diff --git a/.changeset/effect-rc117-repin.md b/.changeset/effect-rc117-repin.md
new file mode 100644
index 000000000..0e4245fb3
--- /dev/null
+++ b/.changeset/effect-rc117-repin.md
@@ -0,0 +1,7 @@
+---
+'agent-bundle': patch
+'@agent-bundle/runtime': patch
+'create-agent-bundle': patch
+---
+
+Update the bundled Effect runtime to `effect@4.0.0-rc.117` (with `@effect/platform-node-shared` and `@effect/platform-node` on the same RC). Consumer installs of `agent-bundle` and `@agent-bundle/runtime` no longer pull in `msgpackr`, `msgpackr-extract`, or `fast-check` through `effect`. (#832)
diff --git a/agent-patterns/effect-concurrency.md b/agent-patterns/effect-concurrency.md
index a18580e99..240aa6956 100644
--- a/agent-patterns/effect-concurrency.md
+++ b/agent-patterns/effect-concurrency.md
@@ -14,7 +14,8 @@ lifecycle). Build those Effect-native from day one behind Promise edges.
 - `Fiber.await` / `Fiber.join` / `Fiber.interrupt`: observe or cancel.
 - Prefer exported Fiber functions over `interruptUnsafe` / `pollUnsafe`.
 - Forked work that owns a resource must be forked *into a scope*
-  (`forkScoped` / `Layer.scoped`) so interruption closes the resource.
+  (`forkScoped`, or a `Layer.effect` constructor) so interruption closes
+  the resource.
 
 Host `AbortSignal` still exists at the edges (`dispatch()` / `stream()`).
 Do not thread extra internal signals once the program is an Effect; interrupt
diff --git a/agent-patterns/effect-errors.md b/agent-patterns/effect-errors.md
index 870beb5a2..12b6d3783 100644
--- a/agent-patterns/effect-errors.md
+++ b/agent-patterns/effect-errors.md
@@ -65,7 +65,7 @@ export class DevCoordinatorCloseError extends YieldableFrameworkError {
 The bases keep the `Error` / `CodedError` constructor shapes, so migrating
 an existing class is the `extends` clause plus the import. They also keep
 the plain-`Error` observable shape, `JSON.stringify`, `stableJson`,
-`{ ...error }`, `util.inspect`, non-enumerable `cause`, which rc.112
+`{ ...error }`, `util.inspect`, non-enumerable `cause`, which rc.117
 `Data.Error` alone would change (its prototype `toJSON` spreads the
 constructor fields; its `[nodejs.util.inspect.custom]` prints that instead
 of the stack). Never extend `Data.Error` directly.
diff --git a/agent-patterns/effect-scope.md b/agent-patterns/effect-scope.md
index 162a29e17..0b9930bf9 100644
--- a/agent-patterns/effect-scope.md
+++ b/agent-patterns/effect-scope.md
@@ -55,9 +55,10 @@ holds the transaction open for the next caller.
 
 ## Layers
 
-- `Layer.effect` for a service with no finalizer.
-- `Layer.scoped` when constructing the service needs `Scope` (open a handle,
-  register a lease, start a subscriber).
+- `Layer.effect` for a service, including one whose construction needs
+  `Scope` (open a handle, register a lease, start a subscriber): v4 has no
+  `Layer.scoped`; `Layer.effect` excludes `Scope` from the requirements and
+  closes it when the layer is released.
 - `Layer.effectDiscard` for a background fiber you do not expose as a
   service (pair with `Effect.forkScoped` / `Effect.forkChild` + scope).
 
diff --git a/agent-patterns/effect-stream.md b/agent-patterns/effect-stream.md
index 47b5cc7d6..30e839b5a 100644
--- a/agent-patterns/effect-stream.md
+++ b/agent-patterns/effect-stream.md
@@ -1,7 +1,7 @@
 # Effect Stream patterns
 
 Source: `repos/effect/packages/effect/src/Stream.ts` (vendored v4, package
-`4.0.0-rc.112`). Refresh when the subtree moves. Read
+`4.0.0-rc.117`). Refresh when the subtree moves. Read
 `repos/effect/LLMS.md` § Working with Streams first.
 
 Stage 2 replaces the #145 pull-gated Flight `TransformStream` with Effect
diff --git a/docs/effect-conventions.md b/docs/effect-conventions.md
index 675d6e4d2..4efabc8e2 100644
--- a/docs/effect-conventions.md
+++ b/docs/effect-conventions.md
@@ -9,8 +9,8 @@ docs, or examples' user code. The four-concept newcomer ledger is untouched.
 
 | Surface | Pin |
 | --- | --- |
-| npm `effect` | **`4.0.0-rc.112`** (exact). Latest published `rc` dist-tag on 2026-09-01. The Wave 3.5 brief named `4.0.0-rc.113`; that version was not on the registry. Re-pin chores take the next published RC. |
-| Vendored tree | `repos/effect` via `git subtree` from [Effect-TS/effect](https://github.com/Effect-TS/effect.git) `main` (v4). Squash commit tracks `packages/effect` version **4.0.0-rc.112**. |
+| npm `effect` | **`4.0.0-rc.117`** (exact). Latest published `rc` dist-tag on 2026-09-25 (re-pinned from `4.0.0-rc.112`, #832). Re-pin chores take the next published RC. |
+| Vendored tree | `repos/effect` via `git subtree` from [Effect-TS/effect](https://github.com/Effect-TS/effect.git) at the release tag **`effect@4.0.0-rc.117`** (v4). Pull the tag matching the npm pin, not `main`: upstream `main` can carry unreleased commits under the same version. |
 | `website` TypeScript | Native **`7.0.2`** runs `tsc`; the `typescript-6` alias stays on **`6.0.3`** for TypeDoc, Twoslash, and `rspress.config.ts` compiler-API calls. `.pnpmfile.cjs` turns those plugins' TypeScript peers into dependencies, and the scoped overrides in `pnpm-workspace.yaml` isolate them from TypeScript 7. Re-pin chores update the alias and overrides together. |
 
 Application code imports the npm package. Never import from `repos/**`.
@@ -86,7 +86,7 @@ is not the goal, and recovery keeps using `Effect.catch` + `instanceof` /
 What does not change: `instanceof Error` / `instanceof X`, `.name`,
 `.message`, `.code`, `.cause`, `.stack`, the boundary's identity-preserving
 rethrow (`isTypedDevError` matches the string `code`), `JSON.stringify`,
-`stableJson`, `{ ...error }`, and `util.inspect`. rc.112 `Data.Error` would
+`stableJson`, `{ ...error }`, and `util.inspect`. rc.117 `Data.Error` would
 otherwise change the last four, its prototype `toJSON` spreads the
 constructor fields (`message`, `cause`) into the JSON and its
 `[nodejs.util.inspect.custom]` prints that instead of the stack, so the
@@ -169,10 +169,11 @@ on the Promise edge. Do not widen public error types to satisfy Effect.
   `Disposable` / `AsyncDisposable`).
 - Close a scope with `Effect.scoped` / `Effect.scopedWith`. Do not leak
   `Scope` into a public Promise signature.
-- Layers compose services. `Layer.scoped` when the layer needs `Scope`.
+- Layers compose services. `Layer.effect` also covers a layer that needs
+  `Scope` (v4 has no `Layer.scoped`).
 - Host `AbortSignal` at a Promise edge goes on `runPromise(..., { signal })`.
   Inside Effect, `interruptWhenAborted` or `yield* scopedAbortSignal`.
-- `scopedAbortSignal` is `Effect.abortSignal`, which in rc.112 is exactly
+- `scopedAbortSignal` is `Effect.abortSignal`, which in rc.117 is exactly
   `acquireRelease(sync(() => new AbortController()), c => sync(() => c.abort()))`
   mapped to `.signal`: it aborts only when the owning scope closes, always
   with no reason, and never hands out the controller. A contract that must
@@ -268,7 +269,7 @@ Hurt / gotchas:
   `release: (a, exit) => Effect<unknown, never, R>` and `Effect.addFinalizer`
   an `Effect<void, never, R>`, so a release that can fail cannot even be
   written there. `Effect.acquireUseRelease`'s `release` and `Effect.onExit`
-  / `Effect.ensuring` handlers are **not** infallible: rc.112 types them
+  / `Effect.ensuring` handlers are **not** infallible: rc.117 types them
   `Effect<void, E3, R3>` and merges a failing handler into the result
   (`combineFinalizerCause` → `Cause.combine(useCause, handlerCause)`). That
   merged cause is first-failure-wins once it reaches the boundary:
@@ -305,7 +306,7 @@ published API surface; its dist ships inside the `agent-bundle` package as
 static assets.
 
 Exact-pin `effect` + `@effect/atom-react` (synchronized with the repo's effect
-pin, currently `4.0.0-rc.112`) are allowed there, but only in dedicated
+pin, currently `4.0.0-rc.117`) are allowed there, but only in dedicated
 browser-state modules (`src/runtime/agent-document-atoms.ts`,
 `src/routes/route-editor-atoms.ts`, and `src/discovery/discovery-atoms.ts`).
 The discovery module owns report loading plus ephemeral live-probe consent
@@ -323,10 +324,10 @@ and result state. Atoms live in `effect/unstable/reactivity`; React bindings com
 - Imperative clients (`ProjectClient`, `RuntimeClient`, `AgentDocumentClient`,
   …) stay the lifecycle authorities; atoms are read-side caches over their
   decoded outputs.
-- Known caveat: `4.0.0-rc.112` has a stream-backed derived-atom disposal bug
-  (fixed upstream post-rc.112, unpublished), no stream-backed derived atoms
-  in the Workbench until a re-pin past the fix; the root `RegistryProvider`
-  (not the default registry) avoids the reported React case.
+- Stream-backed derived atoms are allowed from `4.0.0-rc.117`: the rc.112
+  idle-TTL disposal bug for a stream-backed atom read through a derived atom
+  is fixed upstream (Effect-TS/effect#7535, first published in rc.113). Keep
+  the root `RegistryProvider`; the module-level default registry stays unused.
 - Every effect re-pin must bump `@effect/atom-react` to the same RC in the
   same chore, re-run the Workbench disposal regression test, and re-measure
   the Workbench production bundle (the rsbuild build emits the size table).
@@ -336,6 +337,9 @@ and result state. Atoms live in `effect/unstable/reactivity`; React bindings com
 Re-evaluated 2026-09-03 against `effect@4.0.0-rc.112` +
 `@effect/platform-node@4.0.0-rc.112`; **decision = adopted for ordinary
 filesystem I/O and path operations** (the 2026-09-01 decline is superseded).
+Re-verified 2026-09-25 on rc.117: `@effect/platform-node` still requires a
+non-optional `redis` peer, and `NodeFileSystem` still has no `lstat`,
+`O_NOFOLLOW`, or directory fsync, so the split and the keep-raw list stand.
 `FileSystem.FileSystem` and `Path.Path` from the `effect` package are the
 sanctioned way for framework code to touch the filesystem. The Node
 implementations come from `@effect/platform-node` (`NodeServices.layer`) in
@@ -344,7 +348,7 @@ implementations come from `@effect/platform-node` (`NodeServices.layer`) in
 `NodeFileSystem` / `NodePath` / `NodeChildProcessSpawner` / `NodeStdio` /
 `NodeTerminal` / `NodeCrypto`; `@effect/platform-node`'s modules are
 re-exports of it) in `agent-bundle`, which every consumer installs:
-`@effect/platform-node@rc.112` would add `undici`, `mime`, and, through a
+`@effect/platform-node` would add `undici` (rc.112 also added `mime`) and, through a
 non-optional `redis` peer that npm auto-installs, a Redis client (+23 MB,
 +17 packages) to each consumer install. `agent-bundle`'s `platformLayer`
 composes the same six services the same way `NodeServices.layer` does. The
@@ -374,7 +378,7 @@ the first-party CLI's user-facing text, see
   `try`/`finally` `rm(dir, { recursive: true, force: true })` exactly,
   `force`, cleanup failure as a typed `PlatformError` that wins over the
   operation's failure, cleanup on interruption. Not
-  `fs.makeTempDirectoryScoped` in library code: the rc.112 finalizer removes
+  `fs.makeTempDirectoryScoped` in library code: the rc.117 finalizer removes
   without `force` and `orDie`s, so an operation that deleted its own staging
   directory would fail an already successful call, and a real cleanup error
   would surface as the `PlatformError` wrapper (scope finalizers cannot fail
@@ -508,7 +512,9 @@ import into its own chunk (`dist/scaffold-cli.js`, 447.5 kB; the argv layer
 is 10.8 kB), so `--help` no longer evaluates it: cold start ≈40 ms before
 `NodeServices.layer`, ≈65 ms with it evaluated eagerly (the 2026-09-03
 regression, ≈69 ms on the 2026-09-03 re-measurement below), ≈40 ms with the
-split. `undici` is not pulled into the bundle.
+split. `undici` is not pulled into the bundle. Re-measured 2026-09-25: the
+chunk is 449.5 kB on rc.112 and 487.4 kB on rc.117 (+37.9 kB; the package
+total 462.2 kB → 500.1 kB).
 
 `packages/agent-bundle/src/effect/platform.ts` owns the framework's platform
 layer: `platformLayer` (the `NodeServices` union composed from
@@ -566,7 +572,7 @@ place of the script's outcome.
 ### Terminal and Stdio: user-facing CLI text
 
 Adopted 2026-09-03 for the first-party `agent-bundle` CLI (`src/cli.ts`); the
-Node implementations come from `@effect/platform-node-shared@4.0.0-rc.112`,
+Node implementations come from `@effect/platform-node-shared@4.0.0-rc.117`,
 the same dependency `platform.ts` builds `platformLayer` from (never
 `@effect/platform-node`, for the consumer-footprint reason above).
 `effect/Terminal` is the sanctioned way to touch stdin/stdout for
@@ -735,7 +741,7 @@ wire contracts](#effect-schema-wire-contracts-schema-projections).
 
 | Module | Adopted in | Re-verify |
 | --- | --- | --- |
-| `effect/unstable/reactivity` (+ `@effect/atom-react` bindings) | Workbench Agent Document panel (#105 phase 1) and route editor (#105 phase 2) | re-pin bumps @effect/atom-react in lockstep; re-run disposal regression + bundle measurement; stream-backed derived atoms stay banned until the rc.112 disposal fix ships |
+| `effect/unstable/reactivity` (+ `@effect/atom-react` bindings) | Workbench Agent Document panel (#105 phase 1) and route editor (#105 phase 2) | re-pin bumps @effect/atom-react in lockstep; re-run disposal regression + bundle measurement (rc.117: 2929.0 kB / 649.8 kB gzip total); stream-backed derived atoms allowed since rc.117 (Effect-TS/effect#7535) |
 | `@effect/platform-node` (`NodeServices.layer`, `create-agent-bundle`) and `@effect/platform-node-shared` (`agent-bundle`'s `platformLayer`); `FileSystem` / `Path` services live in `effect` | **adopted** (2026-09-03) for ordinary I/O, `create-agent-bundle` scaffolder and the `agent-bundle` temp directories in `api.ts` / the Codex validator (phase 1); host-contracts validators, `services/*`, `eval/*`, and the post-build readers (phase 2, ordinary-I/O modules, 2026-09-03); the dev server's services on one session-scoped runtime created in `startDevServer` (phase 2, dev server, 2026-09-03); see [Effect platform services](#effect-platform-services-effectplatform-node) for the keep-raw list and the consumer-footprint reason for the split | re-pin bumps both in lockstep with `effect`; re-check whether `@effect/platform-node` still forces a `redis` peer (if it stops, `agent-bundle` can move to `NodeServices.layer`); re-check whether `lstat` / `O_NOFOLLOW` / directory fsync landed (would shrink the keep-raw list) and the `runMain` 130/143 exit contract |
 | `@effect/platform-node-shared` (`NodeTerminal` / `NodeStdio`) + `effect/Terminal`, `effect/Stdio` | first-party CLI command output, diagnostics, and machine output (`src/cli.ts`, `src/effect/terminal.ts`, `src/effect/cli-runtime.ts`), loaded lazily on the first command write (2026-09-03); Commander's help/version/argv-error text and the scaffolder's `--help` / flag-error text stay on synchronous process writes for the cold-start budget | re-pin re-checks `Terminal.display` stays stdout-only, `readLine` EOF → `QuitError`, the `Stdio` sink contract, and re-measures `agent-bundle --version` startup against the recorded ≈60 ms (`cli.test.ts` fails the build if the trivial invocations resolve an `effect` module) |
 | `Schema` / `SchemaAST` / `SchemaParser` projections (`toType` / `toEncoded`) for wire contracts | **declined** (2026-09-01) | revisit at Effect GA or on the first encoded/decoded-divergent wire contract; re-pin re-checks the projections API and the `onExcessProperty` parse-option default |
@@ -761,7 +767,10 @@ Adding the `effect` dependency changed no generated artifact, no runtime
 entry (`index.js`, `state.js`, `state/sqlite.js`, `plugin.js`) imports it
 until Stage 1+. Machine-readable copy:
 [effect-cold-start-baseline.json](effect-cold-start-baseline.json). Stage 2
-must not regress it: `pnpm bench:hook-cold-start -- --check`.
+must not regress it: `pnpm bench:hook-cold-start -- --check`. The rc.117
+re-pin measured a 46.4–47.3 ms median (2026-09-25, Node v24.15.0 against
+the baseline's v22.23.1), inside the check's budget; the baseline file was
+not rewritten.
 
 ## Re-pin chore
 
@@ -774,7 +783,10 @@ must not regress it: `pnpm bench:hook-cold-start -- --check`.
    the same RC; re-run the Workbench disposal regression test and production
    bundle measurement (rsbuild size table), and re-measure the scaffolder
    bundle (`pnpm --filter create-agent-bundle build` prints the size table).
-3. `git subtree pull --prefix=repos/effect https://github.com/Effect-TS/effect.git main --squash`.
+3. `git subtree pull --prefix=repos/effect https://github.com/Effect-TS/effect.git effect@<version> --squash`
+   (the release tag of the new pin). Fetch upstream tags in a separate clone,
+   never into this repository. Keep the `git-subtree-dir` / `git-subtree-split`
+   trailers in the PR's squash-merge body so the next pull finds its base.
 4. Re-read `repos/effect/LLMS.md` and refresh `agent-patterns/effect-*.md`.
 5. Re-verify every unstable-module row and the language-service diagnostics.
 6. Re-run the hook cold-start check.
@@ -804,7 +816,7 @@ resolved the current repo practice stands, and new code follows it.
   (`adapters/hook-contract.ts`, `install/surface.ts`,
   `dev/runtime-client-surface-proxy.ts`, `dev/mcp-apps/mcp-app-sandbox.ts`).
   Roughly 400 call sites in total, against about a dozen
-  `Predicate.isObject` uses (the install lane). rc.112 `Predicate` has no
+  `Predicate.isObject` uses (the install lane). rc.117 `Predicate` has no
   `isRecord`; `Predicate.isObject` is the closest match (`{}`-typed, excludes
   arrays), and `Predicate.isObjectOrArray` includes arrays. Options: declare
   the `core/strict-json.ts` guards the sanctioned spelling, fold the private
@@ -819,7 +831,7 @@ resolved the current repo practice stands, and new code follows it.
   [Yieldable framework errors](#yieldable-framework-errors-dataerror-decided-2026-09-03).
   Summary: framework-process error classes in Effect-native modules extend
   `YieldableFrameworkError` / `YieldableCodedError`
-  (`packages/agent-bundle/src/effect/errors.ts`, thin subclasses of rc.112
+  (`packages/agent-bundle/src/effect/errors.ts`, thin subclasses of rc.117
   `Data.Error` that keep the `Error` / `CodedError` constructor shapes and
   restore plain-`Error` `toJSON` / `util.inspect`), so programs write
   `return yield* new X(...)`. `Schema.TaggedError` stays deferred. Plain
@@ -852,6 +864,6 @@ soon as the trigger fires and retire the row.
 
 | Recorded | Pin (where) | Observed registry state | Trigger / action |
 | --- | --- | --- | --- |
-| 2026-09-03 | `effect-rstest` **pkg.pr.new preview `e5f8d5f`** (`https://pkg.pr.new/ScriptedAlchemy/effect-rstest@e5f8d5f`), `packages/agent-bundle`, `packages/rsc-runtime`, `packages/create-agent-bundle` devDependencies (three pins). Needs a real release pin once published. | `npm view effect-rstest versions`: **E404, not published to npm** (no versions, no dist-tags). | First npm publish of `effect-rstest`. Replace all three preview URLs with the exact published version, refresh `pnpm-lock.yaml`, re-run `pnpm test:unit` (`it.effect` / `it.live` suites). |
-| 2026-09-03 | `effect` **`4.0.0-rc.112`** (`packages/agent-bundle`, `packages/rsc-runtime`, `packages/workbench`, `packages/create-agent-bundle`), `@effect/atom-react` `4.0.0-rc.112` (`packages/workbench`), `@effect/platform-node` `4.0.0-rc.112` (`packages/create-agent-bundle`), `@effect/platform-node-shared` `4.0.0-rc.112` (`packages/agent-bundle`), `@effect/language-service` `0.87.2` (root). `@effect/tsgo` is not part of this row: it detects the Effect major version rather than pinning an RC, and moves on its own (`0.45.0`, 2026-09-24, #817; `effect-tsgo diagnostics` output identical to `0.41.0` on the root, Workbench, and scaffolder projects). Auto re-pin in lockstep + `repos/effect` subtree + Workbench atom phase 4 unblock (stream-backed derived atoms) once the post-rc.112 disposal fix ships. | `npm view effect dist-tags`: `rc` **`4.0.0-rc.112`** (unchanged), `beta` `4.0.0-beta.107`, `latest` `3.22.1`. `@effect/atom-react`: `rc` `4.0.0-rc.112`. `@effect/language-service`: `latest` `0.87.2`. 2026-09-24: `rc` **`4.0.0-rc.117`**; the trigger has fired but the re-pin is **blocked** (#832): every `effect-rstest` build imports `effect/testing/FastCheck`, removed in rc.113 (Effect-TS/effect#7254, native Arbitraries), so six unit-test files fail to load on any RC after rc.112. | `effect-rstest` ships a build ported to `effect/unstable/arbitrary/Arbitrary` (as upstream `@effect/vitest` did); then run the re-pin chore steps 1–6 above (#832 has steps 1 and 3), bumping `effect`, `@effect/atom-react`, and `@effect/language-service` together, then lift the stream-backed derived-atom ban in the Workbench if the disposal fix is in the new RC. |
+| 2026-09-25 | `effect-rstest` **pkg.pr.new preview `cbbf87e`** (`https://pkg.pr.new/ScriptedAlchemy/effect-rstest@cbbf87e`, the ScriptedAlchemy/effect-rstest#5 port to `effect/unstable/arbitrary`), `packages/agent-bundle`, `packages/rsc-runtime`, `packages/create-agent-bundle` devDependencies (three pins). Needs a real release pin once published. | ScriptedAlchemy/effect-rstest is **not published to npm**. The npm name `effect-rstest` (`latest` `0.1.5`, 2026-09-19) belongs to an unrelated port, [Nsttt/effect-rstest](https://github.com/Nsttt/effect-rstest); do not pin it by name. | First npm publish of ScriptedAlchemy/effect-rstest. Replace all three preview URLs with the exact published version, refresh `pnpm-lock.yaml`, re-run `pnpm test:unit` (`it.effect` / `it.live` / `it.prop` suites). |
+| 2026-09-25 | `effect` **`4.0.0-rc.117`** (`packages/agent-bundle`, `packages/rsc-runtime`, `packages/workbench`, `packages/create-agent-bundle`), `@effect/atom-react` `4.0.0-rc.117` (`packages/workbench`), `@effect/platform-node` `4.0.0-rc.117` (`packages/create-agent-bundle`), `@effect/platform-node-shared` `4.0.0-rc.117` (`packages/agent-bundle`), `@effect/language-service` `0.87.2` (root). `@effect/tsgo` is not part of this row: it detects the Effect major version rather than pinning an RC, and moves on its own. Auto re-pin in lockstep + `repos/effect` subtree at the matching release tag. | `npm view effect dist-tags`: `rc` **`4.0.0-rc.117`**, `beta` `4.0.0-beta.107`, `latest` `3.22.2`. `@effect/atom-react`: `rc` `4.0.0-rc.117`. `@effect/language-service`: `latest` `0.87.2`. Re-pinned from rc.112 in #832 after `effect-rstest` moved off `effect/testing/FastCheck` (removed in rc.113, Effect-TS/effect#7254). | `effect@rc` advances past `4.0.0-rc.117`. Run the re-pin chore steps 1–6 above, bumping `effect`, `@effect/atom-react`, the platform packages, and `@effect/language-service` together; `effect-rstest` must build against the new RC first. |
 | 2026-09-03 | Agent Plugins specification **`1.0.0`**, `packages/agent-bundle/src/adapters/schemas/portable/{plugin,mcp}.schema.json` + `PROVENANCE.json` (spec repo `agentplugins/agent-plugins-spec` @ `ff8ab5e392cc87bd88d87c060815a87490e51003`, 2026-08-19), portable `adapterRevision` `1.8.0`, pins in `tests/adapter-metadata.test.ts`. Spec watch for #426; not an npm pin, so re-verify with `curl`/`gh api`, not `npm view`. | Live `https://agent-plugins.org/schemas/1.0.0/{plugin,mcp}.schema.json` rehash to the pinned sha256 (1805 / 3408 bytes). Repo `main` HEAD unchanged at the pinned commit; **no tags, no GitHub releases**. `spec/1.1.0.md` is "Status: Working Draft" (started 2026-08-15, `a2afd7ec`); in-repo `schemas/1.1.0/*.schema.json` differ from 1.0.0 only in the `$id`/`const`/`description` version strings; `https://agent-plugins.org/schemas/1.1.0/*.schema.json` → 404. Observed latest published version: **1.0.0**. | `spec/1.1.0.md` (or later) flips to "Published" **and** `agent-plugins.org/schemas/<version>/` serves both schemas. Re-pin under `schemas/portable/` with a dated `PROVENANCE.json` (sha/bytes/date/commit), bump the portable `adapterRevision`, refresh the metadata pins, run `pnpm test:unit` (portable adapter + plugin-validation suites) and `pnpm test:host-install:build`, and add a capability row per additive field. |
diff --git a/packages/agent-bundle/package.json b/packages/agent-bundle/package.json
index 8707ce20b..3cb8a4466 100644
--- a/packages/agent-bundle/package.json
+++ b/packages/agent-bundle/package.json
@@ -109,7 +109,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@effect/platform-node-shared": "4.0.0-rc.112",
+    "@effect/platform-node-shared": "4.0.0-rc.117",
     "@modelcontextprotocol/client": "2.0.0",
     "@modelcontextprotocol/node": "2.0.0",
     "@modelcontextprotocol/server": "2.0.0",
@@ -123,7 +123,7 @@
     "ajv-formats": "3.0.1",
     "chokidar": "5.0.0",
     "commander": "15.0.0",
-    "effect": "4.0.0-rc.112",
+    "effect": "4.0.0-rc.117",
     "es-module-lexer": "3.0.2",
     "fast-glob": "3.3.3",
     "ignore": "7.0.9",
@@ -136,7 +136,7 @@
     "@types/npm-package-arg": "6.1.4",
     "@types/react": "19.3.0",
     "@types/ws": "8.18.1",
-    "effect-rstest": "https://pkg.pr.new/ScriptedAlchemy/effect-rstest@e5f8d5f",
+    "effect-rstest": "https://pkg.pr.new/ScriptedAlchemy/effect-rstest@cbbf87e",
     "react": "19.3.0",
     "typescript-5": "npm:typescript@5.9.3",
     "zod": "4.6.4"
diff --git a/packages/agent-bundle/src/effect/errors.ts b/packages/agent-bundle/src/effect/errors.ts
index dcbd917c8..c26eae814 100644
--- a/packages/agent-bundle/src/effect/errors.ts
+++ b/packages/agent-bundle/src/effect/errors.ts
@@ -8,21 +8,21 @@ import { Data } from 'effect';
  * behaves as the plain `Error` subclass it replaces:
  *
  * - `instanceof Error` / `instanceof X`, `.name`, `.message`, `.code`,
- *   `.cause`, and `.stack` are unchanged (rc.112 `Data.Error` is
+ *   `.cause`, and `.stack` are unchanged (rc.117 `Data.Error` is
  *   `class extends globalThis.Error`).
  * - `JSON.stringify(error)`, `stableJson(error)`, and `{ ...error }` stay
- *   byte-identical to the plain-`Error` output. rc.112 `Data.Error#toJSON`
+ *   byte-identical to the plain-`Error` output. rc.117 `Data.Error#toJSON`
  *   would spread the constructor fields (`message`, `cause`) into the JSON
  *   and `stableJson` would then sort the keys; the base shadows `toJSON` so
  *   both serializers take their plain-object path ("own enumerable fields,
  *   insertion order").
- * - `util.inspect` / `console.error(error)` print the stack trace. rc.112
+ * - `util.inspect` / `console.error(error)` print the stack trace. rc.117
  *   installs `[nodejs.util.inspect.custom]` on the yieldable prototype
  *   (returning `toJSON()`), which would replace the stack with a field dump
  *   in CLI output; the base shadows it so Node's default `Error` formatting
  *   applies again.
  * - `cause` is installed exactly like `new Error(message, { cause })`: only
- *   when `options` carries the key, and never enumerable. rc.112 passes a
+ *   when `options` carries the key, and never enumerable. rc.117 passes a
  *   falsy `cause` through `Object.assign`-style property assignment, which
  *   would make it an enumerable own field.
  *
diff --git a/packages/agent-bundle/src/effect/platform.ts b/packages/agent-bundle/src/effect/platform.ts
index 604298bdf..abf1115fe 100644
--- a/packages/agent-bundle/src/effect/platform.ts
+++ b/packages/agent-bundle/src/effect/platform.ts
@@ -16,10 +16,10 @@ import { runPromise, type RunPromiseOptions } from './boundary.ts';
  * `NodeServices.layer`, but built from `@effect/platform-node-shared`, the
  * package that actually implements them (`@effect/platform-node`'s
  * `NodeFileSystem` etc. are re-exports). `agent-bundle` is a runtime
- * dependency of every consumer, and `@effect/platform-node@rc.112` would add
- * `undici`, `mime`, and — through a non-optional `redis` peer that npm
- * auto-installs — a Redis client (+23 MB, +17 packages) to each install for
- * a filesystem layer. `create-agent-bundle`, which bundles its
+ * dependency of every consumer, and `@effect/platform-node@rc.117` would add
+ * `undici` and — through a non-optional `redis` peer that npm auto-installs —
+ * a Redis client (+23 MB, +17 packages measured on rc.112) to each install
+ * for a filesystem layer. `create-agent-bundle`, which bundles its
  * dependencies, keeps `NodeServices.layer`.
  *
  * Provided at Promise edges only — the public API functions in `api.ts` and
@@ -122,7 +122,7 @@ export const ensuringRemoved = <A, E, R>(
  * an interrupt cannot land between its creation and its cleanup. The
  * operation is restored to the caller's interruptibility before it enters
  * the bracket (the bracket's own mask is a no-op inside this one). Not
- * `fs.makeTempDirectoryScoped`: in rc.112 its finalizer removes without
+ * `fs.makeTempDirectoryScoped`: through rc.117 its finalizer removes without
  * `force` and `orDie`s, so a missing directory would reject an already
  * successful call and a real cleanup error would lose its Node cause.
  */
diff --git a/packages/agent-bundle/tests/effect-filesystem-phase2-dev.test.ts b/packages/agent-bundle/tests/effect-filesystem-phase2-dev.test.ts
index f506dd863..a77a13402 100644
--- a/packages/agent-bundle/tests/effect-filesystem-phase2-dev.test.ts
+++ b/packages/agent-bundle/tests/effect-filesystem-phase2-dev.test.ts
@@ -2,7 +2,7 @@ import { access, mkdtemp, readFile, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 
-import { Effect, FileSystem, Layer, Option } from 'effect';
+import { ByteSize, Effect, FileSystem, Layer, Option } from 'effect';
 import { afterEach, describe, expect, it } from '@rstest/core';
 
 import { createDefaultRegistry } from '../src/adapters/registry.ts';
@@ -58,7 +58,7 @@ const fileInfo = (size: number): FileSystem.File.Info => ({
   mtime: Option.none(),
   nlink: Option.none(),
   rdev: Option.none(),
-  size: FileSystem.Size(size),
+  size: ByteSize.bytes(size),
   type: 'File',
   uid: Option.none(),
 });
diff --git a/packages/agent-bundle/tests/effect-filesystem-phase2.test.ts b/packages/agent-bundle/tests/effect-filesystem-phase2.test.ts
index ea91fedb7..65d9221b8 100644
--- a/packages/agent-bundle/tests/effect-filesystem-phase2.test.ts
+++ b/packages/agent-bundle/tests/effect-filesystem-phase2.test.ts
@@ -4,7 +4,7 @@ import { access, mkdir, mkdtemp, readFile, stat, symlink, writeFile } from 'node
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 
-import { Effect, FileSystem, Option, PlatformError } from 'effect';
+import { ByteSize, Effect, FileSystem, Option, PlatformError } from 'effect';
 import { afterEach, describe, expect, it } from '@rstest/core';
 
 import { runPromise } from '../src/effect/boundary.ts';
@@ -57,7 +57,7 @@ const fileInfo = (mode: number): FileSystem.File.Info => ({
   mtime: Option.none(),
   nlink: Option.none(),
   rdev: Option.none(),
-  size: FileSystem.Size(3),
+  size: ByteSize.bytes(3),
   type: 'File',
   uid: Option.none(),
 });
diff --git a/packages/create-agent-bundle/package.json b/packages/create-agent-bundle/package.json
index 7fb279bae..b267b5ea7 100644
--- a/packages/create-agent-bundle/package.json
+++ b/packages/create-agent-bundle/package.json
@@ -46,12 +46,12 @@
   },
   "devDependencies": {
     "@clack/prompts": "1.8.1",
-    "@effect/platform-node": "4.0.0-rc.112",
+    "@effect/platform-node": "4.0.0-rc.117",
     "@rslib/core": "1.0.0",
     "@rstest/core": "0.11.12",
     "@types/node": "26.5.1",
-    "effect": "4.0.0-rc.112",
-    "effect-rstest": "https://pkg.pr.new/ScriptedAlchemy/effect-rstest@e5f8d5f"
+    "effect": "4.0.0-rc.117",
+    "effect-rstest": "https://pkg.pr.new/ScriptedAlchemy/effect-rstest@cbbf87e"
   },
   "peerDependencies": {
     "@agent-bundle/runtime": "workspace:*",
diff --git a/packages/create-agent-bundle/tests/scaffold-noop.test.ts b/packages/create-agent-bundle/tests/scaffold-noop.test.ts
index 90ded852c..3a25e3d08 100644
--- a/packages/create-agent-bundle/tests/scaffold-noop.test.ts
+++ b/packages/create-agent-bundle/tests/scaffold-noop.test.ts
@@ -1,4 +1,4 @@
-import { Effect, FileSystem, Layer, Option, Path, PlatformError } from 'effect';
+import { ByteSize, Effect, FileSystem, Layer, Option, Path, PlatformError } from 'effect';
 import { describe, expect, it } from 'effect-rstest';
 
 import { assertLocalFrameworkTarball } from '../src/framework.ts';
@@ -25,7 +25,7 @@ const fileInfo = (type: FileSystem.File.Type): FileSystem.File.Info => ({
   mtime: Option.none(),
   nlink: Option.none(),
   rdev: Option.none(),
-  size: FileSystem.Size(0),
+  size: ByteSize.bytes(0),
   type,
   uid: Option.none(),
 });
diff --git a/packages/rsc-runtime/package.json b/packages/rsc-runtime/package.json
index b88852c55..d43fc5e94 100644
--- a/packages/rsc-runtime/package.json
+++ b/packages/rsc-runtime/package.json
@@ -92,7 +92,7 @@
   },
   "dependencies": {
     "@modelcontextprotocol/server": "2.0.0",
-    "effect": "4.0.0-rc.112",
+    "effect": "4.0.0-rc.117",
     "flare-redact": "1.6.1",
     "react-server-dom-rspack": "0.1.0",
     "rsc-markdown-stream": "workspace:^"
@@ -103,7 +103,7 @@
     "@rspack/core": "2.2.3",
     "@rstest/core": "0.11.12",
     "@types/react": "19.3.0",
-    "effect-rstest": "https://pkg.pr.new/ScriptedAlchemy/effect-rstest@e5f8d5f",
+    "effect-rstest": "https://pkg.pr.new/ScriptedAlchemy/effect-rstest@cbbf87e",
     "micromark": "4.0.2",
     "micromark-extension-gfm": "3.0.0",
     "react": "19.3.0",
diff --git a/packages/workbench/package.json b/packages/workbench/package.json
index 92a16ac63..aaff1a21a 100644
--- a/packages/workbench/package.json
+++ b/packages/workbench/package.json
@@ -13,11 +13,11 @@
     "typecheck": "tsc --project tsconfig.json"
   },
   "dependencies": {
-    "@effect/atom-react": "4.0.0-rc.112",
+    "@effect/atom-react": "4.0.0-rc.117",
     "@modelcontextprotocol/client": "2.0.0",
     "@xterm/addon-fit": "0.11.0",
     "@xterm/xterm": "6.0.0",
-    "effect": "4.0.0-rc.112",
+    "effect": "4.0.0-rc.117",
     "react": "19.3.0",
     "react-dom": "19.3.0",
     "react-markdown": "10.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5f7f5c097..6f4ffc5ea 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -257,8 +257,8 @@ importers:
         specifier: workspace:*
         version: link:../rsc-runtime
       '@effect/platform-node-shared':
-        specifier: 4.0.0-rc.112
-        version: 4.0.0-rc.112(effect@4.0.0-rc.112)
+        specifier: 4.0.0-rc.117
+        version: 4.0.0-rc.117(effect@4.0.0-rc.117)
       '@modelcontextprotocol/client':
         specifier: 2.0.0
         version: 2.0.0
@@ -302,8 +302,8 @@ importers:
         specifier: 15.0.0
         version: 15.0.0
       effect:
-        specifier: 4.0.0-rc.112
-        version: 4.0.0-rc.112
+        specifier: 4.0.0-rc.117
+        version: 4.0.0-rc.117
       es-module-lexer:
         specifier: 3.0.2
         version: 3.0.2
@@ -336,8 +336,8 @@ importers:
         specifier: 8.18.1
         version: 8.18.1
       effect-rstest:
-        specifier: https://pkg.pr.new/ScriptedAlchemy/effect-rstest@e5f8d5f
-        version: https://pkg.pr.new/ScriptedAlchemy/effect-rstest@e5f8d5f(@rstest/core@0.11.12)(effect@4.0.0-rc.112)
+        specifier: https://pkg.pr.new/ScriptedAlchemy/effect-rstest@cbbf87e
+        version: https://pkg.pr.new/ScriptedAlchemy/effect-rstest@cbbf87e(@rstest/core@0.11.12)(effect@4.0.0-rc.117)
       react:
         specifier: 19.3.0
         version: 19.3.0
@@ -361,8 +361,8 @@ importers:
         specifier: 1.8.1
         version: 1.8.1
       '@effect/platform-node':
-        specifier: 4.0.0-rc.112
-        version: 4.0.0-rc.112(effect@4.0.0-rc.112)(redis@6.2.1)
+        specifier: 4.0.0-rc.117
+        version: 4.0.0-rc.117(effect@4.0.0-rc.117)(redis@6.2.1)
       '@rslib/core':
         specifier: 1.0.0
         version: 1.0.0(typescript@7.0.2)
@@ -373,11 +373,11 @@ importers:
         specifier: 26.5.1
         version: 26.5.1
       effect:
-        specifier: 4.0.0-rc.112
-        version: 4.0.0-rc.112
+        specifier: 4.0.0-rc.117
+        version: 4.0.0-rc.117
       effect-rstest:
-        specifier: https://pkg.pr.new/ScriptedAlchemy/effect-rstest@e5f8d5f
-        version: https://pkg.pr.new/ScriptedAlchemy/effect-rstest@e5f8d5f(@rstest/core@0.11.12)(effect@4.0.0-rc.112)
+        specifier: https://pkg.pr.new/ScriptedAlchemy/effect-rstest@cbbf87e
+        version: https://pkg.pr.new/ScriptedAlchemy/effect-rstest@cbbf87e(@rstest/core@0.11.12)(effect@4.0.0-rc.117)
 
   packages/rsc-markdown-stream:
     devDependencies:
@@ -400,8 +400,8 @@ importers:
         specifier: 2.0.0
         version: 2.0.0
       effect:
-        specifier: 4.0.0-rc.112
-        version: 4.0.0-rc.112
+        specifier: 4.0.0-rc.117
+        version: 4.0.0-rc.117
       flare-redact:
         specifier: 1.6.1
         version: 1.6.1
@@ -428,8 +428,8 @@ importers:
         specifier: 19.3.0
         version: 19.3.0
       effect-rstest:
-        specifier: https://pkg.pr.new/ScriptedAlchemy/effect-rstest@e5f8d5f
-        version: https://pkg.pr.new/ScriptedAlchemy/effect-rstest@e5f8d5f(@rstest/core@0.11.12)(effect@4.0.0-rc.112)
+        specifier: https://pkg.pr.new/ScriptedAlchemy/effect-rstest@cbbf87e
+        version: https://pkg.pr.new/ScriptedAlchemy/effect-rstest@cbbf87e(@rstest/core@0.11.12)(effect@4.0.0-rc.117)
       micromark:
         specifier: 4.0.2
         version: 4.0.2(supports-color@7.2.0)
@@ -449,8 +449,8 @@ importers:
   packages/workbench:
     dependencies:
       '@effect/atom-react':
-        specifier: 4.0.0-rc.112
-        version: 4.0.0-rc.112(effect@4.0.0-rc.112)(react@19.3.0)(scheduler@0.27.0)
+        specifier: 4.0.0-rc.117
+        version: 4.0.0-rc.117(effect@4.0.0-rc.117)(react@19.3.0)(scheduler@0.27.0)
       '@modelcontextprotocol/client':
         specifier: 2.0.0
         version: 2.0.0
@@ -461,8 +461,8 @@ importers:
         specifier: 6.0.0
         version: 6.0.0
       effect:
-        specifier: 4.0.0-rc.112
-        version: 4.0.0-rc.112
+        specifier: 4.0.0-rc.117
+        version: 4.0.0-rc.117
       react:
         specifier: 19.3.0
         version: 19.3.0
@@ -698,10 +698,10 @@ packages:
     resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
     engines: {node: '>=0.1.90'}
 
-  '@effect/atom-react@4.0.0-rc.112':
-    resolution: {integrity: sha512-Ksf90KQa6D4UDnMj4M84arlVKNIuwxxF2GvgXBzuaYi2LsgririsUhKQ5SYaK1euf8oIYeamEuthoZSbUQmIhw==}
+  '@effect/atom-react@4.0.0-rc.117':
+    resolution: {integrity: sha512-e6swZzC+2sPY9LfICB1YQBdn6DvnNmS1p4KwppzfHjT9lv+fyDVI9IxymUQ/Oduc58rOV/4jBhZv1tu7vgx47w==}
     peerDependencies:
-      effect: ^4.0.0-rc.112
+      effect: ^4.0.0-rc.117
       react: '>=19.0.0 <20.0.0'
       scheduler: '>=0.25.0 <0.28.0'
 
@@ -709,17 +709,17 @@ packages:
     resolution: {integrity: sha512-CfiSoaVQO8pZgaMZGw5VvMvRGybsJ2LaSDoLYaqiVGvo/YYPYVR2GzUKY0h1NtIweq/+SQ5XLrvtzPIttWQ0GQ==}
     hasBin: true
 
-  '@effect/platform-node-shared@4.0.0-rc.112':
-    resolution: {integrity: sha512-ttjz0xKamFN7vL8pNDYVwddJLjZvqKePc05djlz2VcdaKbLsnYbtMnL1rbOfHgEnIUSHGh7FkjaN4DM1Ov81sQ==}
+  '@effect/platform-node-shared@4.0.0-rc.117':
+    resolution: {integrity: sha512-GyRkEfLBG49MwJe+/XDPiXYcQ44RA9p2z0AurlsWhR1cd1PqOUMEZU1pORL+/R5hR8aH6ZuqoJYD8lAc6h+wlA==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
-      effect: ^4.0.0-rc.112
+      effect: ^4.0.0-rc.117
 
-  '@effect/platform-node@4.0.0-rc.112':
-    resolution: {integrity: sha512-/BMAcdNGQQskLmI0Zoa95KfTZkr9HV9N4NSxaSrusG6GeW6Ulp9KvZ+Rlaiw8lnOt43CXjFLdfll5/k5rxL4hQ==}
+  '@effect/platform-node@4.0.0-rc.117':
+    resolution: {integrity: sha512-WbPcvQDkqXFnCeG6LohJ9eVNapCDhZbCpezhYKxm0IsZEk7swakRh7RkC1t2CXzd3hGmszTv2k9e/pXyZuL+wQ==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
-      effect: ^4.0.0-rc.112
+      effect: ^4.0.0-rc.117
       redis: '>=5.0.0 <7.0.0'
 
   '@effect/tsgo-darwin-arm64@0.45.0':
@@ -915,36 +915,6 @@ packages:
     resolution: {integrity: sha512-YhHWdHfpFMQfd0prsEnxKeS3Qz3ytIGmsS0sth4KDjnacIT7hxk6hXHkJ9KysxlkvTM+WZAtQbbcUhdoP4Hvtw==}
     engines: {node: '>=20'}
 
-  '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.4':
-    resolution: {integrity: sha512-LCkGo6JDfaBhgST7UpPWgNgLINpcpabaHfyz5OBx75nUYxBsaEPxjnyNjWpeb/xBup/682QnBfRBy2/LvPutZQ==}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.4':
-    resolution: {integrity: sha512-zExlW9zUJKZH/tOtVMttwjKa4Xm/3KcNjnE3dPN92uCktwavMxpgCA3MoJK/DOnTWsQgo224OaST27/mPNAf+w==}
-    cpu: [x64]
-    os: [darwin]
-
-  '@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.4':
-    resolution: {integrity: sha512-dgX0P/9wGPJeHFBG+ZmhgE6bmtMt7NP5CRBGyyktpopdk/mW4POnrpQsSLtKI1dwpc+pPLuXHDh6vvskyQE/sw==}
-    cpu: [arm64]
-    os: [linux]
-
-  '@msgpackr-extract/msgpackr-extract-linux-arm@3.0.4':
-    resolution: {integrity: sha512-Tg3yX65f5GbtXLkrYEHE5oibZG9epyYWas7FogTTEJeDEF9JlXJzKgXaNhT3UXlTOeA+AfZpYZYZ0uPj7Cfquw==}
-    cpu: [arm]
-    os: [linux]
-
-  '@msgpackr-extract/msgpackr-extract-linux-x64@3.0.4':
-    resolution: {integrity: sha512-8TNXMEjJc3QEy7R/x1INhgiU+XakDAFUzBhaz7+Rbrs8NH5UQeHQxxmzsSBJGyV6I1jW79undiQm8tOI+D+8FQ==}
-    cpu: [x64]
-    os: [linux]
-
-  '@msgpackr-extract/msgpackr-extract-win32-x64@3.0.4':
-    resolution: {integrity: sha512-CmCXPQrkbwExx3j946/PtHWHbYJiCRBRDl4BlkRQcJB/YOwQxJRTpoo7aTsortjgoJ1x7opzTSxn7C+ASSLVjQ==}
-    cpu: [x64]
-    os: [win32]
-
   '@napi-rs/wasm-runtime@1.1.6':
     resolution: {integrity: sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==}
     peerDependencies:
@@ -1857,10 +1827,6 @@ packages:
     resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
     engines: {node: '>=6'}
 
-  detect-libc@2.1.2:
-    resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
-    engines: {node: '>=8'}
-
   devlop@1.1.0:
     resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
 
@@ -1871,15 +1837,15 @@ packages:
   ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
-  effect-rstest@https://pkg.pr.new/ScriptedAlchemy/effect-rstest@e5f8d5f:
-    resolution: {integrity: sha512-vAoaIALD1PEKZDHdX8RdFKzJQtV5FTTzmGt9+xSbjbCJyPX/yKXvL9kJlR9QjSXRxGwFcxy+v+QxEK2ja7JKpA==, tarball: https://pkg.pr.new/ScriptedAlchemy/effect-rstest@e5f8d5f}
+  effect-rstest@https://pkg.pr.new/ScriptedAlchemy/effect-rstest@cbbf87e:
+    resolution: {integrity: sha512-5+p2KfQ++ASE/jODKn7/WvTEJoLGA0EQNol/Y4yO1KsB46ZgPcwyjmS7CwmM5B7UxzB6LzbdmXmgpoE1sAfh6w==, tarball: https://pkg.pr.new/ScriptedAlchemy/effect-rstest@cbbf87e}
     version: 0.1.0
     peerDependencies:
       '@rstest/core': ^0.11.11
-      effect: ^4.0.0-rc.108
+      effect: ^4.0.0-rc.113
 
-  effect@4.0.0-rc.112:
-    resolution: {integrity: sha512-wXxwuh1Ywnv4cPRM3Wfa0vDwuOHnZ1TsTgHJkG9XgzND6inhBH9n1vBxhg3iIXOia/OrpmvVmd3lrD4vq6bF3A==}
+  effect@4.0.0-rc.117:
+    resolution: {integrity: sha512-UUyi9QiOW4nySFIBM3KnYbNMd9EZliOdKfBcyLD0mPMPheO2fkuXS5y0opjWc9oqzlJxPQICEGm8gGw3kh9j/w==}
 
   emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
@@ -1989,10 +1955,6 @@ packages:
   extend@3.0.2:
     resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
 
-  fast-check@4.9.0:
-    resolution: {integrity: sha512-7ms6T7SybUev/PQITciI0yLM2pOSFy5zpG8Ty7tQofcVaQUvrMXp6CBwqF6fThLCLOrfBtuHAtwq6Yu4XPCllg==}
-    engines: {node: '>=12.17.0'}
-
   fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
@@ -2557,11 +2519,6 @@ packages:
     resolution: {integrity: sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==}
     engines: {node: '>=18'}
 
-  mime@4.1.0:
-    resolution: {integrity: sha512-X5ju04+cAzsojXKes0B/S4tcYtFAJ6tTMuSPBEn9CPGlrWr8Fiw7qYeLT0XyH80HSoAoqWCaz+MWKh22P7G1cw==}
-    engines: {node: '>=16'}
-    hasBin: true
-
   minimatch@10.2.6:
     resolution: {integrity: sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==}
     engines: {node: 18 || 20 || >=22}
@@ -2577,13 +2534,6 @@ packages:
   ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
-  msgpackr-extract@3.0.4:
-    resolution: {integrity: sha512-4kmO/MdyUIkLIvTPr8VHLil4AtoKIoniWPIEk5+CDy0xnWC84azhSFmuJ7PxZdsYtiP5kEeQsORAVIeMgxT+Hw==}
-    hasBin: true
-
-  msgpackr@2.1.0:
-    resolution: {integrity: sha512-p/pBCVO63CsvvpkomUnNNag6+n38rULuDA6HHe70o2gtC8ODI52foF/4ko2qQcp6OiErJXTmrZeXmsGGHsIQNQ==}
-
   mz@2.7.0:
     resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
 
@@ -2595,10 +2545,6 @@ packages:
     resolution: {integrity: sha512-Z3lTE9pLaJF47NyMhd4ww1yFTAP8YhYI8SleJiHzM46Fgpm5cnNzSl9XfzFNqbaz+VlJrIj3fXQ4DeN1Rjm6cw==}
     engines: {node: '>=18'}
 
-  node-gyp-build-optional-packages@5.2.2:
-    resolution: {integrity: sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==}
-    hasBin: true
-
   npm-package-arg@14.0.0:
     resolution: {integrity: sha512-69XQh3k+dtGa1p+7RaR57IuG3rCko96xr/nUfN4yDYBXbTYICiWcOpsFKLN2GtGE9cyIljE+f1exnaYt9MvM+Q==}
     engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0}
@@ -2740,9 +2686,6 @@ packages:
     resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==}
     engines: {node: '>=6'}
 
-  pure-rand@8.4.2:
-    resolution: {integrity: sha512-vvuOGgcuPJAirlHvuQw1TrOiw7ptaIXXmIbNuiNOY6lNGJJH49PQ1Kj4nd783nPdQhQdicgOjVI2yI/9BD6/Ng==}
-
   qs@6.15.3:
     resolution: {integrity: sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==}
     engines: {node: '>=0.6'}
@@ -3154,8 +3097,8 @@ packages:
     resolution: {integrity: sha512-IDxfleLmmbSskfWSUATiN1nfn2rDuvnMOqb5CWR92iIfojA0Ud+ulOAAEQ57LPr9rWmsreUyf5lwyao+7GNNVw==}
     engines: {node: '>=20.18.1'}
 
-  undici@8.10.1:
-    resolution: {integrity: sha512-YQ3WlbqjYMmNpdvDH64jAgLjxuAR9+649calDWhbshYaeQGO2bR4nI94ORJmwI3J9YhoKQnpyGOK+0zlWS5N5Q==}
+  undici@8.11.0:
+    resolution: {integrity: sha512-AdzuGcAkzhbha3GgCSoUBx2P0quwym6qdFNCQz/fDGZc8w9XJ741wHUbt2kTmfPz+ZIOMkySFkiY7RXmiDDC8w==}
     engines: {node: '>=22.19.0'}
 
   unhead@2.1.17:
@@ -3473,30 +3416,29 @@ snapshots:
   '@colors/colors@1.5.0':
     optional: true
 
-  '@effect/atom-react@4.0.0-rc.112(effect@4.0.0-rc.112)(react@19.3.0)(scheduler@0.27.0)':
+  '@effect/atom-react@4.0.0-rc.117(effect@4.0.0-rc.117)(react@19.3.0)(scheduler@0.27.0)':
     dependencies:
-      effect: 4.0.0-rc.112
+      effect: 4.0.0-rc.117
       react: 19.3.0
       scheduler: 0.27.0
 
   '@effect/language-service@0.87.2': {}
 
-  '@effect/platform-node-shared@4.0.0-rc.112(effect@4.0.0-rc.112)':
+  '@effect/platform-node-shared@4.0.0-rc.117(effect@4.0.0-rc.117)':
     dependencies:
       '@types/ws': 8.18.1
-      effect: 4.0.0-rc.112
+      effect: 4.0.0-rc.117
       ws: 8.21.3
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
 
-  '@effect/platform-node@4.0.0-rc.112(effect@4.0.0-rc.112)(redis@6.2.1)':
+  '@effect/platform-node@4.0.0-rc.117(effect@4.0.0-rc.117)(redis@6.2.1)':
     dependencies:
-      '@effect/platform-node-shared': 4.0.0-rc.112(effect@4.0.0-rc.112)
-      effect: 4.0.0-rc.112
-      mime: 4.1.0
+      '@effect/platform-node-shared': 4.0.0-rc.117(effect@4.0.0-rc.117)
+      effect: 4.0.0-rc.117
       redis: 6.2.1
-      undici: 8.10.1
+      undici: 8.11.0
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
@@ -3740,24 +3682,6 @@ snapshots:
       '@modelcontextprotocol/core': 2.0.0
       zod: 4.6.4
 
-  '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.4':
-    optional: true
-
-  '@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.4':
-    optional: true
-
-  '@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.4':
-    optional: true
-
-  '@msgpackr-extract/msgpackr-extract-linux-arm@3.0.4':
-    optional: true
-
-  '@msgpackr-extract/msgpackr-extract-linux-x64@3.0.4':
-    optional: true
-
-  '@msgpackr-extract/msgpackr-extract-win32-x64@3.0.4':
-    optional: true
-
   '@napi-rs/wasm-runtime@1.1.6(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)':
     dependencies:
       '@emnapi/core': 1.11.3
@@ -4590,9 +4514,6 @@ snapshots:
 
   dequal@2.0.3: {}
 
-  detect-libc@2.1.2:
-    optional: true
-
   devlop@1.1.0:
     dependencies:
       dequal: 2.0.3
@@ -4605,15 +4526,12 @@ snapshots:
 
   ee-first@1.1.1: {}
 
-  effect-rstest@https://pkg.pr.new/ScriptedAlchemy/effect-rstest@e5f8d5f(@rstest/core@0.11.12)(effect@4.0.0-rc.112):
+  effect-rstest@https://pkg.pr.new/ScriptedAlchemy/effect-rstest@cbbf87e(@rstest/core@0.11.12)(effect@4.0.0-rc.117):
     dependencies:
       '@rstest/core': 0.11.12
-      effect: 4.0.0-rc.112
+      effect: 4.0.0-rc.117
 
-  effect@4.0.0-rc.112:
-    dependencies:
-      fast-check: 4.9.0
-      msgpackr: 2.1.0
+  effect@4.0.0-rc.117: {}
 
   emoji-regex@8.0.0: {}
 
@@ -4758,10 +4676,6 @@ snapshots:
 
   extend@3.0.2: {}
 
-  fast-check@4.9.0:
-    dependencies:
-      pure-rand: 8.4.2
-
   fast-deep-equal@3.1.3: {}
 
   fast-glob@3.3.3:
@@ -5634,8 +5548,6 @@ snapshots:
     dependencies:
       mime-db: 1.54.0
 
-  mime@4.1.0: {}
-
   minimatch@10.2.6:
     dependencies:
       brace-expansion: 5.0.9
@@ -5646,22 +5558,6 @@ snapshots:
 
   ms@2.1.3: {}
 
-  msgpackr-extract@3.0.4:
-    dependencies:
-      node-gyp-build-optional-packages: 5.2.2
-    optionalDependencies:
-      '@msgpackr-extract/msgpackr-extract-darwin-arm64': 3.0.4
-      '@msgpackr-extract/msgpackr-extract-darwin-x64': 3.0.4
-      '@msgpackr-extract/msgpackr-extract-linux-arm': 3.0.4
-      '@msgpackr-extract/msgpackr-extract-linux-arm64': 3.0.4
-      '@msgpackr-extract/msgpackr-extract-linux-x64': 3.0.4
-      '@msgpackr-extract/msgpackr-extract-win32-x64': 3.0.4
-    optional: true
-
-  msgpackr@2.1.0:
-    optionalDependencies:
-      msgpackr-extract: 3.0.4
-
   mz@2.7.0:
     dependencies:
       any-promise: 1.3.0
@@ -5679,11 +5575,6 @@ snapshots:
       emojilib: 2.4.0
       skin-tone: 2.0.0
 
-  node-gyp-build-optional-packages@5.2.2:
-    dependencies:
-      detect-libc: 2.1.2
-    optional: true
-
   npm-package-arg@14.0.0:
     dependencies:
       hosted-git-info: 10.1.1
@@ -5812,8 +5703,6 @@ snapshots:
 
   punycode.js@2.3.1: {}
 
-  pure-rand@8.4.2: {}
-
   qs@6.15.3:
     dependencies:
       es-define-property: 1.0.1
@@ -6309,7 +6198,7 @@ snapshots:
 
   undici@7.29.0: {}
 
-  undici@8.10.1: {}
+  undici@8.11.0: {}
 
   unhead@2.1.17:
     dependencies:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index f84740768..8d84a7147 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -20,7 +20,6 @@ overrides:
   'typedoc>typescript': npm:typescript@6.0.3
 allowBuilds:
   '@google/genai': false
-  msgpackr-extract: false
   protobufjs: false
 # LocalProvider.init() awaits FlexSearch addAsync so the first search query
 # cannot race the index build (#590; upstream web-infra-dev/rspress#3658).
diff --git a/repos/effect/.changeset/config.json b/repos/effect/.changeset/config.json
index 0a755e5f0..2b10fe8a6 100644
--- a/repos/effect/.changeset/config.json
+++ b/repos/effect/.changeset/config.json
@@ -17,6 +17,7 @@
       "effect",
       "@effect/ai-anthropic",
       "@effect/ai-openai",
+      "@effect/ai-typesafe",
       "@effect/ai-openai-compat",
       "@effect/ai-openrouter",
       "@effect/atom-react",
diff --git a/repos/effect/.changeset/exact-byte-size.md b/repos/effect/.changeset/exact-byte-size.md
deleted file mode 100644
index 2442670a7..000000000
--- a/repos/effect/.changeset/exact-byte-size.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"effect": patch
----
-
-Add an exact `ByteSize` value module with unambiguous decimal (`kB`, `MB`) and binary (`KiB`, `MiB`) units, parsing, formatting, checked arithmetic, and safe number conversion. Add `Schema.ByteSize*` codecs and `Config.ByteSize` for exact non-negative bigint-backed byte counts.
diff --git a/repos/effect/.changeset/pre/add-schema-compilers.md b/repos/effect/.changeset/pre/add-schema-compilers.md
new file mode 100644
index 000000000..5a88e849b
--- /dev/null
+++ b/repos/effect/.changeset/pre/add-schema-compilers.md
@@ -0,0 +1,48 @@
+---
+"effect": patch
+---
+
+Add experimental JIT and AOT schema compilers that work through the existing
+`SchemaParser` APIs and share a decoder registry. Enable JIT globally with
+`effect/unstable/schema/SchemaJITCompiler/enable`, selectively with
+`SchemaJITCompiler.enable(ast)`, or install generated AOT decoders without
+requiring dynamic function construction. The new
+`effect/unstable/schema/SchemaAOTCompiler/Build` entrypoint discovers direct
+Schema exports from explicit module loaders and writes a self-installing AOT
+module through Effect's `FileSystem` and `Path` services. Compiled decoders can
+provide optional synchronous `decode` and `make` operations; normal
+`SchemaParser` calls consume them transparently and retain `decodeEffect` and
+`makeEffect` as the detailed fallbacks. AOT targets declare the operations to
+prepare, so generated modules contain only those operation families and use
+the interpreter if an omitted operation is later called.
+
+### Breaking changes
+
+`SchemaGetter.Getter` is now a tagged union that distinguishes synchronous,
+optional, and effectful transformations. Getter values now expose only `pipe`.
+Use the dual `SchemaGetter.map`, `SchemaGetter.compose`, and `SchemaGetter.run`
+functions instead of the former methods. Keeping these operations standalone
+lets bundlers remove composition code when an application does not use it.
+
+The public `Getter` constructor is removed. Use
+`SchemaGetter.transformOptionalEffect` instead of `new SchemaGetter.Getter`.
+`SchemaGetter.onSome` and `SchemaGetter.onNone` are also removed. Use
+`transformEffect` for an effectful transformation of present values and
+`transformOptionalEffect` when the transformation handles missing values.
+
+`Transformation#compose` is replaced by the dual standalone function
+`SchemaTransformation.composeTransformation`. Replace `first.compose(second)`
+with `SchemaTransformation.composeTransformation(first, second)` or
+`SchemaTransformation.composeTransformation(second)(first)`.
+
+`SchemaTransformation.make` is renamed to
+`SchemaTransformation.makeTransformation`. `SchemaTransformation.Transformation`
+and `SchemaTransformation.Middleware` now implement `Pipeable`, so both values
+can be passed through standalone combinators with `.pipe(...)`.
+
+`SchemaAST.Context.constructorDefault` now stores the constructor-default
+`Effect` directly instead of wrapping it in a `SchemaAST.Link`. Constructor
+defaults apply only during construction, so the direct representation avoids
+giving them encoding semantics and lets construction reuse already-completed
+synchronous Effects. Code that constructs or inspects `SchemaAST.Context`
+should pass or read the default `Effect` directly.
diff --git a/repos/effect/.changeset/pre/ai-approved-tool-results.md b/repos/effect/.changeset/pre/ai-approved-tool-results.md
new file mode 100644
index 000000000..203cf0284
--- /dev/null
+++ b/repos/effect/.changeset/pre/ai-approved-tool-results.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Retain completed tool approval results in non-streaming responses so Chat records them and does not replay approved tools on later turns.
diff --git a/repos/effect/.changeset/pre/ai-decision-model.md b/repos/effect/.changeset/pre/ai-decision-model.md
new file mode 100644
index 000000000..e6450a36c
--- /dev/null
+++ b/repos/effect/.changeset/pre/ai-decision-model.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Add `Decision` and `DecisionModel` to `effect/unstable/ai` for batched classification, rating, and probability estimates over schema-encoded input.
diff --git a/repos/effect/.changeset/align-type-id-paths.md b/repos/effect/.changeset/pre/align-type-id-paths.md
similarity index 100%
rename from repos/effect/.changeset/align-type-id-paths.md
rename to repos/effect/.changeset/pre/align-type-id-paths.md
diff --git a/repos/effect/.changeset/pre/all-union-record-channels.md b/repos/effect/.changeset/pre/all-union-record-channels.md
new file mode 100644
index 000000000..ddafd3ab6
--- /dev/null
+++ b/repos/effect/.changeset/pre/all-union-record-channels.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Effect.all` to retain errors and required services from every branch of a union of record inputs.
diff --git a/repos/effect/.changeset/pre/anthropic-image-strings.md b/repos/effect/.changeset/pre/anthropic-image-strings.md
new file mode 100644
index 000000000..7cb1c1467
--- /dev/null
+++ b/repos/effect/.changeset/pre/anthropic-image-strings.md
@@ -0,0 +1,5 @@
+---
+"@effect/ai-anthropic": patch
+---
+
+Preserve base64 image strings in Anthropic requests.
diff --git a/repos/effect/.changeset/pre/anthropic-strict-json-schema.md b/repos/effect/.changeset/pre/anthropic-strict-json-schema.md
new file mode 100644
index 000000000..9a1caae53
--- /dev/null
+++ b/repos/effect/.changeset/pre/anthropic-strict-json-schema.md
@@ -0,0 +1,5 @@
+---
+"@effect/ai-anthropic": patch
+---
+
+Exclude the provider-only `strictJsonSchema` option from Anthropic Messages request bodies while preserving its control over tool strictness.
diff --git a/repos/effect/.changeset/pre/anthropic-structured-output-fallback.md b/repos/effect/.changeset/pre/anthropic-structured-output-fallback.md
new file mode 100644
index 000000000..3ed06de12
--- /dev/null
+++ b/repos/effect/.changeset/pre/anthropic-structured-output-fallback.md
@@ -0,0 +1,5 @@
+---
+"@effect/ai-anthropic": patch
+---
+
+Fix non-native structured output generation by always requesting the response tool and excluding accompanying prose when decoding its JSON payload.
diff --git a/repos/effect/.changeset/pre/arbitrary-array-shrinking.md b/repos/effect/.changeset/pre/arbitrary-array-shrinking.md
new file mode 100644
index 000000000..7df992f6e
--- /dev/null
+++ b/repos/effect/.changeset/pre/arbitrary-array-shrinking.md
@@ -0,0 +1,9 @@
+---
+"effect": patch
+---
+
+Add `Arbitrary.array(item, { minLength, maxLength })` for variable-length arrays of custom Arbitraries. Shrinking removes blocks of commands while preserving the remaining values and their order, and also simplifies individual elements.
+
+Schema-derived arrays now also try removing prefixes and interior blocks. Shrinking composed values and Schema objects preserves child candidates that were previously lost when exploring another branch.
+
+Shrunk results and replay paths may change from earlier native releases. Re-run affected properties to obtain new replay tokens, and preserve important failing inputs as regression tests.
diff --git a/repos/effect/.changeset/pre/arbitrary-index-constraints.md b/repos/effect/.changeset/pre/arbitrary-index-constraints.md
new file mode 100644
index 000000000..9cff5c7da
--- /dev/null
+++ b/repos/effect/.changeset/pre/arbitrary-index-constraints.md
@@ -0,0 +1,7 @@
+---
+"effect": patch
+---
+
+Fix `Arbitrary.schema` to respect applicable index signatures when generating and shrinking object properties, including fixed fields in `Schema.StructWithRest` and overlapping records.
+
+Combine compatible string, number, and bigint constraints during generation so cases such as a `String` field constrained by a `NonEmptyString` record remain productive at size zero. Other intersections are validated and may exhaust the discard budget.
diff --git a/repos/effect/.changeset/pre/array-ensure-array-elements.md b/repos/effect/.changeset/pre/array-ensure-array-elements.md
new file mode 100644
index 000000000..762cc5afa
--- /dev/null
+++ b/repos/effect/.changeset/pre/array-ensure-array-elements.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Schema.ArrayEnsure` to preserve array-valued element branches and outer-array encoding cardinality.
diff --git a/repos/effect/.changeset/pre/atom-rpc-query-requires.md b/repos/effect/.changeset/pre/atom-rpc-query-requires.md
new file mode 100644
index 000000000..7169977a4
--- /dev/null
+++ b/repos/effect/.changeset/pre/atom-rpc-query-requires.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `AtomRpc.query` returning `never` for RPCs whose middleware declares service `requires`. The return-type conditional now infers all six `Rpc` type parameters, matching `mutation` and every utility in `Rpc`.
diff --git a/repos/effect/.changeset/pre/atom-solid-idle-ttl.md b/repos/effect/.changeset/pre/atom-solid-idle-ttl.md
new file mode 100644
index 000000000..e7a9989e5
--- /dev/null
+++ b/repos/effect/.changeset/pre/atom-solid-idle-ttl.md
@@ -0,0 +1,5 @@
+---
+"@effect/atom-solid": patch
+---
+
+Allow `RegistryProvider` to leave `defaultIdleTTL` undefined, matching the React binding and enabling immediate cleanup of unused atoms unless a TTL is explicitly configured.
diff --git a/repos/effect/.changeset/pre/bound-cluster-registration-waits.md b/repos/effect/.changeset/pre/bound-cluster-registration-waits.md
new file mode 100644
index 000000000..52ee07553
--- /dev/null
+++ b/repos/effect/.changeset/pre/bound-cluster-registration-waits.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Bound local sends that wait for an unregistered cluster entity type. These sends now fail with an `Entity type ... not registered` defect at the shared runner registration deadline. Once that startup deadline has elapsed, sends to not-yet-registered dynamic entity types fail immediately.
diff --git a/repos/effect/.changeset/bright-mimes-leave.md b/repos/effect/.changeset/pre/bright-mimes-leave.md
similarity index 100%
rename from repos/effect/.changeset/bright-mimes-leave.md
rename to repos/effect/.changeset/pre/bright-mimes-leave.md
diff --git a/repos/effect/.changeset/bright-sockets-connect.md b/repos/effect/.changeset/pre/bright-sockets-connect.md
similarity index 100%
rename from repos/effect/.changeset/bright-sockets-connect.md
rename to repos/effect/.changeset/pre/bright-sockets-connect.md
diff --git a/repos/effect/.changeset/pre/browser-crypto-missing-subtle.md b/repos/effect/.changeset/pre/browser-crypto-missing-subtle.md
new file mode 100644
index 000000000..0fedd8a2b
--- /dev/null
+++ b/repos/effect/.changeset/pre/browser-crypto-missing-subtle.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-browser": patch
+---
+
+Return a typed `PlatformError` from `BrowserCrypto` digest operations when `crypto.subtle` is unavailable, instead of failing with a defect.
diff --git a/repos/effect/.changeset/pre/browser-indexeddb-binary-key-existence.md b/repos/effect/.changeset/pre/browser-indexeddb-binary-key-existence.md
new file mode 100644
index 000000000..c5462e706
--- /dev/null
+++ b/repos/effect/.changeset/pre/browser-indexeddb-binary-key-existence.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-browser": patch
+---
+
+Fix `BrowserKeyValueStore.layerIndexedDb` to report keys containing `Uint8Array` values from `has`.
diff --git a/repos/effect/.changeset/pre/browser-runtime-custom-teardown.md b/repos/effect/.changeset/pre/browser-runtime-custom-teardown.md
new file mode 100644
index 000000000..443d692f7
--- /dev/null
+++ b/repos/effect/.changeset/pre/browser-runtime-custom-teardown.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-browser": patch
+---
+
+Invoke custom `BrowserRuntime.runMain` teardown callbacks when the main effect completes, and remove the `pagehide` listener once the main fiber finishes.
diff --git a/repos/effect/.changeset/pre/bun-http-server-unix-address.md b/repos/effect/.changeset/pre/bun-http-server-unix-address.md
new file mode 100644
index 000000000..b5abe92de
--- /dev/null
+++ b/repos/effect/.changeset/pre/bun-http-server-unix-address.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-bun": patch
+---
+
+Report Unix socket addresses from Bun HTTP servers.
diff --git a/repos/effect/.changeset/pre/bun-stream-preserve-failure.md b/repos/effect/.changeset/pre/bun-stream-preserve-failure.md
new file mode 100644
index 000000000..c5756f3ee
--- /dev/null
+++ b/repos/effect/.changeset/pre/bun-stream-preserve-failure.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-bun": patch
+---
+
+Preserve mapped errors from Bun readable streams.
diff --git a/repos/effect/.changeset/pre/cache-invalidate-when-replacement.md b/repos/effect/.changeset/pre/cache-invalidate-when-replacement.md
new file mode 100644
index 000000000..b8b861c28
--- /dev/null
+++ b/repos/effect/.changeset/pre/cache-invalidate-when-replacement.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Cache.invalidateWhen` and `ScopedCache.invalidateWhen` deleting a replacement entry while waiting for an earlier lookup.
diff --git a/repos/effect/.changeset/pre/cache-refresh-cancellation-ownership.md b/repos/effect/.changeset/pre/cache-refresh-cancellation-ownership.md
new file mode 100644
index 000000000..7ad98b91c
--- /dev/null
+++ b/repos/effect/.changeset/pre/cache-refresh-cancellation-ownership.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix interruption of `Cache.refresh` for a missing key removing a newer value written by `Cache.set`.
diff --git a/repos/effect/.changeset/pre/cache-refresh-capacity.md b/repos/effect/.changeset/pre/cache-refresh-capacity.md
new file mode 100644
index 000000000..d03ac1d50
--- /dev/null
+++ b/repos/effect/.changeset/pre/cache-refresh-capacity.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Cache.refresh` and `ScopedCache.refresh` exceeding capacity when an existing key is evicted while its refresh is in progress. Publishing the refreshed entry now evicts older entries as needed, releasing their resources in `ScopedCache`.
diff --git a/repos/effect/.changeset/pre/cache-refresh-zero-ttl-ownership.md b/repos/effect/.changeset/pre/cache-refresh-zero-ttl-ownership.md
new file mode 100644
index 000000000..06f9ee7f2
--- /dev/null
+++ b/repos/effect/.changeset/pre/cache-refresh-zero-ttl-ownership.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Cache.refresh` for an initially missing key deleting a newer cached value when the refresh completes with zero time to live.
diff --git a/repos/effect/.changeset/pre/cache-synchronous-interruption.md b/repos/effect/.changeset/pre/cache-synchronous-interruption.md
new file mode 100644
index 000000000..23fde1c27
--- /dev/null
+++ b/repos/effect/.changeset/pre/cache-synchronous-interruption.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Prevent `Cache` from retaining synchronously interrupted lookups.
diff --git a/repos/effect/.changeset/pre/cached-with-ttl-callback.md b/repos/effect/.changeset/pre/cached-with-ttl-callback.md
new file mode 100644
index 000000000..af20cb464
--- /dev/null
+++ b/repos/effect/.changeset/pre/cached-with-ttl-callback.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Allow `Effect.cachedWithTTL` to compute the TTL from each completed `Exit`, so successes and failures can use different cache durations.
diff --git a/repos/effect/.changeset/pre/calm-ducks-fail.md b/repos/effect/.changeset/pre/calm-ducks-fail.md
new file mode 100644
index 000000000..7c801d321
--- /dev/null
+++ b/repos/effect/.changeset/pre/calm-ducks-fail.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-node-shared": patch
+---
+
+Wake `NodeStream.pipeThroughDuplex` readers when the upstream fails so the original error is propagated instead of hanging.
diff --git a/repos/effect/.changeset/pre/calm-headers-hide.md b/repos/effect/.changeset/pre/calm-headers-hide.md
new file mode 100644
index 000000000..0e3cff5d5
--- /dev/null
+++ b/repos/effect/.changeset/pre/calm-headers-hide.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Respect custom HTTP header redaction when recording server span attributes.
diff --git a/repos/effect/.changeset/pre/calm-olives-nest.md b/repos/effect/.changeset/pre/calm-olives-nest.md
new file mode 100644
index 000000000..50f337788
--- /dev/null
+++ b/repos/effect/.changeset/pre/calm-olives-nest.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-sqlite-do": patch
+---
+
+Support nested transactions with independent child rollback.
diff --git a/repos/effect/.changeset/calm-readers-transact.md b/repos/effect/.changeset/pre/calm-readers-transact.md
similarity index 100%
rename from repos/effect/.changeset/calm-readers-transact.md
rename to repos/effect/.changeset/pre/calm-readers-transact.md
diff --git a/repos/effect/.changeset/calm-trees-generate.md b/repos/effect/.changeset/pre/calm-trees-generate.md
similarity index 100%
rename from repos/effect/.changeset/calm-trees-generate.md
rename to repos/effect/.changeset/pre/calm-trees-generate.md
diff --git a/repos/effect/.changeset/pre/canonical-internet-addresses.md b/repos/effect/.changeset/pre/canonical-internet-addresses.md
new file mode 100644
index 000000000..7d5cd8cc5
--- /dev/null
+++ b/repos/effect/.changeset/pre/canonical-internet-addresses.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Extend `NetAddress.toCanonical` to accept internet addresses. IPv4-mapped IPv6 addresses become IPv4 while retaining the port. Other addresses retain their identity and IPv6 scope metadata.
diff --git a/repos/effect/.changeset/pre/catch-stream-channel-defects.md b/repos/effect/.changeset/pre/catch-stream-channel-defects.md
new file mode 100644
index 000000000..6757799f4
--- /dev/null
+++ b/repos/effect/.changeset/pre/catch-stream-channel-defects.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Add `Stream.catchDefect` and `Channel.catchDefect` for recovering from defects without catching typed failures or interruptions.
diff --git a/repos/effect/.changeset/pre/channel-rundone-completion.md b/repos/effect/.changeset/pre/channel-rundone-completion.md
new file mode 100644
index 000000000..c0a74a290
--- /dev/null
+++ b/repos/effect/.changeset/pre/channel-rundone-completion.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Remove `Channel.runDone`; use `Channel.runDrain` to consume all output and return the completion value.
diff --git a/repos/effect/.changeset/pre/child-process-astral-escape-arguments.md b/repos/effect/.changeset/pre/child-process-astral-escape-arguments.md
new file mode 100644
index 000000000..f68fd0049
--- /dev/null
+++ b/repos/effect/.changeset/pre/child-process-astral-escape-arguments.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve astral Unicode escapes and following arguments in `ChildProcess.make` and `ChildProcess.prefix` template literals.
diff --git a/repos/effect/.changeset/pre/childprocess-process-group-wait.md b/repos/effect/.changeset/pre/childprocess-process-group-wait.md
new file mode 100644
index 000000000..0a6f55a4e
--- /dev/null
+++ b/repos/effect/.changeset/pre/childprocess-process-group-wait.md
@@ -0,0 +1,10 @@
+---
+"@effect/platform-node-shared": patch
+"effect": patch
+---
+
+Wait for Node child process groups to exit during scoped release and `kill`.
+
+After signalling a process group, both operations now wait for its leader and descendants. Without `forceKillAfter`, the wait is limited to one second and never escalates. With `forceKillAfter`, the group receives `SIGKILL` at the deadline, followed by a final wait of up to one second. Native timers keep escalation working under a `TestClock`, and cleanup no longer depends on stdio closing.
+
+`exitCode` and `isRunning` remain tied to the leader's exit, and a leader that already exited successfully still leaves its group untouched. Process group checks count zombies, so cleanup may wait for the full bound under a non-reaping PID 1.
diff --git a/repos/effect/.changeset/pre/chunk-slice-concatenation.md b/repos/effect/.changeset/pre/chunk-slice-concatenation.md
new file mode 100644
index 000000000..593f5c2a6
--- /dev/null
+++ b/repos/effect/.changeset/pre/chunk-slice-concatenation.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Chunk` concatenation to preserve sliced elements.
diff --git a/repos/effect/.changeset/clean-config-names.md b/repos/effect/.changeset/pre/clean-config-names.md
similarity index 100%
rename from repos/effect/.changeset/clean-config-names.md
rename to repos/effect/.changeset/pre/clean-config-names.md
diff --git a/repos/effect/.changeset/clean-yaks-parse.md b/repos/effect/.changeset/pre/clean-yaks-parse.md
similarity index 100%
rename from repos/effect/.changeset/clean-yaks-parse.md
rename to repos/effect/.changeset/pre/clean-yaks-parse.md
diff --git a/repos/effect/.changeset/pre/cleanup-before-use-callbacks.md b/repos/effect/.changeset/pre/cleanup-before-use-callbacks.md
new file mode 100644
index 000000000..414cb54e6
--- /dev/null
+++ b/repos/effect/.changeset/pre/cleanup-before-use-callbacks.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Ensure `Effect.acquireUseRelease` releases an acquired resource and `Effect.useSpan` ends its span when the use callback throws before returning an effect. The thrown exception remains a defect, but no longer skips cleanup.
diff --git a/repos/effect/.changeset/pre/cleanup-successful-process-groups.md b/repos/effect/.changeset/pre/cleanup-successful-process-groups.md
new file mode 100644
index 000000000..384fb153e
--- /dev/null
+++ b/repos/effect/.changeset/pre/cleanup-successful-process-groups.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-node-shared": patch
+---
+
+Clean up referenced POSIX process groups on scope closure after their leader exits successfully or is terminated by a signal.
diff --git a/repos/effect/.changeset/pre/clear-wings-relax.md b/repos/effect/.changeset/pre/clear-wings-relax.md
new file mode 100644
index 000000000..526b3bc30
--- /dev/null
+++ b/repos/effect/.changeset/pre/clear-wings-relax.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+use `new` instantiation for streams
diff --git a/repos/effect/.changeset/pre/cli-completion-command-aliases.md b/repos/effect/.changeset/pre/cli-completion-command-aliases.md
new file mode 100644
index 000000000..00d824e98
--- /dev/null
+++ b/repos/effect/.changeset/pre/cli-completion-command-aliases.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve flags and nested commands when completing a CLI subcommand through its alias.
diff --git a/repos/effect/.changeset/pre/cli-completion-shared-flags.md b/repos/effect/.changeset/pre/cli-completion-shared-flags.md
new file mode 100644
index 000000000..9e27bd98d
--- /dev/null
+++ b/repos/effect/.changeset/pre/cli-completion-shared-flags.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Include inherited shared flags in descendant CLI completions.
diff --git a/repos/effect/.changeset/pre/cli-key-value-pair-first-separator.md b/repos/effect/.changeset/pre/cli-key-value-pair-first-separator.md
new file mode 100644
index 000000000..d8241fd5a
--- /dev/null
+++ b/repos/effect/.changeset/pre/cli-key-value-pair-first-separator.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Allow `=` in values parsed by `Primitive.keyValuePair`, `Flag.keyValuePair`, and `Param.keyValuePair` in `effect/unstable/cli`.
diff --git a/repos/effect/.changeset/pre/cli-no-color-values.md b/repos/effect/.changeset/pre/cli-no-color-values.md
new file mode 100644
index 000000000..084859b63
--- /dev/null
+++ b/repos/effect/.changeset/pre/cli-no-color-values.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Disable CLI formatter colors for every non-empty `NO_COLOR` value.
diff --git a/repos/effect/.changeset/pre/cli-optional-alternative-flags.md b/repos/effect/.changeset/pre/cli-optional-alternative-flags.md
new file mode 100644
index 000000000..743c995ff
--- /dev/null
+++ b/repos/effect/.changeset/pre/cli-optional-alternative-flags.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Allow optional alternative CLI flags.
diff --git a/repos/effect/.changeset/pre/cli-scalar-constructor-names.md b/repos/effect/.changeset/pre/cli-scalar-constructor-names.md
new file mode 100644
index 000000000..e5476bb8a
--- /dev/null
+++ b/repos/effect/.changeset/pre/cli-scalar-constructor-names.md
@@ -0,0 +1,27 @@
+---
+"effect": patch
+---
+
+Rename CLI constructors to PascalCase, aligning scalar names with `Schema` and `Config`. This is a breaking change; parsing behavior is unchanged.
+
+In `Primitive`, `Param`, `Flag`, and `Argument`, capitalize existing constructor names, with these exceptions:
+
+| Previous  | New        | Modules               |
+| --------- | ---------- | --------------------- |
+| `integer` | `Int`      | All four              |
+| `float`   | `Finite`   | All four              |
+| `none`    | `Never`    | All four              |
+| `choice`  | `Literals` | Param, Flag, Argument |
+
+`Primitive.choice` becomes `Primitive.Choice`; `choiceWithValue` becomes `ChoiceWithValue` where available.
+
+In `Prompt`, capitalize control constructors except `text` → `String`, `integer` → `Int`, and `float` → `Number`. Rename public types `IntegerOptions` → `IntOptions` and `FloatOptions` → `NumberOptions`. Shared `TextOptions` is unchanged. `Prompt.Number` retains its existing parser, without a finite-number restriction.
+
+In `GlobalFlag`, rename `action` → `Action` and `setting` → `Setting`. Factories and combinators, including `Command.make` and `Prompt.succeed`, keep their names.
+
+Update public `_tag` matches and completion descriptors:
+
+- `Primitive`: `"Integer"` → `"Int"`, `"Float"` → `"Finite"`, `"None"` → `"Never"`.
+- `Completions.FlagType` and `Completions.ArgumentType`: `"Integer"` → `"Int"`, `"Float"` → `"Finite"`.
+
+Sentinels still always fail; their internal parameter name is now `"__never__"`. Help labels and completion scripts are unchanged.
diff --git a/repos/effect/.changeset/pre/cli-variadic-absence-defaults.md b/repos/effect/.changeset/pre/cli-variadic-absence-defaults.md
new file mode 100644
index 000000000..7f3f05e30
--- /dev/null
+++ b/repos/effect/.changeset/pre/cli-variadic-absence-defaults.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix defaulted variadic arguments when omitted.
diff --git a/repos/effect/.changeset/pre/cli-wizard-option-looking-values.md b/repos/effect/.changeset/pre/cli-wizard-option-looking-values.md
new file mode 100644
index 000000000..852a59382
--- /dev/null
+++ b/repos/effect/.changeset/pre/cli-wizard-option-looking-values.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix CLI wizard handling of negative numbers and other flag values beginning with `-`.
diff --git a/repos/effect/.changeset/pre/clickhouse-compiler-dialect.md b/repos/effect/.changeset/pre/clickhouse-compiler-dialect.md
new file mode 100644
index 000000000..0af5bad5e
--- /dev/null
+++ b/repos/effect/.changeset/pre/clickhouse-compiler-dialect.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-clickhouse": patch
+---
+
+Mark the ClickHouse statement compiler with the ClickHouse dialect so dialect-specific SQL fragments select the correct branch.
diff --git a/repos/effect/.changeset/pre/clickhouse-ping-check.md b/repos/effect/.changeset/pre/clickhouse-ping-check.md
new file mode 100644
index 000000000..0dca4a3a4
--- /dev/null
+++ b/repos/effect/.changeset/pre/clickhouse-ping-check.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-clickhouse": patch
+---
+
+Use ClickHouse's `ping()` endpoint for connection validation and map failed health checks to `SqlError` values.
diff --git a/repos/effect/.changeset/cluster-active-teardowns.md b/repos/effect/.changeset/pre/cluster-active-teardowns.md
similarity index 100%
rename from repos/effect/.changeset/cluster-active-teardowns.md
rename to repos/effect/.changeset/pre/cluster-active-teardowns.md
diff --git a/repos/effect/.changeset/pre/cluster-reply-codec-services.md b/repos/effect/.changeset/pre/cluster-reply-codec-services.md
new file mode 100644
index 000000000..1ee7d1c8f
--- /dev/null
+++ b/repos/effect/.changeset/pre/cluster-reply-codec-services.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Reply.Reply` codecs to require client services when decoding and server services when encoding.
diff --git a/repos/effect/.changeset/pre/cluster-reset-claims.md b/repos/effect/.changeset/pre/cluster-reset-claims.md
new file mode 100644
index 000000000..1f8143ff5
--- /dev/null
+++ b/repos/effect/.changeset/pre/cluster-reset-claims.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix cluster workflows stalling after request resets.
diff --git a/repos/effect/.changeset/cold-shards-continue.md b/repos/effect/.changeset/pre/cold-shards-continue.md
similarity index 100%
rename from repos/effect/.changeset/cold-shards-continue.md
rename to repos/effect/.changeset/pre/cold-shards-continue.md
diff --git a/repos/effect/.changeset/pre/compatible-dependency-refresh.md b/repos/effect/.changeset/pre/compatible-dependency-refresh.md
new file mode 100644
index 000000000..a2d211be4
--- /dev/null
+++ b/repos/effect/.changeset/pre/compatible-dependency-refresh.md
@@ -0,0 +1,8 @@
+---
+"@effect/platform-node": patch
+"@effect/sql-libsql": patch
+"@effect/sql-mysql2": patch
+"@effect/doctest": patch
+---
+
+Update dependencies to their latest compatible versions.
diff --git a/repos/effect/.changeset/pre/context-saved-getter-inference.md b/repos/effect/.changeset/pre/context-saved-getter-inference.md
new file mode 100644
index 000000000..c3028f360
--- /dev/null
+++ b/repos/effect/.changeset/pre/context-saved-getter-inference.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix saved curried `Context.get` calls incorrectly inferring their required service as `unknown`.
diff --git a/repos/effect/.changeset/pre/cookies-error-tag.md b/repos/effect/.changeset/pre/cookies-error-tag.md
new file mode 100644
index 000000000..c523bca08
--- /dev/null
+++ b/repos/effect/.changeset/pre/cookies-error-tag.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix the `CookiesError` tag in `effect/unstable/http` from `CookieError` to `CookiesError` to match the class name.
diff --git a/repos/effect/.changeset/pre/crypto-ulid.md b/repos/effect/.changeset/pre/crypto-ulid.md
new file mode 100644
index 000000000..2da81d868
--- /dev/null
+++ b/repos/effect/.changeset/pre/crypto-ulid.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Add `Crypto.randomULID` to generate ULIDs from the current `Clock` timestamp and cryptographically secure random bytes.
diff --git a/repos/effect/.changeset/pre/curvy-falcons-listen.md b/repos/effect/.changeset/pre/curvy-falcons-listen.md
new file mode 100644
index 000000000..5f3419fd7
--- /dev/null
+++ b/repos/effect/.changeset/pre/curvy-falcons-listen.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Add validated multicast address refinements for IP and MAC addresses.
diff --git a/repos/effect/.changeset/pre/d1-raw-native-results.md b/repos/effect/.changeset/pre/d1-raw-native-results.md
new file mode 100644
index 000000000..5441b86d1
--- /dev/null
+++ b/repos/effect/.changeset/pre/d1-raw-native-results.md
@@ -0,0 +1,7 @@
+---
+"@effect/sql-d1": patch
+---
+
+Return the complete native `D1Result` from D1 statement `.raw`, preserving `success`, `meta`, and `results` instead of returning only the row array.
+
+Callers that treated `.raw` as an array should read `.results` or use an ordinary or `.unprepared` statement when only rows are needed.
diff --git a/repos/effect/.changeset/pre/datetime-calendar-parts.md b/repos/effect/.changeset/pre/datetime-calendar-parts.md
new file mode 100644
index 000000000..5529fb6e2
--- /dev/null
+++ b/repos/effect/.changeset/pre/datetime-calendar-parts.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Apply DateTime calendar parts without intermediate overflow.
diff --git a/repos/effect/.changeset/pre/deno-redis-url-credentials.md b/repos/effect/.changeset/pre/deno-redis-url-credentials.md
new file mode 100644
index 000000000..c150c6fef
--- /dev/null
+++ b/repos/effect/.changeset/pre/deno-redis-url-credentials.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-deno": patch
+---
+
+Decode percent-encoded Redis URL authority credentials before authentication.
diff --git a/repos/effect/.changeset/pre/deno-writefile-existing-mode.md b/repos/effect/.changeset/pre/deno-writefile-existing-mode.md
new file mode 100644
index 000000000..17d44f9ed
--- /dev/null
+++ b/repos/effect/.changeset/pre/deno-writefile-existing-mode.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-deno": patch
+---
+
+Fix `FileSystem.writeFile` on Deno to preserve permissions when writing an existing file with an explicit mode.
diff --git a/repos/effect/.changeset/pre/docgen-alias-signature.md b/repos/effect/.changeset/pre/docgen-alias-signature.md
new file mode 100644
index 000000000..58b06047f
--- /dev/null
+++ b/repos/effect/.changeset/pre/docgen-alias-signature.md
@@ -0,0 +1,5 @@
+---
+"@effect/docgen": patch
+---
+
+Preserve alias names, constraints, and defaults in generated type signatures.
diff --git a/repos/effect/.changeset/pre/docgen-class-property-examples.md b/repos/effect/.changeset/pre/docgen-class-property-examples.md
new file mode 100644
index 000000000..68bfef540
--- /dev/null
+++ b/repos/effect/.changeset/pre/docgen-class-property-examples.md
@@ -0,0 +1,5 @@
+---
+"@effect/docgen": patch
+---
+
+Type-check parsed class property examples and execute them when `runExamples` is enabled. Previously unchecked property examples with type errors now cause docgen to fail.
diff --git a/repos/effect/.changeset/pre/docgen-source-relative-module-pages.md b/repos/effect/.changeset/pre/docgen-source-relative-module-pages.md
new file mode 100644
index 000000000..92efd2667
--- /dev/null
+++ b/repos/effect/.changeset/pre/docgen-source-relative-module-pages.md
@@ -0,0 +1,5 @@
+---
+"@effect/docgen": patch
+---
+
+Fix module page paths for `.`, nested, and absolute source directories so modules with the same filename in different subdirectories produce distinct pages.
diff --git a/repos/effect/.changeset/pre/docgen-unique-example-files.md b/repos/effect/.changeset/pre/docgen-unique-example-files.md
new file mode 100644
index 000000000..15a55b136
--- /dev/null
+++ b/repos/effect/.changeset/pre/docgen-unique-example-files.md
@@ -0,0 +1,5 @@
+---
+"@effect/docgen": patch
+---
+
+Prevent examples from modules with colliding flattened paths from overwriting each other, so all examples are checked and optionally executed. Temporary example filenames and diagnostic paths now include a numeric prefix.
diff --git a/repos/effect/.changeset/pre/doctest-markdown-typescript.md b/repos/effect/.changeset/pre/doctest-markdown-typescript.md
new file mode 100644
index 000000000..a42719023
--- /dev/null
+++ b/repos/effect/.changeset/pre/doctest-markdown-typescript.md
@@ -0,0 +1,5 @@
+---
+"@effect/doctest": patch
+---
+
+Fix spurious TypeScript syntax errors when running marked code fences in Markdown and MDX documents.
diff --git a/repos/effect/.changeset/pre/doctest-statement-boundary.md b/repos/effect/.changeset/pre/doctest-statement-boundary.md
new file mode 100644
index 000000000..9e69e68ff
--- /dev/null
+++ b/repos/effect/.changeset/pre/doctest-statement-boundary.md
@@ -0,0 +1,5 @@
+---
+"@effect/doctest": patch
+---
+
+Preserve statement boundaries after generated doctest assertions.
diff --git a/repos/effect/.changeset/pre/dotenv-literal-substitution.md b/repos/effect/.changeset/pre/dotenv-literal-substitution.md
new file mode 100644
index 000000000..0e351277d
--- /dev/null
+++ b/repos/effect/.changeset/pre/dotenv-literal-substitution.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `ConfigProvider.fromDotEnvContents` variable expansion to preserve replacement tokens such as `$&` in referenced values.
diff --git a/repos/effect/.changeset/pre/durable-clock-zero-threshold.md b/repos/effect/.changeset/pre/durable-clock-zero-threshold.md
new file mode 100644
index 000000000..3a23956d3
--- /dev/null
+++ b/repos/effect/.changeset/pre/durable-clock-zero-threshold.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `DurableClock.sleep` to preserve explicit `0` and `0n` in-memory thresholds.
diff --git a/repos/effect/.changeset/pre/durable-deferred-into-encoding-services.md b/repos/effect/.changeset/pre/durable-deferred-into-encoding-services.md
new file mode 100644
index 000000000..6a823609a
--- /dev/null
+++ b/repos/effect/.changeset/pre/durable-deferred-into-encoding-services.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Require schema encoding services when `DurableDeferred.into` records an exit.
diff --git a/repos/effect/.changeset/pre/dynamic-tool-parameter-schema.md b/repos/effect/.changeset/pre/dynamic-tool-parameter-schema.md
new file mode 100644
index 000000000..7d16a999d
--- /dev/null
+++ b/repos/effect/.changeset/pre/dynamic-tool-parameter-schema.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Update dynamic tools to advertise replacement parameter schemas after `setParameters`.
diff --git a/repos/effect/.changeset/pre/eff-1004-cli-display-width.md b/repos/effect/.changeset/pre/eff-1004-cli-display-width.md
new file mode 100644
index 000000000..6c0fdf593
--- /dev/null
+++ b/repos/effect/.changeset/pre/eff-1004-cli-display-width.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Align CLI help tables by terminal display width for wide, emoji, combining, and zero-width graphemes.
diff --git a/repos/effect/.changeset/pre/eff-1008-tool-param-failure-mode.md b/repos/effect/.changeset/pre/eff-1008-tool-param-failure-mode.md
new file mode 100644
index 000000000..8939684f6
--- /dev/null
+++ b/repos/effect/.changeset/pre/eff-1008-tool-param-failure-mode.md
@@ -0,0 +1,9 @@
+---
+"effect": patch
+"@effect/ai-anthropic": patch
+"@effect/ai-openai": patch
+"@effect/ai-openai-compat": patch
+"@effect/ai-openrouter": patch
+---
+
+Route tool call parameter validation failures through the tool's `failureMode` and drop `ToolParameterValidationError.toolParams`.
diff --git a/repos/effect/.changeset/pre/eff-1036-fiber-allocations.md b/repos/effect/.changeset/pre/eff-1036-fiber-allocations.md
new file mode 100644
index 000000000..ddd8bbc1c
--- /dev/null
+++ b/repos/effect/.changeset/pre/eff-1036-fiber-allocations.md
@@ -0,0 +1,12 @@
+---
+"effect": patch
+"@effect/opentelemetry": patch
+---
+
+Reduce memory usage in Effect primitives and fibers.
+
+Breaking: context-derived `Fiber` fields now live under `fiber.cache`. The
+`currentScheduler`, `currentSpan`, `currentLogLevel`, `currentStackFrame`, and
+`currentPreventYield` fields are now `scheduler`, `span`, `logLevel`,
+`stackFrame`, and `preventYield`. Access `minimumLogLevel` and
+`maxOpsBeforeYield` through `cache` as well.
diff --git a/repos/effect/.changeset/pre/eff-1038-http-server-allocations.md b/repos/effect/.changeset/pre/eff-1038-http-server-allocations.md
new file mode 100644
index 000000000..26a8ea83b
--- /dev/null
+++ b/repos/effect/.changeset/pre/eff-1038-http-server-allocations.md
@@ -0,0 +1,6 @@
+---
+"effect": patch
+"@effect/platform-node": patch
+---
+
+Reduce HTTP server allocation churn when tracing is not configured and for requests that complete synchronously.
diff --git a/repos/effect/.changeset/pre/eff-1039-rpc-server-allocations.md b/repos/effect/.changeset/pre/eff-1039-rpc-server-allocations.md
new file mode 100644
index 000000000..5973fa3cf
--- /dev/null
+++ b/repos/effect/.changeset/pre/eff-1039-rpc-server-allocations.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Reduce per-request RPC server allocations.
diff --git a/repos/effect/.changeset/pre/eff-1042-http-server-performance.md b/repos/effect/.changeset/pre/eff-1042-http-server-performance.md
new file mode 100644
index 000000000..bbdd46323
--- /dev/null
+++ b/repos/effect/.changeset/pre/eff-1042-http-server-performance.md
@@ -0,0 +1,10 @@
+---
+"effect": patch
+"@effect/platform-node": patch
+"@effect/platform-bun": patch
+---
+
+Improve HTTP server throughput by reducing routing, request handling, response
+construction, and body encoding overhead. Add `Effect.withFiberSucceed` for
+synchronously computing successful values from the current fiber. Copy pooled
+byte views by their exact range when exposing `ArrayBuffer` values.
diff --git a/repos/effect/.changeset/pre/eff-1201-http-overhead.md b/repos/effect/.changeset/pre/eff-1201-http-overhead.md
new file mode 100644
index 000000000..84500451c
--- /dev/null
+++ b/repos/effect/.changeset/pre/eff-1201-http-overhead.md
@@ -0,0 +1,9 @@
+---
+"effect": patch
+---
+
+Reduce HTTP server overhead: complete freshly created header maps in place in
+`HttpServerResponse.setHeader` and `setHeaders`, compare static route prefixes
+with a prepared `startsWith`, map `HttpApi` schema errors eagerly for completed
+decoder results, and implement `Effect.cached` as a dedicated one-time memo
+without time-to-live machinery.
diff --git a/repos/effect/.changeset/eff-854-pg-connection-startup.md b/repos/effect/.changeset/pre/eff-854-pg-connection-startup.md
similarity index 100%
rename from repos/effect/.changeset/eff-854-pg-connection-startup.md
rename to repos/effect/.changeset/pre/eff-854-pg-connection-startup.md
diff --git a/repos/effect/.changeset/eff-961-node-socket-tls.md b/repos/effect/.changeset/pre/eff-961-node-socket-tls.md
similarity index 100%
rename from repos/effect/.changeset/eff-961-node-socket-tls.md
rename to repos/effect/.changeset/pre/eff-961-node-socket-tls.md
diff --git a/repos/effect/.changeset/eff-963-node-socket-server-tls.md b/repos/effect/.changeset/pre/eff-963-node-socket-server-tls.md
similarity index 100%
rename from repos/effect/.changeset/eff-963-node-socket-server-tls.md
rename to repos/effect/.changeset/pre/eff-963-node-socket-server-tls.md
diff --git a/repos/effect/.changeset/eff-965-socket-upgrade.md b/repos/effect/.changeset/pre/eff-965-socket-upgrade.md
similarity index 100%
rename from repos/effect/.changeset/eff-965-socket-upgrade.md
rename to repos/effect/.changeset/pre/eff-965-socket-upgrade.md
diff --git a/repos/effect/.changeset/eff-969-dependency-updates.md b/repos/effect/.changeset/pre/eff-969-dependency-updates.md
similarity index 100%
rename from repos/effect/.changeset/eff-969-dependency-updates.md
rename to repos/effect/.changeset/pre/eff-969-dependency-updates.md
diff --git a/repos/effect/.changeset/eff-972-deno-socket-server.md b/repos/effect/.changeset/pre/eff-972-deno-socket-server.md
similarity index 100%
rename from repos/effect/.changeset/eff-972-deno-socket-server.md
rename to repos/effect/.changeset/pre/eff-972-deno-socket-server.md
diff --git a/repos/effect/.changeset/pre/eff-997-service-keys.md b/repos/effect/.changeset/pre/eff-997-service-keys.md
new file mode 100644
index 000000000..8ba1ef8c6
--- /dev/null
+++ b/repos/effect/.changeset/pre/eff-997-service-keys.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Normalize core service and runtime identities under their owning module namespaces.
diff --git a/repos/effect/.changeset/pre/effect-eager-transform-arguments.md b/repos/effect/.changeset/pre/effect-eager-transform-arguments.md
new file mode 100644
index 000000000..05be690d2
--- /dev/null
+++ b/repos/effect/.changeset/pre/effect-eager-transform-arguments.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Effect.fnUntracedEager` to pass the original function arguments to each transform after the current effect, matching `Effect.fn` and `Effect.fnUntraced`.
diff --git a/repos/effect/.changeset/pre/effect-scoped-service-restoration.md b/repos/effect/.changeset/pre/effect-scoped-service-restoration.md
new file mode 100644
index 000000000..ffc7b79ab
--- /dev/null
+++ b/repos/effect/.changeset/pre/effect-scoped-service-restoration.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Effect.updateServiceScoped` cleanup when an inner service provider has already completed. Closing the scope now preserves the service's absence instead of failing with a missing-service defect.
diff --git a/repos/effect/.changeset/pre/effect-stream-api-alignment.md b/repos/effect/.changeset/pre/effect-stream-api-alignment.md
new file mode 100644
index 000000000..dd5636e4c
--- /dev/null
+++ b/repos/effect/.changeset/pre/effect-stream-api-alignment.md
@@ -0,0 +1,17 @@
+---
+"effect": patch
+---
+
+Align the `Effect` and `Stream` APIs and fix several Stream type signatures.
+
+- `Effect.orElseSucceed` now passes the error to the fallback function, matching `Stream.orElseSucceed`.
+- `Effect.isEffect` narrows to `Effect<unknown, unknown, unknown>` instead of `any`.
+- `Stream.bind`, `Stream.bindEffect` and `Stream.let` allow re-binding an existing field and produce the same record type as their `Effect` counterparts.
+- `Stream.Success`, `Stream.Error` and `Stream.Services` are unconstrained and distributive like the `Effect` versions.
+- `Stream.partition` returns `[passes, fails]` and takes a `capacity` option, matching `Stream.partitionQueue` and `Stream.partitionEffect`. Its default capacity remains 16.
+- `Stream.mapBoth` takes `onElement` / `onError`, matching `Stream.tapBoth`.
+- `Stream.scan` and `Stream.scanEffect` take a lazy initial state.
+- `Stream.catchTags` rejects unknown tag keys like `Effect.catchTags`.
+- Fixed the data-first overloads of `Stream.runIntoPubSub` (error type was dropped), `Stream.cross` (swapped type parameter names) and `Stream.mapAccumArray` (`onHalt` return type).
+- Added `Stream.as`, `Stream.tapDefect`, `Stream.tapErrorTag` and `Stream.unwrapReason`.
+- Stream concurrency options use the `Types.Concurrency` alias, and JSDoc categories were consolidated across both modules.
diff --git a/repos/effect/.changeset/pre/effect-unmatched-reason-preservation.md b/repos/effect/.changeset/pre/effect-unmatched-reason-preservation.md
new file mode 100644
index 000000000..38f3af546
--- /dev/null
+++ b/repos/effect/.changeset/pre/effect-unmatched-reason-preservation.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve the original cause in `Effect.catchReason` and `Effect.catchReasons` when no nested reason matches and no fallback is provided.
diff --git a/repos/effect/.changeset/pre/effectable-class-override-delegation.md b/repos/effect/.changeset/pre/effectable-class-override-delegation.md
new file mode 100644
index 000000000..9a99f8e88
--- /dev/null
+++ b/repos/effect/.changeset/pre/effectable-class-override-delegation.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Effectable.Class` evaluation by delegating to its abstract `asEffect()` method. The method is called on the instance for each execution, preserving current receiver state and provided services.
diff --git a/repos/effect/.changeset/pre/effectable-mixin.md b/repos/effect/.changeset/pre/effectable-mixin.md
new file mode 100644
index 000000000..b087c5cde
--- /dev/null
+++ b/repos/effect/.changeset/pre/effectable-mixin.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Add `Effectable.Mixin` to insert the Effect prototype into an existing class inheritance chain. The returned abstract class requires an `asEffect` method and derives its Effect type from that method through polymorphic `this`.
diff --git a/repos/effect/.changeset/pre/effectify-mapper-input-tuples.md b/repos/effect/.changeset/pre/effectify-mapper-input-tuples.md
new file mode 100644
index 000000000..9f6495308
--- /dev/null
+++ b/repos/effect/.changeset/pre/effectify-mapper-input-tuples.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix the `onError` and `onSyncError` argument tuple types in `Effect.effectify` to include only caller inputs, excluding the synthesized callback. Mapper annotations that expected a callback slot must use the caller-input tuple instead. Runtime behavior is unchanged.
diff --git a/repos/effect/.changeset/pre/entity-proxy-client-codec-services.md b/repos/effect/.changeset/pre/entity-proxy-client-codec-services.md
new file mode 100644
index 000000000..a7e883600
--- /dev/null
+++ b/repos/effect/.changeset/pre/entity-proxy-client-codec-services.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `EntityProxyServer` handler layers to include client-side codec service requirements.
diff --git a/repos/effect/.changeset/pre/entity-test-client-fatal-defect-option.md b/repos/effect/.changeset/pre/entity-test-client-fatal-defect-option.md
new file mode 100644
index 000000000..403acc21d
--- /dev/null
+++ b/repos/effect/.changeset/pre/entity-test-client-fatal-defect-option.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Honor the entity layer's `disableFatalDefects` option in `Entity.makeTestClient`. When enabled, a handler defect no longer fails other pending calls to the same entity ID. The failing call still reports its defect; omitted or false options retain fatal-defect behavior.
diff --git a/repos/effect/.changeset/pre/eventlog-authentication-forbidden-retry.md b/repos/effect/.changeset/pre/eventlog-authentication-forbidden-retry.md
new file mode 100644
index 000000000..44b83c11b
--- /dev/null
+++ b/repos/effect/.changeset/pre/eventlog-authentication-forbidden-retry.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Retry `EventLogRemote` writes and change streams when authentication returns `Forbidden`.
diff --git a/repos/effect/.changeset/pre/eventlog-empty-chunk-framing.md b/repos/effect/.changeset/pre/eventlog-empty-chunk-framing.md
new file mode 100644
index 000000000..c28935464
--- /dev/null
+++ b/repos/effect/.changeset/pre/eventlog-empty-chunk-framing.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Return one empty chunk when `ChunkedMessage.split` receives an empty `Uint8Array`.
diff --git a/repos/effect/.changeset/pre/exact-byte-size.md b/repos/effect/.changeset/pre/exact-byte-size.md
new file mode 100644
index 000000000..d3f07145d
--- /dev/null
+++ b/repos/effect/.changeset/pre/exact-byte-size.md
@@ -0,0 +1,9 @@
+---
+"effect": patch
+"@effect/platform-bun": patch
+"@effect/platform-deno": patch
+"@effect/platform-node-shared": patch
+"@effect/platform-node": patch
+---
+
+Add `ByteSize` module and use it across the ecosystem
diff --git a/repos/effect/.changeset/pre/exact-http-file-body-length.md b/repos/effect/.changeset/pre/exact-http-file-body-length.md
new file mode 100644
index 000000000..72c8cd6b8
--- /dev/null
+++ b/repos/effect/.changeset/pre/exact-http-file-body-length.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Calculate `HttpBody.file`, `HttpBody.fileFromInfo`, and `HttpClientRequest.bodyFile` content lengths with exact bigint arithmetic and EOF clamping.
diff --git a/repos/effect/.changeset/pre/execution-plan-captured-predicate.md b/repos/effect/.changeset/pre/execution-plan-captured-predicate.md
new file mode 100644
index 000000000..5dbd29881
--- /dev/null
+++ b/repos/effect/.changeset/pre/execution-plan-captured-predicate.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Ensure `ExecutionPlan.captureRequirements` provides captured services to effectful `while` predicates.
diff --git a/repos/effect/.changeset/fair-matches-infer.md b/repos/effect/.changeset/pre/fair-matches-infer.md
similarity index 100%
rename from repos/effect/.changeset/fair-matches-infer.md
rename to repos/effect/.changeset/pre/fair-matches-infer.md
diff --git a/repos/effect/.changeset/pre/fair-workflows-suspend.md b/repos/effect/.changeset/pre/fair-workflows-suspend.md
new file mode 100644
index 000000000..0c9810dea
--- /dev/null
+++ b/repos/effect/.changeset/pre/fair-workflows-suspend.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix parallel child workflows inside activities to dispatch before suspending, release activity resources during durable waits, and resume reliably when children complete during cleanup.
diff --git a/repos/effect/.changeset/pre/faster-schema-construction.md b/repos/effect/.changeset/pre/faster-schema-construction.md
new file mode 100644
index 000000000..3310a7c53
--- /dev/null
+++ b/repos/effect/.changeset/pre/faster-schema-construction.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Optimize schema initialization while preserving custom constructor options.
diff --git a/repos/effect/.changeset/pre/fetch-raw-stream-duplex.md b/repos/effect/.changeset/pre/fetch-raw-stream-duplex.md
new file mode 100644
index 000000000..ebf4b4415
--- /dev/null
+++ b/repos/effect/.changeset/pre/fetch-raw-stream-duplex.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Set `duplex` for raw Web stream request bodies in `FetchHttpClient`.
diff --git a/repos/effect/.changeset/pre/fiber-map-reentrant-replacement.md b/repos/effect/.changeset/pre/fiber-map-reentrant-replacement.md
new file mode 100644
index 000000000..6153f0ac2
--- /dev/null
+++ b/repos/effect/.changeset/pre/fiber-map-reentrant-replacement.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `FiberMap` losing track of fibers started under the same key by a replaced fiber's synchronous finalizer, ensuring they are interrupted when the map's scope closes.
diff --git a/repos/effect/.changeset/pre/fiber-registration-same-fiber.md b/repos/effect/.changeset/pre/fiber-registration-same-fiber.md
new file mode 100644
index 000000000..ee7c0ef2c
--- /dev/null
+++ b/repos/effect/.changeset/pre/fiber-registration-same-fiber.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve an already registered fiber when `FiberHandle` or `FiberMap` registers it again with `onlyIfMissing: true`, instead of interrupting it and clearing the entry.
diff --git a/repos/effect/.changeset/pre/fifty-carrots-punch.md b/repos/effect/.changeset/pre/fifty-carrots-punch.md
new file mode 100644
index 000000000..4ba43f52d
--- /dev/null
+++ b/repos/effect/.changeset/pre/fifty-carrots-punch.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Exposed the platform specific pretty loggers separately.
diff --git a/repos/effect/.changeset/pre/filesystem-sink-undefined-flag.md b/repos/effect/.changeset/pre/filesystem-sink-undefined-flag.md
new file mode 100644
index 000000000..4c26793e9
--- /dev/null
+++ b/repos/effect/.changeset/pre/filesystem-sink-undefined-flag.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `FileSystem.sink` to retain its default write flag when `flag` is undefined.
diff --git a/repos/effect/.changeset/pre/filesystem-stat-optional-inode.md b/repos/effect/.changeset/pre/filesystem-stat-optional-inode.md
new file mode 100644
index 000000000..6fa54f6f0
--- /dev/null
+++ b/repos/effect/.changeset/pre/filesystem-stat-optional-inode.md
@@ -0,0 +1,6 @@
+---
+"effect": patch
+"@effect/platform-node-shared": patch
+---
+
+Keep Node and Bun file stats usable when optional numeric metadata exceeds the safe integer range by returning `Option.none()` for those fields.
diff --git a/repos/effect/.changeset/pre/five-spoons-visit.md b/repos/effect/.changeset/pre/five-spoons-visit.md
new file mode 100644
index 000000000..f3d0b9e51
--- /dev/null
+++ b/repos/effect/.changeset/pre/five-spoons-visit.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Removed unused stderr option from Logger.consolePretty signature
diff --git a/repos/effect/.changeset/pre/fix-atom-http-stream-success-types.md b/repos/effect/.changeset/pre/fix-atom-http-stream-success-types.md
new file mode 100644
index 000000000..186f81b12
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-atom-http-stream-success-types.md
@@ -0,0 +1,9 @@
+---
+"effect": patch
+---
+
+Match `AtomHttpApi` query and mutation success types to the generated HTTP client,
+including SSE, binary streams, and header-wrapped responses. Stream transport,
+decoding, and SSE errors now appear in the stream's error channel instead of
+`never`, so code that assumed a failure-free stream may need to handle them.
+Runtime and serialization behavior are unchanged.
diff --git a/repos/effect/.changeset/pre/fix-atom-http-top-level-dispatch.md b/repos/effect/.changeset/pre/fix-atom-http-top-level-dispatch.md
new file mode 100644
index 000000000..d38505b77
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-atom-http-top-level-dispatch.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `AtomHttpApi` query and mutation dispatch for top-level API groups.
diff --git a/repos/effect/.changeset/pre/fix-atom-query-zero-ttl.md b/repos/effect/.changeset/pre/fix-atom-query-zero-ttl.md
new file mode 100644
index 000000000..f29a0e995
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-atom-query-zero-ttl.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Honor explicit `timeToLive: 0` and `timeToLive: 0n` in `AtomRpc` and `AtomHttpApi` queries. Zero now opts out of the registry's default idle retention, matching other zero-duration inputs, so an unmounted query can be disposed and fetched again on remount. Omitting `timeToLive` still uses the registry default.
diff --git a/repos/effect/.changeset/pre/fix-atom-rpc-client-middleware-errors.md b/repos/effect/.changeset/pre/fix-atom-rpc-client-middleware-errors.md
new file mode 100644
index 000000000..882cdf455
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-atom-rpc-client-middleware-errors.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `AtomRpc` mutation and query atoms to include client middleware errors in their result error types.
diff --git a/repos/effect/.changeset/pre/fix-atom-writable-fallback.md b/repos/effect/.changeset/pre/fix-atom-writable-fallback.md
new file mode 100644
index 000000000..711e5279a
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-atom-writable-fallback.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Forward `Atom.withFallback` writes to the primary atom.
diff --git a/repos/effect/.changeset/pre/fix-bun-http-default-hostname.md b/repos/effect/.changeset/pre/fix-bun-http-default-hostname.md
new file mode 100644
index 000000000..79e580325
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-bun-http-default-hostname.md
@@ -0,0 +1,7 @@
+---
+"@effect/platform-bun": patch
+---
+
+Fix `BunHttpServer` startup when `hostname` is omitted by explicitly listening on `::`, preserving IPv4 and IPv6 connectivity and avoiding a `ServeError` when parsing Bun's default hostname.
+
+Preserve the configured listen address in `BunClusterHttp`, including loopback addresses, when applying the HTTP server hostname default.
diff --git a/repos/effect/.changeset/pre/fix-cors-vary.md b/repos/effect/.changeset/pre/fix-cors-vary.md
new file mode 100644
index 000000000..b5c0fe58b
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-cors-vary.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `HttpMiddleware.cors` to preserve `Origin` and other required `Vary` dimensions.
diff --git a/repos/effect/.changeset/pre/fix-dangling-internal-declarations.md b/repos/effect/.changeset/pre/fix-dangling-internal-declarations.md
new file mode 100644
index 000000000..5fb1a0e7c
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-dangling-internal-declarations.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix published declarations referencing symbols stripped as `@internal`, which broke consumers compiling with `skipLibCheck: false`. `Effectable.d.ts` now uses the public `Effect.TypeId`, `Match.d.ts` no longer aliases an internal `Contextual` type, `Schema.d.ts` ships the `AnnotationSchemaConstraint` alias it references, and the CLI's `toFlagDoc` helper is marked internal so it no longer leaks `Param.getParamMetadata`.
diff --git a/repos/effect/.changeset/pre/fix-deep-mutable-opaque-types.md b/repos/effect/.changeset/pre/fix-deep-mutable-opaque-types.md
new file mode 100644
index 000000000..0e0efdbac
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-deep-mutable-opaque-types.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Types.DeepMutable` to preserve built-in objects, Effect data types, and other objects with methods or symbol-keyed properties while recursively making arrays, tuples, maps, sets, and plain records mutable.
diff --git a/repos/effect/.changeset/pre/fix-deferred-handover-rpc-interruption.md b/repos/effect/.changeset/pre/fix-deferred-handover-rpc-interruption.md
new file mode 100644
index 000000000..d8fba8505
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-deferred-handover-rpc-interruption.md
@@ -0,0 +1,9 @@
+---
+"effect": patch
+---
+
+Retain durable deferred completions received before a workflow owner's first local run so replay can complete while the deferred reply is still being persisted.
+
+Keep pending completions in a cache keyed weakly by cluster activation. Handler rebuilds retain completions, and overlapping activations cannot clear each other's results. Results can be collected once their activation scope becomes unreachable; closing a scope alone does not guarantee collection.
+
+Release RPC stream and queue consumers when their request write fiber is interrupted.
diff --git a/repos/effect/.changeset/pre/fix-discarded-workflow-deferred-wake.md b/repos/effect/.changeset/pre/fix-discarded-workflow-deferred-wake.md
new file mode 100644
index 000000000..8fad39371
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-discarded-workflow-deferred-wake.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix lost durable deferred wake-ups when a ClusterWorkflowEngine execution suspends before its run reply is persisted. Deferred completions now wait for the current run reply before resuming, so discarded executions can replay without relying on caller retries.
diff --git a/repos/effect/.changeset/pre/fix-encoded-header-metadata.md b/repos/effect/.changeset/pre/fix-encoded-header-metadata.md
new file mode 100644
index 000000000..d44380628
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-encoded-header-metadata.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Use body status and encoding defaults in `HttpApiSchema.encodeToWithHeaders`.
diff --git a/repos/effect/.changeset/pre/fix-file-response-content-type.md b/repos/effect/.changeset/pre/fix-file-response-content-type.md
new file mode 100644
index 000000000..6f8badace
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-file-response-content-type.md
@@ -0,0 +1,11 @@
+---
+"effect": patch
+"@effect/platform-node": patch
+"@effect/platform-deno": patch
+---
+
+Fix file response content types: honor the `contentType` option and preserve explicit headers, including MIME types set by `HttpStaticServer`. The default `HttpPlatform.layer` now infers missing content types from file extensions.
+
+Web file responses on the default, Node, and Deno platforms prefer explicit content types, then nonempty `File.type`, then the file extension.
+
+Removed the unused `contentLength` option from `HttpServerResponse.file`; lengths are calculated from the file and requested range.
diff --git a/repos/effect/.changeset/pre/fix-filesystem-integer-precision.md b/repos/effect/.changeset/pre/fix-filesystem-integer-precision.md
new file mode 100644
index 000000000..70e684da5
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-filesystem-integer-precision.md
@@ -0,0 +1,9 @@
+---
+"@effect/platform-node-shared": patch
+"@effect/platform-node": patch
+"@effect/platform-bun": patch
+"@effect/platform-deno": patch
+"effect": patch
+---
+
+Prevent precision loss in Node/Bun filesystem operations and `HttpPlatform` file responses.
diff --git a/repos/effect/.changeset/pre/fix-http-platform-file-ranges.md b/repos/effect/.changeset/pre/fix-http-platform-file-ranges.md
new file mode 100644
index 000000000..87b522ab5
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-http-platform-file-ranges.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Clamp HttpPlatform file response ranges to the file size so Content-Length matches the bytes available. Oversized reads stop at EOF, and offsets at or past EOF return an empty body with Content-Length 0. Apply the same clamping to the default Web file response implementation.
diff --git a/repos/effect/.changeset/pre/fix-http-toweb-null-body-status.md b/repos/effect/.changeset/pre/fix-http-toweb-null-body-status.md
new file mode 100644
index 000000000..dccd82337
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-http-toweb-null-body-status.md
@@ -0,0 +1,7 @@
+---
+"effect": patch
+"@effect/platform-bun": patch
+"@effect/platform-deno": patch
+---
+
+Omit response bodies for statuses 204, 205, and 304 in `HttpServerResponse.toWeb` and the Bun/Deno HTTP adapters, preventing invalid Web responses and hung requests. Cancel omitted raw `ReadableStream` bodies, and finalize request resources without starting omitted Effect streams.
diff --git a/repos/effect/.changeset/pre/fix-httpapi-form-responses.md b/repos/effect/.changeset/pre/fix-httpapi-form-responses.md
new file mode 100644
index 000000000..9e9f6f333
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-httpapi-form-responses.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `HttpApiClient` decoding form-urlencoded responses.
diff --git a/repos/effect/.changeset/pre/fix-httpapi-test-pre-response-handlers.md b/repos/effect/.changeset/pre/fix-httpapi-test-pre-response-handlers.md
new file mode 100644
index 000000000..d1b399851
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-httpapi-test-pre-response-handlers.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Run registered pre-response handlers before `HttpApiTest` returns responses.
diff --git a/repos/effect/.changeset/pre/fix-httpapi-url-builder-base-path.md b/repos/effect/.changeset/pre/fix-httpapi-url-builder-base-path.md
new file mode 100644
index 000000000..9733d4db0
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-httpapi-url-builder-base-path.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `HttpApiClient.urlBuilder` dropping base URL pathnames.
diff --git a/repos/effect/.changeset/pre/fix-json-schema-percent-references.md b/repos/effect/.changeset/pre/fix-json-schema-percent-references.md
new file mode 100644
index 000000000..01c6a3c47
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-json-schema-percent-references.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Add `JsonPointer.parseUriFragment` and `JsonPointer.formatUriFragment` for converting RFC 6901 URI fragments, and use them to preserve percent-encoded definition names in exported JSON Schema references. JSON Schema compilation now rejects malformed local definition references returned by `toJsonSchema` hooks. Such hooks must percent-encode characters that URI fragments do not permit, for example `%` as `%25` and `#` as `%23`.
diff --git a/repos/effect/.changeset/pre/fix-memory-workflow-self-completion.md b/repos/effect/.changeset/pre/fix-memory-workflow-self-completion.md
new file mode 100644
index 000000000..aaf1f81c5
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-memory-workflow-self-completion.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix a deadlock in the memory workflow engine when a durable deferred is completed from a finalizer in the workflow awaiting it, including `DurableDeferred.into` inside `DurableDeferred.raceAll`.
diff --git a/repos/effect/.changeset/pre/fix-mime-parameter-normalization.md b/repos/effect/.changeset/pre/fix-mime-parameter-normalization.md
new file mode 100644
index 000000000..545607aac
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-mime-parameter-normalization.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Normalize MIME type parameters and whitespace in `Mime.getAllExtensions`.
diff --git a/repos/effect/.changeset/pre/fix-multipart-active-file-failure.md b/repos/effect/.changeset/pre/fix-multipart-active-file-failure.md
new file mode 100644
index 000000000..bff8687e1
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-multipart-active-file-failure.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix multipart file streams hanging on body read errors and preserve error causes when persisting files.
diff --git a/repos/effect/.changeset/pre/fix-negative-file-seek.md b/repos/effect/.changeset/pre/fix-negative-file-seek.md
new file mode 100644
index 000000000..50227499b
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-negative-file-seek.md
@@ -0,0 +1,7 @@
+---
+"effect": patch
+"@effect/platform-node-shared": patch
+"@effect/platform-deno": patch
+---
+
+On Node and Deno, `FileSystem.File.seek` now rejects negative resulting positions with a `BadArgument` platform error, leaving the cursor unchanged. Its return type is now `Effect<bigint, PlatformError>`.
diff --git a/repos/effect/.changeset/pre/fix-node-compression-content-type.md b/repos/effect/.changeset/pre/fix-node-compression-content-type.md
new file mode 100644
index 000000000..eef388ec4
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-node-compression-content-type.md
@@ -0,0 +1,9 @@
+---
+"effect": patch
+"@effect/platform-node": patch
+"@effect/platform-node-shared": patch
+"@effect/platform-bun": patch
+"@effect/platform-deno": patch
+---
+
+Preserve the response Content-Type when compressing file, raw, stream, and byte-array responses on Node, Bun, Deno, and the web platform, including headers overridden after body construction.
diff --git a/repos/effect/.changeset/pre/fix-openapi-client-form-url-encoding.md b/repos/effect/.changeset/pre/fix-openapi-client-form-url-encoding.md
new file mode 100644
index 000000000..99c7fd034
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-openapi-client-form-url-encoding.md
@@ -0,0 +1,5 @@
+---
+"@effect/openapi-generator": patch
+---
+
+Encode form-urlencoded request bodies in generated HTTP clients.
diff --git a/repos/effect/.changeset/pre/fix-openapi-client-multipart-records.md b/repos/effect/.changeset/pre/fix-openapi-client-multipart-records.md
new file mode 100644
index 000000000..c4c36d038
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-openapi-client-multipart-records.md
@@ -0,0 +1,5 @@
+---
+"@effect/openapi-generator": patch
+---
+
+Encode multipart record payloads as form data in generated schema-backed clients.
diff --git a/repos/effect/.changeset/pre/fix-openapi-client-paths.md b/repos/effect/.changeset/pre/fix-openapi-client-paths.md
new file mode 100644
index 000000000..04b3c50ec
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-openapi-client-paths.md
@@ -0,0 +1,5 @@
+---
+"@effect/openapi-generator": patch
+---
+
+Quote static paths and percent-encode path parameters in generated HTTP clients, including SSE and binary stream methods. Reject empty parameters and dot segments with an HTTP client error before sending a request.
diff --git a/repos/effect/.changeset/pre/fix-openapi-endpoint-transform-order.md b/repos/effect/.changeset/pre/fix-openapi-endpoint-transform-order.md
new file mode 100644
index 000000000..ff1335312
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-openapi-endpoint-transform-order.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Apply endpoint OpenAPI overrides and transforms after schema generation.
diff --git a/repos/effect/.changeset/pre/fix-openapi-stream-transform-client.md b/repos/effect/.changeset/pre/fix-openapi-stream-transform-client.md
new file mode 100644
index 000000000..13f781b60
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-openapi-stream-transform-client.md
@@ -0,0 +1,5 @@
+---
+"@effect/openapi-generator": patch
+---
+
+Apply `transformClient` when generated binary and SSE streams are consumed, preserving lazy stream construction.
diff --git a/repos/effect/.changeset/pre/fix-pg-tls-servername.md b/repos/effect/.changeset/pre/fix-pg-tls-servername.md
new file mode 100644
index 000000000..258137c25
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-pg-tls-servername.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-pg": patch
+---
+
+Default TLS servername to the hostname for non-IP hosts during connection startup and cancellation, restoring connections to Postgres endpoints that require SNI. Preserve explicit SSL servername overrides.
diff --git a/repos/effect/.changeset/pre/fix-prompt-date-tab-buffer.md b/repos/effect/.changeset/pre/fix-prompt-date-tab-buffer.md
new file mode 100644
index 000000000..43f07df7a
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-prompt-date-tab-buffer.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Prompt.date` carrying typed digits into the next field when pressing Tab, including when navigation wraps.
diff --git a/repos/effect/.changeset/pre/fix-raw-response-bodyless-headers.md b/repos/effect/.changeset/pre/fix-raw-response-bodyless-headers.md
new file mode 100644
index 000000000..422cba3fe
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-raw-response-bodyless-headers.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+`HttpServerResponse.toWeb` now keeps a raw `Response`'s headers and `Set-Cookie` values when the body is omitted (HEAD, or status 204, 205 or 304). Bodyless outer statuses keep the outer status and status text; HEAD keeps the raw `Response`'s. Outer cookies are appended to native `Set-Cookie` headers instead of replacing them.
diff --git a/repos/effect/.changeset/pre/fix-rcref-idle-ttl-zero.md b/repos/effect/.changeset/pre/fix-rcref-idle-ttl-zero.md
new file mode 100644
index 000000000..e37e347c3
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-rcref-idle-ttl-zero.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `RcRef.make` to treat `idleTimeToLive: 0` like `Duration.zero` and `"0 millis"` instead of an omitted option.
diff --git a/repos/effect/.changeset/pre/fix-react-ref-switch.md b/repos/effect/.changeset/pre/fix-react-ref-switch.md
new file mode 100644
index 000000000..0044f5227
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-react-ref-switch.md
@@ -0,0 +1,5 @@
+---
+"@effect/atom-react": patch
+---
+
+Ensure `useAtomRef` updates after switching refs when the new value matches the previous ref's value.
diff --git a/repos/effect/.changeset/pre/fix-reactivity-duplicate-keys.md b/repos/effect/.changeset/pre/fix-reactivity-duplicate-keys.md
new file mode 100644
index 000000000..2f0111087
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-reactivity-duplicate-keys.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Prevent `Reactivity.query` cleanup from failing when keys are repeated.
diff --git a/repos/effect/.changeset/pre/fix-read-alloc-invalid-sizes.md b/repos/effect/.changeset/pre/fix-read-alloc-invalid-sizes.md
new file mode 100644
index 000000000..b656ca94c
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-read-alloc-invalid-sizes.md
@@ -0,0 +1,6 @@
+---
+"@effect/platform-node-shared": patch
+"@effect/platform-deno": patch
+---
+
+Fix `File.readAlloc` on Node and Deno to fail with `PlatformError` (`BadArgument`) for negative, fractional, non-finite, or unallocatable sizes without moving the cursor. Zero-size reads continue to return `Option.none()` without moving the cursor.
diff --git a/repos/effect/.changeset/pre/fix-redacted-transform-results.md b/repos/effect/.changeset/pre/fix-redacted-transform-results.md
new file mode 100644
index 000000000..97385788c
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-redacted-transform-results.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Schema.Redacted` to wrap the transformed result of its inner schema during decoding and encoding.
diff --git a/repos/effect/.changeset/pre/fix-runner-stream-disconnect.md b/repos/effect/.changeset/pre/fix-runner-stream-disconnect.md
new file mode 100644
index 000000000..6a72f5da6
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-runner-stream-disconnect.md
@@ -0,0 +1,7 @@
+---
+"effect": patch
+---
+
+Release non-persisted, interruptible `RunnerServer` handlers and mailbox slots when callers disconnect.
+
+Preserve dynamic `WithTransaction` annotations during replay and re-delivery.
diff --git a/repos/effect/.changeset/pre/fix-schema-codegen-optional-tuples.md b/repos/effect/.changeset/pre/fix-schema-codegen-optional-tuples.md
new file mode 100644
index 000000000..6a39c5f2c
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-schema-codegen-optional-tuples.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `SchemaRepresentation.toCodeDocument` generating invalid TypeScript for optional tuple elements containing unions or nested readonly tuples. Optional element types are now parenthesized, for example `readonly [(string | number)?]` instead of `readonly [string | number?]`. Generated runtime schemas are unchanged.
diff --git a/repos/effect/.changeset/pre/fix-schema-codegen-proto.md b/repos/effect/.changeset/pre/fix-schema-codegen-proto.md
new file mode 100644
index 000000000..38f773bc3
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-schema-codegen-proto.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `SchemaRepresentation.toCodeDocument` dropping Struct fields named `__proto__` from generated schemas. These fields now use computed keys, such as `Schema.Struct({ ["__proto__"]: Schema.String })`, so the generated schema validates them correctly.
diff --git a/repos/effect/.changeset/pre/fix-sink-flatmap-leftovers.md b/repos/effect/.changeset/pre/fix-sink-flatmap-leftovers.md
new file mode 100644
index 000000000..0afe46e74
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-sink-flatmap-leftovers.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve pending leftovers when a `Sink.flatMap` continuation completes without consuming input.
diff --git a/repos/effect/.changeset/pre/fix-sse-mixed-line-endings.md b/repos/effect/.changeset/pre/fix-sse-mixed-line-endings.md
new file mode 100644
index 000000000..c1b272729
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-sse-mixed-line-endings.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve SSE events with mixed line endings.
diff --git a/repos/effect/.changeset/pre/fix-static-head-range.md b/repos/effect/.changeset/pre/fix-static-head-range.md
new file mode 100644
index 000000000..915c8deb8
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-static-head-range.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Ignore Range headers on non-GET requests in HttpStaticServer.
diff --git a/repos/effect/.changeset/pre/fix-static-oversized-ranges.md b/repos/effect/.changeset/pre/fix-static-oversized-ranges.md
new file mode 100644
index 000000000..583891479
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-static-oversized-ranges.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Parse HttpStaticServer byte range integers exactly, including values above Number.MAX_SAFE_INTEGER. Oversized starts now return 416 with Content-Range instead of falling back to 200. Oversized ends clamp to the last byte, and oversized suffixes return the whole file as 206.
diff --git a/repos/effect/.changeset/pre/fix-stream-wrapper-status.md b/repos/effect/.changeset/pre/fix-stream-wrapper-status.md
new file mode 100644
index 000000000..9568a5cfd
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-stream-wrapper-status.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `HttpApiBuilder` ignoring the status annotation on a `HttpApiSchema.WithHeaders` wrapper around a streaming success, which defected when the wrapper and inner statuses differed.
diff --git a/repos/effect/.changeset/pre/fix-toml-array-subtables.md b/repos/effect/.changeset/pre/fix-toml-array-subtables.md
new file mode 100644
index 000000000..07d3edbae
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-toml-array-subtables.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Toml.parse` rejecting child tables in separate array-of-tables entries.
diff --git a/repos/effect/.changeset/pre/fix-tool-result-serialization.md b/repos/effect/.changeset/pre/fix-tool-result-serialization.md
new file mode 100644
index 000000000..65accd0f1
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-tool-result-serialization.md
@@ -0,0 +1,13 @@
+---
+"effect": patch
+---
+
+Fix tool result serialization to select the codec using `isFailure` and preserve `encodedResult` through `Response.AllParts` round trips.
+
+Add `Tool.failureResultSchema(tool)` and `Tool.ExecutionFailure` to handle user failures, `AiError`, and denied or interrupted calls consistently. Also export `HttpRequestDetails` and `HttpResponseDetails` from `AiError`; the `Response` exports remain available.
+
+### Breaking changes
+
+- Stored results must match the selected schema. With success `Schema.Number` and failure `Schema.NumberFromString`, migrate failed results from `404` to `"404"`.
+- `Response.ToolResultPart` returns `Schema.Codec` instead of `Schema.decodeTo`. Update annotations that depend on the old type.
+- `Tool.FailureResult` and `Tool.Result`, including their encoded variants, now include `Tool.ExecutionFailure` in both failure modes. Handle it when narrowing failed results.
diff --git a/repos/effect/.changeset/pre/fix-vue-ref-switch.md b/repos/effect/.changeset/pre/fix-vue-ref-switch.md
new file mode 100644
index 000000000..b804de834
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-vue-ref-switch.md
@@ -0,0 +1,5 @@
+---
+"@effect/atom-vue": patch
+---
+
+Fix `useAtomRef` returning a stale value after switching refs.
diff --git a/repos/effect/.changeset/pre/fix-workflow-activity-interruption.md b/repos/effect/.changeset/pre/fix-workflow-activity-interruption.md
new file mode 100644
index 000000000..2ce3cda65
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-workflow-activity-interruption.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix activity count leaks when workflow activity acquisition is interrupted, which could block later workflow suspension.
diff --git a/repos/effect/.changeset/pre/fix-yaml-folded-scalars.md b/repos/effect/.changeset/pre/fix-yaml-folded-scalars.md
new file mode 100644
index 000000000..eeb3dfef2
--- /dev/null
+++ b/repos/effect/.changeset/pre/fix-yaml-folded-scalars.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix folded YAML scalars to preserve paragraph and indentation breaks.
diff --git a/repos/effect/.changeset/flat-pipelines-share.md b/repos/effect/.changeset/pre/flat-pipelines-share.md
similarity index 100%
rename from repos/effect/.changeset/flat-pipelines-share.md
rename to repos/effect/.changeset/pre/flat-pipelines-share.md
diff --git a/repos/effect/.changeset/pre/formatter-defined-error-causes.md b/repos/effect/.changeset/pre/formatter-defined-error-causes.md
new file mode 100644
index 000000000..51f66c0f4
--- /dev/null
+++ b/repos/effect/.changeset/pre/formatter-defined-error-causes.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve defined falsy Error causes (`0`, `false`, `""`, `null`, `0n`, and `NaN`) in `Formatter.format` output. Missing and explicitly `undefined` causes remain omitted.
diff --git a/repos/effect/.changeset/pre/fresh-pools-release.md b/repos/effect/.changeset/pre/fresh-pools-release.md
new file mode 100644
index 000000000..0e4248826
--- /dev/null
+++ b/repos/effect/.changeset/pre/fresh-pools-release.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix memory leaks in `Pool.makeWithTTL` with the usage strategy by releasing retired resources and consumed acquisition errors from the TTL queue.
diff --git a/repos/effect/.changeset/fresh-pools-rotate.md b/repos/effect/.changeset/pre/fresh-pools-rotate.md
similarity index 100%
rename from repos/effect/.changeset/fresh-pools-rotate.md
rename to repos/effect/.changeset/pre/fresh-pools-rotate.md
diff --git a/repos/effect/.changeset/fuzzy-classes-compare.md b/repos/effect/.changeset/pre/fuzzy-classes-compare.md
similarity index 100%
rename from repos/effect/.changeset/fuzzy-classes-compare.md
rename to repos/effect/.changeset/pre/fuzzy-classes-compare.md
diff --git a/repos/effect/.changeset/pre/graph-bellman-ford-infinite-cycle-barriers.md b/repos/effect/.changeset/pre/graph-bellman-ford-infinite-cycle-barriers.md
new file mode 100644
index 000000000..e016e3903
--- /dev/null
+++ b/repos/effect/.changeset/pre/graph-bellman-ford-infinite-cycle-barriers.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Graph.bellmanFord` reporting a negative cycle as affecting a target across an impassable, positive-infinite-weight edge. Targets separated from the cycle by such edges now retain their finite shortest path or remain unreachable, while targets reachable from the cycle through finite-weight edges still report an error.
diff --git a/repos/effect/.changeset/pre/hashmap-collision-entries.md b/repos/effect/.changeset/pre/hashmap-collision-entries.md
new file mode 100644
index 000000000..fa077d00b
--- /dev/null
+++ b/repos/effect/.changeset/pre/hashmap-collision-entries.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Prevent `HashMap` iterators from exposing mutable internal collision entries.
diff --git a/repos/effect/.changeset/pre/hashring-exclusion-endpoint.md b/repos/effect/.changeset/pre/hashring-exclusion-endpoint.md
new file mode 100644
index 000000000..3e54251e1
--- /dev/null
+++ b/repos/effect/.changeset/pre/hashring-exclusion-endpoint.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `HashRing.getShards` skipping an eligible node at the first ring position when other nodes have reached their allocation quota.
diff --git a/repos/effect/.changeset/pre/headers-redacted-name-case.md b/repos/effect/.changeset/pre/headers-redacted-name-case.md
new file mode 100644
index 000000000..70d6358da
--- /dev/null
+++ b/repos/effect/.changeset/pre/headers-redacted-name-case.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Compare header names case-insensitively in `Headers.isRedactedName`.
diff --git a/repos/effect/.changeset/pre/headers-stateful-patterns.md b/repos/effect/.changeset/pre/headers-stateful-patterns.md
new file mode 100644
index 000000000..db5ebef9e
--- /dev/null
+++ b/repos/effect/.changeset/pre/headers-stateful-patterns.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Headers.redact` and `Headers.isRedactedName` skipping matches when a redaction pattern is a global or sticky regular expression.
diff --git a/repos/effect/.changeset/pre/http-client-catch-response-result.md b/repos/effect/.changeset/pre/http-client-catch-response-result.md
new file mode 100644
index 000000000..29bd409fb
--- /dev/null
+++ b/repos/effect/.changeset/pre/http-client-catch-response-result.md
@@ -0,0 +1,8 @@
+---
+"effect": patch
+---
+
+Constrain the data-first `HttpClient.catch(client, recover)` overload to recover with
+`HttpClientResponse` values, matching the data-last overload. Callbacks returning other
+success types are now rejected; use `Effect.catch` on the result of `client.execute(request)`
+to recover to arbitrary values.
diff --git a/repos/effect/.changeset/pre/http-client-redirect-preprocessing-recovery.md b/repos/effect/.changeset/pre/http-client-redirect-preprocessing-recovery.md
new file mode 100644
index 000000000..70c1b6e20
--- /dev/null
+++ b/repos/effect/.changeset/pre/http-client-redirect-preprocessing-recovery.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `HttpClient.followRedirects` bypassing response-level recovery when request preprocessing fails.
diff --git a/repos/effect/.changeset/pre/http-client-response-schema-json-options.md b/repos/effect/.changeset/pre/http-client-response-schema-json-options.md
new file mode 100644
index 000000000..b4a867afa
--- /dev/null
+++ b/repos/effect/.changeset/pre/http-client-response-schema-json-options.md
@@ -0,0 +1,6 @@
+---
+"effect": patch
+---
+
+Fix `HttpClientResponse.schemaJson` and `HttpClientResponse.schemaNoBody` to apply parse options when decoding response
+schemas.
diff --git a/repos/effect/.changeset/pre/http-head-stream-scope.md b/repos/effect/.changeset/pre/http-head-stream-scope.md
new file mode 100644
index 000000000..93f35c109
--- /dev/null
+++ b/repos/effect/.changeset/pre/http-head-stream-scope.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Close request scopes for streaming HEAD responses.
diff --git a/repos/effect/.changeset/pre/http-query-method.md b/repos/effect/.changeset/pre/http-query-method.md
new file mode 100644
index 000000000..debdb31f3
--- /dev/null
+++ b/repos/effect/.changeset/pre/http-query-method.md
@@ -0,0 +1,8 @@
+---
+"effect": patch
+"@effect/openapi-generator": patch
+---
+
+Add HTTP `QUERY` support to clients, routers, HttpApi endpoints, and AI request metadata. Configure CORS support through `allowedMethods`; defaults are unchanged.
+
+OpenAPI 3.1 output represents `QUERY` through `x-oai-additionalOperations`, which requires consumer support for that extension. The OpenAPI generator accepts the extension and the native OpenAPI 3.2 `query` field.
diff --git a/repos/effect/.changeset/pre/http-response-content-length.md b/repos/effect/.changeset/pre/http-response-content-length.md
new file mode 100644
index 000000000..55326a913
--- /dev/null
+++ b/repos/effect/.changeset/pre/http-response-content-length.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve `Content-Length` headers in `HttpServerResponse.fromWeb`.
diff --git a/repos/effect/.changeset/pre/http-router-normalized-prefix.md b/repos/effect/.changeset/pre/http-router-normalized-prefix.md
new file mode 100644
index 000000000..a19f44155
--- /dev/null
+++ b/repos/effect/.changeset/pre/http-router-normalized-prefix.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Normalize router prefixes before removing them from handler request URLs.
diff --git a/repos/effect/.changeset/pre/http-runner-path-boundary.md b/repos/effect/.changeset/pre/http-runner-path-boundary.md
new file mode 100644
index 000000000..412f194b1
--- /dev/null
+++ b/repos/effect/.changeset/pre/http-runner-path-boundary.md
@@ -0,0 +1,7 @@
+---
+"effect": patch
+---
+
+Fix `HttpRunner` HTTP and WebSocket client URLs adding an extra leading slash to slash-prefixed paths. Insert the address/path separator only when it is missing, preserving intentional leading and interior slashes.
+
+This path correction is normally masked by router normalization, but prevents route misses for non-root paths when duplicate-slash normalization is disabled. Applications that compensate for the extra slash may need to remove that compensation. Router defaults and shared trailing-slash handling are unchanged.
diff --git a/repos/effect/.changeset/pre/http-web-handler-cold-start.md b/repos/effect/.changeset/pre/http-web-handler-cold-start.md
new file mode 100644
index 000000000..5fb4aabd0
--- /dev/null
+++ b/repos/effect/.changeset/pre/http-web-handler-cold-start.md
@@ -0,0 +1,8 @@
+---
+"effect": patch
+---
+
+Reduce cold start cost of `HttpRouter` and `HttpEffect` web handlers.
+
+- `HttpServerRespondable` no longer imports `Schema` to detect schema errors, which removes the Schema modules from bundles that do not otherwise use them (about 23% of a minimal `HttpRouter` bundle).
+- `HttpRouter.toWebHandler`, `HttpEffect.toWebHandlerLayer` and `HttpEffect.toWebHandlerLayerWith` now build the layer immediately instead of on the first request. A failed build never surfaces as an unhandled rejection; every request rejects with the build error instead.
diff --git a/repos/effect/.changeset/pre/httpapi-client-literal-actions.md b/repos/effect/.changeset/pre/httpapi-client-literal-actions.md
new file mode 100644
index 000000000..5fb5f6a85
--- /dev/null
+++ b/repos/effect/.changeset/pre/httpapi-client-literal-actions.md
@@ -0,0 +1,7 @@
+---
+"effect": patch
+---
+
+Preserve literal suffixes such as `:wait` in `/operations/:id:wait` across `HttpApiClient`, `HttpApiBuilder`, and OpenAPI paths.
+
+Server routes without a params schema keep their existing matching for `RouteContext` consumers. Schemas whose keys cannot be enumerated keep the existing fallback.
diff --git a/repos/effect/.changeset/pre/httpapi-middleware-error-dedupe.md b/repos/effect/.changeset/pre/httpapi-middleware-error-dedupe.md
new file mode 100644
index 000000000..76d74654b
--- /dev/null
+++ b/repos/effect/.changeset/pre/httpapi-middleware-error-dedupe.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `HttpApiMiddleware`-declared errors being duplicated and mis-encoded.
diff --git a/repos/effect/.changeset/pre/httpapi-sse-decode-options.md b/repos/effect/.changeset/pre/httpapi-sse-decode-options.md
new file mode 100644
index 000000000..eb84e9032
--- /dev/null
+++ b/repos/effect/.changeset/pre/httpapi-sse-decode-options.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Allow generated `HttpApiClient` methods and `AtomHttpApi` queries and mutations to accept native SSE decode options per call through the request's `sseOptions` field.
diff --git a/repos/effect/.changeset/pre/improve-json-schema-import.md b/repos/effect/.changeset/pre/improve-json-schema-import.md
new file mode 100644
index 000000000..27024c853
--- /dev/null
+++ b/repos/effect/.changeset/pre/improve-json-schema-import.md
@@ -0,0 +1,57 @@
+---
+"effect": patch
+---
+
+Improve `SchemaRepresentation.fromJsonSchemaDocument` and `fromJsonSchemaMultiDocument`:
+
+- Import `{ not: {} }` as `Schema.Never` (#8137).
+
+- Import closed records with one `patternProperties` entry, `additionalProperties: false`, and no declared or required properties when `patterns: "apply"` is enabled. These were previously rejected.
+
+  ```json
+  {
+    "type": "object",
+    "patternProperties": { "^a": { "type": "number" } },
+    "additionalProperties": false
+  }
+  ```
+
+  ```ts
+  Schema.Record(
+    Schema.String.check(Schema.isPattern(/^a/)),
+    Schema.Finite
+  )
+  ```
+
+- Reject open patterned objects with `patterns: "apply"` instead of generating incompatible TypeScript index signatures.
+
+  ```json
+  {
+    "type": "object",
+    "patternProperties": { "^a": { "type": "number" } },
+    "additionalProperties": true
+  }
+  ```
+
+  Import now explains that the generated TypeScript index signatures would give incorrect types to unmatched keys, and reports the source path. The same applies when `additionalProperties` is omitted or `{}`. Patterns can still be combined with a closed object in `allOf` when the result has a finite set of keys. Use `patterns: "ignore"` only if you intend to discard the pattern and its value constraints.
+
+- Reject references inside a subschema with its own `$id` instead of potentially resolving against the wrong definitions. Resolve or flatten these references before importing. A `$id` on the document root remains supported.
+
+  ```json
+  {
+    "$id": "https://example.com/root",
+    "$defs": { "Value": { "type": "string" } },
+    "type": "object",
+    "properties": {
+      "child": {
+        "$id": "child",
+        "$defs": { "Value": { "type": "number" } },
+        "$ref": "#/$defs/Value"
+      }
+    }
+  }
+  ```
+
+  Here `child` refers to the nested numeric `Value`, not the root string `Value`. Import now reports that references inside a subschema with its own `$id` are unsupported instead of incorrectly using the root definition.
+
+- Explain import failures using JSON Schema keyword names, the reason for rejection, and the source path. Reference errors distinguish missing definitions, unsupported reference formats, and circular aliases. Pattern errors explain how to opt in for trusted schemas or explicitly discard the constraints.
diff --git a/repos/effect/.changeset/pre/indexeddb-out-of-line-primary-keys.md b/repos/effect/.changeset/pre/indexeddb-out-of-line-primary-keys.md
new file mode 100644
index 000000000..30b66a4e5
--- /dev/null
+++ b/repos/effect/.changeset/pre/indexeddb-out-of-line-primary-keys.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-browser": patch
+---
+
+Preserve out-of-line primary keys in IndexedDB query results, including secondary-index reads.
diff --git a/repos/effect/.changeset/pre/indexeddb-stream-query-limits.md b/repos/effect/.changeset/pre/indexeddb-stream-query-limits.md
new file mode 100644
index 000000000..c12593165
--- /dev/null
+++ b/repos/effect/.changeset/pre/indexeddb-stream-query-limits.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-browser": patch
+---
+
+Keep streamed IndexedDB selects within their query limits.
diff --git a/repos/effect/.changeset/pre/isolate-unencodable-hydration.md b/repos/effect/.changeset/pre/isolate-unencodable-hydration.md
new file mode 100644
index 000000000..fa72c498e
--- /dev/null
+++ b/repos/effect/.changeset/pre/isolate-unencodable-hydration.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Prevent unencodable atom values from aborting dehydration of the rest of an atom registry.
diff --git a/repos/effect/.changeset/large-postgres-messages.md b/repos/effect/.changeset/pre/large-postgres-messages.md
similarity index 100%
rename from repos/effect/.changeset/large-postgres-messages.md
rename to repos/effect/.changeset/pre/large-postgres-messages.md
diff --git a/repos/effect/.changeset/pre/latest-dependencies.md b/repos/effect/.changeset/pre/latest-dependencies.md
new file mode 100644
index 000000000..d6459ac3b
--- /dev/null
+++ b/repos/effect/.changeset/pre/latest-dependencies.md
@@ -0,0 +1,8 @@
+---
+"@effect/doctest": patch
+"@effect/platform-deno": patch
+"@effect/sql-d1": patch
+"@effect/sql-mysql2": patch
+---
+
+Update Rolldown, the Deno Redis driver, Cloudflare Workers types, and MySQL dependencies to their latest releases.
diff --git a/repos/effect/.changeset/pre/layer-error-observer-types.md b/repos/effect/.changeset/pre/layer-error-observer-types.md
new file mode 100644
index 000000000..24bcdb3e2
--- /dev/null
+++ b/repos/effect/.changeset/pre/layer-error-observer-types.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Layer.tapError` and `Layer.tapCause` to require observers that accept the source layer's complete error type.
diff --git a/repos/effect/.changeset/pre/layer-span-trace-options.md b/repos/effect/.changeset/pre/layer-span-trace-options.md
new file mode 100644
index 000000000..d0cb11a3b
--- /dev/null
+++ b/repos/effect/.changeset/pre/layer-span-trace-options.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Honor `captureStackTrace` in both forms of `Layer.withSpan`. Layer construction diagnostics previously reported a location inside `Layer.ts` instead of the `withSpan` call site, and ignored `captureStackTrace: false` or a supplied lazy stack.
diff --git a/repos/effect/.changeset/pre/layermap-preloaded-acquisition-errors.md b/repos/effect/.changeset/pre/layermap-preloaded-acquisition-errors.md
new file mode 100644
index 000000000..402864fb9
--- /dev/null
+++ b/repos/effect/.changeset/pre/layermap-preloaded-acquisition-errors.md
@@ -0,0 +1,7 @@
+---
+"effect": patch
+---
+
+Preserve resource acquisition errors on `LayerMap.Service` when `preload: true` is set. The yielded service instance and its `get`, `contextEffect`, and `contextEffectOption` accessors now retain the resource error type because a resource can fail when reacquired, even if preloading succeeded.
+
+Consumers that assumed these accessors had a `never` error must handle the resource error. Runtime behavior is unchanged.
diff --git a/repos/effect/.changeset/pre/lazy-bun-redis-import.md b/repos/effect/.changeset/pre/lazy-bun-redis-import.md
new file mode 100644
index 000000000..9255d6d97
--- /dev/null
+++ b/repos/effect/.changeset/pre/lazy-bun-redis-import.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-bun": patch
+---
+
+Load Bun's `RedisClient` lazily in `BunRedis`.
diff --git a/repos/effect/.changeset/pre/lazy-undici-loading.md b/repos/effect/.changeset/pre/lazy-undici-loading.md
new file mode 100644
index 000000000..9c767e4ea
--- /dev/null
+++ b/repos/effect/.changeset/pre/lazy-undici-loading.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-node": patch
+---
+
+Defer loading Undici until an Undici-backed layer is acquired, preventing Node HTTP client imports from replacing Node's global fetch dispatcher. Import Undici APIs from `@effect/platform-node/Undici` instead of the package root.
diff --git a/repos/effect/.changeset/pre/libsql-transaction-client-isolation.md b/repos/effect/.changeset/pre/libsql-transaction-client-isolation.md
new file mode 100644
index 000000000..186ff4348
--- /dev/null
+++ b/repos/effect/.changeset/pre/libsql-transaction-client-isolation.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-libsql": patch
+---
+
+Isolate transaction contexts between separately created libSQL clients.
diff --git a/repos/effect/.changeset/pre/logger-complete-file-writes.md b/repos/effect/.changeset/pre/logger-complete-file-writes.md
new file mode 100644
index 000000000..0c2c6983d
--- /dev/null
+++ b/repos/effect/.changeset/pre/logger-complete-file-writes.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Logger.toFile` dropping the remainder of a log batch when a successful file write writes only part of the buffer. File logging now uses the complete-write contract; write errors continue to be ignored.
diff --git a/repos/effect/.changeset/pre/mcp-http-resource-template-origins.md b/repos/effect/.changeset/pre/mcp-http-resource-template-origins.md
new file mode 100644
index 000000000..b94ed9b0d
--- /dev/null
+++ b/repos/effect/.changeset/pre/mcp-http-resource-template-origins.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `McpServer` HTTP resource templates failing to resolve.
diff --git a/repos/effect/.changeset/pre/mcp-identified-output-schema.md b/repos/effect/.changeset/pre/mcp-identified-output-schema.md
new file mode 100644
index 000000000..503ea7349
--- /dev/null
+++ b/repos/effect/.changeset/pre/mcp-identified-output-schema.md
@@ -0,0 +1,6 @@
+---
+"effect": patch
+---
+
+Normalize identified MCP output schemas to object roots across protocol versions.
+Support identified object schemas in MCP elicitation requests.
diff --git a/repos/effect/.changeset/pre/mcp-prompt-decoded-parameter-types.md b/repos/effect/.changeset/pre/mcp-prompt-decoded-parameter-types.md
new file mode 100644
index 000000000..180a6f1ad
--- /dev/null
+++ b/repos/effect/.changeset/pre/mcp-prompt-decoded-parameter-types.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `McpServer.registerPrompt` callback types to use decoded prompt parameters.
diff --git a/repos/effect/.changeset/pre/mcp-prompt-titles.md b/repos/effect/.changeset/pre/mcp-prompt-titles.md
new file mode 100644
index 000000000..42b30b54e
--- /dev/null
+++ b/repos/effect/.changeset/pre/mcp-prompt-titles.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Support prompt titles in `McpServer.prompt` and `McpServer.registerPrompt`.
diff --git a/repos/effect/.changeset/pre/mcp-server-instructions.md b/repos/effect/.changeset/pre/mcp-server-instructions.md
new file mode 100644
index 000000000..1302b3381
--- /dev/null
+++ b/repos/effect/.changeset/pre/mcp-server-instructions.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Add an `instructions` option to MCP servers for initialization and discovery responses.
diff --git a/repos/effect/.changeset/mcp-structured-content-object.md b/repos/effect/.changeset/pre/mcp-structured-content-object.md
similarity index 100%
rename from repos/effect/.changeset/mcp-structured-content-object.md
rename to repos/effect/.changeset/pre/mcp-structured-content-object.md
diff --git a/repos/effect/.changeset/pre/memory-message-storage-clear-controls.md b/repos/effect/.changeset/pre/memory-message-storage-clear-controls.md
new file mode 100644
index 000000000..d4f524b69
--- /dev/null
+++ b/repos/effect/.changeset/pre/memory-message-storage-clear-controls.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Remove queued control envelopes when clearing an address from in-memory message storage.
diff --git a/repos/effect/.changeset/pre/metric-attribute-order-identity.md b/repos/effect/.changeset/pre/metric-attribute-order-identity.md
new file mode 100644
index 000000000..608c6d396
--- /dev/null
+++ b/repos/effect/.changeset/pre/metric-attribute-order-identity.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Ensure metrics with equal attributes share a series regardless of attribute insertion order.
diff --git a/repos/effect/.changeset/pre/metric-registry-isolation.md b/repos/effect/.changeset/pre/metric-registry-isolation.md
new file mode 100644
index 000000000..68aa520b5
--- /dev/null
+++ b/repos/effect/.changeset/pre/metric-registry-isolation.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix metrics reused across different `MetricRegistry` services to read and update the active registry while preserving each registry's values when revisited.
diff --git a/repos/effect/.changeset/pre/model-field-option-undefined.md b/repos/effect/.changeset/pre/model-field-option-undefined.md
new file mode 100644
index 000000000..3bca7a691
--- /dev/null
+++ b/repos/effect/.changeset/pre/model-field-option-undefined.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Model.FieldOption` to preserve omitted variants.
diff --git a/repos/effect/.changeset/pre/modern-mice-discover.md b/repos/effect/.changeset/pre/modern-mice-discover.md
new file mode 100644
index 000000000..06985bb85
--- /dev/null
+++ b/repos/effect/.changeset/pre/modern-mice-discover.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Add server support for MCP protocol version 2026-07-28 through 2026_07_28
diff --git a/repos/effect/.changeset/pre/mssql-binary-parameters.md b/repos/effect/.changeset/pre/mssql-binary-parameters.md
new file mode 100644
index 000000000..9ceac54a6
--- /dev/null
+++ b/repos/effect/.changeset/pre/mssql-binary-parameters.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-mssql": patch
+---
+
+Fix automatic binary parameter binding in `@effect/sql-mssql`.
diff --git a/repos/effect/.changeset/pre/mssql-ntlm-domain.md b/repos/effect/.changeset/pre/mssql-ntlm-domain.md
new file mode 100644
index 000000000..eaa55815f
--- /dev/null
+++ b/repos/effect/.changeset/pre/mssql-ntlm-domain.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-mssql": patch
+---
+
+Forward the configured domain to the SQL Server driver so NTLM clients can be constructed with a supplied domain.
diff --git a/repos/effect/.changeset/pre/multipart-binary-client-file-type.md b/repos/effect/.changeset/pre/multipart-binary-client-file-type.md
new file mode 100644
index 000000000..3bd11c39e
--- /dev/null
+++ b/repos/effect/.changeset/pre/multipart-binary-client-file-type.md
@@ -0,0 +1,7 @@
+---
+"@effect/openapi-generator": patch
+---
+
+Generated HTTP clients now type `multipart/form-data` fields with `format: binary` as `File | Blob` instead of `string`. `httpapi` output is unchanged.
+
+Referenced components containing binary fields use `*Multipart` exports, such as `UploadBodyMultipart`. If a component is used only by multipart requests, update imports from its original name to the generated name. Components also used by JSON requests or responses keep their original exports and string fields.
diff --git a/repos/effect/.changeset/pre/multipart-streamed-part-guard.md b/repos/effect/.changeset/pre/multipart-streamed-part-guard.md
new file mode 100644
index 000000000..f593fc224
--- /dev/null
+++ b/repos/effect/.changeset/pre/multipart-streamed-part-guard.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Add `Multipart.isStreamPart` to recognize only a text `Field` or streamed `File`, while preserving `Multipart.isPart` for all branded multipart parts, including `PersistedFile` values.
diff --git a/repos/effect/.changeset/mutable-arrays-preserve.md b/repos/effect/.changeset/pre/mutable-arrays-preserve.md
similarity index 100%
rename from repos/effect/.changeset/mutable-arrays-preserve.md
rename to repos/effect/.changeset/pre/mutable-arrays-preserve.md
diff --git a/repos/effect/.changeset/pre/mutable-list-bulk-prepend-tail.md b/repos/effect/.changeset/pre/mutable-list-bulk-prepend-tail.md
new file mode 100644
index 000000000..61e8ed55a
--- /dev/null
+++ b/repos/effect/.changeset/pre/mutable-list-bulk-prepend-tail.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve values added to an empty `MutableList` by `prependAll` when appending more values.
diff --git a/repos/effect/.changeset/pre/name-random-services.md b/repos/effect/.changeset/pre/name-random-services.md
new file mode 100644
index 000000000..2fef9ba2e
--- /dev/null
+++ b/repos/effect/.changeset/pre/name-random-services.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Export the `Random.Random` service interface and `Metric.MetricRegistry` type so custom service implementations can be annotated without accessing `Context.Reference` phantom types.
diff --git a/repos/effect/.changeset/pre/net-address-host-helpers.md b/repos/effect/.changeset/pre/net-address-host-helpers.md
new file mode 100644
index 000000000..ea7d6ccd1
--- /dev/null
+++ b/repos/effect/.changeset/pre/net-address-host-helpers.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Add `NetAddress.formatHost` and `NetAddress.inetAddressFromHostString` for socket APIs that accept numeric hosts and ports separately, preserving IPv6 scope IDs. Add `NetAddress.scopeIdsFromInterfaces` to build a scope map for resolving named IPv6 zones from supplied network interface entries without performing operating-system lookups.
diff --git a/repos/effect/.changeset/pre/net-address-values.md b/repos/effect/.changeset/pre/net-address-values.md
new file mode 100644
index 000000000..b6db60e64
--- /dev/null
+++ b/repos/effect/.changeset/pre/net-address-values.md
@@ -0,0 +1,14 @@
+---
+"effect": patch
+"@effect/sql-pg": patch
+"@effect/platform-node": patch
+"@effect/platform-node-shared": patch
+"@effect/platform-deno": patch
+"@effect/platform-bun": patch
+---
+
+Add `NetAddress` under `effect/unstable/net` for MAC, IP, internet socket, and Unix socket addresses, with checked parsing, schemas, equality, canonical string serialization, and URL formatting. Companion modules `IpInterface` and `IpNetwork` represent IP interfaces and CIDR networks.
+
+HTTP and socket servers now expose `NetAddress.SocketAddress`. Replace TCP `hostname` access with `NetAddress.formatIp(address.address)` and use `UnixPathAddress.path` for Unix sockets. URL helpers bracket IPv6 addresses and reject scoped IPv6. Bun and Deno HTTP server layers can now fail with `ServeError` when listener address conversion fails.
+
+PostgreSQL `inet` values now use `IpInterface`; `cidr` values use `IpNetwork` and reject addresses with host bits set.
diff --git a/repos/effect/.changeset/ninety-books-sit.md b/repos/effect/.changeset/pre/ninety-books-sit.md
similarity index 100%
rename from repos/effect/.changeset/ninety-books-sit.md
rename to repos/effect/.changeset/pre/ninety-books-sit.md
diff --git a/repos/effect/.changeset/pre/node-http-status-text.md b/repos/effect/.changeset/pre/node-http-status-text.md
new file mode 100644
index 000000000..b83133d66
--- /dev/null
+++ b/repos/effect/.changeset/pre/node-http-status-text.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-node": patch
+---
+
+Forward custom and empty status text from NodeHttpServer responses.
diff --git a/repos/effect/.changeset/pre/node-response-preserve-bytes.md b/repos/effect/.changeset/pre/node-response-preserve-bytes.md
new file mode 100644
index 000000000..add6daba8
--- /dev/null
+++ b/repos/effect/.changeset/pre/node-response-preserve-bytes.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-node": patch
+---
+
+Preserve response bytes when selecting the text reader in Node HTTP clients.
diff --git a/repos/effect/.changeset/pre/node-sink-cancel-drain.md b/repos/effect/.changeset/pre/node-sink-cancel-drain.md
new file mode 100644
index 000000000..257aead2e
--- /dev/null
+++ b/repos/effect/.changeset/pre/node-sink-cancel-drain.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-node-shared": patch
+---
+
+Prevent Node sinks from submitting buffered writes after interruption while waiting for writable backpressure.
diff --git a/repos/effect/.changeset/pre/node-sink-finalization-errors.md b/repos/effect/.changeset/pre/node-sink-finalization-errors.md
new file mode 100644
index 000000000..308442c81
--- /dev/null
+++ b/repos/effect/.changeset/pre/node-sink-finalization-errors.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-node-shared": patch
+---
+
+Fix `NodeSink` hanging when a writable reports an error during finalization.
diff --git a/repos/effect/.changeset/pre/node-stream-buffer-size.md b/repos/effect/.changeset/pre/node-stream-buffer-size.md
new file mode 100644
index 000000000..82b55372d
--- /dev/null
+++ b/repos/effect/.changeset/pre/node-stream-buffer-size.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-node-shared": patch
+---
+
+Remove the ignored `bufferSize` option from `NodeStream`.
diff --git a/repos/effect/.changeset/pre/node-watch-relative.md b/repos/effect/.changeset/pre/node-watch-relative.md
new file mode 100644
index 000000000..792683eba
--- /dev/null
+++ b/repos/effect/.changeset/pre/node-watch-relative.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-node-shared": patch
+---
+
+Fix watch event classification for targets outside the current working directory.
diff --git a/repos/effect/.changeset/pre/node-worker-unsafe-send-envelope.md b/repos/effect/.changeset/pre/node-worker-unsafe-send-envelope.md
new file mode 100644
index 000000000..999baa91a
--- /dev/null
+++ b/repos/effect/.changeset/pre/node-worker-unsafe-send-envelope.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-node": patch
+---
+
+Preserve reply payloads sent through `NodeWorkerRunner.sendUnsafe`.
diff --git a/repos/effect/.changeset/pre/node-writeall-empty.md b/repos/effect/.changeset/pre/node-writeall-empty.md
new file mode 100644
index 000000000..f503e0d70
--- /dev/null
+++ b/repos/effect/.changeset/pre/node-writeall-empty.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-node-shared": patch
+---
+
+Allow `File.writeAll` to accept empty buffers.
diff --git a/repos/effect/.changeset/normalize-collection-counts.md b/repos/effect/.changeset/pre/normalize-collection-counts.md
similarity index 100%
rename from repos/effect/.changeset/normalize-collection-counts.md
rename to repos/effect/.changeset/pre/normalize-collection-counts.md
diff --git a/repos/effect/.changeset/pre/number-remainder-negative-zero-dividend.md b/repos/effect/.changeset/pre/number-remainder-negative-zero-dividend.md
new file mode 100644
index 000000000..054499696
--- /dev/null
+++ b/repos/effect/.changeset/pre/number-remainder-negative-zero-dividend.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Number.remainder` to preserve negative-zero dividends with ordinary finite divisors.
diff --git a/repos/effect/.changeset/olive-queues-persist.md b/repos/effect/.changeset/pre/olive-queues-persist.md
similarity index 100%
rename from repos/effect/.changeset/olive-queues-persist.md
rename to repos/effect/.changeset/pre/olive-queues-persist.md
diff --git a/repos/effect/.changeset/pre/openai-image-strings.md b/repos/effect/.changeset/pre/openai-image-strings.md
new file mode 100644
index 000000000..5a8aae24e
--- /dev/null
+++ b/repos/effect/.changeset/pre/openai-image-strings.md
@@ -0,0 +1,6 @@
+---
+"@effect/ai-openai": patch
+"@effect/ai-openai-compat": patch
+---
+
+Preserve image data supplied as strings in OpenAI Responses and OpenAI-compatible chat requests.
diff --git a/repos/effect/.changeset/pre/openai-optional-sequence-number.md b/repos/effect/.changeset/pre/openai-optional-sequence-number.md
new file mode 100644
index 000000000..ffd414cd8
--- /dev/null
+++ b/repos/effect/.changeset/pre/openai-optional-sequence-number.md
@@ -0,0 +1,5 @@
+---
+"@effect/ai-openai": patch
+---
+
+Allow OpenAI-compatible Responses API stream events to omit `sequence_number`.
diff --git a/repos/effect/.changeset/pre/openai-web-search-api-sources.md b/repos/effect/.changeset/pre/openai-web-search-api-sources.md
new file mode 100644
index 000000000..62c9e6524
--- /dev/null
+++ b/repos/effect/.changeset/pre/openai-web-search-api-sources.md
@@ -0,0 +1,5 @@
+---
+"@effect/ai-openai": patch
+---
+
+Support API sources in OpenAI web search. Narrow sources by `type` before reading `url` or `name`.
diff --git a/repos/effect/.changeset/pre/openai-web-search-outcomes.md b/repos/effect/.changeset/pre/openai-web-search-outcomes.md
new file mode 100644
index 000000000..e6129dcf2
--- /dev/null
+++ b/repos/effect/.changeset/pre/openai-web-search-outcomes.md
@@ -0,0 +1,5 @@
+---
+"@effect/ai-openai": patch
+---
+
+Report failed OpenAI provider-executed tool calls as failure tool results in both `generateText` and `streamText`, preserving the call details.
diff --git a/repos/effect/.changeset/openapi-omitted-additional-properties.md b/repos/effect/.changeset/pre/openapi-omitted-additional-properties.md
similarity index 100%
rename from repos/effect/.changeset/openapi-omitted-additional-properties.md
rename to repos/effect/.changeset/pre/openapi-omitted-additional-properties.md
diff --git a/repos/effect/.changeset/pre/openrouter-alpha-decisions.md b/repos/effect/.changeset/pre/openrouter-alpha-decisions.md
new file mode 100644
index 000000000..8dd39d844
--- /dev/null
+++ b/repos/effect/.changeset/pre/openrouter-alpha-decisions.md
@@ -0,0 +1,7 @@
+---
+"@effect/ai-openrouter": patch
+---
+
+Add `OpenRouterDecisionModel` for OpenRouter's alpha Decisions API.
+
+Custom `OpenRouterClient.Service` implementations and mocks must now provide `createDecisions`.
diff --git a/repos/effect/.changeset/pre/openrouter-disjoint-usage-details.md b/repos/effect/.changeset/pre/openrouter-disjoint-usage-details.md
new file mode 100644
index 000000000..8b36a80db
--- /dev/null
+++ b/repos/effect/.changeset/pre/openrouter-disjoint-usage-details.md
@@ -0,0 +1,7 @@
+---
+"@effect/ai-openrouter": patch
+---
+
+Fix negative text and uncached token usage when reasoning or cached counts exceed their parent totals. Treat these counts as disjoint, adding them to the total and retaining the parent count as text or uncached usage.
+
+Disjoint counts at or below their parent totals remain indistinguishable from subsets, so their totals are still undercounted.
diff --git a/repos/effect/.changeset/pre/openrouter-encrypted-tool-finish.md b/repos/effect/.changeset/pre/openrouter-encrypted-tool-finish.md
new file mode 100644
index 000000000..4f5006ac1
--- /dev/null
+++ b/repos/effect/.changeset/pre/openrouter-encrypted-tool-finish.md
@@ -0,0 +1,5 @@
+---
+"@effect/ai-openrouter": patch
+---
+
+Report `tool-calls` instead of `unknown` when an OpenRouter stream ends with `stop` after emitting tool calls and nonempty encrypted reasoning.
diff --git a/repos/effect/.changeset/pre/openrouter-strict-json-schema.md b/repos/effect/.changeset/pre/openrouter-strict-json-schema.md
new file mode 100644
index 000000000..736612759
--- /dev/null
+++ b/repos/effect/.changeset/pre/openrouter-strict-json-schema.md
@@ -0,0 +1,5 @@
+---
+"@effect/ai-openrouter": patch
+---
+
+Exclude the provider-only `strictJsonSchema` option from outgoing OpenRouter request bodies while preserving structured-output and tool strictness settings.
diff --git a/repos/effect/.changeset/pre/opentelemetry-delta-interval-starts.md b/repos/effect/.changeset/pre/opentelemetry-delta-interval-starts.md
new file mode 100644
index 000000000..c536f6823
--- /dev/null
+++ b/repos/effect/.changeset/pre/opentelemetry-delta-interval-starts.md
@@ -0,0 +1,5 @@
+---
+"@effect/opentelemetry": patch
+---
+
+Use collection interval starts for OpenTelemetry delta metrics.
diff --git a/repos/effect/.changeset/pre/optic-projection-replacement.md b/repos/effect/.changeset/pre/optic-projection-replacement.md
new file mode 100644
index 000000000..3523631ae
--- /dev/null
+++ b/repos/effect/.changeset/pre/optic-projection-replacement.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Ensure `Optic.pick` and `Optic.omit` delete focused optional fields omitted from a replacement.
diff --git a/repos/effect/.changeset/pre/optic-string-index-delete.md b/repos/effect/.changeset/pre/optic-string-index-delete.md
new file mode 100644
index 000000000..8468eda4a
--- /dev/null
+++ b/repos/effect/.changeset/pre/optic-string-index-delete.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Optic.optionalKey` to splice tuple elements selected by string indices.
diff --git a/repos/effect/.changeset/pre/optional-never-arbitrary.md b/repos/effect/.changeset/pre/optional-never-arbitrary.md
new file mode 100644
index 000000000..7c6a3cd62
--- /dev/null
+++ b/repos/effect/.changeset/pre/optional-never-arbitrary.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Treat `Never` as an uninhabited branch during `Arbitrary.schema` derivation. Schemas with another finite generation path, including optional properties, unions, and empty collections, no longer fail derivation.
diff --git a/repos/effect/.changeset/pre/order-consumed-criteria.md b/repos/effect/.changeset/pre/order-consumed-criteria.md
new file mode 100644
index 000000000..85dd26e64
--- /dev/null
+++ b/repos/effect/.changeset/pre/order-consumed-criteria.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Order.combineAll` consuming one-shot iterables after the first comparison.
diff --git a/repos/effect/.changeset/pre/otlp-disabled-batch-flush.md b/repos/effect/.changeset/pre/otlp-disabled-batch-flush.md
new file mode 100644
index 000000000..9ab34b05a
--- /dev/null
+++ b/repos/effect/.changeset/pre/otlp-disabled-batch-flush.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix disabled OTLP batching to skip empty exports and avoid resending buffered items.
diff --git a/repos/effect/.changeset/pre/otlp-tracer-span-performance.md b/repos/effect/.changeset/pre/otlp-tracer-span-performance.md
new file mode 100644
index 000000000..2319594b7
--- /dev/null
+++ b/repos/effect/.changeset/pre/otlp-tracer-span-performance.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Speed up `OtlpTracer` span creation and export. Spans now allocate identifiers, attributes, and events lazily, and `Encoding.randomHex` produces flat strings for 16 and 32 character identifiers so serialization no longer flattens ropes.
diff --git a/repos/effect/.changeset/pre/parameterize-persistence-lookup-keys.md b/repos/effect/.changeset/pre/parameterize-persistence-lookup-keys.md
new file mode 100644
index 000000000..92960c36a
--- /dev/null
+++ b/repos/effect/.changeset/pre/parameterize-persistence-lookup-keys.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Parameterize persistence lookup keys in both SQL backing stores' `getMany` queries.
diff --git a/repos/effect/.changeset/pre/partitioned-semaphore-stale-cleanup.md b/repos/effect/.changeset/pre/partitioned-semaphore-stale-cleanup.md
new file mode 100644
index 000000000..72b3fba03
--- /dev/null
+++ b/repos/effect/.changeset/pre/partitioned-semaphore-stale-cleanup.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `PartitionedSemaphore` leaving a new waiter suspended when a previously resumed waiter for the same partition is interrupted before its acquisition completes.
diff --git a/repos/effect/.changeset/pre/persisted-cache-lookup-throw.md b/repos/effect/.changeset/pre/persisted-cache-lookup-throw.md
new file mode 100644
index 000000000..81b54be07
--- /dev/null
+++ b/repos/effect/.changeset/pre/persisted-cache-lookup-throw.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Persist synchronous defects thrown by `PersistedCache` lookups.
diff --git a/repos/effect/.changeset/pre/pg-explicit-ssl-precedence.md b/repos/effect/.changeset/pre/pg-explicit-ssl-precedence.md
new file mode 100644
index 000000000..e52b6246f
--- /dev/null
+++ b/repos/effect/.changeset/pre/pg-explicit-ssl-precedence.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-pg": patch
+---
+
+Honor explicit `ssl` options when PostgreSQL URLs use `sslmode=prefer` or `sslmode=allow`.
diff --git a/repos/effect/.changeset/pre/pg-listen-connection-errors.md b/repos/effect/.changeset/pre/pg-listen-connection-errors.md
new file mode 100644
index 000000000..fe0e5cd61
--- /dev/null
+++ b/repos/effect/.changeset/pre/pg-listen-connection-errors.md
@@ -0,0 +1,7 @@
+---
+"@effect/sql-pg": patch
+---
+
+Preserve the original `SqlError` when a PostgreSQL LISTEN connection fails after registration, allowing `Stream.retry` to acquire a new listener. Intentional scope closure still interrupts consumers.
+
+Notification queues returned by `PgClient.listen` and `PgConnection.listen` now carry `SqlError`. Update explicit queue and stream type annotations to include this error.
diff --git a/repos/effect/.changeset/pre/pg-regclass-codec.md b/repos/effect/.changeset/pre/pg-regclass-codec.md
new file mode 100644
index 000000000..f2a4331d9
--- /dev/null
+++ b/repos/effect/.changeset/pre/pg-regclass-codec.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-pg": patch
+---
+
+Decode binary `regclass` and `regclass[]` values as unsigned numeric OIDs, fixing the migration runner's table-existence check. Cast `regclass` values to `text` in SQL to return relation names.
diff --git a/repos/effect/.changeset/pre/pg-sslmode-compatibility.md b/repos/effect/.changeset/pre/pg-sslmode-compatibility.md
new file mode 100644
index 000000000..9b7cf2eef
--- /dev/null
+++ b/repos/effect/.changeset/pre/pg-sslmode-compatibility.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-pg": patch
+---
+
+Support `sslmode=prefer` and `sslmode=allow` by trying TLS first, then plaintext if the server declines `SSLRequest`. Unlike libpq, `allow` also tries TLS first. Explicit `ssl` overrides and certificate verification are unchanged. TLS handshake and certificate failures remain fatal. Cancellation never downgrades a TLS session to plaintext.
diff --git a/repos/effect/.changeset/pre/pg-startup-parameters.md b/repos/effect/.changeset/pre/pg-startup-parameters.md
new file mode 100644
index 000000000..876df5954
--- /dev/null
+++ b/repos/effect/.changeset/pre/pg-startup-parameters.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-pg": patch
+---
+
+Add structured `startupParameters` and opaque `startupOptions` to connection config, and restore support for URL `options`. Explicit `startupOptions` overrides URL `options`; the startup packet field remains `options`. Send session defaults in every physical connection's startup packet, including pooled replacements, with config validation and documented application-name precedence.
diff --git a/repos/effect/.changeset/pre/pglite-json-string-values.md b/repos/effect/.changeset/pre/pglite-json-string-values.md
new file mode 100644
index 000000000..f30fa9521
--- /dev/null
+++ b/repos/effect/.changeset/pre/pglite-json-string-values.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-pglite": patch
+---
+
+Preserve string values passed to `sql.json` when using PGlite.
diff --git a/repos/effect/.changeset/pre/pipeline-root-stdin.md b/repos/effect/.changeset/pre/pipeline-root-stdin.md
new file mode 100644
index 000000000..1c380f884
--- /dev/null
+++ b/repos/effect/.changeset/pre/pipeline-root-stdin.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-node-shared": patch
+---
+
+Route pipeline handle input through the first process.
diff --git a/repos/effect/.changeset/pre/plain-tool-results.md b/repos/effect/.changeset/pre/plain-tool-results.md
new file mode 100644
index 000000000..b58b40275
--- /dev/null
+++ b/repos/effect/.changeset/pre/plain-tool-results.md
@@ -0,0 +1,7 @@
+---
+"@effect/ai-openai": patch
+"@effect/ai-anthropic": patch
+"@effect/ai-openrouter": patch
+---
+
+Preserve plain-text client tool results when encoding provider requests.
diff --git a/repos/effect/.changeset/pre/pool-preserve-reservations.md b/repos/effect/.changeset/pre/pool-preserve-reservations.md
new file mode 100644
index 000000000..0f87426b2
--- /dev/null
+++ b/repos/effect/.changeset/pre/pool-preserve-reservations.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Keep `Pool.reserve` items out of shared circulation when other borrowers return or overlapping reservations close. Restore available slots only after the last reservation closes.
diff --git a/repos/effect/.changeset/pre/port-http-api-builder-handler.md b/repos/effect/.changeset/pre/port-http-api-builder-handler.md
new file mode 100644
index 000000000..a499e2fe2
--- /dev/null
+++ b/repos/effect/.changeset/pre/port-http-api-builder-handler.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Port `HttpApiBuilder.handler` from v3 to define reusable endpoint callbacks with inferred request, response, error, and service types.
diff --git a/repos/effect/.changeset/postgres-channel-names.md b/repos/effect/.changeset/pre/postgres-channel-names.md
similarity index 100%
rename from repos/effect/.changeset/postgres-channel-names.md
rename to repos/effect/.changeset/pre/postgres-channel-names.md
diff --git a/repos/effect/.changeset/pre/preserve-default-variant-class.md b/repos/effect/.changeset/pre/preserve-default-variant-class.md
new file mode 100644
index 000000000..d263ec6ae
--- /dev/null
+++ b/repos/effect/.changeset/pre/preserve-default-variant-class.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve schema classes when extracting their default `VariantSchema` variant.
diff --git a/repos/effect/.changeset/pre/preserve-negative-counter-deltas.md b/repos/effect/.changeset/pre/preserve-negative-counter-deltas.md
new file mode 100644
index 000000000..d8783c189
--- /dev/null
+++ b/repos/effect/.changeset/pre/preserve-negative-counter-deltas.md
@@ -0,0 +1,6 @@
+---
+"effect": patch
+"@effect/opentelemetry": patch
+---
+
+Preserve negative counter deltas in OTLP and OpenTelemetry metric exports.
diff --git a/repos/effect/.changeset/principled-collection-counts.md b/repos/effect/.changeset/pre/principled-collection-counts.md
similarity index 100%
rename from repos/effect/.changeset/principled-collection-counts.md
rename to repos/effect/.changeset/pre/principled-collection-counts.md
diff --git a/repos/effect/.changeset/pre/prompt-buffer-render.md b/repos/effect/.changeset/pre/prompt-buffer-render.md
new file mode 100644
index 000000000..6cc05a921
--- /dev/null
+++ b/repos/effect/.changeset/pre/prompt-buffer-render.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Keep the previous prompt frame visible until the next frame or submission is ready to display.
diff --git a/repos/effect/.changeset/pre/prompt-lossless-text-serialization.md b/repos/effect/.changeset/pre/prompt-lossless-text-serialization.md
new file mode 100644
index 000000000..ead45aa74
--- /dev/null
+++ b/repos/effect/.changeset/pre/prompt-lossless-text-serialization.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve text parts and provider options when serializing prompts.
diff --git a/repos/effect/.changeset/pre/prompt-response-files.md b/repos/effect/.changeset/pre/prompt-response-files.md
new file mode 100644
index 000000000..0f11a7d89
--- /dev/null
+++ b/repos/effect/.changeset/pre/prompt-response-files.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve generated files when converting AI responses to prompts.
diff --git a/repos/effect/.changeset/pre/pubsub-sliding-single-subscriber.md b/repos/effect/.changeset/pre/pubsub-sliding-single-subscriber.md
new file mode 100644
index 000000000..3584a0509
--- /dev/null
+++ b/repos/effect/.changeset/pre/pubsub-sliding-single-subscriber.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix capacity-one PubSub subscriber cursors after sliding past messages, including duplicate delivery and invalid state when unsubscribing from a slid message.
diff --git a/repos/effect/.changeset/pull-based-socket.md b/repos/effect/.changeset/pre/pull-based-socket.md
similarity index 100%
rename from repos/effect/.changeset/pull-based-socket.md
rename to repos/effect/.changeset/pre/pull-based-socket.md
diff --git a/repos/effect/.changeset/pre/queue-manual-flush.md b/repos/effect/.changeset/pre/queue-manual-flush.md
new file mode 100644
index 000000000..c7f3fb423
--- /dev/null
+++ b/repos/effect/.changeset/pre/queue-manual-flush.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Add `Queue.flush` and `Queue.flushUnsafe` for manually releasing pending takers, including after synchronous offers.
diff --git a/repos/effect/.changeset/pre/queue-reentrant-producers.md b/repos/effect/.changeset/pre/queue-reentrant-producers.md
new file mode 100644
index 000000000..3048f717e
--- /dev/null
+++ b/repos/effect/.changeset/pre/queue-reentrant-producers.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Queue` message duplication, capacity overruns, and consumer defects when a resumed producer synchronously uses the same queue. Zero-capacity queues now reserve each handed-off message for its consumer before resuming the producer.
diff --git a/repos/effect/.changeset/pre/queue-shutdown-unsafe.md b/repos/effect/.changeset/pre/queue-shutdown-unsafe.md
new file mode 100644
index 000000000..f840a6966
--- /dev/null
+++ b/repos/effect/.changeset/pre/queue-shutdown-unsafe.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Add `Queue.shutdownUnsafe` to synchronously discard buffered messages and settle pending queue operations from callbacks. Both `Queue.shutdown` and `Queue.shutdownUnsafe` return `false` when the queue has already been shut down or completed; previously, `Queue.shutdown` always returned `true`.
diff --git a/repos/effect/.changeset/quiet-buffers-decode.md b/repos/effect/.changeset/pre/quiet-buffers-decode.md
similarity index 100%
rename from repos/effect/.changeset/quiet-buffers-decode.md
rename to repos/effect/.changeset/pre/quiet-buffers-decode.md
diff --git a/repos/effect/.changeset/pre/quiet-buns-route.md b/repos/effect/.changeset/pre/quiet-buns-route.md
new file mode 100644
index 000000000..e63500872
--- /dev/null
+++ b/repos/effect/.changeset/pre/quiet-buns-route.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-bun": patch
+---
+
+Preserve configured Bun routes when Effect HTTP handlers are installed or restored.
diff --git a/repos/effect/.changeset/pre/quiet-graphs-simplify.md b/repos/effect/.changeset/pre/quiet-graphs-simplify.md
new file mode 100644
index 000000000..cc52f4d7d
--- /dev/null
+++ b/repos/effect/.changeset/pre/quiet-graphs-simplify.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Remove the redundant `Graph.Proto` interface. Use `Graph.Graph<N, E, Graph.Kind>` when accepting any immutable graph.
diff --git a/repos/effect/.changeset/pre/quiet-hosts-format.md b/repos/effect/.changeset/pre/quiet-hosts-format.md
new file mode 100644
index 000000000..211c20263
--- /dev/null
+++ b/repos/effect/.changeset/pre/quiet-hosts-format.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Add `NetAddress.formatNativeHost` and `NetAddress.formatMulticastInterface` with explicit platform and scope ID map parameters for native socket APIs.
diff --git a/repos/effect/.changeset/pre/quiet-pandas-connect.md b/repos/effect/.changeset/pre/quiet-pandas-connect.md
new file mode 100644
index 000000000..7fb8e2146
--- /dev/null
+++ b/repos/effect/.changeset/pre/quiet-pandas-connect.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-pg": patch
+---
+
+Support infallible Effect password providers with no service requirements, refreshed per PostgreSQL connection and schema dump.
diff --git a/repos/effect/.changeset/quiet-pandas-listen.md b/repos/effect/.changeset/pre/quiet-pandas-listen.md
similarity index 100%
rename from repos/effect/.changeset/quiet-pandas-listen.md
rename to repos/effect/.changeset/pre/quiet-pandas-listen.md
diff --git a/repos/effect/.changeset/quiet-streams-take.md b/repos/effect/.changeset/pre/quiet-streams-take.md
similarity index 100%
rename from repos/effect/.changeset/quiet-streams-take.md
rename to repos/effect/.changeset/pre/quiet-streams-take.md
diff --git a/repos/effect/.changeset/pre/quiet-tables-resolve.md b/repos/effect/.changeset/pre/quiet-tables-resolve.md
new file mode 100644
index 000000000..676b29e5e
--- /dev/null
+++ b/repos/effect/.changeset/pre/quiet-tables-resolve.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-sqlite-do": patch
+---
+
+Prevent automatic scheduler yields inside storage-backed transactions to avoid Durable Object input-gate deadlocks when another fiber is queued. Explicit asynchronous operations inside transactions remain unsupported.
diff --git a/repos/effect/.changeset/pre/random-exclusive-upper-endpoint.md b/repos/effect/.changeset/pre/random-exclusive-upper-endpoint.md
new file mode 100644
index 000000000..ee55cc507
--- /dev/null
+++ b/repos/effect/.changeset/pre/random-exclusive-upper-endpoint.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Random.nextBetween` and `Crypto.randomBetween` returning their exclusive upper bound when floating-point arithmetic rounds up.
diff --git a/repos/effect/.changeset/pre/random-pg-prepared-names.md b/repos/effect/.changeset/pre/random-pg-prepared-names.md
new file mode 100644
index 000000000..a7b7bf76d
--- /dev/null
+++ b/repos/effect/.changeset/pre/random-pg-prepared-names.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-pg": patch
+---
+
+Namespace prepared statement names per connection to avoid collisions when backend sessions are shared.
diff --git a/repos/effect/.changeset/pre/rate-limiter-reset-lifetime.md b/repos/effect/.changeset/pre/rate-limiter-reset-lifetime.md
new file mode 100644
index 000000000..03547308d
--- /dev/null
+++ b/repos/effect/.changeset/pre/rate-limiter-reset-lifetime.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Report the exact remaining store lifetime in `RateLimiter` fixed-window `resetAfter` metadata when `onExceeded` is `"delay"`, instead of rounding up to a whole window. Admission, returned delays, and remaining-token counts are unchanged.
diff --git a/repos/effect/.changeset/rcmap-invalidation-release.md b/repos/effect/.changeset/pre/rcmap-invalidation-release.md
similarity index 100%
rename from repos/effect/.changeset/rcmap-invalidation-release.md
rename to repos/effect/.changeset/pre/rcmap-invalidation-release.md
diff --git a/repos/effect/.changeset/pre/rcmap-throwing-lookup.md b/repos/effect/.changeset/pre/rcmap-throwing-lookup.md
new file mode 100644
index 000000000..2e8027ee5
--- /dev/null
+++ b/repos/effect/.changeset/pre/rcmap-throwing-lookup.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `RcMap` entries getting stuck when the lookup function throws synchronously. Later borrowers now receive the defect, and unused entries are released according to their idle TTL instead of permanently consuming capacity.
diff --git a/repos/effect/.changeset/pre/rcref-acquisition-shutdown.md b/repos/effect/.changeset/pre/rcref-acquisition-shutdown.md
new file mode 100644
index 000000000..1ee8dedc2
--- /dev/null
+++ b/repos/effect/.changeset/pre/rcref-acquisition-shutdown.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Keep `RcRef` closed when an in-flight acquisition finishes after its owning scope has closed. Release the late-acquired resource and interrupt waiting borrowers instead of making the resource available again.
diff --git a/repos/effect/.changeset/pre/rcref-release-ownership.md b/repos/effect/.changeset/pre/rcref-release-ownership.md
new file mode 100644
index 000000000..53bd9947b
--- /dev/null
+++ b/repos/effect/.changeset/pre/rcref-release-ownership.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Prevent `RcRef` borrower cleanup from discarding replacement resources after invalidation or reopening a reference after its owner scope has closed.
diff --git a/repos/effect/.changeset/pre/reason-annotate-context-only.md b/repos/effect/.changeset/pre/reason-annotate-context-only.md
new file mode 100644
index 000000000..12b1b2c39
--- /dev/null
+++ b/repos/effect/.changeset/pre/reason-annotate-context-only.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Type `Cause.Reason#annotate` as accepting a `Context` only.
diff --git a/repos/effect/.changeset/pre/release-pg-savepoints.md b/repos/effect/.changeset/pre/release-pg-savepoints.md
new file mode 100644
index 000000000..74e0f8312
--- /dev/null
+++ b/repos/effect/.changeset/pre/release-pg-savepoints.md
@@ -0,0 +1,15 @@
+---
+"effect": patch
+"@effect/sql-pg": patch
+"@effect/sql-pglite": patch
+"@effect/sql-mysql2": patch
+"@effect/sql-libsql": patch
+"@effect/sql-sqlite-node": patch
+"@effect/sql-sqlite-bun": patch
+"@effect/sql-sqlite-react-native": patch
+"@effect/sql-sqlite-wasm": patch
+---
+
+Release savepoints after nested transactions succeed or successfully roll back in PostgreSQL, PGlite, MySQL, libSQL, and the Node, Bun, React Native, and WASM SQLite clients. This frees PostgreSQL transaction locks before the outer transaction completes.
+
+Custom SQL clients can opt in through the new `releaseSavepoint` option. Clients that omit it are unchanged.
diff --git a/repos/effect/.changeset/remove-msgpack.md b/repos/effect/.changeset/pre/remove-msgpack.md
similarity index 100%
rename from repos/effect/.changeset/remove-msgpack.md
rename to repos/effect/.changeset/pre/remove-msgpack.md
diff --git a/repos/effect/.changeset/pre/rename-schema-arbitrary-filter-constraint.md b/repos/effect/.changeset/pre/rename-schema-arbitrary-filter-constraint.md
new file mode 100644
index 000000000..be77fbf9d
--- /dev/null
+++ b/repos/effect/.changeset/pre/rename-schema-arbitrary-filter-constraint.md
@@ -0,0 +1,7 @@
+---
+"effect": patch
+---
+
+Rename `Schema.Annotations.ToArbitrary.Constraint` to `Schema.Annotations.ToArbitrary.FilterConstraint`.
+
+Code that refers to the previous type name should update its type annotations to use `FilterConstraint`.
diff --git a/repos/effect/.changeset/pre/rename-schema-transform-effect.md b/repos/effect/.changeset/pre/rename-schema-transform-effect.md
new file mode 100644
index 000000000..273dfb7e4
--- /dev/null
+++ b/repos/effect/.changeset/pre/rename-schema-transform-effect.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Rename `SchemaGetter.transformOrFail` to `SchemaGetter.transformEffect` and `SchemaTransformation.transformOrFail` to `SchemaTransformation.transformEffect`. Replace calls to the old names with their `transformEffect` equivalents.
diff --git a/repos/effect/.changeset/pre/repeat-or-else-metadata-argument.md b/repos/effect/.changeset/pre/repeat-or-else-metadata-argument.md
new file mode 100644
index 000000000..1e0828ffa
--- /dev/null
+++ b/repos/effect/.changeset/pre/repeat-or-else-metadata-argument.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Correct the `Effect.repeatOrElse` fallback type to expose the previous step's `Schedule.Metadata`, matching the existing runtime value.
diff --git a/repos/effect/.changeset/pre/report-mcp-tool-failures.md b/repos/effect/.changeset/pre/report-mcp-tool-failures.md
new file mode 100644
index 000000000..531baac79
--- /dev/null
+++ b/repos/effect/.changeset/pre/report-mcp-tool-failures.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Report recovered MCP toolkit failures and defects to configured `ErrorReporter`s, including declared tool failures returned with `isError: true`.
diff --git a/repos/effect/.changeset/pre/request-cache-cancellation.md b/repos/effect/.changeset/pre/request-cache-cancellation.md
new file mode 100644
index 000000000..9feb720d7
--- /dev/null
+++ b/repos/effect/.changeset/pre/request-cache-cancellation.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `RequestResolver.withCache` retaining abandoned entries when a pending request is cancelled
diff --git a/repos/effect/.changeset/pre/request-persisted-resolver-failures.md b/repos/effect/.changeset/pre/request-persisted-resolver-failures.md
new file mode 100644
index 000000000..3268c2646
--- /dev/null
+++ b/repos/effect/.changeset/pre/request-persisted-resolver-failures.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve completed results and propagate resolver failures from `RequestResolver.persisted`.
diff --git a/repos/effect/.changeset/pre/request-race-cache.md b/repos/effect/.changeset/pre/request-race-cache.md
new file mode 100644
index 000000000..2ae0bcc17
--- /dev/null
+++ b/repos/effect/.changeset/pre/request-race-cache.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Keep completed results in `RequestResolver.withCache` when a losing `RequestResolver.race` resolver is interrupted after the winner completes, avoiding repeated backend requests on subsequent equal lookups.
diff --git a/repos/effect/.changeset/pre/request-resolver-failure-causes.md b/repos/effect/.changeset/pre/request-resolver-failure-causes.md
new file mode 100644
index 000000000..a77da246a
--- /dev/null
+++ b/repos/effect/.changeset/pre/request-resolver-failure-causes.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve typed errors, defects, and interrupts from `RequestResolver.fromEffectTagged` handlers.
diff --git a/repos/effect/.changeset/pre/request-resolver-iterable-results.md b/repos/effect/.changeset/pre/request-resolver-iterable-results.md
new file mode 100644
index 000000000..59f70109e
--- /dev/null
+++ b/repos/effect/.changeset/pre/request-resolver-iterable-results.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `RequestResolver.fromEffectTagged` to consume handler results as an iterable, allowing arrays, iterators, and generators to resolve requests in order.
diff --git a/repos/effect/.changeset/pre/required-keys-index-signatures.md b/repos/effect/.changeset/pre/required-keys-index-signatures.md
new file mode 100644
index 000000000..61a9a583d
--- /dev/null
+++ b/repos/effect/.changeset/pre/required-keys-index-signatures.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Types.RequiredKeys` dropping named required keys on types with index signatures. Derived type annotations may need to include these keys.
diff --git a/repos/effect/.changeset/pre/resolved-client-urls.md b/repos/effect/.changeset/pre/resolved-client-urls.md
new file mode 100644
index 000000000..b3554d530
--- /dev/null
+++ b/repos/effect/.changeset/pre/resolved-client-urls.md
@@ -0,0 +1,8 @@
+---
+"@effect/platform-browser": patch
+"@effect/platform-node": patch
+"effect": patch
+---
+
+Add `HttpClientResponse.url`, including query parameters and excluding the hash. When redirects are followed, it reports
+the final URL.
diff --git a/repos/effect/.changeset/pre/rpc-falsy-control-ids.md b/repos/effect/.changeset/pre/rpc-falsy-control-ids.md
new file mode 100644
index 000000000..0c2d815d7
--- /dev/null
+++ b/repos/effect/.changeset/pre/rpc-falsy-control-ids.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve zero and empty-string request IDs in JSON-RPC control messages.
diff --git a/repos/effect/.changeset/pre/scheduler-global-scope-timers.md b/repos/effect/.changeset/pre/scheduler-global-scope-timers.md
new file mode 100644
index 000000000..af24f0d77
--- /dev/null
+++ b/repos/effect/.changeset/pre/scheduler-global-scope-timers.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+The default scheduler falls back to a microtask when setting a timer throws. Cloudflare Workers disallow timers in global scope, so an effect that yielded while running at module load failed with "Disallowed operation called within global scope".
diff --git a/repos/effect/.changeset/pre/schema-api-cleanup.md b/repos/effect/.changeset/pre/schema-api-cleanup.md
new file mode 100644
index 000000000..b7a4c3d72
--- /dev/null
+++ b/repos/effect/.changeset/pre/schema-api-cleanup.md
@@ -0,0 +1,11 @@
+---
+"effect": patch
+---
+
+Move the built-in schema revivers from `Schema` to `SchemaRepresentation`.
+Rename the reviver constructors to `makeReviverDeclaration`,
+`makeReviverFilter`, and `makeReviverFilterGroup`.
+
+Change `Schema.toEncoderXml` to fail with `SchemaIssue.Issue` directly instead
+of wrapping failures in `SchemaError`. Consumers that read `error.issue` should
+now use the error value itself.
diff --git a/repos/effect/.changeset/pre/schema-array-leaf-aggregation.md b/repos/effect/.changeset/pre/schema-array-leaf-aggregation.md
new file mode 100644
index 000000000..daf0561a8
--- /dev/null
+++ b/repos/effect/.changeset/pre/schema-array-leaf-aggregation.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve array-valued leaves when `SchemaGetter.makeTreeRecord` aggregates duplicate paths.
diff --git a/repos/effect/.changeset/pre/schema-binary-preserve-bom.md b/repos/effect/.changeset/pre/schema-binary-preserve-bom.md
new file mode 100644
index 000000000..2248164f1
--- /dev/null
+++ b/repos/effect/.changeset/pre/schema-binary-preserve-bom.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve leading U+FEFF characters in SchemaBinary string values when decoding.
diff --git a/repos/effect/.changeset/pre/schema-interpreter-backports.md b/repos/effect/.changeset/pre/schema-interpreter-backports.md
new file mode 100644
index 000000000..87da660f4
--- /dev/null
+++ b/repos/effect/.changeset/pre/schema-interpreter-backports.md
@@ -0,0 +1,23 @@
+---
+"effect": patch
+---
+
+Align Schema construction and parsing semantics, simplify parse options, accept inherited declared fields, and move Union settings into a node-local options object.
+
+### Breaking changes
+
+- `Class.make`, `Class.makeOption`, and `Class.makeEffect` now return an existing instance unchanged. This avoids duplicate initialization and makes the construction APIs consistent. Use `new MyClass(input)` when a distinct instance is required.
+
+- `Literal(0)` and `Literal(-0)` continue to accept either signed zero, but decoding and encoding now preserve the input sign. Add an explicit transformation when a canonical sign is required.
+
+- `parseOptions` annotations no longer affect parsing. Options passed when creating or calling a decoder, encoder, or constructor adapter now apply to the complete operation. Move operation-wide settings from annotations to the relevant parser API.
+
+- `propertyOrder` has been removed from `ParseOptions` because preserving input order required a separate, rarely used object reconstruction path. Schema parsing no longer guarantees that decoded object keys follow their input order. Remove the option and apply any required presentation or serialization order after parsing.
+
+- `concurrency` now applies only to product children: tuple elements, array elements, struct fields, record entries, and structs with rest. It follows `Effect.forEach` semantics, defaults to sequential execution, and applies independently at every nested product. Union candidates remain sequential because speculative candidate evaluation can run transformations that are not selected. Existing product parsing can keep the option. Replace code that relied on concurrent Union candidates with explicitly coordinated parser calls. With concurrent Record key transformations, completion order determines the retained value when transformed keys collide.
+
+- `onExcessProperty: "preserve"` has been removed because it allowed unvalidated values absent from the schema type to cross the parsing boundary. Model additional properties with `Record` or `StructWithRest`; `"ignore"` and `"error"` remain available.
+
+- Declared `Struct` fields may now be inherited and are copied to own properties in the output. Dynamic `Record` index signatures remain own-only, while finite literal record keys are declared and may be inherited. The `__proto__` field remains own-only. Check ownership before parsing when every declared field must be own.
+
+- `SchemaAST.Union.mode` moved to `SchemaAST.Union.options?.mode` so node-local constructor settings live in one options object instead of special top-level fields. An absent value defaults to `"anyOf"`. `SchemaRepresentation.Union` now serializes `{ options: { mode: "oneOf" } }`; update direct AST access and regenerate or migrate persisted representation documents. The public `Schema.Union(members, { mode })` call is unchanged.
diff --git a/repos/effect/.changeset/pre/schema-json-schema-options.md b/repos/effect/.changeset/pre/schema-json-schema-options.md
new file mode 100644
index 000000000..e358933bc
--- /dev/null
+++ b/repos/effect/.changeset/pre/schema-json-schema-options.md
@@ -0,0 +1,17 @@
+---
+"effect": patch
+---
+
+JSON Schema generation now follows the canonical JSON codec more closely and leaves unmodeled object properties open by default, matching Effect decoding.
+
+### Breaking changes
+
+`Schema.ToJsonSchemaOptions.additionalProperties` has been replaced by `onExcessProperty`:
+
+- Replace `{ additionalProperties: true }` with `{ onExcessProperty: "ignore" }`.
+- Replace `{ additionalProperties: false }` with `{ onExcessProperty: "error" }`.
+- Replace a schema-valued `additionalProperties` option with `Schema.Record` or `Schema.StructWithRest`.
+
+`Schema.Enum` now rejects non-finite numeric members. `Schema.isMultipleOf` now rejects zero and non-finite divisors, and normalizes negative divisors.
+
+Generation is more accurate for index signatures, empty structs, template literal alternatives, capitalized strings, and unique symbols. Conjunctive index keys remain open by default; `onExcessProperty: "error"` constrains them with `propertyNames`.
diff --git a/repos/effect/.changeset/pre/scoped-cache-invalidate-all-reentrancy.md b/repos/effect/.changeset/pre/scoped-cache-invalidate-all-reentrancy.md
new file mode 100644
index 000000000..2f7bc048a
--- /dev/null
+++ b/repos/effect/.changeset/pre/scoped-cache-invalidate-all-reentrancy.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `ScopedCache.invalidateAll` discarding entries created by reentrant resource finalizers without releasing them. Entries are now removed before their finalizers run, so replacement resources remain cached and are released when the cache closes.
diff --git a/repos/effect/.changeset/pre/scoped-cache-refresh-lookup-defects.md b/repos/effect/.changeset/pre/scoped-cache-refresh-lookup-defects.md
new file mode 100644
index 000000000..412dc00d9
--- /dev/null
+++ b/repos/effect/.changeset/pre/scoped-cache-refresh-lookup-defects.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Capture synchronous defects thrown by `ScopedCache.refresh` lookup callbacks.
diff --git a/repos/effect/.changeset/pre/scoped-log-nan-restoration.md b/repos/effect/.changeset/pre/scoped-log-nan-restoration.md
new file mode 100644
index 000000000..07413320b
--- /dev/null
+++ b/repos/effect/.changeset/pre/scoped-log-nan-restoration.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Effect.annotateLogsScoped` to restore or remove unchanged `NaN` annotations when the scope closes.
diff --git a/repos/effect/.changeset/pre/select-prompt-optional-message.md b/repos/effect/.changeset/pre/select-prompt-optional-message.md
new file mode 100644
index 000000000..1165109f1
--- /dev/null
+++ b/repos/effect/.changeset/pre/select-prompt-optional-message.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Make `message` optional for `Prompt.Select` and `Prompt.MultiSelect`. When omitted, prompts display only the choices and submission shows a tick followed by the selected titles. `Prompt.AutoComplete` still requires a message.
diff --git a/repos/effect/.changeset/pre/service-interface-const.md b/repos/effect/.changeset/pre/service-interface-const.md
new file mode 100644
index 000000000..3018bd030
--- /dev/null
+++ b/repos/effect/.changeset/pre/service-interface-const.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Use branded interfaces for `Reactivity`, `LanguageModel`, `EmbeddingModel`, and `Chat`. Refer to each service's same-name type instead of `.Service` or `["Service"]`; custom implementations must include `[TypeId]: TypeId`.
diff --git a/repos/effect/.changeset/pre/shaky-terms-push.md b/repos/effect/.changeset/pre/shaky-terms-push.md
new file mode 100644
index 000000000..9e004ee1e
--- /dev/null
+++ b/repos/effect/.changeset/pre/shaky-terms-push.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix HttpRouter nested prefixed application order
diff --git a/repos/effect/.changeset/pre/sharding-registration-context-overrides.md b/repos/effect/.changeset/pre/sharding-registration-context-overrides.md
new file mode 100644
index 000000000..67c74a7d1
--- /dev/null
+++ b/repos/effect/.changeset/pre/sharding-registration-context-overrides.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Honor services explicitly supplied when registering cluster entities while retaining construction-context services as fallbacks.
diff --git a/repos/effect/.changeset/shy-seals-smile.md b/repos/effect/.changeset/pre/shy-seals-smile.md
similarity index 100%
rename from repos/effect/.changeset/shy-seals-smile.md
rename to repos/effect/.changeset/pre/shy-seals-smile.md
diff --git a/repos/effect/.changeset/pre/skip-disabled-stack-capture.md b/repos/effect/.changeset/pre/skip-disabled-stack-capture.md
new file mode 100644
index 000000000..cbdf29e4f
--- /dev/null
+++ b/repos/effect/.changeset/pre/skip-disabled-stack-capture.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Skip optional stack capture when `Error.stackTraceLimit` is zero.
diff --git a/repos/effect/.changeset/pre/small-basic-bundle.md b/repos/effect/.changeset/pre/small-basic-bundle.md
new file mode 100644
index 000000000..eef21766d
--- /dev/null
+++ b/repos/effect/.changeset/pre/small-basic-bundle.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Reduce the basic Effect bundle size by keeping cause deduplication local, making encoding lookup tables tree-shakeable, removing redundant cause field declarations, and simplifying primitive hash dispatch without changing hash values.
diff --git a/repos/effect/.changeset/pre/socket-paused-websocket-handoff.md b/repos/effect/.changeset/pre/socket-paused-websocket-handoff.md
new file mode 100644
index 000000000..b8ee1aaef
--- /dev/null
+++ b/repos/effect/.changeset/pre/socket-paused-websocket-handoff.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Resume paused WebSockets after their readers take ownership.
diff --git a/repos/effect/.changeset/pre/socket-websocket-text-byte-watermark.md b/repos/effect/.changeset/pre/socket-websocket-text-byte-watermark.md
new file mode 100644
index 000000000..bd35e74b5
--- /dev/null
+++ b/repos/effect/.changeset/pre/socket-websocket-text-byte-watermark.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Count buffered WebSocket text frames by their UTF-8 byte length when enforcing `highWaterMark`.
diff --git a/repos/effect/.changeset/pre/split-lines-completed-cr.md b/repos/effect/.changeset/pre/split-lines-completed-cr.md
new file mode 100644
index 000000000..5a3608f58
--- /dev/null
+++ b/repos/effect/.changeset/pre/split-lines-completed-cr.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Emit CR-terminated lines from `Stream.splitLines` without pulling upstream again.
diff --git a/repos/effect/.changeset/spotty-masks-own.md b/repos/effect/.changeset/pre/spotty-masks-own.md
similarity index 100%
rename from repos/effect/.changeset/spotty-masks-own.md
rename to repos/effect/.changeset/pre/spotty-masks-own.md
diff --git a/repos/effect/.changeset/pre/sql-event-journal-callback-errors.md b/repos/effect/.changeset/pre/sql-event-journal-callback-errors.md
new file mode 100644
index 000000000..2d3016175
--- /dev/null
+++ b/repos/effect/.changeset/pre/sql-event-journal-callback-errors.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve callback error identity in `SqlEventJournal.write` and `SqlEventJournal.withRemoteUncommited`.
diff --git a/repos/effect/.changeset/pre/sql-message-storage-joined-reply-id.md b/repos/effect/.changeset/pre/sql-message-storage-joined-reply-id.md
new file mode 100644
index 000000000..37a3db749
--- /dev/null
+++ b/repos/effect/.changeset/pre/sql-message-storage-joined-reply-id.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve reply IDs in SQL-backed `MessageStorage.unprocessedMessagesById` reads.
diff --git a/repos/effect/.changeset/pre/sql-nested-placeholder-cache.md b/repos/effect/.changeset/pre/sql-nested-placeholder-cache.md
new file mode 100644
index 000000000..978826051
--- /dev/null
+++ b/repos/effect/.changeset/pre/sql-nested-placeholder-cache.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix placeholder numbering for cached fragments used in returning helpers.
diff --git a/repos/effect/.changeset/pre/sql-optional-span-propagation.md b/repos/effect/.changeset/pre/sql-optional-span-propagation.md
new file mode 100644
index 000000000..f925c1ad0
--- /dev/null
+++ b/repos/effect/.changeset/pre/sql-optional-span-propagation.md
@@ -0,0 +1,12 @@
+---
+"effect": patch
+---
+
+Add `Statement.SpanPropagationEnabled` to scope driver span parenting under `sql.execute` for any SQL client. Disabled by default.
+
+```ts
+import { Effect } from "effect"
+import { Statement } from "effect/unstable/sql"
+
+query.pipe(Effect.provideService(Statement.SpanPropagationEnabled, true))
+```
diff --git a/repos/effect/.changeset/pre/sql-pg-cancel-pending.md b/repos/effect/.changeset/pre/sql-pg-cancel-pending.md
new file mode 100644
index 000000000..3c0967bf0
--- /dev/null
+++ b/repos/effect/.changeset/pre/sql-pg-cancel-pending.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-pg": patch
+---
+
+Retire pooled PostgreSQL sessions with an unconfirmed `CancelRequest`, preventing a delayed cancel from reaching a later checkout. This includes interrupts sent while idle. The current checkout and unpooled sessions remain exposed to their own late cancel.
diff --git a/repos/effect/.changeset/pre/sql-pg-timestamp-date.md b/repos/effect/.changeset/pre/sql-pg-timestamp-date.md
new file mode 100644
index 000000000..7f90d4881
--- /dev/null
+++ b/repos/effect/.changeset/pre/sql-pg-timestamp-date.md
@@ -0,0 +1,12 @@
+---
+"@effect/sql-pg": patch
+---
+
+Decode `timestamp` and `timestamptz` values, including array elements, as `Date` instead of epoch milliseconds. Their encoders, including `PgTypes.timestamp` and `PgTypes.timestamptz`, accept either form. Precision remains milliseconds.
+
+### Breaking changes
+
+- Numeric readers must call `date.getTime()` or restore numeric codecs with `PgTypes.register` or a client `Registry` passed as `types`.
+- `infinity`, `-infinity` and values outside the JavaScript `Date` range decode to an invalid `Date`. Numeric `±Infinity` still encodes PostgreSQL's sentinels; encoding an invalid `Date` fails with `PgTypes.CodecError`.
+
+Date parameters bind as `timestamptz`. Inserting one into a `timestamp` column applies the session `TimeZone`. Use UTC or `PgTypes.timestamp(value)` to preserve its UTC fields. `timestamptz` round trips preserve the instant regardless of session timezone.
diff --git a/repos/effect/.changeset/pre/sql-pg-unknown-oid-text.md b/repos/effect/.changeset/pre/sql-pg-unknown-oid-text.md
new file mode 100644
index 000000000..1e9535968
--- /dev/null
+++ b/repos/effect/.changeset/pre/sql-pg-unknown-oid-text.md
@@ -0,0 +1,9 @@
+---
+"@effect/sql-pg": patch
+---
+
+Decode unregistered OIDs as UTF-8 text so scalar enums return string labels.
+
+Other binary user-defined types, including enum arrays, may produce garbled text or fail UTF-8 decoding. Decode failures close the connection, failing its pending queries and discarding transactions and `LISTEN` subscriptions; the pool replaces it.
+
+Register scalar codecs with `PgTypes.register`. For arrays, use `PgTypes.makeRegistry().register(elementOid, codec, { arrayOid })` and pass the registry as the client's `types` option.
diff --git a/repos/effect/.changeset/pre/sql-returning-identifier.md b/repos/effect/.changeset/pre/sql-returning-identifier.md
new file mode 100644
index 000000000..7922dc865
--- /dev/null
+++ b/repos/effect/.changeset/pre/sql-returning-identifier.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix SQL returning helpers to compile identifiers with dialect-specific escaping.
diff --git a/repos/effect/.changeset/pre/sql-runner-requested-shard-results.md b/repos/effect/.changeset/pre/sql-runner-requested-shard-results.md
new file mode 100644
index 000000000..bbce8efe4
--- /dev/null
+++ b/repos/effect/.changeset/pre/sql-runner-requested-shard-results.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Ensure PostgreSQL shard acquisition and refresh return only the requested shards.
diff --git a/repos/effect/.changeset/pre/sqlite-bun-transaction-export.md b/repos/effect/.changeset/pre/sqlite-bun-transaction-export.md
new file mode 100644
index 000000000..52739714a
--- /dev/null
+++ b/repos/effect/.changeset/pre/sqlite-bun-transaction-export.md
@@ -0,0 +1,6 @@
+---
+"@effect/sql-sqlite-bun": patch
+---
+
+Allow database exports inside `withTransaction` to complete instead of waiting indefinitely. The exported snapshot
+includes the transaction's uncommitted writes, while exports outside that transaction still wait for it to finish.
diff --git a/repos/effect/.changeset/pre/sqlite-do-native-completion.md b/repos/effect/.changeset/pre/sqlite-do-native-completion.md
new file mode 100644
index 000000000..75867a216
--- /dev/null
+++ b/repos/effect/.changeset/pre/sqlite-do-native-completion.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-sqlite-do": patch
+---
+
+Propagate native Durable Object transaction completion failures as `SqlError`.
diff --git a/repos/effect/.changeset/pre/sqlite-do-stream-errors.md b/repos/effect/.changeset/pre/sqlite-do-stream-errors.md
new file mode 100644
index 000000000..af0b108b0
--- /dev/null
+++ b/repos/effect/.changeset/pre/sqlite-do-stream-errors.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-sqlite-do": patch
+---
+
+Report synchronous Durable Object SQL streaming failures as recoverable `SqlError` values.
diff --git a/repos/effect/.changeset/pre/sqlite-node-unprepared-errors.md b/repos/effect/.changeset/pre/sqlite-node-unprepared-errors.md
new file mode 100644
index 000000000..be4ae32fa
--- /dev/null
+++ b/repos/effect/.changeset/pre/sqlite-node-unprepared-errors.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-sqlite-node": patch
+---
+
+Capture unprepared statement preparation failures as typed `SqlError`s.
diff --git a/repos/effect/.changeset/pre/sqlite-wasm-messageport-startup.md b/repos/effect/.changeset/pre/sqlite-wasm-messageport-startup.md
new file mode 100644
index 000000000..bd2530e4c
--- /dev/null
+++ b/repos/effect/.changeset/pre/sqlite-wasm-messageport-startup.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-sqlite-wasm": patch
+---
+
+Start incoming MessagePort queues after registering the SQLite WASM client and OPFS worker listeners. Fresh ports, including a SharedWorker's client port, no longer require manual activation to receive ready messages and query replies or process worker requests.
diff --git a/repos/effect/.changeset/pre/sqlite-wasm-statement-columns.md b/repos/effect/.changeset/pre/sqlite-wasm-statement-columns.md
new file mode 100644
index 000000000..889b6cc7d
--- /dev/null
+++ b/repos/effect/.changeset/pre/sqlite-wasm-statement-columns.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-sqlite-wasm": patch
+---
+
+Preserve statement-specific column names in SQLite WASM worker-backed query results.
diff --git a/repos/effect/.changeset/pre/sqlite-wasm-worker-error-metadata.md b/repos/effect/.changeset/pre/sqlite-wasm-worker-error-metadata.md
new file mode 100644
index 000000000..b4e0486cc
--- /dev/null
+++ b/repos/effect/.changeset/pre/sqlite-wasm-worker-error-metadata.md
@@ -0,0 +1,5 @@
+---
+"@effect/sql-sqlite-wasm": patch
+---
+
+Preserve native SQLite error codes in OPFS worker replies so the client can classify constraint failures as `ConstraintError` instead of `UnknownError`. For coded worker failures, `SqlError.reason.cause` now contains a `{ message, code }` record instead of a string.
diff --git a/repos/effect/.changeset/pre/sqlmodel-insert-decoding-services.md b/repos/effect/.changeset/pre/sqlmodel-insert-decoding-services.md
new file mode 100644
index 000000000..58b1a15a3
--- /dev/null
+++ b/repos/effect/.changeset/pre/sqlmodel-insert-decoding-services.md
@@ -0,0 +1,7 @@
+---
+"effect": patch
+---
+
+Include the model's decoding services in the public requirements of `SqlModel.makeResolvers().insert`, alongside its existing input-encoding services.
+
+This intentionally tightens compile-time checking: previously accepted callers must now provide the services already needed to decode inserted rows at runtime. Provide those services when executing the insert with `SqlResolver.request`. `insertVoid` still requires only input-encoding services, and service-free models need no changes. Runtime behavior is unchanged.
diff --git a/repos/effect/.changeset/pre/stream-rechunk-large-source.md b/repos/effect/.changeset/pre/stream-rechunk-large-source.md
new file mode 100644
index 000000000..f96dfb7d3
--- /dev/null
+++ b/repos/effect/.changeset/pre/stream-rechunk-large-source.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Stream.rechunk` failing on large source chunks.
diff --git a/repos/effect/.changeset/pre/strict-byte-size-input.md b/repos/effect/.changeset/pre/strict-byte-size-input.md
new file mode 100644
index 000000000..231a6d587
--- /dev/null
+++ b/repos/effect/.changeset/pre/strict-byte-size-input.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Restrict `ByteSize.Input` strings to canonical non-negative integers with recognized units, rejecting malformed literals at compile time. Parse external strings and fractional quantities with `ByteSize.fromString` or `ByteSize.fromStringUnsafe` before passing them to APIs accepting `ByteSize.Input`.
diff --git a/repos/effect/.changeset/strict-content-length.md b/repos/effect/.changeset/pre/strict-content-length.md
similarity index 100%
rename from repos/effect/.changeset/strict-content-length.md
rename to repos/effect/.changeset/pre/strict-content-length.md
diff --git a/repos/effect/.changeset/strict-cookie-names.md b/repos/effect/.changeset/pre/strict-cookie-names.md
similarity index 100%
rename from repos/effect/.changeset/strict-cookie-names.md
rename to repos/effect/.changeset/pre/strict-cookie-names.md
diff --git a/repos/effect/.changeset/pre/strict-mcp-tool-inputs.md b/repos/effect/.changeset/pre/strict-mcp-tool-inputs.md
new file mode 100644
index 000000000..05d9deefc
--- /dev/null
+++ b/repos/effect/.changeset/pre/strict-mcp-tool-inputs.md
@@ -0,0 +1,13 @@
+---
+"effect": patch
+---
+
+Honor `Tool.Strict` in MCP input schemas and argument validation. Strict dynamic tools require Effect schemas; raw JSON Schema is rejected at registration.
+
+Support identified input schemas for non-strict tools. Invalid arguments use `InvalidParams` on protocols before 2025-11-25 and `isError: true` results on newer protocols.
+
+Distinguish validation failures from declared handler failures. Declared failures return `isError: true` without `structuredContent`: error mode uses `Error.message` or schema-encoded text, and return mode uses the encoded payload. Declared failures do not produce internal-error diagnostics.
+
+Log and report internal failures, including defects and encoding errors, while keeping client messages generic.
+
+Allow `Toolkit.handle` to accept `SchemaAST.ParseOptions` for parameter decoding. Expose the `Toolkit.FailureOrigin` cause annotation and shared `Tool.FailureOrigin` type, with the same origin available in `Tool.HandlerResult.failureOrigin` on returned failures.
diff --git a/repos/effect/.changeset/pre/struct-numeric-selection.md b/repos/effect/.changeset/pre/struct-numeric-selection.md
new file mode 100644
index 000000000..7a947d2af
--- /dev/null
+++ b/repos/effect/.changeset/pre/struct-numeric-selection.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Honor numeric property selectors in Struct selection and mapping utilities.
diff --git a/repos/effect/.changeset/pre/structural-schema-nodes.md b/repos/effect/.changeset/pre/structural-schema-nodes.md
new file mode 100644
index 000000000..41d9897d2
--- /dev/null
+++ b/repos/effect/.changeset/pre/structural-schema-nodes.md
@@ -0,0 +1,7 @@
+---
+"effect": patch
+---
+
+Expose `SchemaAST` nodes, `SchemaIssue` nodes, `SchemaGetter.Getter`, and the `SchemaTransformation` models through structural instance interfaces instead of concrete class declarations. The constructors remain usable with `new` and `instanceof`, but their `prototype` is no longer part of the public TypeScript API. Replace type-level access through a constructor's `prototype` with the corresponding named instance interface, such as `SchemaGetter.Getter<T, E, R>`.
+
+`SchemaAST.Base` is no longer exported. Use `SchemaAST.AST` when accepting any AST node, and use the `SchemaAST.is*` guards to narrow individual variants.
diff --git a/repos/effect/.changeset/pre/synchronized-ref-modify-some-effect-currying.md b/repos/effect/.changeset/pre/synchronized-ref-modify-some-effect-currying.md
new file mode 100644
index 000000000..8691cfd97
--- /dev/null
+++ b/repos/effect/.changeset/pre/synchronized-ref-modify-some-effect-currying.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix the curried `SynchronizedRef.modifySomeEffect` overload to accept only the callback, matching its runtime behavior.
diff --git a/repos/effect/.changeset/pre/synchronized-ref-not-ref.md b/repos/effect/.changeset/pre/synchronized-ref-not-ref.md
new file mode 100644
index 000000000..13bee8c91
--- /dev/null
+++ b/repos/effect/.changeset/pre/synchronized-ref-not-ref.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Stop declaring `SynchronizedRef` as a subtype of `Ref`, preventing `Ref` combinators from accepting values that do not implement the required runtime representation.
diff --git a/repos/effect/.changeset/pre/tap-defect-saved-error-inference.md b/repos/effect/.changeset/pre/tap-defect-saved-error-inference.md
new file mode 100644
index 000000000..9c85a3983
--- /dev/null
+++ b/repos/effect/.changeset/pre/tap-defect-saved-error-inference.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve the source error type when a saved `Effect.tapDefect` operator is applied. The source error is now inferred from each application instead of when the operator is created. Runtime behavior is unchanged.
diff --git a/repos/effect/.changeset/tcp-schema-binary-default.md b/repos/effect/.changeset/pre/tcp-schema-binary-default.md
similarity index 100%
rename from repos/effect/.changeset/tcp-schema-binary-default.md
rename to repos/effect/.changeset/pre/tcp-schema-binary-default.md
diff --git a/repos/effect/.changeset/pre/template-literal-parts-without-encoding.md b/repos/effect/.changeset/pre/template-literal-parts-without-encoding.md
new file mode 100644
index 000000000..246f3b36a
--- /dev/null
+++ b/repos/effect/.changeset/pre/template-literal-parts-without-encoding.md
@@ -0,0 +1,15 @@
+---
+"effect": patch
+---
+
+Separate template literal validation from transformed tuple parsing. `TemplateLiteralParser` now propagates its parts' decoding and encoding service requirements.
+
+### Breaking changes
+
+`Schema.TemplateLiteral` and `SchemaAST.TemplateLiteral` now throw during construction when a part contains an encoding, including inside unions and nested templates. This also rejects transformations whose decoded and encoded types are equal. Brands and supported checks without encodings remain valid.
+
+Use `Schema.Literals([0, 1])` to describe bit spellings or `Schema.Finite` to describe finite numeric spellings. Use `Schema.TemplateLiteralParser` when you need to decode transformed parts into a tuple. Explicit `Schema.toType` or `Schema.toEncoded` projections can remove an encoding, but do not necessarily preserve the strings accepted by the old template. For example, a `Finite` part rejects the empty segment accepted by `FiniteFromString`.
+
+`Schema.toEncoded(Schema.TemplateLiteralParser(...))` now validates the structure of the template instead of accepting any string. Use `Schema.String` when unrestricted strings are intended.
+
+When parser parts require services, provide those services to the corresponding decoding or encoding effect. These requirements were previously omitted from the parser's types.
diff --git a/repos/effect/.changeset/pre/testschema-own-field-asts.md b/repos/effect/.changeset/pre/testschema-own-field-asts.md
new file mode 100644
index 000000000..42b34e752
--- /dev/null
+++ b/repos/effect/.changeset/pre/testschema-own-field-asts.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `TestSchema.Asserts.ast.fields.equals` to compare ASTs for all own struct fields, including symbol and non-enumerable keys. Equivalent field schemas now compare equally regardless of schema instance identity, while differing ASTs and distinct symbol keys remain unequal.
diff --git a/repos/effect/.changeset/pre/thin-ends-hug.md b/repos/effect/.changeset/pre/thin-ends-hug.md
new file mode 100644
index 000000000..e3d613b8a
--- /dev/null
+++ b/repos/effect/.changeset/pre/thin-ends-hug.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+dispatch websocket events directly
diff --git a/repos/effect/.changeset/pre/tidy-apis-parse.md b/repos/effect/.changeset/pre/tidy-apis-parse.md
new file mode 100644
index 000000000..cf51526b5
--- /dev/null
+++ b/repos/effect/.changeset/pre/tidy-apis-parse.md
@@ -0,0 +1,11 @@
+---
+"effect": patch
+---
+
+Add `HttpApi.ParseOptions` to configure server and client codecs at the API, group, or endpoint level.
+
+`Sse.decodeSchema` and `ChannelSchema.decode` accept parse options, and `Schema.Cause` encodes reasons to their wire fields.
+
+SSE decoding omits absent IDs, including with default options. Use `Schema.optional(Schema.String)` instead of `Schema.UndefinedOr(Schema.String)` for IDs. With `onExcessProperty: "error"`, declare `event` (default: `"message"`) and any `id`, including inherited IDs.
+
+`HttpApiSchema.StreamSse` data-mode types and OpenAPI schemas now make `id` optional.
diff --git a/repos/effect/.changeset/pre/tidy-lobsters-count.md b/repos/effect/.changeset/pre/tidy-lobsters-count.md
new file mode 100644
index 000000000..8af9e44a1
--- /dev/null
+++ b/repos/effect/.changeset/pre/tidy-lobsters-count.md
@@ -0,0 +1,7 @@
+---
+"effect": patch
+---
+
+Improve Schema-derived BigInt and BigDecimal arbitraries with wider magnitude, precision, and exponent coverage and numeric boundary shrinking.
+
+Cover intermediate magnitudes up to large one-sided BigInt bounds, handle BigDecimal bounds with widely different scales, and refine decimal counterexamples between simple values.
diff --git a/repos/effect/.changeset/pre/tidy-panthers-smile.md b/repos/effect/.changeset/pre/tidy-panthers-smile.md
new file mode 100644
index 000000000..b07928251
--- /dev/null
+++ b/repos/effect/.changeset/pre/tidy-panthers-smile.md
@@ -0,0 +1,8 @@
+---
+"effect": patch
+---
+
+Add generic branded NetAddress classifications and named validating schemas.
+Singleton address constants retain their base-family types; guards expose
+classifications on demand. Operations that derive new address bits return only
+the IPv4 or IPv6 family until callers revalidate the classification.
diff --git a/repos/effect/.changeset/tidy-parts-narrow.md b/repos/effect/.changeset/pre/tidy-parts-narrow.md
similarity index 100%
rename from repos/effect/.changeset/tidy-parts-narrow.md
rename to repos/effect/.changeset/pre/tidy-parts-narrow.md
diff --git a/repos/effect/.changeset/pre/tidy-probability-criteria.md b/repos/effect/.changeset/pre/tidy-probability-criteria.md
new file mode 100644
index 000000000..43416ca46
--- /dev/null
+++ b/repos/effect/.changeset/pre/tidy-probability-criteria.md
@@ -0,0 +1,7 @@
+---
+"effect": patch
+---
+
+Make `criteria` optional for `Decision.probability`. When supplied, `criteria` still requires descriptions for both `false` and `true`.
+
+`Decision.Probability.criteria` is now optional, so consumers reading outcome descriptions (for example, `decision.criteria.true`) must first guard against `undefined`.
diff --git a/repos/effect/.changeset/tidy-tools-finish.md b/repos/effect/.changeset/pre/tidy-tools-finish.md
similarity index 100%
rename from repos/effect/.changeset/tidy-tools-finish.md
rename to repos/effect/.changeset/pre/tidy-tools-finish.md
diff --git a/repos/effect/.changeset/timeout-error-message.md b/repos/effect/.changeset/pre/timeout-error-message.md
similarity index 100%
rename from repos/effect/.changeset/timeout-error-message.md
rename to repos/effect/.changeset/pre/timeout-error-message.md
diff --git a/repos/effect/.changeset/pre/timeout-or-else-cleanup-before-fallback.md b/repos/effect/.changeset/pre/timeout-or-else-cleanup-before-fallback.md
new file mode 100644
index 000000000..02eb8f720
--- /dev/null
+++ b/repos/effect/.changeset/pre/timeout-or-else-cleanup-before-fallback.md
@@ -0,0 +1,7 @@
+---
+"effect": patch
+---
+
+Fix `Effect.timeoutOrElse` to finish interrupting the source before evaluating the fallback, preventing the source from winning after the timeout.
+
+Fallbacks now run in the caller fiber and inherit its interruptibility and supervision.
diff --git a/repos/effect/.changeset/pre/toclient-raw-response-readable.md b/repos/effect/.changeset/pre/toclient-raw-response-readable.md
new file mode 100644
index 000000000..dd8307783
--- /dev/null
+++ b/repos/effect/.changeset/pre/toclient-raw-response-readable.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix repeated `text`, `json`, `arrayBuffer`, and `urlParamsBody` reads in `HttpServerResponse.toClientResponse` for raw Web `Response` bodies, preserving the original response for serving.
diff --git a/repos/effect/.changeset/pre/token-bucket-elapsed-refill.md b/repos/effect/.changeset/pre/token-bucket-elapsed-refill.md
new file mode 100644
index 000000000..6ee54efc4
--- /dev/null
+++ b/repos/effect/.changeset/pre/token-bucket-elapsed-refill.md
@@ -0,0 +1,7 @@
+---
+"effect": patch
+---
+
+Fix token-bucket `retryAfter`, `delay` and `resetAfter` in the memory and Redis stores. Timing now follows whole-token refill boundaries and accounts for elapsed time, including fractional token costs. Redis preserves signed fractional counts and keeps keys until capacity actually refills.
+
+`RateLimiterStore.tokenBucket` now returns `[remaining, elapsedMillis]` instead of `remaining`. Custom stores must return both values from the same atomic operation; see the `tokenBucket` docs for the contract. Returning `[remaining, 0]` keeps the old timing bug.
diff --git a/repos/effect/.changeset/pre/tokenizer-whole-prompt-truncation.md b/repos/effect/.changeset/pre/tokenizer-whole-prompt-truncation.md
new file mode 100644
index 000000000..6258e5a22
--- /dev/null
+++ b/repos/effect/.changeset/pre/tokenizer-whole-prompt-truncation.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Tokenizer.truncate` to account for token costs between messages.
diff --git a/repos/effect/.changeset/pre/tool-result-branch-encoding.md b/repos/effect/.changeset/pre/tool-result-branch-encoding.md
new file mode 100644
index 000000000..5c609b07a
--- /dev/null
+++ b/repos/effect/.changeset/pre/tool-result-branch-encoding.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Encode tool results with the schema for their known success or failure branch.
diff --git a/repos/effect/.changeset/pre/track-mapped-error-domain.md b/repos/effect/.changeset/pre/track-mapped-error-domain.md
new file mode 100644
index 000000000..3c4c9a2c3
--- /dev/null
+++ b/repos/effect/.changeset/pre/track-mapped-error-domain.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Effect.track(metric, mapper)` to reject source errors the mapper cannot handle.
diff --git a/repos/effect/.changeset/pre/trie-remove-valued-prefix.md b/repos/effect/.changeset/pre/trie-remove-valued-prefix.md
new file mode 100644
index 000000000..beabebf6c
--- /dev/null
+++ b/repos/effect/.changeset/pre/trie-remove-valued-prefix.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve valued prefix nodes when removing a longer key from a `Trie`.
diff --git a/repos/effect/.changeset/pre/try-direct-error-types.md b/repos/effect/.changeset/pre/try-direct-error-types.md
new file mode 100644
index 000000000..659c45466
--- /dev/null
+++ b/repos/effect/.changeset/pre/try-direct-error-types.md
@@ -0,0 +1,9 @@
+---
+"effect": patch
+---
+
+Correct the error types of `Effect.try` and `Effect.tryPromise`. Direct function forms retain `Cause.UnknownError`, while `{ try, catch }` options use the error type returned by `catch`.
+
+Explicit two-generic direct calls, union-valued arguments, and generic aliases that combine the two forms no longer compile. Use `{ try, catch }` with a real error mapper, or narrow a union before calling the constructor.
+
+Runtime behavior, callback arguments, and error mapping are unchanged.
diff --git a/repos/effect/.changeset/pre/tuple-optional-evolve-result-types.md b/repos/effect/.changeset/pre/tuple-optional-evolve-result-types.md
new file mode 100644
index 000000000..c770854fd
--- /dev/null
+++ b/repos/effect/.changeset/pre/tuple-optional-evolve-result-types.md
@@ -0,0 +1,7 @@
+---
+"effect": patch
+---
+
+Correct `Tuple.evolve` result types when a transform may be `undefined`. The result now includes both the transformed and unchanged element types, matching the existing runtime behavior. Accepted inputs and runtime behavior are unchanged.
+
+Code relying on the previous, incorrect result type must handle both outcomes. For example, a number-to-string transform that may be absent now produces `number | string`, so callers assuming a number-only result must adjust.
diff --git a/repos/effect/.changeset/pre/typesafe-decision-provider.md b/repos/effect/.changeset/pre/typesafe-decision-provider.md
new file mode 100644
index 000000000..05c27e8f6
--- /dev/null
+++ b/repos/effect/.changeset/pre/typesafe-decision-provider.md
@@ -0,0 +1,5 @@
+---
+"@effect/ai-typesafe": patch
+---
+
+Add `@effect/ai-typesafe`, a `DecisionModel` provider for TypeSafe's System One API.
diff --git a/repos/effect/.changeset/pre/undici-response-form-data.md b/repos/effect/.changeset/pre/undici-response-form-data.md
new file mode 100644
index 000000000..21a307e9e
--- /dev/null
+++ b/repos/effect/.changeset/pre/undici-response-form-data.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-node": patch
+---
+
+Parse URL-encoded and multipart response bodies in the Undici HTTP client.
diff --git a/repos/effect/.changeset/pre/unstable-http-schemas.md b/repos/effect/.changeset/pre/unstable-http-schemas.md
new file mode 100644
index 000000000..809b62c34
--- /dev/null
+++ b/repos/effect/.changeset/pre/unstable-http-schemas.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Move the Cookie, Cookies, Headers, and UrlParams schemas from `effect/unstable/http` to `effect/Schema`, including their record and JSON-field helper schemas.
diff --git a/repos/effect/.changeset/pre/update-workspace-dependencies.md b/repos/effect/.changeset/pre/update-workspace-dependencies.md
new file mode 100644
index 000000000..4aba61889
--- /dev/null
+++ b/repos/effect/.changeset/pre/update-workspace-dependencies.md
@@ -0,0 +1,7 @@
+---
+"@effect/docgen": patch
+"@effect/doctest": patch
+"@effect/sql-d1": patch
+---
+
+Update repository dependencies to their latest compatible releases.
diff --git a/repos/effect/.changeset/upgraded-request-skips-http-response-write.md b/repos/effect/.changeset/pre/upgraded-request-skips-http-response-write.md
similarity index 100%
rename from repos/effect/.changeset/upgraded-request-skips-http-response-write.md
rename to repos/effect/.changeset/pre/upgraded-request-skips-http-response-write.md
diff --git a/repos/effect/.changeset/pre/urlparams-null-input.md b/repos/effect/.changeset/pre/urlparams-null-input.md
new file mode 100644
index 000000000..274b0d09e
--- /dev/null
+++ b/repos/effect/.changeset/pre/urlparams-null-input.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `UrlParams.fromInput` to stringify `null` values.
diff --git a/repos/effect/.changeset/pre/urlparams-setall-immutable.md b/repos/effect/.changeset/pre/urlparams-setall-immutable.md
new file mode 100644
index 000000000..25422eb6f
--- /dev/null
+++ b/repos/effect/.changeset/pre/urlparams-setall-immutable.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Prevent `UrlParams.setAll` from mutating reusable overrides.
diff --git a/repos/effect/.changeset/pre/use-canonical-array-indices.md b/repos/effect/.changeset/pre/use-canonical-array-indices.md
new file mode 100644
index 000000000..a3bda5d21
--- /dev/null
+++ b/repos/effect/.changeset/pre/use-canonical-array-indices.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Treat only unpadded decimal integers from `0` through `4294967294` as array indices in environment-backed configuration and bracket-path decoding. This preserves numeric-looking object keys and prevents out-of-range environment keys from producing impossible array lengths. Bracket paths that intend to address arrays must use `[1]` instead of `[01]`.
diff --git a/repos/effect/.changeset/violet-pugs-tickle.md b/repos/effect/.changeset/pre/violet-pugs-tickle.md
similarity index 100%
rename from repos/effect/.changeset/violet-pugs-tickle.md
rename to repos/effect/.changeset/pre/violet-pugs-tickle.md
diff --git a/repos/effect/.changeset/pre/vitest-await-timeout-finalizers.md b/repos/effect/.changeset/pre/vitest-await-timeout-finalizers.md
new file mode 100644
index 000000000..1fbd8b6b0
--- /dev/null
+++ b/repos/effect/.changeset/pre/vitest-await-timeout-finalizers.md
@@ -0,0 +1,5 @@
+---
+"@effect/vitest": patch
+---
+
+Await asynchronous test and layer finalizers after an Effect test times out before starting the next test.
diff --git a/repos/effect/.changeset/pre/vitest-five-migration.md b/repos/effect/.changeset/pre/vitest-five-migration.md
new file mode 100644
index 000000000..349baff34
--- /dev/null
+++ b/repos/effect/.changeset/pre/vitest-five-migration.md
@@ -0,0 +1,16 @@
+---
+"@effect/vitest": patch
+"@effect/doctest": patch
+---
+
+Require Vitest `>=5.0.0 <6.0.0` and Node.js `^22.12.0 || ^24.0.0 || >=26.0.0`.
+
+### Breaking changes
+
+- Replace `.sequential` and `{ sequential: true }` with `{ concurrent: false }`.
+- Use `bench` from the test context and await `bench(name, fn).run()`. The top-level benchmark API is removed.
+- Use `Assertion<void, T>` or `Assertion<Promise<void>, T>`. Define custom matchers through `vitest.Matchers`, not `@vitest/expect`.
+- Import reporter types from `vitest/node` and environment/snapshot APIs from `vitest/runtime`. Set `outputFile` when consuming JSON reports.
+- Await asynchronous assertions. Mock history now clears before each test.
+
+See the [Vitest migration guide](https://vitest.dev/guide/migration/) for removed types and other upstream changes.
diff --git a/repos/effect/.changeset/pre/vitest-layer-concurrency.md b/repos/effect/.changeset/pre/vitest-layer-concurrency.md
new file mode 100644
index 000000000..2b1922a26
--- /dev/null
+++ b/repos/effect/.changeset/pre/vitest-layer-concurrency.md
@@ -0,0 +1,5 @@
+---
+"@effect/vitest": patch
+---
+
+Add a `concurrent` option to named `layer` and `it.layer` suites. Omitted options and anonymous layers preserve inherited concurrency.
diff --git a/repos/effect/.changeset/pre/warn-workflow-tags.md b/repos/effect/.changeset/pre/warn-workflow-tags.md
new file mode 100644
index 000000000..62821c799
--- /dev/null
+++ b/repos/effect/.changeset/pre/warn-workflow-tags.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Warn when conflicting cluster workflow definitions reuse a tag.
diff --git a/repos/effect/.changeset/pre/with-error-reporting-effect-result.md b/repos/effect/.changeset/pre/with-error-reporting-effect-result.md
new file mode 100644
index 000000000..f359ab076
--- /dev/null
+++ b/repos/effect/.changeset/pre/with-error-reporting-effect-result.md
@@ -0,0 +1,6 @@
+---
+"effect": patch
+---
+
+Fix `Effect.withErrorReporting` to return an `Effect` instead of preserving input
+subtypes such as `Exit`, whose subtype-specific fields are not present on the wrapper.
diff --git a/repos/effect/.changeset/pre/worker-run-early-exit.md b/repos/effect/.changeset/pre/worker-run-early-exit.md
new file mode 100644
index 000000000..a5d68a606
--- /dev/null
+++ b/repos/effect/.changeset/pre/worker-run-early-exit.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix `Worker.run` hanging uninterruptibly when a worker dies before the ready handshake.
diff --git a/repos/effect/.changeset/pre/xhr-arraybuffer-readers.md b/repos/effect/.changeset/pre/xhr-arraybuffer-readers.md
new file mode 100644
index 000000000..d3ce6d29e
--- /dev/null
+++ b/repos/effect/.changeset/pre/xhr-arraybuffer-readers.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-browser": patch
+---
+
+Support text, JSON, and stream readers when the XHR response type is `"arraybuffer"`.
diff --git a/repos/effect/.changeset/pre/yaml-scalar-sequence-conformance.md b/repos/effect/.changeset/pre/yaml-scalar-sequence-conformance.md
new file mode 100644
index 000000000..bbef3bc91
--- /dev/null
+++ b/repos/effect/.changeset/pre/yaml-scalar-sequence-conformance.md
@@ -0,0 +1,7 @@
+---
+"effect": patch
+---
+
+Fix YAML indentless sequences, multiline scalar folding, and comments. Reject unsupported compact nested sequences (`- - value`) and document streams.
+
+Previously accepted values such as `description: Use when: deploy` and `description: Deploy:` now throw `SyntaxError`: YAML forbids colons followed by whitespace or end-of-value in plain scalars. Quote these values, for example `description: "Use when: deploy"`.
diff --git a/repos/effect/.github/actions/setup/action.yaml b/repos/effect/.github/actions/setup/action.yaml
index bed189322..0f97b61a1 100644
--- a/repos/effect/.github/actions/setup/action.yaml
+++ b/repos/effect/.github/actions/setup/action.yaml
@@ -13,11 +13,19 @@ runs:
   steps:
     - name: Install pnpm
       uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 # v6
+      env:
+        npm_config_audit: "false"
+        npm_config_fund: "false"
     - name: Install node
       uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6
       with:
-        cache: pnpm
         node-version: 26.4.0
+        package-manager-cache: ${{ env.NSC_CONTAINER_REGISTRY == '' }}
+    - name: Configure pnpm cache
+      if: ${{ env.NSC_CONTAINER_REGISTRY != '' }}
+      uses: namespacelabs/nscloud-cache-action@c5f8dab7560444c4bf8dbc64f1b203431873c547 # v1.6.1
+      with:
+        cache: pnpm
     - name: Install deno
       uses: denoland/setup-deno@22d081ff2d3a40755e97629de92e3bcbfa7cf2ed # v2
       if: ${{ inputs.deno-version != '' }}
diff --git a/repos/effect/.github/workflows/ai-codegen.yml b/repos/effect/.github/workflows/ai-codegen.yml
index d46bec4e3..6a88b2827 100644
--- a/repos/effect/.github/workflows/ai-codegen.yml
+++ b/repos/effect/.github/workflows/ai-codegen.yml
@@ -15,7 +15,7 @@ jobs:
   codegen:
     name: AI Codegen
     if: github.repository_owner == 'Effect-Ts'
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-linux-small
     permissions:
       contents: write
       pull-requests: write
diff --git a/repos/effect/.github/workflows/check.yml b/repos/effect/.github/workflows/check.yml
index bbb1c979d..5bbcfe849 100644
--- a/repos/effect/.github/workflows/check.yml
+++ b/repos/effect/.github/workflows/check.yml
@@ -13,8 +13,8 @@ concurrency:
 permissions: {}
 
 jobs:
-  lint:
-    name: Lint
+  static-checks:
+    name: Static
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -23,11 +23,23 @@ jobs:
       - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
       - name: Install dependencies
         uses: ./.github/actions/setup
-      - run: pnpm lint
+      - name: Lint
+        run: pnpm lint
+      - name: Check circular dependencies
+        run: pnpm circular
+      - name: Generate AI documentation
+        run: pnpm ai-docgen
+      - name: Verify AI documentation is up-to-date
+        run: |
+          if [ -n "$(git status --short)" ]; then
+            git status --short
+            echo "Run 'pnpm ai-docgen' and commit generated changes."
+            exit 1
+          fi
 
   types:
     name: Types
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-linux-small
     permissions:
       contents: read
     timeout-minutes: 10
@@ -35,7 +47,13 @@ jobs:
       - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
       - name: Install dependencies
         uses: ./.github/actions/setup
+        with:
+          deno-version: v2.9.4
       - run: pnpm check
+        env:
+          # Leave memory headroom for the runner by collecting the Go heap earlier.
+          GOMEMLIMIT: 4GiB
+      - run: deno check .
       - run: pnpm test-types --target '>=5.9'
 
   build:
@@ -53,23 +71,7 @@ jobs:
         run: |
           sed -i 's/"stripInternal": false/"stripInternal": true/' tsconfig.base.json
       - run: pnpm build
-
-  types-deno:
-    name: Types on Deno
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
-      - name: Install dependencies
-        uses: ./.github/actions/setup
-        with:
-          deno-version: v2.9.4
-      - name: Set strip internals config
-        run: |
-          sed -i 's/"stripInternal": false/"stripInternal": true/' tsconfig.base.json
-      - run: deno check .
+      - run: pnpm check-dist-types
 
   bundle:
     name: Bundle
@@ -93,9 +95,10 @@ jobs:
           sed -i 's/"stripInternal": false/"stripInternal": true/' base/tsconfig.base.json
       - name: Build
         run: |
-          pnpm build &
-          cd base && pnpm install && pnpm build &
-          wait
+          pnpm build
+          cd base
+          pnpm install
+          pnpm build
       - name: Compare bundle size
         run: node ./packages/tools/bundle/src/bin.ts compare --base-dir base/packages/tools/bundle/fixtures
       - name: Upload stats artifact
@@ -107,24 +110,36 @@ jobs:
           if-no-files-found: error
 
   test:
-    name: Test
-    runs-on: ubuntu-latest
+    name: Test (${{ matrix.runtime }})
+    runs-on: namespace-profile-linux-default
     env:
       EFFECT_INTEGRATION_TESTS: "1"
+      # The ephemeral runner provides cleanup without a Ryuk sidecar.
+      TESTCONTAINERS_RYUK_DISABLED: "true"
     permissions:
       contents: read
-    timeout-minutes: 10
+    timeout-minutes: 15
     strategy:
       fail-fast: false
       matrix:
-        shard: [1/2, 2/2]
-        runtime: [Node, Deno]
+        include:
+          - runtime: Node
+            deno: ""
+            bun: ""
+            command: pnpm test --max-concurrency=10
+          - runtime: Deno
+            deno: v2.9.4
+            bun: ""
+            command: deno task test --max-concurrency=10
+          - runtime: Bun
+            deno: ""
+            bun: 1.4.0
+            command: bun run --bun vitest run --max-concurrency=10
     steps:
       - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
 
       - name: Pre-pull test container images
         run: |
-          docker pull testcontainers/ryuk:0.14.0 &
           docker pull ghcr.io/tursodatabase/libsql-server:main &
           docker pull postgres:alpine &
           docker pull mysql:lts &
@@ -133,40 +148,17 @@ jobs:
           docker pull redis:alpine &
           wait
 
-      - name: Install dependencies
-        if: matrix.runtime == 'Node'
-        uses: ./.github/actions/setup
-      - name: Test
-        if: matrix.runtime == 'Node'
-        run: pnpm test --shard ${{ matrix.shard }}
-
-      - name: Install dependencies
-        if: matrix.runtime == 'Deno'
-        uses: ./.github/actions/setup
-        with:
-          deno-version: v2.9.4
-      - name: Test
-        if: matrix.runtime == 'Deno'
-        run: deno task test --shard ${{ matrix.shard }}
-
-  test-bun:
-    name: Test on Bun
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v6
       - name: Install dependencies
         uses: ./.github/actions/setup
         with:
-          bun-version: 1.3.13
+          deno-version: ${{ matrix.deno }}
+          bun-version: ${{ matrix.bun }}
       - name: Test
-        run: bun node_modules/vitest/vitest.mjs run --project @effect/platform-bun
+        run: ${{ matrix.command }}
 
   doctest:
-    name: Documentation Tests
-    runs-on: ubuntu-latest
+    name: Test (Documentation)
+    runs-on: namespace-profile-linux-small
     permissions:
       contents: read
     timeout-minutes: 10
@@ -176,36 +168,3 @@ jobs:
         uses: ./.github/actions/setup
       - name: Test Documentation
         run: pnpm doctest
-
-  ai-docgen:
-    name: AI Documentation Generation
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
-      - name: Install dependencies
-        uses: ./.github/actions/setup
-      - name: Generate AI Documentation
-        run: pnpm ai-docgen
-      - name: Verify AI Documentation is up-to-date
-        run: |
-          if [ -n "$(git status --short)" ]; then
-            git status --short
-            echo "Run 'pnpm ai-docgen' and commit generated changes."
-            exit 1
-          fi
-
-  circular:
-    name: Circular Dependencies
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
-      - name: Install dependencies
-        uses: ./.github/actions/setup
-      - name: Check for circular dependencies
-        run: pnpm circular
diff --git a/repos/effect/.github/workflows/cluster.yml b/repos/effect/.github/workflows/cluster.yml
index 606ee8018..ba674aed4 100644
--- a/repos/effect/.github/workflows/cluster.yml
+++ b/repos/effect/.github/workflows/cluster.yml
@@ -7,22 +7,17 @@ permissions: {}
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-linux-small
     timeout-minutes: 30
     env:
       EFFECT_CLUSTER_TESTS: "1"
+      # The ephemeral runner provides cleanup without a Ryuk sidecar.
+      TESTCONTAINERS_RYUK_DISABLED: "true"
     permissions:
       contents: read
     steps:
       - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
 
-      - name: Pre-pull test container images
-        run: |
-          docker pull testcontainers/ryuk:0.14.0 &
-          docker pull postgres:alpine &
-          docker pull mysql:lts &
-          wait
-
       - name: Install dependencies
         uses: ./.github/actions/setup
       - name: Test
diff --git a/repos/effect/.github/workflows/release-queue.yml b/repos/effect/.github/workflows/release-queue.yml
index cbf7d2472..1235f5adf 100644
--- a/repos/effect/.github/workflows/release-queue.yml
+++ b/repos/effect/.github/workflows/release-queue.yml
@@ -27,7 +27,7 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
         with:
           fetch-depth: 0
           token: ${{ secrets.EFFECT_BOT_GH }}
diff --git a/repos/effect/.github/workflows/snapshot.yml b/repos/effect/.github/workflows/snapshot.yml
index 30fca3d8a..69e9e2528 100644
--- a/repos/effect/.github/workflows/snapshot.yml
+++ b/repos/effect/.github/workflows/snapshot.yml
@@ -15,7 +15,7 @@ permissions: {}
 jobs:
   approval-gate:
     if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-linux-small
     environment: fork
     steps:
       - run: echo "Fork PR approved by maintainer."
@@ -27,7 +27,7 @@ jobs:
       !cancelled()
       && (needs.approval-gate.result == 'success' || needs.approval-gate.result == 'skipped')
       && github.repository_owner == 'Effect-Ts'
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-linux-small
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
@@ -39,6 +39,10 @@ jobs:
       - name: Run codemods
         run: pnpm codemod
       - name: Build package
+        env:
+          # Leave memory for the runner and package builds on the 8 GB runner.
+          # The native TypeScript compiler uses Go's soft memory limit.
+          GOMEMLIMIT: 4GiB
         run: pnpm build
       - name: Create snapshot
         id: snapshot
diff --git a/repos/effect/README.md b/repos/effect/README.md
index 93973efa2..7d911b40d 100644
--- a/repos/effect/README.md
+++ b/repos/effect/README.md
@@ -50,6 +50,7 @@ This monorepo contains the core `effect` package alongside integration packages
 | [`@effect/sql-sqlite-wasm`](packages/sql/sqlite-wasm)                 | SQL client for SQLite compiled to WebAssembly            | [docs](https://effect.website/docs/v4/api/sql-sqlite-wasm)         |
 | [`@effect/ai-anthropic`](packages/ai/anthropic)                       | Anthropic provider for the Effect AI modules             | [docs](https://effect.website/docs/v4/api/ai-anthropic)            |
 | [`@effect/ai-openai`](packages/ai/openai)                             | OpenAI provider for the Effect AI modules                | [docs](https://effect.website/docs/v4/api/ai-openai)               |
+| [`@effect/ai-typesafe`](packages/ai/typesafe)                         | TypeSafe decision provider for the Effect AI modules     | [docs](https://effect.website/docs/v4/api/ai-typesafe)             |
 | [`@effect/ai-openai-compat`](packages/ai/openai-compat)               | OpenAI-compatible API provider for the Effect AI modules | [docs](https://effect.website/docs/v4/api/ai-openai-compat)        |
 | [`@effect/ai-openrouter`](packages/ai/openrouter)                     | OpenRouter provider for the Effect AI modules            | [docs](https://effect.website/docs/v4/api/ai-openrouter)           |
 | [`@effect/atom-react`](packages/atom/react)                           | React bindings for Effect Atom                           | [docs](https://effect.website/docs/v4/api/atom-react)              |
diff --git a/repos/effect/ai-docs/package.json b/repos/effect/ai-docs/package.json
index d21c796cc..e679adecb 100644
--- a/repos/effect/ai-docs/package.json
+++ b/repos/effect/ai-docs/package.json
@@ -27,10 +27,10 @@
     "@effect/sql-sqlite-wasm": "workspace:*",
     "@effect/vitest": "workspace:*",
     "effect": "workspace:*",
-    "hono": "^4.13.5",
-    "nodemailer": "^9.0.6"
+    "hono": "^4.13.8",
+    "nodemailer": "^10.0.10"
   },
   "devDependencies": {
-    "@types/nodemailer": "^8.0.1"
+    "@types/nodemailer": "^8.0.2"
   }
 }
diff --git a/repos/effect/ai-docs/src/70_cli/10_basics.ts b/repos/effect/ai-docs/src/70_cli/10_basics.ts
index 9d33b9db5..3f4a40c46 100644
--- a/repos/effect/ai-docs/src/70_cli/10_basics.ts
+++ b/repos/effect/ai-docs/src/70_cli/10_basics.ts
@@ -10,7 +10,7 @@ import { Argument, Command, Flag } from "effect/unstable/cli"
 
 // You can define flags outside of commands and reuse them across multiple
 // commands.
-const workspace = Flag.string("workspace").pipe(
+const workspace = Flag.String("workspace").pipe(
   Flag.withAlias("w"),
   Flag.withDescription("Workspace to operate on"),
   Flag.withDefault("personal")
@@ -21,7 +21,7 @@ const workspace = Flag.string("workspace").pipe(
 const tasks = Command.make("tasks").pipe(
   Command.withSharedFlags({
     workspace,
-    verbose: Flag.boolean("verbose").pipe(
+    verbose: Flag.Boolean("verbose").pipe(
       Flag.withAlias("v"),
       Flag.withDescription("Print diagnostic output"),
       Flag.withDefault(false)
@@ -41,17 +41,17 @@ const Email = Schema.String.pipe(
 const create = Command.make(
   "create",
   {
-    title: Argument.string("title").pipe(
+    title: Argument.String("title").pipe(
       Argument.withDescription("Task title"),
       // Reject empty titles at parse time, so the handler only ever sees
       // valid input
       Argument.withSchema(Schema.NonEmptyString)
     ),
-    priority: Flag.choice("priority", ["low", "normal", "high"]).pipe(
+    priority: Flag.Literals("priority", ["low", "normal", "high"]).pipe(
       Flag.withDescription("Priority for the new task"),
       Flag.withDefault("normal")
     ),
-    assignee: Flag.string("assignee").pipe(
+    assignee: Flag.String("assignee").pipe(
       Flag.withDescription("Email address of the person to assign"),
       Flag.withSchema(Email),
       Flag.optional
@@ -88,11 +88,11 @@ const create = Command.make(
 const list = Command.make(
   "list",
   {
-    status: Flag.choice("status", ["open", "done", "all"]).pipe(
+    status: Flag.Literals("status", ["open", "done", "all"]).pipe(
       Flag.withDescription("Filter tasks by status"),
       Flag.withDefault("open")
     ),
-    json: Flag.boolean("json").pipe(
+    json: Flag.Boolean("json").pipe(
       Flag.withDescription("Print machine-readable output"),
       Flag.withDefault(false)
     )
diff --git a/repos/effect/jsdocs.config.json b/repos/effect/jsdocs.config.json
index f31bd337c..6811e35b4 100644
--- a/repos/effect/jsdocs.config.json
+++ b/repos/effect/jsdocs.config.json
@@ -6,6 +6,7 @@
   ],
   "exclude": [
     "**/node_modules/**",
+    "packages/**/ai-docs/**",
     "packages/tools/**",
     "packages/**/src/index.ts",
     "packages/effect/src/StandardSchema.ts",
diff --git a/repos/effect/migration/annotations/effect__Channel.yaml b/repos/effect/migration/annotations/effect__Channel.yaml
index 2b8ea573b..a03978a15 100644
--- a/repos/effect/migration/annotations/effect__Channel.yaml
+++ b/repos/effect/migration/annotations/effect__Channel.yaml
@@ -173,11 +173,11 @@
   replacement: "Channel.forever"
   note: "Use forever for infinite repetition. Channel.repeat takes a Schedule and may terminate, so it is not equivalent."
 "effect/Channel#run":
-  replacement: "Channel.runDone"
-  note: "Renamed to runDone for an inputless, outputless channel. Use runDrain if emitted elements should be discarded."
+  replacement: "Channel.runDrain"
+  note: "Use runDrain to consume all emitted elements and return the channel's done value."
 "effect/Channel#runScoped":
   replacement: "Channel.toPull"
-  note: "No direct scoped runner remains. Use toPull in the caller scope and recover Cause.Done; use runDone or runDrain when an internally managed scope is acceptable."
+  note: "No direct scoped runner remains. Use toPull in the caller scope and recover Cause.Done; use runDrain when an internally managed scope is acceptable."
 "effect/Channel#scopedWith":
   replacement: "Channel.unwrap"
   note: "Use Channel.unwrap(Effect.map(Effect.scope, (scope) => Channel.fromEffect(f(scope)))) so the effect uses the active channel scope."
diff --git a/repos/effect/migration/annotations/effect__Effect.yaml b/repos/effect/migration/annotations/effect__Effect.yaml
index 4a7ee9816..06d2eca07 100644
--- a/repos/effect/migration/annotations/effect__Effect.yaml
+++ b/repos/effect/migration/annotations/effect__Effect.yaml
@@ -20,6 +20,7 @@ effect/Effect#allWith:
   replacement: "Effect.all"
   note: "Wrap `Effect.all(values, options)` in a lambda when a data-last combinator is needed. Adapt arguments and imports to the v4 API."
 effect/Effect#annotateLogs:
+  include: true
   replacement: "Effect.annotateLogs"
   note: "Still exported in v4; update call sites for the revised signature, options, and channel inference."
 effect/Effect#ap:
@@ -528,7 +529,7 @@ effect/Effect#transposeMapOption:
   note: "Return `Effect.succeedNone` for None and map the Effect result to Some. Adapt arguments and imports to the v4 API."
 effect/Effect#try:
   replacement: "Effect.try"
-  note: "Still exported in v4; update call sites for the revised signature, options, and channel inference."
+  note: "Use the callback overload for Cause.UnknownError, or the object overload with try and catch to map failures to a custom error. The callback-only overload does not accept a custom error type parameter."
 effect/Effect#tryMap:
   replacement: "Effect.flatMap + Effect.try"
   note: "FlatMap the source value into the v4 synchronous try constructor. Adapt arguments and imports to the v4 API."
@@ -605,6 +606,7 @@ effect/Effect#withFiberRuntime:
   replacement: "none"
   note: "Direct FiberRuntime access was removed; use public Effect, Fiber, and Context operations. No direct public replacement exists in v4; rewrite the call site around the stated v4 primitive."
 effect/Effect#withLogSpan:
+  include: true
   replacement: "Effect.withLogSpan"
   note: "Still exported in v4; update call sites for the revised signature, options, and channel inference."
 effect/Effect#withMaxOpsBeforeYield:
@@ -655,3 +657,9 @@ effect/Effect#zipLeft:
 effect/Effect#zipRight:
   replacement: "Effect.andThen"
   note: "Sequence the Effects and retain the second result. Adapt arguments and imports to the v4 API."
+"effect/Effect#repeatOrElse":
+  replacement: "Effect.repeatOrElse"
+  note: "The fallback receives Option<Schedule.Metadata<B, A>> instead of Option<B>. Read metadata.output for the previous schedule output and metadata.attempt for the attempt count. The error also includes schedule failures."
+"effect/Effect#tryPromise":
+  replacement: "Effect.tryPromise"
+  note: "Use the callback overload for Cause.UnknownError, or the object overload with try and catch to map failures to a custom error. The callback-only overload does not accept a custom error type parameter."
diff --git a/repos/effect/migration/annotations/effect__Effectable.yaml b/repos/effect/migration/annotations/effect__Effectable.yaml
index a90d6864a..fe8066d27 100644
--- a/repos/effect/migration/annotations/effect__Effectable.yaml
+++ b/repos/effect/migration/annotations/effect__Effectable.yaml
@@ -3,7 +3,7 @@
   note: "The public channel brand moved to its owning module; v4 uses a string TypeId rather than the v3 Symbol."
 "effect/Effectable#Class":
   replacement: "Effectable.Class"
-  note: "Still available; replace commit() with an override property or getter returning the Effect."
+  note: "Still available; replace commit() with an asEffect() method returning the Effect. The intermediate v4 override property/getter is no longer supported."
 "effect/Effectable#CommitPrimitive":
   replacement: "new<A, E = never, R = never>() => Effect.Effect<A, E, R>"
   note: "The named constructor interface was removed; inline the constructor type when needed."
@@ -24,7 +24,7 @@
   note: "The public stream brand moved to its owning module; v4 uses a string TypeId rather than the v3 Symbol."
 "effect/Effectable#StructuralClass":
   replacement: "Effectable.Class"
-  note: "Use Class and migrate commit() to override; v4 equality is structural by default."
+  note: "Use Class and migrate commit() to asEffect(); v4 equality is structural by default."
 "effect/Effectable#StructuralCommitPrototype":
   replacement: "Effectable.Prototype"
   note: "Use Prototype with evaluate; a separate structural prototype is unnecessary because v4 equality is structural by default."
diff --git a/repos/effect/migration/annotations/effect__Graph.yaml b/repos/effect/migration/annotations/effect__Graph.yaml
index 4b1997f9d..1f58ee52e 100644
--- a/repos/effect/migration/annotations/effect__Graph.yaml
+++ b/repos/effect/migration/annotations/effect__Graph.yaml
@@ -6,10 +6,10 @@
   note: "The immutable type remains, but storage is opaque; replace field access with Graph nodes, edges, count, lookup, neighbor, and acyclicity APIs."
 "effect/Graph#MutableGraph":
   replacement: "Graph.MutableGraph"
-  note: "The mutable type remains but no longer extends Graph.Proto; obtain it through Graph.mutate or Graph.beginMutation and use public mutation/query functions."
+  note: "The mutable type remains but no longer shares a public base interface with immutable Graph; obtain it through Graph.mutate or Graph.beginMutation and use public mutation/query functions."
 "effect/Graph#Proto":
-  replacement: "Graph.Proto"
-  note: "The name remains as the opaque immutable graph protocol; it no longer exposes storage and is no longer the base of MutableGraph."
+  replacement: "none"
+  note: "The common graph protocol was removed. Use Graph.Graph or Graph.MutableGraph as appropriate and replace storage-field access with public graph query and mutation functions."
 "effect/Graph#SearchConfig":
   replacement: "Graph.SearchConfig"
   note: "The type remains; direction is now Graph.TraversalDirection and also accepts undirected, while radius limits traversal depth."
diff --git a/repos/effect/migration/annotations/effect__JSONSchema.yaml b/repos/effect/migration/annotations/effect__JSONSchema.yaml
index 34d61b8f0..62a4840de 100644
--- a/repos/effect/migration/annotations/effect__JSONSchema.yaml
+++ b/repos/effect/migration/annotations/effect__JSONSchema.yaml
@@ -1,6 +1,6 @@
 "effect/JSONSchema#fromAST":
   replacement: "Schema.toJsonSchemaDocument"
-  note: "Wrap a low-level AST with Schema.make, then generate a document; v4 generation targets draft 2020-12."
+  note: "Wrap a low-level AST with Schema.make, then generate a draft 2020-12 document. Generation defaults to onExcessProperty: 'ignore'; use 'error' for closed objects. JSON Schema validation is approximate and does not replace Effect decoding."
   example: "Schema.toJsonSchemaDocument(Schema.make(ast))"
 "effect/JSONSchema#JsonSchema7":
   replacement: "JsonSchema.JsonSchema"
@@ -67,5 +67,5 @@
   note: "Schema metadata now uses string-keyed Schema annotations; JSON Schema-specific checks use toJsonSchema annotations."
 "effect/JSONSchema#make":
   replacement: "Schema.toJsonSchemaDocument"
-  note: "Generate draft 2020-12, then call JsonSchema.toDocumentDraft07 when draft-07 output is required."
+  note: "Generate draft 2020-12, then call JsonSchema.toDocumentDraft07 when draft-07 output is required. Generation now defaults to onExcessProperty: 'ignore'; pass 'error' to retain closed-object output, and use the same option when decoding to reject excess properties. The earlier v4 additionalProperties generation option was removed. JSON Schema validation is approximate and does not replace Effect decoding."
   example: "JsonSchema.toDocumentDraft07(Schema.toJsonSchemaDocument(schema))"
diff --git a/repos/effect/migration/annotations/effect__Layer.yaml b/repos/effect/migration/annotations/effect__Layer.yaml
index def772ee9..925c52e31 100644
--- a/repos/effect/migration/annotations/effect__Layer.yaml
+++ b/repos/effect/migration/annotations/effect__Layer.yaml
@@ -168,7 +168,7 @@
   note: "No version-mismatch log-level Reference or public replacement exists."
 "effect/Layer#tapErrorCause":
   replacement: "Layer.tapCause"
-  note: "The cause observer was renamed."
+  note: "The cause observer was renamed. Its callback must accept the source layer's full error cause; a callback narrowed to only part of the error union is rejected."
 "effect/Layer#toRuntime":
   replacement: "Layer.build(self), then Effect.runForkWith, Effect.runPromiseWith, or Effect.runSyncWith"
   note: "Runtime<R> was removed; build a Context, or use ManagedRuntime.make for a reusable managed runner."
@@ -187,3 +187,6 @@
 "effect/Layer#zipWith":
   replacement: "Layer.fromBuild with concurrent Effect.zipWith over Layer.buildWithMemoMap"
   note: "Combine acquisition effects directly; use Layer.merge when the function only merged Context values."
+"effect/Layer#tapError":
+  replacement: "Layer.tapError"
+  note: "The observer must accept the source layer's full error union. Widen callbacks that handled only a subtype; saved curried observers preserve the source error type."
diff --git a/repos/effect/migration/annotations/effect__LayerMap.yaml b/repos/effect/migration/annotations/effect__LayerMap.yaml
index a87d5e2f5..12e986353 100644
--- a/repos/effect/migration/annotations/effect__LayerMap.yaml
+++ b/repos/effect/migration/annotations/effect__LayerMap.yaml
@@ -3,7 +3,7 @@
   note: "The type remains; runtime(key) became contextEffect(key) and returns Context."
 "effect/LayerMap#Service":
   replacement: "LayerMap.Service"
-  note: "Use layer instead of Default, layerNoDeps instead of DefaultWithoutDependencies, and contextEffect instead of runtime."
+  note: "Use layer instead of Default, layerNoDeps instead of DefaultWithoutDependencies, and contextEffect instead of runtime. Preloading does not remove acquisition errors from later lookups, which can reacquire expired or invalidated entries."
 "effect/LayerMap#Service.Context":
   replacement: "LayerMap.Service.Services<Options>"
   note: "The input-services extractor was renamed."
diff --git a/repos/effect/migration/annotations/effect__Logger.yaml b/repos/effect/migration/annotations/effect__Logger.yaml
index b8a4a8cf4..77a9957fb 100644
--- a/repos/effect/migration/annotations/effect__Logger.yaml
+++ b/repos/effect/migration/annotations/effect__Logger.yaml
@@ -54,7 +54,7 @@ effect/Logger#pretty:
   note: "Logger.layer replaces the active set; include tracerLogger to preserve v3 built-in layer behavior."
 effect/Logger#prettyLogger:
   replacement: "Logger.consolePretty"
-  note: "Direct constructor rename; call it with the same options."
+  note: "Renamed to consolePretty. Remove the stderr option; provide Logger.LogToStderr with true to route TTY output to console.error. Colors, formatDate, and mode remain constructor options."
 effect/Logger#prettyLoggerDefault:
   replacement: "Logger.consolePretty()"
   note: "The prebuilt singleton became a constructor call."
@@ -95,8 +95,8 @@ effect/Logger#withMinimumLogLevel:
   replacement: "Effect.provideService(effect, References.MinimumLogLevel, level)"
   note: "Replace the FiberRef-local helper with reference provisioning."
 effect/Logger#withSpanAnnotations:
-  replacement: "custom Logger.make wrapper using options.fiber.currentSpan"
-  note: "No transparent generic equivalent remains. Read span identity from options.fiber.currentSpan and add it to custom output as needed."
+  replacement: "custom Logger.make wrapper using options.fiber.cache.span"
+  note: "No transparent generic equivalent remains. Read span identity from options.fiber.cache.span and add it to custom output as needed."
 effect/Logger#zip:
   replacement: "Logger.make(options => [left.log(options), right.log(options)])"
   note: "No named combinator remains; invoke both loggers and return their output tuple."
diff --git a/repos/effect/migration/annotations/effect__ParseResult.yaml b/repos/effect/migration/annotations/effect__ParseResult.yaml
index 3feefd473..da9f26d0b 100644
--- a/repos/effect/migration/annotations/effect__ParseResult.yaml
+++ b/repos/effect/migration/annotations/effect__ParseResult.yaml
@@ -8,9 +8,12 @@
 "effect/ParseResult#ArrayFormatterIssue":
   replacement: "StandardSchemaV1.FailureResult[\"issues\"][number]"
   note: "Use the Standard Schema issue shape returned by makeFormatterStandardSchemaV1."
+"effect/ParseResult#Composite":
+  replacement: "SchemaIssue.Composite"
+  note: "Composite parse failures moved to SchemaIssue. The v4 constructor takes the failing AST and an array of nested issues; input is retained only when reportInput is enabled."
 "effect/ParseResult#DeclarationDecodeUnknown":
   replacement: "SchemaGetter.Getter"
-  note: "Custom declaration decoding now uses SchemaGetter values and Schema.declare annotations."
+  note: "Custom declaration decoding now uses SchemaGetter values and Schema.declare annotations. Getter is a tagged union, not a constructor; use transformOptionalEffect for an Option-to-Effect decoder. Use standalone SchemaGetter.run, map, and compose instead of instance methods."
 "effect/ParseResult#decodeEither":
   replacement: "Schema.decodeExit"
   note: "Either parsing was replaced by Exit parsing."
@@ -68,6 +71,9 @@
 "effect/ParseResult#orElse":
   replacement: "Effect.orElse"
   note: "Schema transformations now use Effect combinators."
+"effect/ParseResult#Pointer":
+  replacement: "SchemaIssue.Pointer"
+  note: "Path-qualified failures moved to SchemaIssue. Construct them with the property path and nested issue; rejected input belongs to the nested issue when reportInput is enabled."
 "effect/ParseResult#parseError":
   replacement: "Schema.SchemaError"
   note: "Construct a SchemaError from a SchemaIssue.Issue."
@@ -94,6 +100,9 @@
   replacement: "SchemaIssue.defaultFormatter"
   note: "Use the default SchemaIssue string formatter."
   example: "SchemaIssue.defaultFormatter(issue)"
+"effect/ParseResult#Transformation":
+  replacement: "SchemaIssue.Encoding"
+  note: "Transformation-stage failures are Encoding issues in v4. They retain the failing AST and nested issue; the old Encoded, Transformation, and Type kind discriminator was removed."
 "effect/ParseResult#try":
   replacement: "Effect.try"
   note: "Schema transformations now use Effect and map thrown errors to SchemaIssue values."
diff --git a/repos/effect/migration/annotations/effect__Schema.yaml b/repos/effect/migration/annotations/effect__Schema.yaml
index 69c83c30e..6be978903 100644
--- a/repos/effect/migration/annotations/effect__Schema.yaml
+++ b/repos/effect/migration/annotations/effect__Schema.yaml
@@ -27,7 +27,7 @@ effect/Schema#Annotations.Doc:
   note: The v3 helper/protocol type was removed by the v4 Schema model rewrite. Use the public v4 constructor and infer its result types instead.
 effect/Schema#Annotations.Filter:
   replacement: Schema.Annotations.Filter
-  note: The API remains public in v4, but its type/value declaration was consolidated; use the v4 declaration and update inferred types/signature as needed.
+  note: "Use the v4 filter annotation shape. arbitraryConstraint uses Schema.Annotations.ToArbitrary.FilterConstraint; the earlier v4 ToArbitrary.Constraint name was removed."
 effect/Schema#Annotations.GenericSchema:
   replacement: none
   note: The v3 helper/protocol type was removed by the v4 Schema model rewrite. Use the public v4 constructor and infer its result types instead.
@@ -312,7 +312,7 @@ effect/Schema#EndsWithSchemaId:
   note: The v3 schema-id symbol was removed. Use the corresponding public v4 constructor/check instead of inspecting schema ids.
 effect/Schema#Enums:
   replacement: Schema.Enum
-  note: Rename the enum constructor and pass the enum object.
+  note: "Rename the enum constructor and pass the enum object. Numeric members must be finite; NaN and positive or negative Infinity throw at construction."
 effect/Schema#EnumsDefinition:
   replacement: none
   note: Compared the v3 declaration with v4 Schema and the schema migration guide; no direct public replacement remains. Rebuild the behavior from public v4 codecs/getters where still required.
@@ -660,7 +660,7 @@ effect/Schema#MinLengthSchemaId:
   note: The v3 schema-id symbol was removed. Use the corresponding public v4 constructor/check instead of inspecting schema ids.
 effect/Schema#multipleOf:
   replacement: Schema.isMultipleOf
-  note: Rename the predicate to `isMultipleOf` and apply it with `Schema.check` or a schema's `check` method.
+  note: "Rename the predicate to `isMultipleOf` and apply it with `Schema.check` or a schema's `check` method. The divisor must be finite and nonzero or construction throws RangeError; negative divisors are normalized to their absolute value."
 effect/Schema#MultipleOfSchemaId:
   replacement: none
   note: The v3 schema-id symbol was removed. Use the corresponding public v4 constructor/check instead of inspecting schema ids.
@@ -1155,10 +1155,10 @@ effect/Schema#TaggedStruct:
   note: The API remains public in v4, but its type/value declaration was consolidated; use the v4 declaration and update inferred types/signature as needed.
 effect/Schema#TemplateLiteral:
   replacement: Schema.TemplateLiteral(parts)
-  note: Pass template literal parts as one array.
+  note: Pass template literal parts as one array. Parts must not contain encodings, including inside unions and nested templates. Transformations whose decoded and encoded types are equal are also rejected. Use Schema.TemplateLiteralParser(parts) for transformed parts.
 effect/Schema#TemplateLiteralParser:
-  replacement: Schema.TemplateLiteralParser(schema.parts)
-  note: Create the template schema first and pass its `parts` property.
+  replacement: Schema.TemplateLiteralParser(parts)
+  note: Pass template literal parts directly as one array. Transformed parts are supported, and their decoding and encoding services are required in the corresponding direction.
 effect/Schema#TimeZone:
   replacement: Schema.TimeZoneFromString
   note: Use the string codec; v4 `TimeZone` is the self schema.
@@ -1190,8 +1190,8 @@ effect/Schema#transformLiterals:
   replacement: Schema.Literals(fromValues).transform(toValues)
   note: Split the pairs into parallel arrays and use `Literals(...).transform(...)`.
 effect/Schema#transformOrFail:
-  replacement: "schema.pipe(Schema.decodeTo(target, { decode: SchemaGetter.transformOrFail(...), encode: ... }))"
-  note: Replace the constructor with `decodeTo` and fallible `SchemaGetter` transformations.
+  replacement: "schema.pipe(Schema.decodeTo(target, { decode: SchemaGetter.transformEffect(...), encode: ... }))"
+  note: Replace the constructor with `decodeTo` and effectful `SchemaGetter` transformations.
 effect/Schema#Trim:
   replacement: Schema.Trim
   note: The API remains public in v4, but its type/value declaration was consolidated; use the v4 declaration and update inferred types/signature as needed.
@@ -1278,7 +1278,7 @@ effect/Schema#Union:
   note: Pass union members as one array.
 effect/Schema#UniqueSymbolFromSelf:
   replacement: Schema.UniqueSymbol
-  note: Use the v4 unique-symbol schema constructor.
+  note: "Use the v4 unique-symbol schema constructor. JSON encoding is available only for globally registered symbols and uses the exact String(symbol) value; local symbols cannot be encoded as JSON."
 effect/Schema#Unknown:
   replacement: Schema.Unknown
   note: The API remains public in v4, but its type/value declaration was consolidated; use the v4 declaration and update inferred types/signature as needed.
diff --git a/repos/effect/migration/annotations/effect__SchemaAST.yaml b/repos/effect/migration/annotations/effect__SchemaAST.yaml
index ab4978f15..043934cf5 100644
--- a/repos/effect/migration/annotations/effect__SchemaAST.yaml
+++ b/repos/effect/migration/annotations/effect__SchemaAST.yaml
@@ -1,6 +1,6 @@
 "effect/SchemaAST#Annotated":
-  replacement: "SchemaAST.Base"
-  note: "All v4 AST nodes extend Base, which owns annotations, checks, encoding, and context."
+  replacement: "SchemaAST.AST"
+  note: "The public base type was removed. Use the AST union; every variant still exposes annotations, checks, encoding, and context."
 "effect/SchemaAST#annotations":
   replacement: "SchemaAST.annotate"
   note: "Use the v4 annotation helper and string-keyed Schema.Annotations."
@@ -18,7 +18,7 @@
   note: "The name remains, but its constructor and fields changed in the v4 Base/check/context/encoding model."
 "effect/SchemaAST#BatchingAnnotation":
   replacement: "none"
-  note: "Per-schema batching annotations were removed; control asynchronous parsing with ParseOptions.concurrency."
+  note: "Per-schema batching annotations were removed. They have no direct replacement. ParseOptions.concurrency controls product child parsing only; configure request batching separately."
 "effect/SchemaAST#BatchingAnnotationId":
   replacement: "none"
   note: "Symbol annotation IDs were removed and batching is no longer a schema annotation."
@@ -43,6 +43,9 @@
 "effect/SchemaAST#Compiler":
   replacement: "none"
   note: "The generic AST compiler abstraction was removed; traverse the discriminated SchemaAST.AST union directly or use a higher-level Schema derivation API."
+"effect/SchemaAST#pick":
+  replacement: "none"
+  note: "The low-level AST picker was removed. Keep field selection at the Schema.Struct level with mapFields and Struct.pick, or discriminate and rebuild custom AST nodes explicitly."
 "effect/SchemaAST#composeTransformation":
   replacement: "SchemaAST.Encoding"
   note: "V4 transformations are SchemaAST.Link values in an encoding chain; compose by adding links with SchemaAST.decodeTo."
@@ -50,11 +53,11 @@
   replacement: "SchemaAST.Encoding"
   note: "The marker transformation was replaced by explicit SchemaAST.Link encoding chains."
 "effect/SchemaAST#ConcurrencyAnnotation":
-  replacement: "SchemaAST.ParseOptions[\"concurrency\"]"
-  note: "Concurrency is now a parse option rather than its own annotation type."
+  replacement: "SchemaAST.ParseOptions"
+  note: "Per-schema concurrency annotations were removed. Pass concurrency in runtime ParseOptions when creating or calling a decoder, encoder, or constructor. It applies independently to each tuple, array, struct, record, or struct-with-rest node and does not make Union candidates concurrent."
 "effect/SchemaAST#ConcurrencyAnnotationId":
-  replacement: "Schema.Annotations.Bottom[\"parseOptions\"]"
-  note: "Symbol annotation IDs were removed; put concurrency inside the parseOptions annotation."
+  replacement: "SchemaAST.ParseOptions"
+  note: "The annotation ID was removed. Pass concurrency in runtime ParseOptions; product parsing follows Effect.forEach concurrency semantics while Union candidates remain sequential."
 "effect/SchemaAST#Declaration":
   replacement: "SchemaAST.Declaration"
   note: "The name remains, but its constructor and fields changed in the v4 Base/check/context/encoding model."
@@ -93,7 +96,7 @@
   note: "The separate encoded-bound projection was removed; use the encoded projection and v4 encoding links."
 "effect/SchemaAST#Enums":
   replacement: "SchemaAST.Enum"
-  note: "The v4 SchemaAST redesign renamed this primitive, collection, or guard while preserving its role."
+  note: "Renamed to Enum in the v4 AST model. Numeric enum members must be finite; NaN and positive or negative Infinity throw at construction."
 "effect/SchemaAST#EquivalenceAnnotation":
   replacement: "Schema.Annotations.ToEquivalence.Declaration"
   note: "Equivalence derivation annotations now use the toEquivalence key in Schema.Annotations."
@@ -114,7 +117,7 @@
   note: "Resolve string-keyed annotations with resolveAt, or use resolveIdentifier, resolveTitle, and resolveDescription."
 "effect/SchemaAST#getBatchingAnnotation":
   replacement: "none"
-  note: "Batching annotations were removed; read ParseOptions.concurrency when controlling asynchronous parsing."
+  note: "Batching annotations were removed. ParseOptions.concurrency controls product child parsing only; configure request batching separately."
 "effect/SchemaAST#getBrandAnnotation":
   replacement: "SchemaAST.resolveAt(\"brands\")"
   note: "Resolve the string-keyed brands annotation."
@@ -122,8 +125,8 @@
   replacement: "none"
   note: "The Match-based compiler was removed; traverse SchemaAST.AST directly or use the relevant Schema derivation API."
 "effect/SchemaAST#getConcurrencyAnnotation":
-  replacement: "SchemaAST.resolveAt(\"parseOptions\")"
-  note: "Resolve parseOptions and read concurrency from it."
+  replacement: "SchemaAST.ParseOptions"
+  note: "Concurrency is no longer read from schema annotations. Pass it in runtime ParseOptions when creating or calling a parser. It applies to product children, not Union candidates."
 "effect/SchemaAST#getDecodingFallbackAnnotation":
   replacement: "none"
   note: "Fallbacks are encoding middleware in v4, not readable annotations; attach them with Schema.catchDecoding."
@@ -161,8 +164,8 @@
   replacement: "none"
   note: "Issue-title callbacks were removed; use message or expected annotations and SchemaIssue formatters."
 "effect/SchemaAST#getParseOptionsAnnotation":
-  replacement: "SchemaAST.resolveAt(\"parseOptions\")"
-  note: "Resolve the string-keyed parseOptions annotation."
+  replacement: "none"
+  note: "Parse options are no longer schema annotations. Pass options when creating or calling a decoder or encoder; there is no annotation-based override for nested schemas."
 "effect/SchemaAST#getPropertySignatures":
   replacement: "SchemaAST.Objects.propertySignatures"
   note: "Narrow to Objects and read propertySignatures directly."
@@ -327,10 +330,10 @@
   note: "Use the built-in JSON string codec instead of checking the old schema ID."
 "effect/SchemaAST#ParseOptions":
   replacement: "SchemaAST.ParseOptions"
-  note: "The name remains, but its constructor and fields changed in the v4 Base/check/context/encoding model."
+  note: "Pass parsing options at runtime. onExcessProperty supports ignore or error, not preserve; model extra values with an explicit Record or StructWithRest. propertyOrder was removed. concurrency follows Effect.forEach semantics for tuple, array, struct, record, and struct-with-rest children, applies independently at each nested product, and does not make Union candidates concurrent. Output key order is unspecified, including in values passed to checks. Handle required presentation or serialization order explicitly outside the parser."
 "effect/SchemaAST#ParseOptionsAnnotationId":
-  replacement: "Schema.Annotations.Bottom[\"parseOptions\"]"
-  note: "Symbol annotation IDs were removed; use the parseOptions key."
+  replacement: "none"
+  note: "Parse options are no longer schema annotations. Pass options when creating or calling a decoder or encoder; there is no annotation-based override for nested schemas."
 "effect/SchemaAST#partial":
   replacement: "Schema.mapFields + Struct.map(Schema.optional)"
   note: "Partial object transforms moved to schema field transforms."
@@ -378,7 +381,7 @@
   note: "The v4 SchemaAST redesign renamed this primitive, collection, or guard while preserving its role."
 "effect/SchemaAST#TemplateLiteral":
   replacement: "SchemaAST.TemplateLiteral"
-  note: "The name remains, but its constructor and fields changed in the v4 Base/check/context/encoding model."
+  note: "The name remains, but its constructor and fields changed in the v4 Base/check/context/encoding model. Parts must not contain encodings, including inside unions or nested templates; use Schema.TemplateLiteralParser for transformed parts."
 "effect/SchemaAST#TemplateLiteralSpan":
   replacement: "SchemaAST.TemplateLiteral"
   note: "Template literal parts are represented directly as AST values in v4."
@@ -396,7 +399,7 @@
   note: "Transformation implementations moved to SchemaTransformation and are stored on SchemaAST.Link."
 "effect/SchemaAST#TupleType":
   replacement: "SchemaAST.Arrays"
-  note: "The v4 SchemaAST redesign renamed this primitive, collection, or guard while preserving its role."
+  note: "Use Arrays(isMutable, elements, rest, annotations?, checks?, encoding?, context?, encodingChecks?)."
 "effect/SchemaAST#Type":
   replacement: "SchemaAST.AST"
   note: "The tuple-element Type wrapper was removed; optionality and mutability moved to Context."
@@ -411,7 +414,7 @@
   note: "Symbol annotation IDs were removed; use declaration codec annotation keys."
 "effect/SchemaAST#TypeLiteral":
   replacement: "SchemaAST.Objects"
-  note: "The v4 SchemaAST redesign renamed this primitive, collection, or guard while preserving its role."
+  note: "Use Objects(propertySignatures, indexSignatures, annotations?, checks?, encoding?, context?, encodingChecks?). Output key order is unspecified."
 "effect/SchemaAST#TypeLiteralTransformation":
   replacement: "SchemaAST.Encoding"
   note: "Object transformations are encoding links; use Schema.encodeKeys for key mappings."
@@ -423,7 +426,7 @@
   note: "The v4 SchemaAST redesign renamed this primitive, collection, or guard while preserving its role."
 "effect/SchemaAST#Union":
   replacement: "SchemaAST.Union"
-  note: "The name remains, but its constructor and fields changed in the v4 Base/check/context/encoding model."
+  note: "Pass member ASTs and an optional options object: new SchemaAST.Union(types, { mode: 'oneOf' }). Read options?.mode ?? 'anyOf' instead of a direct mode field."
 "effect/SchemaAST#UniqueSymbol":
   replacement: "SchemaAST.UniqueSymbol"
   note: "The name remains, but its constructor and fields changed in the v4 Base/check/context/encoding model."
diff --git a/repos/effect/migration/annotations/effect__SortedSet.yaml b/repos/effect/migration/annotations/effect__SortedSet.yaml
index cc0e6e0c8..7e95f864c 100644
--- a/repos/effect/migration/annotations/effect__SortedSet.yaml
+++ b/repos/effect/migration/annotations/effect__SortedSet.yaml
@@ -58,3 +58,6 @@
 "effect/SortedSet#some":
   replacement: "HashSet.some"
   note: "Run the predicate against the replacement HashSet; sort first only if traversal order has observable effects."
+"effect/SortedSet#toggle":
+  replacement: "HashSet.has + HashSet.add / HashSet.remove"
+  note: "HashSet has no toggle; branch on membership and add or remove the element."
diff --git a/repos/effect/migration/annotations/effect__Stream.yaml b/repos/effect/migration/annotations/effect__Stream.yaml
index c2d861cd5..e4396a591 100644
--- a/repos/effect/migration/annotations/effect__Stream.yaml
+++ b/repos/effect/migration/annotations/effect__Stream.yaml
@@ -1,3 +1,39 @@
+effect/Stream#bind:
+  include: true
+  replacement: "Stream.bind"
+  note: "The input must be a record. Start from Stream.Do or use Stream.bindTo(name) to wrap a non-record element. The field name may now re-bind an existing key; the resulting record type is Simplify<Omit<A, N> & Record<N, B>>."
+effect/Stream#bindEffect:
+  include: true
+  replacement: "Stream.bindEffect"
+  note: "The input must be a record. Start from Stream.Do or use Stream.bindTo(name) to wrap a non-record element. Existing keys may be re-bound, with the new value replacing the old field type. The callback still returns an Effect."
+effect/Stream#catchTags:
+  include: true
+  replacement: "Stream.catchTags"
+  note: "Only keys present in the tagged error union are accepted; remove handlers for tags the stream cannot fail with. Untagged errors remain in the error channel."
+effect/Stream#mapBoth:
+  include: true
+  replacement: "Stream.mapBoth"
+  note: "Rename the options onSuccess to onElement and onFailure to onError. The callbacks still transform emitted elements and typed errors respectively."
+effect/Stream#partition:
+  include: true
+  replacement: "Stream.partition"
+  note: "Pass a Result-returning Filter instead of a boolean predicate or refinement; Filter.fromPredicate(predicate) adapts existing predicates. The tuple order is now [passes, fails], the reverse of v3 [excluded, satisfying]. Rename bufferSize to capacity (default 16; also accepts \"unbounded\"). Acquisition is scoped and does not fail with E; the returned streams carry E."
+effect/Stream#scan:
+  include: true
+  replacement: "Stream.scan"
+  note: "Wrap the initial state in a thunk: Stream.scan(() => initial, step). The thunk is evaluated for each stream run; allocate mutable initial state inside it to avoid sharing state between runs."
+effect/Stream#scanEffect:
+  include: true
+  replacement: "Stream.scanEffect"
+  note: "Wrap the initial state in a thunk: Stream.scanEffect(() => initial, step). It is evaluated for each stream run; the step still returns an Effect."
+effect/Stream#runIntoPubSub:
+  include: true
+  replacement: "Stream.runIntoPubSub"
+  note: "Pass a PubSub of plain elements rather than Take wrappers. Both overloads return Effect<void, E, R>, so handle stream failures on the returned Effect instead of expecting them as PubSub messages. The optional shutdownOnEnd flag controls PubSub shutdown."
+effect/Stream#let:
+  include: true
+  replacement: "Stream.let"
+  note: "Retained in v4 and aligned with Effect.let: the field name may re-bind an existing key (the computed value replaces it) and the record type is Simplify<Omit<A, N> & Record<N, B>>."
 effect/Stream#Stream:
   replacement: "Stream"
   note: "The Stream<A, E, R> interface is unchanged in shape and keeps the effect/Stream import path; the type-id key is now the string literal \"~effect/Stream\" instead of a unique symbol."
@@ -29,8 +65,9 @@ effect/Stream#aggregateWithinEither:
   replacement: "Stream.aggregateWithin"
   note: "Either-emitting variant removed; v4 aggregateWithin(sink, schedule) emits only the sink outputs B (schedule outputs are no longer surfaced as Either.right)."
 effect/Stream#as:
-  replacement: "Stream.map(() => value)"
-  note: "Stream.as was removed; replace each element with a constant via Stream.map."
+  include: true
+  replacement: "Stream.as"
+  note: "Retained in v4 with the same signature; replaces every element with the provided constant value."
 effect/Stream#async:
   replacement: "Stream.callback"
   note: "Stream.callback((queue) => Effect | void, { bufferSize?, strategy? }) replaces the Emit-based async; push with Queue.offer/offerAll, end with Queue.end, fail with Queue.fail."
@@ -392,6 +429,7 @@ effect/Stream#toReadableStreamRuntime:
   replacement: "Stream.toReadableStreamWith"
   note: "Renamed; takes a `Context.Context<XR>` instead of a Runtime (v4 removed Runtime); options `{ strategy?: QueuingStrategy }` unchanged."
 effect/Stream#transduce:
+  include: true
   replacement: "Stream.transduce"
   note: "Unchanged name and Sink-based shape; chunks are plain arrays in v4."
 effect/Stream#unfoldChunk:
diff --git a/repos/effect/migration/annotations/effect__SynchronizedRef.yaml b/repos/effect/migration/annotations/effect__SynchronizedRef.yaml
index 5fef8a050..37db3e7ba 100644
--- a/repos/effect/migration/annotations/effect__SynchronizedRef.yaml
+++ b/repos/effect/migration/annotations/effect__SynchronizedRef.yaml
@@ -1,9 +1,9 @@
 effect/SynchronizedRef#SynchronizedRef:
   replacement: "SynchronizedRef.SynchronizedRef"
-  note: "The model remains, now extends the v4 Ref model, and is read or updated through explicit SynchronizedRef operations."
+  note: "The model remains but no longer extends Ref; read and update it through explicit SynchronizedRef operations. The curried v4 modifySomeEffect takes only the callback, which returns an Effect of [result, Option<newValue>]; remove the v3 fallback and outer Option."
 effect/SynchronizedRef#SynchronizedRef.Variance:
-  replacement: "Ref.Ref.Variance"
-  note: "SynchronizedRef now inherits Ref variance instead of declaring a separate public variance marker."
+  replacement: "none"
+  note: "The public nested variance marker was removed. SynchronizedRef uses an internal brand in v4, so do not refer to a variance interface directly."
 effect/SynchronizedRef#SynchronizedRefTypeId:
   replacement: "none"
   note: "The SynchronizedRef type id is internal in v4; do not inspect or construct the brand directly."
diff --git a/repos/effect/migration/annotations/effect__Types.yaml b/repos/effect/migration/annotations/effect__Types.yaml
index cbd7331fa..95bb82323 100644
--- a/repos/effect/migration/annotations/effect__Types.yaml
+++ b/repos/effect/migration/annotations/effect__Types.yaml
@@ -10,6 +10,9 @@
 "effect/Types#Ctor":
   replacement: "new (...args: Array<any>) => T"
   note: "The named alias was removed; inline the construct signature or define a local alias."
+"effect/Types#DeepMutable":
+  replacement: "Types.DeepMutable"
+  note: "Retained, but v4 preserves built-in objects, Effect data types, and other objects with methods or symbol-keyed properties while making surrounding structural data mutable."
 "effect/Types#Invariant":
   replacement: "Types.Invariant"
   note: "Unchanged invariant type helper."
diff --git a/repos/effect/migration/annotations/effect__ai-openai__OpenAiTool.yaml b/repos/effect/migration/annotations/effect__ai-openai__OpenAiTool.yaml
new file mode 100644
index 000000000..7cf5207b1
--- /dev/null
+++ b/repos/effect/migration/annotations/effect__ai-openai__OpenAiTool.yaml
@@ -0,0 +1,14 @@
+"@effect/ai-openai/OpenAiTool#CodeInterpreter":
+  replacement: "OpenAiTool.CodeInterpreter"
+  note: "Results now wrap outputs in an object with status and outputs, rather than returning the output array or null directly. Only completed is successful; other statuses produce failure results that preserve outputs."
+"@effect/ai-openai/OpenAiTool#FileSearch":
+  replacement: "OpenAiTool.FileSearch"
+  note: "Results contain status, queries, and a required results field holding matches or null. Only completed is successful; other statuses produce failure results that preserve partial matches."
+"@effect/ai-openai/OpenAiTool#WebSearch":
+  include: true
+  replacement: "OpenAiTool.WebSearch"
+  note: "Results now include action alongside status. Only completed is successful; other statuses produce failure results. Inspect isFailure before treating a result as a successful search. Inspect each search source by its type: URL sources have url, while API sources have name and no url."
+"@effect/ai-openai/OpenAiTool#WebSearchPreview":
+  include: true
+  replacement: "OpenAiTool.WebSearchPreview"
+  note: "Results now include action alongside status. Only completed is successful; other statuses produce failure results. Inspect isFailure before treating a result as a successful search. Inspect each search source by its type: URL sources have url, while API sources have name and no url."
diff --git a/repos/effect/migration/annotations/effect__ai-openrouter__OpenRouterClient.yaml b/repos/effect/migration/annotations/effect__ai-openrouter__OpenRouterClient.yaml
index 81023018b..a41065273 100644
--- a/repos/effect/migration/annotations/effect__ai-openrouter__OpenRouterClient.yaml
+++ b/repos/effect/migration/annotations/effect__ai-openrouter__OpenRouterClient.yaml
@@ -12,4 +12,4 @@
   note: "The standalone streaming chunk schema was replaced by the decoded data type from Generated.ChatStreamingResponse."
 "@effect/ai-openrouter/OpenRouterClient#Service":
   replacement: "OpenRouterClient.Service"
-  note: "Still exported in v4; adapt to the regenerated client, revised request and response schemas, and the new streaming result tuple."
+  note: "Still exported in v4; adapt to the regenerated client, revised request and response schemas, and the new streaming result tuple. Custom service implementations and mocks must also provide createDecisions, returning an Effect of [decoded DecisionsResponse, HttpClientResponse] with AiError failures."
diff --git a/repos/effect/migration/annotations/effect__ai__AiError.yaml b/repos/effect/migration/annotations/effect__ai__AiError.yaml
index d906cf83a..34d041d50 100644
--- a/repos/effect/migration/annotations/effect__ai__AiError.yaml
+++ b/repos/effect/migration/annotations/effect__ai__AiError.yaml
@@ -19,3 +19,6 @@
 "@effect/ai/AiError#UnknownError":
   replacement: "AiError.make + AiError.UnknownError"
   note: "UnknownError is now a semantic reason rather than a top-level error. Put module and method on AiError.make and inspect reason._tag when handling the outer AiError."
+"@effect/ai/AiError#HttpRequestDetails":
+  replacement: "AiError.HttpRequestDetails"
+  note: "Retained in effect/unstable/ai/AiError and also re-exported as Response.HttpRequestDetails. Hash is an optional string instead of Option, headers may contain Redacted strings, and method includes TRACE."
diff --git a/repos/effect/migration/annotations/effect__ai__Chat.yaml b/repos/effect/migration/annotations/effect__ai__Chat.yaml
new file mode 100644
index 000000000..ce5272505
--- /dev/null
+++ b/repos/effect/migration/annotations/effect__ai__Chat.yaml
@@ -0,0 +1,6 @@
+"@effect/ai/Chat#Chat":
+  replacement: "Chat.Chat"
+  note: "Use the Chat interface for implementations and the Context.Service value as the service key; it is no longer a class. Chat.empty and Chat.fromPrompt construct branded chat sessions."
+"@effect/ai/Chat#Service":
+  replacement: "Chat.Chat"
+  note: "Service was renamed to Chat. Implementations require [Chat.TypeId]: Chat.TypeId; use Chat.empty or Chat.fromPrompt to create a session."
diff --git a/repos/effect/migration/annotations/effect__ai__EmbeddingModel.yaml b/repos/effect/migration/annotations/effect__ai__EmbeddingModel.yaml
index a4c065c0d..b92a1a18b 100644
--- a/repos/effect/migration/annotations/effect__ai__EmbeddingModel.yaml
+++ b/repos/effect/migration/annotations/effect__ai__EmbeddingModel.yaml
@@ -1,3 +1,9 @@
 "@effect/ai/EmbeddingModel#makeDataLoader":
   replacement: "EmbeddingModel.make + RequestResolver.setDelay + RequestResolver.batchN"
   note: "The dedicated data-loader constructor was removed. EmbeddingModel.make batches concurrent embed requests through its resolver; compose the exposed resolver with setDelay and optional batchN for the old window and maximum-batch behavior."
+"@effect/ai/EmbeddingModel#EmbeddingModel":
+  replacement: "EmbeddingModel.EmbeddingModel"
+  note: "Use the EmbeddingModel interface for implementations and the Context.Service value as the service key; it is no longer a class. Prefer EmbeddingModel.make to construct the branded implementation."
+"@effect/ai/EmbeddingModel#Service":
+  replacement: "EmbeddingModel.EmbeddingModel"
+  note: "Service was renamed to EmbeddingModel. Implementations require [EmbeddingModel.TypeId]: EmbeddingModel.TypeId; EmbeddingModel.make supplies the brand."
diff --git a/repos/effect/migration/annotations/effect__ai__LanguageModel.yaml b/repos/effect/migration/annotations/effect__ai__LanguageModel.yaml
index 7436f1bf5..19b26391d 100644
--- a/repos/effect/migration/annotations/effect__ai__LanguageModel.yaml
+++ b/repos/effect/migration/annotations/effect__ai__LanguageModel.yaml
@@ -4,3 +4,9 @@
 "@effect/ai/LanguageModel#ExtractContext":
   replacement: "LanguageModel.ExtractServices"
   note: "Renamed in effect/unstable/ai/LanguageModel. ExtractServices infers toolkit handler, result-decoding, and effectful-toolkit service requirements."
+"@effect/ai/LanguageModel#LanguageModel":
+  replacement: "LanguageModel.LanguageModel"
+  note: "Use the LanguageModel interface for implementations and the Context.Service value as the service key; it is no longer a class. Prefer LanguageModel.make to construct the branded implementation."
+"@effect/ai/LanguageModel#Service":
+  replacement: "LanguageModel.LanguageModel"
+  note: "Service was renamed to LanguageModel. Implementations require [LanguageModel.TypeId]: LanguageModel.TypeId; LanguageModel.make supplies the brand."
diff --git a/repos/effect/migration/annotations/effect__ai__McpSchema.yaml b/repos/effect/migration/annotations/effect__ai__McpSchema.yaml
index 2c7a565d1..626955bfc 100644
--- a/repos/effect/migration/annotations/effect__ai__McpSchema.yaml
+++ b/repos/effect/migration/annotations/effect__ai__McpSchema.yaml
@@ -16,6 +16,9 @@
 "@effect/ai/McpSchema#McpError":
   replacement: "McpSchema.McpError"
   note: "Moved, but changed from a constructable base class to a union schema of standard tagged protocol errors plus McpErrorBase. Use McpErrorBase to construct a generic MCP error."
+"@effect/ai/McpSchema#McpServerClient":
+  replacement: "McpSchema.McpRequestContext / McpSchema.McpServerClient"
+  note: "Use McpRequestContext for client identity, capabilities, and request metadata in protocol-neutral handlers. McpServerClient remains available for initialized stateful protocols and reverse client requests; it is not provided by the stateless 2026-07-28 adapter. Registration helpers exclude McpRequestContext from handler requirements, not McpServerClient."
 "@effect/ai/McpSchema#param":
   replacement: "McpSchema.param"
   note: "Moved to effect/unstable/ai/McpSchema. V4 wraps the schema and exposes Param.name and Param.schema instead of attaching a public symbol annotation."
diff --git a/repos/effect/migration/annotations/effect__ai__McpServer.yaml b/repos/effect/migration/annotations/effect__ai__McpServer.yaml
index 7ded9767a..a23e5401e 100644
--- a/repos/effect/migration/annotations/effect__ai__McpServer.yaml
+++ b/repos/effect/migration/annotations/effect__ai__McpServer.yaml
@@ -13,3 +13,24 @@
 "@effect/ai/McpServer#run":
   replacement: "McpServer.run"
   note: "Moved to effect/unstable/ai/McpServer. Pass a non-empty protocols array of adapters, such as [McpProtocol.v2025_06_18], imported with McpProtocol from effect/unstable/ai; it remains the Effect-level runner over RpcServer.Protocol."
+"@effect/ai/McpServer#McpServer":
+  replacement: "McpServer.McpServer"
+  note: "The service is now a Context.Service. initializedClients and notificationsMailbox are no longer exposed. Registration callbacks use McpSchema.McpRequestContext; McpServerClient is only supplied for initialized stateful requests. Prefer registerToolkit, registerResource, and registerPrompt over implementing the registry shape directly."
+"@effect/ai/McpServer#registerToolkit":
+  replacement: "McpServer.registerToolkit"
+  note: "Moved to effect/unstable/ai/McpServer. Handler requirements now exclude McpSchema.McpRequestContext instead of McpServerClient. Strict tools reject excess input properties; raw JSON Schema dynamic tools cannot use strict mode. Declared handler failures produce isError results, while parameter validation fails with InvalidParams."
+"@effect/ai/McpServer#toolkit":
+  replacement: "McpServer.toolkit"
+  note: "Moved to effect/unstable/ai/McpServer. The registration layer supplies McpSchema.McpRequestContext to handlers instead of excluding McpServerClient from requirements. Strict tools reject excess properties and require an Effect Schema rather than raw dynamic JSON Schema."
+"@effect/ai/McpServer#registerResource":
+  replacement: "McpServer.registerResource"
+  note: "Moved to effect/unstable/ai/McpServer. Resource and completion handler requirements now exclude McpSchema.McpRequestContext instead of McpServerClient; use the request context for protocol-neutral client metadata."
+"@effect/ai/McpServer#resource":
+  replacement: "McpServer.resource"
+  note: "Moved to effect/unstable/ai/McpServer. The registration layer excludes McpSchema.McpRequestContext from resource and completion handler requirements instead of McpServerClient."
+"@effect/ai/McpServer#registerPrompt":
+  replacement: "McpServer.registerPrompt"
+  note: "Moved to effect/unstable/ai/McpServer. Prompt decoding and handler requirements now exclude McpSchema.McpRequestContext instead of McpServerClient; use the request context for protocol-neutral client metadata."
+"@effect/ai/McpServer#prompt":
+  replacement: "McpServer.prompt"
+  note: "Moved to effect/unstable/ai/McpServer. The registration layer excludes McpSchema.McpRequestContext from prompt decoding and handler requirements instead of McpServerClient."
diff --git a/repos/effect/migration/annotations/effect__ai__Response.yaml b/repos/effect/migration/annotations/effect__ai__Response.yaml
index 2a1351c12..886befa16 100644
--- a/repos/effect/migration/annotations/effect__ai__Response.yaml
+++ b/repos/effect/migration/annotations/effect__ai__Response.yaml
@@ -67,3 +67,6 @@
 "@effect/ai/Response#urlSourcePart":
   replacement: "Response.makePart(\"source\", { ...params, sourceType: \"url\" })"
   note: "The lowercase convenience constructor was removed. The UrlSourcePart model remains, and the generic constructor now requires the URL source discriminator."
+"@effect/ai/Response#ToolResultPart":
+  replacement: "Response.ToolResultPart"
+  note: "The schema selects success or failure using isFailure rather than trying both result schemas. It returns Schema.Codec; supply decoding services when decoding and encoding services when encoding."
diff --git a/repos/effect/migration/annotations/effect__ai__Tool.yaml b/repos/effect/migration/annotations/effect__ai__Tool.yaml
index 5bd660841..e0fefb044 100644
--- a/repos/effect/migration/annotations/effect__ai__Tool.yaml
+++ b/repos/effect/migration/annotations/effect__ai__Tool.yaml
@@ -55,3 +55,9 @@
 "@effect/ai/Tool#TypeId":
   replacement: "Tool.TypeId"
   note: "Moved to effect/unstable/ai/Tool and remains public. Its literal changed, so use the export rather than retaining the old hard-coded string."
+"@effect/ai/Tool#Result":
+  replacement: "Tool.Result"
+  note: "The result includes success, declared failure, and execution-denied or execution-interrupted values in both failure modes. Return mode also includes AiError; handle these variants when narrowing results."
+"@effect/ai/Tool#ResultEncoded":
+  replacement: "Tool.ResultEncoded"
+  note: "The encoded result includes execution-denied and execution-interrupted variants in both failure modes, plus encoded AiError in return mode."
diff --git a/repos/effect/migration/annotations/effect__cli__Args.yaml b/repos/effect/migration/annotations/effect__cli__Args.yaml
index f95db093c..c07e2b7fe 100644
--- a/repos/effect/migration/annotations/effect__cli__Args.yaml
+++ b/repos/effect/migration/annotations/effect__cli__Args.yaml
@@ -15,9 +15,9 @@
   note: "Argument constructors now take the name as a required first parameter."
 "@effect/cli/Args#Args.FormatArgsConfig":
   replacement: "Primitive.FileParseOptions"
-  note: "Pass the name separately and use the format option with Argument.fileParse or Argument.fileSchema."
+  note: "Pass the name separately and use the format option with Argument.FileParse or Argument.FileSchema."
 "@effect/cli/Args#Args.PathArgsConfig":
-  replacement: "Argument.path(name, { pathType, mustExist })"
+  replacement: "Argument.Path(name, { pathType, mustExist })"
   note: "Path options are inline; map exists=yes to mustExist=true and either to omission. exists=no has no exact replacement."
 "@effect/cli/Args#Args.Variance":
   replacement: "Argument.Argument"
@@ -35,11 +35,35 @@
   replacement: "Argument.between"
   note: "Use the moved combinator; v4 validates bounds when constructing the parameter."
 "@effect/cli/Args#boolean":
-  replacement: "Flag.boolean / Argument.choiceWithValue"
+  replacement: "Flag.Boolean / Argument.ChoiceWithValue"
   note: "Positional booleans were removed as ambiguous; prefer a boolean flag or explicit true/false positional choices."
+"@effect/cli/Args#choice":
+  replacement: "Argument.Literals"
+  note: "Use the renamed constructor and pass the argument name explicitly."
+"@effect/cli/Args#date":
+  replacement: "Argument.Date"
+  note: "Use the renamed constructor and pass the argument name explicitly."
+"@effect/cli/Args#directory":
+  replacement: "Argument.Directory"
+  note: "Use mustExist=true for exists=yes and omit it for either; exists=no has no exact replacement."
+"@effect/cli/Args#file":
+  replacement: "Argument.File"
+  note: "Use mustExist=true for exists=yes and omit it for either; exists=no has no exact replacement."
 "@effect/cli/Args#fileContent":
-  replacement: "Argument.file + Argument.mapEffect"
+  replacement: "Argument.File + Argument.mapEffect"
   note: "Parse a path and read it with FileSystem.readFile; no binary-content argument constructor remains."
+"@effect/cli/Args#fileParse":
+  replacement: "Argument.FileParse"
+  note: "Pass the old format as an options field; v4 returns parsed content rather than a path/content tuple."
+"@effect/cli/Args#fileSchema":
+  replacement: "Argument.FileSchema"
+  note: "Pass the old format as an options field and use a v4 Schema constraint decoder."
+"@effect/cli/Args#fileText":
+  replacement: "Argument.FileText"
+  note: "Use the renamed constructor; it returns content only."
+"@effect/cli/Args#float":
+  replacement: "Argument.Finite"
+  note: "Use the renamed constructor; it rejects non-finite numbers."
 "@effect/cli/Args#getHelp":
   replacement: "none"
   note: "Per-argument help introspection was removed; Command generates help internally."
@@ -55,24 +79,36 @@
 "@effect/cli/Args#getUsage":
   replacement: "none"
   note: "The public Usage tree was removed; Command generates a usage string internally."
+"@effect/cli/Args#integer":
+  replacement: "Argument.Int"
+  note: "Use the renamed constructor and pass the argument name explicitly."
 "@effect/cli/Args#isArgs":
   replacement: "Param.isParam(value) && value.kind === Param.argumentKind"
   note: "Arguments now use the shared Param representation and an explicit kind discriminator."
 "@effect/cli/Args#map":
   replacement: "Argument.map"
   note: "Use the moved combinator."
+"@effect/cli/Args#none":
+  replacement: "omit the config entry"
+  note: "V4 Argument.Never is an always-failing sentinel, not v3's empty successful argument set."
 "@effect/cli/Args#optional":
   replacement: "Argument.optional"
   note: "Use the moved combinator; it still returns Option."
+"@effect/cli/Args#path":
+  replacement: "Argument.Path"
+  note: "Path options are inline; map exists=yes to mustExist=true and either to omission. exists=no has no exact replacement."
+"@effect/cli/Args#redacted":
+  replacement: "Argument.Redacted"
+  note: "Use the renamed constructor and pass the argument name explicitly."
 "@effect/cli/Args#repeated":
   replacement: "Argument.variadic"
   note: "Renamed to variadic; pass optional min and max bounds."
 "@effect/cli/Args#secret":
-  replacement: "Argument.redacted"
+  replacement: "Argument.Redacted"
   note: "Use Redacted-backed positional input."
 "@effect/cli/Args#text":
-  replacement: "Argument.string"
-  note: "Renamed to string; pass the argument name explicitly."
+  replacement: "Argument.String"
+  note: "Renamed to String; pass the argument name explicitly."
 "@effect/cli/Args#validate":
   replacement: "argument.parse({ flags: {}, arguments: args })"
   note: "Parsing is now a Param method and returns leftover tokens with the value; errors are CliError."
diff --git a/repos/effect/migration/annotations/effect__cli__CommandDirective.yaml b/repos/effect/migration/annotations/effect__cli__CommandDirective.yaml
index 3c157a9c8..8dc872ab7 100644
--- a/repos/effect/migration/annotations/effect__cli__CommandDirective.yaml
+++ b/repos/effect/migration/annotations/effect__cli__CommandDirective.yaml
@@ -1,5 +1,5 @@
 "@effect/cli/CommandDirective#builtIn":
-  replacement: "GlobalFlag.action"
+  replacement: "GlobalFlag.Action"
   note: "Define a custom action flag; v4 runners no longer return built-in directives."
 "@effect/cli/CommandDirective#BuiltIn":
   replacement: "GlobalFlag.Action"
diff --git a/repos/effect/migration/annotations/effect__cli__Options.yaml b/repos/effect/migration/annotations/effect__cli__Options.yaml
index 22a76c724..966f792e3 100644
--- a/repos/effect/migration/annotations/effect__cli__Options.yaml
+++ b/repos/effect/migration/annotations/effect__cli__Options.yaml
@@ -17,40 +17,40 @@
   replacement: "Flag.between"
   note: "Use the moved combinator; v4 validates bounds when constructing the parameter."
 "@effect/cli/Options#boolean":
-  replacement: "Flag.boolean + Flag.withDefault"
-  note: "Use Flag.boolean(name).pipe(Flag.withDefault(false)) to preserve v3's omitted-flag default; bare Flag.boolean is now required. --no-name is automatic and aliases are added with Flag.withAlias."
+  replacement: "Flag.Boolean + Flag.withDefault"
+  note: "Use Flag.Boolean(name).pipe(Flag.withDefault(false)) to preserve v3's omitted-flag default; bare Flag.Boolean is now required. --no-name is automatic and aliases are added with Flag.withAlias."
 "@effect/cli/Options#choice":
-  replacement: "Flag.choice"
+  replacement: "Flag.Literals"
   note: "Use the moved constructor."
 "@effect/cli/Options#choiceWithValue":
-  replacement: "Flag.choiceWithValue"
+  replacement: "Flag.ChoiceWithValue"
   note: "Use the moved constructor."
 "@effect/cli/Options#date":
-  replacement: "Flag.date"
+  replacement: "Flag.Date"
   note: "Use the moved constructor."
 "@effect/cli/Options#directory":
-  replacement: "Flag.directory"
+  replacement: "Flag.Directory"
   note: "Use mustExist=true for exists=yes and omit it for either; exists=no has no exact replacement."
 "@effect/cli/Options#file":
-  replacement: "Flag.file"
+  replacement: "Flag.File"
   note: "Use mustExist=true for exists=yes and omit it for either; exists=no has no exact replacement."
 "@effect/cli/Options#fileContent":
-  replacement: "Flag.file + Flag.mapEffect"
+  replacement: "Flag.File + Flag.mapEffect"
   note: "Parse a path and read it with FileSystem.readFile; no binary-content flag constructor remains."
 "@effect/cli/Options#fileParse":
-  replacement: "Flag.fileParse"
+  replacement: "Flag.FileParse"
   note: "Pass the old format as an options field; v4 returns parsed content rather than a path/content tuple."
 "@effect/cli/Options#fileSchema":
-  replacement: "Flag.fileSchema"
+  replacement: "Flag.FileSchema"
   note: "Pass the old format as an options field and use a v4 Schema constraint decoder."
 "@effect/cli/Options#fileText":
-  replacement: "Flag.file + Flag.mapEffect"
-  note: "Flag.fileText returns content only; read after Flag.file when the path/content tuple must be preserved."
+  replacement: "Flag.File + Flag.mapEffect"
+  note: "Flag.FileText returns content only; read after Flag.File when the path/content tuple must be preserved."
 "@effect/cli/Options#filterMap":
   replacement: "Flag.filterMap"
   note: "Use the moved combinator and replace the fixed message with an onNone function."
 "@effect/cli/Options#float":
-  replacement: "Flag.float"
+  replacement: "Flag.Finite"
   note: "Use the moved constructor."
 "@effect/cli/Options#getHelp":
   replacement: "none"
@@ -62,7 +62,7 @@
   replacement: "none"
   note: "The public Usage tree was removed; Command generates a usage string internally."
 "@effect/cli/Options#integer":
-  replacement: "Flag.integer"
+  replacement: "Flag.Int"
   note: "Use the moved constructor."
 "@effect/cli/Options#isBool":
   replacement: "none"
@@ -71,7 +71,7 @@
   replacement: "Param.isParam(value) && value.kind === Param.flagKind"
   note: "Flags now use the shared Param representation and an explicit kind discriminator."
 "@effect/cli/Options#keyValueMap":
-  replacement: "Flag.keyValuePair"
+  replacement: "Flag.KeyValuePair"
   note: "Renamed and now returns Record<string, string> rather than HashMap."
 "@effect/cli/Options#map":
   replacement: "Flag.map"
@@ -84,7 +84,7 @@
   note: "Use the moved combinator; onError now returns a string rather than HelpDoc."
 "@effect/cli/Options#none":
   replacement: "omit the config entry"
-  note: "V4 Flag.none is an always-failing sentinel, not v3's empty successful option set."
+  note: "V4 Flag.Never is an always-failing sentinel, not v3's empty successful option set."
 "@effect/cli/Options#optional":
   replacement: "Flag.optional"
   note: "Use the moved combinator; it still returns Option."
@@ -92,7 +92,7 @@
   replacement: "Flag.Flag"
   note: "Options was renamed to Flag in effect/unstable/cli."
 "@effect/cli/Options#Options.BooleanOptionsConfig":
-  replacement: "Flag.boolean + Flag.withAlias + Flag.map"
+  replacement: "Flag.Boolean + Flag.withAlias + Flag.map"
   note: "The config object was removed; aliases and value inversion are combinators, while custom negation names need application logic."
 "@effect/cli/Options#Options.PathOptionsConfig":
   replacement: "{ readonly mustExist?: boolean }"
@@ -116,17 +116,17 @@
   replacement: "Command.runWith"
   note: "Raw argv processing is now whole-command execution; no public standalone flag tokenizer remains."
 "@effect/cli/Options#redacted":
-  replacement: "Flag.redacted"
+  replacement: "Flag.Redacted"
   note: "Use the moved constructor."
 "@effect/cli/Options#repeated":
   replacement: "Flag.variadic"
   note: "Renamed to variadic; pass optional min and max bounds."
 "@effect/cli/Options#secret":
-  replacement: "Flag.redacted"
+  replacement: "Flag.Redacted"
   note: "The deprecated Secret constructor was removed; use Redacted-backed input."
 "@effect/cli/Options#text":
-  replacement: "Flag.string"
-  note: "Renamed from text to string."
+  replacement: "Flag.String"
+  note: "Renamed from text to String."
 "@effect/cli/Options#withAlias":
   replacement: "Flag.withAlias"
   note: "Use the moved combinator."
diff --git a/repos/effect/migration/annotations/effect__cli__Primitive.yaml b/repos/effect/migration/annotations/effect__cli__Primitive.yaml
index 35082dfc9..ab6eec519 100644
--- a/repos/effect/migration/annotations/effect__cli__Primitive.yaml
+++ b/repos/effect/migration/annotations/effect__cli__Primitive.yaml
@@ -1,15 +1,15 @@
 "@effect/cli/Primitive#boolean":
-  replacement: "Primitive.boolean"
-  note: "Boolean is now a singleton value; defaults belong on Flag.boolean or withDefault."
+  replacement: "Primitive.Boolean"
+  note: "Boolean is now a singleton value; defaults belong on Flag.Boolean or withDefault."
 "@effect/cli/Primitive#choice":
-  replacement: "Primitive.choice"
+  replacement: "Primitive.Choice"
   note: "Use the moved constructor."
 "@effect/cli/Primitive#date":
-  replacement: "Primitive.date"
+  replacement: "Primitive.Date"
   note: "Date is now a singleton Primitive value."
 "@effect/cli/Primitive#float":
-  replacement: "Primitive.float"
-  note: "Float is now a singleton Primitive value and rejects non-finite numbers."
+  replacement: "Primitive.Finite"
+  note: "Finite is now a singleton Primitive value and rejects non-finite numbers."
 "@effect/cli/Primitive#getChoices":
   replacement: "none"
   note: "Choice introspection is internal in v4; retain alternatives in application code when needed."
@@ -17,8 +17,8 @@
   replacement: "none"
   note: "Primitive-level help generation was removed from the public API."
 "@effect/cli/Primitive#integer":
-  replacement: "Primitive.integer"
-  note: "Integer is now a singleton Primitive value."
+  replacement: "Primitive.Int"
+  note: "Int is now a singleton Primitive value."
 "@effect/cli/Primitive#isBool":
   replacement: "none"
   note: "The boolean Primitive predicate is internal in v4."
@@ -35,8 +35,8 @@
   replacement: "none"
   note: "The public Primitive type-id symbol was removed."
 "@effect/cli/Primitive#text":
-  replacement: "Primitive.string"
-  note: "Renamed from text to string."
+  replacement: "Primitive.String"
+  note: "Renamed from text to String."
 "@effect/cli/Primitive#validate":
   replacement: "primitive.parse(value)"
   note: "Parsing is now the Primitive.parse method over a string; defaults and case normalization moved out of this layer."
diff --git a/repos/effect/migration/annotations/effect__cli__Prompt.yaml b/repos/effect/migration/annotations/effect__cli__Prompt.yaml
index 8c1f6ffb1..04071fb7b 100644
--- a/repos/effect/migration/annotations/effect__cli__Prompt.yaml
+++ b/repos/effect/migration/annotations/effect__cli__Prompt.yaml
@@ -4,24 +4,42 @@
 "@effect/cli/Prompt#All.Return":
   replacement: "Prompt.All.Return"
   note: "The collection result helper remains under Prompt.All."
+"@effect/cli/Prompt#confirm":
+  replacement: "Prompt.Confirm"
+  note: "Use the renamed constructor."
+"@effect/cli/Prompt#custom":
+  replacement: "Prompt.Custom"
+  note: "Use the renamed constructor; both overloads are preserved."
 "@effect/cli/Prompt#date":
-  replacement: "Prompt.date"
+  replacement: "Prompt.Date"
   note: "Use the moved constructor."
 "@effect/cli/Prompt#file":
-  replacement: "Prompt.file"
+  replacement: "Prompt.File"
   note: "Use the moved constructor; v4 also supports a default selected path."
 "@effect/cli/Prompt#flatMap":
   replacement: "Prompt.flatMap"
   note: "Use the moved combinator."
 "@effect/cli/Prompt#float":
-  replacement: "Prompt.float"
+  replacement: "Prompt.Number"
   note: "Use the moved constructor; v4 also supports a default value."
+"@effect/cli/Prompt#hidden":
+  replacement: "Prompt.Hidden"
+  note: "Use the renamed constructor."
 "@effect/cli/Prompt#integer":
-  replacement: "Prompt.integer"
+  replacement: "Prompt.Int"
   note: "Use the moved constructor; v4 also supports a default value."
+"@effect/cli/Prompt#list":
+  replacement: "Prompt.List"
+  note: "Use the renamed constructor."
 "@effect/cli/Prompt#map":
   replacement: "Prompt.map"
   note: "Use the moved combinator."
+"@effect/cli/Prompt#multiSelect":
+  replacement: "Prompt.MultiSelect"
+  note: "Use the renamed constructor."
+"@effect/cli/Prompt#password":
+  replacement: "Prompt.Password"
+  note: "Use the renamed constructor."
 "@effect/cli/Prompt#Prompt":
   replacement: "Prompt.Prompt"
   note: "The model moved to effect/unstable/cli; quitting now fails with Terminal.QuitError."
@@ -34,6 +52,18 @@
 "@effect/cli/Prompt#PromptTypeId":
   replacement: "Prompt.isPrompt"
   note: "The public type-id symbol was removed; use the runtime guard."
+"@effect/cli/Prompt#select":
+  replacement: "Prompt.Select"
+  note: "Use the renamed constructor."
 "@effect/cli/Prompt#text":
-  replacement: "Prompt.text"
+  replacement: "Prompt.String"
   note: "Use the moved constructor."
+"@effect/cli/Prompt#toggle":
+  replacement: "Prompt.Toggle"
+  note: "Use the renamed constructor."
+"@effect/cli/Prompt#Prompt.IntegerOptions":
+  replacement: "Prompt.IntOptions"
+  note: "Use the renamed public options type for Prompt.Int; option fields are preserved."
+"@effect/cli/Prompt#Prompt.FloatOptions":
+  replacement: "Prompt.NumberOptions"
+  note: "Use the renamed public options type for Prompt.Number; it still extends the integer options type, now IntOptions."
diff --git a/repos/effect/migration/annotations/effect__cluster__EntityProxyServer.yaml b/repos/effect/migration/annotations/effect__cluster__EntityProxyServer.yaml
index 6edba3715..57ef342ba 100644
--- a/repos/effect/migration/annotations/effect__cluster__EntityProxyServer.yaml
+++ b/repos/effect/migration/annotations/effect__cluster__EntityProxyServer.yaml
@@ -1,9 +1,9 @@
 "@effect/cluster/EntityProxyServer#layerHttpApi":
   replacement: "effect/unstable/cluster/EntityProxyServer#layerHttpApi"
-  note: "Moved into core Effect. Use v4 HttpApi identifiers and Rpc.ServicesServer requirements."
+  note: "Moved into core Effect. Use v4 HttpApi identifiers and provide Sharding plus both Rpc.ServicesServer and Rpc.ServicesClient codec requirements."
 "@effect/cluster/EntityProxyServer#layerRpcHandlers":
   replacement: "effect/unstable/cluster/EntityProxyServer#layerRpcHandlers"
-  note: "Moved into core Effect; the service requirement is now Rpc.ServicesServer rather than Rpc.Context."
+  note: "Moved into core Effect; replace Rpc.Context with both Rpc.ServicesServer and Rpc.ServicesClient codec requirements, alongside Sharding."
 "@effect/cluster/EntityProxyServer#RpcHandlers":
   replacement: "effect/unstable/cluster/EntityProxyServer#RpcHandlers"
   note: "Moved into core Effect and updated for the additional v4 Rpc requirements type parameter."
diff --git a/repos/effect/migration/annotations/effect__cluster__Reply.yaml b/repos/effect/migration/annotations/effect__cluster__Reply.yaml
index aecd2243b..842dd729a 100644
--- a/repos/effect/migration/annotations/effect__cluster__Reply.yaml
+++ b/repos/effect/migration/annotations/effect__cluster__Reply.yaml
@@ -7,3 +7,6 @@
 "@effect/cluster/Reply#TypeId":
   replacement: "none"
   note: "The reply marker is private in v4. Use Reply.isReply for runtime refinement."
+"@effect/cluster/Reply#Reply":
+  replacement: "Reply.Reply(rpc, codecFor)"
+  note: "Pass the transport codec. Decoding replies requires Rpc.ServicesClient; encoding replies requires Rpc.ServicesServer."
diff --git a/repos/effect/migration/annotations/effect__experimental__RateLimiter.yaml b/repos/effect/migration/annotations/effect__experimental__RateLimiter.yaml
index ebbe457fe..32537e758 100644
--- a/repos/effect/migration/annotations/effect__experimental__RateLimiter.yaml
+++ b/repos/effect/migration/annotations/effect__experimental__RateLimiter.yaml
@@ -16,3 +16,6 @@
 "@effect/experimental/RateLimiter#TypeId":
   replacement: effect/unstable/persistence/RateLimiter#TypeId
   note: Import TypeId from the v4 unstable RateLimiter module; it is now a string brand.
+"@effect/experimental/RateLimiter#RateLimiterStore":
+  replacement: RateLimiter.RateLimiterStore
+  note: "Use the Context.Service class from effect/unstable/persistence/RateLimiter. Custom tokenBucket implementations must return [remaining, elapsedMillis] instead of a number, preserving fractional counts and elapsed refill time."
diff --git a/repos/effect/migration/annotations/effect__experimental__Reactivity.yaml b/repos/effect/migration/annotations/effect__experimental__Reactivity.yaml
index 621a7f78d..d224797f0 100644
--- a/repos/effect/migration/annotations/effect__experimental__Reactivity.yaml
+++ b/repos/effect/migration/annotations/effect__experimental__Reactivity.yaml
@@ -6,10 +6,10 @@
   note: Import make from the v4 unstable Reactivity module.
 "@effect/experimental/Reactivity#Reactivity":
   replacement: effect/unstable/reactivity/Reactivity#Reactivity
-  note: Use the v4 Reactivity Context.Service; unsafe methods were renamed with an Unsafe suffix.
+  note: Use the Reactivity interface for implementations and the Reactivity Context.Service value as the service key. Implementations require the TypeId brand; prefer Reactivity.make. Unsafe methods were renamed with an Unsafe suffix.
 "@effect/experimental/Reactivity#Reactivity.Service":
-  replacement: effect/unstable/reactivity/Reactivity#Reactivity["Service"]
-  note: The named namespace member was removed; derive the service shape from the Context.Service class.
+  replacement: effect/unstable/reactivity/Reactivity#Reactivity
+  note: "The named namespace member was removed; use the branded Reactivity interface directly. Prefer Reactivity.make, or include [Reactivity.TypeId]: Reactivity.TypeId in a custom implementation."
 "@effect/experimental/Reactivity#stream":
   replacement: effect/unstable/reactivity/Reactivity#stream
   note: Import stream from the v4 unstable Reactivity module.
diff --git a/repos/effect/migration/annotations/effect__platform-bun__BunStream.yaml b/repos/effect/migration/annotations/effect__platform-bun__BunStream.yaml
index 4b343a35c..dee586b78 100644
--- a/repos/effect/migration/annotations/effect__platform-bun__BunStream.yaml
+++ b/repos/effect/migration/annotations/effect__platform-bun__BunStream.yaml
@@ -1,6 +1,6 @@
 "@effect/platform-bun/BunStream#FromReadableOptions":
   replacement: "Pick<Parameters<typeof BunStream.fromReadable>[0], \"chunkSize\" | \"closeOnDone\">"
-  note: "The named interface was inlined into the constructor options; chunkSize is now a number and the full options also contain evaluate, onError, and bufferSize."
+  note: "The named interface was inlined into the constructor options; chunkSize is now a number and the full options also contain evaluate and onError. The ignored bufferSize option was removed."
 "@effect/platform-bun/BunStream#FromWritableOptions":
   replacement: "Pick<Parameters<typeof BunSink.fromWritable>[0], \"endOnDone\" | \"encoding\">"
   note: "The named interface was inlined into BunSink.fromWritable and duplex constructor options."
diff --git a/repos/effect/migration/annotations/effect__platform-node__index.yaml b/repos/effect/migration/annotations/effect__platform-node__index.yaml
index d2e0c66e9..3e30ad165 100644
--- a/repos/effect/migration/annotations/effect__platform-node__index.yaml
+++ b/repos/effect/migration/annotations/effect__platform-node__index.yaml
@@ -1,3 +1,3 @@
 "@effect/platform-node/index":
   replacement: "@effect/platform-node"
-  note: "The explicit /index entrypoint was removed; import the same namespaces from the @effect/platform-node package root or import specific modules directly."
+  note: "The explicit /index entrypoint was removed; import Node-prefixed namespaces from the @effect/platform-node package root or import specific modules directly. Undici is no longer in the root barrel; import it from @effect/platform-node/Undici or directly from undici."
diff --git a/repos/effect/migration/annotations/effect__platform__Cookies.yaml b/repos/effect/migration/annotations/effect__platform__Cookies.yaml
index 0cf3cfa23..ef4edc1e9 100644
--- a/repos/effect/migration/annotations/effect__platform__Cookies.yaml
+++ b/repos/effect/migration/annotations/effect__platform__Cookies.yaml
@@ -19,3 +19,6 @@
 "@effect/platform/Cookies#unsafeSetAll":
   replacement: "Cookies.setAllUnsafe"
   note: "Renamed to put Unsafe last; the dual all-or-throw behavior is retained."
+"@effect/platform/Cookies#CookiesError":
+  replacement: "Cookies.CookiesError"
+  note: "The error tag is CookiesError rather than CookieError. Update catchTag calls and _tag comparisons; validation details are in the reason field."
diff --git a/repos/effect/migration/annotations/effect__platform__FileSystem.yaml b/repos/effect/migration/annotations/effect__platform__FileSystem.yaml
index ddd7a88d3..a2b699595 100644
--- a/repos/effect/migration/annotations/effect__platform__FileSystem.yaml
+++ b/repos/effect/migration/annotations/effect__platform__FileSystem.yaml
@@ -13,9 +13,15 @@
 "@effect/platform/FileSystem#FileTypeId":
   replacement: "typeof FileSystem.FileTypeId"
   note: "The runtime marker remains exported, but the separate type alias was removed."
+"@effect/platform/FileSystem#GiB":
+  replacement: "ByteSize.gibibytes"
+  note: "Use the ByteSize binary unit constructor."
 "@effect/platform/FileSystem#isFile":
   replacement: "FileSystem.isFile"
   note: "The guard remains after moving the module to effect/FileSystem."
+"@effect/platform/FileSystem#KiB":
+  replacement: "ByteSize.kibibytes"
+  note: "Use the ByteSize binary unit constructor."
 "@effect/platform/FileSystem#layerNoop":
   replacement: "FileSystem.layerNoop"
   note: "The helper remains after moving the module to effect/FileSystem."
@@ -34,9 +40,15 @@
 "@effect/platform/FileSystem#MakeTempFileOptions":
   replacement: "NonNullable<Parameters<FileSystem.FileSystem[\"makeTempFile\"]>[0]>"
   note: "Operation option interfaces are inline in the v4 FileSystem service."
+"@effect/platform/FileSystem#MiB":
+  replacement: "ByteSize.mebibytes"
+  note: "Use the ByteSize binary unit constructor."
 "@effect/platform/FileSystem#OpenFileOptions":
   replacement: "NonNullable<Parameters<FileSystem.FileSystem[\"open\"]>[1]>"
   note: "Operation option interfaces are inline in the v4 FileSystem service."
+"@effect/platform/FileSystem#PiB":
+  replacement: "ByteSize.pebibytes"
+  note: "Use the ByteSize binary unit constructor."
 "@effect/platform/FileSystem#ReadDirectoryOptions":
   replacement: "NonNullable<Parameters<FileSystem.FileSystem[\"readDirectory\"]>[1]>"
   note: "Operation option interfaces are inline in the v4 FileSystem service."
@@ -47,11 +59,17 @@
   replacement: "NonNullable<Parameters<FileSystem.FileSystem[\"sink\"]>[1]>"
   note: "Operation option interfaces are inline in the v4 FileSystem service."
 "@effect/platform/FileSystem#Size":
-  replacement: "FileSystem.Size"
-  note: "The branded bigint size type remains after moving the module to effect/FileSystem."
+  replacement: "ByteSize.ByteSize"
+  note: "Use ByteSize.bytes or unit constructors for file sizes. Truncation lengths, buffer sizes, and read/write counts use number. File.seek takes and returns signed bigint positions; it can fail with PlatformError, including BadArgument when seeking before the start."
+"@effect/platform/FileSystem#SizeInput":
+  replacement: "ByteSize.Input"
+  note: "File-size and path-backed range inputs use ByteSize.Input. String inputs must be non-negative decimal integers without leading zeros, followed by a canonical unit symbol or lowercase unit name, with at most one separating space. Parse external strings or fractional quantities with ByteSize.fromString (Option) or ByteSize.fromStringUnsafe (throws), then pass the resulting ByteSize. Truncation lengths, Web File ranges, and buffer sizes use number."
 "@effect/platform/FileSystem#StreamOptions":
   replacement: "NonNullable<Parameters<FileSystem.FileSystem[\"stream\"]>[1]>"
-  note: "Stream options are inline; bufferSize was removed while bytesToRead, chunkSize, and offset remain."
+  note: "Stream options are inline; bufferSize was removed, bytesToRead and offset accept ByteSize inputs, and chunkSize uses number."
+"@effect/platform/FileSystem#TiB":
+  replacement: "ByteSize.tebibytes"
+  note: "Use the ByteSize binary unit constructor."
 "@effect/platform/FileSystem#WatchEventCreate":
   replacement: "FileSystem.WatchEvent.Create"
   note: "The constructor was removed; construct a tagged object with _tag: \"Create\" and path."
diff --git a/repos/effect/migration/annotations/effect__platform__Headers.yaml b/repos/effect/migration/annotations/effect__platform__Headers.yaml
index ef95fbf84..2cd2ffa57 100644
--- a/repos/effect/migration/annotations/effect__platform__Headers.yaml
+++ b/repos/effect/migration/annotations/effect__platform__Headers.yaml
@@ -29,11 +29,11 @@
   replacement: "Headers.remove / Headers.removeMany"
   note: "Use remove for one name or removeMany for an iterable; RegExp removal requires enumerating matching names."
 "@effect/platform/Headers#schema":
-  replacement: "Headers.HeadersSchema"
-  note: "The encoded-record and self schemas were consolidated into HeadersSchema."
+  replacement: "Schema.Headers"
+  note: "The encoded-record and self schemas were consolidated and moved to effect/Schema as Schema.Headers."
 "@effect/platform/Headers#schemaFromSelf":
-  replacement: "Headers.HeadersSchema"
-  note: "The encoded-record and self schemas were consolidated into HeadersSchema."
+  replacement: "Schema.Headers"
+  note: "The encoded-record and self schemas were consolidated and moved to effect/Schema as Schema.Headers."
 "@effect/platform/Headers#set":
   replacement: "Headers.set"
   note: "Retained with the same dual signature and lowercase key normalization."
diff --git a/repos/effect/migration/annotations/effect__platform__HttpApiBuilder.yaml b/repos/effect/migration/annotations/effect__platform__HttpApiBuilder.yaml
index 3742d27e5..35231d587 100644
--- a/repos/effect/migration/annotations/effect__platform__HttpApiBuilder.yaml
+++ b/repos/effect/migration/annotations/effect__platform__HttpApiBuilder.yaml
@@ -8,8 +8,8 @@
   replacement: "effect/unstable/httpapi/HttpApiBuilder#group"
   note: "The group layer remains; names are now identifiers and API/group global error channels are gone."
 "@effect/platform/HttpApiBuilder#handler":
-  replacement: "effect/unstable/httpapi/HttpApiBuilder#endpoint"
-  note: "Use endpoint for a standalone typed endpoint implementation; inside a group pass callbacks to handlers.handle."
+  replacement: "effect/unstable/httpapi/HttpApiBuilder#handler"
+  note: "The typed callback helper remains; names are now identifiers and API/group global error channels are gone. Pass the returned callback to handlers.handle."
 "@effect/platform/HttpApiBuilder#Handlers":
   replacement: "effect/unstable/httpapi/HttpApiBuilder#Handlers"
   note: "Handlers now tracks an endpoint map and handled identifiers. Prefer Handlers.FromGroup<Group>."
@@ -25,6 +25,9 @@
 "@effect/platform/HttpApiBuilder#HandlersTypeId":
   replacement: "none"
   note: "The exported symbol was removed; do not inspect or construct the private Handlers marker."
+"@effect/platform/HttpApiBuilder#Middleware":
+  replacement: "none"
+  note: "The API-specific middleware service tag was removed. Declared HttpApiMiddleware services are applied while routes are built; use HttpRouter.middleware for additional global middleware."
 "@effect/platform/HttpApiBuilder#httpApp":
   replacement: "effect/unstable/http/HttpRouter#toHttpEffect"
   note: "Build the application from the assembled API route layer; HTTP apps are Effects in v4."
diff --git a/repos/effect/migration/annotations/effect__platform__HttpBody.yaml b/repos/effect/migration/annotations/effect__platform__HttpBody.yaml
index 4e8e46f1b..8258bcc0c 100644
--- a/repos/effect/migration/annotations/effect__platform__HttpBody.yaml
+++ b/repos/effect/migration/annotations/effect__platform__HttpBody.yaml
@@ -12,10 +12,10 @@
   note: "The error type-id is private in v4; identify the exported error class instead."
 "@effect/platform/HttpBody#file":
   replacement: "HttpBody.file"
-  note: "Retained; bufferSize was replaced by chunkSize and the other file options remain."
+  note: "Retained; bufferSize was replaced by numeric chunkSize. Offset and bytesToRead accept ByteSize.Input. Invalid ranges and a final EOF-clamped content length above Number.MAX_SAFE_INTEGER fail with PlatformError / BadArgument."
 "@effect/platform/HttpBody#fileInfo":
   replacement: "HttpBody.fileFromInfo"
-  note: "Renamed; it still uses supplied File.Info for content length and requires FileSystem."
+  note: "Renamed; it uses supplied File.Info with ByteSize size metadata and requires FileSystem. Offset and bytesToRead accept ByteSize.Input, while chunkSize is numeric. Invalid ranges and a final EOF-clamped content length above Number.MAX_SAFE_INTEGER fail with PlatformError / BadArgument."
 "@effect/platform/HttpBody#formData":
   replacement: "HttpBody.formData"
   note: "Retained with the same Web FormData input."
diff --git a/repos/effect/migration/annotations/effect__platform__HttpClientResponse.yaml b/repos/effect/migration/annotations/effect__platform__HttpClientResponse.yaml
index cc48c14c8..49154affc 100644
--- a/repos/effect/migration/annotations/effect__platform__HttpClientResponse.yaml
+++ b/repos/effect/migration/annotations/effect__platform__HttpClientResponse.yaml
@@ -25,3 +25,6 @@
 "@effect/platform/HttpClientResponse#TypeId":
   replacement: "typeof HttpClientResponse.TypeId"
   note: "TypeId remains public but is now a string constant; use typeof in type position."
+"@effect/platform/HttpClientResponse#HttpClientResponse":
+  replacement: "HttpClientResponse.HttpClientResponse"
+  note: "Custom implementations must supply the required url string. It represents the resolved URL including query parameters and excluding the hash, uses the final URL after redirects, and is empty when unknown."
diff --git a/repos/effect/migration/annotations/effect__platform__HttpIncomingMessage.yaml b/repos/effect/migration/annotations/effect__platform__HttpIncomingMessage.yaml
index f720fb5d1..055745ce5 100644
--- a/repos/effect/migration/annotations/effect__platform__HttpIncomingMessage.yaml
+++ b/repos/effect/migration/annotations/effect__platform__HttpIncomingMessage.yaml
@@ -1,9 +1,9 @@
 "@effect/platform/HttpIncomingMessage#MaxBodySize":
   replacement: "HttpIncomingMessage.MaxBodySize"
-  note: "Changed from a Reference subclass holding Option<Size> to Context.Reference<Size | undefined>."
+  note: "Changed from a Reference subclass holding Option<Size> to Context.Reference<ByteSize.ByteSize | undefined>."
 "@effect/platform/HttpIncomingMessage#TypeId":
   replacement: "typeof HttpIncomingMessage.TypeId"
   note: "TypeId remains public but is now a string constant; use typeof in type position."
 "@effect/platform/HttpIncomingMessage#withMaxBodySize":
   replacement: "Effect.provideService(HttpIncomingMessage.MaxBodySize, size)"
-  note: "The helper was removed; provide FileSystem.Size(input) or undefined directly."
+  note: "The helper was removed; provide a ByteSize value or undefined directly."
diff --git a/repos/effect/migration/annotations/effect__platform__HttpPlatform.yaml b/repos/effect/migration/annotations/effect__platform__HttpPlatform.yaml
index ba4d67380..523d462f0 100644
--- a/repos/effect/migration/annotations/effect__platform__HttpPlatform.yaml
+++ b/repos/effect/migration/annotations/effect__platform__HttpPlatform.yaml
@@ -1,12 +1,12 @@
 "@effect/platform/HttpPlatform#HttpPlatform":
   replacement: "HttpPlatform.HttpPlatform"
-  note: "The service is now a Context.Service class; use its Service member for the implementation type."
+  note: "The service is now a Context.Service class; use its Service member for the implementation type. Path-backed offset and bytesToRead accept ByteSize.Input, while chunkSize and all Web File range options use number."
 "@effect/platform/HttpPlatform#layer":
   replacement: "HttpPlatform.layer"
   note: "Retained as the default file-response layer."
 "@effect/platform/HttpPlatform#make":
   replacement: "HttpPlatform.make"
-  note: "Retained; v4 returns the service implementation and uses updated file stream options."
+  note: "Retained; v4 returns the service implementation. The fileResponse callback receives contentLength as bigint, while start and end remain numbers. Web File range options use number."
 "@effect/platform/HttpPlatform#TypeId":
   replacement: "none"
   note: "The public type id was removed; use the HttpPlatform Context.Service class."
diff --git a/repos/effect/migration/annotations/effect__platform__HttpServer.yaml b/repos/effect/migration/annotations/effect__platform__HttpServer.yaml
index be98b6d5d..12076eaf5 100644
--- a/repos/effect/migration/annotations/effect__platform__HttpServer.yaml
+++ b/repos/effect/migration/annotations/effect__platform__HttpServer.yaml
@@ -1,3 +1,6 @@
+"@effect/platform/HttpServer#Address":
+  replacement: "effect/unstable/net/NetAddress#SocketAddress"
+  note: "Replaced by the shared concrete internet-or-Unix socket address union."
 "@effect/platform/HttpServer#addressWith":
   replacement: "HttpServer.HttpServer.use(({ address }) => effect(address))"
   note: "The accessor was removed; read the service and pass its Address to the callback."
@@ -9,19 +12,22 @@
   note: "Renamed; it provides the standard HTTP platform services."
 "@effect/platform/HttpServer#make":
   replacement: "HttpServer.make"
-  note: "Retained; it returns the Context.Service implementation."
+  note: "Retained; it returns the Context.Service implementation. Supply a NetAddress.SocketAddress for address, using NetAddress.inetAddressUnsafe for a parsed IP and port or NetAddress.unixPathAddress for a Unix path. Use NetAddress.inetAddress to validate the port through Result instead."
+"@effect/platform/HttpServer#formatAddress":
+  replacement: "HttpServer.formatAddress"
+  note: "Accepts NetAddress.SocketAddress and delegates to NetAddress.formatUrlUnsafe. Scoped IPv6 addresses throw NetAddressError; Unix paths use the unix:// prefix."
 "@effect/platform/HttpServer#ServeOptions":
   replacement: "none"
   note: "The unused respond option model was removed with no shared v4 counterpart."
 "@effect/platform/HttpServer#TcpAddress":
-  replacement: "HttpServer.TcpAddress"
-  note: "Moved unchanged."
+  replacement: "effect/unstable/net/NetAddress#InetAddress"
+  note: "Replaced by the shared resolved internet-address model; use address and port instead of hostname and port."
 "@effect/platform/HttpServer#TypeId":
   replacement: "none"
   note: "The public TypeId was removed; HttpServer is now a Context.Service class."
 "@effect/platform/HttpServer#UnixAddress":
-  replacement: "HttpServer.UnixAddress"
-  note: "Moved unchanged."
+  replacement: "effect/unstable/net/NetAddress#UnixPathAddress"
+  note: "Replaced by the shared Unix filesystem-path address model."
 "@effect/platform/HttpServer#serve":
   replacement: "effect/unstable/http/HttpServer#serve"
   note: "Moved to the v4 HTTP module; the application is now an Effect producing HttpServerResponse rather than the separate HttpApp model."
diff --git a/repos/effect/migration/annotations/effect__platform__HttpServerResponse.yaml b/repos/effect/migration/annotations/effect__platform__HttpServerResponse.yaml
index 86d7dfd14..f7b220253 100644
--- a/repos/effect/migration/annotations/effect__platform__HttpServerResponse.yaml
+++ b/repos/effect/migration/annotations/effect__platform__HttpServerResponse.yaml
@@ -6,7 +6,7 @@
   note: "Now effectful and safe; use expireCookieUnsafe for synchronous throwing behavior."
 "@effect/platform/HttpServerResponse#file":
   replacement: "HttpServerResponse.file"
-  note: "Retained with updated FileSystem stream options."
+  note: "Retained; offset and bytesToRead accept ByteSize.Input, while chunkSize uses number. Path-backed responses validate ranges and clamp content length to the available bytes."
 "@effect/platform/HttpServerResponse#formData":
   replacement: "HttpServerResponse.formData"
   note: "Moved unchanged."
@@ -42,7 +42,7 @@
   note: "Moved unchanged."
 "@effect/platform/HttpServerResponse#toWeb":
   replacement: "HttpServerResponse.toWeb"
-  note: "Retained, but the optional Runtime became an optional Context for stream execution."
+  note: "Retained, but the optional Runtime became an optional Context for stream execution. For a raw Web Response, outer headers override native headers and cookies append, including when the body is omitted. With withoutBody, the raw status and statusText are preserved unless the outer status is 204, 205, or 304, which takes precedence."
 "@effect/platform/HttpServerResponse#TypeId":
   replacement: "HttpServerResponse.isHttpServerResponse"
   note: "The response brand is private in v4; use the public runtime refinement."
@@ -61,3 +61,6 @@
 "@effect/platform/HttpServerResponse#urlParams":
   replacement: "HttpServerResponse.urlParams"
   note: "Retained and widened to accept UrlParams.Input."
+"@effect/platform/HttpServerResponse#fileWeb":
+  replacement: "HttpServerResponse.fileWeb"
+  note: "Web File offset, bytesToRead, and chunkSize options use number, unlike path-backed ByteSize.Input ranges."
diff --git a/repos/effect/migration/annotations/effect__platform__Multipart.yaml b/repos/effect/migration/annotations/effect__platform__Multipart.yaml
index e5f43102e..3e1a86345 100644
--- a/repos/effect/migration/annotations/effect__platform__Multipart.yaml
+++ b/repos/effect/migration/annotations/effect__platform__Multipart.yaml
@@ -18,10 +18,10 @@
   note: "The guard remains in effect/unstable/http/Multipart."
 "@effect/platform/Multipart#MaxFieldSize":
   replacement: "Multipart.MaxFieldSize"
-  note: "The setting remains but is now a Context.Reference."
+  note: "Now a Context.Reference<ByteSize.ByteSize>; provide a value such as ByteSize.bytes(100)."
 "@effect/platform/Multipart#MaxFileSize":
   replacement: "Multipart.MaxFileSize"
-  note: "The setting remains as a Context.Reference; use undefined rather than Option.none for no limit."
+  note: "Now a Context.Reference<ByteSize.ByteSize | undefined>; provide ByteSize.bytes(100), for example, or undefined for no limit."
 "@effect/platform/Multipart#MaxParts":
   replacement: "Multipart.MaxParts"
   note: "The setting remains as a Context.Reference; use undefined rather than Option.none for no limit."
@@ -42,10 +42,10 @@
   note: "Build the multipart limit context and provide it to the stream; Option-valued limits became optional plain values."
 "@effect/platform/Multipart#withMaxFieldSize":
   replacement: "Effect.provideService(Multipart.MaxFieldSize, size)"
-  note: "Provide the v4 Context.Reference around the effect."
+  note: "Provide a ByteSize value, such as ByteSize.bytes(100). To normalize ByteSize.Input options, use Multipart.limitsServices."
 "@effect/platform/Multipart#withMaxFileSize":
   replacement: "Effect.provideService(Multipart.MaxFileSize, size)"
-  note: "Provide the v4 Context.Reference around the effect, converting Option.none to undefined."
+  note: "Replace Option.none with undefined and Option.some(value) with a normalized ByteSize value. To normalize ByteSize.Input options, use Multipart.limitsServices."
 "@effect/platform/Multipart#withMaxParts":
   replacement: "Effect.provideService(Multipart.MaxParts, count)"
   note: "Provide the v4 Context.Reference around the effect, converting Option.none to undefined."
@@ -54,4 +54,4 @@
   note: "The channel constructor moved and no longer accepts bufferSize; input and output chunks use non-empty readonly arrays."
 "@effect/platform/Multipart#withLimits.Options":
   replacement: "Multipart.withLimits.Options"
-  note: "Limit fields now use optional plain numbers or SizeInput values; convert Option.none to undefined and Option.some(value) to value."
+  note: "Limit fields now use optional plain numbers or ByteSize inputs; convert Option.none to undefined and Option.some(value) to value."
diff --git a/repos/effect/migration/annotations/effect__platform__OpenApiJsonSchema.yaml b/repos/effect/migration/annotations/effect__platform__OpenApiJsonSchema.yaml
index 683b937f3..0bb6527bc 100644
--- a/repos/effect/migration/annotations/effect__platform__OpenApiJsonSchema.yaml
+++ b/repos/effect/migration/annotations/effect__platform__OpenApiJsonSchema.yaml
@@ -10,6 +10,9 @@
 "@effect/platform/OpenApiJsonSchema#Array":
   replacement: "effect/JsonSchema#JsonSchema"
   note: "The narrow node interfaces were consolidated into the general object model."
+"@effect/platform/OpenApiJsonSchema#Boolean":
+  replacement: "effect/JsonSchema#JsonSchema"
+  note: "The narrow boolean interface was consolidated into the open, dialect-neutral JSON Schema object model."
 "@effect/platform/OpenApiJsonSchema#Empty":
   replacement: "effect/JsonSchema#JsonSchema"
   note: "The narrow node interfaces and special id shapes were removed."
@@ -31,6 +34,12 @@
 "@effect/platform/OpenApiJsonSchema#makeWithDefs":
   replacement: "effect/SchemaRepresentation#toJsonSchemaMultiDocument + effect/JsonSchema#toMultiDocumentOpenApi3_1"
   note: "Definitions are returned separately; build a multi-document representation and convert it to OpenAPI 3.1."
+"@effect/platform/OpenApiJsonSchema#Never":
+  replacement: "effect/JsonSchema#JsonSchema"
+  note: "The special never-schema interface was consolidated into the open JSON Schema object model; represent it with a not constraint."
+"@effect/platform/OpenApiJsonSchema#Number":
+  replacement: "effect/JsonSchema#JsonSchema"
+  note: "The narrow number interface was consolidated into the open, dialect-neutral JSON Schema object model."
 "@effect/platform/OpenApiJsonSchema#Numeric":
   replacement: "effect/JsonSchema#JsonSchema"
   note: "The narrow numeric interfaces were consolidated into the general object model."
@@ -43,3 +52,9 @@
 "@effect/platform/OpenApiJsonSchema#Root":
   replacement: "effect/JsonSchema#MultiDocument"
   note: "OpenAPI generation keeps roots in schemas and shared components in definitions; the inline-definitions root model is gone."
+"@effect/platform/OpenApiJsonSchema#String":
+  replacement: "effect/JsonSchema#JsonSchema"
+  note: "The narrow string interface was consolidated into the open, dialect-neutral JSON Schema object model."
+"@effect/platform/OpenApiJsonSchema#Void":
+  replacement: "effect/JsonSchema#JsonSchema"
+  note: "The special void-schema interface was consolidated into the open JSON Schema object model."
diff --git a/repos/effect/migration/annotations/effect__platform__SocketServer.yaml b/repos/effect/migration/annotations/effect__platform__SocketServer.yaml
index b7a20dbd8..6367ff8e1 100644
--- a/repos/effect/migration/annotations/effect__platform__SocketServer.yaml
+++ b/repos/effect/migration/annotations/effect__platform__SocketServer.yaml
@@ -1,9 +1,12 @@
+"@effect/platform/SocketServer#Address":
+  replacement: "effect/unstable/net/NetAddress#SocketAddress"
+  note: "Replaced by the shared concrete internet-or-Unix socket address union."
 "@effect/platform/SocketServer#ErrorTypeId":
   replacement: "SocketServer.ErrorTypeId"
   note: "The API moved to effect/unstable/socket/SocketServer and retains this name."
 "@effect/platform/SocketServer#TcpAddress":
-  replacement: "SocketServer.TcpAddress"
-  note: "The API moved to effect/unstable/socket/SocketServer and retains this name."
+  replacement: "effect/unstable/net/NetAddress#InetAddress"
+  note: "Replaced by the shared resolved internet-address model; use address and port instead of hostname and port."
 "@effect/platform/SocketServer#UnixAddress":
-  replacement: "SocketServer.UnixAddress"
-  note: "The API moved to effect/unstable/socket/SocketServer and retains this name."
+  replacement: "effect/unstable/net/NetAddress#UnixPathAddress"
+  note: "Replaced by the shared Unix filesystem-path address model."
diff --git a/repos/effect/migration/annotations/effect__platform__Url.yaml b/repos/effect/migration/annotations/effect__platform__Url.yaml
index 951df8c57..de6c44677 100644
--- a/repos/effect/migration/annotations/effect__platform__Url.yaml
+++ b/repos/effect/migration/annotations/effect__platform__Url.yaml
@@ -1,3 +1,6 @@
+"@effect/platform/Url#fromString":
+  replacement: "Url.fromString"
+  note: "Retained; returns Result with IllegalArgumentError instead of Either with IllegalArgumentException."
 "@effect/platform/Url#setUrlParams":
   replacement: "Url.setUrlParams"
   note: "Retained and widened to accept UrlParams.Input."
diff --git a/repos/effect/migration/annotations/effect__platform__UrlParams.yaml b/repos/effect/migration/annotations/effect__platform__UrlParams.yaml
index a799f823a..2e4a856df 100644
--- a/repos/effect/migration/annotations/effect__platform__UrlParams.yaml
+++ b/repos/effect/migration/annotations/effect__platform__UrlParams.yaml
@@ -23,23 +23,23 @@
   replacement: "UrlParams.remove"
   note: "Retained and removes every value for the key."
 "@effect/platform/UrlParams#schemaFromSelf":
-  replacement: "UrlParams.UrlParamsSchema"
-  note: "Renamed to the declaration schema for the v4 wrapper."
+  replacement: "Schema.UrlParams"
+  note: "The declaration schema for the v4 wrapper moved to effect/Schema."
 "@effect/platform/UrlParams#schemaFromString":
-  replacement: "Schema.String.pipe(Schema.decodeTo(UrlParams.UrlParamsSchema, { decode: SchemaGetter.transform((s) => UrlParams.fromInput(new URLSearchParams(s))), encode: SchemaGetter.transform(UrlParams.toString) }))"
+  replacement: "Schema.String.pipe(Schema.decodeTo(Schema.UrlParams, { decode: SchemaGetter.transform((s) => UrlParams.fromInput(new URLSearchParams(s))), encode: SchemaGetter.transform(UrlParams.toString) }))"
   note: "No prebuilt string codec remains; recreate it by transforming between a query string and UrlParams."
 "@effect/platform/UrlParams#schemaJson":
-  replacement: "UrlParams.schemaJsonField(field).pipe(Schema.decodeTo(schema), Schema.decodeEffect)"
-  note: "Compose the field codec with the target schema, then decode it."
+  replacement: "Schema.JsonFromUrlParamsField(field).pipe(Schema.decodeTo(schema), Schema.decodeEffect)"
+  note: "The field codec moved to effect/Schema. Compose it with the target schema, then decode it."
 "@effect/platform/UrlParams#schemaParse":
-  replacement: "UrlParamsFromString.pipe(Schema.decodeTo(UrlParams.schemaRecord.pipe(Schema.decodeTo(schema))))"
+  replacement: "UrlParamsFromString.pipe(Schema.decodeTo(Schema.RecordFromUrlParams.pipe(Schema.decodeTo(schema))))"
   note: "Recreate the removed helper by composing the string, record, and target codecs."
 "@effect/platform/UrlParams#schemaRecord":
-  replacement: "UrlParams.schemaRecord.pipe(Schema.decodeTo(schema))"
-  note: "schemaRecord is now a base codec value; compose it with the target schema."
+  replacement: "Schema.RecordFromUrlParams.pipe(Schema.decodeTo(schema))"
+  note: "RecordFromUrlParams is a base codec in effect/Schema; compose it with the target schema."
 "@effect/platform/UrlParams#schemaStruct":
-  replacement: "UrlParams.schemaRecord.pipe(Schema.decodeTo(schema), Schema.decodeEffect)"
-  note: "Compose the record codec with the target schema and decode it."
+  replacement: "Schema.RecordFromUrlParams.pipe(Schema.decodeTo(schema), Schema.decodeEffect)"
+  note: "Compose the record codec from effect/Schema with the target schema and decode it."
 "@effect/platform/UrlParams#set":
   replacement: "UrlParams.set"
   note: "Retained and replaces all existing values for the key."
@@ -49,3 +49,6 @@
 "@effect/platform/UrlParams#toString":
   replacement: "UrlParams.toString"
   note: "Retained and broadened to accept any UrlParams.Input."
+"@effect/platform/UrlParams#UrlParams":
+  replacement: "UrlParams.UrlParams"
+  note: "Import UrlParams from effect/unstable/http. It is now a branded iterable object with a params field rather than a ReadonlyArray; construct it with UrlParams.make or UrlParams.fromInput."
diff --git a/repos/effect/migration/annotations/effect__sql-pg__PgClient.yaml b/repos/effect/migration/annotations/effect__sql-pg__PgClient.yaml
index d9ae6977b..8c497bbb2 100644
--- a/repos/effect/migration/annotations/effect__sql-pg__PgClient.yaml
+++ b/repos/effect/migration/annotations/effect__sql-pg__PgClient.yaml
@@ -6,10 +6,11 @@
   note: "Wrapping an existing node-pg Pool was removed. Provide connection settings to PgClient.layer instead."
 "@effect/sql-pg/PgClient#PgClient":
   replacement: "@effect/sql-pg/PgClient#PgClient"
-  note: "Retained; the service value is now a Context.Service."
+  note: "Retained; the service value is now a Context.Service. The listen method returns a scoped Effect acquiring a Queue.Dequeue<PgConnection.Notification, SqlError>; consume it with Queue operations or Stream.fromQueue and read each notification's payload. Connection failures after registration fail the queue with the original SqlError; scope closure interrupts consumers."
 "@effect/sql-pg/PgClient#PgClientConfig":
+  include: true
   replacement: "@effect/sql-pg/PgClient#PgClientConfig / PgPoolConfig"
-  note: "Use PgClientConfig for base settings and PgPoolConfig for make/layer; pool sizing, idle timeout, and connection TTL moved to PgPoolConfig."
+  note: "Use PgClientConfig for base settings and PgPoolConfig for make/layer; pool sizing, idle timeout, and connection TTL moved to PgPoolConfig. The types option takes a PgTypes.Registry rather than node-pg custom types. Timestamp and timestamptz results (including array elements) are Date values with millisecond precision; infinity, -infinity, and out-of-range values become invalid Dates. Numeric readers can use getTime() or register numeric codecs. Date parameters bind as timestamptz; use PgTypes.timestamp(value) to preserve UTC fields when writing a timestamp column instead of applying the session TimeZone."
 "@effect/sql-pg/PgClient#PgClientFromPoolOptions":
   replacement: none
   note: "The node-pg Pool wrapper options were removed with fromPool. Use PgClient.PgPoolConfig with PgClient.make or PgClient.layer."
diff --git a/repos/effect/migration/annotations/effect__sql__Model.yaml b/repos/effect/migration/annotations/effect__sql__Model.yaml
index 00db99efc..6c82eda85 100644
--- a/repos/effect/migration/annotations/effect__sql__Model.yaml
+++ b/repos/effect/migration/annotations/effect__sql__Model.yaml
@@ -10,6 +10,9 @@
 "@effect/sql/Model#Class":
   replacement: "effect/unstable/schema/Model#Class"
   note: "Moved; model variants remain select, insert, update, json, jsonCreate, and jsonUpdate."
+"@effect/sql/Model#Date":
+  replacement: "effect/unstable/schema/Model#Date"
+  note: "Moved; still serializes DateTime.Utc as a YYYY-MM-DD string."
 "@effect/sql/Model#DateTimeFromDate":
   replacement: "effect/Schema#DateTimeUtcFromDate"
   note: "Moved to core Schema and retains Date to DateTime.Utc conversion."
@@ -24,7 +27,7 @@
   note: "Renamed and now read-only, with select and json variants only. Use Model.Field with select, update, and json to preserve writable v3 behavior."
 "@effect/sql/Model#makeDataLoaders":
   replacement: "effect/unstable/sql/SqlModel#makeResolvers"
-  note: "Returns RequestResolvers instead of callable loaders; execute with SqlResolver.request and use RequestResolver delay/batch combinators for batching controls."
+  note: "Returns RequestResolvers instead of callable loaders; execute with SqlResolver.request and use RequestResolver delay/batch combinators for batching controls. The insert resolver requires model decoding services as well as insert-schema encoding services."
 "@effect/sql/Model#Override":
   replacement: "effect/unstable/schema/Model#Override"
   note: "Moved with the same explicit-default override purpose."
diff --git a/repos/effect/migration/annotations/effect__vitest__index.yaml b/repos/effect/migration/annotations/effect__vitest__index.yaml
index a40e32ca2..515c9201a 100644
--- a/repos/effect/migration/annotations/effect__vitest__index.yaml
+++ b/repos/effect/migration/annotations/effect__vitest__index.yaml
@@ -18,88 +18,88 @@
   note: "This was a Vitest re-export, not Effect API. Import it directly from vitest; @effect/vitest/index is not a valid v4 route."
 "@effect/vitest/index#ApiConfig":
   replacement: "vitest/node#ApiConfig"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#BaseCoverageOptions":
   replacement: "vitest/node#BaseCoverageOptions"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#BenchmarkUserOptions":
   replacement: "vitest/node#BenchmarkUserOptions"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#BrowserConfigOptions":
   replacement: "vitest/node#BrowserConfigOptions"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#BrowserScript":
   replacement: "vitest/node#BrowserScript"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#BuiltinEnvironment":
   replacement: "vitest/node#BuiltinEnvironment"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#CoverageIstanbulOptions":
   replacement: "vitest/node#CoverageIstanbulOptions"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#CoverageOptions":
   replacement: "vitest/node#CoverageOptions"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#CoverageProvider":
   replacement: "vitest/node#CoverageProvider"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#CoverageProviderModule":
   replacement: "vitest/node#CoverageProviderModule"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#CoverageReporter":
   replacement: "vitest/node#CoverageReporter"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#CoverageV8Options":
   replacement: "vitest/node#CoverageV8Options"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#CSSModuleScopeStrategy":
   replacement: "vitest/node#CSSModuleScopeStrategy"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#CustomProviderOptions":
   replacement: "vitest/node#CustomProviderOptions"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#DepsOptimizationOptions":
   replacement: "vitest/node#DepsOptimizationOptions"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#EnvironmentOptions":
   replacement: "vitest/node#EnvironmentOptions"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#InlineConfig":
   replacement: "vitest/node#InlineConfig"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#Pool":
   replacement: "vitest/node#Pool"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#ProjectConfig":
   replacement: "vitest/node#ProjectConfig"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#ReportContext":
   replacement: "vitest/node#ReportContext"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#ResolvedConfig":
   replacement: "vitest/node#ResolvedConfig"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#ResolvedCoverageOptions":
   replacement: "vitest/node#ResolvedCoverageOptions"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#SequenceHooks":
   replacement: "vitest/node#SequenceHooks"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#SequenceSetupFiles":
   replacement: "vitest/node#SequenceSetupFiles"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#TypecheckConfig":
   replacement: "vitest/node#TypecheckConfig"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#VitestEnvironment":
   replacement: "vitest/node#VitestEnvironment"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#VitestRunMode":
   replacement: "vitest/node#VitestRunMode"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#WorkerContext":
   replacement: "vitest/node#WorkerContext"
-  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape."
+  note: "This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape."
 "@effect/vitest/index#CollectLineNumbers":
   replacement: "vitest/node#TypeCheckCollectLineNumbers"
   note: "Vitest 3 deprecated the root alias in favor of this renamed vitest/node type."
@@ -147,25 +147,25 @@
   note: "Vitest 4 removed the deprecated unprefixed runner alias. Import the explicit Runner* type from vitest."
 "@effect/vitest/index#ExtendedContext":
   replacement: "vitest#TestContext"
-  note: "The separate context alias was removed. Vitest 4 uses TestContext, which includes the current task and lifecycle methods."
+  note: "The separate context alias was removed. Vitest 5 uses TestContext, which includes the current task and lifecycle methods."
 "@effect/vitest/index#TaskContext":
   replacement: "vitest#TestContext"
-  note: "The separate context alias was removed. Vitest 4 uses TestContext, which includes the current task and lifecycle methods."
+  note: "The separate context alias was removed. Vitest 5 uses TestContext, which includes the current task and lifecycle methods."
 "@effect/vitest/index#Environment":
-  replacement: "vitest/environments#Environment"
-  note: "This was a deprecated root re-export. Import it from vitest/environments; Vitest 4 custom environments use Vite environments."
+  replacement: "vitest/runtime#Environment"
+  note: "This was a deprecated root re-export. Import it from vitest/runtime; Vitest 5 exposes custom environments through vitest/runtime."
 "@effect/vitest/index#EnvironmentReturn":
-  replacement: "vitest/environments#EnvironmentReturn"
-  note: "This was a deprecated root re-export. Import it from vitest/environments; Vitest 4 custom environments use Vite environments."
+  replacement: "vitest/runtime#EnvironmentReturn"
+  note: "This was a deprecated root re-export. Import it from vitest/runtime; Vitest 5 exposes custom environments through vitest/runtime."
 "@effect/vitest/index#VmEnvironmentReturn":
-  replacement: "vitest/environments#VmEnvironmentReturn"
-  note: "This was a deprecated root re-export. Import it from vitest/environments; Vitest 4 custom environments use Vite environments."
+  replacement: "vitest/runtime#VmEnvironmentReturn"
+  note: "This was a deprecated root re-export. Import it from vitest/runtime; Vitest 5 exposes custom environments through vitest/runtime."
 "@effect/vitest/index#HappyDOMOptions":
   replacement: "NonNullable<import(\"vitest/node\").EnvironmentOptions[\"happyDOM\"]>"
-  note: "Vitest 4 keeps this shape only as a property of EnvironmentOptions; derive it from the public vitest/node type."
+  note: "Vitest 5 keeps this shape only as a property of EnvironmentOptions; derive it from the public vitest/node type."
 "@effect/vitest/index#JSDOMOptions":
   replacement: "NonNullable<import(\"vitest/node\").EnvironmentOptions[\"jsdom\"]>"
-  note: "Vitest 4 keeps this shape only as a property of EnvironmentOptions; derive it from the public vitest/node type."
+  note: "Vitest 5 keeps this shape only as a property of EnvironmentOptions; derive it from the public vitest/node type."
 "@effect/vitest/index#ArgumentsType":
   replacement: "T extends (...args: infer A) => any ? A : never"
   note: "Vitest 3 marked this root alias as an internal helper. Define the small TypeScript shape locally instead of depending on transitive internals."
@@ -191,38 +191,38 @@
   replacement: "vitest#SerializedTestSpecification"
   note: "Use the non-deprecated Vitest name; SerializableSpec was only an alias."
 "@effect/vitest/index#Reporter":
-  replacement: "vitest/reporters#Reporter"
-  note: "Import Reporter from the public plural vitest/reporters entrypoint; its lifecycle methods changed in Vitest 4."
+  replacement: "vitest/node#Reporter"
+  note: "Import Reporter from vitest/node; the deprecated vitest/reporters entrypoint was removed in Vitest 5."
 "@effect/vitest/index#UserConfig":
   replacement: "vitest/config#TestUserConfig"
-  note: "Vitest 4 exposes its config as TestUserConfig; ViteUserConfig is the separate Vite configuration type."
+  note: "Vitest 5 exposes its config as TestUserConfig; ViteUserConfig is the separate Vite configuration type."
 "@effect/vitest/index#UserWorkspaceConfig":
   replacement: "vitest/config#UserWorkspaceConfig"
   note: "Import the type from vitest/config and migrate Vitest workspace configuration to projects."
 "@effect/vitest/index#PoolOptions":
   replacement: "vitest/config#TestUserConfig"
-  note: "The v3 built-in poolOptions object was removed. Move its fields to Vitest 4 top-level config such as maxWorkers and vmMemoryLimit; vitest/node PoolOptions is a different custom-pool API."
+  note: "The v3 built-in poolOptions object was removed. Move its fields to Vitest 5 top-level config such as maxWorkers and vmMemoryLimit; vitest/node PoolOptions is a different custom-pool API."
 "@effect/vitest/index#RuntimeContext":
-  replacement: "@vitest/runner#RuntimeContext"
-  note: "Custom-runner code can add an explicit @vitest/runner dependency; ordinary tests should avoid this internal state type."
+  replacement: "none"
+  note: "Vitest 5 deprecates @vitest/runner and does not expose this internal state type. Extend TestRunner from vitest and use its public methods instead."
 "@effect/vitest/index#SuiteHooks":
-  replacement: "@vitest/runner#SuiteHooks"
-  note: "Custom-runner code can add an explicit @vitest/runner dependency; ordinary tests should use public hook functions."
+  replacement: "ReturnType<typeof import(\"vitest\").TestRunner.getSuiteHooks>"
+  note: "Derive the hook collection from Vitest 5's public TestRunner API; ordinary tests should use public hook functions."
 "@effect/vitest/index#DoneCallback":
   replacement: "none"
   note: "Vitest does not support callback-style tests. Return a Promise or, in @effect/vitest tests, return an Effect."
 "@effect/vitest/index#HookCleanupCallback":
   replacement: "none"
-  note: "No named Vitest 4 export replaces this alias. Let the hook return type infer, or type the cleanup function locally."
+  note: "No named Vitest 5 export replaces this alias. Let the hook return type infer, or type the cleanup function locally."
 "@effect/vitest/index#HookListener":
   replacement: "none"
-  note: "Use the matching @vitest/runner hook-specific type such as BeforeAllListener, AfterAllListener, BeforeEachListener, or AfterEachListener for custom runner code."
+  note: "Infer the callback from the public hook function, or derive it with Parameters<typeof import(\"vitest\").beforeAll>[0] and the corresponding hook name."
 "@effect/vitest/index#ModuleCache":
   replacement: "none"
-  note: "Vitest 3 marked this unused internal cache shape deprecated; Vitest 4 has no public replacement."
+  note: "Vitest 3 marked this unused internal cache shape deprecated; Vitest 5 has no public replacement."
 "@effect/vitest/index#ResolvedTestEnvironment":
   replacement: "none"
-  note: "Vitest 3 marked this type unsupported. Use Environment from vitest/environments for custom environments."
+  note: "Vitest 3 marked this type unsupported. Use Environment from vitest/runtime for custom environments."
 "@effect/vitest/index#ResolveIdFunction":
   replacement: "none"
   note: "This deprecated vite-node callback was removed. Use Vite environment or module-runner APIs."
@@ -232,3 +232,48 @@
 "@effect/vitest/index#WorkerRPC":
   replacement: "none"
   note: "The concrete worker RPC composition is internal. Use public Vitest RuntimeRPC, RunnerRPC, ContextRPC, or WorkerRequest types only when their narrower contract fits."
+"@effect/vitest/index#bench":
+  replacement: "vitest#test"
+  note: "Vitest 5 removes the top-level bench export. Destructure bench from a regular test's context and await bench(name, fn).run(); use skip, only, or todo on the enclosing test."
+"@effect/vitest/index#BenchFactory":
+  replacement: "vitest#Bench"
+  note: "Use the Vitest 5 test-context bench fixture type. It is no longer the tinybench factory constructor."
+"@effect/vitest/index#BenchFunction":
+  replacement: "vitest#BenchFn"
+  note: "Use BenchFn for the callback passed to the Vitest 5 test-context bench fixture."
+"@effect/vitest/index#BenchTask":
+  replacement: "vitest#BenchRegistration"
+  note: "Migrate to a fixture registration and await its run() method; review its fields instead of treating it as a tinybench task."
+"@effect/vitest/index#BenchTaskResult":
+  replacement: "vitest#BenchResult"
+  note: "Use the result returned by awaiting the Vitest 5 fixture registration's run() method."
+"@effect/vitest/index#Benchmark":
+  replacement: "vitest#TestBenchmark"
+  note: "Use TestBenchmark for recorded benchmark data on a test; benchmarks are no longer standalone test tasks."
+"@effect/vitest/index#BenchmarkAPI":
+  replacement: "vitest#Bench"
+  note: "Use the test-context bench fixture. Move skip, only, and todo to the enclosing test."
+"@effect/vitest/index#BenchmarkResult":
+  replacement: "vitest#BenchResult"
+  note: "Use the result returned by awaiting the Vitest 5 fixture registration's run() method; review its changed fields."
+"@effect/vitest/index#BenchmarkRunner":
+  replacement: "vitest#BenchmarkProvider"
+  note: "Vitest 5 runs benchmarks through providers. Export a BenchmarkProvider with an asynchronous run(group) method for a custom engine."
+"@effect/vitest/index#ExpectPollOptions":
+  replacement: "NonNullable<Parameters<typeof import(\"vitest\").expect.poll>[1]>"
+  note: "Vitest 5 removes the named options export; derive the options from the public expect.poll function."
+"@effect/vitest/index#Assertion":
+  replacement: "vitest#Assertion"
+  note: "Vitest 5 takes the matcher return type first. Replace Assertion<T> with Assertion<void, T> or Assertion<Promise<void>, T> for asynchronous assertions."
+"@effect/vitest/index#Matchers":
+  replacement: "vitest#Matchers"
+  note: "Augment vitest.Matchers<R, T> for custom matchers. R is the matcher return type and T is the received value; @vitest/expect no longer shares Vitest's assertion state."
+"@effect/vitest/index#it":
+  replacement: "@effect/vitest#it"
+  note: "Effect helpers retain their calling convention. Vitest 5 removes it.sequential; pass { concurrent: false } to the native test or as the Effect helper's third argument."
+"@effect/vitest/index#test":
+  replacement: "vitest#test"
+  note: "Vitest 5 removes test.sequential and sequential options. Pass { concurrent: false } to opt out of inherited concurrency."
+"@effect/vitest/index#describe":
+  replacement: "vitest#describe"
+  note: "Vitest 5 removes describe.sequential and sequential options. Use describe(name, { concurrent: false }, body) for suites that depend on ordering."
diff --git a/repos/effect/migration/annotations/effect__workflow__DurableDeferred.yaml b/repos/effect/migration/annotations/effect__workflow__DurableDeferred.yaml
index f30fc24b4..6e01c63c9 100644
--- a/repos/effect/migration/annotations/effect__workflow__DurableDeferred.yaml
+++ b/repos/effect/migration/annotations/effect__workflow__DurableDeferred.yaml
@@ -15,7 +15,7 @@
   note: "Moved into core Effect and now requires the error schema encoding services."
 "@effect/workflow/DurableDeferred#into":
   replacement: "effect/unstable/workflow/DurableDeferred#into"
-  note: "Moved into core Effect with the same exit recording and suspension propagation behavior."
+  note: "Moved into core Effect with the same exit recording and suspension propagation behavior. Provide both decoding and encoding services for the success and error schemas; recording the exit requires encoding services."
 "@effect/workflow/DurableDeferred#make":
   replacement: "effect/unstable/workflow/DurableDeferred#make"
   note: "Moved into core Effect with the same name and optional schemas, expressed through v4 Schema.Constraint."
diff --git a/repos/effect/migration/schema.md b/repos/effect/migration/schema.md
index bc5ead367..e9d71ad07 100644
--- a/repos/effect/migration/schema.md
+++ b/repos/effect/migration/schema.md
@@ -59,7 +59,7 @@ This document maps v3 Schema APIs to their v4 equivalents. Simple renames and ar
 | `required(schema)`                              | `schema.mapFields(Struct.map(Schema.requiredKey))`                            | restructure       |
 | `extend(structB)`                               | `mapFields(Struct.assign(fieldsB))` or `fieldsAssign(fieldsB)`                | restructure       |
 | `transform(from, to, { decode, encode })`       | `from.pipe(decodeTo(to, SchemaTransformation.transform({ decode, encode })))` | restructure       |
-| `transformOrFail(from, to, { decode, encode })` | `from.pipe(decodeTo(to, { decode: SchemaGetter.transformOrFail(...), ... }))` | restructure       |
+| `transformOrFail(from, to, { decode, encode })` | `from.pipe(decodeTo(to, { decode: SchemaGetter.transformEffect(...), ... }))` | restructure       |
 | `transformLiteral(from, to)`                    | `Literal(from).transform(to)`                                                 | restructure       |
 | `transformLiterals([0,"a"], [1,"b"])`           | `Literals([0, 1]).transform(["a", "b"])`                                      | restructure       |
 | `attachPropertySignature("k", "v")`             | `mapFields(f => ({...f, k: tagDefaultOmit("v")}))`                            | restructure       |
@@ -121,7 +121,7 @@ Note: `positive`, `negative`, `nonNegative`, `nonPositive` have been removed in
 
 ### Utility renames
 
-`equivalence` → `toEquivalence`, `arbitrary` → `toArbitrary`, `pretty` → `toFormatter`, `standardSchemaV1` → `toStandardSchemaV1`
+`equivalence` → `toEquivalence`, `arbitrary` → [`Arbitrary.schema`](#migrating-from-the-fast-check-bridge-to-native-arbitrary) from `effect/unstable/arbitrary`, `pretty` → `toFormatter`, `standardSchemaV1` → `toStandardSchemaV1`
 
 ## Detailed migrations
 
@@ -901,7 +901,7 @@ import { Effect, Number, Schema, SchemaGetter, SchemaIssue } from "effect"
 
 const NumberFromString = Schema.String.pipe(
   Schema.decodeTo(Schema.Number, {
-    decode: SchemaGetter.transformOrFail((s) => {
+    decode: SchemaGetter.transformEffect((s) => {
       const n = Number.parse(s)
       if (n === undefined) {
         return Effect.fail(new SchemaIssue.InvalidValue())
@@ -1093,3 +1093,345 @@ function split(separator: string) {
   )
 }
 ```
+
+## Migrating from the fast-check bridge to native Arbitrary
+
+This section covers migration from the fast-check bridge published in `effect@4.0.0-rc.109` to the native,
+Schema-first module at `effect/unstable/arbitrary`.
+
+The new module removes fast-check from the `effect` package. Applications may still install and use fast-check
+directly, but Effect Schema generation and `@effect/vitest` property tests no longer depend on it.
+
+For the new API and its semantics, see [Arbitrary in Effect](../packages/effect/ARBITRARY.md).
+
+### Import changes
+
+The following APIs have been removed:
+
+- `effect/testing/FastCheck`;
+- `Schema.toArbitrary`;
+- `Schema.Arbitrary`;
+- the legacy `Schema.Annotations.ToArbitrary` contract and declaration-level `toArbitrary` annotation;
+- the legacy `arbitrary` filter annotation;
+- raw fast-check arbitrary inputs and `fastCheck` options in `@effect/vitest`.
+
+Import the native module explicitly:
+
+```ts
+import { Arbitrary } from "effect/unstable/arbitrary"
+```
+
+If other tests still use fast-check-specific APIs, add fast-check as a direct development dependency and import it
+from `"fast-check"`. Do not import it through Effect.
+
+### Generating samples
+
+Previously, `Schema.toArbitrary` returned a factory that needed the fast-check module:
+
+```ts
+import { Schema } from "effect"
+import { FastCheck } from "effect/testing"
+
+const Person = Schema.Struct({
+  name: Schema.String,
+  age: Schema.Int
+})
+
+const personArbitrary = Schema.toArbitrary(Person)(FastCheck)
+const samples = FastCheck.sample(personArbitrary, { numRuns: 20, seed: 42 })
+```
+
+Now derive and sample through the Effect-native module:
+
+```ts
+import { Effect, Schema } from "effect"
+import { Arbitrary } from "effect/unstable/arbitrary"
+
+const Person = Schema.Struct({
+  name: Schema.String,
+  age: Schema.Int
+})
+
+const personArbitrary = Arbitrary.schema(Person)
+const samples = await Effect.runPromise(
+  Arbitrary.sampleEffect(personArbitrary, { count: 20, seed: 42 })
+)
+```
+
+`Arbitrary.sampleEffect` returns an `Effect` because sampling is interruptible, uses Effect `Random` when no seed is
+provided, and reports bounded generation exhaustion as a typed `SampleError`.
+
+The generated values still use the decoded Schema `Type`. The sequence and distribution are not compatible with
+fast-check, even when the same numeric seed is used.
+
+### Checking properties
+
+Previously, fast-check owned both the property and the runner:
+
+```ts
+import { Schema } from "effect"
+import { FastCheck } from "effect/testing"
+
+const integer = Schema.toArbitrary(Schema.Int)(FastCheck)
+
+FastCheck.assert(
+  FastCheck.property(integer, (value) => Number.isInteger(value)),
+  { numRuns: 100, seed: 42 }
+)
+```
+
+Now `Arbitrary.checkEffect` runs a pure or Effectful property and returns a structured result:
+
+```ts
+import { Effect, Schema } from "effect"
+import { Arbitrary } from "effect/unstable/arbitrary"
+
+const result = await Effect.runPromise(
+  Arbitrary.checkEffect(
+    Arbitrary.schema(Schema.Int),
+    (value) => Number.isInteger(value),
+    { runs: 100, seed: 42 }
+  )
+)
+```
+
+Unlike `FastCheck.assert`, `Arbitrary.checkEffect` does not throw for an ordinary falsification. Handle `Passed`,
+`Falsified`, `Exhausted`, and `ReplayMismatch` explicitly, or use `@effect/vitest`, which converts non-passing results
+into test failures.
+
+Typed failures from Effectful properties are preserved in `Falsified.failure`. Defects and interruption continue
+through the returned Effect.
+
+### Option mapping
+
+The most common options map as follows:
+
+| Previous fast-check option | Native option        | Migration note                                                     |
+| -------------------------- | -------------------- | ------------------------------------------------------------------ |
+| `numRuns`                  | `count` or `runs`    | Use `count` for `sampleEffect` and `runs` for `checkEffect`.       |
+| `seed`                     | `seed`               | The type is compatible, but generated sequences are not.           |
+| `path`                     | `replay`             | Existing fast-check paths cannot be converted.                     |
+| `maxSkipsPerRun`           | `maxDiscards`        | Native uses one absolute discard budget, not a multiplier per run. |
+| `examples`                 | No direct equivalent | Keep explicit regression cases as ordinary tests.                  |
+| `endOnFailure`             | `maxShrinks`         | Use `maxShrinks: 0` to stop at the initial failure.                |
+| `interruptAfterTimeLimit`  | Effect interruption  | Apply an Effect or test timeout around the check.                  |
+| `skipAllAfterTimeLimit`    | No direct equivalent | Prefer explicit run and discard bounds.                            |
+| `verbose`                  | No direct equivalent | Inspect `CheckResult` or use `@effect/vitest` failure output.      |
+
+Review any less common fast-check runner option manually. The native API deliberately does not reproduce the complete
+`fc.Parameters` surface.
+
+### Replay migration
+
+Fast-check replay used a seed plus a shrink `path`. Native replay uses one opaque token returned by a `Falsified`
+result:
+
+```ts
+const replayed = Arbitrary.checkEffect(arbitrary, property, {
+  replay: previousFailure.replay
+})
+```
+
+There is no conversion from a fast-check seed and path to a native replay token. Re-run the property with the native
+engine, then record the new token from its `Falsified` result.
+
+Replay tokens are intended for reproducing and diagnosing a current failure. Because the module is unstable, they are
+not guaranteed to survive upgrades. Preserve important failing inputs as explicit regression tests.
+
+Array shrinking now tries deleting prefixes and interior blocks as well as suffixes. Products and objects retain child
+shrink candidates when exploring other branches. Shrunk outputs and replay paths can therefore differ from earlier
+native releases, including RC.115. Re-run affected properties to record new tokens.
+For arrays of composed Arbitraries, use `Arbitrary.array(item, { maxLength: 50 })` instead of shrinking a generated
+length through `flatMap` and `all`; deletions then preserve the remaining generated elements.
+
+### Migrating declaration annotations
+
+The old `toArbitrary` annotation directly constructed a fast-check arbitrary and exposed fast-check recursion and
+constraint details:
+
+```ts
+import { Schema } from "effect"
+
+class UserId {
+  readonly value: number
+  constructor(value: number) {
+    this.value = value
+  }
+}
+
+const UserIdSchema = Schema.instanceOf(UserId, {
+  toArbitrary: () => (fc) => fc.integer({ min: 1, max: 1_000_000 }).map((value) => new UserId(value))
+})
+```
+
+The native `toCodecArbitrary` annotation describes a generatable representation as a Schema `Link`:
+
+```ts
+import { Schema, SchemaTransformation } from "effect"
+
+class UserId {
+  readonly value: number
+  constructor(value: number) {
+    this.value = value
+  }
+}
+
+const UserIdSchema = Schema.instanceOf(UserId, {
+  toCodecArbitrary: () =>
+    Schema.link<UserId>()(
+      Schema.Int.check(Schema.isBetween({ minimum: 1, maximum: 1_000_000 })),
+      SchemaTransformation.transform({
+        decode: (value) => new UserId(value),
+        encode: (id) => id.value
+      })
+    )
+})
+```
+
+Before adding `toCodecArbitrary`, check whether the declaration already has a useful `toCodecJson` or `toCodec`.
+Native derivation falls back to those canonical codecs automatically. Add an arbitrary-specific Link only when the
+canonical representation is opaque or generates valid values too rarely.
+
+The migration changes where generation logic lives:
+
+| Legacy contract                                | Native contract                                                |
+| ---------------------------------------------- | -------------------------------------------------------------- |
+| Returns a `fast-check.Arbitrary`               | Returns a `SchemaAST.Link` through `Schema.link`.              |
+| Receives generated arbitrary type parameters   | Receives decoded Schema type parameters.                       |
+| Receives fast-check constraints and recursion  | Receives normalized constraints.                               |
+| Manages terminal recursive branches explicitly | Leaves recursion analysis and budgets to the native compiler.  |
+| Uses arbitrary combinators                     | Uses Schema constructors, checks, and a Schema transformation. |
+
+The original declaration remains authoritative. Values decoded by the Link are checked against it. Failed decodes and
+rejected values become bounded discards.
+
+#### Custom filter metadata
+
+The old `arbitrary` filter annotation has been replaced by `arbitraryConstraint`. Ordinary custom filters continue to
+work as residual filters without generation metadata:
+
+```ts
+import { Schema } from "effect"
+
+const Even = Schema.Int.check(
+  Schema.makeFilter((value) => value % 2 === 0)
+)
+```
+
+Residual filtering is bounded, so a very selective or impossible predicate may produce `SampleError` or `Exhausted`.
+
+If the previous annotation supplied a recognized constructive constraint, move it to `arbitraryConstraint` and adapt
+its shape. The predicate remains authoritative:
+
+```ts
+import { Order, Schema } from "effect"
+
+const Positive = Schema.Number.check(
+  Schema.makeFilter(
+    (value) => value > 0,
+    {
+      arbitraryConstraint: {
+        order: Order.Number,
+        minimum: 0,
+        exclusiveMinimum: true
+      }
+    }
+  )
+)
+```
+
+The main constraint-shape changes are:
+
+| Previous field                       | Native field                                                        |
+| ------------------------------------ | ------------------------------------------------------------------- |
+| `ordered.order`                      | `order`                                                             |
+| `ordered.minimum` / `maximum`        | `minimum` / `maximum`                                               |
+| `ordered.exclusiveMinimum` / maximum | `exclusiveMinimum: true` / `exclusiveMaximum: true`                 |
+| `integer: true`                      | `number: "integer"`                                                 |
+| `noNaN` and `noInfinity`             | `number: "finite"` when both restrictions apply                     |
+| collection `minLength` / `maxLength` | `minLength`, `minSize`, or `minProperties` and its matching maximum |
+| string pattern                       | `{ source, flags }` in `patterns`                                   |
+| `unique: true`                       | `uniqueBy: identity`                                                |
+| `candidate`                          | No direct equivalent                                                |
+
+Choose the cardinality field that matches the Schema domain: `minLength` and `maxLength` for strings and arrays,
+`minSize` and `maxSize` for sized collections, and `minProperties` and `maxProperties` for object properties.
+
+For an opaque declaration that needs a reusable statistically better source domain, express that source as a Schema
+Link with `toCodecArbitrary`.
+
+### Migrating `@effect/vitest`
+
+Property inputs may be Schemas, native Arbitraries, or mixtures of both.
+
+Schema-only properties need only an option rename:
+
+```ts
+// Before
+it.prop(
+  "commutative",
+  [Schema.Int, Schema.Int],
+  ([a, b]) => a + b === b + a,
+  { fastCheck: { numRuns: 200, seed: 42 } }
+)
+
+// After
+it.prop(
+  "commutative",
+  [Schema.Int, Schema.Int],
+  ([a, b]) => a + b === b + a,
+  { arbitrary: { runs: 200, seed: 42 } }
+)
+```
+
+Raw or mixed fast-check inputs are no longer accepted:
+
+```ts
+// No longer supported
+it.prop("raw arbitrary", [fc.integer()], ([value]) => Number.isInteger(value))
+it.prop("mixed", [Schema.String, fc.integer()], ([text, value]) => true)
+```
+
+Replace those inputs with Schemas when they describe a domain supported by Schema, or compose a native Arbitrary:
+
+```ts
+import { Arbitrary } from "effect/unstable/arbitrary"
+
+const integer = Arbitrary.schema(Schema.Int)
+
+it.prop("native arbitrary", [integer], ([value]) => Number.isInteger(value))
+it.prop("mixed", [Schema.String, integer], ([text, value]) => typeof text === "string" && Number.isInteger(value))
+```
+
+If a test genuinely needs a fast-check-specific arbitrary or runner feature, use fast-check directly with Vitest
+rather than passing it through `@effect/vitest`.
+
+`it.prop`, `it.effect.prop`, and `it.live.prop` all accept native check options under `arbitrary`.
+
+### Behavioral differences to review
+
+Migration is not only an import rename. Review the following differences:
+
+- native generation and shrinking have different distributions and may find different shrunk inputs;
+- native checking returns structured results instead of using fast-check's assertion exceptions;
+- generation that cannot find enough valid samples is bounded and reports `SampleError` or `Exhausted`;
+- pure and Effectful properties share one interruptible runner;
+- recursive and mutually recursive Schemas are analyzed as a graph and must have a finite generation path;
+- replay tokens, seeds, and shrink paths are not compatible with fast-check;
+- generated values are the decoded Schema `Type`;
+- properties must not mutate generated values.
+
+### Migration checklist
+
+1. Replace `effect/testing/FastCheck` imports. Use the native Arbitrary module for Schema generation and import
+   `"fast-check"` directly only where it is still independently required.
+2. Replace `Schema.toArbitrary(schema)(FastCheck)` with `Arbitrary.schema(schema)`.
+3. Replace `FastCheck.sample` with `Arbitrary.sampleEffect` and run the returned Effect.
+4. Replace `FastCheck.check` or `FastCheck.assert` for Schema-derived inputs with `Arbitrary.checkEffect`, then handle its
+   structured result.
+5. Rename `@effect/vitest` options from `fastCheck` to `arbitrary` and convert `numRuns` to `runs`.
+6. Replace raw fast-check inputs in `@effect/vitest` with Schemas or native Arbitraries.
+7. Migrate declaration-level `toArbitrary` callbacks to the `toCodecArbitrary` Link-returning contract and replace old
+   filter-level `arbitrary` annotations with `arbitraryConstraint`.
+8. Re-run properties with the native engine and record new replay tokens or explicit regression examples.
+9. Review discard limits for selective custom filters.
diff --git a/repos/effect/migration/v3-to-v4.md b/repos/effect/migration/v3-to-v4.md
index 00b867a78..e178782b4 100644
--- a/repos/effect/migration/v3-to-v4.md
+++ b/repos/effect/migration/v3-to-v4.md
@@ -2,9 +2,9 @@
 
 # v3 to v4 Migration Reference
 
-Base: `origin/v3` (`7c6e1e5d2ac9dfe00649a65fa80a61dcc14d55ae`)
+Base: `origin/v3` (`1ce1e62367e67a04e63bdf62ce2911cfee8c716c`)
 
-Head: `origin/main` (`53843f6490f4eebaf1eeb91fdcc5f1c542b0e132`)
+Head: `origin/main` (`3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5`)
 
 This file is generated from the API diff and `migration/annotations/*.yaml`.
 
@@ -506,7 +506,7 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 - `@effect/platform-node/NodeContext`: No single module replacement; follow the curated per-API guidance below.
 - `@effect/platform-node/NodeFileSystem/ParcelWatcher`: No single module replacement; follow the curated per-API guidance below.
 - `@effect/platform-node/NodeKeyValueStore` -> `effect/unstable/persistence/KeyValueStore`: layerFileSystem is now platform-neutral as KeyValueStore.layerFileSystem(directory); provide FileSystem and Path via NodeServices.layer or NodeFileSystem.layer with NodePath.layer.
-- `@effect/platform-node/index` -> `@effect/platform-node`: The explicit /index entrypoint was removed; import the same namespaces from the @effect/platform-node package root or import specific modules directly.
+- `@effect/platform-node/index` -> `@effect/platform-node`: The explicit /index entrypoint was removed; import Node-prefixed namespaces from the @effect/platform-node package root or import specific modules directly. Undici is no longer in the root barrel; import it from @effect/platform-node/Undici or directly from undici.
 - `@effect/platform/ChannelSchema` -> `effect/ChannelSchema`
 - `@effect/platform/Command` -> `effect/unstable/process/ChildProcess`
 - `@effect/platform/CommandExecutor` -> `effect/unstable/process/ChildProcessSpawner`
@@ -4164,6 +4164,12 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `OpenAiTokenizer.make` -> `Tokenizer.make`: The provider-specific tokenizer module was removed; build and provide an effect/unstable/ai/Tokenizer service explicitly, using gpt-tokenizer if equivalent OpenAI counting is required.
 
+### `@effect/ai-openai/OpenAiTool`
+
+- `OpenAiTool.WebSearch` -> `OpenAiTool.WebSearch`: Results now include action alongside status. Only completed is successful; other statuses produce failure results. Inspect isFailure before treating a result as a successful search. Inspect each search source by its type: URL sources have url, while API sources have name and no url.
+
+- `OpenAiTool.WebSearchPreview` -> `OpenAiTool.WebSearchPreview`: Results now include action alongside status. Only completed is successful; other statuses produce failure results. Inspect isFailure before treating a result as a successful search. Inspect each search source by its type: URL sources have url, while API sources have name and no url.
+
 ### `@effect/ai-openrouter/Generated`
 
 - `Generated.ActivityItem` -> `Generated.ActivityItem`: Still generated in v4 from the current OpenRouter specification; re-check the schema's Type/Encoded shape because the generated definition changed.
@@ -4878,7 +4884,7 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `OpenRouterClient.ChatStreamingResponseChunk` -> `OpenRouterClient.ChatStreamingResponseChunkData`: The standalone streaming chunk schema was replaced by the decoded data type from Generated.ChatStreamingResponse.
 
-- `OpenRouterClient.Service` -> `OpenRouterClient.Service`: Still exported in v4; adapt to the regenerated client, revised request and response schemas, and the new streaming result tuple.
+- `OpenRouterClient.Service` -> `OpenRouterClient.Service`: Still exported in v4; adapt to the regenerated client, revised request and response schemas, and the new streaming result tuple. Custom service implementations and mocks must also provide createDecisions, returning an Effect of [decoded DecisionsResponse, HttpClientResponse] with AiError failures.
 
 ### `@effect/ai-openrouter/OpenRouterConfig`
 
@@ -4898,6 +4904,8 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `AiError.AiError` -> `AiError.AiError`: Moved to effect/unstable/ai/AiError and redesigned from a union of separately tagged errors into one AiError wrapper with a semantic reason. Construct it with AiError.make({ module, method, reason }) and match error.reason rather than the old top-level tags.
 
+- `AiError.HttpRequestDetails` -> `AiError.HttpRequestDetails`: Retained in effect/unstable/ai/AiError and also re-exported as Response.HttpRequestDetails. Hash is an optional string instead of Option, headers may contain Redacted strings, and method includes TRACE.
+
 - `AiError.HttpRequestError` -> `AiError.make + AiError.NetworkError`: Replace the old top-level request error with an AiError whose reason is NetworkError. NetworkError.fromRequestError converts a v4 HttpClientError.RequestError.
 
 - `AiError.HttpResponseError` -> `AiError.make + AiError.reasonFromHttpStatus / AiError.InvalidOutputError`: There is no single v4 response-error class. Wrap a semantic reason with AiError.make: use reasonFromHttpStatus for status failures and InvalidOutputError for decode or empty-body failures.
@@ -4910,10 +4918,20 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `AiError.UnknownError` -> `AiError.make + AiError.UnknownError`: UnknownError is now a semantic reason rather than a top-level error. Put module and method on AiError.make and inspect reason.\_tag when handling the outer AiError.
 
+### `@effect/ai/Chat`
+
+- `Chat.Chat` -> `Chat.Chat`: Use the Chat interface for implementations and the Context.Service value as the service key; it is no longer a class. Chat.empty and Chat.fromPrompt construct branded chat sessions.
+
+- `Chat.Service` -> `Chat.Chat`: Service was renamed to Chat. Implementations require [Chat.TypeId]: Chat.TypeId; use Chat.empty or Chat.fromPrompt to create a session.
+
 ### `@effect/ai/EmbeddingModel`
 
+- `EmbeddingModel.EmbeddingModel` -> `EmbeddingModel.EmbeddingModel`: Use the EmbeddingModel interface for implementations and the Context.Service value as the service key; it is no longer a class. Prefer EmbeddingModel.make to construct the branded implementation.
+
 - `EmbeddingModel.Result`: TODO: needs guidance
 
+- `EmbeddingModel.Service` -> `EmbeddingModel.EmbeddingModel`: Service was renamed to EmbeddingModel. Implementations require [EmbeddingModel.TypeId]: EmbeddingModel.TypeId; EmbeddingModel.make supplies the brand.
+
 - `EmbeddingModel.makeDataLoader` -> `EmbeddingModel.make + RequestResolver.setDelay + RequestResolver.batchN`: The dedicated data-loader constructor was removed. EmbeddingModel.make batches concurrent embed requests through its resolver; compose the exposed resolver with setDelay and optional batchN for the old window and maximum-batch behavior.
 
 ### `@effect/ai/IdGenerator`
@@ -4926,6 +4944,10 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `LanguageModel.ExtractContext` -> `LanguageModel.ExtractServices`: Renamed in effect/unstable/ai/LanguageModel. ExtractServices infers toolkit handler, result-decoding, and effectful-toolkit service requirements.
 
+- `LanguageModel.LanguageModel` -> `LanguageModel.LanguageModel`: Use the LanguageModel interface for implementations and the Context.Service value as the service key; it is no longer a class. Prefer LanguageModel.make to construct the branded implementation.
+
+- `LanguageModel.Service` -> `LanguageModel.LanguageModel`: Service was renamed to LanguageModel. Implementations require [LanguageModel.TypeId]: LanguageModel.TypeId; LanguageModel.make supplies the brand.
+
 ### `@effect/ai/McpSchema`
 
 - `McpSchema.ContentBlock` -> `McpSchema.ContentBlock`: Moved to effect/unstable/ai/McpSchema. It remains the MCP content-block union, but v4 exports it as a const schema rather than a Schema.Union subclass. Binary image, audio, and blob data still use Uint8Array values with base64 wire encoding.
@@ -4940,6 +4962,8 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 ### `@effect/ai/McpServer`
 
+- `McpServer.McpServer` -> `McpServer.McpServer`: The service is now a Context.Service. initializedClients and notificationsMailbox are no longer exposed. Registration callbacks use McpSchema.McpRequestContext; McpServerClient is only supplied for initialized stateful requests. Prefer registerToolkit, registerResource, and registerPrompt over implementing the registry shape directly.
+
 - `McpServer.layer` -> `McpServer.layer`: Moved to effect/unstable/ai/McpServer. Pass a non-empty protocols array of adapters, such as [McpProtocol.v2025\_06\_18], imported with McpProtocol from effect/unstable/ai; it still runs over a caller-provided RpcServer.Protocol.
 
 - `McpServer.layerHttp` -> `McpServer.layerHttp`: Moved to effect/unstable/ai/McpServer and the unified HttpRouter. Pass a non-empty protocols array of adapters, such as [McpProtocol.v2025\_06\_18], imported with McpProtocol from effect/unstable/ai.
@@ -4948,8 +4972,20 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `McpServer.layerStdio` -> `McpServer.layerStdio`: Moved to effect/unstable/ai/McpServer. Pass a non-empty protocols array of adapters, such as [McpProtocol.v2025\_06\_18], imported with McpProtocol from effect/unstable/ai.
 
+- `McpServer.prompt` -> `McpServer.prompt`: Moved to effect/unstable/ai/McpServer. The registration layer excludes McpSchema.McpRequestContext from prompt decoding and handler requirements instead of McpServerClient.
+
+- `McpServer.registerPrompt` -> `McpServer.registerPrompt`: Moved to effect/unstable/ai/McpServer. Prompt decoding and handler requirements now exclude McpSchema.McpRequestContext instead of McpServerClient; use the request context for protocol-neutral client metadata.
+
+- `McpServer.registerResource` -> `McpServer.registerResource`: Moved to effect/unstable/ai/McpServer. Resource and completion handler requirements now exclude McpSchema.McpRequestContext instead of McpServerClient; use the request context for protocol-neutral client metadata.
+
+- `McpServer.registerToolkit` -> `McpServer.registerToolkit`: Moved to effect/unstable/ai/McpServer. Handler requirements now exclude McpSchema.McpRequestContext instead of McpServerClient. Strict tools reject excess input properties; raw JSON Schema dynamic tools cannot use strict mode. Declared handler failures produce isError results, while parameter validation fails with InvalidParams.
+
+- `McpServer.resource` -> `McpServer.resource`: Moved to effect/unstable/ai/McpServer. The registration layer excludes McpSchema.McpRequestContext from resource and completion handler requirements instead of McpServerClient.
+
 - `McpServer.run` -> `McpServer.run`: Moved to effect/unstable/ai/McpServer. Pass a non-empty protocols array of adapters, such as [McpProtocol.v2025\_06\_18], imported with McpProtocol from effect/unstable/ai; it remains the Effect-level runner over RpcServer.Protocol.
 
+- `McpServer.toolkit` -> `McpServer.toolkit`: Moved to effect/unstable/ai/McpServer. The registration layer supplies McpSchema.McpRequestContext to handlers instead of excluding McpServerClient from requirements. Strict tools reject excess properties and require an Effect Schema rather than raw dynamic JSON Schema.
+
 ### `@effect/ai/Model`
 
 - `Model.TypeId` -> `none`: The Model brand still exists internally, but its TypeId is not exported and v4 has no public isModel guard. Use Model values created by Model.make rather than inspecting or constructing the brand.
@@ -4994,6 +5030,8 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Response.ToolCallPartEncoded` -> `Response.ToolCallPartEncoded`: Moved to effect/unstable/ai/Response; providerName was removed while providerExecuted remains optional when encoded.
 
+- `Response.ToolResultPart` -> `Response.ToolResultPart`: The schema selects success or failure using isFailure rather than trying both result schemas. It returns Schema.Codec; supply decoding services when decoding and encoding services when encoding.
+
 - `Response.ToolResultPartEncoded` -> `Response.ToolResultPartEncoded`: Moved to effect/unstable/ai/Response; providerName was removed and optional preliminary was added to the encoded shape.
 
 - `Response.documentSourcePart` -> `Response.makePart("source", { ...params, sourceType: "document" })`: The lowercase convenience constructor was removed. The DocumentSourcePart model remains, and the generic constructor now requires the document source discriminator.
@@ -5048,6 +5086,10 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Tool.Requirements` -> `Tool.HandlerServices`: Renamed and refined. HandlerServices combines parameter-decoding, result-encoding, and request-level dependencies required by a tool handler.
 
+- `Tool.Result` -> `Tool.Result`: The result includes success, declared failure, and execution-denied or execution-interrupted values in both failure modes. Return mode also includes AiError; handle these variants when narrowing results.
+
+- `Tool.ResultEncoded` -> `Tool.ResultEncoded`: The encoded result includes execution-denied and execution-interrupted variants in both failure modes, plus encoded AiError in return mode.
+
 - `Tool.Success` -> `Tool.Success`: Moved to effect/unstable/ai/Tool and remains the utility type that extracts a tool's decoded success type.
 
 - `Tool.Tool.ProviderDefinedProto` -> `Tool.ProviderDefined`: This implementation-brand interface is no longer public. Use Tool.ProviderDefined for the model type and Tool.isProviderDefined for runtime narrowing.
@@ -5080,9 +5122,9 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Args.Args.BaseArgsConfig` -> `name: string`: Argument constructors now take the name as a required first parameter.
 
-- `Args.Args.FormatArgsConfig` -> `Primitive.FileParseOptions`: Pass the name separately and use the format option with Argument.fileParse or Argument.fileSchema.
+- `Args.Args.FormatArgsConfig` -> `Primitive.FileParseOptions`: Pass the name separately and use the format option with Argument.FileParse or Argument.FileSchema.
 
-- `Args.Args.PathArgsConfig` -> `Argument.path(name, { pathType, mustExist })`: Path options are inline; map exists=yes to mustExist=true and either to omission. exists=no has no exact replacement.
+- `Args.Args.PathArgsConfig` -> `Argument.Path(name, { pathType, mustExist })`: Path options are inline; map exists=yes to mustExist=true and either to omission. exists=no has no exact replacement.
 
 - `Args.Args.Variance` -> `Argument.Argument`: The separate variance artifact was removed; Argument inherits the shared Param variance.
 
@@ -5096,9 +5138,25 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Args.between` -> `Argument.between`: Use the moved combinator; v4 validates bounds when constructing the parameter.
 
-- `Args.boolean` -> `Flag.boolean / Argument.choiceWithValue`: Positional booleans were removed as ambiguous; prefer a boolean flag or explicit true/false positional choices.
+- `Args.boolean` -> `Flag.Boolean / Argument.ChoiceWithValue`: Positional booleans were removed as ambiguous; prefer a boolean flag or explicit true/false positional choices.
+
+- `Args.choice` -> `Argument.Literals`: Use the renamed constructor and pass the argument name explicitly.
+
+- `Args.date` -> `Argument.Date`: Use the renamed constructor and pass the argument name explicitly.
+
+- `Args.directory` -> `Argument.Directory`: Use mustExist=true for exists=yes and omit it for either; exists=no has no exact replacement.
+
+- `Args.file` -> `Argument.File`: Use mustExist=true for exists=yes and omit it for either; exists=no has no exact replacement.
+
+- `Args.fileContent` -> `Argument.File + Argument.mapEffect`: Parse a path and read it with FileSystem.readFile; no binary-content argument constructor remains.
+
+- `Args.fileParse` -> `Argument.FileParse`: Pass the old format as an options field; v4 returns parsed content rather than a path/content tuple.
+
+- `Args.fileSchema` -> `Argument.FileSchema`: Pass the old format as an options field and use a v4 Schema constraint decoder.
 
-- `Args.fileContent` -> `Argument.file + Argument.mapEffect`: Parse a path and read it with FileSystem.readFile; no binary-content argument constructor remains.
+- `Args.fileText` -> `Argument.FileText`: Use the renamed constructor; it returns content only.
+
+- `Args.float` -> `Argument.Finite`: Use the renamed constructor; it rejects non-finite numbers.
 
 - `Args.getHelp` -> `none`: Per-argument help introspection was removed; Command generates help internally.
 
@@ -5110,19 +5168,27 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Args.getUsage` -> `none`: The public Usage tree was removed; Command generates a usage string internally.
 
+- `Args.integer` -> `Argument.Int`: Use the renamed constructor and pass the argument name explicitly.
+
 - `Args.isArgs` -> `Param.isParam(value) && value.kind === Param.argumentKind`: Arguments now use the shared Param representation and an explicit kind discriminator.
 
 - `Args.map` -> `Argument.map`: Use the moved combinator.
 
 - `Args.mapEffect`: TODO: needs guidance
 
+- `Args.none` -> `omit the config entry`: V4 Argument.Never is an always-failing sentinel, not v3's empty successful argument set.
+
 - `Args.optional` -> `Argument.optional`: Use the moved combinator; it still returns Option.
 
+- `Args.path` -> `Argument.Path`: Path options are inline; map exists=yes to mustExist=true and either to omission. exists=no has no exact replacement.
+
+- `Args.redacted` -> `Argument.Redacted`: Use the renamed constructor and pass the argument name explicitly.
+
 - `Args.repeated` -> `Argument.variadic`: Renamed to variadic; pass optional min and max bounds.
 
-- `Args.secret` -> `Argument.redacted`: Use Redacted-backed positional input.
+- `Args.secret` -> `Argument.Redacted`: Use Redacted-backed positional input.
 
-- `Args.text` -> `Argument.string`: Renamed to string; pass the argument name explicitly.
+- `Args.text` -> `Argument.String`: Renamed to String; pass the argument name explicitly.
 
 - `Args.validate` -> `argument.parse({ flags: {}, arguments: args })`: Parsing is now a Param method and returns leftover tokens with the value; errors are CliError.
 
@@ -5284,7 +5350,7 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `CommandDirective.UserDefined` -> `none`: The user-defined intermediate directive was removed.
 
-- `CommandDirective.builtIn` -> `GlobalFlag.action`: Define a custom action flag; v4 runners no longer return built-in directives.
+- `CommandDirective.builtIn` -> `GlobalFlag.Action`: Define a custom action flag; v4 runners no longer return built-in directives.
 
 - `CommandDirective.isBuiltIn` -> `none`: Intermediate built-in directives were removed.
 
@@ -5364,7 +5430,7 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Options.Options` -> `Flag.Flag`: Options was renamed to Flag in effect/unstable/cli.
 
-- `Options.Options.BooleanOptionsConfig` -> `Flag.boolean + Flag.withAlias + Flag.map`: The config object was removed; aliases and value inversion are combinators, while custom negation names need application logic.
+- `Options.Options.BooleanOptionsConfig` -> `Flag.Boolean + Flag.withAlias + Flag.map`: The config object was removed; aliases and value inversion are combinators, while custom negation names need application logic.
 
 - `Options.Options.PathOptionsConfig` -> `{ readonly mustExist?: boolean }`: Path options are inline; true replaces exists=yes and omission replaces either. exists=no has no exact replacement.
 
@@ -5380,29 +5446,29 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Options.between` -> `Flag.between`: Use the moved combinator; v4 validates bounds when constructing the parameter.
 
-- `Options.boolean` -> `Flag.boolean + Flag.withDefault`: Use Flag.boolean(name).pipe(Flag.withDefault(false)) to preserve v3's omitted-flag default; bare Flag.boolean is now required. --no-name is automatic and aliases are added with Flag.withAlias.
+- `Options.boolean` -> `Flag.Boolean + Flag.withDefault`: Use Flag.Boolean(name).pipe(Flag.withDefault(false)) to preserve v3's omitted-flag default; bare Flag.Boolean is now required. --no-name is automatic and aliases are added with Flag.withAlias.
 
-- `Options.choice` -> `Flag.choice`: Use the moved constructor.
+- `Options.choice` -> `Flag.Literals`: Use the moved constructor.
 
-- `Options.choiceWithValue` -> `Flag.choiceWithValue`: Use the moved constructor.
+- `Options.choiceWithValue` -> `Flag.ChoiceWithValue`: Use the moved constructor.
 
-- `Options.date` -> `Flag.date`: Use the moved constructor.
+- `Options.date` -> `Flag.Date`: Use the moved constructor.
 
-- `Options.directory` -> `Flag.directory`: Use mustExist=true for exists=yes and omit it for either; exists=no has no exact replacement.
+- `Options.directory` -> `Flag.Directory`: Use mustExist=true for exists=yes and omit it for either; exists=no has no exact replacement.
 
-- `Options.file` -> `Flag.file`: Use mustExist=true for exists=yes and omit it for either; exists=no has no exact replacement.
+- `Options.file` -> `Flag.File`: Use mustExist=true for exists=yes and omit it for either; exists=no has no exact replacement.
 
-- `Options.fileContent` -> `Flag.file + Flag.mapEffect`: Parse a path and read it with FileSystem.readFile; no binary-content flag constructor remains.
+- `Options.fileContent` -> `Flag.File + Flag.mapEffect`: Parse a path and read it with FileSystem.readFile; no binary-content flag constructor remains.
 
-- `Options.fileParse` -> `Flag.fileParse`: Pass the old format as an options field; v4 returns parsed content rather than a path/content tuple.
+- `Options.fileParse` -> `Flag.FileParse`: Pass the old format as an options field; v4 returns parsed content rather than a path/content tuple.
 
-- `Options.fileSchema` -> `Flag.fileSchema`: Pass the old format as an options field and use a v4 Schema constraint decoder.
+- `Options.fileSchema` -> `Flag.FileSchema`: Pass the old format as an options field and use a v4 Schema constraint decoder.
 
-- `Options.fileText` -> `Flag.file + Flag.mapEffect`: Flag.fileText returns content only; read after Flag.file when the path/content tuple must be preserved.
+- `Options.fileText` -> `Flag.File + Flag.mapEffect`: Flag.FileText returns content only; read after Flag.File when the path/content tuple must be preserved.
 
 - `Options.filterMap` -> `Flag.filterMap`: Use the moved combinator and replace the fixed message with an onNone function.
 
-- `Options.float` -> `Flag.float`: Use the moved constructor.
+- `Options.float` -> `Flag.Finite`: Use the moved constructor.
 
 - `Options.getHelp` -> `none`: Per-flag help introspection was removed; Command generates help internally.
 
@@ -5410,13 +5476,13 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Options.getUsage` -> `none`: The public Usage tree was removed; Command generates a usage string internally.
 
-- `Options.integer` -> `Flag.integer`: Use the moved constructor.
+- `Options.integer` -> `Flag.Int`: Use the moved constructor.
 
 - `Options.isBool` -> `none`: No public flag-shape predicate remains; boolean-shape inspection is internal.
 
 - `Options.isOptions` -> `Param.isParam(value) && value.kind === Param.flagKind`: Flags now use the shared Param representation and an explicit kind discriminator.
 
-- `Options.keyValueMap` -> `Flag.keyValuePair`: Renamed and now returns Record\<string, string\> rather than HashMap.
+- `Options.keyValueMap` -> `Flag.KeyValuePair`: Renamed and now returns Record\<string, string\> rather than HashMap.
 
 - `Options.map` -> `Flag.map`: Use the moved combinator.
 
@@ -5424,7 +5490,7 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Options.mapTryCatch` -> `Flag.mapTryCatch`: Use the moved combinator; onError now returns a string rather than HelpDoc.
 
-- `Options.none` -> `omit the config entry`: V4 Flag.none is an always-failing sentinel, not v3's empty successful option set.
+- `Options.none` -> `omit the config entry`: V4 Flag.Never is an always-failing sentinel, not v3's empty successful option set.
 
 - `Options.optional` -> `Flag.optional`: Use the moved combinator; it still returns Option.
 
@@ -5436,13 +5502,13 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Options.processCommandLine` -> `Command.runWith`: Raw argv processing is now whole-command execution; no public standalone flag tokenizer remains.
 
-- `Options.redacted` -> `Flag.redacted`: Use the moved constructor.
+- `Options.redacted` -> `Flag.Redacted`: Use the moved constructor.
 
 - `Options.repeated` -> `Flag.variadic`: Renamed to variadic; pass optional min and max bounds.
 
-- `Options.secret` -> `Flag.redacted`: The deprecated Secret constructor was removed; use Redacted-backed input.
+- `Options.secret` -> `Flag.Redacted`: The deprecated Secret constructor was removed; use Redacted-backed input.
 
-- `Options.text` -> `Flag.string`: Renamed from text to string.
+- `Options.text` -> `Flag.String`: Renamed from text to String.
 
 - `Options.withAlias` -> `Flag.withAlias`: Use the moved combinator.
 
@@ -5468,19 +5534,23 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Primitive.PrimitiveTypeId` -> `none`: The public Primitive type-id symbol was removed.
 
-- `Primitive.boolean` -> `Primitive.boolean`: Boolean is now a singleton value; defaults belong on Flag.boolean or withDefault.
+- `Primitive.boolean` -> `Primitive.Boolean`: Boolean is now a singleton value; defaults belong on Flag.Boolean or withDefault.
+
+- `Primitive.choice` -> `Primitive.Choice`: Use the moved constructor.
 
-- `Primitive.choice` -> `Primitive.choice`: Use the moved constructor.
+- `Primitive.date` -> `Primitive.Date`: Date is now a singleton Primitive value.
 
-- `Primitive.date` -> `Primitive.date`: Date is now a singleton Primitive value.
+- `Primitive.float` -> `Primitive.Finite`: Finite is now a singleton Primitive value and rejects non-finite numbers.
 
 - `Primitive.getChoices` -> `none`: Choice introspection is internal in v4; retain alternatives in application code when needed.
 
 - `Primitive.getHelp` -> `none`: Primitive-level help generation was removed from the public API.
 
+- `Primitive.integer` -> `Primitive.Int`: Int is now a singleton Primitive value.
+
 - `Primitive.isBool` -> `none`: The boolean Primitive predicate is internal in v4.
 
-- `Primitive.text` -> `Primitive.string`: Renamed from text to string.
+- `Primitive.text` -> `Primitive.String`: Renamed from text to String.
 
 - `Primitive.validate` -> `primitive.parse(value)`: Parsing is now the Primitive.parse method over a string; defaults and case normalization moved out of this layer.
 
@@ -5492,21 +5562,41 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Prompt.Prompt` -> `Prompt.Prompt`: The model moved to effect/unstable/cli; quitting now fails with Terminal.QuitError.
 
+- `Prompt.Prompt.FloatOptions` -> `Prompt.NumberOptions`: Use the renamed public options type for Prompt.Number; it still extends the integer options type, now IntOptions.
+
+- `Prompt.Prompt.IntegerOptions` -> `Prompt.IntOptions`: Use the renamed public options type for Prompt.Int; option fields are preserved.
+
 - `Prompt.Prompt.Variance` -> `Prompt.Prompt`: The named variance artifact was removed; use Prompt\<Output\>.
 
 - `Prompt.Prompt.VarianceStruct` -> `Prompt.Prompt`: The named variance structure was removed; use Prompt\<Output\>.
 
 - `Prompt.PromptTypeId` -> `Prompt.isPrompt`: The public type-id symbol was removed; use the runtime guard.
 
-- `Prompt.date` -> `Prompt.date`: Use the moved constructor.
+- `Prompt.confirm` -> `Prompt.Confirm`: Use the renamed constructor.
+
+- `Prompt.custom` -> `Prompt.Custom`: Use the renamed constructor; both overloads are preserved.
+
+- `Prompt.date` -> `Prompt.Date`: Use the moved constructor.
+
+- `Prompt.file` -> `Prompt.File`: Use the moved constructor; v4 also supports a default selected path.
+
+- `Prompt.float` -> `Prompt.Number`: Use the moved constructor; v4 also supports a default value.
+
+- `Prompt.hidden` -> `Prompt.Hidden`: Use the renamed constructor.
 
-- `Prompt.file` -> `Prompt.file`: Use the moved constructor; v4 also supports a default selected path.
+- `Prompt.integer` -> `Prompt.Int`: Use the moved constructor; v4 also supports a default value.
 
-- `Prompt.float` -> `Prompt.float`: Use the moved constructor; v4 also supports a default value.
+- `Prompt.list` -> `Prompt.List`: Use the renamed constructor.
 
-- `Prompt.integer` -> `Prompt.integer`: Use the moved constructor; v4 also supports a default value.
+- `Prompt.multiSelect` -> `Prompt.MultiSelect`: Use the renamed constructor.
 
-- `Prompt.text` -> `Prompt.text`: Use the moved constructor.
+- `Prompt.password` -> `Prompt.Password`: Use the renamed constructor.
+
+- `Prompt.select` -> `Prompt.Select`: Use the renamed constructor.
+
+- `Prompt.text` -> `Prompt.String`: Use the moved constructor.
+
+- `Prompt.toggle` -> `Prompt.Toggle`: Use the renamed constructor.
 
 ### `@effect/cli/ValidationError`
 
@@ -5636,9 +5726,9 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `EntityProxyServer.RpcHandlers` -> `effect/unstable/cluster/EntityProxyServer#RpcHandlers`: Moved into core Effect and updated for the additional v4 Rpc requirements type parameter.
 
-- `EntityProxyServer.layerHttpApi` -> `effect/unstable/cluster/EntityProxyServer#layerHttpApi`: Moved into core Effect. Use v4 HttpApi identifiers and Rpc.ServicesServer requirements.
+- `EntityProxyServer.layerHttpApi` -> `effect/unstable/cluster/EntityProxyServer#layerHttpApi`: Moved into core Effect. Use v4 HttpApi identifiers and provide Sharding plus both Rpc.ServicesServer and Rpc.ServicesClient codec requirements.
 
-- `EntityProxyServer.layerRpcHandlers` -> `effect/unstable/cluster/EntityProxyServer#layerRpcHandlers`: Moved into core Effect; the service requirement is now Rpc.ServicesServer rather than Rpc.Context.
+- `EntityProxyServer.layerRpcHandlers` -> `effect/unstable/cluster/EntityProxyServer#layerRpcHandlers`: Moved into core Effect; replace Rpc.Context with both Rpc.ServicesServer and Rpc.ServicesClient codec requirements, alongside Sharding.
 
 ### `@effect/cluster/EntityResource`
 
@@ -5692,6 +5782,8 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 ### `@effect/cluster/Reply`
 
+- `Reply.Reply` -> `Reply.Reply(rpc, codecFor)`: Pass the transport codec. Decoding replies requires Rpc.ServicesClient; encoding replies requires Rpc.ServicesServer.
+
 - `Reply.ReplyEncoded` -> `effect/unstable/cluster/Reply#Encoded`: Renamed to Encoded and no longer parameterized by an Rpc; payload fields are unknown and validated by Reply.Reply(rpc, codecFor) with the transport's codec.
 
 - `Reply.TypeId` -> `none`: The reply marker is private in v4. Use Reply.isReply for runtime refinement.
@@ -5866,8 +5958,6 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `EventLogRemote.Hello` -> `effect/unstable/eventlog/EventLogMessage#HelloResponse`: HelloResponse replaces Hello and includes the v4 authentication challenge; HelloRpc defines the endpoint.
 
-- `EventLogRemote.Ping`: TODO: needs guidance
-
 - `EventLogRemote.Pong` -> `none`: The event-log Pong model was removed; heartbeats belong to the generic RPC socket protocol.
 
 - `EventLogRemote.ProtocolRequest` -> `effect/unstable/eventlog/EventLogMessage#EventLogRemoteRpcs`: EventLogRemoteRpcs and generic RPC serialization replace the old protocol request union.
@@ -5994,12 +6084,14 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 ### `@effect/experimental/Reactivity`
 
-- `Reactivity.Reactivity` -> `effect/unstable/reactivity/Reactivity#Reactivity`: Use the v4 Reactivity Context.Service; unsafe methods were renamed with an Unsafe suffix.
+- `Reactivity.Reactivity` -> `effect/unstable/reactivity/Reactivity#Reactivity`: Use the Reactivity interface for implementations and the Reactivity Context.Service value as the service key. Implementations require the TypeId brand; prefer Reactivity.make. Unsafe methods were renamed with an Unsafe suffix.
 
-- `Reactivity.Reactivity.Service` -> `effect/unstable/reactivity/Reactivity#Reactivity["Service"]`: The named namespace member was removed; derive the service shape from the Context.Service class.
+- `Reactivity.Reactivity.Service` -> `effect/unstable/reactivity/Reactivity#Reactivity`: The named namespace member was removed; use the branded Reactivity interface directly. Prefer Reactivity.make, or include [Reactivity.TypeId]: Reactivity.TypeId in a custom implementation.
 
 - `Reactivity.make` -> `effect/unstable/reactivity/Reactivity#make`: Import make from the v4 unstable Reactivity module.
 
+- `Reactivity.query`: TODO: needs guidance
+
 ### `@effect/experimental/RequestResolver`
 
 - `RequestResolver.PersistedRequest` -> `effect/Request#Request & effect/unstable/persistence/Persistable#Persistable`: Intersect a Request with Persistable or define it with Persistable.Class; there is no combined named export.
@@ -6192,7 +6284,7 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 ### `@effect/platform-bun/BunStream`
 
-- `BunStream.FromReadableOptions` -> `Pick<Parameters<typeof BunStream.fromReadable>[0], "chunkSize" | "closeOnDone">`: The named interface was inlined into the constructor options; chunkSize is now a number and the full options also contain evaluate, onError, and bufferSize.
+- `BunStream.FromReadableOptions` -> `Pick<Parameters<typeof BunStream.fromReadable>[0], "chunkSize" | "closeOnDone">`: The named interface was inlined into the constructor options; chunkSize is now a number and the full options also contain evaluate and onError. The ignored bufferSize option was removed.
 
 - `BunStream.FromWritableOptions` -> `Pick<Parameters<typeof BunSink.fromWritable>[0], "endOnDone" | "encoding">`: The named interface was inlined into BunSink.fromWritable and duplex constructor options.
 
@@ -6336,6 +6428,8 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Undici.MessageEventInit` -> `undici.MessageEventInit`: Import the upstream type directly; message ports and source use MessagePort instances in Undici 8.
 
+- `Undici.MockAgent`: TODO: needs guidance
+
 - `Undici.Pool` -> `undici.Pool`: Import the upstream Pool directly and apply interceptors after construction with pool.compose(...).
 
 - `Undici.Pool.Options` -> `undici.Pool.Options`: Import the same Pool namespace type; Undici 8 removes the interceptors option in favor of pool.compose(...).
@@ -6438,6 +6532,8 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Cookies.CookieTypeId` -> `Cookies.isCookie`: The cookie brand is private in v4; use the public refinement instead of reading the type-id symbol.
 
+- `Cookies.CookiesError` -> `Cookies.CookiesError`: The error tag is CookiesError rather than CookieError. Update catchTag calls and \_tag comparisons; validation details are in the reason field.
+
 - `Cookies.ErrorTypeId` -> `Cookies.CookiesError`: The error brand is private in v4; identify the exported error class instead.
 
 - `Cookies.TypeId` -> `Cookies.isCookies`: The collection brand is private in v4; use the public refinement instead.
@@ -6486,21 +6582,35 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `FileSystem.FileTypeId` -> `typeof FileSystem.FileTypeId`: The runtime marker remains exported, but the separate type alias was removed.
 
+- `FileSystem.GiB` -> `ByteSize.gibibytes`: Use the ByteSize binary unit constructor.
+
+- `FileSystem.KiB` -> `ByteSize.kibibytes`: Use the ByteSize binary unit constructor.
+
 - `FileSystem.MakeDirectoryOptions` -> `NonNullable<Parameters<FileSystem.FileSystem["makeDirectory"]>[1]>`: Operation option interfaces are inline in the v4 FileSystem service.
 
 - `FileSystem.MakeTempDirectoryOptions` -> `NonNullable<Parameters<FileSystem.FileSystem["makeTempDirectory"]>[0]>`: Operation option interfaces are inline in the v4 FileSystem service.
 
 - `FileSystem.MakeTempFileOptions` -> `NonNullable<Parameters<FileSystem.FileSystem["makeTempFile"]>[0]>`: Operation option interfaces are inline in the v4 FileSystem service.
 
+- `FileSystem.MiB` -> `ByteSize.mebibytes`: Use the ByteSize binary unit constructor.
+
 - `FileSystem.OpenFileOptions` -> `NonNullable<Parameters<FileSystem.FileSystem["open"]>[1]>`: Operation option interfaces are inline in the v4 FileSystem service.
 
+- `FileSystem.PiB` -> `ByteSize.pebibytes`: Use the ByteSize binary unit constructor.
+
 - `FileSystem.ReadDirectoryOptions` -> `NonNullable<Parameters<FileSystem.FileSystem["readDirectory"]>[1]>`: Operation option interfaces are inline in the v4 FileSystem service.
 
 - `FileSystem.RemoveOptions` -> `NonNullable<Parameters<FileSystem.FileSystem["remove"]>[1]>`: Operation option interfaces are inline in the v4 FileSystem service.
 
 - `FileSystem.SinkOptions` -> `NonNullable<Parameters<FileSystem.FileSystem["sink"]>[1]>`: Operation option interfaces are inline in the v4 FileSystem service.
 
-- `FileSystem.StreamOptions` -> `NonNullable<Parameters<FileSystem.FileSystem["stream"]>[1]>`: Stream options are inline; bufferSize was removed while bytesToRead, chunkSize, and offset remain.
+- `FileSystem.Size` -> `ByteSize.ByteSize`: Use ByteSize.bytes or unit constructors for file sizes. Truncation lengths, buffer sizes, and read/write counts use number. File.seek takes and returns signed bigint positions; it can fail with PlatformError, including BadArgument when seeking before the start.
+
+- `FileSystem.SizeInput` -> `ByteSize.Input`: File-size and path-backed range inputs use ByteSize.Input. String inputs must be non-negative decimal integers without leading zeros, followed by a canonical unit symbol or lowercase unit name, with at most one separating space. Parse external strings or fractional quantities with ByteSize.fromString (Option) or ByteSize.fromStringUnsafe (throws), then pass the resulting ByteSize. Truncation lengths, Web File ranges, and buffer sizes use number.
+
+- `FileSystem.StreamOptions` -> `NonNullable<Parameters<FileSystem.FileSystem["stream"]>[1]>`: Stream options are inline; bufferSize was removed, bytesToRead and offset accept ByteSize inputs, and chunkSize uses number.
+
+- `FileSystem.TiB` -> `ByteSize.tebibytes`: Use the ByteSize binary unit constructor.
 
 - `FileSystem.WatchEventCreate` -> `FileSystem.WatchEvent.Create`: The constructor was removed; construct a tagged object with \_tag: "Create" and path.
 
@@ -6528,9 +6638,9 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Headers.remove` -> `Headers.remove / Headers.removeMany`: Use remove for one name or removeMany for an iterable; RegExp removal requires enumerating matching names.
 
-- `Headers.schema` -> `Headers.HeadersSchema`: The encoded-record and self schemas were consolidated into HeadersSchema.
+- `Headers.schema` -> `Schema.Headers`: The encoded-record and self schemas were consolidated and moved to effect/Schema as Schema.Headers.
 
-- `Headers.schemaFromSelf` -> `Headers.HeadersSchema`: The encoded-record and self schemas were consolidated into HeadersSchema.
+- `Headers.schemaFromSelf` -> `Schema.Headers`: The encoded-record and self schemas were consolidated and moved to effect/Schema as Schema.Headers.
 
 - `Headers.unsafeFromRecord` -> `Headers.fromRecordUnsafe`: Renamed to put Unsafe last; it still skips name normalization.
 
@@ -6558,6 +6668,8 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `HttpApiBuilder.HandlersTypeId` -> `none`: The exported symbol was removed; do not inspect or construct the private Handlers marker.
 
+- `HttpApiBuilder.Middleware` -> `none`: The API-specific middleware service tag was removed. Declared HttpApiMiddleware services are applied while routes are built; use HttpRouter.middleware for additional global middleware.
+
 - `HttpApiBuilder.MiddlewareFn` -> `effect/unstable/http/HttpRouter#middleware.Fn`: HTTP apps are Effects in v4; use the router middleware function type or infer it through HttpRouter.middleware.
 
 - `HttpApiBuilder.Router` -> `effect/unstable/http/HttpRouter#HttpRouter`: The API-specific router tag was removed; API and group layers register with the shared HttpRouter service.
@@ -6568,7 +6680,7 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `HttpApiBuilder.group` -> `effect/unstable/httpapi/HttpApiBuilder#group`: The group layer remains; names are now identifiers and API/group global error channels are gone.
 
-- `HttpApiBuilder.handler` -> `effect/unstable/httpapi/HttpApiBuilder#endpoint`: Use endpoint for a standalone typed endpoint implementation; inside a group pass callbacks to handlers.handle.
+- `HttpApiBuilder.handler` -> `effect/unstable/httpapi/HttpApiBuilder#handler`: The typed callback helper remains; names are now identifiers and API/group global error channels are gone. Pass the returned callback to handlers.handle.
 
 - `HttpApiBuilder.httpApp` -> `effect/unstable/http/HttpRouter#toHttpEffect`: Build the application from the assembled API route layer; HTTP apps are Effects in v4.
 
@@ -6878,9 +6990,9 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `HttpBody.Uint8Array` -> `HttpBody.Uint8Array`: Retained with the same fields and tag, but v4 exports a class.
 
-- `HttpBody.file` -> `HttpBody.file`: Retained; bufferSize was replaced by chunkSize and the other file options remain.
+- `HttpBody.file` -> `HttpBody.file`: Retained; bufferSize was replaced by numeric chunkSize. Offset and bytesToRead accept ByteSize.Input. Invalid ranges and a final EOF-clamped content length above Number.MAX\_SAFE\_INTEGER fail with PlatformError / BadArgument.
 
-- `HttpBody.fileInfo` -> `HttpBody.fileFromInfo`: Renamed; it still uses supplied File.Info for content length and requires FileSystem.
+- `HttpBody.fileInfo` -> `HttpBody.fileFromInfo`: Renamed; it uses supplied File.Info with ByteSize size metadata and requires FileSystem. Offset and bytesToRead accept ByteSize.Input, while chunkSize is numeric. Invalid ranges and a final EOF-clamped content length above Number.MAX\_SAFE\_INTEGER fail with PlatformError / BadArgument.
 
 - `HttpBody.unsafeJson` -> `HttpBody.jsonUnsafe`: Renamed to put Unsafe last; serialization failures still throw.
 
@@ -6952,6 +7064,8 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 ### `@effect/platform/HttpClientResponse`
 
+- `HttpClientResponse.HttpClientResponse` -> `HttpClientResponse.HttpClientResponse`: Custom implementations must supply the required url string. It represents the resolved URL including query parameters and excluding the hash, uses the final URL after redirects, and is empty when unknown.
+
 - `HttpClientResponse.TypeId` -> `typeof HttpClientResponse.TypeId`: TypeId remains public but is now a string constant; use typeof in type position.
 
 - `HttpClientResponse.filterStatus` -> `HttpClientResponse.filterStatus`: Retained; rejected status now fails with an HttpClientError wrapper.
@@ -6972,11 +7086,11 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 ### `@effect/platform/HttpIncomingMessage`
 
-- `HttpIncomingMessage.MaxBodySize` -> `HttpIncomingMessage.MaxBodySize`: Changed from a Reference subclass holding Option\<Size\> to Context.Reference\<Size | undefined\>.
+- `HttpIncomingMessage.MaxBodySize` -> `HttpIncomingMessage.MaxBodySize`: Changed from a Reference subclass holding Option\<Size\> to Context.Reference\<ByteSize.ByteSize | undefined\>.
 
 - `HttpIncomingMessage.TypeId` -> `typeof HttpIncomingMessage.TypeId`: TypeId remains public but is now a string constant; use typeof in type position.
 
-- `HttpIncomingMessage.withMaxBodySize` -> `Effect.provideService(HttpIncomingMessage.MaxBodySize, size)`: The helper was removed; provide FileSystem.Size(input) or undefined directly.
+- `HttpIncomingMessage.withMaxBodySize` -> `Effect.provideService(HttpIncomingMessage.MaxBodySize, size)`: The helper was removed; provide a ByteSize value or undefined directly.
 
 ### `@effect/platform/HttpLayerRouter`
 
@@ -7046,13 +7160,13 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 ### `@effect/platform/HttpPlatform`
 
-- `HttpPlatform.HttpPlatform` -> `HttpPlatform.HttpPlatform`: The service is now a Context.Service class; use its Service member for the implementation type.
+- `HttpPlatform.HttpPlatform` -> `HttpPlatform.HttpPlatform`: The service is now a Context.Service class; use its Service member for the implementation type. Path-backed offset and bytesToRead accept ByteSize.Input, while chunkSize and all Web File range options use number.
 
 - `HttpPlatform.TypeId` -> `none`: The public type id was removed; use the HttpPlatform Context.Service class.
 
 - `HttpPlatform.layer` -> `HttpPlatform.layer`: Retained as the default file-response layer.
 
-- `HttpPlatform.make` -> `HttpPlatform.make`: Retained; v4 returns the service implementation and uses updated file stream options.
+- `HttpPlatform.make` -> `HttpPlatform.make`: Retained; v4 returns the service implementation. The fileResponse callback receives contentLength as bigint, while start and end remain numbers. Web File range options use number.
 
 ### `@effect/platform/HttpRouter`
 
@@ -7124,17 +7238,25 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 ### `@effect/platform/HttpServer`
 
+- `HttpServer.Address` -> `effect/unstable/net/NetAddress#SocketAddress`: Replaced by the shared concrete internet-or-Unix socket address union.
+
 - `HttpServer.HttpServer` -> `HttpServer.HttpServer`: The interface and tag became one Context.Service class; use its Service member for implementations.
 
 - `HttpServer.ServeOptions` -> `none`: The unused respond option model was removed with no shared v4 counterpart.
 
+- `HttpServer.TcpAddress` -> `effect/unstable/net/NetAddress#InetAddress`: Replaced by the shared resolved internet-address model; use address and port instead of hostname and port.
+
 - `HttpServer.TypeId` -> `none`: The public TypeId was removed; HttpServer is now a Context.Service class.
 
+- `HttpServer.UnixAddress` -> `effect/unstable/net/NetAddress#UnixPathAddress`: Replaced by the shared Unix filesystem-path address model.
+
 - `HttpServer.addressWith` -> `HttpServer.HttpServer.use(({ address }) => effect(address))`: The accessor was removed; read the service and pass its Address to the callback.
 
+- `HttpServer.formatAddress` -> `HttpServer.formatAddress`: Accepts NetAddress.SocketAddress and delegates to NetAddress.formatUrlUnsafe. Scoped IPv6 addresses throw NetAddressError; Unix paths use the unix:// prefix.
+
 - `HttpServer.layerContext` -> `HttpServer.layerServices`: Renamed; it provides the standard HTTP platform services.
 
-- `HttpServer.make` -> `HttpServer.make`: Retained; it returns the Context.Service implementation.
+- `HttpServer.make` -> `HttpServer.make`: Retained; it returns the Context.Service implementation. Supply a NetAddress.SocketAddress for address, using NetAddress.inetAddressUnsafe for a parsed IP and port or NetAddress.unixPathAddress for a Unix path. Use NetAddress.inetAddress to validate the port through Result instead.
 
 - `HttpServer.serve` -> `effect/unstable/http/HttpServer#serve`: Moved to the v4 HTTP module; the application is now an Effect producing HttpServerResponse rather than the separate HttpApp model.
 
@@ -7180,7 +7302,9 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `HttpServerResponse.expireCookie` -> `HttpServerResponse.expireCookie`: Now effectful and safe; use expireCookieUnsafe for synchronous throwing behavior.
 
-- `HttpServerResponse.file` -> `HttpServerResponse.file`: Retained with updated FileSystem stream options.
+- `HttpServerResponse.file` -> `HttpServerResponse.file`: Retained; offset and bytesToRead accept ByteSize.Input, while chunkSize uses number. Path-backed responses validate ranges and clamp content length to the available bytes.
+
+- `HttpServerResponse.fileWeb` -> `HttpServerResponse.fileWeb`: Web File offset, bytesToRead, and chunkSize options use number, unlike path-backed ByteSize.Input ranges.
 
 - `HttpServerResponse.isServerResponse` -> `HttpServerResponse.isHttpServerResponse`: Renamed.
 
@@ -7190,7 +7314,7 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `HttpServerResponse.text` -> `HttpServerResponse.text`: Moved unchanged.
 
-- `HttpServerResponse.toWeb` -> `HttpServerResponse.toWeb`: Retained, but the optional Runtime became an optional Context for stream execution.
+- `HttpServerResponse.toWeb` -> `HttpServerResponse.toWeb`: Retained, but the optional Runtime became an optional Context for stream execution. For a raw Web Response, outer headers override native headers and cookies append, including when the body is omitted. With withoutBody, the raw status and statusText are preserved unless the outer status is 204, 205, or 304, which takes precedence.
 
 - `HttpServerResponse.uint8Array` -> `HttpServerResponse.uint8Array`: Moved unchanged.
 
@@ -7244,9 +7368,9 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Multipart.FileSchema` -> `Multipart.PersistedFileSchema`: The schema for persisted multipart files was renamed.
 
-- `Multipart.MaxFieldSize` -> `Multipart.MaxFieldSize`: The setting remains but is now a Context.Reference.
+- `Multipart.MaxFieldSize` -> `Multipart.MaxFieldSize`: Now a Context.Reference\<ByteSize.ByteSize\>; provide a value such as ByteSize.bytes(100).
 
-- `Multipart.MaxFileSize` -> `Multipart.MaxFileSize`: The setting remains as a Context.Reference; use undefined rather than Option.none for no limit.
+- `Multipart.MaxFileSize` -> `Multipart.MaxFileSize`: Now a Context.Reference\<ByteSize.ByteSize | undefined\>; provide ByteSize.bytes(100), for example, or undefined for no limit.
 
 - `Multipart.MaxParts` -> `Multipart.MaxParts`: The setting remains as a Context.Reference; use undefined rather than Option.none for no limit.
 
@@ -7260,13 +7384,13 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Multipart.withLimits` -> `Effect.provideContext(effect, Multipart.limitsServices(options))`: Build the multipart limit context and provide it to the effect; Option-valued limits became optional plain values.
 
-- `Multipart.withLimits.Options` -> `Multipart.withLimits.Options`: Limit fields now use optional plain numbers or SizeInput values; convert Option.none to undefined and Option.some(value) to value.
+- `Multipart.withLimits.Options` -> `Multipart.withLimits.Options`: Limit fields now use optional plain numbers or ByteSize inputs; convert Option.none to undefined and Option.some(value) to value.
 
 - `Multipart.withLimitsStream` -> `Stream.provideContext(stream, Multipart.limitsServices(options))`: Build the multipart limit context and provide it to the stream; Option-valued limits became optional plain values.
 
-- `Multipart.withMaxFieldSize` -> `Effect.provideService(Multipart.MaxFieldSize, size)`: Provide the v4 Context.Reference around the effect.
+- `Multipart.withMaxFieldSize` -> `Effect.provideService(Multipart.MaxFieldSize, size)`: Provide a ByteSize value, such as ByteSize.bytes(100). To normalize ByteSize.Input options, use Multipart.limitsServices.
 
-- `Multipart.withMaxFileSize` -> `Effect.provideService(Multipart.MaxFileSize, size)`: Provide the v4 Context.Reference around the effect, converting Option.none to undefined.
+- `Multipart.withMaxFileSize` -> `Effect.provideService(Multipart.MaxFileSize, size)`: Replace Option.none with undefined and Option.some(value) with a normalized ByteSize value. To normalize ByteSize.Input options, use Multipart.limitsServices.
 
 - `Multipart.withMaxParts` -> `Effect.provideService(Multipart.MaxParts, count)`: Provide the v4 Context.Reference around the effect, converting Option.none to undefined.
 
@@ -7318,6 +7442,8 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `OpenApiJsonSchema.Array` -> `effect/JsonSchema#JsonSchema`: The narrow node interfaces were consolidated into the general object model.
 
+- `OpenApiJsonSchema.Boolean` -> `effect/JsonSchema#JsonSchema`: The narrow boolean interface was consolidated into the open, dialect-neutral JSON Schema object model.
+
 - `OpenApiJsonSchema.Empty` -> `effect/JsonSchema#JsonSchema`: The narrow node interfaces and special id shapes were removed.
 
 - `OpenApiJsonSchema.Enum` -> `effect/JsonSchema#JsonSchema`: The narrow node interfaces were consolidated into the general object model.
@@ -7328,6 +7454,10 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `OpenApiJsonSchema.JsonSchema` -> `effect/JsonSchema#JsonSchema`: Use the dialect-neutral open JSON Schema object model.
 
+- `OpenApiJsonSchema.Never` -> `effect/JsonSchema#JsonSchema`: The special never-schema interface was consolidated into the open JSON Schema object model; represent it with a not constraint.
+
+- `OpenApiJsonSchema.Number` -> `effect/JsonSchema#JsonSchema`: The narrow number interface was consolidated into the open, dialect-neutral JSON Schema object model.
+
 - `OpenApiJsonSchema.Numeric` -> `effect/JsonSchema#JsonSchema`: The narrow numeric interfaces were consolidated into the general object model.
 
 - `OpenApiJsonSchema.Object` -> `effect/JsonSchema#JsonSchema`: The narrow node interfaces were consolidated into the general object model.
@@ -7336,8 +7466,12 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `OpenApiJsonSchema.Root` -> `effect/JsonSchema#MultiDocument`: OpenAPI generation keeps roots in schemas and shared components in definitions; the inline-definitions root model is gone.
 
+- `OpenApiJsonSchema.String` -> `effect/JsonSchema#JsonSchema`: The narrow string interface was consolidated into the open, dialect-neutral JSON Schema object model.
+
 - `OpenApiJsonSchema.Unknown`: TODO: needs guidance
 
+- `OpenApiJsonSchema.Void` -> `effect/JsonSchema#JsonSchema`: The special void-schema interface was consolidated into the open JSON Schema object model.
+
 - `OpenApiJsonSchema.make` -> `effect/Schema#toJsonSchemaDocument + effect/JsonSchema#toMultiDocumentOpenApi3_1`: Generate Draft 2020-12, wrap the root in a multi-document, then convert references and definitions to OpenAPI 3.1.
 
 - `OpenApiJsonSchema.makeWithDefs` -> `effect/SchemaRepresentation#toJsonSchemaMultiDocument + effect/JsonSchema#toMultiDocumentOpenApi3_1`: Definitions are returned separately; build a multi-document representation and convert it to OpenAPI 3.1.
@@ -7390,8 +7524,14 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 ### `@effect/platform/SocketServer`
 
+- `SocketServer.Address` -> `effect/unstable/net/NetAddress#SocketAddress`: Replaced by the shared concrete internet-or-Unix socket address union.
+
 - `SocketServer.ErrorTypeId` -> `SocketServer.ErrorTypeId`: The API moved to effect/unstable/socket/SocketServer and retains this name.
 
+- `SocketServer.TcpAddress` -> `effect/unstable/net/NetAddress#InetAddress`: Replaced by the shared resolved internet-address model; use address and port instead of hostname and port.
+
+- `SocketServer.UnixAddress` -> `effect/unstable/net/NetAddress#UnixPathAddress`: Replaced by the shared Unix filesystem-path address model.
+
 ### `@effect/platform/Template`
 
 - `Template.Interpolated.Context` -> `Template.Interpolated.Context`: The API moved to effect/unstable/http/Template; v4 interpolation types also account for Effect values.
@@ -7416,6 +7556,8 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 ### `@effect/platform/Url`
 
+- `Url.fromString` -> `Url.fromString`: Retained; returns Result with IllegalArgumentError instead of Either with IllegalArgumentException.
+
 - `Url.setUrlParams` -> `Url.setUrlParams`: Retained and widened to accept UrlParams.Input.
 
 ### `@effect/platform/UrlParams`
@@ -7424,19 +7566,21 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `UrlParams.Input` -> `UrlParams.Input`: Retained and broadened to include UrlParams itself.
 
+- `UrlParams.UrlParams` -> `UrlParams.UrlParams`: Import UrlParams from effect/unstable/http. It is now a branded iterable object with a params field rather than a ReadonlyArray; construct it with UrlParams.make or UrlParams.fromInput.
+
 - `UrlParams.makeUrl` -> `Url.make`: Moved to Url, returns Result, and takes string | undefined for the hash.
 
-- `UrlParams.schemaFromSelf` -> `UrlParams.UrlParamsSchema`: Renamed to the declaration schema for the v4 wrapper.
+- `UrlParams.schemaFromSelf` -> `Schema.UrlParams`: The declaration schema for the v4 wrapper moved to effect/Schema.
 
-- `UrlParams.schemaFromString` -> `Schema.String.pipe(Schema.decodeTo(UrlParams.UrlParamsSchema, { decode: SchemaGetter.transform((s) => UrlParams.fromInput(new URLSearchParams(s))), encode: SchemaGetter.transform(UrlParams.toString) }))`: No prebuilt string codec remains; recreate it by transforming between a query string and UrlParams.
+- `UrlParams.schemaFromString` -> `Schema.String.pipe(Schema.decodeTo(Schema.UrlParams, { decode: SchemaGetter.transform((s) => UrlParams.fromInput(new URLSearchParams(s))), encode: SchemaGetter.transform(UrlParams.toString) }))`: No prebuilt string codec remains; recreate it by transforming between a query string and UrlParams.
 
-- `UrlParams.schemaJson` -> `UrlParams.schemaJsonField(field).pipe(Schema.decodeTo(schema), Schema.decodeEffect)`: Compose the field codec with the target schema, then decode it.
+- `UrlParams.schemaJson` -> `Schema.JsonFromUrlParamsField(field).pipe(Schema.decodeTo(schema), Schema.decodeEffect)`: The field codec moved to effect/Schema. Compose it with the target schema, then decode it.
 
-- `UrlParams.schemaParse` -> `UrlParamsFromString.pipe(Schema.decodeTo(UrlParams.schemaRecord.pipe(Schema.decodeTo(schema))))`: Recreate the removed helper by composing the string, record, and target codecs.
+- `UrlParams.schemaParse` -> `UrlParamsFromString.pipe(Schema.decodeTo(Schema.RecordFromUrlParams.pipe(Schema.decodeTo(schema))))`: Recreate the removed helper by composing the string, record, and target codecs.
 
-- `UrlParams.schemaRecord` -> `UrlParams.schemaRecord.pipe(Schema.decodeTo(schema))`: schemaRecord is now a base codec value; compose it with the target schema.
+- `UrlParams.schemaRecord` -> `Schema.RecordFromUrlParams.pipe(Schema.decodeTo(schema))`: RecordFromUrlParams is a base codec in effect/Schema; compose it with the target schema.
 
-- `UrlParams.schemaStruct` -> `UrlParams.schemaRecord.pipe(Schema.decodeTo(schema), Schema.decodeEffect)`: Compose the record codec with the target schema and decode it.
+- `UrlParams.schemaStruct` -> `Schema.RecordFromUrlParams.pipe(Schema.decodeTo(schema), Schema.decodeEffect)`: Compose the record codec from effect/Schema with the target schema and decode it.
 
 - `UrlParams.toString` -> `UrlParams.toString`: Retained and broadened to accept any UrlParams.Input.
 
@@ -7790,9 +7934,9 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 ### `@effect/sql-pg/PgClient`
 
-- `PgClient.PgClient` -> `@effect/sql-pg/PgClient#PgClient`: Retained; the service value is now a Context.Service.
+- `PgClient.PgClient` -> `@effect/sql-pg/PgClient#PgClient`: Retained; the service value is now a Context.Service. The listen method returns a scoped Effect acquiring a Queue.Dequeue\<PgConnection.Notification, SqlError\>; consume it with Queue operations or Stream.fromQueue and read each notification's payload. Connection failures after registration fail the queue with the original SqlError; scope closure interrupts consumers.
 
-- `PgClient.PgClientConfig` -> `@effect/sql-pg/PgClient#PgClientConfig / PgPoolConfig`: Use PgClientConfig for base settings and PgPoolConfig for make/layer; pool sizing, idle timeout, and connection TTL moved to PgPoolConfig.
+- `PgClient.PgClientConfig` -> `@effect/sql-pg/PgClient#PgClientConfig / PgPoolConfig`: Use PgClientConfig for base settings and PgPoolConfig for make/layer; pool sizing, idle timeout, and connection TTL moved to PgPoolConfig. The types option takes a PgTypes.Registry rather than node-pg custom types. Timestamp and timestamptz results (including array elements) are Date values with millisecond precision; infinity, -infinity, and out-of-range values become invalid Dates. Numeric readers can use getTime() or register numeric codecs. Date parameters bind as timestamptz; use PgTypes.timestamp(value) to preserve UTC fields when writing a timestamp column instead of applying the session TimeZone.
 
 - `PgClient.PgClientFromPoolOptions` -> `none`: The node-pg Pool wrapper options were removed with fromPool. Use PgClient.PgPoolConfig with PgClient.make or PgClient.layer.
 
@@ -7818,6 +7962,10 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `SqliteClient.asyncQuery` -> `@effect/sql-sqlite-react-native/SqliteClient#AsyncQuery`: Renamed and changed from FiberRef to Context.Reference; prefer withAsyncQuery or provide AsyncQuery as a service.
 
+### `@effect/sql-sqlite-wasm/OpfsWorker`
+
+- `OpfsWorker.OpfsWorkerConfig`: TODO: needs guidance
+
 ### `@effect/sql-sqlite-wasm/SqliteClient`
 
 - `SqliteClient.SqliteClient` -> `@effect/sql-sqlite-wasm/SqliteClient#SqliteClient`: Retained with the same export/import surface; the service value is now a Context.Service.
@@ -7834,6 +7982,8 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Model.Class` -> `effect/unstable/schema/Model#Class`: Moved; model variants remain select, insert, update, json, jsonCreate, and jsonUpdate.
 
+- `Model.Date` -> `effect/unstable/schema/Model#Date`: Moved; still serializes DateTime.Utc as a YYYY-MM-DD string.
+
 - `Model.DateTimeFromDate` -> `effect/Schema#DateTimeUtcFromDate`: Moved to core Schema and retains Date to DateTime.Utc conversion.
 
 - `Model.Generated` -> `effect/unstable/schema/Model#GeneratedByDb`: Renamed and now read-only, with select and json variants only. Use Model.Field with select, update, and json to preserve writable v3 behavior.
@@ -7844,7 +7994,7 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Model.fields` -> `effect/unstable/schema/Model#fields`: Moved with the variant-model helpers into core Effect's unstable schema package.
 
-- `Model.makeDataLoaders` -> `effect/unstable/sql/SqlModel#makeResolvers`: Returns RequestResolvers instead of callable loaders; execute with SqlResolver.request and use RequestResolver delay/batch combinators for batching controls.
+- `Model.makeDataLoaders` -> `effect/unstable/sql/SqlModel#makeResolvers`: Returns RequestResolvers instead of callable loaders; execute with SqlResolver.request and use RequestResolver delay/batch combinators for batching controls. The insert resolver requires model decoding services as well as insert-schema encoding services.
 
 ### `@effect/sql/SqlClient`
 
@@ -8294,25 +8444,41 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 ### `@effect/vitest/index`
 
-- `index.ApiConfig` -> `vitest/node#ApiConfig`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.ApiConfig` -> `vitest/node#ApiConfig`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
 - `index.ArgumentsType` -> `T extends (...args: infer A) => any ? A : never`: Vitest 3 marked this root alias as an internal helper. Define the small TypeScript shape locally instead of depending on transitive internals.
 
 - `index.Arrayable` -> `T | Array<T>`: Vitest 3 marked this root alias as an internal helper. Define the small TypeScript shape locally instead of depending on transitive internals.
 
+- `index.Assertion` -> `vitest#Assertion`: Vitest 5 takes the matcher return type first. Replace Assertion\<T\> with Assertion\<void, T\> or Assertion\<Promise\<void\>, T\> for asynchronous assertions.
+
 - `index.Awaitable` -> `T | PromiseLike<T>`: Vitest 3 marked this root alias as an internal helper. Define the small TypeScript shape locally instead of depending on transitive internals.
 
-- `index.BaseCoverageOptions` -> `vitest/node#BaseCoverageOptions`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.BaseCoverageOptions` -> `vitest/node#BaseCoverageOptions`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
+
+- `index.BenchFactory` -> `vitest#Bench`: Use the Vitest 5 test-context bench fixture type. It is no longer the tinybench factory constructor.
+
+- `index.BenchFunction` -> `vitest#BenchFn`: Use BenchFn for the callback passed to the Vitest 5 test-context bench fixture.
+
+- `index.BenchTask` -> `vitest#BenchRegistration`: Migrate to a fixture registration and await its run() method; review its fields instead of treating it as a tinybench task.
+
+- `index.BenchTaskResult` -> `vitest#BenchResult`: Use the result returned by awaiting the Vitest 5 fixture registration's run() method.
 
-- `index.BenchmarkUserOptions` -> `vitest/node#BenchmarkUserOptions`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.Benchmark` -> `vitest#TestBenchmark`: Use TestBenchmark for recorded benchmark data on a test; benchmarks are no longer standalone test tasks.
 
-- `index.BrowserConfigOptions` -> `vitest/node#BrowserConfigOptions`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.BenchmarkAPI` -> `vitest#Bench`: Use the test-context bench fixture. Move skip, only, and todo to the enclosing test.
 
-- `index.BrowserScript` -> `vitest/node#BrowserScript`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.BenchmarkResult` -> `vitest#BenchResult`: Use the result returned by awaiting the Vitest 5 fixture registration's run() method; review its changed fields.
 
-- `index.BuiltinEnvironment` -> `vitest/node#BuiltinEnvironment`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.BenchmarkUserOptions` -> `vitest/node#BenchmarkUserOptions`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
-- `index.CSSModuleScopeStrategy` -> `vitest/node#CSSModuleScopeStrategy`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.BrowserConfigOptions` -> `vitest/node#BrowserConfigOptions`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
+
+- `index.BrowserScript` -> `vitest/node#BrowserScript`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
+
+- `index.BuiltinEnvironment` -> `vitest/node#BuiltinEnvironment`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
+
+- `index.CSSModuleScopeStrategy` -> `vitest/node#CSSModuleScopeStrategy`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
 - `index.CollectLineNumbers` -> `vitest/node#TypeCheckCollectLineNumbers`: Vitest 3 deprecated the root alias in favor of this renamed vitest/node type.
 
@@ -8322,97 +8488,101 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `index.Context` -> `vitest/node#TypeCheckContext`: Vitest 3 deprecated the root alias in favor of this renamed vitest/node type.
 
-- `index.CoverageIstanbulOptions` -> `vitest/node#CoverageIstanbulOptions`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.CoverageIstanbulOptions` -> `vitest/node#CoverageIstanbulOptions`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
-- `index.CoverageOptions` -> `vitest/node#CoverageOptions`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.CoverageOptions` -> `vitest/node#CoverageOptions`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
-- `index.CoverageProvider` -> `vitest/node#CoverageProvider`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.CoverageProvider` -> `vitest/node#CoverageProvider`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
-- `index.CoverageProviderModule` -> `vitest/node#CoverageProviderModule`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.CoverageProviderModule` -> `vitest/node#CoverageProviderModule`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
-- `index.CoverageReporter` -> `vitest/node#CoverageReporter`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.CoverageReporter` -> `vitest/node#CoverageReporter`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
-- `index.CoverageV8Options` -> `vitest/node#CoverageV8Options`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.CoverageV8Options` -> `vitest/node#CoverageV8Options`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
 - `index.Custom` -> `vitest#RunnerTestCase`: Vitest 4 removed the deprecated unprefixed runner alias. Import the explicit Runner\* type from vitest.
 
-- `index.CustomProviderOptions` -> `vitest/node#CustomProviderOptions`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.CustomProviderOptions` -> `vitest/node#CustomProviderOptions`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
-- `index.DepsOptimizationOptions` -> `vitest/node#DepsOptimizationOptions`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.DepsOptimizationOptions` -> `vitest/node#DepsOptimizationOptions`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
 - `index.DoneCallback` -> `none`: Vitest does not support callback-style tests. Return a Promise or, in @effect/vitest tests, return an Effect.
 
-- `index.Environment` -> `vitest/environments#Environment`: This was a deprecated root re-export. Import it from vitest/environments; Vitest 4 custom environments use Vite environments.
+- `index.Environment` -> `vitest/runtime#Environment`: This was a deprecated root re-export. Import it from vitest/runtime; Vitest 5 exposes custom environments through vitest/runtime.
 
-- `index.EnvironmentOptions` -> `vitest/node#EnvironmentOptions`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.EnvironmentOptions` -> `vitest/node#EnvironmentOptions`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
-- `index.EnvironmentReturn` -> `vitest/environments#EnvironmentReturn`: This was a deprecated root re-export. Import it from vitest/environments; Vitest 4 custom environments use Vite environments.
+- `index.EnvironmentReturn` -> `vitest/runtime#EnvironmentReturn`: This was a deprecated root re-export. Import it from vitest/runtime; Vitest 5 exposes custom environments through vitest/runtime.
 
 - `index.ErrorWithDiff` -> `vitest#TestError`: Vitest 3 deprecated ErrorWithDiff in favor of TestError; review the tightened actual, expected, and cause fields.
 
-- `index.ExtendedContext` -> `vitest#TestContext`: The separate context alias was removed. Vitest 4 uses TestContext, which includes the current task and lifecycle methods.
+- `index.ExpectPollOptions` -> `NonNullable<Parameters<typeof import("vitest").expect.poll>[1]>`: Vitest 5 removes the named options export; derive the options from the public expect.poll function.
+
+- `index.ExtendedContext` -> `vitest#TestContext`: The separate context alias was removed. Vitest 5 uses TestContext, which includes the current task and lifecycle methods.
 
 - `index.File` -> `vitest#RunnerTestFile`: Vitest 4 removed the deprecated unprefixed runner alias. Import the explicit Runner\* type from vitest.
 
-- `index.HappyDOMOptions` -> `NonNullable<import("vitest/node").EnvironmentOptions["happyDOM"]>`: Vitest 4 keeps this shape only as a property of EnvironmentOptions; derive it from the public vitest/node type.
+- `index.HappyDOMOptions` -> `NonNullable<import("vitest/node").EnvironmentOptions["happyDOM"]>`: Vitest 5 keeps this shape only as a property of EnvironmentOptions; derive it from the public vitest/node type.
 
-- `index.HookCleanupCallback` -> `none`: No named Vitest 4 export replaces this alias. Let the hook return type infer, or type the cleanup function locally.
+- `index.HookCleanupCallback` -> `none`: No named Vitest 5 export replaces this alias. Let the hook return type infer, or type the cleanup function locally.
 
-- `index.HookListener` -> `none`: Use the matching @vitest/runner hook-specific type such as BeforeAllListener, AfterAllListener, BeforeEachListener, or AfterEachListener for custom runner code.
+- `index.HookListener` -> `none`: Infer the callback from the public hook function, or derive it with Parameters\<typeof import("vitest").beforeAll\>[0] and the corresponding hook name.
 
-- `index.InlineConfig` -> `vitest/node#InlineConfig`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.InlineConfig` -> `vitest/node#InlineConfig`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
-- `index.JSDOMOptions` -> `NonNullable<import("vitest/node").EnvironmentOptions["jsdom"]>`: Vitest 4 keeps this shape only as a property of EnvironmentOptions; derive it from the public vitest/node type.
+- `index.JSDOMOptions` -> `NonNullable<import("vitest/node").EnvironmentOptions["jsdom"]>`: Vitest 5 keeps this shape only as a property of EnvironmentOptions; derive it from the public vitest/node type.
+
+- `index.Matchers` -> `vitest#Matchers`: Augment vitest.Matchers\<R, T\> for custom matchers. R is the matcher return type and T is the received value; @vitest/expect no longer shares Vitest's assertion state.
 
 - `index.Mock` -> `vitest#Mock`: This was a Vitest re-export, not Effect API. Import it directly from vitest; @effect/vitest/index is not a valid v4 route.
 
-- `index.ModuleCache` -> `none`: Vitest 3 marked this unused internal cache shape deprecated; Vitest 4 has no public replacement.
+- `index.ModuleCache` -> `none`: Vitest 3 marked this unused internal cache shape deprecated; Vitest 5 has no public replacement.
 
 - `index.MutableArray` -> `{ -readonly [K in keyof T]: T[K] }`: Vitest 3 marked this root alias as an internal helper. Define the small TypeScript shape locally instead of depending on transitive internals.
 
 - `index.Nullable` -> `T | null | undefined`: Vitest 3 marked this root alias as an internal helper. Define the small TypeScript shape locally instead of depending on transitive internals.
 
-- `index.Pool` -> `vitest/node#Pool`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.Pool` -> `vitest/node#Pool`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
-- `index.PoolOptions` -> `vitest/config#TestUserConfig`: The v3 built-in poolOptions object was removed. Move its fields to Vitest 4 top-level config such as maxWorkers and vmMemoryLimit; vitest/node PoolOptions is a different custom-pool API.
+- `index.PoolOptions` -> `vitest/config#TestUserConfig`: The v3 built-in poolOptions object was removed. Move its fields to Vitest 5 top-level config such as maxWorkers and vmMemoryLimit; vitest/node PoolOptions is a different custom-pool API.
 
-- `index.ProjectConfig` -> `vitest/node#ProjectConfig`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.ProjectConfig` -> `vitest/node#ProjectConfig`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
 - `index.RawErrsMap` -> `vitest/node#TypeCheckRawErrorsMap`: Vitest 3 deprecated the root alias in favor of this renamed vitest/node type.
 
-- `index.ReportContext` -> `vitest/node#ReportContext`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.ReportContext` -> `vitest/node#ReportContext`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
-- `index.Reporter` -> `vitest/reporters#Reporter`: Import Reporter from the public plural vitest/reporters entrypoint; its lifecycle methods changed in Vitest 4.
+- `index.Reporter` -> `vitest/node#Reporter`: Import Reporter from vitest/node; the deprecated vitest/reporters entrypoint was removed in Vitest 5.
 
 - `index.ResolveIdFunction` -> `none`: This deprecated vite-node callback was removed. Use Vite environment or module-runner APIs.
 
-- `index.ResolvedConfig` -> `vitest/node#ResolvedConfig`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.ResolvedConfig` -> `vitest/node#ResolvedConfig`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
-- `index.ResolvedCoverageOptions` -> `vitest/node#ResolvedCoverageOptions`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.ResolvedCoverageOptions` -> `vitest/node#ResolvedCoverageOptions`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
-- `index.ResolvedTestEnvironment` -> `none`: Vitest 3 marked this type unsupported. Use Environment from vitest/environments for custom environments.
+- `index.ResolvedTestEnvironment` -> `none`: Vitest 3 marked this type unsupported. Use Environment from vitest/runtime for custom environments.
 
 - `index.RootAndTarget` -> `vitest/node#TypeCheckRootAndTarget`: Vitest 3 deprecated the root alias in favor of this renamed vitest/node type.
 
 - `index.RunnerCustomCase` -> `vitest#RunnerTestCase`: Vitest 4 removed the deprecated unprefixed runner alias. Import the explicit Runner\* type from vitest.
 
-- `index.RuntimeContext` -> `@vitest/runner#RuntimeContext`: Custom-runner code can add an explicit @vitest/runner dependency; ordinary tests should avoid this internal state type.
+- `index.RuntimeContext` -> `none`: Vitest 5 deprecates @vitest/runner and does not expose this internal state type. Extend TestRunner from vitest and use its public methods instead.
 
-- `index.SequenceHooks` -> `vitest/node#SequenceHooks`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.SequenceHooks` -> `vitest/node#SequenceHooks`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
-- `index.SequenceSetupFiles` -> `vitest/node#SequenceSetupFiles`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.SequenceSetupFiles` -> `vitest/node#SequenceSetupFiles`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
 - `index.SerializableSpec` -> `vitest#SerializedTestSpecification`: Use the non-deprecated Vitest name; SerializableSpec was only an alias.
 
 - `index.Suite` -> `vitest#RunnerTestSuite`: Vitest 4 removed the deprecated unprefixed runner alias. Import the explicit Runner\* type from vitest.
 
-- `index.SuiteHooks` -> `@vitest/runner#SuiteHooks`: Custom-runner code can add an explicit @vitest/runner dependency; ordinary tests should use public hook functions.
+- `index.SuiteHooks` -> `ReturnType<typeof import("vitest").TestRunner.getSuiteHooks>`: Derive the hook collection from Vitest 5's public TestRunner API; ordinary tests should use public hook functions.
 
 - `index.Task` -> `vitest#RunnerTask`: Vitest 4 removed the deprecated unprefixed runner alias. Import the explicit Runner\* type from vitest.
 
 - `index.TaskBase` -> `vitest#RunnerTaskBase`: Vitest 4 removed the deprecated unprefixed runner alias. Import the explicit Runner\* type from vitest.
 
-- `index.TaskContext` -> `vitest#TestContext`: The separate context alias was removed. Vitest 4 uses TestContext, which includes the current task and lifecycle methods.
+- `index.TaskContext` -> `vitest#TestContext`: The separate context alias was removed. Vitest 5 uses TestContext, which includes the current task and lifecycle methods.
 
 - `index.TaskResult` -> `vitest#RunnerTaskResult`: Vitest 4 removed the deprecated unprefixed runner alias. Import the explicit Runner\* type from vitest.
 
@@ -8424,32 +8594,40 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `index.TscErrorInfo` -> `vitest/node#TypeCheckErrorInfo`: Vitest 3 deprecated the root alias in favor of this renamed vitest/node type.
 
-- `index.TypecheckConfig` -> `vitest/node#TypecheckConfig`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.TypecheckConfig` -> `vitest/node#TypecheckConfig`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
-- `index.UserConfig` -> `vitest/config#TestUserConfig`: Vitest 4 exposes its config as TestUserConfig; ViteUserConfig is the separate Vite configuration type.
+- `index.UserConfig` -> `vitest/config#TestUserConfig`: Vitest 5 exposes its config as TestUserConfig; ViteUserConfig is the separate Vite configuration type.
 
 - `index.UserWorkspaceConfig` -> `vitest/config#UserWorkspaceConfig`: Import the type from vitest/config and migrate Vitest workspace configuration to projects.
 
-- `index.VitestEnvironment` -> `vitest/node#VitestEnvironment`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.VitestEnvironment` -> `vitest/node#VitestEnvironment`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
-- `index.VitestRunMode` -> `vitest/node#VitestRunMode`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.VitestRunMode` -> `vitest/node#VitestRunMode`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
-- `index.VmEnvironmentReturn` -> `vitest/environments#VmEnvironmentReturn`: This was a deprecated root re-export. Import it from vitest/environments; Vitest 4 custom environments use Vite environments.
+- `index.VmEnvironmentReturn` -> `vitest/runtime#VmEnvironmentReturn`: This was a deprecated root re-export. Import it from vitest/runtime; Vitest 5 exposes custom environments through vitest/runtime.
 
-- `index.WorkerContext` -> `vitest/node#WorkerContext`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 4 shape.
+- `index.WorkerContext` -> `vitest/node#WorkerContext`: This was a deprecated Vitest 3 root re-export. Import the type directly from vitest/node and review its Vitest 5 shape.
 
 - `index.WorkerRPC` -> `none`: The concrete worker RPC composition is internal. Use public Vitest RuntimeRPC, RunnerRPC, ContextRPC, or WorkerRequest types only when their narrower contract fits.
 
+- `index.bench` -> `vitest#test`: Vitest 5 removes the top-level bench export. Destructure bench from a regular test's context and await bench(name, fn).run(); use skip, only, or todo on the enclosing test.
+
 - `index.chai.Should` -> `vitest#chai.Should`: This was a Vitest re-export, not Effect API. Import it directly from vitest; @effect/vitest/index is not a valid v4 route.
 
+- `index.describe` -> `vitest#describe`: Vitest 5 removes describe.sequential and sequential options. Use describe(name, { concurrent: false }, body) for suites that depend on ordering.
+
 - `index.expect` -> `vitest#expect`: This was a Vitest re-export, not Effect API. Import it directly from vitest; @effect/vitest/index is not a valid v4 route.
 
+- `index.it` -> `@effect/vitest#it`: Effect helpers retain their calling convention. Vitest 5 removes it.sequential; pass { concurrent: false } to the native test or as the Effect helper's third argument.
+
 - `index.scoped` -> `@effect/vitest#effect`: V4 effect tests are scoped and provide the test environment. Replace scoped(...) with effect(...), and it.scoped(...) with it.effect(...).
 
 - `index.scopedLive` -> `@effect/vitest#live`: V4 live tests are scoped automatically. Replace scopedLive(...) with live(...), and it.scopedLive(...) with it.live(...).
 
 - `index.should` -> `vitest#should`: This was a Vitest re-export, not Effect API. Import it directly from vitest; @effect/vitest/index is not a valid v4 route.
 
+- `index.test` -> `vitest#test`: Vitest 5 removes test.sequential and sequential options. Pass { concurrent: false } to opt out of inherited concurrency.
+
 ### `@effect/vitest/utils`
 
 - `utils.assertFailure` -> `assertExitFailure`: For v3 Exit values, rename to assertExitFailure. In v4, assertFailure instead asserts Result.Failure.
@@ -8494,7 +8672,7 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `DurableDeferred.failCause` -> `effect/unstable/workflow/DurableDeferred#failCause`: Moved into core Effect and now requires the error schema encoding services.
 
-- `DurableDeferred.into` -> `effect/unstable/workflow/DurableDeferred#into`: Moved into core Effect with the same exit recording and suspension propagation behavior.
+- `DurableDeferred.into` -> `effect/unstable/workflow/DurableDeferred#into`: Moved into core Effect with the same exit recording and suspension propagation behavior. Provide both decoding and encoding services for the success and error schemas; recording the exit requires encoding services.
 
 - `DurableDeferred.make` -> `effect/unstable/workflow/DurableDeferred#make`: Moved into core Effect with the same name and optional schemas, expressed through v4 Schema.Constraint.
 
@@ -8516,8 +8694,6 @@ effect/unstable/rpc/Utils (barrel: effect/unstable/rpc)
 
 - `Workflow.CaptureDefects` -> `effect/unstable/workflow/Workflow#CaptureDefects`: Moved into core Effect and changed from a Context.Tag subclass to a Context.Reference value with the same true default.
 
-- `Workflow.Complete`: TODO: needs guidance
-
 - `Workflow.Execution` -> `effect/unstable/workflow/Workflow#Execution`: Moved into core Effect; its workflow discriminator changed from name to \_tag.
 
 - `Workflow.Requirements` -> `Workflow.RequirementsClient / Workflow.RequirementsHandler`: The schema Context union split by direction: client payload encoding and result decoding versus handler payload decoding and result encoding.
@@ -8998,9 +9174,9 @@ Arbitrary.schema(schema)
 
 - `Channel.repeated` -> `Channel.forever`: Use forever for infinite repetition. Channel.repeat takes a Schedule and may terminate, so it is not equivalent.
 
-- `Channel.run` -> `Channel.runDone`: Renamed to runDone for an inputless, outputless channel. Use runDrain if emitted elements should be discarded.
+- `Channel.run` -> `Channel.runDrain`: Use runDrain to consume all emitted elements and return the channel's done value.
 
-- `Channel.runScoped` -> `Channel.toPull`: No direct scoped runner remains. Use toPull in the caller scope and recover Cause.Done; use runDone or runDrain when an internally managed scope is acceptable.
+- `Channel.runScoped` -> `Channel.toPull`: No direct scoped runner remains. Use toPull in the caller scope and recover Cause.Done; use runDrain when an internally managed scope is acceptable.
 
 - `Channel.scopedWith` -> `Channel.unwrap`: Use Channel.unwrap(Effect.map(Effect.scope, (scope) =\> Channel.fromEffect(f(scope)))) so the effect uses the active channel scope.
 
@@ -9900,7 +10076,7 @@ Arbitrary.schema(schema)
 
 - `Effect.transposeMapOption` -> `Option.match`: Return `Effect.succeedNone` for None and map the Effect result to Some. Adapt arguments and imports to the v4 API.
 
-- `Effect.try` -> `Effect.try`: Still exported in v4; update call sites for the revised signature, options, and channel inference.
+- `Effect.try` -> `Effect.try`: Use the callback overload for Cause.UnknownError, or the object overload with try and catch to map failures to a custom error. The callback-only overload does not accept a custom error type parameter.
 
 - `Effect.tryMap` -> `Effect.flatMap + Effect.try`: FlatMap the source value into the v4 synchronous try constructor. Adapt arguments and imports to the v4 API.
 
@@ -9990,7 +10166,7 @@ Arbitrary.schema(schema)
 
 - `Effectable.ChannelTypeId` -> `Channel.TypeId`: The public channel brand moved to its owning module; v4 uses a string TypeId rather than the v3 Symbol.
 
-- `Effectable.Class` -> `Effectable.Class`: Still available; replace commit() with an override property or getter returning the Effect.
+- `Effectable.Class` -> `Effectable.Class`: Still available; replace commit() with an asEffect() method returning the Effect. The intermediate v4 override property/getter is no longer supported.
 
 - `Effectable.CommitPrimitive` -> `new<A, E = never, R = never>() => Effect.Effect<A, E, R>`: The named constructor interface was removed; inline the constructor type when needed.
 
@@ -10004,7 +10180,7 @@ Arbitrary.schema(schema)
 
 - `Effectable.StreamTypeId` -> `Stream.TypeId`: The public stream brand moved to its owning module; v4 uses a string TypeId rather than the v3 Symbol.
 
-- `Effectable.StructuralClass` -> `Effectable.Class`: Use Class and migrate commit() to override; v4 equality is structural by default.
+- `Effectable.StructuralClass` -> `Effectable.Class`: Use Class and migrate commit() to asEffect(); v4 equality is structural by default.
 
 - `Effectable.StructuralCommitPrototype` -> `Effectable.Prototype`: Use Prototype with evaluate; a separate structural prototype is unnecessary because v4 equality is structural by default.
 
@@ -10366,6 +10542,8 @@ Arbitrary.schema(schema)
 
 - `FastCheck.ShuffledSubarrayConstraints`: TODO: needs guidance
 
+- `FastCheck.Size`: TODO: needs guidance
+
 - `FastCheck.SizeForArbitrary`: TODO: needs guidance
 
 - `FastCheck.SparseArrayConstraints`: TODO: needs guidance
@@ -11148,9 +11326,9 @@ FastCheck.uuid({ version: 4 })
 
 - `Graph.Graph` -> `Graph.Graph`: The immutable type remains, but storage is opaque; replace field access with Graph nodes, edges, count, lookup, neighbor, and acyclicity APIs.
 
-- `Graph.MutableGraph` -> `Graph.MutableGraph`: The mutable type remains but no longer extends Graph.Proto; obtain it through Graph.mutate or Graph.beginMutation and use public mutation/query functions.
+- `Graph.MutableGraph` -> `Graph.MutableGraph`: The mutable type remains but no longer shares a public base interface with immutable Graph; obtain it through Graph.mutate or Graph.beginMutation and use public mutation/query functions.
 
-- `Graph.Proto` -> `Graph.Proto`: The name remains as the opaque immutable graph protocol; it no longer exposes storage and is no longer the base of MutableGraph.
+- `Graph.Proto` -> `none`: The common graph protocol was removed. Use Graph.Graph or Graph.MutableGraph as appropriate and replace storage-field access with public graph query and mutation functions.
 
 - `Graph.SearchConfig` -> `Graph.SearchConfig`: The type remains; direction is now Graph.TraversalDirection and also accepts undirected, while radius limits traversal depth.
 
@@ -11295,7 +11473,7 @@ stream.pipe(
 
 **Replacement:** `Schema.toJsonSchemaDocument`
 
-Wrap a low-level AST with Schema.make, then generate a document; v4 generation targets draft 2020-12.
+Wrap a low-level AST with Schema.make, then generate a draft 2020-12 document. Generation defaults to onExcessProperty: 'ignore'; use 'error' for closed objects. JSON Schema validation is approximate and does not replace Effect decoding.
 
 **Example**
 
@@ -11307,7 +11485,7 @@ Schema.toJsonSchemaDocument(Schema.make(ast))
 
 **Replacement:** `Schema.toJsonSchemaDocument`
 
-Generate draft 2020-12, then call JsonSchema.toDocumentDraft07 when draft-07 output is required.
+Generate draft 2020-12, then call JsonSchema.toDocumentDraft07 when draft-07 output is required. Generation now defaults to onExcessProperty: 'ignore'; pass 'error' to retain closed-object output, and use the same option when decoding to reject excess properties. The earlier v4 additionalProperties generation option was removed. JSON Schema validation is approximate and does not replace Effect decoding.
 
 **Example**
 
@@ -11449,7 +11627,7 @@ JsonSchema.toDocumentDraft07(Schema.toJsonSchemaDocument(schema))
 
 - `Layer.setVersionMismatchErrorLogLevel` -> `none`: No version-mismatch log-level Reference or public replacement exists.
 
-- `Layer.tapErrorCause` -> `Layer.tapCause`: The cause observer was renamed.
+- `Layer.tapErrorCause` -> `Layer.tapCause`: The cause observer was renamed. Its callback must accept the source layer's full error cause; a callback narrowed to only part of the error union is rejected.
 
 - `Layer.toRuntime` -> `Layer.build(self), then Effect.runForkWith, Effect.runPromiseWith, or Effect.runSyncWith`: Runtime\<R\> was removed; build a Context, or use ManagedRuntime.make for a reusable managed runner.
 
@@ -11467,7 +11645,7 @@ JsonSchema.toDocumentDraft07(Schema.toJsonSchemaDocument(schema))
 
 - `LayerMap.LayerMap` -> `LayerMap.LayerMap`: The type remains; runtime(key) became contextEffect(key) and returns Context.
 
-- `LayerMap.Service` -> `LayerMap.Service`: Use layer instead of Default, layerNoDeps instead of DefaultWithoutDependencies, and contextEffect instead of runtime.
+- `LayerMap.Service` -> `LayerMap.Service`: Use layer instead of Default, layerNoDeps instead of DefaultWithoutDependencies, and contextEffect instead of runtime. Preloading does not remove acquisition errors from later lookups, which can reacquire expired or invalidated entries.
 
 - `LayerMap.Service.Context` -> `LayerMap.Service.Services<Options>`: The input-services extractor was renamed.
 
@@ -11645,7 +11823,7 @@ JsonSchema.toDocumentDraft07(Schema.toJsonSchemaDocument(schema))
 
 - `Logger.pretty` -> `Logger.layer([Logger.consolePretty(), Logger.tracerLogger])`: Logger.layer replaces the active set; include tracerLogger to preserve v3 built-in layer behavior.
 
-- `Logger.prettyLogger` -> `Logger.consolePretty`: Direct constructor rename; call it with the same options.
+- `Logger.prettyLogger` -> `Logger.consolePretty`: Renamed to consolePretty. Remove the stderr option; provide Logger.LogToStderr with true to route TTY output to console.error. Colors, formatDate, and mode remain constructor options.
 
 - `Logger.prettyLoggerDefault` -> `Logger.consolePretty()`: The prebuilt singleton became a constructor call.
 
@@ -11673,7 +11851,7 @@ JsonSchema.toDocumentDraft07(Schema.toJsonSchemaDocument(schema))
 
 - `Logger.withMinimumLogLevel` -> `Effect.provideService(effect, References.MinimumLogLevel, level)`: Replace the FiberRef-local helper with reference provisioning.
 
-- `Logger.withSpanAnnotations` -> `custom Logger.make wrapper using options.fiber.currentSpan`: No transparent generic equivalent remains. Read span identity from options.fiber.currentSpan and add it to custom output as needed.
+- `Logger.withSpanAnnotations` -> `custom Logger.make wrapper using options.fiber.cache.span`: No transparent generic equivalent remains. Read span identity from options.fiber.cache.span and add it to custom output as needed.
 
 - `Logger.zip` -> `Logger.make(options => [left.log(options), right.log(options)])`: No named combinator remains; invoke both loggers and return their output tuple.
 
@@ -12661,7 +12839,9 @@ SchemaIssue.makeFormatterStandardSchemaV1()(error.issue).issues
 
 - `ParseResult.ArrayFormatterIssue` -> `StandardSchemaV1.FailureResult["issues"][number]`: Use the Standard Schema issue shape returned by makeFormatterStandardSchemaV1.
 
-- `ParseResult.DeclarationDecodeUnknown` -> `SchemaGetter.Getter`: Custom declaration decoding now uses SchemaGetter values and Schema.declare annotations.
+- `ParseResult.Composite` -> `SchemaIssue.Composite`: Composite parse failures moved to SchemaIssue. The v4 constructor takes the failing AST and an array of nested issues; input is retained only when reportInput is enabled.
+
+- `ParseResult.DeclarationDecodeUnknown` -> `SchemaGetter.Getter`: Custom declaration decoding now uses SchemaGetter values and Schema.declare annotations. Getter is a tagged union, not a constructor; use transformOptionalEffect for an Option-to-Effect decoder. Use standalone SchemaGetter.run, map, and compose instead of instance methods.
 
 - `ParseResult.DecodeUnknown` -> `Schema.decodeUnknownEffect`: Use the function type returned by Schema.decodeUnknownEffect.
 
@@ -12677,10 +12857,14 @@ SchemaIssue.makeFormatterStandardSchemaV1()(error.issue).issues
 
 - `ParseResult.ParseResultFormatter` -> `SchemaIssue.Formatter`: Issue formatter types moved to SchemaIssue.
 
+- `ParseResult.Pointer` -> `SchemaIssue.Pointer`: Path-qualified failures moved to SchemaIssue. Construct them with the property path and nested issue; rejected input belongs to the nested issue when reportInput is enabled.
+
 - `ParseResult.Refinement` -> `SchemaIssue.Filter`: Refinement failures are represented as filter issues in v4.
 
 - `ParseResult.SingleOrNonEmpty` -> `ReadonlyArray`: This ParseResult helper type was removed; use an explicit value-or-non-empty-array type when still needed.
 
+- `ParseResult.Transformation` -> `SchemaIssue.Encoding`: Transformation-stage failures are Encoding issues in v4. They retain the failing AST and nested issue; the old Encoded, Transformation, and Type kind discriminator was removed.
+
 #### `ParseResult.TreeFormatter`
 
 **Replacement:** `SchemaIssue.defaultFormatter`
@@ -13889,7 +14073,7 @@ Schema.toFormatter(schema)
 
 - `Schema.Annotations.Doc` -> `none`: The v3 helper/protocol type was removed by the v4 Schema model rewrite. Use the public v4 constructor and infer its result types instead.
 
-- `Schema.Annotations.Filter` -> `Schema.Annotations.Filter`: The API remains public in v4, but its type/value declaration was consolidated; use the v4 declaration and update inferred types/signature as needed.
+- `Schema.Annotations.Filter` -> `Schema.Annotations.Filter`: Use the v4 filter annotation shape. arbitraryConstraint uses Schema.Annotations.ToArbitrary.FilterConstraint; the earlier v4 ToArbitrary.Constraint name was removed.
 
 - `Schema.Annotations.GenericSchema` -> `none`: The v3 helper/protocol type was removed by the v4 Schema model rewrite. Use the public v4 constructor and infer its result types instead.
 
@@ -14009,7 +14193,7 @@ Schema.toFormatter(schema)
 
 - `Schema.EndsWithSchemaId` -> `none`: The v3 schema-id symbol was removed. Use the corresponding public v4 constructor/check instead of inspecting schema ids.
 
-- `Schema.Enums` -> `Schema.Enum`: Rename the enum constructor and pass the enum object.
+- `Schema.Enums` -> `Schema.Enum`: Rename the enum constructor and pass the enum object. Numeric members must be finite; NaN and positive or negative Infinity throw at construction.
 
 - `Schema.EnumsDefinition` -> `none`: Compared the v3 declaration with v4 Schema and the schema migration guide; no direct public replacement remains. Rebuild the behavior from public v4 codecs/getters where still required.
 
@@ -14377,9 +14561,9 @@ Schema.toFormatter(schema)
 
 - `Schema.TaggedStruct` -> `Schema.TaggedStruct`: The API remains public in v4, but its type/value declaration was consolidated; use the v4 declaration and update inferred types/signature as needed.
 
-- `Schema.TemplateLiteral` -> `Schema.TemplateLiteral(parts)`: Pass template literal parts as one array.
+- `Schema.TemplateLiteral` -> `Schema.TemplateLiteral(parts)`: Pass template literal parts as one array. Parts must not contain encodings, including inside unions and nested templates. Transformations whose decoded and encoded types are equal are also rejected. Use Schema.TemplateLiteralParser(parts) for transformed parts.
 
-- `Schema.TemplateLiteralParser` -> `Schema.TemplateLiteralParser(schema.parts)`: Create the template schema first and pass its `parts` property.
+- `Schema.TemplateLiteralParser` -> `Schema.TemplateLiteralParser(parts)`: Pass template literal parts directly as one array. Transformed parts are supported, and their decoding and encoding services are required in the corresponding direction.
 
 - `Schema.TimeZone` -> `Schema.TimeZoneFromString`: Use the string codec; v4 `TimeZone` is the self schema.
 
@@ -14453,7 +14637,7 @@ Schema.toFormatter(schema)
 
 - `Schema.Union` -> `Schema.Union(members)`: Pass union members as one array.
 
-- `Schema.UniqueSymbolFromSelf` -> `Schema.UniqueSymbol`: Use the v4 unique-symbol schema constructor.
+- `Schema.UniqueSymbolFromSelf` -> `Schema.UniqueSymbol`: Use the v4 unique-symbol schema constructor. JSON encoding is available only for globally registered symbols and uses the exact String(symbol) value; local symbols cannot be encoded as JSON.
 
 - `Schema.Unknown` -> `Schema.Unknown`: The API remains public in v4, but its type/value declaration was consolidated; use the v4 declaration and update inferred types/signature as needed.
 
@@ -14655,7 +14839,7 @@ Schema.toFormatter(schema)
 
 - `Schema.minLength` -> `Schema.isMinLength`: Rename the string predicate to `isMinLength` and apply it with `Schema.check` or a schema's `check` method.
 
-- `Schema.multipleOf` -> `Schema.isMultipleOf`: Rename the predicate to `isMultipleOf` and apply it with `Schema.check` or a schema's `check` method.
+- `Schema.multipleOf` -> `Schema.isMultipleOf`: Rename the predicate to `isMultipleOf` and apply it with `Schema.check` or a schema's `check` method. The divisor must be finite and nonzero or construction throws RangeError; negative divisors are normalized to their absolute value.
 
 - `Schema.mutable` -> `Schema.mutable`: The API remains public in v4, but its type/value declaration was consolidated; use the v4 declaration and update inferred types/signature as needed.
 
@@ -14755,7 +14939,7 @@ Schema.toFormatter(schema)
 
 - `Schema.transformLiterals` -> `Schema.Literals(fromValues).transform(toValues)`: Split the pairs into parallel arrays and use `Literals(...).transform(...)`.
 
-- `Schema.transformOrFail` -> `schema.pipe(Schema.decodeTo(target, { decode: SchemaGetter.transformOrFail(...), encode: ... }))`: Replace the constructor with `decodeTo` and fallible `SchemaGetter` transformations.
+- `Schema.transformOrFail` -> `schema.pipe(Schema.decodeTo(target, { decode: SchemaGetter.transformEffect(...), encode: ... }))`: Replace the constructor with `decodeTo` and effectful `SchemaGetter` transformations.
 
 - `Schema.trimmed` -> `Schema.isTrimmed`: Rename the string predicate to `isTrimmed` and apply it with `Schema.check` or a schema's `check` method.
 
@@ -14783,13 +14967,13 @@ Schema.toFormatter(schema)
 
 - `SchemaAST.AST` -> `SchemaAST.AST`: The name remains, but its constructor and fields changed in the v4 Base/check/context/encoding model.
 
-- `SchemaAST.Annotated` -> `SchemaAST.Base`: All v4 AST nodes extend Base, which owns annotations, checks, encoding, and context.
+- `SchemaAST.Annotated` -> `SchemaAST.AST`: The public base type was removed. Use the AST union; every variant still exposes annotations, checks, encoding, and context.
 
 - `SchemaAST.AnyKeyword` -> `SchemaAST.Any`: The v4 SchemaAST redesign renamed this primitive, collection, or guard while preserving its role.
 
 - `SchemaAST.ArbitraryAnnotationId` -> `Schema.Annotations.ToArbitrary`: Symbol annotation IDs were removed. Declarations use the toCodecArbitrary annotation; filters use arbitraryConstraint.
 
-- `SchemaAST.BatchingAnnotation` -> `none`: Per-schema batching annotations were removed; control asynchronous parsing with ParseOptions.concurrency.
+- `SchemaAST.BatchingAnnotation` -> `none`: Per-schema batching annotations were removed. They have no direct replacement. ParseOptions.concurrency controls product child parsing only; configure request batching separately.
 
 - `SchemaAST.BatchingAnnotationId` -> `none`: Symbol annotation IDs were removed and batching is no longer a schema annotation.
 
@@ -14805,9 +14989,9 @@ Schema.toFormatter(schema)
 
 - `SchemaAST.ComposeTransformation` -> `SchemaAST.Encoding`: The marker transformation was replaced by explicit SchemaAST.Link encoding chains.
 
-- `SchemaAST.ConcurrencyAnnotation` -> `SchemaAST.ParseOptions["concurrency"]`: Concurrency is now a parse option rather than its own annotation type.
+- `SchemaAST.ConcurrencyAnnotation` -> `SchemaAST.ParseOptions`: Per-schema concurrency annotations were removed. Pass concurrency in runtime ParseOptions when creating or calling a decoder, encoder, or constructor. It applies independently to each tuple, array, struct, record, or struct-with-rest node and does not make Union candidates concurrent.
 
-- `SchemaAST.ConcurrencyAnnotationId` -> `Schema.Annotations.Bottom["parseOptions"]`: Symbol annotation IDs were removed; put concurrency inside the parseOptions annotation.
+- `SchemaAST.ConcurrencyAnnotationId` -> `SchemaAST.ParseOptions`: The annotation ID was removed. Pass concurrency in runtime ParseOptions; product parsing follows Effect.forEach concurrency semantics while Union candidates remain sequential.
 
 - `SchemaAST.Declaration` -> `SchemaAST.Declaration`: The name remains, but its constructor and fields changed in the v4 Base/check/context/encoding model.
 
@@ -14827,7 +15011,7 @@ Schema.toFormatter(schema)
 
 - `SchemaAST.DocumentationAnnotationId` -> `Schema.Annotations.Augment["documentation"]`: Symbol annotation IDs were removed; use the documentation key.
 
-- `SchemaAST.Enums` -> `SchemaAST.Enum`: The v4 SchemaAST redesign renamed this primitive, collection, or guard while preserving its role.
+- `SchemaAST.Enums` -> `SchemaAST.Enum`: Renamed to Enum in the v4 AST model. Numeric enum members must be finite; NaN and positive or negative Infinity throw at construction.
 
 - `SchemaAST.EquivalenceAnnotation` -> `Schema.Annotations.ToEquivalence.Declaration`: Equivalence derivation annotations now use the toEquivalence key in Schema.Annotations.
 
@@ -14883,9 +15067,9 @@ Schema.toFormatter(schema)
 
 - `SchemaAST.ParseJsonSchemaId` -> `Schema.UnknownFromJsonString`: Use the built-in JSON string codec instead of checking the old schema ID.
 
-- `SchemaAST.ParseOptions` -> `SchemaAST.ParseOptions`: The name remains, but its constructor and fields changed in the v4 Base/check/context/encoding model.
+- `SchemaAST.ParseOptions` -> `SchemaAST.ParseOptions`: Pass parsing options at runtime. onExcessProperty supports ignore or error, not preserve; model extra values with an explicit Record or StructWithRest. propertyOrder was removed. concurrency follows Effect.forEach semantics for tuple, array, struct, record, and struct-with-rest children, applies independently at each nested product, and does not make Union candidates concurrent. Output key order is unspecified, including in values passed to checks. Handle required presentation or serialization order explicitly outside the parser.
 
-- `SchemaAST.ParseOptionsAnnotationId` -> `Schema.Annotations.Bottom["parseOptions"]`: Symbol annotation IDs were removed; use the parseOptions key.
+- `SchemaAST.ParseOptionsAnnotationId` -> `none`: Parse options are no longer schema annotations. Pass options when creating or calling a decoder or encoder; there is no annotation-based override for nested schemas.
 
 - `SchemaAST.PrettyAnnotationId` -> `Schema.overrideToFormatter`: The symbol annotation was removed; attach custom formatters with Schema.overrideToFormatter.
 
@@ -14909,7 +15093,7 @@ Schema.toFormatter(schema)
 
 - `SchemaAST.SymbolKeyword` -> `SchemaAST.Symbol`: The v4 SchemaAST redesign renamed this primitive, collection, or guard while preserving its role.
 
-- `SchemaAST.TemplateLiteral` -> `SchemaAST.TemplateLiteral`: The name remains, but its constructor and fields changed in the v4 Base/check/context/encoding model.
+- `SchemaAST.TemplateLiteral` -> `SchemaAST.TemplateLiteral`: The name remains, but its constructor and fields changed in the v4 Base/check/context/encoding model. Parts must not contain encodings, including inside unions or nested templates; use Schema.TemplateLiteralParser for transformed parts.
 
 - `SchemaAST.TemplateLiteralSpan` -> `SchemaAST.TemplateLiteral`: Template literal parts are represented directly as AST values in v4.
 
@@ -14921,7 +15105,7 @@ Schema.toFormatter(schema)
 
 - `SchemaAST.TransformationKind` -> `SchemaTransformation.Transformation`: Transformation implementations moved to SchemaTransformation and are stored on SchemaAST.Link.
 
-- `SchemaAST.TupleType` -> `SchemaAST.Arrays`: The v4 SchemaAST redesign renamed this primitive, collection, or guard while preserving its role.
+- `SchemaAST.TupleType` -> `SchemaAST.Arrays`: Use Arrays(isMutable, elements, rest, annotations?, checks?, encoding?, context?, encodingChecks?).
 
 - `SchemaAST.Type` -> `SchemaAST.AST`: The tuple-element Type wrapper was removed; optionality and mutability moved to Context.
 
@@ -14929,13 +15113,13 @@ Schema.toFormatter(schema)
 
 - `SchemaAST.TypeConstructorAnnotationId` -> `Schema.Annotations.Declaration["toCodec"]`: Symbol annotation IDs were removed; use declaration codec annotation keys.
 
-- `SchemaAST.TypeLiteral` -> `SchemaAST.Objects`: The v4 SchemaAST redesign renamed this primitive, collection, or guard while preserving its role.
+- `SchemaAST.TypeLiteral` -> `SchemaAST.Objects`: Use Objects(propertySignatures, indexSignatures, annotations?, checks?, encoding?, context?, encodingChecks?). Output key order is unspecified.
 
 - `SchemaAST.TypeLiteralTransformation` -> `SchemaAST.Encoding`: Object transformations are encoding links; use Schema.encodeKeys for key mappings.
 
 - `SchemaAST.UndefinedKeyword` -> `SchemaAST.Undefined`: The v4 SchemaAST redesign renamed this primitive, collection, or guard while preserving its role.
 
-- `SchemaAST.Union` -> `SchemaAST.Union`: The name remains, but its constructor and fields changed in the v4 Base/check/context/encoding model.
+- `SchemaAST.Union` -> `SchemaAST.Union`: Pass member ASTs and an optional options object: new SchemaAST.Union(types, { mode: 'oneOf' }). Read options?.mode ?? 'anyOf' instead of a direct mode field.
 
 - `SchemaAST.UniqueSymbol` -> `SchemaAST.UniqueSymbol`: The name remains, but its constructor and fields changed in the v4 Base/check/context/encoding model.
 
@@ -14961,13 +15145,13 @@ Schema.toFormatter(schema)
 
 - `SchemaAST.getAnnotation` -> `SchemaAST.resolveAt`: Resolve string-keyed annotations with resolveAt, or use resolveIdentifier, resolveTitle, and resolveDescription.
 
-- `SchemaAST.getBatchingAnnotation` -> `none`: Batching annotations were removed; read ParseOptions.concurrency when controlling asynchronous parsing.
+- `SchemaAST.getBatchingAnnotation` -> `none`: Batching annotations were removed. ParseOptions.concurrency controls product child parsing only; configure request batching separately.
 
 - `SchemaAST.getBrandAnnotation` -> `SchemaAST.resolveAt("brands")`: Resolve the string-keyed brands annotation.
 
 - `SchemaAST.getCompiler` -> `none`: The Match-based compiler was removed; traverse SchemaAST.AST directly or use the relevant Schema derivation API.
 
-- `SchemaAST.getConcurrencyAnnotation` -> `SchemaAST.resolveAt("parseOptions")`: Resolve parseOptions and read concurrency from it.
+- `SchemaAST.getConcurrencyAnnotation` -> `SchemaAST.ParseOptions`: Concurrency is no longer read from schema annotations. Pass it in runtime ParseOptions when creating or calling a parser. It applies to product children, not Union candidates.
 
 - `SchemaAST.getDecodingFallbackAnnotation` -> `none`: Fallbacks are encoding middleware in v4, not readable annotations; attach them with Schema.catchDecoding.
 
@@ -14993,7 +15177,7 @@ Schema.toFormatter(schema)
 
 - `SchemaAST.getParseIssueTitleAnnotation` -> `none`: Issue-title callbacks were removed; use message or expected annotations and SchemaIssue formatters.
 
-- `SchemaAST.getParseOptionsAnnotation` -> `SchemaAST.resolveAt("parseOptions")`: Resolve the string-keyed parseOptions annotation.
+- `SchemaAST.getParseOptionsAnnotation` -> `none`: Parse options are no longer schema annotations. Pass options when creating or calling a decoder or encoder; there is no annotation-based override for nested schemas.
 
 - `SchemaAST.getPropertySignatures` -> `SchemaAST.Objects.propertySignatures`: Narrow to Objects and read propertySignatures directly.
 
@@ -15061,6 +15245,8 @@ Schema.toFormatter(schema)
 
 - `SchemaAST.partial` -> `Schema.mapFields + Struct.map(Schema.optional)`: Partial object transforms moved to schema field transforms.
 
+- `SchemaAST.pick` -> `none`: The low-level AST picker was removed. Keep field selection at the Schema.Struct level with mapFields and Struct.pick, or discriminate and rebuild custom AST nodes explicitly.
+
 - `SchemaAST.required` -> `Schema.mapFields + Struct.map(Schema.requiredKey)`: Required object transforms moved to schema field transforms.
 
 - `SchemaAST.stringKeyword` -> `SchemaAST.string`: The v4 SchemaAST redesign renamed this primitive, collection, or guard while preserving its role.
@@ -15123,6 +15309,8 @@ Schema.toFormatter(schema)
 
 - `Secret.fromIterable` -> `Redacted.make(Array.from(iterable).join(""))`: Secret was removed; join the character iterable and wrap the resulting string in Redacted.
 
+- `Secret.fromString`: TODO: needs guidance
+
 - `Secret.isSecret` -> `Redacted.isRedacted`: Secret was removed in favor of Redacted.
 
 - `Secret.make` -> `Redacted.make(bytes.map((byte) => String.fromCharCode(byte)).join(""))`: Secret was removed; preserve the v3 byte-to-code-unit conversion explicitly, then wrap the string in Redacted.
@@ -15363,6 +15551,8 @@ Schema.toFormatter(schema)
 
 - `SortedSet.some` -> `HashSet.some`: Run the predicate against the replacement HashSet; sort first only if traversal order has observable effects.
 
+- `SortedSet.toggle` -> `HashSet.has + HashSet.add / HashSet.remove`: HashSet has no toggle; branch on membership and add or remove the element.
+
 - `SortedSet.union` -> `HashSet.union + HashSet.fromIterable`: Convert the old general iterable argument to HashSet before taking the union.
 
 - `SortedSet.values` -> `Array.sort`: Sort the replacement HashSet with the retained Order and iterate the resulting array.
@@ -15389,7 +15579,7 @@ Schema.toFormatter(schema)
 
 - `Stream.aggregateWithinEither` -> `Stream.aggregateWithin`: Either-emitting variant removed; v4 aggregateWithin(sink, schedule) emits only the sink outputs B (schedule outputs are no longer surfaced as Either.right).
 
-- `Stream.as` -> `Stream.map(() => value)`: Stream.as was removed; replace each element with a constant via Stream.map.
+- `Stream.as` -> `Stream.as`: Retained in v4 with the same signature; replaces every element with the provided constant value.
 
 - `Stream.async` -> `Stream.callback`: Stream.callback((queue) =\> Effect | void, { bufferSize?, strategy? }) replaces the Emit-based async; push with Queue.offer/offerAll, end with Queue.end, fail with Queue.fail.
 
@@ -15399,6 +15589,10 @@ Schema.toFormatter(schema)
 
 - `Stream.asyncScoped` -> `Stream.callback`: Stream.callback's register effect may use Scope (Scope is excluded from the resulting R), replacing asyncScoped; the Option\<E\> end signal becomes Queue.end.
 
+- `Stream.bind` -> `Stream.bind`: The input must be a record. Start from Stream.Do or use Stream.bindTo(name) to wrap a non-record element. The field name may now re-bind an existing key; the resulting record type is Simplify\<Omit\<A, N\> & Record\<N, B\>\>.
+
+- `Stream.bindEffect` -> `Stream.bindEffect`: The input must be a record. Start from Stream.Do or use Stream.bindTo(name) to wrap a non-record element. Existing keys may be re-bound, with the new value replacing the old field type. The callback still returns an Effect.
+
 #### `Stream.branchAfter`
 
 **Replacement:** `Stream.peel`
@@ -15427,6 +15621,8 @@ Stream.unwrap(Effect.map(Stream.peel(self, Sink.take(n)), ([head, rest]) => f(he
 
 - `Stream.catchSomeCause` -> `Stream.catchCauseFilter`: Option-returning cause handler replaced by Stream.catchCauseFilter(filter, f, orElse?) using a Filter on the Cause (Stream.catchCauseIf for refinements).
 
+- `Stream.catchTags` -> `Stream.catchTags`: Only keys present in the tagged error union are accepted; remove handlers for tags the stream cannot fail with. Untagged errors remain in the error channel.
+
 - `Stream.chunksWith` -> `Stream.flattenArray(f(Stream.chunks(self)))`: No dedicated combinator; expose chunk structure with Stream.chunks (Stream\<NonEmptyReadonlyArray\<A\>\>), transform, then re-flatten with Stream.flattenArray.
 
 - `Stream.combineChunks` -> `Stream.combineArray`: Chunk-\>Array rename of the pull-level combining primitive; pulls now yield NonEmptyReadonlyArray values and halt via Cause.Done-failing Pull effects instead of Option-typed errors.
@@ -15501,6 +15697,10 @@ Stream.unwrap(Effect.map(Stream.peel(self, Sink.take(n)), ([head, rest]) => f(he
 
 - `Stream.interruptWhenDeferred` -> `Stream.interruptWhen(Deferred.await(deferred))`: Deferred-specialized variant removed; pass Deferred.await to Stream.interruptWhen (a Deferred failure surfaces as the stream's failure, as before).
 
+- `Stream.let` -> `Stream.let`: Retained in v4 and aligned with Effect.let: the field name may re-bind an existing key (the computed value replaces it) and the record type is Simplify\<Omit\<A, N\> & Record\<N, B\>\>.
+
+- `Stream.mapBoth` -> `Stream.mapBoth`: Rename the options onSuccess to onElement and onFailure to onError. The callbacks still transform emitted elements and typed errors respectively.
+
 - `Stream.mapChunks` -> `Stream.mapArray`: Chunk-\>Array rename; transforms each emitted chunk as a NonEmptyReadonlyArray.
 
 - `Stream.mapChunksEffect` -> `Stream.mapArrayEffect`: Chunk-\>Array rename of the effectful per-chunk transform.
@@ -15553,6 +15753,8 @@ Stream.mergeAll(Object.entries(streams).map(([_tag, s]) => Stream.map(s, (value)
 
 - `Stream.paginateEffect` -> `Stream.paginate`: v4 Stream.paginate emits a batch per step; wrap the single value in an array: `(s) => Effect.map(step(s), ([a, next]) => [[a], next])`.
 
+- `Stream.partition` -> `Stream.partition`: Pass a Result-returning Filter instead of a boolean predicate or refinement; Filter.fromPredicate(predicate) adapts existing predicates. The tuple order is now [passes, fails], the reverse of v3 [excluded, satisfying]. Rename bufferSize to capacity (default 16; also accepts "unbounded"). Acquisition is scoped and does not fail with E; the returned streams carry E.
+
 - `Stream.partitionEither` -> `Stream.partitionEffect`: Either-based split replaced by Filter.FilterEffect: the function now returns Effect\<Result\<Pass, Fail\>\> (Result.succeed/Result.fail instead of Either.right/left). Returns Effect\<[passes, fails], never, R | Scope\> — note the tuple is [passes, fails], v3 was [left, right]; options are { capacity?, concurrency? }.
 
 - `Stream.provideLayer` -> `Stream.provide`: v4 Stream.provide accepts a Layer or a Context; behavior identical.
@@ -15623,6 +15825,8 @@ Effect.suspend(() => {
 
 - `Stream.runForEachWhileScoped` -> `Stream.runForEachWhile`: Scoped run variants are gone; v4 runForEachWhile (callback returns Effect\<boolean\>) manages the stream scope internally.
 
+- `Stream.runIntoPubSub` -> `Stream.runIntoPubSub`: Pass a PubSub of plain elements rather than Take wrappers. Both overloads return Effect\<void, E, R\>, so handle stream failures on the returned Effect instead of expecting them as PubSub messages. The optional shutdownOnEnd flag controls PubSub shutdown.
+
 - `Stream.runIntoPubSubScoped` -> `Stream.runIntoPubSub`: Scoped variant removed; v4 runIntoPubSub(pubsub, { shutdownOnEnd? }) publishes plain values (the Take wrapper is gone) and does not require Scope — fork the returned effect (Effect.forkIn/Effect.forkScoped) to reproduce the background scoped behavior.
 
 - `Stream.runIntoQueueElementsScoped` -> `Stream.runIntoQueue`: The per-element Exit\<A, Option\<E\>\> encoding is gone; v4 runIntoQueue targets a Queue\<A, E | Cause.Done\> — elements are offered plainly and failure/end are signalled through the queue's error/done channel. Fork with Effect.forkIn for scoped background running.
@@ -15631,6 +15835,10 @@ Effect.suspend(() => {
 
 - `Stream.runScoped` -> `Stream.run`: Scoped variant removed; v4 Stream.run(sink) manages the stream's scope internally. For consumption tied to an enclosing Scope, use Stream.toPull and drive the Pull manually.
 
+- `Stream.scan` -> `Stream.scan`: Wrap the initial state in a thunk: Stream.scan(() =\> initial, step). The thunk is evaluated for each stream run; allocate mutable initial state inside it to avoid sharing state between runs.
+
+- `Stream.scanEffect` -> `Stream.scanEffect`: Wrap the initial state in a thunk: Stream.scanEffect(() =\> initial, step). It is evaluated for each stream run; the step still returns an Effect.
+
 - `Stream.scanReduce` -> `Stream.mapAccum`: Removed; emulate first-element-as-seed with `Stream.mapAccum(self, () => undefined as A | undefined, (acc, a) => { const next = acc === undefined ? a : f(acc, a); return [next, [next]] })`.
 
 - `Stream.scanReduceEffect` -> `Stream.mapAccumEffect`: Removed; same first-element-as-seed emulation as scanReduce but with Stream.mapAccumEffect and an effectful step.
@@ -15828,9 +16036,9 @@ switch (strategy) {
 
 ### `effect/SynchronizedRef`
 
-- `SynchronizedRef.SynchronizedRef` -> `SynchronizedRef.SynchronizedRef`: The model remains, now extends the v4 Ref model, and is read or updated through explicit SynchronizedRef operations.
+- `SynchronizedRef.SynchronizedRef` -> `SynchronizedRef.SynchronizedRef`: The model remains but no longer extends Ref; read and update it through explicit SynchronizedRef operations. The curried v4 modifySomeEffect takes only the callback, which returns an Effect of [result, Option\<newValue\>]; remove the v3 fallback and outer Option.
 
-- `SynchronizedRef.SynchronizedRef.Variance` -> `Ref.Ref.Variance`: SynchronizedRef now inherits Ref variance instead of declaring a separate public variance marker.
+- `SynchronizedRef.SynchronizedRef.Variance` -> `none`: The public nested variance marker was removed. SynchronizedRef uses an internal brand in v4, so do not refer to a variance interface directly.
 
 - `SynchronizedRef.SynchronizedRefTypeId` -> `none`: The SynchronizedRef type id is internal in v4; do not inspect or construct the brand directly.
 
@@ -15972,6 +16180,8 @@ switch (strategy) {
 
 - `TMap.removeAll` -> `TxHashMap.removeMany`: The bulk removal operation was renamed.
 
+- `TMap.set`: TODO: needs guidance
+
 - `TMap.setIfAbsent` -> `Effect.tx + TxHashMap.get/TxHashMap.set`: No direct helper remains; check and conditionally set under one outer transaction.
 
 - `TMap.size` -> `TxHashMap.size`: Import TxHashMap from "effect/TxHashMap"; the operation keeps its name. V4 Tx operations return ordinary Effects; compose multiple operations under one outer Effect.tx to keep them atomic.
diff --git a/repos/effect/package.json b/repos/effect/package.json
index e114088fd..1be138c69 100644
--- a/repos/effect/package.json
+++ b/repos/effect/package.json
@@ -22,6 +22,7 @@
     "runtimeperf": "pnpm --dir packages/effect exec node runtimeperf/run.mts",
     "runtimeperf-compare": "pnpm --dir packages/effect exec node runtimeperf/compare.mts",
     "check-recursive": "pnpm --recursive --filter \"./packages/**/*\" exec tsc -b tsconfig.json",
+    "check-dist-types": "node scripts/check-dist-types.mjs",
     "jsdocs": "effect-jsdocs",
     "lint": "oxlint -f unix && dprint check",
     "lint-fix": "oxlint --fix && dprint fmt",
@@ -33,19 +34,19 @@
     "changeset-publish": "node scripts/set-strip-internal.mjs && pnpm codemod && pnpm build && changeset publish"
   },
   "devDependencies": {
-    "@babel/cli": "^8.0.4",
-    "@babel/core": "^8.0.1",
+    "@babel/cli": "^8.0.6",
+    "@babel/core": "^8.0.6",
     "@babel/plugin-transform-export-namespace-from": "^8.0.1",
     "@babel/plugin-transform-modules-commonjs": "^8.0.1",
-    "@changesets/changelog-github": "1.0.0",
-    "@changesets/cli": "3.0.1",
+    "@changesets/changelog-github": "1.0.1",
+    "@changesets/cli": "3.0.3",
     "@effect/ai-docgen": "workspace:^",
     "@effect/bundle": "workspace:^",
     "@effect/docgen": "workspace:^",
     "@effect/doctest": "workspace:^",
     "@effect/jsdocs": "workspace:^",
     "@effect/oxc": "workspace:^",
-    "@effect/tsgo": "^0.38.0",
+    "@effect/tsgo": "^0.45.0",
     "@effect/utils": "workspace:^",
     "@effect/vitest": "workspace:^",
     "@faker-js/faker": "^10.6.0",
@@ -53,33 +54,31 @@
     "@rollup/plugin-replace": "^6.0.3",
     "@rollup/plugin-terser": "^1.0.0",
     "@types/jscodeshift": "^17.3.0",
-    "@types/node": "^26.4.0",
-    "@vitest/browser": "^4.1.11",
-    "@vitest/coverage-v8": "^4.1.11",
-    "@vitest/expect": "^4.1.11",
-    "@vitest/web-worker": "^4.1.11",
-    "ast-types": "^0.16.1",
+    "@types/node": "^26.6.2",
+    "@vitest/coverage-v8": "^5.0.1",
+    "@vitest/web-worker": "^5.0.1",
+    "ast-types": "^0.16.3",
     "babel-plugin-annotate-pure-calls": "^0.5.0",
-    "dprint": "^0.56.1",
-    "fast-check": "^4.9.0",
+    "dprint": "^0.57.4",
+    "fast-check": "^4.10.2",
     "glob": "^13.0.6",
-    "happy-dom": "^20.12.0",
+    "happy-dom": "^20.14.5",
     "jscodeshift": "^17.4.0",
     "lalph": "^0.3.139",
     "madge": "^8.0.0",
-    "oxlint": "^1.80.0",
+    "oxlint": "^1.83.0",
     "pkg-pr-new": "0.0.88",
-    "playwright": "^1.62.1",
-    "rollup": "^4.63.1",
+    "playwright": "^1.63.0",
+    "rollup": "^4.63.4",
     "rollup-plugin-bundle-stats": "^4.22.3",
     "rollup-plugin-esbuild": "^6.2.1",
     "rollup-plugin-visualizer": "^7.1.1",
     "terser": "^5.51.2",
-    "tstyche": "^7.2.3",
+    "tstyche": "^7.2.5",
     "typescript": "^7.0.2",
-    "vite": "^8.2.2",
-    "vitest": "^4.1.11",
-    "vitest-websocket-mock": "^0.7.0",
-    "zod": "^4.5.4"
+    "vite": "^8.3.0",
+    "vitest": "^5.0.1",
+    "vitest-websocket-mock": "^0.8.0",
+    "zod": "^4.6.5"
   }
 }
diff --git a/repos/effect/packages/ai/anthropic/CHANGELOG.md b/repos/effect/packages/ai/anthropic/CHANGELOG.md
index d1b848563..5750d3726 100644
--- a/repos/effect/packages/ai/anthropic/CHANGELOG.md
+++ b/repos/effect/packages/ai/anthropic/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @effect/ai-anthropic
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7758](https://github.com/Effect-TS/effect/pull/7758) [`8479f4e`](https://github.com/Effect-TS/effect/commit/8479f4e91f67209106ad34af0b665ebce2b15f1c) Thanks @kitlangton! - Preserve base64 image strings in Anthropic requests.
+
+- [#8098](https://github.com/Effect-TS/effect/pull/8098) [`ad8e9ad`](https://github.com/Effect-TS/effect/commit/ad8e9ad7aff4a4ff50886db2c48b4d136c3d5980) Thanks @tim-smart! - Exclude the provider-only `strictJsonSchema` option from Anthropic Messages request bodies while preserving its control over tool strictness.
+
+- [#8100](https://github.com/Effect-TS/effect/pull/8100) [`8f3ea0d`](https://github.com/Effect-TS/effect/commit/8f3ea0d0054cbf9f7700e82e0801b8fe4c511bc1) Thanks @tim-smart! - Fix non-native structured output generation by always requesting the response tool and excluding accompanying prose when decoding its JSON payload.
+
+- [#7588](https://github.com/Effect-TS/effect/pull/7588) [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494) Thanks @tim-smart! - Route tool call parameter validation failures through the tool's `failureMode` and drop `ToolParameterValidationError.toolParams`.
+
+- [#7805](https://github.com/Effect-TS/effect/pull/7805) [`0b93584`](https://github.com/Effect-TS/effect/commit/0b935848082dd178db8278bff52a2cd07e5bf69a) Thanks @tim-smart! - Preserve plain-text client tool results when encoding provider requests.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/ai/anthropic/package.json b/repos/effect/packages/ai/anthropic/package.json
index 6e60982cb..15d80fa28 100644
--- a/repos/effect/packages/ai/anthropic/package.json
+++ b/repos/effect/packages/ai/anthropic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/ai-anthropic",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "An Anthropic provider integration for Effect AI SDK",
diff --git a/repos/effect/packages/ai/anthropic/src/AnthropicLanguageModel.ts b/repos/effect/packages/ai/anthropic/src/AnthropicLanguageModel.ts
index 7ba02b588..52b4ddf59 100644
--- a/repos/effect/packages/ai/anthropic/src/AnthropicLanguageModel.ts
+++ b/repos/effect/packages/ai/anthropic/src/AnthropicLanguageModel.ts
@@ -20,7 +20,6 @@ import * as Predicate from "effect/Predicate"
 import * as Redactable from "effect/Redactable"
 import * as Schema from "effect/Schema"
 import * as SchemaAST from "effect/SchemaAST"
-import * as SchemaIssue from "effect/SchemaIssue"
 import * as Stream from "effect/Stream"
 import type { Span } from "effect/Tracer"
 import type { Mutable, Simplify } from "effect/Types"
@@ -40,8 +39,6 @@ import type { AnthropicTool } from "./AnthropicTool.ts"
 import type * as Generated from "./Generated.ts"
 import * as InternalUtilities from "./internal/utilities.ts"
 
-const formatIssue = SchemaIssue.makeFormatterDefault()
-
 /**
  * Known Anthropic Claude model identifiers exposed by the generated Anthropic schema.
  *
@@ -663,7 +660,7 @@ export const model = (
  *
  * **When to use**
  *
- * Use when you need to construct a `LanguageModel.Service` value backed by
+ * Use when you need to construct a `LanguageModel` value backed by
  * `AnthropicClient` inside an Effect.
  *
  * **Details**
@@ -681,7 +678,7 @@ export const model = (
 export const make = Effect.fnUntraced(function*({ model, config: providerConfig }: {
   readonly model: (string & {}) | Model
   readonly config?: Omit<typeof Config.Service, "model"> | undefined
-}): Effect.fn.Return<LanguageModel.Service, never, AnthropicClient> {
+}): Effect.fn.Return<LanguageModel.LanguageModel, never, AnthropicClient> {
   const client = yield* AnthropicClient
 
   const makeConfig: Effect.Effect<typeof Config.Service & { readonly model: string }> = Effect.contextWith((services) =>
@@ -713,8 +710,13 @@ export const make = Effect.fnUntraced(function*({ model, config: providerConfig
       if (betas.size > 0) {
         params["anthropic-beta"] = Array.from(betas).join(",")
       }
-      const { disableParallelToolCalls: _, output_config, structuredOutputs: _structuredOutputs, ...requestConfig } =
-        config
+      const {
+        disableParallelToolCalls: _,
+        output_config,
+        strictJsonSchema: _strictJsonSchema,
+        structuredOutputs: _structuredOutputs,
+        ...requestConfig
+      } = config
       const payload: Mutable<typeof Generated.BetaCreateMessageParams.Encoded> = {
         ...requestConfig,
         max_tokens: requestConfig.max_tokens ?? capabilities.maxOutputTokens,
@@ -892,7 +894,13 @@ const prepareMessages = Effect.fnUntraced(
 
                         const source = isUrlData(part.data)
                           ? { type: "url", url: getUrlString(part.data) } as const
-                          : { type: "base64", media_type: mediaType, data: Encoding.encodeBase64(part.data) } as const
+                          : {
+                            type: "base64",
+                            media_type: mediaType,
+                            data: typeof part.data === "string"
+                              ? part.data.replace(/^data:[^;]+;base64,/, "")
+                              : Encoding.encodeBase64(part.data)
+                          } as const
 
                         content.push({ type: "image", source, cache_control: cacheControl })
                       } else if (part.mediaType === "application/pdf" || part.mediaType === "text/plain") {
@@ -965,7 +973,7 @@ const prepareMessages = Effect.fnUntraced(
                   content.push({
                     type: "tool_result",
                     tool_use_id: part.id,
-                    content: JSON.stringify(part.result),
+                    content: typeof part.result === "string" ? part.result : JSON.stringify(part.result),
                     is_error: part.isFailure,
                     cache_control: cacheControl
                   })
@@ -1290,10 +1298,6 @@ const prepareTools = Effect.fnUntraced(
     readonly tools: ReadonlyArray<AnthropicUserDefinedTool | AnthropicProviderDefinedTool> | undefined
     readonly toolChoice: typeof Generated.BetaToolChoice.Encoded | undefined
   }, AiError.AiError> {
-    if (options.tools.length === 0 || options.toolChoice === "none") {
-      return { tools: undefined, toolChoice: undefined }
-    }
-
     // Return a JSON response tool when using non-native structured outputs
     if (options.responseFormat.type === "json" && !capabilities.supportsStructuredOutput) {
       const input_schema = yield* tryJsonSchema(options.responseFormat.schema, "prepareTools")
@@ -1313,6 +1317,10 @@ const prepareTools = Effect.fnUntraced(
       }
     }
 
+    if (options.tools.length === 0 || options.toolChoice === "none") {
+      return { tools: undefined, toolChoice: undefined }
+    }
+
     const userTools: Array<AnthropicUserDefinedTool> = []
     const providerTools: Array<AnthropicProviderDefinedTool> = []
 
@@ -1567,6 +1575,9 @@ const makeResponse = Effect.fnUntraced(
     const mcpToolCalls: Map<string, Response.ToolCallPartEncoded> = new Map()
     const serverToolCalls: Map<string, string> = new Map()
     const citableDocuments = extractCitableDocuments(options.prompt)
+    const responseFormat = options.responseFormat
+    const hasStructuredOutputTool = responseFormat.type === "json" &&
+      rawResponse.content.some((part) => part.type === "tool_use" && part.name === responseFormat.objectName)
 
     parts.push({
       type: "response-metadata",
@@ -1579,10 +1590,12 @@ const makeResponse = Effect.fnUntraced(
     for (const part of rawResponse.content) {
       switch (part.type) {
         case "text": {
-          // Text parts are added for both text and json response formats.
-          // For native structured output (json_schema), the JSON comes directly
-          // in a text content block. For tool-based structured output, text may
-          // also be present alongside the tool_use.
+          // The response tool supplies the JSON payload. Accompanying prose
+          // must not be concatenated with it during structured output decoding.
+          if (hasStructuredOutputTool) {
+            break
+          }
+
           parts.push({
             type: "text",
             text: part.text
@@ -1629,7 +1642,7 @@ const makeResponse = Effect.fnUntraced(
         case "tool_use": {
           // When the `"json"` response format is requested, the JSON we need
           // is returned by a tool call injected into the request
-          if (options.responseFormat.type === "json") {
+          if (responseFormat.type === "json" && part.name === responseFormat.objectName) {
             parts.push({
               type: "text",
               text: JSON.stringify(part.input)
@@ -3106,19 +3119,13 @@ const transformToolCallParams = Effect.fnUntraced(function*<Tools extends Readon
 
   const { codec } = yield* tryCodecTransform(tool.parametersSchema, "makeResponse")
 
-  const transform = Schema.decodeEffect(codec)
-
+  // Normalize valid parameters; leave invalid ones for Toolkit.
   return yield* (
-    transform(toolParams) as Effect.Effect<unknown, Schema.SchemaError>
-  ).pipe(Effect.mapError((error) =>
-    AiError.make({
-      module: "AnthropicLanguageModel",
-      method: "makeResponse",
-      reason: new AiError.ToolParameterValidationError({
-        toolName,
-        toolParams,
-        description: formatIssue(error.issue)
-      })
-    })
-  ))
+    Schema.decodeEffect(codec)(toolParams) as Effect.Effect<unknown, Schema.SchemaError>
+  ).pipe(
+    Effect.flatMap((decoded) =>
+      Schema.encodeUnknownEffect(tool.parametersSchema)(decoded) as Effect.Effect<unknown, Schema.SchemaError>
+    ),
+    Effect.orElseSucceed(() => toolParams)
+  )
 })
diff --git a/repos/effect/packages/ai/anthropic/test/AnthropicLanguageModel.test.ts b/repos/effect/packages/ai/anthropic/test/AnthropicLanguageModel.test.ts
index bd8b19023..56bab6b2d 100644
--- a/repos/effect/packages/ai/anthropic/test/AnthropicLanguageModel.test.ts
+++ b/repos/effect/packages/ai/anthropic/test/AnthropicLanguageModel.test.ts
@@ -2,6 +2,7 @@ import { AnthropicClient, AnthropicLanguageModel, AnthropicTool } from "@effect/
 import { assert, describe, it } from "@effect/vitest"
 import { Effect, Layer, Redacted, Schema, Stream } from "effect"
 import {
+  type AiError,
   AnthropicStructuredOutput,
   LanguageModel,
   Prompt,
@@ -119,6 +120,113 @@ describe("AnthropicLanguageModel", () => {
         assert.deepStrictEqual(toolCall.params, toolParams)
       }))
 
+    it.effect("routes invalid tool call params through failureMode: return without failing the stream", () =>
+      Effect.gen(function*() {
+        const layer = AnthropicClient.layer({ apiKey: Redacted.make("sk-test-key") }).pipe(
+          Layer.provide(Layer.succeed(
+            HttpClient.HttpClient,
+            makeHttpClient((request) =>
+              Effect.succeed(sseResponse(request, [
+                {
+                  type: "message_start",
+                  message: {
+                    id: "msg_test_1",
+                    type: "message",
+                    role: "assistant",
+                    model: "claude-sonnet-4-20250514",
+                    content: [],
+                    stop_reason: null,
+                    stop_sequence: null,
+                    usage: {
+                      cache_creation: null,
+                      cache_creation_input_tokens: null,
+                      cache_read_input_tokens: null,
+                      inference_geo: null,
+                      input_tokens: 10,
+                      output_tokens: 0,
+                      service_tier: null
+                    }
+                  }
+                },
+                {
+                  type: "content_block_start",
+                  index: 0,
+                  content_block: {
+                    type: "tool_use",
+                    id: "toolu_test_1",
+                    name: "GlobTool",
+                    input: {}
+                  }
+                },
+                {
+                  type: "content_block_delta",
+                  index: 0,
+                  delta: {
+                    type: "input_json_delta",
+                    partial_json: JSON.stringify({ pattern: 123 })
+                  }
+                },
+                {
+                  type: "content_block_stop",
+                  index: 0
+                },
+                {
+                  type: "message_delta",
+                  delta: {
+                    stop_reason: "tool_use",
+                    stop_sequence: null
+                  },
+                  usage: {
+                    cache_creation_input_tokens: null,
+                    cache_read_input_tokens: null,
+                    input_tokens: null,
+                    output_tokens: 5
+                  }
+                },
+                {
+                  type: "message_stop"
+                }
+              ]))
+            )
+          ))
+        )
+
+        const GlobTool = Tool.make("GlobTool", {
+          description: "Search for files",
+          failureMode: "return",
+          parameters: Schema.Struct({ pattern: Schema.String }),
+          success: Schema.String,
+          failure: Schema.String
+        })
+
+        const toolkit = Toolkit.make(GlobTool)
+        const toolkitLayer = toolkit.toLayer({
+          GlobTool: () => Effect.succeed("found.ts")
+        })
+
+        const partsChunk = yield* LanguageModel.streamText({
+          prompt: "find ts files",
+          toolkit
+        }).pipe(
+          Stream.runCollect,
+          Effect.provide(AnthropicLanguageModel.model("claude-sonnet-4-20250514")),
+          Effect.provide(toolkitLayer),
+          Effect.provide(layer)
+        )
+
+        const parts = globalThis.Array.from(partsChunk)
+        const toolResult = parts.find((part) => part.type === "tool-result")
+        assert.isDefined(toolResult)
+        if (toolResult?.type !== "tool-result") {
+          return
+        }
+
+        assert.strictEqual(toolResult.isFailure, true)
+        const failure = toolResult.result as AiError.AiError
+        assert.strictEqual(failure._tag, "AiError")
+        assert.strictEqual(failure.reason._tag, "ToolParameterValidationError")
+      }))
+
     const codeExecutionCases = [
       {
         providerName: "bash_code_execution",
@@ -329,6 +437,175 @@ describe("AnthropicLanguageModel", () => {
   })
 
   describe("generateText", () => {
+    it.effect("omits strictJsonSchema from the request while preserving tool strictness", () =>
+      Effect.gen(function*() {
+        let capturedRequest: HttpClientRequest.HttpClientRequest | undefined = undefined
+        const model = "claude-sonnet-4-5"
+        const layer = AnthropicClient.layer({ apiKey: Redacted.make("sk-test-key") }).pipe(
+          Layer.provide(Layer.succeed(
+            HttpClient.HttpClient,
+            makeHttpClient((request) => {
+              capturedRequest = request
+              return Effect.succeed(jsonResponse(request, {
+                id: "msg_test_1",
+                type: "message",
+                role: "assistant",
+                model,
+                content: [{ type: "text", text: "Hello" }],
+                stop_reason: "end_turn",
+                stop_sequence: null,
+                usage: {
+                  cache_creation: null,
+                  cache_creation_input_tokens: null,
+                  cache_read_input_tokens: null,
+                  inference_geo: null,
+                  input_tokens: 1,
+                  output_tokens: 1,
+                  service_tier: null
+                }
+              }))
+            })
+          ))
+        )
+
+        yield* LanguageModel.generateText({
+          prompt: "Hello",
+          toolkit: Toolkit.make(Tool.make("Search", {
+            parameters: Schema.Struct({ query: Schema.String }),
+            success: Schema.String
+          })),
+          disableToolCallResolution: true
+        }).pipe(
+          Effect.provide(AnthropicLanguageModel.model(model, { strictJsonSchema: false })),
+          Effect.provide(layer)
+        )
+
+        assert.isDefined(capturedRequest)
+        const body = yield* getRequestBody(capturedRequest)
+        assert.strictEqual(body.model, model)
+        assert.strictEqual(body.tools[0].name, "Search")
+        assert.strictEqual(body.tools[0].strict, false)
+        assert.notProperty(body, "strictJsonSchema")
+      }))
+
+    it.effect("preserves string tool results", () =>
+      Effect.gen(function*() {
+        let capturedRequest: HttpClientRequest.HttpClientRequest | undefined = undefined
+        const layer = AnthropicClient.layer({ apiKey: Redacted.make("sk-test-key") }).pipe(
+          Layer.provide(Layer.succeed(
+            HttpClient.HttpClient,
+            makeHttpClient((request) => {
+              capturedRequest = request
+              return Effect.succeed(jsonResponse(request, {
+                id: "msg_test_1",
+                type: "message",
+                role: "assistant",
+                model: "claude-sonnet-4-20250514",
+                content: [{ type: "text", text: "Done" }],
+                stop_reason: "end_turn",
+                stop_sequence: null,
+                usage: {
+                  cache_creation: null,
+                  cache_creation_input_tokens: null,
+                  cache_read_input_tokens: null,
+                  inference_geo: null,
+                  input_tokens: 10,
+                  output_tokens: 5,
+                  service_tier: null
+                }
+              }))
+            })
+          ))
+        )
+
+        yield* LanguageModel.generateText({
+          prompt: Prompt.make([
+            { role: "user", content: "Use the tool" },
+            {
+              role: "assistant",
+              content: [Prompt.toolCallPart({
+                id: "call_text",
+                name: "text_tool",
+                params: {},
+                providerExecuted: false
+              })]
+            },
+            {
+              role: "tool",
+              content: [Prompt.toolResultPart({
+                id: "call_text",
+                name: "text_tool",
+                result: "PLAIN_TEXT_SENTINEL\n",
+                isFailure: false,
+                providerExecuted: false
+              })]
+            }
+          ]),
+          disableToolCallResolution: true
+        }).pipe(
+          Effect.provide(AnthropicLanguageModel.model("claude-sonnet-4-20250514")),
+          Effect.provide(layer)
+        )
+
+        assert.isDefined(capturedRequest)
+        if (capturedRequest === undefined) {
+          return
+        }
+
+        const body = yield* getRequestBody(capturedRequest)
+        const toolResult = body.messages
+          .flatMap((message: any) => Array.isArray(message.content) ? message.content : [])
+          .find((block: any) => block.type === "tool_result")
+
+        assert.isDefined(toolResult)
+        assert.strictEqual(toolResult.content, "PLAIN_TEXT_SENTINEL\n")
+      }))
+
+    it.effect("preserves base64 image string payloads", () =>
+      Effect.gen(function*() {
+        const base64 = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVR4nGP4DwQACfsD/fteaysAAAAASUVORK5CYII="
+        let capturedRequest: HttpClientRequest.HttpClientRequest | undefined = undefined
+        const layer = AnthropicClient.layer({ apiKey: Redacted.make("sk-test-key") }).pipe(
+          Layer.provide(Layer.succeed(
+            HttpClient.HttpClient,
+            makeHttpClient((request) => {
+              capturedRequest = request
+              return Effect.succeed(jsonResponse(request, {
+                id: "msg_test_1",
+                type: "message",
+                role: "assistant",
+                model: "claude-sonnet-4-20250514",
+                content: [{ type: "text", text: "Done" }],
+                stop_reason: "end_turn",
+                stop_sequence: null,
+                usage: {
+                  cache_creation: null,
+                  cache_creation_input_tokens: null,
+                  cache_read_input_tokens: null,
+                  inference_geo: null,
+                  input_tokens: 1,
+                  output_tokens: 1,
+                  service_tier: null
+                }
+              }))
+            })
+          ))
+        )
+
+        yield* LanguageModel.generateText({
+          prompt: Prompt.make([Prompt.userMessage({
+            content: [Prompt.filePart({ mediaType: "image/png", data: base64 })]
+          })])
+        }).pipe(
+          Effect.provide(AnthropicLanguageModel.model("claude-sonnet-4-20250514")),
+          Effect.provide(layer)
+        )
+
+        assert.isDefined(capturedRequest)
+        const body = yield* getRequestBody(capturedRequest)
+        assert.strictEqual(body.messages[0].content[0].source.data, base64)
+      }))
+
     it.effect("encodes dynamic tools", () =>
       Effect.gen(function*() {
         let capturedRequest: HttpClientRequest.HttpClientRequest | undefined = undefined
@@ -644,6 +921,94 @@ describe("AnthropicLanguageModel", () => {
         assert.strictEqual(body.output_config?.format?.type, "json_schema")
         assert.notProperty(body, "structuredOutputs")
       }))
+
+    const summaryResponse = (request: HttpClientRequest.HttpClientRequest, content: ReadonlyArray<unknown>) =>
+      jsonResponse(request, {
+        id: "msg_summary",
+        type: "message",
+        role: "assistant",
+        model: "claude-sonnet-4-6",
+        content,
+        stop_reason: "tool_use",
+        stop_sequence: null,
+        usage: {
+          cache_creation: null,
+          cache_creation_input_tokens: null,
+          cache_read_input_tokens: null,
+          inference_geo: null,
+          input_tokens: 1,
+          output_tokens: 1,
+          service_tier: null
+        }
+      })
+
+    it.effect("forces the fallback response tool and decodes its input alongside prose", () =>
+      Effect.gen(function*() {
+        const layer = AnthropicClient.layer({ apiKey: Redacted.make("sk-test-key") }).pipe(
+          Layer.provide(Layer.succeed(
+            HttpClient.HttpClient,
+            makeHttpClient((request) =>
+              Effect.gen(function*() {
+                const body = yield* getRequestBody(request)
+                assert.deepStrictEqual(body.tools?.map((tool: { name: string }) => tool.name), ["summary"])
+                assert.deepStrictEqual(body.tool_choice, {
+                  type: "tool",
+                  name: "summary",
+                  disable_parallel_tool_use: true
+                })
+                return summaryResponse(request, [
+                  { type: "text", text: "Here is the summary." },
+                  { type: "tool_use", id: "toolu_summary", name: "summary", input: { title: "Rain" } }
+                ])
+              })
+            )
+          ))
+        )
+
+        const response = yield* LanguageModel.generateObject({
+          prompt: "Give a title for a story about rain.",
+          objectName: "summary",
+          schema: Schema.Struct({ title: Schema.String })
+        }).pipe(
+          Effect.provide(AnthropicLanguageModel.model("claude-sonnet-4-6", { structuredOutputs: false })),
+          Effect.provide(layer)
+        )
+
+        assert.deepStrictEqual(response.value, { title: "Rain" })
+      }))
+
+    it.effect("decodes native JSON alongside an ordinary tool call", () =>
+      Effect.gen(function*() {
+        const layer = AnthropicClient.layer({ apiKey: Redacted.make("sk-test-key") }).pipe(
+          Layer.provide(Layer.succeed(
+            HttpClient.HttpClient,
+            makeHttpClient((request) =>
+              Effect.succeed(summaryResponse(request, [
+                { type: "text", text: JSON.stringify({ title: "Rain" }) },
+                { type: "tool_use", id: "toolu_weather", name: "Weather", input: { city: "SF" } }
+              ]))
+            )
+          ))
+        )
+        const toolkit = Toolkit.make(Tool.make("Weather", {
+          parameters: Schema.Struct({ city: Schema.String }),
+          success: Schema.String
+        }))
+
+        const response = yield* LanguageModel.generateObject({
+          prompt: "Give a title for a story about rain.",
+          objectName: "summary",
+          schema: Schema.Struct({ title: Schema.String }),
+          toolkit
+        }).pipe(
+          Effect.provide(AnthropicLanguageModel.model("claude-sonnet-4-6")),
+          Effect.provide(toolkit.toLayer({ Weather: () => Effect.succeed("Rain") })),
+          Effect.provide(layer)
+        )
+
+        assert.deepStrictEqual(response.value, { title: "Rain" })
+        assert.strictEqual(response.toolCalls[0]?.name, "Weather")
+      }))
   })
 
   // The packaged `Memory_20250818` tool ships `customName: "AnthropicMemory"` /
diff --git a/repos/effect/packages/ai/openai-compat/CHANGELOG.md b/repos/effect/packages/ai/openai-compat/CHANGELOG.md
index 363f05ad6..bdb297955 100644
--- a/repos/effect/packages/ai/openai-compat/CHANGELOG.md
+++ b/repos/effect/packages/ai/openai-compat/CHANGELOG.md
@@ -1,5 +1,43 @@
 # @effect/ai-openai-compat
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7588](https://github.com/Effect-TS/effect/pull/7588) [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494) Thanks @tim-smart! - Route tool call parameter validation failures through the tool's `failureMode` and drop `ToolParameterValidationError.toolParams`.
+
+- [#7756](https://github.com/Effect-TS/effect/pull/7756) [`6852750`](https://github.com/Effect-TS/effect/commit/685275058aea20b139498bba7eedd151f5638d7b) Thanks @kitlangton! - Preserve image data supplied as strings in OpenAI Responses and OpenAI-compatible chat requests.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/ai/openai-compat/package.json b/repos/effect/packages/ai/openai-compat/package.json
index e68e72f5c..c83e71100 100644
--- a/repos/effect/packages/ai/openai-compat/package.json
+++ b/repos/effect/packages/ai/openai-compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/ai-openai-compat",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "An OpenAI compat integration for Effect",
diff --git a/repos/effect/packages/ai/openai-compat/src/OpenAiEmbeddingModel.ts b/repos/effect/packages/ai/openai-compat/src/OpenAiEmbeddingModel.ts
index 0cd5393aa..c64569c4a 100644
--- a/repos/effect/packages/ai/openai-compat/src/OpenAiEmbeddingModel.ts
+++ b/repos/effect/packages/ai/openai-compat/src/OpenAiEmbeddingModel.ts
@@ -118,7 +118,7 @@ export const model = (
 export const make = Effect.fnUntraced(function*({ model, config: providerConfig }: {
   readonly model: string
   readonly config?: ModelConfig | undefined
-}): Effect.fn.Return<EmbeddingModel.Service, never, OpenAiClient> {
+}): Effect.fn.Return<EmbeddingModel.EmbeddingModel, never, OpenAiClient> {
   const client = yield* OpenAiClient
 
   const makeConfig = Effect.contextWith((services: Context.Context<never>) =>
diff --git a/repos/effect/packages/ai/openai-compat/src/OpenAiLanguageModel.ts b/repos/effect/packages/ai/openai-compat/src/OpenAiLanguageModel.ts
index 71e1e586a..923f39397 100644
--- a/repos/effect/packages/ai/openai-compat/src/OpenAiLanguageModel.ts
+++ b/repos/effect/packages/ai/openai-compat/src/OpenAiLanguageModel.ts
@@ -20,7 +20,6 @@ import * as Rec from "effect/Record"
 import * as Redactable from "effect/Redactable"
 import * as Schema from "effect/Schema"
 import * as AST from "effect/SchemaAST"
-import * as SchemaIssue from "effect/SchemaIssue"
 import * as Stream from "effect/Stream"
 import type { Span } from "effect/Tracer"
 import type { DeepMutable, Simplify } from "effect/Types"
@@ -55,8 +54,6 @@ import {
 } from "./OpenAiClient.ts"
 import { addGenAIAnnotations } from "./OpenAiTelemetry.ts"
 
-const formatIssue = SchemaIssue.makeFormatterDefault()
-
 /**
  * Image detail level for vision requests.
  */
@@ -575,7 +572,7 @@ export const model = (
 export const make = Effect.fnUntraced(function*({ model, config: providerConfig }: {
   readonly model: string
   readonly config?: ModelConfig | undefined
-}): Effect.fn.Return<LanguageModel.Service, never, OpenAiClient> {
+}): Effect.fn.Return<LanguageModel.LanguageModel, never, OpenAiClient> {
   const client = yield* OpenAiClient
 
   const makeConfig = Effect.contextWith((services: Context.Context<never>) =>
@@ -790,15 +787,14 @@ const prepareMessages = Effect.fnUntraced(
 
                   if (typeof part.data === "string" && isFileId(part.data, config)) {
                     content.push({ type: "input_image", file_id: part.data, detail })
-                  }
-
-                  if (part.data instanceof URL) {
-                    content.push({ type: "input_image", image_url: part.data.toString(), detail })
-                  }
-
-                  if (part.data instanceof Uint8Array) {
-                    const base64 = Encoding.encodeBase64(part.data)
-                    const imageUrl = `data:${mediaType};base64,${base64}`
+                  } else {
+                    const imageUrl = part.data instanceof URL
+                      ? part.data.toString()
+                      : part.data instanceof Uint8Array
+                      ? `data:${mediaType};base64,${Encoding.encodeBase64(part.data)}`
+                      : /^(data:|https?:\/\/)/i.test(part.data)
+                      ? part.data
+                      : `data:${mediaType};base64,${part.data}`
                     content.push({ type: "input_image", image_url: imageUrl, detail })
                   }
                 } else if (part.mediaType === "application/pdf") {
@@ -1099,7 +1095,6 @@ const makeResponse = Effect.fnUntraced(
                 method: "makeResponse",
                 reason: new AiError.ToolParameterValidationError({
                   toolName,
-                  toolParams: {},
                   description: `Failed to securely JSON parse tool parameters: ${cause}`
                 })
               })
@@ -1192,7 +1187,6 @@ const makeStreamResponse = Effect.fnUntraced(
                   method: "makeStreamResponse",
                   reason: new AiError.ToolParameterValidationError({
                     toolName: toolCall.name,
-                    toolParams: {},
                     description: `Failed to securely JSON parse tool parameters: ${cause}`
                   })
                 })
@@ -1452,21 +1446,16 @@ const transformToolCallParams = Effect.fnUntraced(function*<Tools extends Readon
   }
 
   const { codec } = yield* tryCodecTransform(tool.parametersSchema, "makeResponse")
-  const transform = Schema.decodeEffect(codec)
 
+  // Normalize valid parameters; leave invalid ones for Toolkit.
   return yield* (
-    transform(toolParams) as Effect.Effect<unknown, Schema.SchemaError>
-  ).pipe(Effect.mapError((error) =>
-    AiError.make({
-      module: "OpenAiLanguageModel",
-      method: "makeResponse",
-      reason: new AiError.ToolParameterValidationError({
-        toolName,
-        toolParams,
-        description: formatIssue(error.issue)
-      })
-    })
-  ))
+    Schema.decodeEffect(codec)(toolParams) as Effect.Effect<unknown, Schema.SchemaError>
+  ).pipe(
+    Effect.flatMap((decoded) =>
+      Schema.encodeUnknownEffect(tool.parametersSchema)(decoded) as Effect.Effect<unknown, Schema.SchemaError>
+    ),
+    Effect.orElseSucceed(() => toolParams)
+  )
 })
 
 const prepareTools = Effect.fnUntraced(function*<Tools extends ReadonlyArray<Tool.Any>>({
diff --git a/repos/effect/packages/ai/openai-compat/test/OpenAiLanguageModel.test.ts b/repos/effect/packages/ai/openai-compat/test/OpenAiLanguageModel.test.ts
index df6edf923..dc90d1f4d 100644
--- a/repos/effect/packages/ai/openai-compat/test/OpenAiLanguageModel.test.ts
+++ b/repos/effect/packages/ai/openai-compat/test/OpenAiLanguageModel.test.ts
@@ -1,7 +1,7 @@
 import { OpenAiClient, OpenAiLanguageModel } from "@effect/ai-openai-compat"
 import { assert, describe, it } from "@effect/vitest"
 import { Effect, Layer, Redacted, Ref, Schema, Stream } from "effect"
-import { LanguageModel, Prompt, Tool, Toolkit } from "effect/unstable/ai"
+import { type AiError, LanguageModel, Prompt, Tool, Toolkit } from "effect/unstable/ai"
 import { HttpClient, type HttpClientError, type HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
 
 describe("OpenAiLanguageModel", () => {
@@ -48,6 +48,67 @@ describe("OpenAiLanguageModel", () => {
         assert.strictEqual(requestBody.messages[0]?.content, "hello")
       }))
 
+    it.effect("routes invalid tool call params through failureMode: return without failing the effect", () =>
+      Effect.gen(function*() {
+        const layer = OpenAiClient.layer({ apiKey: Redacted.make("sk-test-key") }).pipe(
+          Layer.provide(Layer.succeed(
+            HttpClient.HttpClient,
+            makeHttpClient((request) =>
+              Effect.succeed(jsonResponse(
+                request,
+                makeChatCompletion({
+                  choices: [{
+                    index: 0,
+                    finish_reason: "tool_calls",
+                    message: {
+                      role: "assistant",
+                      content: null,
+                      tool_calls: [{
+                        id: "call_1",
+                        type: "function",
+                        function: {
+                          name: "ReturnModeTool",
+                          arguments: JSON.stringify({ input: 123 })
+                        }
+                      }]
+                    }
+                  }]
+                })
+              ))
+            )
+          ))
+        )
+
+        const ReturnModeTool = Tool.make("ReturnModeTool", {
+          description: "A test tool",
+          failureMode: "return",
+          parameters: Schema.Struct({ input: Schema.String }),
+          success: Schema.Struct({ output: Schema.String }),
+          failure: Schema.Struct({ error: Schema.String })
+        })
+
+        const toolkit = Toolkit.make(ReturnModeTool)
+        const toolkitLayer = toolkit.toLayer({
+          ReturnModeTool: ({ input }) => Effect.succeed({ output: `processed: ${input}` })
+        })
+
+        const result = yield* LanguageModel.generateText({
+          prompt: "use the tool",
+          toolkit
+        }).pipe(
+          Effect.provide(OpenAiLanguageModel.model("gpt-4o-mini")),
+          Effect.provide(toolkitLayer),
+          Effect.provide(layer)
+        )
+
+        assert.strictEqual(result.toolResults.length, 1)
+        const toolResult = result.toolResults[0]!
+        assert.strictEqual(toolResult.isFailure, true)
+        const failure = toolResult.result as AiError.AiError
+        assert.strictEqual(failure._tag, "AiError")
+        assert.strictEqual(failure.reason._tag, "ToolParameterValidationError")
+      }))
+
     it.effect("forwards reasoning config to chat completions request", () =>
       Effect.gen(function*() {
         let capturedRequest: HttpClientRequest.HttpClientRequest | undefined
@@ -142,8 +203,9 @@ describe("OpenAiLanguageModel", () => {
         })
       }))
 
-    it.effect("preserves multimodal user content order in chat payload", () =>
+    it.effect("preserves URL and base64 images in multimodal content order", () =>
       Effect.gen(function*() {
+        const base64 = "iVBORw0KGgo="
         let capturedRequest: HttpClientRequest.HttpClientRequest | undefined
 
         const layer = OpenAiClient.layer({ apiKey: Redacted.make("sk-test-key") }).pipe(
@@ -177,6 +239,8 @@ describe("OpenAiLanguageModel", () => {
                 mediaType: "image/png",
                 data: new URL("https://example.com/image.png")
               }),
+              Prompt.filePart({ mediaType: "image/png", data: "https://example.com/string-image.png" }),
+              Prompt.filePart({ mediaType: "image/png", data: base64 }),
               Prompt.textPart({ text: "second text" })
             ]
           }])
@@ -205,6 +269,20 @@ describe("OpenAiLanguageModel", () => {
               detail: "auto"
             }
           },
+          {
+            type: "image_url",
+            image_url: {
+              url: "https://example.com/string-image.png",
+              detail: "auto"
+            }
+          },
+          {
+            type: "image_url",
+            image_url: {
+              url: `data:image/png;base64,${base64}`,
+              detail: "auto"
+            }
+          },
           {
             type: "text",
             text: "second text"
diff --git a/repos/effect/packages/ai/openai/CHANGELOG.md b/repos/effect/packages/ai/openai/CHANGELOG.md
index cb5fb0a47..7cf475a6e 100644
--- a/repos/effect/packages/ai/openai/CHANGELOG.md
+++ b/repos/effect/packages/ai/openai/CHANGELOG.md
@@ -1,5 +1,65 @@
 # @effect/ai-openai
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- [#8236](https://github.com/Effect-TS/effect/pull/8236) [`90695b0`](https://github.com/Effect-TS/effect/commit/90695b0d5bee3aa33e67cbea1aa2e6298816a64f) Thanks @danieljvdm! - Support API sources in OpenAI web search. Narrow sources by `type` before reading `url` or `name`.
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- [#8157](https://github.com/Effect-TS/effect/pull/8157) [`fdec3b2`](https://github.com/Effect-TS/effect/commit/fdec3b23a163566b65ce67b721b4d2faa009001c) Thanks @danieljvdm! - Report failed OpenAI provider-executed tool calls as failure tool results in both `generateText` and `streamText`, preserving the call details.
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7477](https://github.com/Effect-TS/effect/pull/7477) [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803) Thanks @candrewlee14! - Allow sockets to use browser, Bun, and Node WebSocket implementations without consumer casts. Platform constructors
+  now support typed opening-handshake headers where available.
+
+- [#7588](https://github.com/Effect-TS/effect/pull/7588) [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494) Thanks @tim-smart! - Route tool call parameter validation failures through the tool's `failureMode` and drop `ToolParameterValidationError.toolParams`.
+
+- [#7756](https://github.com/Effect-TS/effect/pull/7756) [`6852750`](https://github.com/Effect-TS/effect/commit/685275058aea20b139498bba7eedd151f5638d7b) Thanks @kitlangton! - Preserve image data supplied as strings in OpenAI Responses and OpenAI-compatible chat requests.
+
+- [#8037](https://github.com/Effect-TS/effect/pull/8037) [`e255f08`](https://github.com/Effect-TS/effect/commit/e255f0893e5f185414466b6a06b710c554ef8c7c) Thanks @tim-smart! - Allow OpenAI-compatible Responses API stream events to omit `sequence_number`.
+
+- [#7805](https://github.com/Effect-TS/effect/pull/7805) [`0b93584`](https://github.com/Effect-TS/effect/commit/0b935848082dd178db8278bff52a2cd07e5bf69a) Thanks @tim-smart! - Preserve plain-text client tool results when encoding provider requests.
+
+- [#7487](https://github.com/Effect-TS/effect/pull/7487) [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80) Thanks @tim-smart! - Redesign `Socket` around a scoped, pull-based reader with transport backpressure.
+  
+  `Socket` now exposes `reader` and `writer`. Client reader acquisition dials and yields a pull of non-empty batches: one buffer for TCP and one entry per WebSocket frame. TCP applies backpressure while paused; pausable WebSockets pause at `highWaterMark` (64 KiB by default) and resume after draining. Browser WebSockets cannot pause, so they can fail with `SocketReadError` at a configured `highWaterMark`. Writes await native drain signals and batch with `cork` / `uncork` where available.
+  
+  ### Breaking changes
+  
+  - `Socket.run`, `Socket.runString`, and `Socket.runRaw` are removed. Acquire `socket.reader` (or `Socket.readerBytes` / `Socket.readerString`) in a scope and pull in a loop. Code before the first pull replaces `onOpen`.
+  - `Socket.make` now takes `{ reader, writer }`. The writer acquisition is infallible and yields a `Writer` with `write` and `writeAll`; both operations can still fail with `SocketError`.
+  - Every close fails the pull with `SocketError` wrapping `SocketCloseError`. The close-code predicates are removed; use `Effect.retry` around the scoped read loop to reconnect.
+  - `Socket.toChannel` and `Socket.toChannelString` now read from the pull and fail on close. `Socket.toStream` is added for read-only consumption.
+  - `fromWebSocket` drops the `onInitialRun` option; `SendQueueCapacity` is removed.
+  - Accepted server sockets pause immediately. Their reader attaches to the existing connection and cannot reconnect after close.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/ai/openai/codegen.yaml b/repos/effect/packages/ai/openai/codegen.yaml
index 05724087a..c8384791a 100644
--- a/repos/effect/packages/ai/openai/codegen.yaml
+++ b/repos/effect/packages/ai/openai/codegen.yaml
@@ -17,6 +17,8 @@ patches:
   - '[{"op":"add","path":"/components/schemas/PromptCacheRetentionEnum/enum/1","value":"in-memory"}]'
   - '[{"op":"replace","path":"/components/schemas/OpenAIFile/properties/expires_at","value":{"anyOf":[{"type":"integer","format":"unixtime","description":"The Unix timestamp (in seconds) for when the file will expire."},{"type":"null"}]}}]'
   - '[{"op":"add","path":"/components/schemas/OpenAIFile/properties/status_details/nullable","value":true}]'
+  # Remove when the upstream schema includes named API sources: https://github.com/openai/openai-openapi/issues/573
+  - '[{"op":"replace","path":"/components/schemas/WebSearchActionSearch/properties/sources/items","value":{"anyOf":[{"type":"object","title":"Web search source","description":"A source used in the search.\n","properties":{"type":{"type":"string","enum":["url"],"description":"The type of source. Always `url`.\n","x-stainless-const":true},"url":{"type":"string","format":"uri","description":"The URL of the source.\n"}},"required":["type","url"]},{"type":"object","title":"Web search API source","description":"An API source used in the search.\n","properties":{"type":{"type":"string","enum":["api"],"description":"The type of source. Always `api`.\n","x-stainless-const":true},"name":{"type":"string","description":"The name of the API source, such as `oai-weather`, `oai-sports`, or `oai-finance`.\n"}},"required":["type","name"]}]}}]'
   # Add missing keepalive stream event support
   - '[{"op":"add","path":"/components/schemas/ResponseKeepAliveEvent","value":{"type":"object","title":"Keep alive","description":"A keepalive event emitted during long-running response streams.","properties":{"type":{"type":"string","enum":["keepalive"],"description":"The type of the keepalive event. Always `keepalive`.","default":"keepalive","x-stainless-const":true},"sequence_number":{"type":"integer","description":"The sequence number of this keepalive event."}},"required":["type","sequence_number"]}}]'
   - '[{"op":"add","path":"/components/schemas/ResponseStreamEvent/anyOf/-","value":{"$ref":"#/components/schemas/ResponseKeepAliveEvent"}}]'
diff --git a/repos/effect/packages/ai/openai/package.json b/repos/effect/packages/ai/openai/package.json
index 52e041041..000043f8f 100644
--- a/repos/effect/packages/ai/openai/package.json
+++ b/repos/effect/packages/ai/openai/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/ai-openai",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "An OpenAI provider integration for Effect AI SDK",
diff --git a/repos/effect/packages/ai/openai/src/Generated.ts b/repos/effect/packages/ai/openai/src/Generated.ts
index d51b31244..5df29a71f 100644
--- a/repos/effect/packages/ai/openai/src/Generated.ts
+++ b/repos/effect/packages/ai/openai/src/Generated.ts
@@ -8411,7 +8411,9 @@ export type WebSearchToolCall = {
       readonly "type": "search"
       readonly "query"?: string
       readonly "queries"?: ReadonlyArray<string>
-      readonly "sources"?: ReadonlyArray<{ readonly "type": "url"; readonly "url": string }>
+      readonly "sources"?: ReadonlyArray<
+        { readonly "type": "url"; readonly "url": string } | { readonly "type": "api"; readonly "name": string }
+      >
     }
     | { readonly "type": "open_page"; readonly "url"?: string | null }
     | { readonly "type": "find_in_page"; readonly "url": string; readonly "pattern": string }
@@ -8436,10 +8438,18 @@ export const WebSearchToolCall = Schema.Struct({
       ),
       "sources": Schema.optionalKey(
         Schema.Array(
-          Schema.Struct({
-            "type": Schema.Literal("url").annotate({ "description": "The type of source. Always `url`.\n" }),
-            "url": Schema.String.annotate({ "description": "The URL of the source.\n", "format": "uri" })
-          }).annotate({ "title": "Web search source", "description": "A source used in the search.\n" })
+          Schema.Union([
+            Schema.Struct({
+              "type": Schema.Literal("url").annotate({ "description": "The type of source. Always `url`.\n" }),
+              "url": Schema.String.annotate({ "description": "The URL of the source.\n", "format": "uri" })
+            }).annotate({ "title": "Web search source", "description": "A source used in the search.\n" }),
+            Schema.Struct({
+              "type": Schema.Literal("api").annotate({ "description": "The type of source. Always `api`.\n" }),
+              "name": Schema.String.annotate({
+                "description": "The name of the API source, such as `oai-weather`, `oai-sports`, or `oai-finance`.\n"
+              })
+            }).annotate({ "title": "Web search API source", "description": "An API source used in the search.\n" })
+          ])
         ).annotate({ "title": "Web search sources", "description": "The sources used in the search.\n" })
       )
     }).annotate({
@@ -22773,7 +22783,9 @@ export type InputItem =
         readonly "type": "search"
         readonly "query"?: string
         readonly "queries"?: ReadonlyArray<string>
-        readonly "sources"?: ReadonlyArray<{ readonly "type": "url"; readonly "url": string }>
+        readonly "sources"?: ReadonlyArray<
+          { readonly "type": "url"; readonly "url": string } | { readonly "type": "api"; readonly "name": string }
+        >
       }
       | { readonly "type": "open_page"; readonly "url"?: string | null }
       | { readonly "type": "find_in_page"; readonly "url": string; readonly "pattern": string }
@@ -23067,10 +23079,19 @@ export const InputItem = Schema.Union([
           ),
           "sources": Schema.optionalKey(
             Schema.Array(
-              Schema.Struct({
-                "type": Schema.Literal("url").annotate({ "description": "The type of source. Always `url`.\n" }),
-                "url": Schema.String.annotate({ "description": "The URL of the source.\n", "format": "uri" })
-              }).annotate({ "title": "Web search source", "description": "A source used in the search.\n" })
+              Schema.Union([
+                Schema.Struct({
+                  "type": Schema.Literal("url").annotate({ "description": "The type of source. Always `url`.\n" }),
+                  "url": Schema.String.annotate({ "description": "The URL of the source.\n", "format": "uri" })
+                }).annotate({ "title": "Web search source", "description": "A source used in the search.\n" }),
+                Schema.Struct({
+                  "type": Schema.Literal("api").annotate({ "description": "The type of source. Always `api`.\n" }),
+                  "name": Schema.String.annotate({
+                    "description":
+                      "The name of the API source, such as `oai-weather`, `oai-sports`, or `oai-finance`.\n"
+                  })
+                }).annotate({ "title": "Web search API source", "description": "An API source used in the search.\n" })
+              ])
             ).annotate({ "title": "Web search sources", "description": "The sources used in the search.\n" })
           )
         }).annotate({
diff --git a/repos/effect/packages/ai/openai/src/OpenAiEmbeddingModel.ts b/repos/effect/packages/ai/openai/src/OpenAiEmbeddingModel.ts
index fa466ca79..6b08fff02 100644
--- a/repos/effect/packages/ai/openai/src/OpenAiEmbeddingModel.ts
+++ b/repos/effect/packages/ai/openai/src/OpenAiEmbeddingModel.ts
@@ -101,7 +101,7 @@ export const model = (
  *
  * **When to use**
  *
- * Use to construct the `EmbeddingModel.Service` effectfully when
+ * Use to construct the `EmbeddingModel` effectfully when
  * `OpenAiClient` is already available in the environment.
  *
  * **Details**
@@ -127,7 +127,7 @@ export const model = (
 export const make = Effect.fnUntraced(function*({ model, config: providerConfig }: {
   readonly model: (string & {}) | Model
   readonly config?: Omit<typeof Config.Service, "model"> | undefined
-}): Effect.fn.Return<EmbeddingModel.Service, never, OpenAiClient> {
+}): Effect.fn.Return<EmbeddingModel.EmbeddingModel, never, OpenAiClient> {
   const client = yield* OpenAiClient
 
   const makeConfig = Effect.contextWith((services: Context.Context<never>) =>
diff --git a/repos/effect/packages/ai/openai/src/OpenAiLanguageModel.ts b/repos/effect/packages/ai/openai/src/OpenAiLanguageModel.ts
index 4addf9f5b..3b3d11cb0 100644
--- a/repos/effect/packages/ai/openai/src/OpenAiLanguageModel.ts
+++ b/repos/effect/packages/ai/openai/src/OpenAiLanguageModel.ts
@@ -19,7 +19,6 @@ import * as Predicate from "effect/Predicate"
 import * as Redactable from "effect/Redactable"
 import * as Schema from "effect/Schema"
 import * as AST from "effect/SchemaAST"
-import * as SchemaIssue from "effect/SchemaIssue"
 import * as Stream from "effect/Stream"
 import type { Span } from "effect/Tracer"
 import type { DeepMutable, Mutable, Simplify } from "effect/Types"
@@ -40,8 +39,6 @@ import type * as OpenAiSchema from "./OpenAiSchema.ts"
 import { addGenAIAnnotations } from "./OpenAiTelemetry.ts"
 import type * as OpenAiTool from "./OpenAiTool.ts"
 
-const formatIssue = SchemaIssue.makeFormatterDefault()
-
 const ResponseModelIds = Generated.ModelIdsResponses.members[1]
 const SharedModelIds = Generated.ModelIdsShared.members[1]
 
@@ -615,7 +612,7 @@ export const model = (
 export const make = Effect.fnUntraced(function*({ model, config: providerConfig }: {
   readonly model: (string & {}) | Model
   readonly config?: Omit<typeof Config.Service, "model"> | undefined
-}): Effect.fn.Return<LanguageModel.Service, never, OpenAiClient> {
+}): Effect.fn.Return<LanguageModel.LanguageModel, never, OpenAiClient> {
   const client = yield* OpenAiClient
 
   const makeConfig = Effect.gen(function*() {
@@ -881,15 +878,14 @@ const prepareMessages = Effect.fnUntraced(
 
                   if (typeof part.data === "string" && isFileId(part.data, config)) {
                     content.push({ type: "input_image", file_id: part.data, detail })
-                  }
-
-                  if (part.data instanceof URL) {
-                    content.push({ type: "input_image", image_url: part.data.toString(), detail })
-                  }
-
-                  if (part.data instanceof Uint8Array) {
-                    const base64 = Encoding.encodeBase64(part.data)
-                    const imageUrl = `data:${mediaType};base64,${base64}`
+                  } else {
+                    const imageUrl = part.data instanceof URL
+                      ? part.data.toString()
+                      : part.data instanceof Uint8Array
+                      ? `data:${mediaType};base64,${Encoding.encodeBase64(part.data)}`
+                      : /^(data:|https?:\/\/)/i.test(part.data)
+                      ? part.data
+                      : `data:${mediaType};base64,${part.data}`
                     content.push({ type: "input_image", image_url: imageUrl, detail })
                   }
                 } else if (part.mediaType === "application/pdf") {
@@ -1045,7 +1041,6 @@ const prepareMessages = Effect.fnUntraced(
                         method: "prepareMessages",
                         reason: new AiError.ToolParameterValidationError({
                           toolName: "local_shell",
-                          toolParams: part.params as Schema.Json,
                           description: error.message
                         })
                       })
@@ -1071,7 +1066,6 @@ const prepareMessages = Effect.fnUntraced(
                         method: "prepareMessages",
                         reason: new AiError.ToolParameterValidationError({
                           toolName: "shell",
-                          toolParams: part.params as Schema.Json,
                           description: error.message
                         })
                       })
@@ -1199,7 +1193,7 @@ const prepareMessages = Effect.fnUntraced(
             messages.push({
               type: "function_call_output",
               call_id: part.id,
-              output: JSON.stringify(part.result),
+              output: typeof part.result === "string" ? part.result : JSON.stringify(part.result),
               ...(Predicate.isNotNull(status) ? { status } : {})
             })
           }
@@ -1343,19 +1337,20 @@ const makeResponse = Effect.fnUntraced(
 
         case "code_interpreter_call": {
           const toolName = toolNameMapper.getCustomName("code_interpreter")
+          const status = part.status ?? "completed"
           parts.push({
             type: "tool-call",
             id: part.id,
             name: toolName,
-            params: { code: part.code, container_id: part.container_id },
+            params: { code: part.code ?? null, container_id: part.container_id },
             providerExecuted: true
           })
           parts.push({
             type: "tool-result",
             id: part.id,
             name: toolName,
-            isFailure: false,
-            result: { outputs: part.outputs },
+            isFailure: status !== "completed",
+            result: { status, outputs: part.outputs ?? null },
             providerExecuted: true
           })
           break
@@ -1374,7 +1369,7 @@ const makeResponse = Effect.fnUntraced(
             type: "tool-result",
             id: part.id,
             name: toolName,
-            isFailure: false,
+            isFailure: part.status !== "completed",
             result: {
               status: part.status,
               queries: part.queries,
@@ -1398,7 +1393,6 @@ const makeResponse = Effect.fnUntraced(
                 method: "makeResponse",
                 reason: new AiError.ToolParameterValidationError({
                   toolName,
-                  toolParams: {},
                   description: `Faled to securely JSON parse tool parameters: ${cause}`
                 })
               })
@@ -1418,6 +1412,7 @@ const makeResponse = Effect.fnUntraced(
 
         case "image_generation_call": {
           const toolName = toolNameMapper.getCustomName("image_generation")
+          const status = part.status ?? "completed"
           parts.push({
             type: "tool-call",
             id: part.id,
@@ -1429,8 +1424,10 @@ const makeResponse = Effect.fnUntraced(
             type: "tool-result",
             id: part.id,
             name: toolName,
-            isFailure: false,
-            result: { result: part.result }
+            isFailure: status !== "completed",
+            result: status === "completed"
+              ? { result: part.result }
+              : { status, result: part.result }
           })
           break
         }
@@ -1470,7 +1467,7 @@ const makeResponse = Effect.fnUntraced(
             type: "tool-result",
             id: toolId,
             name: toolName,
-            isFailure: false,
+            isFailure: Predicate.isNotNullish(part.error),
             providerExecuted: true,
             result: {
               type: "mcp_call",
@@ -1668,7 +1665,7 @@ const makeResponse = Effect.fnUntraced(
             type: "tool-result",
             id: part.id,
             name: toolName,
-            isFailure: false,
+            isFailure: part.status !== "completed",
             result: { action: part.action, status: part.status },
             providerExecuted: true
           })
@@ -1764,9 +1761,39 @@ const makeStreamResponse = Effect.fnUntraced(
       }
       readonly codeInterpreter?: {
         readonly containerId: string
+        hasCode: boolean
+        streamedCode: string
       }
     }> = {}
 
+    const finishCodeInterpreterCall = (
+      outputIndex: number,
+      code: string | null,
+      parts: Array<Response.StreamPartEncoded>
+    ) => {
+      const toolCall = activeToolCalls[outputIndex]
+      if (Predicate.isUndefined(toolCall?.codeInterpreter)) {
+        return
+      }
+      parts.push({
+        type: "tool-params-delta",
+        id: toolCall.id,
+        delta: toolCall.codeInterpreter.hasCode ? "\"}" : `${JSON.stringify(code)}}`
+      })
+      parts.push({ type: "tool-params-end", id: toolCall.id })
+      parts.push({
+        type: "tool-call",
+        id: toolCall.id,
+        name: toolCall.name,
+        params: {
+          code: toolCall.codeInterpreter.hasCode ? toolCall.codeInterpreter.streamedCode : code,
+          container_id: toolCall.codeInterpreter.containerId
+        },
+        providerExecuted: true
+      })
+      delete activeToolCalls[outputIndex]
+    }
+
     const webSearchTool = options.tools.find((tool) =>
       Tool.isProviderDefined(tool) &&
       (tool.name === "OpenAiWebSearch" ||
@@ -1878,7 +1905,7 @@ const makeStreamResponse = Effect.fnUntraced(
                 activeToolCalls[event.output_index] = {
                   id: event.item.id,
                   name: toolName,
-                  codeInterpreter: { containerId: event.item.container_id }
+                  codeInterpreter: { containerId: event.item.container_id, hasCode: false, streamedCode: "" }
                 }
                 parts.push({
                   type: "tool-params-start",
@@ -1889,7 +1916,7 @@ const makeStreamResponse = Effect.fnUntraced(
                 parts.push({
                   type: "tool-params-delta",
                   id: event.item.id,
-                  delta: `{"containerId":"${event.item.container_id}","code":"`
+                  delta: `{"container_id":${JSON.stringify(event.item.container_id)},"code":`
                 })
                 break
               }
@@ -2072,14 +2099,15 @@ const makeStreamResponse = Effect.fnUntraced(
               }
 
               case "code_interpreter_call": {
-                delete activeToolCalls[event.output_index]
+                finishCodeInterpreterCall(event.output_index, event.item.code ?? null, parts)
                 const toolName = toolNameMapper.getCustomName("code_interpreter")
+                const status = event.item.status ?? "completed"
                 parts.push({
                   type: "tool-result",
                   id: event.item.id,
                   name: toolName,
-                  isFailure: false,
-                  result: { outputs: event.item.outputs },
+                  isFailure: status !== "completed",
+                  result: { status, outputs: event.item.outputs ?? null },
                   providerExecuted: true
                 })
                 break
@@ -2112,15 +2140,16 @@ const makeStreamResponse = Effect.fnUntraced(
               case "file_search_call": {
                 delete activeToolCalls[event.output_index]
                 const toolName = toolNameMapper.getCustomName("file_search")
-                const results = Predicate.isNotNullish(event.item.results)
-                  ? { results: event.item.results }
-                  : undefined
                 parts.push({
                   type: "tool-result",
                   id: event.item.id,
                   name: toolName,
-                  isFailure: false,
-                  result: { ...results, status: event.item.status, queries: event.item.queries },
+                  isFailure: event.item.status !== "completed",
+                  result: {
+                    status: event.item.status,
+                    queries: event.item.queries,
+                    results: event.item.results ?? null
+                  },
                   providerExecuted: true
                 })
                 break
@@ -2147,7 +2176,6 @@ const makeStreamResponse = Effect.fnUntraced(
                       method: "makeStreamResponse",
                       reason: new AiError.ToolParameterValidationError({
                         toolName,
-                        toolParams: {},
                         description: `Failed securely JSON parse tool parameters: ${cause}`
                       })
                     })
@@ -2173,12 +2201,15 @@ const makeStreamResponse = Effect.fnUntraced(
 
               case "image_generation_call": {
                 const toolName = toolNameMapper.getCustomName("image_generation")
+                const status = event.item.status ?? "completed"
                 parts.push({
                   type: "tool-result",
                   id: event.item.id,
                   name: toolName,
-                  isFailure: false,
-                  result: { result: event.item.result },
+                  isFailure: status !== "completed",
+                  result: status === "completed"
+                    ? { result: event.item.result }
+                    : { status, result: event.item.result },
                   providerExecuted: true
                 })
                 break
@@ -2223,7 +2254,7 @@ const makeStreamResponse = Effect.fnUntraced(
                   type: "tool-result",
                   id: toolId,
                   name: toolName,
-                  isFailure: false,
+                  isFailure: Predicate.isNotNullish(event.item.error),
                   providerExecuted: true,
                   result: {
                     type: "mcp_call",
@@ -2331,7 +2362,7 @@ const makeStreamResponse = Effect.fnUntraced(
                   type: "tool-result",
                   id: event.item.id,
                   name: toolName,
-                  isFailure: false,
+                  isFailure: event.item.status !== "completed",
                   result: { action: event.item.action, status: event.item.status },
                   providerExecuted: true
                 })
@@ -2450,7 +2481,6 @@ const makeStreamResponse = Effect.fnUntraced(
                     method: "makeStreamResponse",
                     reason: new AiError.ToolParameterValidationError({
                       toolName: toolCall.name,
-                      toolParams: {},
                       description: `Failed securely JSON parse tool parameters: ${cause}`
                     })
                   })
@@ -2516,37 +2546,21 @@ const makeStreamResponse = Effect.fnUntraced(
 
           case "response.code_interpreter_call_code.delta": {
             const toolCall = activeToolCalls[event.output_index]
-            if (Predicate.isNotUndefined(toolCall)) {
+            if (Predicate.isNotUndefined(toolCall?.codeInterpreter)) {
               parts.push({
                 type: "tool-params-delta",
                 id: toolCall.id,
-                delta: InternalUtilities.escapeJSONDelta(event.delta)
+                delta: (toolCall.codeInterpreter.hasCode ? "" : "\"") +
+                  InternalUtilities.escapeJSONDelta(event.delta)
               })
+              toolCall.codeInterpreter.hasCode = true
+              toolCall.codeInterpreter.streamedCode += event.delta
             }
             break
           }
 
           case "response.code_interpreter_call_code.done": {
-            const toolCall = activeToolCalls[event.output_index]
-            if (Predicate.isNotUndefined(toolCall) && Predicate.isNotUndefined(toolCall.codeInterpreter)) {
-              const toolName = toolNameMapper.getCustomName("code_interpreter")
-              parts.push({
-                type: "tool-params-delta",
-                id: toolCall.id,
-                delta: "\"}"
-              })
-              parts.push({ type: "tool-params-end", id: toolCall.id })
-              parts.push({
-                type: "tool-call",
-                id: toolCall.id,
-                name: toolName,
-                params: {
-                  code: event.code,
-                  container_id: toolCall.codeInterpreter.containerId
-                },
-                providerExecuted: true
-              })
-            }
+            finishCodeInterpreterCall(event.output_index, event.code, parts)
             break
           }
 
@@ -3104,7 +3118,6 @@ const normalizeMcpToolCall = Effect.fnUntraced(function*<Tools extends ReadonlyA
         method,
         reason: new AiError.ToolParameterValidationError({
           toolName,
-          toolParams,
           description: `Failed to securely JSON parse tool parameters: ${cause}`
         })
       })
@@ -3195,19 +3208,13 @@ const transformToolCallParams = Effect.fnUntraced(function*<Tools extends Readon
 
   const { codec } = yield* tryCodecTransform(tool.parametersSchema, "makeResponse")
 
-  const transform = Schema.decodeEffect(codec)
-
+  // Normalize valid parameters; leave invalid ones for Toolkit.
   return yield* (
-    transform(toolParams) as Effect.Effect<unknown, Schema.SchemaError>
-  ).pipe(Effect.mapError((error) =>
-    AiError.make({
-      module: "OpenAiLanguageModel",
-      method: "makeResponse",
-      reason: new AiError.ToolParameterValidationError({
-        toolName,
-        toolParams,
-        description: formatIssue(error.issue)
-      })
-    })
-  ))
+    Schema.decodeEffect(codec)(toolParams) as Effect.Effect<unknown, Schema.SchemaError>
+  ).pipe(
+    Effect.flatMap((decoded) =>
+      Schema.encodeUnknownEffect(tool.parametersSchema)(decoded) as Effect.Effect<unknown, Schema.SchemaError>
+    ),
+    Effect.orElseSucceed(() => toolParams)
+  )
 })
diff --git a/repos/effect/packages/ai/openai/src/OpenAiSchema.ts b/repos/effect/packages/ai/openai/src/OpenAiSchema.ts
index 2714c893a..073e56256 100644
--- a/repos/effect/packages/ai/openai/src/OpenAiSchema.ts
+++ b/repos/effect/packages/ai/openai/src/OpenAiSchema.ts
@@ -766,10 +766,12 @@ const ApplyPatchCall = Schema.Struct({
 const CodeInterpreterCall = Schema.Struct({
   id: Schema.String,
   type: Schema.Literal("code_interpreter_call"),
-  code: Schema.optionalKey(Schema.String),
+  code: Schema.optionalKey(Schema.NullOr(Schema.String)),
   container_id: Schema.String,
-  outputs: Schema.optionalKey(Schema.Array(Schema.Unknown)),
-  status: Schema.optionalKey(MessageStatus)
+  outputs: Schema.optionalKey(Schema.NullOr(Schema.Array(Schema.Unknown))),
+  status: Schema.optionalKey(
+    Schema.Literals(["in_progress", "completed", "incomplete", "interpreting", "failed"])
+  )
 })
 
 const ComputerCall = Schema.Struct({
@@ -905,38 +907,38 @@ export type Response = typeof Response.Type
 const ResponseCreatedEvent = Schema.Struct({
   type: Schema.Literal("response.created"),
   response: Response,
-  sequence_number: Schema.Int
+  sequence_number: Schema.optionalKey(Schema.Int)
 })
 
 const ResponseCompletedEvent = Schema.Struct({
   type: Schema.Literal("response.completed"),
   response: Response,
-  sequence_number: Schema.Int
+  sequence_number: Schema.optionalKey(Schema.Int)
 })
 
 const ResponseIncompleteEvent = Schema.Struct({
   type: Schema.Literal("response.incomplete"),
   response: Response,
-  sequence_number: Schema.Int
+  sequence_number: Schema.optionalKey(Schema.Int)
 })
 
 const ResponseFailedEvent = Schema.Struct({
   type: Schema.Literal("response.failed"),
   response: Response,
-  sequence_number: Schema.Int
+  sequence_number: Schema.optionalKey(Schema.Int)
 })
 
 const ResponseOutputItemAddedEvent = Schema.Struct({
   type: Schema.Literal("response.output_item.added"),
   output_index: Schema.Int,
-  sequence_number: Schema.Int,
+  sequence_number: Schema.optionalKey(Schema.Int),
   item: OutputItem
 })
 
 const ResponseOutputItemDoneEvent = Schema.Struct({
   type: Schema.Literal("response.output_item.done"),
   output_index: Schema.Int,
-  sequence_number: Schema.Int,
+  sequence_number: Schema.optionalKey(Schema.Int),
   item: OutputItem
 })
 
@@ -946,7 +948,7 @@ const ResponseOutputTextDeltaEvent = Schema.Struct({
   output_index: Schema.Int,
   content_index: Schema.Int,
   delta: Schema.String,
-  sequence_number: Schema.Int,
+  sequence_number: Schema.optionalKey(Schema.Int),
   logprobs: Schema.optionalKey(Schema.Array(Schema.Unknown))
 })
 
@@ -956,7 +958,7 @@ const ResponseOutputTextAnnotationAddedEvent = Schema.Struct({
   output_index: Schema.Int,
   content_index: Schema.Int,
   annotation_index: Schema.Int,
-  sequence_number: Schema.Int,
+  sequence_number: Schema.optionalKey(Schema.Int),
   annotation: Annotation
 })
 
@@ -965,7 +967,7 @@ const ResponseReasoningSummaryPartAddedEvent = Schema.Struct({
   item_id: Schema.String,
   output_index: Schema.Int,
   summary_index: Schema.Int,
-  sequence_number: Schema.Int,
+  sequence_number: Schema.optionalKey(Schema.Int),
   part: SummaryTextContent
 })
 
@@ -974,7 +976,7 @@ const ResponseReasoningSummaryPartDoneEvent = Schema.Struct({
   item_id: Schema.String,
   output_index: Schema.Int,
   summary_index: Schema.Int,
-  sequence_number: Schema.Int,
+  sequence_number: Schema.optionalKey(Schema.Int),
   part: SummaryTextContent
 })
 
@@ -984,14 +986,14 @@ const ResponseReasoningSummaryTextDeltaEvent = Schema.Struct({
   output_index: Schema.Int,
   summary_index: Schema.Int,
   delta: Schema.String,
-  sequence_number: Schema.Int
+  sequence_number: Schema.optionalKey(Schema.Int)
 })
 
 const ResponseFunctionCallArgumentsDeltaEvent = Schema.Struct({
   type: Schema.Literal("response.function_call_arguments.delta"),
   item_id: Schema.String,
   output_index: Schema.Int,
-  sequence_number: Schema.Int,
+  sequence_number: Schema.optionalKey(Schema.Int),
   delta: Schema.String
 })
 
@@ -999,7 +1001,7 @@ const ResponseFunctionCallArgumentsDoneEvent = Schema.Struct({
   type: Schema.Literal("response.function_call_arguments.done"),
   item_id: Schema.String,
   output_index: Schema.Int,
-  sequence_number: Schema.Int,
+  sequence_number: Schema.optionalKey(Schema.Int),
   arguments: Schema.String
 })
 
@@ -1007,7 +1009,7 @@ const ResponseCodeInterpreterCallCodeDeltaEvent = Schema.Struct({
   type: Schema.Literal("response.code_interpreter_call_code.delta"),
   item_id: Schema.String,
   output_index: Schema.Int,
-  sequence_number: Schema.Int,
+  sequence_number: Schema.optionalKey(Schema.Int),
   delta: Schema.String
 })
 
@@ -1015,7 +1017,7 @@ const ResponseCodeInterpreterCallCodeDoneEvent = Schema.Struct({
   type: Schema.Literal("response.code_interpreter_call_code.done"),
   item_id: Schema.String,
   output_index: Schema.Int,
-  sequence_number: Schema.Int,
+  sequence_number: Schema.optionalKey(Schema.Int),
   code: Schema.String
 })
 
@@ -1023,7 +1025,7 @@ const ResponseApplyPatchCallOperationDiffDeltaEvent = Schema.Struct({
   type: Schema.Literal("response.apply_patch_call_operation_diff.delta"),
   item_id: Schema.String,
   output_index: Schema.Int,
-  sequence_number: Schema.Int,
+  sequence_number: Schema.optionalKey(Schema.Int),
   delta: Schema.String
 })
 
@@ -1031,7 +1033,7 @@ const ResponseApplyPatchCallOperationDiffDoneEvent = Schema.Struct({
   type: Schema.Literal("response.apply_patch_call_operation_diff.done"),
   item_id: Schema.String,
   output_index: Schema.Int,
-  sequence_number: Schema.Int,
+  sequence_number: Schema.optionalKey(Schema.Int),
   delta: Schema.optionalKey(Schema.String)
 })
 
@@ -1039,7 +1041,7 @@ const ResponseImageGenerationCallPartialImageEvent = Schema.Struct({
   type: Schema.Literal("response.image_generation_call.partial_image"),
   item_id: Schema.String,
   output_index: Schema.Int,
-  sequence_number: Schema.Int,
+  sequence_number: Schema.optionalKey(Schema.Int),
   partial_image_b64: Schema.String
 })
 
@@ -1048,7 +1050,7 @@ const ResponseErrorEvent = Schema.Struct({
   code: Schema.NullOr(Schema.String),
   message: Schema.String,
   param: Schema.NullOr(Schema.String),
-  sequence_number: Schema.Int,
+  sequence_number: Schema.optionalKey(Schema.Int),
   status: Schema.optionalKey(Schema.Int)
 })
 
@@ -1060,7 +1062,7 @@ const NestedResponseErrorEvent = Schema.Struct({
     message: Schema.String,
     param: Schema.NullOr(Schema.String)
   }),
-  sequence_number: Schema.Int,
+  sequence_number: Schema.optionalKey(Schema.Int),
   status: Schema.optionalKey(Schema.Int)
 }).pipe(
   Schema.decodeTo(
diff --git a/repos/effect/packages/ai/openai/src/OpenAiTool.ts b/repos/effect/packages/ai/openai/src/OpenAiTool.ts
index 7d80c57d3..89585a6b9 100644
--- a/repos/effect/packages/ai/openai/src/OpenAiTool.ts
+++ b/repos/effect/packages/ai/openai/src/OpenAiTool.ts
@@ -67,9 +67,10 @@ export const ApplyPatch = Tool.providerDefined({
  *
  * **Details**
  *
- * The tool is configured with a `container` argument. Successful tool calls
- * expose `outputs`, which may contain logs or generated images, or `null` when
- * no outputs are available.
+ * The tool is configured with a `container` argument. Results include `status`
+ * and `outputs`: logs, generated images, or `null` when unavailable. A `completed`
+ * status indicates success; omitted statuses default to it. Other statuses
+ * produce failure results that preserve any outputs.
  *
  * @category tools
  * @since 4.0.0
@@ -86,6 +87,13 @@ export const CodeInterpreter = Tool.providerDefined({
     container_id: Generated.CodeInterpreterToolCall.fields.container_id
   }),
   success: Schema.Struct({
+    status: Schema.Literal("completed"),
+    outputs: Generated.CodeInterpreterToolCall.fields.outputs
+  }),
+  failure: Schema.Struct({
+    status: Schema.Literals(
+      Generated.CodeInterpreterToolCall.fields.status.literals.filter((status) => status !== "completed")
+    ),
     outputs: Generated.CodeInterpreterToolCall.fields.outputs
   })
 })
@@ -102,8 +110,10 @@ export const CodeInterpreter = Tool.providerDefined({
  * **Details**
  *
  * The tool requires `vector_store_ids` and accepts optional `filters`,
- * `max_num_results`, and `ranking_options`. Successful tool calls expose the
- * search `status`, generated `queries`, and optional `results`.
+ * `max_num_results`, and `ranking_options`. Results include `queries` and a
+ * required `results` field containing matches or `null`. Only `completed` is
+ * successful; all other statuses produce failure results, preserving partial
+ * matches.
  *
  * @category tools
  * @since 4.0.0
@@ -119,9 +129,16 @@ export const FileSearch = Tool.providerDefined({
     vector_store_ids: Generated.FileSearchTool.fields.vector_store_ids
   }),
   success: Schema.Struct({
-    status: Generated.FileSearchToolCall.fields.status,
+    status: Schema.Literal("completed"),
+    queries: Generated.FileSearchToolCall.fields.queries,
+    results: Generated.FileSearchToolCall.fields.results.schema
+  }),
+  failure: Schema.Struct({
+    status: Schema.Literals(
+      Generated.FileSearchToolCall.fields.status.literals.filter((status) => status !== "completed")
+    ),
     queries: Generated.FileSearchToolCall.fields.queries,
-    results: Generated.FileSearchToolCall.fields.results
+    results: Generated.FileSearchToolCall.fields.results.schema
   })
 })
 
@@ -138,8 +155,10 @@ export const FileSearch = Tool.providerDefined({
  *
  * The tool configures the `image_generation` provider tool, including model,
  * size, quality, output format, moderation, background, input-image options,
- * and partial image settings. Successful tool calls expose `result` as base64
- * image data or `null`.
+ * and partial image settings. Successful calls expose `result` as base64 image
+ * data or `null`. Partial images are preliminary success results. Final results
+ * with a status other than `completed` are failures that include `status`.
+ * Omitted statuses default to `completed`.
  *
  * @category tools
  * @since 4.0.0
@@ -162,6 +181,12 @@ export const ImageGeneration = Tool.providerDefined({
   }),
   success: Schema.Struct({
     result: Generated.ImageGenToolCall.fields.result
+  }),
+  failure: Schema.Struct({
+    status: Schema.Literals(
+      Generated.ImageGenToolCall.fields.status.literals.filter((status) => status !== "completed")
+    ),
+    result: Generated.ImageGenToolCall.fields.result
   })
 })
 
@@ -197,6 +222,14 @@ export const LocalShell = Tool.providerDefined({
   })
 })
 
+const McpResultFields = {
+  type: Generated.MCPToolCall.fields.type,
+  name: Generated.MCPToolCall.fields.name,
+  arguments: Generated.MCPToolCall.fields.arguments,
+  output: Generated.MCPToolCall.fields.output,
+  server_label: Generated.MCPToolCall.fields.server_label
+}
+
 /**
  * Defines the OpenAI MCP tool that gives the model access to additional tools via remote
  * Model Context Protocol (MCP) servers.
@@ -210,7 +243,8 @@ export const LocalShell = Tool.providerDefined({
  * The tool accepts MCP server configuration such as allowed tools,
  * authorization, connector id, approval requirements, server metadata, and
  * server URL. Tool call results include the called tool name, arguments, output,
- * error, and server label.
+ * and server label. Calls that report an `error` produce failure results that
+ * include it; successful results omit `error`.
  *
  * **Gotchas**
  *
@@ -234,13 +268,10 @@ export const Mcp = Tool.providerDefined({
     server_url: Generated.MCPTool.fields.server_url
   }),
   parameters: Schema.Unknown,
-  success: Schema.Struct({
-    type: Generated.MCPToolCall.fields.type,
-    name: Generated.MCPToolCall.fields.name,
-    arguments: Generated.MCPToolCall.fields.arguments,
-    output: Generated.MCPToolCall.fields.output,
-    error: Generated.MCPToolCall.fields.error,
-    server_label: Generated.MCPToolCall.fields.server_label
+  success: Schema.Struct(McpResultFields),
+  failure: Schema.Struct({
+    ...McpResultFields,
+    error: Schema.String
   })
 })
 
@@ -274,6 +305,16 @@ export const Shell = Tool.providerDefined({
   })
 })
 
+const WebSearchSuccess = Schema.Struct({
+  action: Generated.WebSearchToolCall.fields.action,
+  status: Schema.Literal("completed")
+})
+
+const WebSearchFailure = Schema.Struct({
+  action: Generated.WebSearchToolCall.fields.action,
+  status: Schema.Literals(Generated.WebSearchToolCall.fields.status.literals.filter((status) => status !== "completed"))
+})
+
 /**
  * Defines the OpenAI Web Search tool that enables the model to search the web for
  * information.
@@ -285,7 +326,10 @@ export const Shell = Tool.providerDefined({
  * **Details**
  *
  * The tool accepts optional filters, user location, and search context size.
- * Successful calls expose the performed search action and status.
+ * Results preserve the action and status. Only `completed` is successful;
+ * all other statuses produce failure results.
+ * Narrow search sources by `type` to read `url` for URL sources or `name`
+ * for API sources.
  *
  * @see {@link WebSearchPreview} for the preview web search provider tool
  *
@@ -304,10 +348,8 @@ export const WebSearch = Tool.providerDefined({
   parameters: Schema.Struct({
     action: Generated.WebSearchToolCall.fields.action
   }),
-  success: Schema.Struct({
-    action: Generated.WebSearchToolCall.fields.action,
-    status: Generated.WebSearchToolCall.fields.status
-  })
+  success: WebSearchSuccess,
+  failure: WebSearchFailure
 })
 
 /**
@@ -319,8 +361,11 @@ export const WebSearch = Tool.providerDefined({
  *
  * **Details**
  *
- * The preview tool accepts optional user location and search context size, then
- * exposes the performed search action and status in successful calls.
+ * The preview tool accepts optional user location and search context size.
+ * Results preserve the action and status. Only `completed` is successful;
+ * all other statuses produce failure results.
+ * Narrow search sources by `type` to read `url` for URL sources or `name`
+ * for API sources.
  *
  * @see {@link WebSearch} for the stable web search provider tool
  *
@@ -335,8 +380,6 @@ export const WebSearchPreview = Tool.providerDefined({
     user_location: Generated.WebSearchPreviewTool.fields.user_location,
     search_context_size: Generated.WebSearchPreviewTool.fields.search_context_size
   }),
-  success: Schema.Struct({
-    action: Generated.WebSearchToolCall.fields.action,
-    status: Generated.WebSearchToolCall.fields.status
-  })
+  success: WebSearchSuccess,
+  failure: WebSearchFailure
 })
diff --git a/repos/effect/packages/ai/openai/test/OpenAiClient.test.ts b/repos/effect/packages/ai/openai/test/OpenAiClient.test.ts
index c06647cba..c20107c5c 100644
--- a/repos/effect/packages/ai/openai/test/OpenAiClient.test.ts
+++ b/repos/effect/packages/ai/openai/test/OpenAiClient.test.ts
@@ -611,6 +611,138 @@ describe("OpenAiClient", () => {
         ]
       }))))
 
+    it.effect("accepts response stream events without sequence numbers", () =>
+      Effect.gen(function*() {
+        const client = yield* OpenAiClient.OpenAiClient
+        const [, stream] = yield* client.createResponseStream({
+          model: "gpt-4o",
+          input: "test"
+        })
+
+        const events = yield* Stream.runCollect(stream)
+        const decoded = globalThis.Array.from(events)
+
+        assert.deepStrictEqual(decoded.map((event) => event.type), [
+          "response.created",
+          "response.output_item.added",
+          "response.content_part.added",
+          "response.output_text.delta",
+          "response.reasoning_text.delta",
+          "response.reasoning_text.done",
+          "response.content_part.done",
+          "response.completed"
+        ])
+        assert.deepStrictEqual(decoded[0], {
+          type: "response.created",
+          response: {
+            id: "resp_test123",
+            object: "response",
+            model: "gpt-4o-mini",
+            created_at: 1,
+            output: [],
+            error: null,
+            incomplete_details: null
+          }
+        })
+        assert.deepStrictEqual(decoded[3], {
+          type: "response.output_text.delta",
+          output_index: 0,
+          item_id: "msg_123",
+          content_index: 0,
+          delta: "hello",
+          sequence_number: 4
+        })
+        assert.deepStrictEqual([decoded[2], decoded[4], decoded[5], decoded[6]], [
+          {
+            type: "response.content_part.added",
+            output_index: 0,
+            item_id: "rs_tmp_123",
+            content_index: 0,
+            part: { type: "reasoning_text", text: "" }
+          },
+          {
+            type: "response.reasoning_text.delta",
+            output_index: 0,
+            item_id: "rs_tmp_123",
+            content_index: 0,
+            delta: "thinking..."
+          },
+          {
+            type: "response.reasoning_text.done",
+            output_index: 0,
+            item_id: "rs_tmp_123",
+            content_index: 0,
+            text: "thinking..."
+          },
+          {
+            type: "response.content_part.done",
+            output_index: 0,
+            item_id: "rs_tmp_123",
+            content_index: 0,
+            part: { type: "reasoning_text", text: "thinking..." }
+          }
+        ])
+      }).pipe(Effect.provide(makeTestLayer(undefined, {
+        _tag: "Sse",
+        events: [
+          {
+            type: "response.created",
+            response: makeResponseBody({ status: "in_progress" })
+          },
+          {
+            type: "response.output_item.added",
+            output_index: 0,
+            item: {
+              id: "msg_123",
+              type: "message",
+              role: "assistant",
+              status: "in_progress",
+              content: []
+            }
+          },
+          {
+            type: "response.content_part.added",
+            output_index: 0,
+            item_id: "rs_tmp_123",
+            content_index: 0,
+            part: { type: "reasoning_text", text: "" }
+          },
+          {
+            type: "response.output_text.delta",
+            output_index: 0,
+            item_id: "msg_123",
+            content_index: 0,
+            delta: "hello",
+            sequence_number: 4
+          },
+          {
+            type: "response.reasoning_text.delta",
+            output_index: 0,
+            item_id: "rs_tmp_123",
+            content_index: 0,
+            delta: "thinking..."
+          },
+          {
+            type: "response.reasoning_text.done",
+            output_index: 0,
+            item_id: "rs_tmp_123",
+            content_index: 0,
+            text: "thinking..."
+          },
+          {
+            type: "response.content_part.done",
+            output_index: 0,
+            item_id: "rs_tmp_123",
+            content_index: 0,
+            part: { type: "reasoning_text", text: "thinking..." }
+          },
+          {
+            type: "response.completed",
+            response: makeResponseBody()
+          }
+        ]
+      }))))
+
     it.effect("maps HTTP error before stream starts", () =>
       Effect.gen(function*() {
         const client = yield* OpenAiClient.OpenAiClient
diff --git a/repos/effect/packages/ai/openai/test/OpenAiLanguageModel.test.ts b/repos/effect/packages/ai/openai/test/OpenAiLanguageModel.test.ts
index 19b1e4527..7fda8b768 100644
--- a/repos/effect/packages/ai/openai/test/OpenAiLanguageModel.test.ts
+++ b/repos/effect/packages/ai/openai/test/OpenAiLanguageModel.test.ts
@@ -1,10 +1,21 @@
 import { type Generated, OpenAiClient, OpenAiLanguageModel, OpenAiSchema, OpenAiTool } from "@effect/ai-openai"
 import { assert, describe, it } from "@effect/vitest"
-import { deepStrictEqual, strictEqual } from "@effect/vitest/utils"
-import { Array, Context, Effect, Layer, Redacted, Ref, Schema, Stream } from "effect"
-import { LanguageModel, Prompt, Response as AiResponse, Tool, Toolkit } from "effect/unstable/ai"
+import { assertTrue, deepStrictEqual, strictEqual } from "@effect/vitest/utils"
+import { Array, Context, Effect, Layer, Redacted, Ref, Schema, SchemaGetter, Stream } from "effect"
+import { type AiError, LanguageModel, Prompt, Response as AiResponse, Tool, Toolkit } from "effect/unstable/ai"
 import { HttpClient, type HttpClientError, HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
 
+const webSearchFailures = [
+  { tool: OpenAiTool.WebSearch({}), status: "failed" },
+  { tool: OpenAiTool.WebSearchPreview({}), status: "searching" }
+] as const
+
+const fileSearchOutcomes = [
+  { status: "completed", isFailure: false, results: undefined },
+  { status: "failed", isFailure: true, results: null },
+  { status: "incomplete", isFailure: true, results: [{ file_id: "file_123", text: "Matching text" }] }
+] as const
+
 describe("OpenAiLanguageModel", () => {
   describe("make", () => {
     it.effect("sends correct model in request", () =>
@@ -29,6 +40,51 @@ describe("OpenAiLanguageModel", () => {
       }).pipe(Effect.provide(makeTestLayer({ body: { model: "ft:gpt-4o-mini:custom" as any } }))))
   })
 
+  describe("web search sources", () => {
+    it.effect.each(["generateText", "streamText"] as const)(
+      "preserves URL and API sources with %s",
+      (method) =>
+        Effect.gen(function*() {
+          const sources = [
+            { type: "url", url: "https://example.com/weather" },
+            { type: "api", name: "oai-weather" }
+          ] as const
+          const action = { type: "search", query: "weather in London", sources } as const
+          const item = makeWebSearchCall({ action })
+          const event = { type: "response.output_item.done", sequence_number: 1, output_index: 0, item }
+          const body = method === "generateText"
+            ? JSON.stringify(makeDefaultResponse({ output: [item] }))
+            : `data: ${JSON.stringify(event)}\n\n`
+          const client = HttpClient.make((request) =>
+            Effect.succeed(HttpClientResponse.fromWeb(
+              request,
+              new Response(body, {
+                headers: { "content-type": method === "generateText" ? "application/json" : "text/event-stream" }
+              })
+            ))
+          )
+          const options = { prompt: "Weather in London", toolkit: Toolkit.make(OpenAiTool.WebSearch({})) }
+          const parts = yield* Effect.gen(function*() {
+            if (method === "generateText") {
+              const response = yield* LanguageModel.generateText(options)
+              return response.content
+            }
+            return yield* LanguageModel.streamText(options).pipe(Stream.runCollect)
+          }).pipe(
+            Effect.provide(OpenAiLanguageModel.model("gpt-5.6")),
+            Effect.provide(OpenAiClient.layer({ apiKey: Redacted.make("sk-test-key") })),
+            Effect.provideService(HttpClient.HttpClient, client)
+          )
+
+          const calls = parts.filter((part) => part.type === "tool-call")
+          deepStrictEqual(calls.map((part) => part.params), [{ action }])
+
+          const results = parts.filter((part) => part.type === "tool-result")
+          deepStrictEqual(results.map((part) => part.result), [{ action, status: "completed" }])
+        })
+    )
+  })
+
   describe("generateText", () => {
     describe("message preparation", () => {
       it.effect("forwards prompt cache configuration and text breakpoints", () =>
@@ -208,6 +264,35 @@ describe("OpenAiLanguageModel", () => {
             }])
           }).pipe(Effect.provide(makeTestLayer())))
 
+        it.effect("handles image strings", () =>
+          Effect.gen(function*() {
+            const base64 = "iVBORw0KGgo="
+            const dataUrl = `data:image/png;base64,${base64}`
+            const upperCaseDataUrl = `DATA:image/png;base64,${base64}`
+            const url = "https://example.com/image.png"
+
+            yield* LanguageModel.generateText({
+              prompt: Prompt.make([Prompt.userMessage({
+                content: [base64, dataUrl, upperCaseDataUrl, url].map((data) =>
+                  Prompt.filePart({ mediaType: "image/png", data })
+                )
+              })])
+            }).pipe(Effect.provide(OpenAiLanguageModel.model("gpt-4o-mini")))
+
+            const requests = yield* MockHttpClient.requests
+            const body = yield* getRequestBody(requests[0])
+
+            assert.deepStrictEqual(body.input, [{
+              role: "user",
+              content: [
+                { type: "input_image", image_url: `data:image/png;base64,${base64}`, detail: "auto" },
+                { type: "input_image", image_url: dataUrl, detail: "auto" },
+                { type: "input_image", image_url: upperCaseDataUrl, detail: "auto" },
+                { type: "input_image", image_url: url, detail: "auto" }
+              ]
+            }])
+          }).pipe(Effect.provide(makeTestLayer())))
+
         it.effect("handles image with custom detail level", () =>
           Effect.gen(function*() {
             yield* LanguageModel.generateText({
@@ -505,6 +590,46 @@ describe("OpenAiLanguageModel", () => {
             strictEqual(toolOutput.output, JSON.stringify({ output: "result" }))
           }).pipe(Effect.provide([makeTestLayer(), TestToolkitLayer])))
 
+        it.effect("preserves string tool results", () =>
+          Effect.gen(function*() {
+            yield* LanguageModel.generateText({
+              prompt: Prompt.make([
+                { role: "user", content: "Use the tool" },
+                {
+                  role: "assistant",
+                  content: [
+                    Prompt.toolCallPart({
+                      id: "call_text",
+                      name: "TestTool",
+                      params: { input: "test" },
+                      providerExecuted: false
+                    })
+                  ]
+                },
+                {
+                  role: "tool",
+                  content: [
+                    Prompt.toolResultPart({
+                      id: "call_text",
+                      name: "TestTool",
+                      isFailure: false,
+                      result: "PLAIN_TEXT_SENTINEL\n",
+                      providerExecuted: false
+                    })
+                  ]
+                }
+              ]),
+              toolkit: TestToolkit
+            }).pipe(Effect.provide(OpenAiLanguageModel.model("gpt-4o-mini")))
+
+            const requests = yield* MockHttpClient.requests
+            const body = yield* getRequestBody(requests[0])
+            const toolOutput = body.input.find((item: any) => item.type === "function_call_output")
+
+            assert.isDefined(toolOutput)
+            strictEqual(toolOutput.output, "PLAIN_TEXT_SENTINEL\n")
+          }).pipe(Effect.provide([makeTestLayer(), TestToolkitLayer])))
+
         it.effect("emits only the specialized output for apply_patch results", () =>
           Effect.gen(function*() {
             const toolkit = Toolkit.make(OpenAiTool.ApplyPatch({}))
@@ -968,6 +1093,112 @@ describe("OpenAiLanguageModel", () => {
           ])
         ))
 
+      it.effect("routes invalid tool call params through failureMode: return without failing the effect", () =>
+        Effect.gen(function*() {
+          const toolkit = Toolkit.make(ReturnModeTool)
+          const handlers = toolkit.toLayer({
+            ReturnModeTool: ({ input }) => Effect.succeed({ output: `processed: ${input}` })
+          })
+
+          const result = yield* LanguageModel.generateText({
+            prompt: "Use the tool",
+            toolkit
+          }).pipe(
+            Effect.provide(OpenAiLanguageModel.model("gpt-4o-mini")),
+            Effect.provide(handlers)
+          )
+
+          strictEqual(result.toolResults.length, 1)
+          const toolResult = result.toolResults[0]!
+          strictEqual(toolResult.isFailure, true)
+          const failure = toolResult.result as AiError.AiError
+          strictEqual(failure._tag, "AiError")
+          strictEqual(failure.reason._tag, "ToolParameterValidationError")
+        }).pipe(
+          Effect.provide(makeTestLayer({
+            body: { output: [makeFunctionCall("ReturnModeTool", { input: 123 })] }
+          }))
+        ))
+
+      it.effect("converts transformed tool call params to the tool's standard encoded form", () =>
+        Effect.gen(function*() {
+          const received = yield* Ref.make<number | undefined>(undefined)
+          const toolkit = Toolkit.make(TransformParamsTool)
+          const handlers = toolkit.toLayer({
+            TransformParamsTool: ({ input }) =>
+              Ref.set(received, input).pipe(
+                Effect.as({ output: input * 2 })
+              )
+          })
+
+          const result = yield* LanguageModel.generateText({
+            prompt: "Use the tool",
+            toolkit
+          }).pipe(
+            Effect.provide(OpenAiLanguageModel.model("gpt-4o-mini")),
+            Effect.provide(handlers)
+          )
+
+          const toolCall = result.toolCalls[0]!
+          deepStrictEqual(toolCall.params, { input: "21" })
+          strictEqual(yield* Ref.get(received), 21)
+          strictEqual(result.toolResults[0]!.isFailure, false)
+          deepStrictEqual(result.toolResults[0]!.result, { output: 42 })
+        }).pipe(
+          Effect.provide(makeTestLayer({
+            body: { output: [makeFunctionCall("TransformParamsTool", { input: "21" })] }
+          }))
+        ))
+
+      it.effect("provides parameter encoding services to provider normalization", () =>
+        Effect.gen(function*() {
+          const used = yield* Ref.make(false)
+          const toolkit = Toolkit.make(AsymmetricParamsTool)
+          const handlers = toolkit.toLayer({
+            AsymmetricParamsTool: ({ input }) => Effect.succeed({ output: `processed: ${input}` })
+          })
+
+          const result = yield* LanguageModel.generateText({
+            prompt: "Use the tool",
+            toolkit
+          }).pipe(
+            Effect.provide(OpenAiLanguageModel.model("gpt-4o-mini")),
+            Effect.provide(handlers),
+            Effect.provideService(ParamEncodeService, { use: Ref.set(used, true) })
+          )
+
+          strictEqual(yield* Ref.get(used), true)
+          strictEqual(result.toolResults[0]!.isFailure, false)
+          deepStrictEqual(result.toolResults[0]!.result, { output: "processed: hello" })
+        }).pipe(
+          Effect.provide(makeTestLayer({
+            body: { output: [makeFunctionCall("AsymmetricParamsTool", { input: "hello" })] }
+          }))
+        ))
+
+      it.effect("provides parameter encoding services to provider normalization when tool call resolution is disabled", () =>
+        Effect.gen(function*() {
+          const used = yield* Ref.make(false)
+          const toolkit = Toolkit.make(AsymmetricParamsTool)
+
+          const result = yield* LanguageModel.generateText({
+            prompt: "Use the tool",
+            toolkit,
+            disableToolCallResolution: true
+          }).pipe(
+            Effect.provide(OpenAiLanguageModel.model("gpt-4o-mini")),
+            Effect.provideService(ParamEncodeService, { use: Ref.set(used, true) })
+          )
+
+          strictEqual(yield* Ref.get(used), true)
+          const toolCall = result.toolCalls[0]!
+          deepStrictEqual(toolCall.params, { input: "hello" })
+        }).pipe(
+          Effect.provide(makeTestLayer({
+            body: { output: [makeFunctionCall("AsymmetricParamsTool", { input: "hello" })] }
+          }))
+        ))
+
       it.effect("uses canonical OpenAiMcp name for mcp_call", () =>
         Effect.gen(function*() {
           const result = yield* LanguageModel.generateText({
@@ -986,6 +1217,7 @@ describe("OpenAiLanguageModel", () => {
           assert.isDefined(toolResult)
           if (toolResult?.type === "tool-result") {
             strictEqual(toolResult.name, "OpenAiMcp")
+            assertTrue(!toolResult.isFailure, "expected a successful MCP result")
             strictEqual(toolResult.result.name, "CheckPackage")
           }
         }).pipe(Effect.provide(makeTestLayer({
@@ -1026,6 +1258,47 @@ describe("OpenAiLanguageModel", () => {
           )
       )
 
+      for (const { tool, status } of webSearchFailures) {
+        it.effect(
+          `${tool.name} preserves ${status} results`,
+          () =>
+            Effect.gen(function*() {
+              const result = yield* LanguageModel.generateText({
+                prompt: "Search the web",
+                toolkit: Toolkit.make(tool)
+              }).pipe(Effect.provide(OpenAiLanguageModel.model("gpt-4o-mini")))
+              const toolResult = result.toolResults[0]!
+              strictEqual(toolResult.isFailure, true)
+              deepStrictEqual(toolResult.result, {
+                action: { type: "search", query: "Effect TypeScript" },
+                status
+              })
+            }).pipe(Effect.provide(makeTestLayer({
+              body: { output: [makeWebSearchCall({ status })] }
+            })))
+        )
+      }
+
+      it.effect.each(fileSearchOutcomes)(
+        "OpenAiFileSearch reports $status results",
+        ({ status, isFailure, results }) =>
+          Effect.gen(function*() {
+            const result = yield* LanguageModel.generateText({
+              prompt: "Search the files",
+              toolkit: Toolkit.make(OpenAiTool.FileSearch({ vector_store_ids: ["vs_123"] }))
+            }).pipe(Effect.provide(OpenAiLanguageModel.model("gpt-4o-mini")))
+            const toolResult = result.toolResults[0]!
+            strictEqual(toolResult.isFailure, isFailure)
+            deepStrictEqual(toolResult.result, {
+              status,
+              queries: ["Effect TypeScript"],
+              results: results ?? null
+            })
+          }).pipe(Effect.provide(makeTestLayer({
+            body: { output: [makeFileSearchCall({ status, ...(results === undefined ? {} : { results }) })] }
+          })))
+      )
+
       it.effect("uses canonical OpenAiMcp name for mcp_approval_request", () =>
         Effect.gen(function*() {
           const result = yield* LanguageModel.generateText({
@@ -1373,6 +1646,78 @@ describe("OpenAiLanguageModel", () => {
         assert.isDefined(toolParamsEnd)
       }))
 
+    it.effect("routes invalid tool call params through failureMode: return without failing the stream", () =>
+      Effect.gen(function*() {
+        const toolkit = Toolkit.make(ReturnModeTool)
+        const handlers = toolkit.toLayer({
+          ReturnModeTool: ({ input }) => Effect.succeed({ output: `processed: ${input}` })
+        })
+
+        const streamEvents = [
+          {
+            type: "response.created",
+            sequence_number: 1,
+            response: makeDefaultResponse({
+              id: "resp_invalid_params",
+              status: "in_progress",
+              output: []
+            })
+          },
+          {
+            type: "response.output_item.added",
+            sequence_number: 2,
+            output_index: 0,
+            item: {
+              type: "function_call",
+              id: "fc_1",
+              call_id: "call_1",
+              name: "ReturnModeTool",
+              arguments: "",
+              status: "in_progress"
+            }
+          },
+          {
+            type: "response.function_call_arguments.done",
+            sequence_number: 3,
+            output_index: 0,
+            item_id: "fc_1",
+            name: "ReturnModeTool",
+            arguments: "{\"input\":123}"
+          },
+          {
+            type: "response.completed",
+            sequence_number: 4,
+            response: makeDefaultResponse({
+              id: "resp_invalid_params",
+              status: "completed",
+              output: []
+            })
+          }
+        ] as unknown as ReadonlyArray<typeof Generated.ResponseStreamEvent.Type>
+
+        const partsChunk = yield* LanguageModel.streamText({
+          prompt: "Use the test tool",
+          toolkit
+        }).pipe(
+          Stream.runCollect,
+          Effect.provide(OpenAiLanguageModel.model("gpt-4o-mini")),
+          Effect.provide(makeStreamTestLayer(streamEvents)),
+          Effect.provide(handlers)
+        )
+
+        const parts = globalThis.Array.from(partsChunk)
+        const toolResults = parts.filter((part) => part.type === "tool-result")
+        strictEqual(toolResults.length, 1)
+        const toolResult = toolResults[0]
+        if (toolResult?.type === "tool-result") {
+          strictEqual(toolResult.isFailure, true)
+          const result = toolResult.result as AiError.AiError
+          strictEqual(result._tag, "AiError")
+          strictEqual(result.reason._tag, "ToolParameterValidationError")
+        }
+        assert.isDefined(parts.find((part) => part.type === "finish"))
+      }))
+
     it.effect("waits for the stable streamed web search action before emitting the tool call", () =>
       Effect.gen(function*() {
         const toolkit = Toolkit.make(OpenAiTool.WebSearch({}))
@@ -1426,6 +1771,63 @@ describe("OpenAiLanguageModel", () => {
         })
       }))
 
+    for (const { tool, status } of webSearchFailures) {
+      it.effect(
+        `${tool.name} preserves ${status} results from output_item.done`,
+        () =>
+          Effect.gen(function*() {
+            const parts = yield* LanguageModel.streamText({
+              prompt: "Search the web",
+              toolkit: Toolkit.make(tool)
+            }).pipe(
+              Stream.runCollect,
+              Effect.provide(OpenAiLanguageModel.model("gpt-4o-mini")),
+              Effect.provide(makeStreamTestLayer([{
+                type: "response.output_item.done",
+                sequence_number: 1,
+                output_index: 0,
+                item: makeWebSearchCall({ status })
+              }]))
+            )
+
+            const toolResult = parts.find((part) => part.type === "tool-result")!
+            strictEqual(toolResult.isFailure, true)
+            deepStrictEqual(toolResult.result, {
+              action: { type: "search", query: "Effect TypeScript" },
+              status
+            })
+          })
+      )
+    }
+
+    it.effect.each(fileSearchOutcomes)(
+      "OpenAiFileSearch reports $status results from output_item.done",
+      ({ status, isFailure, results }) =>
+        Effect.gen(function*() {
+          const parts = yield* LanguageModel.streamText({
+            prompt: "Search the files",
+            toolkit: Toolkit.make(OpenAiTool.FileSearch({ vector_store_ids: ["vs_123"] }))
+          }).pipe(
+            Stream.runCollect,
+            Effect.provide(OpenAiLanguageModel.model("gpt-4o-mini")),
+            Effect.provide(makeStreamTestLayer([{
+              type: "response.output_item.done",
+              sequence_number: 1,
+              output_index: 0,
+              item: makeFileSearchCall({ status, ...(results === undefined ? {} : { results }) })
+            }]))
+          )
+
+          const toolResult = parts.find((part) => part.type === "tool-result")!
+          strictEqual(toolResult.isFailure, isFailure)
+          deepStrictEqual(toolResult.result, {
+            status,
+            queries: ["Effect TypeScript"],
+            results: results ?? null
+          })
+        })
+    )
+
     it.effect("handles reasoning summary events when reasoning state is missing", () =>
       Effect.gen(function*() {
         const streamEvents = [
@@ -1540,6 +1942,7 @@ describe("OpenAiLanguageModel", () => {
         assert.isDefined(toolResult)
         if (toolResult?.type === "tool-result") {
           strictEqual(toolResult.name, "OpenAiMcp")
+          assertTrue(!toolResult.isFailure, "expected a successful MCP result")
           strictEqual(toolResult.result.name, "CheckPackage")
         }
       }))
@@ -1849,6 +2252,16 @@ const makeWebSearchCall = (
   ...overrides
 })
 
+const makeFileSearchCall = (
+  overrides: Partial<Generated.FileSearchToolCall> = {}
+): Generated.FileSearchToolCall => ({
+  type: "file_search_call",
+  id: "fs_123",
+  status: "completed",
+  queries: ["Effect TypeScript"],
+  ...overrides
+})
+
 const makeMcpCall = (
   name: string,
   args: Record<string, unknown>,
@@ -1912,6 +2325,42 @@ const TestTool = Tool.make("TestTool", {
   success: Schema.Struct({ output: Schema.String })
 })
 
+const ReturnModeTool = Tool.make("ReturnModeTool", {
+  description: "A test tool",
+  failureMode: "return",
+  parameters: Schema.Struct({ input: Schema.String }),
+  success: Schema.Struct({ output: Schema.String }),
+  failure: Schema.Struct({ error: Schema.String })
+})
+
+const TransformParamsTool = Tool.make("TransformParamsTool", {
+  description: "A test tool",
+  parameters: Schema.Struct({ input: Schema.FiniteFromString }),
+  success: Schema.Struct({ output: Schema.Finite })
+})
+
+class ParamEncodeService extends Context.Service<ParamEncodeService, {
+  readonly use: Effect.Effect<void>
+}>()("ParamEncodeService") {}
+
+const AsymmetricParam = Schema.String.pipe(
+  Schema.decodeTo(Schema.String, {
+    decode: SchemaGetter.passthrough(),
+    encode: SchemaGetter.transformEffect<string, string, ParamEncodeService>((value) =>
+      Effect.service(ParamEncodeService).pipe(
+        Effect.flatMap((service) => service.use),
+        Effect.as(value)
+      )
+    )
+  })
+)
+
+const AsymmetricParamsTool = Tool.make("AsymmetricParamsTool", {
+  description: "A test tool",
+  parameters: Schema.Struct({ input: AsymmetricParam }),
+  success: Schema.Struct({ output: Schema.String })
+})
+
 const TestToolkit = Toolkit.make(TestTool)
 
 const McpToolkit = Toolkit.make(OpenAiTool.Mcp({
diff --git a/repos/effect/packages/ai/openai/test/OpenAiSchema.test.ts b/repos/effect/packages/ai/openai/test/OpenAiSchema.test.ts
index 8cdd06a1b..1b97d692b 100644
--- a/repos/effect/packages/ai/openai/test/OpenAiSchema.test.ts
+++ b/repos/effect/packages/ai/openai/test/OpenAiSchema.test.ts
@@ -1,4 +1,4 @@
-import { OpenAiClient, OpenAiLanguageModel } from "@effect/ai-openai"
+import { Generated, OpenAiClient, OpenAiLanguageModel } from "@effect/ai-openai"
 import * as OpenAiSchema from "@effect/ai-openai/OpenAiSchema"
 import { assert, describe, it } from "@effect/vitest"
 import { Effect, Layer, Schema, Stream } from "effect"
@@ -17,6 +17,36 @@ const makeResponse = (overrides: Record<string, unknown> = {}) => ({
 })
 
 describe("OpenAiSchema", () => {
+  describe("web search sources", () => {
+    it("preserves API sources in response history", () => {
+      const item = {
+        type: "web_search_call",
+        id: "ws_123",
+        status: "completed",
+        action: { type: "search", sources: [{ type: "api", name: "oai-weather" }] }
+      } as const
+
+      assert.deepStrictEqual(Schema.decodeUnknownSync(Generated.InputItem)(item), item)
+    })
+
+    it.each([
+      { type: "url" },
+      { type: "api" },
+      { type: "api", name: null },
+      { type: "unknown", name: "oai-weather" }
+    ])("rejects malformed search sources: %j", (source) => {
+      const item = {
+        type: "web_search_call",
+        id: "ws_123",
+        status: "completed",
+        action: { type: "search", sources: [source] }
+      }
+
+      assert.throws(() => Schema.decodeUnknownSync(Generated.WebSearchToolCall)(item))
+      assert.throws(() => Schema.decodeUnknownSync(Generated.InputItem)(item))
+    })
+  })
+
   it("accepts max reasoning effort", () => {
     const decoded = Schema.decodeUnknownSync(OpenAiSchema.CreateResponse)({
       reasoning: { effort: "max" }
diff --git a/repos/effect/packages/ai/openai/typetest/OpenAiTool.tst.ts b/repos/effect/packages/ai/openai/typetest/OpenAiTool.tst.ts
new file mode 100644
index 000000000..49d018fe9
--- /dev/null
+++ b/repos/effect/packages/ai/openai/typetest/OpenAiTool.tst.ts
@@ -0,0 +1,50 @@
+import { type Generated, OpenAiTool } from "@effect/ai-openai"
+import type { Tool } from "effect/unstable/ai"
+import { describe, expect, it } from "tstyche"
+
+describe("OpenAiTool", () => {
+  it("distinguishes completed file searches from failed and unfinished searches", () => {
+    const fileSearch = OpenAiTool.FileSearch({ vector_store_ids: ["vs_123"] })
+
+    type Failure = {
+      readonly status: "in_progress" | "searching" | "incomplete" | "failed"
+      readonly queries: Generated.FileSearchToolCall["queries"]
+      readonly results: Exclude<Generated.FileSearchToolCall["results"], undefined>
+    }
+
+    expect<Tool.Failure<typeof fileSearch>>().type.toBe<Failure>()
+    expect<Tool.Success<typeof fileSearch>>().type.toBe<Omit<Failure, "status"> & { readonly status: "completed" }>()
+  })
+
+  it("distinguishes completed web searches from failed and unfinished searches", () => {
+    const webSearch = OpenAiTool.WebSearch({})
+
+    type Failure = {
+      readonly action: Generated.WebSearchToolCall["action"]
+      readonly status: "in_progress" | "searching" | "failed"
+    }
+
+    expect<Tool.Failure<typeof webSearch>>().type.toBe<Failure>()
+    expect<Tool.Success<typeof webSearch>["status"]>().type.toBe<"completed">()
+  })
+
+  it("keeps search sources optional and distinguishes URL sources from named API sources", () => {
+    const webSearch = OpenAiTool.WebSearch({})
+    const preview = OpenAiTool.WebSearchPreview({})
+    type Sources<Action extends Generated.WebSearchToolCall["action"]> = Pick<
+      Extract<Action, { type: "search" }>,
+      "sources"
+    >
+    type Expected = {
+      readonly sources?: ReadonlyArray<
+        | { readonly type: "url"; readonly url: string }
+        | { readonly type: "api"; readonly name: string }
+      >
+    }
+
+    expect<Sources<Tool.Parameters<typeof webSearch>["action"]>>().type.toBe<Expected>()
+    expect<Sources<Tool.Success<typeof webSearch>["action"]>>().type.toBe<Expected>()
+    expect<Sources<Tool.Failure<typeof webSearch>["action"]>>().type.toBe<Expected>()
+    expect<Sources<Tool.Success<typeof preview>["action"]>>().type.toBe<Expected>()
+  })
+})
diff --git a/repos/effect/packages/ai/openrouter/CHANGELOG.md b/repos/effect/packages/ai/openrouter/CHANGELOG.md
index 6c9f47b0a..b73053ad8 100644
--- a/repos/effect/packages/ai/openrouter/CHANGELOG.md
+++ b/repos/effect/packages/ai/openrouter/CHANGELOG.md
@@ -1,5 +1,53 @@
 # @effect/ai-openrouter
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- [#8287](https://github.com/Effect-TS/effect/pull/8287) [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2) Thanks @tim-smart! - Add `OpenRouterDecisionModel` for OpenRouter's alpha Decisions API.
+  
+  Custom `OpenRouterClient.Service` implementations and mocks must now provide `createDecisions`.
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- [#8170](https://github.com/Effect-TS/effect/pull/8170) [`b0f7be1`](https://github.com/Effect-TS/effect/commit/b0f7be17434838e2cfcda1f90f6ae299e61b2859) Thanks @JeremyFunk! - Fix negative text and uncached token usage when reasoning or cached counts exceed their parent totals. Treat these counts as disjoint, adding them to the total and retaining the parent count as text or uncached usage.
+  
+  Disjoint counts at or below their parent totals remain indistinguishable from subsets, so their totals are still undercounted.
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7588](https://github.com/Effect-TS/effect/pull/7588) [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494) Thanks @tim-smart! - Route tool call parameter validation failures through the tool's `failureMode` and drop `ToolParameterValidationError.toolParams`.
+
+- [#7764](https://github.com/Effect-TS/effect/pull/7764) [`62945c1`](https://github.com/Effect-TS/effect/commit/62945c1bafdf9dae2221eeda9cc705c0154c698c) Thanks @kitlangton! - Report `tool-calls` instead of `unknown` when an OpenRouter stream ends with `stop` after emitting tool calls and nonempty encrypted reasoning.
+
+- [#8102](https://github.com/Effect-TS/effect/pull/8102) [`98592a2`](https://github.com/Effect-TS/effect/commit/98592a2373ae3b7acd541905ec3696dfbd44453a) Thanks @tim-smart! - Exclude the provider-only `strictJsonSchema` option from outgoing OpenRouter request bodies while preserving structured-output and tool strictness settings.
+
+- [#7805](https://github.com/Effect-TS/effect/pull/7805) [`0b93584`](https://github.com/Effect-TS/effect/commit/0b935848082dd178db8278bff52a2cd07e5bf69a) Thanks @tim-smart! - Preserve plain-text client tool results when encoding provider requests.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/ai/openrouter/package.json b/repos/effect/packages/ai/openrouter/package.json
index deda898f1..343a59435 100644
--- a/repos/effect/packages/ai/openrouter/package.json
+++ b/repos/effect/packages/ai/openrouter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/ai-openrouter",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "An OpenRouter provider integration for Effect AI SDK",
diff --git a/repos/effect/packages/ai/openrouter/src/OpenRouterClient.ts b/repos/effect/packages/ai/openrouter/src/OpenRouterClient.ts
index 8a2e66429..5f57c9202 100644
--- a/repos/effect/packages/ai/openrouter/src/OpenRouterClient.ts
+++ b/repos/effect/packages/ai/openrouter/src/OpenRouterClient.ts
@@ -1,8 +1,6 @@
 /**
- * The `OpenRouterClient` module provides an Effect service for calling
- * OpenRouter's chat completions API. It wraps the generated OpenRouter HTTP
- * client with Effect-native constructors, layers, authentication and optional
- * site ranking headers, typed errors, and streaming support.
+ * HTTP client for OpenRouter's chat completions and alpha Decisions APIs,
+ * with authentication, site ranking headers, typed errors, and chat streaming.
  *
  * @since 4.0.0
  */
@@ -15,15 +13,16 @@ import * as Predicate from "effect/Predicate"
 import type * as Redacted from "effect/Redacted"
 import * as Schema from "effect/Schema"
 import * as Stream from "effect/Stream"
-import type * as AiError from "effect/unstable/ai/AiError"
+import * as AiError from "effect/unstable/ai/AiError"
 import * as Sse from "effect/unstable/encoding/Sse"
 import * as HttpBody from "effect/unstable/http/HttpBody"
 import * as HttpClient from "effect/unstable/http/HttpClient"
 import * as HttpClientRequest from "effect/unstable/http/HttpClientRequest"
-import type * as HttpClientResponse from "effect/unstable/http/HttpClientResponse"
+import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse"
 import * as Generated from "./Generated.ts"
 import * as Errors from "./internal/errors.ts"
 import { OpenRouterConfig } from "./OpenRouterConfig.ts"
+import * as OpenRouterSchema from "./OpenRouterSchema.ts"
 
 // =============================================================================
 // Service Interface
@@ -43,6 +42,13 @@ import { OpenRouterConfig } from "./OpenRouterConfig.ts"
 export interface Service {
   readonly client: Generated.OpenRouterClient
 
+  readonly createDecisions: (
+    options: typeof OpenRouterSchema.DecisionsRequest.Encoded
+  ) => Effect.Effect<
+    [body: typeof OpenRouterSchema.DecisionsResponse.Type, response: HttpClientResponse.HttpClientResponse],
+    AiError.AiError
+  >
+
   readonly createChatCompletion: (
     options: typeof Generated.ChatRequest.Encoded
   ) => Effect.Effect<
@@ -111,6 +117,10 @@ export class OpenRouterClient extends Context.Service<
 export type Options = {
   readonly apiKey?: Redacted.Redacted<string> | undefined
 
+  /**
+   * Base URL for the versioned API. Decisions replace a trailing "/v1" with
+   * "/alpha/decisions"; otherwise they append "/alpha/decisions" to this URL.
+   */
   readonly apiUrl?: string | undefined
 
   /**
@@ -140,10 +150,6 @@ export type Options = {
 /**
  * Creates an OpenRouter client service from explicit options.
  *
- * **When to use**
- *
- * Use when you need the OpenRouter client service value inside an effect.
- *
  * **Details**
  *
  * The returned service uses the current `HttpClient`, prepends `apiUrl` or
@@ -151,11 +157,8 @@ export type Options = {
  * `HTTP-Referer` and `X-Title` headers, accepts JSON responses, and applies
  * `transformClient` when provided.
  *
- * **Gotchas**
- *
  * Scoped `OpenRouterConfig.withClientTransform` applies to generated client
- * request methods. Streaming chat completion requests are sent directly by this
- * module and do not read that scoped transform.
+ * methods and alpha Decisions requests, but not streaming chat completions.
  *
  * @see {@link layer} for providing this client from explicit options
  * @see {@link layerConfig} for loading client settings from `Config`
@@ -167,21 +170,55 @@ export const make = Effect.fnUntraced(
   function*(options: Options): Effect.fn.Return<Service, never, HttpClient.HttpClient> {
     const baseClient = yield* HttpClient.HttpClient
 
-    const httpClient = baseClient.pipe(
-      HttpClient.mapRequest((request) =>
-        request.pipe(
-          HttpClientRequest.prependUrl(options.apiUrl ?? "https://openrouter.ai/api/v1"),
-          options.apiKey ? HttpClientRequest.bearerToken(options.apiKey) : identity,
-          options.siteReferrer ? HttpClientRequest.setHeader("HTTP-Referer", options.siteReferrer) : identity,
-          options.siteTitle ? HttpClientRequest.setHeader("X-Title", options.siteTitle) : identity,
-          HttpClientRequest.acceptJson
-        )
-      ),
-      options.transformClient ?? identity
-    )
+    const makeHttpClient = (baseUrl: string) =>
+      baseClient.pipe(
+        HttpClient.mapRequest((request) =>
+          request.pipe(
+            HttpClientRequest.prependUrl(baseUrl),
+            options.apiKey ? HttpClientRequest.bearerToken(options.apiKey) : identity,
+            options.siteReferrer ? HttpClientRequest.setHeader("HTTP-Referer", options.siteReferrer) : identity,
+            options.siteTitle ? HttpClientRequest.setHeader("X-Title", options.siteTitle) : identity,
+            HttpClientRequest.acceptJson
+          )
+        ),
+        options.transformClient ?? identity
+      )
 
+    const httpClient = makeHttpClient(options.apiUrl ?? "https://openrouter.ai/api/v1")
     const httpClientOk = HttpClient.filterStatusOk(httpClient)
 
+    // Remove the version suffix for alpha requests, preserving proxy prefixes.
+    const decisionsClient = makeHttpClient(
+      (options.apiUrl ?? "https://openrouter.ai/api/v1").replace(/\/v1\/?$/, "")
+    )
+    const createDecisions: Service["createDecisions"] = Effect.fnUntraced(
+      function*(payload) {
+        const config = yield* OpenRouterConfig.getOrUndefined
+        const client = HttpClient.filterStatusOk(
+          config?.transformClient ? config.transformClient(decisionsClient) : decisionsClient
+        )
+        const request = yield* HttpClientRequest.bodyJson(HttpClientRequest.post("/alpha/decisions"), payload).pipe(
+          Effect.mapError((error) =>
+            AiError.make({
+              module: "OpenRouterClient",
+              method: "createDecisions",
+              reason: new AiError.InvalidRequestError({ description: String(error) })
+            })
+          )
+        )
+        const response = yield* client.execute(request)
+        const body = yield* HttpClientResponse.schemaBodyJson(OpenRouterSchema.DecisionsResponse)(response)
+        return [body, response] as [
+          typeof OpenRouterSchema.DecisionsResponse.Type,
+          HttpClientResponse.HttpClientResponse
+        ]
+      },
+      Effect.catchTags({
+        HttpClientError: (error) => Errors.mapHttpClientError(error, "createDecisions"),
+        SchemaError: (error) => Effect.fail(Errors.mapSchemaError(error, "createDecisions"))
+      })
+    )
+
     const client = Generated.make(httpClient, {
       transformClient: Effect.fnUntraced(function*(client) {
         const config = yield* OpenRouterConfig.getOrUndefined
@@ -255,6 +292,7 @@ export const make = Effect.fnUntraced(
 
     return OpenRouterClient.of({
       client,
+      createDecisions,
       createChatCompletion,
       createChatCompletionStream
     })
diff --git a/repos/effect/packages/ai/openrouter/src/OpenRouterConfig.ts b/repos/effect/packages/ai/openrouter/src/OpenRouterConfig.ts
index e58445718..38a694af2 100644
--- a/repos/effect/packages/ai/openrouter/src/OpenRouterConfig.ts
+++ b/repos/effect/packages/ai/openrouter/src/OpenRouterConfig.ts
@@ -1,8 +1,5 @@
 /**
- * The `OpenRouterConfig` module lets a workflow temporarily customize the HTTP
- * client used by generated OpenRouter request methods. `OpenRouterClient` reads
- * this scoped transform when generated client operations execute, so callers can
- * add middleware or instrumentation without rebuilding the client layer.
+ * Scoped HTTP client customization for OpenRouter requests.
  *
  * @since 4.0.0
  */
@@ -12,13 +9,7 @@ import { dual } from "effect/Function"
 import type { HttpClient } from "effect/unstable/http/HttpClient"
 
 /**
- * Context service for scoped OpenRouter provider configuration used by client
- * operations.
- *
- * **When to use**
- *
- * Use as the context service tag when manually providing or reading scoped
- * OpenRouter provider configuration in an Effect context.
+ * Scoped configuration read when executing OpenRouter requests.
  *
  * @see {@link withClientTransform} for scoping an HTTP client transformation
  *
@@ -47,8 +38,7 @@ export class OpenRouterConfig extends Context.Service<
  */
 export declare namespace OpenRouterConfig {
   /**
-   * Configuration values read by OpenRouter provider operations when resolving
-   * the generated HTTP client.
+   * HTTP client configuration for generated methods and alpha Decisions requests.
    *
    * @category services
    * @since 4.0.0
@@ -59,26 +49,9 @@ export declare namespace OpenRouterConfig {
 }
 
 /**
- * Provides a scoped transform for the OpenRouter HTTP client used by provider
- * operations.
- *
- * **When to use**
- *
- * Use when you need temporary OpenRouter HTTP client customization for a
- * single effect or workflow without rebuilding the client layer.
- *
- * **Details**
- *
- * Supports both data-first and data-last forms. The transform is stored in the
- * scoped `OpenRouterConfig` service and read by generated OpenRouter request
- * operations while running the supplied effect.
- *
- * **Gotchas**
- *
- * If a transform is already present in the scoped config, this helper replaces
- * it. Compose transforms manually when both should apply. Streaming chat
- * completion requests are sent directly by `OpenRouterClient.make` and do not
- * read this scoped transform.
+ * Transforms the HTTP client for generated methods and alpha Decisions requests
+ * made by the supplied effect. Streaming chat completions ignore this transform.
+ * Replaces any existing scoped transform; compose them manually to apply both.
  *
  * @category configuration
  * @since 4.0.0
diff --git a/repos/effect/packages/ai/openrouter/src/OpenRouterDecisionModel.ts b/repos/effect/packages/ai/openrouter/src/OpenRouterDecisionModel.ts
new file mode 100644
index 000000000..4904ab18a
--- /dev/null
+++ b/repos/effect/packages/ai/openrouter/src/OpenRouterDecisionModel.ts
@@ -0,0 +1,136 @@
+/**
+ * Decision models backed by OpenRouter's alpha Decisions API.
+ *
+ * @since 4.0.0
+ */
+import * as Context from "effect/Context"
+import * as Effect from "effect/Effect"
+import * as Layer from "effect/Layer"
+import * as AiError from "effect/unstable/ai/AiError"
+import * as DecisionModel from "effect/unstable/ai/DecisionModel"
+import * as Model from "effect/unstable/ai/Model"
+import { OpenRouterClient } from "./OpenRouterClient.ts"
+import type * as OpenRouterSchema from "./OpenRouterSchema.ts"
+
+/**
+ * Request options that override model defaults at call time.
+ *
+ * @category services
+ * @since 4.0.0
+ */
+export class Config extends Context.Service<
+  Config,
+  Pick<
+    typeof OpenRouterSchema.DecisionsRequest.Encoded,
+    "provider" | "session_id" | "user" | "trace"
+  >
+>()("@effect/ai-openrouter/OpenRouterDecisionModel/Config") {}
+
+/**
+ * Creates an OpenRouter model descriptor with decision support.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const model = (
+  model: string,
+  config?: typeof Config.Service
+): Model.Model<"openrouter", DecisionModel.DecisionModel, OpenRouterClient> =>
+  Model.make("openrouter", model, layer({ model, config }))
+
+/**
+ * Creates a decision service that requires full choice and score distributions.
+ * Score indices map to criteria labels; cost, id, and provider metadata are omitted.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const make = Effect.fnUntraced(function*(options: {
+  readonly model: string
+  readonly config?: typeof Config.Service | undefined
+}): Effect.fn.Return<DecisionModel.DecisionModel, never, OpenRouterClient> {
+  const client = yield* OpenRouterClient
+  const config = Effect.contextWith((services: Context.Context<never>) =>
+    Effect.succeed({ ...options.config, ...Context.getOrUndefined(services, Config) })
+  )
+  return yield* DecisionModel.make({
+    decide: Effect.fnUntraced(function*({ state, decisions }) {
+      if (state === null || typeof state === "number" || typeof state === "boolean") {
+        return yield* AiError.make({
+          module: "OpenRouterDecisionModel",
+          method: "decide",
+          reason: new AiError.InvalidUserInputError({
+            description: "OpenRouter decision state must be a string, object, or array"
+          })
+        })
+      }
+      const questions: Record<string, typeof OpenRouterSchema.DecisionsQuestion.Encoded> = Object.create(null)
+      for (const [key, decision] of Object.entries(decisions)) {
+        switch (decision._tag) {
+          case "Classify":
+            questions[key] = { type: "choice", instructions: decision.instructions, criteria: decision.criteria }
+            break
+          case "Rate":
+            questions[key] = { type: "score", instructions: decision.instructions, criteria: decision.criteria }
+            break
+          case "Probability":
+            questions[key] = { type: "noul", instructions: decision.instructions, criteria: decision.criteria }
+            break
+        }
+      }
+      const [response] = yield* client.createDecisions({ ...yield* config, model: options.model, state, questions })
+      const answers: Record<string, DecisionModel.ProviderAnswer> = Object.create(null)
+      for (const [key, answer] of Object.entries(response.answers)) {
+        if (answer.type === "noul") {
+          answers[key] = { _tag: "Probability", probability: answer.noul }
+          continue
+        }
+        if (answer.probabilities === undefined) {
+          return yield* AiError.make({
+            module: "OpenRouterDecisionModel",
+            method: "decide",
+            reason: new AiError.InvalidOutputError({
+              description: `Provider returned no probabilities for decision "${key}"`
+            })
+          })
+        }
+        if (answer.type === "choice") {
+          answers[key] = {
+            _tag: "Classify",
+            label: answer.choice,
+            probabilities: answer.probabilities,
+            confidence: answer.confidence
+          }
+        } else {
+          const decision = decisions[key]
+          const probabilities: Record<string, number> = Object.create(null)
+          if (decision?._tag === "Rate") {
+            for (const [index, label] of decision.criteria.entries()) {
+              const probability = answer.probabilities[String(index)]
+              if (probability !== undefined) {
+                probabilities[label] = probability
+              }
+            }
+          }
+          answers[key] = { _tag: "Rate", rating: answer.score, probabilities, confidence: answer.confidence }
+        }
+      }
+      return {
+        answers,
+        usage: { inputTokens: response.usage.input_tokens, outputTokens: response.usage.output_tokens }
+      }
+    })
+  })
+})
+
+/**
+ * Provides a decision model using the OpenRouter client service.
+ *
+ * @category layers
+ * @since 4.0.0
+ */
+export const layer = (options: {
+  readonly model: string
+  readonly config?: typeof Config.Service | undefined
+}): Layer.Layer<DecisionModel.DecisionModel, never, OpenRouterClient> =>
+  Layer.effect(DecisionModel.DecisionModel, make(options))
diff --git a/repos/effect/packages/ai/openrouter/src/OpenRouterLanguageModel.ts b/repos/effect/packages/ai/openrouter/src/OpenRouterLanguageModel.ts
index b32664cd9..0a8d76918 100644
--- a/repos/effect/packages/ai/openrouter/src/OpenRouterLanguageModel.ts
+++ b/repos/effect/packages/ai/openrouter/src/OpenRouterLanguageModel.ts
@@ -516,7 +516,7 @@ export const model = (
  *
  * **When to use**
  *
- * Use when you need to construct a `LanguageModel.Service` value backed by
+ * Use when you need to construct a `LanguageModel` value backed by
  * `OpenRouterClient` inside an Effect.
  *
  * **Details**
@@ -541,7 +541,7 @@ export const model = (
 export const make = Effect.fnUntraced(function*({ model, config: providerConfig }: {
   readonly model: string
   readonly config?: Omit<typeof Config.Service, "model"> | undefined
-}): Effect.fn.Return<LanguageModel.Service, never, OpenRouterClient> {
+}): Effect.fn.Return<LanguageModel.LanguageModel, never, OpenRouterClient> {
   const client = yield* OpenRouterClient
   const codecTransformer = getCodecTransformer(model)
 
@@ -557,8 +557,9 @@ export const make = Effect.fnUntraced(function*({ model, config: providerConfig
       const messages = yield* prepareMessages({ options })
       const { tools, toolChoice } = yield* prepareTools({ options, transformer: codecTransformer })
       const responseFormat = yield* getResponseFormat({ config, options, transformer: codecTransformer })
+      const { strictJsonSchema: _sjs, ...apiConfig } = config
       const request: typeof Generated.ChatRequest.Encoded = {
-        ...config,
+        ...apiConfig,
         messages,
         ...(Predicate.isNotUndefined(responseFormat) ? { response_format: responseFormat } : undefined),
         ...(Predicate.isNotUndefined(tools) ? { tools } : undefined),
@@ -899,7 +900,7 @@ const prepareMessages = Effect.fnUntraced(
             messages.push({
               role: "tool",
               tool_call_id: part.id,
-              content: JSON.stringify(part.result)
+              content: typeof part.result === "string" ? part.result : JSON.stringify(part.result)
             })
           }
 
@@ -1046,7 +1047,6 @@ const makeResponse = Effect.fnUntraced(
               method: "makeResponse",
               reason: new AiError.ToolParameterValidationError({
                 toolName,
-                toolParams: {},
                 description: `Failed to securely JSON parse tool parameters: ${cause}`
               })
             })
@@ -1495,7 +1495,7 @@ const makeStreamResponse = Effect.fnUntraced(
             (detail) => detail.type === "reasoning.encrypted" && detail.data.length > 0
           )
           if (totalToolCalls > 0 && hasEncryptedReasoning && finishReason === "stop") {
-            finishReason = resolveFinishReason("tool-calls")
+            finishReason = "tool-calls"
           }
 
           // Forward any unsent tool calls if finish reason is 'tool-calls'
@@ -1844,16 +1844,21 @@ const getUsage = (usage: Generated.ChatUsage | undefined): Response.Usage => {
   const cacheReadTokens = usage.prompt_tokens_details?.cached_tokens ?? 0
   const cacheWriteTokens = usage.prompt_tokens_details?.cache_write_tokens ?? 0
   const reasoningTokens = usage.completion_tokens_details?.reasoning_tokens ?? 0
+  // Some providers report cached or reasoning tokens separately from their parent counts.
+  // Treat details exceeding the parent as disjoint to avoid negative remainders.
+  // Otherwise, retain subset accounting.
+  const inputTotal = cacheReadTokens > promptTokens ? promptTokens + cacheReadTokens : promptTokens
+  const outputTotal = reasoningTokens > completionTokens ? completionTokens + reasoningTokens : completionTokens
   return {
     inputTokens: {
-      uncached: promptTokens - cacheReadTokens,
-      total: promptTokens,
+      uncached: inputTotal - cacheReadTokens,
+      total: inputTotal,
       cacheRead: cacheReadTokens,
       cacheWrite: cacheWriteTokens
     },
     outputTokens: {
-      total: completionTokens,
-      text: completionTokens - reasoningTokens,
+      total: outputTotal,
+      text: outputTotal - reasoningTokens,
       reasoning: reasoningTokens
     }
   }
diff --git a/repos/effect/packages/ai/openrouter/src/OpenRouterSchema.ts b/repos/effect/packages/ai/openrouter/src/OpenRouterSchema.ts
new file mode 100644
index 000000000..76cc89521
--- /dev/null
+++ b/repos/effect/packages/ai/openrouter/src/OpenRouterSchema.ts
@@ -0,0 +1,112 @@
+/**
+ * Schemas for OpenRouter's alpha Decisions API.
+ *
+ * @since 4.0.0
+ */
+import * as Schema from "effect/Schema"
+import * as Generated from "./Generated.ts"
+
+/**
+ * A choice question with descriptions keyed by choice label.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ChoiceQuestion = Schema.Struct({
+  type: Schema.Literal("choice"),
+  instructions: Schema.String,
+  criteria: Schema.Record(Schema.String, Schema.String)
+})
+
+/**
+ * A score question with ordered criteria.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ScoreQuestion = Schema.Struct({
+  type: Schema.Literal("score"),
+  instructions: Schema.String,
+  criteria: Schema.Array(Schema.String)
+})
+
+/**
+ * A probability question with optional true and false descriptions.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const NoulQuestion = Schema.Struct({
+  type: Schema.Literal("noul"),
+  instructions: Schema.String,
+  criteria: Schema.optional(Schema.Struct({ true: Schema.String, false: Schema.String }))
+})
+
+/**
+ * A choice, ordered score, or probability question.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const DecisionsQuestion = Schema.Union([
+  ChoiceQuestion,
+  ScoreQuestion,
+  NoulQuestion
+])
+
+/**
+ * A provider answer with optional probabilities and confidence.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const Answer = Schema.Union([
+  Schema.Struct({
+    type: Schema.Literal("choice"),
+    choice: Schema.String,
+    confidence: Schema.optional(Schema.Finite),
+    probabilities: Schema.optional(Schema.Record(Schema.String, Schema.Finite))
+  }),
+  Schema.Struct({
+    type: Schema.Literal("score"),
+    score: Schema.Finite,
+    confidence: Schema.optional(Schema.Finite),
+    probabilities: Schema.optional(Schema.Record(Schema.String, Schema.Finite)),
+    legend: Schema.optional(Schema.Record(Schema.String, Schema.String))
+  }),
+  Schema.Struct({ type: Schema.Literal("noul"), noul: Schema.Finite })
+])
+
+/**
+ * Request body for the alpha Decisions endpoint.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const DecisionsRequest = Schema.Struct({
+  model: Schema.String,
+  state: Schema.Unknown,
+  questions: Schema.Record(Schema.String, DecisionsQuestion),
+  provider: Schema.optional(Generated.ProviderPreferences),
+  session_id: Schema.optional(Schema.String),
+  user: Schema.optional(Schema.String),
+  trace: Schema.optional(Schema.Record(Schema.String, Schema.Unknown))
+})
+
+/**
+ * Response body for the alpha Decisions endpoint.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const DecisionsResponse = Schema.Struct({
+  model: Schema.String,
+  answers: Schema.Record(Schema.String, Answer),
+  usage: Schema.Struct({
+    input_tokens: Schema.Int,
+    output_tokens: Schema.Int,
+    cost: Schema.optional(Schema.Finite)
+  }),
+  id: Schema.optional(Schema.String),
+  provider: Schema.optional(Schema.String)
+})
diff --git a/repos/effect/packages/ai/openrouter/src/index.ts b/repos/effect/packages/ai/openrouter/src/index.ts
index 2ea005eb1..7f5d1ab1d 100644
--- a/repos/effect/packages/ai/openrouter/src/index.ts
+++ b/repos/effect/packages/ai/openrouter/src/index.ts
@@ -5,7 +5,7 @@
 // @barrel: Auto-generated exports. Do not edit manually.
 
 /**
- * @since 4.0.0
+ * @since 1.0.0
  */
 export * as Generated from "./Generated.ts"
 
@@ -19,6 +19,11 @@ export * as OpenRouterClient from "./OpenRouterClient.ts"
  */
 export * as OpenRouterConfig from "./OpenRouterConfig.ts"
 
+/**
+ * @since 4.0.0
+ */
+export * as OpenRouterDecisionModel from "./OpenRouterDecisionModel.ts"
+
 /**
  * @since 4.0.0
  */
@@ -28,3 +33,8 @@ export * as OpenRouterError from "./OpenRouterError.ts"
  * @since 4.0.0
  */
 export * as OpenRouterLanguageModel from "./OpenRouterLanguageModel.ts"
+
+/**
+ * @since 4.0.0
+ */
+export * as OpenRouterSchema from "./OpenRouterSchema.ts"
diff --git a/repos/effect/packages/ai/openrouter/test/Generated.test.ts b/repos/effect/packages/ai/openrouter/test/Generated.test.ts
index 8790fed73..b81d3745d 100644
--- a/repos/effect/packages/ai/openrouter/test/Generated.test.ts
+++ b/repos/effect/packages/ai/openrouter/test/Generated.test.ts
@@ -1,7 +1,9 @@
-import { Generated } from "@effect/ai-openrouter"
+import { Generated, OpenRouterClient, OpenRouterLanguageModel } from "@effect/ai-openrouter"
 import { describe, it } from "@effect/vitest"
 import { deepStrictEqual } from "@effect/vitest/utils"
-import { Schema } from "effect"
+import { Effect, Schema, Stream } from "effect"
+import { type AiError, LanguageModel, type Response, Tool, Toolkit } from "effect/unstable/ai"
+import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
 
 describe("Generated", () => {
   it("decodes nullable generation statistics", () => {
@@ -72,4 +74,86 @@ describe("Generated", () => {
 
     deepStrictEqual(Schema.decodeUnknownSync(Generated.ChatUsage)(usage), usage)
   })
+
+  for (
+    const { encrypted, mode, reason, tool } of [
+      { mode: "stream", encrypted: true, tool: true, reason: "tool-calls" },
+      { mode: "stream", encrypted: false, tool: true, reason: "stop" },
+      { mode: "stream", encrypted: true, tool: false, reason: "stop" },
+      { mode: "generate", encrypted: true, tool: true, reason: "tool-calls" }
+    ] as const
+  ) {
+    it.effect(`${mode}: encrypted=${encrypted}, tool=${tool} finishes with ${reason}`, () =>
+      Effect.gen(function*() {
+        const metadata = { id: "response-1", model: "test/reasoning-model", created: 1 }
+        const reasoningDetails = encrypted
+          ? [{ type: "reasoning.encrypted", data: "opaque-signature", format: "unknown" } as const]
+          : []
+        const toolCalls = tool
+          ? [{
+            index: 0,
+            id: "call-1",
+            type: "function" as const,
+            function: { name: "ProbeTool", arguments: "{\"value\":1}" }
+          }]
+          : []
+        const usage = { prompt_tokens: 1, completion_tokens: 1, total_tokens: 2 }
+        const chunks = yield* Schema.decodeUnknownEffect(Schema.Array(Generated.ChatStreamChunk))([
+          {
+            ...metadata,
+            object: "chat.completion.chunk",
+            choices: [{ index: 0, delta: { reasoning_details: reasoningDetails, tool_calls: toolCalls } }]
+          },
+          {
+            ...metadata,
+            object: "chat.completion.chunk",
+            choices: [{ index: 0, delta: {}, finish_reason: "stop" }],
+            usage
+          }
+        ])
+        const body = yield* Schema.decodeUnknownEffect(Generated.SendChatCompletionRequest200)({
+          ...metadata,
+          object: "chat.completion",
+          system_fingerprint: null,
+          choices: [{
+            index: 0,
+            finish_reason: "stop",
+            message: { role: "assistant", reasoning_details: reasoningDetails, tool_calls: toolCalls }
+          }],
+          usage
+        })
+        const response = HttpClientResponse.fromWeb(
+          HttpClientRequest.post("https://example.com/chat/completions"),
+          new globalThis.Response()
+        )
+        const toolkit = Toolkit.make(Tool.make("ProbeTool", {
+          parameters: Schema.Struct({ value: Schema.Number }),
+          success: Schema.String
+        }))
+        const client = OpenRouterClient.OpenRouterClient.of({
+          client: Generated.make(HttpClient.make(() => Effect.die("Unexpected HTTP request"))),
+          createDecisions: () => Effect.die("Unexpected decisions request"),
+          createChatCompletion: () => Effect.succeed([body, response]),
+          createChatCompletionStream: () => Effect.succeed([response, Stream.fromIterable(chunks)])
+        })
+        const options = { prompt: "Use the probe tool", toolkit, disableToolCallResolution: true } as const
+        const operation: Effect.Effect<Array<Response.AnyPart>, AiError.AiError, LanguageModel.LanguageModel> =
+          mode === "stream"
+            ? LanguageModel.streamText(options).pipe(Stream.runCollect)
+            : LanguageModel.generateText(options).pipe(Effect.map((result) => result.content))
+        const parts = globalThis.Array.from(
+          yield* operation.pipe(
+            Effect.provide(OpenRouterLanguageModel.model(metadata.model)),
+            Effect.provide(toolkit.toLayer({ ProbeTool: () => Effect.succeed("ok") })),
+            Effect.provideService(OpenRouterClient.OpenRouterClient, client)
+          )
+        )
+
+        deepStrictEqual(
+          parts.filter((part) => part.type === "tool-call").map((part) => part.name),
+          tool ? ["ProbeTool"] : []
+        )
+        deepStrictEqual(parts.filter((part) => part.type === "finish").map((part) => part.reason), [reason])
+      }))
+  }
 })
diff --git a/repos/effect/packages/ai/openrouter/test/OpenRouterClient.test.ts b/repos/effect/packages/ai/openrouter/test/OpenRouterClient.test.ts
index 3e5eac5a4..c71fb0fa8 100644
--- a/repos/effect/packages/ai/openrouter/test/OpenRouterClient.test.ts
+++ b/repos/effect/packages/ai/openrouter/test/OpenRouterClient.test.ts
@@ -1,10 +1,41 @@
 import { OpenRouterClient } from "@effect/ai-openrouter"
 import * as Errors from "@effect/ai-openrouter/internal/errors"
 import { assert, describe, it } from "@effect/vitest"
-import { Context, Effect, Layer, Redacted, type Schema } from "effect"
+import { Cause, Context, Effect, Exit, Layer, Option, Redacted, type Schema } from "effect"
 import { HttpClient, type HttpClientError, type HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
 
 describe("OpenRouterClient", () => {
+  it.effect("rejects unserializable bigint decision state with a typed error before making an HTTP call", () =>
+    Effect.gen(function*() {
+      const client = yield* OpenRouterClient.OpenRouterClient
+      const exit = yield* client.createDecisions({
+        model: "test-model",
+        state: { n: 1n },
+        questions: {
+          urgent: {
+            type: "noul",
+            instructions: "Is this urgent?",
+            criteria: { false: "Not urgent", true: "Urgent" }
+          }
+        }
+      }).pipe(Effect.exit)
+
+      assert.deepStrictEqual(yield* MockHttpClient.requests, [])
+      assert.isTrue(Exit.isFailure(exit))
+      if (!Exit.isFailure(exit)) {
+        return yield* Effect.die(new Error("Expected serialization to fail"))
+      }
+      assert.isFalse(Cause.hasDies(exit.cause))
+      const error = Option.getOrThrow(Cause.findErrorOption(exit.cause))
+      assert.strictEqual(error._tag, "AiError")
+      assert.strictEqual(error.module, "OpenRouterClient")
+      assert.strictEqual(error.method, "createDecisions")
+      assert.strictEqual(error.reason._tag, "InvalidRequestError")
+    }).pipe(Effect.provide(makeTestLayer({
+      _tag: "Json",
+      body: {}
+    }))))
+
   it.effect("redacts the API key in AI error context", () =>
     Effect.gen(function*() {
       const client = yield* OpenRouterClient.OpenRouterClient
diff --git a/repos/effect/packages/ai/openrouter/test/OpenRouterDecisionModel.test.ts b/repos/effect/packages/ai/openrouter/test/OpenRouterDecisionModel.test.ts
new file mode 100644
index 000000000..b46ef9d10
--- /dev/null
+++ b/repos/effect/packages/ai/openrouter/test/OpenRouterDecisionModel.test.ts
@@ -0,0 +1,767 @@
+import { OpenRouterClient, OpenRouterConfig, OpenRouterDecisionModel } from "@effect/ai-openrouter"
+import { assert, describe, it } from "@effect/vitest"
+import { Effect, Layer, Redacted, Schema } from "effect"
+import { Decision, DecisionModel, Model } from "effect/unstable/ai"
+import { HttpClient, type HttpClientError, HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
+
+const Ticket = Schema.Struct({
+  message: Schema.String,
+  orderId: Schema.String
+})
+
+const TicketTriage = Decision.make({
+  input: Ticket,
+  decisions: {
+    department: Decision.classify({
+      instructions: "Which team should handle this",
+      criteria: {
+        billing: "Payment or subscription issues",
+        technical: "Bugs or integration problems",
+        sales: "Pricing or account questions"
+      }
+    }),
+    frustration: Decision.rate({
+      instructions: "How frustrated the customer appears",
+      criteria: ["Calm, just stating facts", "Frustrated but civil", "Very angry, strong language"]
+    }),
+    urgent: Decision.probability({
+      instructions: "The message conveys urgency or time-sensitivity",
+      criteria: {
+        false: "No time pressure",
+        true: "Needs action now"
+      }
+    })
+  }
+})
+
+const ticket = {
+  message: "Hi, I've been trying to connect my Stripe account for 3 days and it keeps failing. Please help ASAP.",
+  orderId: "A-104"
+}
+
+const decisionsResponse = {
+  model: "test/decision-model",
+  answers: {
+    department: {
+      type: "choice",
+      choice: "billing",
+      probabilities: { billing: 0.84, technical: 0.159, sales: 0.001 },
+      confidence: 0.596
+    },
+    frustration: {
+      type: "score",
+      score: 1.6,
+      legend: {
+        "0": "Calm, just stating facts",
+        "1": "Frustrated but civil",
+        "2": "Very angry, strong language"
+      },
+      probabilities: { "0": 0.05, "1": 0.3, "2": 0.65 },
+      confidence: 0.78
+    },
+    urgent: {
+      type: "noul",
+      noul: 0.999
+    }
+  },
+  usage: { input_tokens: 312, output_tokens: 48 }
+}
+
+describe("OpenRouterDecisionModel", () => {
+  it.effect("omits absent probability criteria from the encoded question", () =>
+    Effect.gen(function*() {
+      const definition = Decision.make({
+        input: Schema.String,
+        decisions: {
+          urgent: Decision.probability({ instructions: "Needs action now" })
+        }
+      })
+      const { answers } = yield* DecisionModel.decide(definition, { input: "Help ASAP" }).pipe(
+        Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+        Effect.provide(makeClientLayer((request) =>
+          Effect.gen(function*() {
+            const { questions } = yield* getRequestBody(request)
+            assert.deepStrictEqual(questions.urgent, {
+              type: "noul",
+              instructions: "Needs action now"
+            })
+
+            return jsonResponse(request, {
+              model: "test/decision-model",
+              answers: { urgent: { type: "noul", noul: 0.75 } },
+              usage: { input_tokens: 20, output_tokens: 4 }
+            })
+          })
+        ))
+      )
+
+      assert.deepStrictEqual(answers.urgent, { probability: 0.75 })
+    }))
+
+  for (const key of ["__proto__", "constructor", "toString"]) {
+    it.effect("round trips a classification label named " + key, () =>
+      Effect.gen(function*() {
+        const definition = Decision.make({
+          input: Schema.String,
+          decisions: {
+            category: Decision.classify({
+              instructions: "Choose a category",
+              criteria: { [key]: "Special category", ordinary: "Ordinary category" }
+            })
+          }
+        })
+        const { answers } = yield* DecisionModel.decide(definition, { input: "Help" }).pipe(
+          Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+          Effect.provide(makeClientLayer((request) =>
+            Effect.gen(function*() {
+              const { questions } = yield* getRequestBody(request)
+              const criteria = questions.category.criteria
+
+              assert.isTrue(Object.hasOwn(criteria, key))
+              assert.isTrue(Object.getOwnPropertyDescriptor(criteria, key)?.enumerable)
+              assert.deepStrictEqual(Object.keys(criteria), [key, "ordinary"])
+              assert.strictEqual(criteria[key], "Special category")
+              assert.strictEqual(Object.getPrototypeOf(criteria), Object.prototype)
+
+              return jsonResponse(request, {
+                model: "test/decision-model",
+                answers: {
+                  category: {
+                    type: "choice",
+                    choice: key,
+                    probabilities: { [key]: 0.75, ordinary: 0.25 },
+                    confidence: 0.5
+                  }
+                },
+                usage: { input_tokens: 10, output_tokens: 5 }
+              })
+            })
+          ))
+        )
+        const { label, probabilities } = answers.category
+
+        assert.isTrue(Object.hasOwn(probabilities, key))
+        assert.isTrue(Object.getOwnPropertyDescriptor(probabilities, key)?.enumerable)
+        assert.deepStrictEqual(Object.keys(probabilities), [key, "ordinary"])
+        assert.deepStrictEqual(probabilities, { [key]: 0.75, ordinary: 0.25 })
+        assert.strictEqual(label, key)
+        assert.strictEqual(Object.getPrototypeOf(probabilities), null)
+      }))
+
+    it.effect("maps a score distribution to a rate level named " + key, () =>
+      Effect.gen(function*() {
+        const definition = Decision.make({
+          input: Schema.String,
+          decisions: {
+            intensity: Decision.rate({ instructions: "How intense", criteria: ["low", key, "high"] })
+          }
+        })
+        const { answers } = yield* DecisionModel.decide(definition, { input: "Help" }).pipe(
+          Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+          Effect.provide(makeClientLayer((request) =>
+            Effect.gen(function*() {
+              const { questions } = yield* getRequestBody(request)
+              assert.deepStrictEqual(questions.intensity.criteria, ["low", key, "high"])
+
+              return jsonResponse(request, {
+                model: "test/decision-model",
+                answers: {
+                  intensity: {
+                    type: "score",
+                    score: 1.1,
+                    legend: { "0": "low", "1": key, "2": "high" },
+                    probabilities: { "0": 0.1, "1": 0.7, "2": 0.2 },
+                    confidence: 0.5
+                  }
+                },
+                usage: { input_tokens: 10, output_tokens: 5 }
+              })
+            })
+          ))
+        )
+        const { label, probabilities, rating } = answers.intensity
+
+        assert.isTrue(Object.hasOwn(probabilities, key))
+        assert.isTrue(Object.getOwnPropertyDescriptor(probabilities, key)?.enumerable)
+        assert.deepStrictEqual(Object.keys(probabilities), ["low", key, "high"])
+        assert.deepStrictEqual(probabilities, { low: 0.1, [key]: 0.7, high: 0.2 })
+        assert.strictEqual(label, key)
+        assert.strictEqual(rating, 1.1)
+        assert.strictEqual(Object.getPrototypeOf(probabilities), null)
+      }))
+
+    it.effect("sends an own enumerable question named " + key, () =>
+      Effect.gen(function*() {
+        const definition = Decision.make({
+          input: Schema.String,
+          decisions: {
+            [key]: Decision.probability({
+              instructions: "Needs action now",
+              criteria: { false: "No", true: "Yes" }
+            })
+          }
+        })
+        const { answers } = yield* DecisionModel.decide(definition, { input: "Help" }).pipe(
+          Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+          Effect.provide(makeClientLayer((request) =>
+            Effect.gen(function*() {
+              const { questions } = yield* getRequestBody(request)
+
+              assert.strictEqual(Object.getPrototypeOf(questions), Object.prototype)
+              assert.isTrue(Object.hasOwn(questions, key))
+              assert.isTrue(Object.getOwnPropertyDescriptor(questions, key)?.enumerable)
+              assert.deepStrictEqual(Object.keys(questions), [key])
+              assert.deepStrictEqual(questions[key], {
+                type: "noul",
+                instructions: "Needs action now",
+                criteria: { false: "No", true: "Yes" }
+              })
+
+              return jsonResponse(request, {
+                model: "test/decision-model",
+                answers: { [key]: { type: "noul", noul: 0.75 } },
+                usage: { input_tokens: 20, output_tokens: 4 }
+              })
+            })
+          ))
+        )
+
+        assert.strictEqual(Object.getPrototypeOf(answers), null)
+        assert.isTrue(Object.hasOwn(answers, key))
+        assert.isTrue(Object.getOwnPropertyDescriptor(answers, key)?.enumerable)
+        assert.deepStrictEqual(Object.keys(answers), [key])
+        assert.deepStrictEqual(answers[key], { probability: 0.75 })
+      }))
+  }
+
+  for (
+    const apiUrl of [
+      "https://proxy.test/openrouter/v1",
+      "https://proxy.test/openrouter/v1/",
+      "https://proxy.test/openrouter",
+      "https://proxy.test/openrouter/"
+    ]
+  ) {
+    it.effect("resolves the alpha endpoint for " + apiUrl, () =>
+      Effect.gen(function*() {
+        const requests: Array<HttpClientRequest.HttpClientRequest> = []
+        yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+          Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+          Effect.provide(makeClientLayer((request) => {
+            requests.push(request)
+            return Effect.succeed(jsonResponse(request, decisionsResponse))
+          }, apiUrl))
+        )
+        assert.strictEqual(requests.length, 1)
+        assert.strictEqual(requests[0].url, "https://proxy.test/openrouter/alpha/decisions")
+      }))
+  }
+
+  it.effect("applies a scoped client transform only to the enclosed decisions request", () =>
+    Effect.gen(function*() {
+      const requests: Array<HttpClientRequest.HttpClientRequest> = []
+      yield* Effect.gen(function*() {
+        yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+          OpenRouterConfig.withClientTransform(
+            HttpClient.mapRequest(HttpClientRequest.setHeader("x-decision-scope", "scoped"))
+          )
+        )
+        yield* DecisionModel.decide(TicketTriage, { input: ticket })
+      }).pipe(
+        Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+        Effect.provide(makeClientLayer((request) => {
+          requests.push(request)
+          return Effect.succeed(jsonResponse(request, decisionsResponse))
+        }))
+      )
+      assert.strictEqual(requests.length, 2)
+      assert.strictEqual(requests[0].headers["x-decision-scope"], "scoped")
+      assert.isUndefined(requests[1].headers["x-decision-scope"])
+    }))
+
+  it.effect("rejects numeric state before making an HTTP request", () =>
+    Effect.gen(function*() {
+      const definition = Decision.make({ input: Schema.Number, decisions: TicketTriage.decisions })
+      const error = yield* DecisionModel.decide(definition, { input: 42 }).pipe(
+        Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+        Effect.provide(makeClientLayer(() => Effect.die(new Error("Unexpected HTTP request")))),
+        Effect.flip
+      )
+      assert.strictEqual(error._tag, "AiError")
+      assert.strictEqual(error.reason._tag, "InvalidUserInputError")
+    }))
+
+  it.effect("maps a malformed successful response to a client InvalidOutputError", () =>
+    Effect.gen(function*() {
+      const error = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+        Effect.provide(makeClientLayer((request) =>
+          Effect.succeed(jsonResponse(request, {
+            ...decisionsResponse,
+            usage: { input_tokens: "not a number", output_tokens: 48 }
+          }))
+        )),
+        Effect.flip
+      )
+      assert.strictEqual(error._tag, "AiError")
+      assert.strictEqual(error.module, "OpenRouterClient")
+      assert.strictEqual(error.method, "createDecisions")
+      assert.strictEqual(error.reason._tag, "InvalidOutputError")
+    }))
+
+  it.effect("make constructs a DecisionModel service", () =>
+    Effect.gen(function*() {
+      const service = yield* OpenRouterDecisionModel.make({ model: "test/decision-model" })
+      assert.isFunction(service.decide)
+    }).pipe(Effect.provide(makeClientLayer(() => Effect.die(new Error("Unexpected HTTP request"))))))
+
+  it.effect("forwards request config and scoped overrides", () =>
+    Effect.gen(function*() {
+      const requests: Array<HttpClientRequest.HttpClientRequest> = []
+      yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provideService(OpenRouterDecisionModel.Config, { user: "scoped-user", trace: { trace_id: "scoped" } }),
+        Effect.provide(OpenRouterDecisionModel.layer({
+          model: "test/decision-model",
+          config: {
+            provider: { order: ["test-provider"] },
+            session_id: "session-1",
+            user: "default-user",
+            trace: { trace_id: "default" }
+          }
+        })),
+        Effect.provide(makeClientLayer((request) => {
+          requests.push(request)
+          return Effect.succeed(jsonResponse(request, decisionsResponse))
+        }))
+      )
+      const body = yield* getRequestBody(requests[0])
+      assert.deepStrictEqual(body.provider, { order: ["test-provider"] })
+      assert.strictEqual(body.session_id, "session-1")
+      assert.strictEqual(body.user, "scoped-user")
+      assert.deepStrictEqual(body.trace, { trace_id: "scoped" })
+    }))
+
+  it.effect("accepts absent confidence, cost, id and provider without inventing values", () =>
+    Effect.gen(function*() {
+      const { confidence: _choiceConfidence, ...department } = decisionsResponse.answers.department
+      const { confidence: _scoreConfidence, legend: _legend, ...frustration } = decisionsResponse.answers.frustration
+      const { answers, usage } = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+        Effect.provide(makeClientLayer((request) =>
+          Effect.succeed(jsonResponse(request, {
+            ...decisionsResponse,
+            answers: { ...decisionsResponse.answers, department, frustration }
+          }))
+        ))
+      )
+      assert.isUndefined(answers.department.confidence)
+      assert.isUndefined(answers.frustration.confidence)
+      assert.strictEqual(answers.frustration.label, "Very angry, strong language")
+      assert.strictEqual(answers.urgent.probability, 0.999)
+      assert.deepStrictEqual({ ...usage }, { inputTokens: 312, outputTokens: 48 })
+    }))
+
+  it.effect("drops provider-specific cost, id and provider metadata", () =>
+    Effect.gen(function*() {
+      const result = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+        Effect.provide(makeClientLayer((request) =>
+          Effect.succeed(jsonResponse(request, {
+            ...decisionsResponse,
+            id: "decision-1",
+            provider: "test-provider",
+            usage: { ...decisionsResponse.usage, cost: 0.001 }
+          }))
+        ))
+      )
+      assert.deepStrictEqual({ ...result.usage }, { inputTokens: 312, outputTokens: 48 })
+      assert.isFalse("id" in result)
+      assert.isFalse("provider" in result)
+      assert.isFalse("cost" in result.answers.department)
+    }))
+
+  it.effect("fails with InvalidOutputError when a choice answer omits probabilities", () =>
+    Effect.gen(function*() {
+      const { probabilities: _probabilities, ...department } = decisionsResponse.answers.department
+      const error = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+        Effect.provide(makeClientLayer((request) =>
+          Effect.succeed(jsonResponse(request, {
+            ...decisionsResponse,
+            answers: { ...decisionsResponse.answers, department }
+          }))
+        )),
+        Effect.flip
+      )
+      assert.strictEqual(error._tag, "AiError")
+      assert.strictEqual(error.reason._tag, "InvalidOutputError")
+    }))
+
+  it.effect("model provides DecisionModel with openrouter provider metadata", () =>
+    Effect.gen(function*() {
+      const provider = yield* Model.ProviderName
+      const modelName = yield* Model.ModelName
+      const model = yield* DecisionModel.DecisionModel
+
+      assert.strictEqual(provider, "openrouter")
+      assert.strictEqual(modelName, "test/decision-model")
+      assert.isDefined(model.decide)
+    }).pipe(
+      Effect.provide(OpenRouterDecisionModel.model("test/decision-model")),
+      Effect.provide(makeClientLayer(() => Effect.die(new Error("Unexpected HTTP request"))))
+    ))
+
+  it.effect("sends the encoded input as state and every decision as a question in one request", () =>
+    Effect.gen(function*() {
+      const requests: Array<HttpClientRequest.HttpClientRequest> = []
+      const clientLayer = makeClientLayer((request) => {
+        requests.push(request)
+        return Effect.succeed(jsonResponse(request, decisionsResponse))
+      })
+
+      yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+        Effect.provide(clientLayer)
+      )
+
+      assert.strictEqual(requests.length, 1)
+      assert.strictEqual(requests[0].method, "POST")
+      assert.strictEqual(requests[0].url, "https://openrouter.ai/api/alpha/decisions")
+      assert.strictEqual(requests[0].headers["authorization"], "Bearer or-test-key")
+
+      assert.strictEqual(requests[0].headers["http-referer"], "https://example.com")
+      assert.strictEqual(requests[0].headers["x-title"], "Decision contract tests")
+
+      const body = yield* getRequestBody(requests[0])
+      assert.deepStrictEqual(body, {
+        state: {
+          message: ticket.message,
+          orderId: "A-104"
+        },
+        model: "test/decision-model",
+        questions: {
+          department: {
+            type: "choice",
+            instructions: "Which team should handle this",
+            criteria: {
+              billing: "Payment or subscription issues",
+              technical: "Bugs or integration problems",
+              sales: "Pricing or account questions"
+            }
+          },
+          frustration: {
+            type: "score",
+            instructions: "How frustrated the customer appears",
+            criteria: ["Calm, just stating facts", "Frustrated but civil", "Very angry, strong language"]
+          },
+          urgent: {
+            type: "noul",
+            instructions: "The message conveys urgency or time-sensitivity",
+            criteria: {
+              false: "No time pressure",
+              true: "Needs action now"
+            }
+          }
+        }
+      })
+    }))
+
+  it.effect("maps choice, score, and noul answers onto classify, rate, and probability answers", () =>
+    Effect.gen(function*() {
+      const { answers, usage } = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+        Effect.provide(makeClientLayer((request) => Effect.succeed(jsonResponse(request, decisionsResponse))))
+      )
+
+      assert.strictEqual(answers.department.label, "billing")
+      assert.deepStrictEqual(answers.department.probabilities, { billing: 0.84, technical: 0.159, sales: 0.001 })
+      assert.strictEqual(answers.department.confidence, 0.596)
+
+      assert.strictEqual(answers.frustration.rating, 1.6)
+      assert.strictEqual(answers.frustration.label, "Very angry, strong language")
+      assert.deepStrictEqual(answers.frustration.probabilities, {
+        "Calm, just stating facts": 0.05,
+        "Frustrated but civil": 0.3,
+        "Very angry, strong language": 0.65
+      })
+      assert.strictEqual(answers.frustration.confidence, 0.78)
+
+      assert.strictEqual(answers.urgent.probability, 0.999)
+      assert.isFalse("confidence" in answers.urgent)
+
+      assert.strictEqual(usage.inputTokens, 312)
+      assert.strictEqual(usage.outputTokens, 48)
+    }))
+
+  it.effect("encodes an explicitly undefined optional input field as JSON null", () =>
+    Effect.gen(function*() {
+      const requests: Array<HttpClientRequest.HttpClientRequest> = []
+      const definition = Decision.make({
+        input: Schema.Struct({ message: Schema.String, orderId: Schema.optional(Schema.String) }),
+        decisions: TicketTriage.decisions
+      })
+      const { answers } = yield* DecisionModel.decide(definition, {
+        input: { message: ticket.message, orderId: undefined }
+      }).pipe(
+        Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+        Effect.provide(makeClientLayer((request) => {
+          requests.push(request)
+          return Effect.succeed(jsonResponse(request, decisionsResponse))
+        }))
+      )
+
+      assert.strictEqual(requests.length, 1)
+      const body = yield* getRequestBody(requests[0])
+      assert.deepStrictEqual(body.state, { message: ticket.message, orderId: null })
+      assert.strictEqual(answers.urgent.probability, 0.999)
+    }))
+
+  it.effect("sends a pinned model id through unchanged", () =>
+    Effect.gen(function*() {
+      const requests: Array<HttpClientRequest.HttpClientRequest> = []
+
+      const modelName = yield* Effect.gen(function*() {
+        yield* DecisionModel.decide(TicketTriage, { input: ticket })
+        return yield* Model.ModelName
+      }).pipe(
+        Effect.provide(OpenRouterDecisionModel.model("test/decision-model-pinned")),
+        Effect.provide(makeClientLayer((request) => {
+          requests.push(request)
+          return Effect.succeed(jsonResponse(request, { ...decisionsResponse, model: "test/decision-model-pinned" }))
+        }))
+      )
+
+      const body = yield* getRequestBody(requests[0])
+      assert.strictEqual(modelName, "test/decision-model-pinned")
+      assert.strictEqual(body.model, "test/decision-model-pinned")
+    }))
+
+  it.effect("passes a string input through as a string state", () =>
+    Effect.gen(function*() {
+      const requests: Array<HttpClientRequest.HttpClientRequest> = []
+      const Sentiment = Decision.make({
+        input: Schema.String,
+        decisions: {
+          urgent: Decision.probability({
+            instructions: "The message conveys urgency",
+            criteria: { false: "No time pressure", true: "Needs action now" }
+          })
+        }
+      })
+
+      yield* DecisionModel.decide(Sentiment, { input: "My card was charged twice." }).pipe(
+        Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+        Effect.provide(makeClientLayer((request) => {
+          requests.push(request)
+          return Effect.succeed(jsonResponse(request, {
+            model: "test/decision-model",
+            answers: { urgent: { type: "noul", noul: 0.93 } },
+            usage: { input_tokens: 20, output_tokens: 4 }
+          }))
+        }))
+      )
+
+      const body = yield* getRequestBody(requests[0])
+      assert.strictEqual(body.state, "My card was charged twice.")
+    }))
+
+  it.effect("passes an array input through as an array state", () =>
+    Effect.gen(function*() {
+      const requests: Array<HttpClientRequest.HttpClientRequest> = []
+      const Conversation = Decision.make({
+        input: Schema.Array(Schema.String),
+        decisions: {
+          urgent: Decision.probability({
+            instructions: "The message conveys urgency",
+            criteria: { false: "No time pressure", true: "Needs action now" }
+          })
+        }
+      })
+
+      yield* DecisionModel.decide(Conversation, {
+        input: ["Hi", "My customer number is TS1337.", "My card was charged twice."]
+      }).pipe(
+        Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+        Effect.provide(makeClientLayer((request) => {
+          requests.push(request)
+          return Effect.succeed(jsonResponse(request, {
+            model: "test/decision-model",
+            answers: { urgent: { type: "noul", noul: 0.93 } },
+            usage: { input_tokens: 20, output_tokens: 4 }
+          }))
+        }))
+      )
+
+      const body = yield* getRequestBody(requests[0])
+      assert.deepStrictEqual(body.state, ["Hi", "My customer number is TS1337.", "My card was charged twice."])
+    }))
+
+  it.effect("fails with InvalidOutputError when an answer type does not match the decision", () =>
+    Effect.gen(function*() {
+      const error = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+        Effect.provide(makeClientLayer((request) =>
+          Effect.succeed(jsonResponse(request, {
+            ...decisionsResponse,
+            answers: {
+              ...decisionsResponse.answers,
+              urgent: {
+                type: "choice",
+                choice: "true",
+                probabilities: { true: 0.9, false: 0.1 },
+                confidence: 0.8
+              }
+            }
+          }))
+        )),
+        Effect.flip
+      )
+
+      assert.strictEqual(error._tag, "AiError")
+      assert.strictEqual(error.reason._tag, "InvalidOutputError")
+    }))
+
+  it.effect("fails with InvalidOutputError when an answer is missing", () =>
+    Effect.gen(function*() {
+      const { urgent: _urgent, ...answers } = decisionsResponse.answers
+      const error = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+        Effect.provide(
+          makeClientLayer((request) => Effect.succeed(jsonResponse(request, { ...decisionsResponse, answers })))
+        ),
+        Effect.flip
+      )
+
+      assert.strictEqual(error._tag, "AiError")
+      assert.strictEqual(error.reason._tag, "InvalidOutputError")
+    }))
+
+  it.effect("fails with InvalidOutputError when a score answer omits probabilities", () =>
+    Effect.gen(function*() {
+      const { probabilities: _probabilities, ...frustration } = decisionsResponse.answers.frustration
+      const error = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+        Effect.provide(makeClientLayer((request) =>
+          Effect.succeed(jsonResponse(request, {
+            ...decisionsResponse,
+            answers: { ...decisionsResponse.answers, frustration }
+          }))
+        )),
+        Effect.flip
+      )
+
+      assert.strictEqual(error._tag, "AiError")
+      assert.strictEqual(error.reason._tag, "InvalidOutputError")
+    }))
+
+  it.effect("fails with InvalidOutputError when a score distribution skips a level index", () =>
+    Effect.gen(function*() {
+      const error = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+        Effect.provide(makeClientLayer((request) =>
+          Effect.succeed(jsonResponse(request, {
+            ...decisionsResponse,
+            answers: {
+              ...decisionsResponse.answers,
+              frustration: {
+                ...decisionsResponse.answers.frustration,
+                probabilities: { "0": 0.35, "2": 0.65 }
+              }
+            }
+          }))
+        )),
+        Effect.flip
+      )
+
+      assert.strictEqual(error._tag, "AiError")
+      assert.strictEqual(error.reason._tag, "InvalidOutputError")
+    }))
+
+  for (
+    const [status, reason] of [
+      [400, "InvalidRequestError"],
+      [401, "AuthenticationError"],
+      [402, "UnknownError"],
+      [403, "AuthenticationError"],
+      [404, "InvalidRequestError"],
+      [413, "UnknownError"],
+      [429, "RateLimitError"],
+      [500, "InternalProviderError"],
+      [502, "InternalProviderError"],
+      [503, "InternalProviderError"],
+      [524, "InternalProviderError"],
+      [529, "InternalProviderError"]
+    ] as const
+  ) {
+    it.effect("maps HTTP " + status + " using the existing OpenRouter error mapping", () =>
+      Effect.gen(function*() {
+        const error = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+          Effect.provide(OpenRouterDecisionModel.layer({ model: "test/decision-model" })),
+          Effect.provide(makeClientLayer((request) =>
+            Effect.succeed(HttpClientResponse.fromWeb(
+              request,
+              new Response(
+                JSON.stringify({ error: { message: "Decision request failed", code: status } }),
+                { status, headers: { "content-type": "application/json", "retry-after": "3" } }
+              )
+            ))
+          )),
+          Effect.flip
+        )
+        assert.strictEqual(error._tag, "AiError")
+        assert.strictEqual(error.reason._tag, reason)
+      }))
+  }
+})
+
+const makeClientLayer = (
+  handler: (
+    request: HttpClientRequest.HttpClientRequest
+  ) => Effect.Effect<HttpClientResponse.HttpClientResponse, HttpClientError.HttpClientError>,
+  apiUrl?: string
+) =>
+  OpenRouterClient.layer({
+    apiUrl,
+    apiKey: Redacted.make("or-test-key"),
+    siteReferrer: "https://example.com",
+    siteTitle: "Decision contract tests"
+  }).pipe(
+    Layer.provide(Layer.succeed(HttpClient.HttpClient, makeHttpClient(handler)))
+  )
+
+const makeHttpClient = (
+  handler: (
+    request: HttpClientRequest.HttpClientRequest
+  ) => Effect.Effect<HttpClientResponse.HttpClientResponse, HttpClientError.HttpClientError>
+) =>
+  HttpClient.makeWith(
+    Effect.fnUntraced(function*(requestEffect) {
+      const request = yield* requestEffect
+      return yield* handler(request)
+    }),
+    Effect.succeed as HttpClient.HttpClient.Preprocess<HttpClientError.HttpClientError, never>
+  )
+
+const jsonResponse = (
+  request: HttpClientRequest.HttpClientRequest,
+  body: unknown
+): HttpClientResponse.HttpClientResponse =>
+  HttpClientResponse.fromWeb(
+    request,
+    new Response(JSON.stringify(body), {
+      status: 200,
+      headers: {
+        "content-type": "application/json"
+      }
+    })
+  )
+
+const getRequestBody = (request: HttpClientRequest.HttpClientRequest) =>
+  Effect.gen(function*() {
+    const body = request.body
+    if (body._tag === "Uint8Array") {
+      const text = new TextDecoder().decode(body.body)
+      return JSON.parse(text)
+    }
+    return yield* Effect.die(new Error("Expected Uint8Array body"))
+  })
diff --git a/repos/effect/packages/ai/openrouter/test/OpenRouterLanguageModel.test.ts b/repos/effect/packages/ai/openrouter/test/OpenRouterLanguageModel.test.ts
index ab6738fdd..1fa775be2 100644
--- a/repos/effect/packages/ai/openrouter/test/OpenRouterLanguageModel.test.ts
+++ b/repos/effect/packages/ai/openrouter/test/OpenRouterLanguageModel.test.ts
@@ -6,6 +6,49 @@ import { LanguageModel, Prompt, Tool, Toolkit } from "effect/unstable/ai"
 import { HttpClient, type HttpClientError, type HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
 
 describe("OpenRouterLanguageModel", () => {
+  describe("strictJsonSchema", () => {
+    it.effect("omits false from requests while preserving response strictness", () =>
+      Effect.gen(function*() {
+        yield* LanguageModel.generateObject({
+          prompt: "Give me a name",
+          schema: Schema.Struct({ name: Schema.String })
+        }).pipe(Effect.provide(OpenRouterLanguageModel.model("openai/gpt-4o-mini", { strictJsonSchema: false })))
+
+        const requests = yield* MockHttpClient.requests
+        const body = yield* getRequestBody(requests[0])
+        strictEqual(body.response_format.json_schema.strict, false)
+        assert.notProperty(body, "strictJsonSchema")
+      }).pipe(Effect.provide(makeTestLayer({
+        body: {
+          choices: [{
+            finish_reason: "stop",
+            index: 0,
+            message: { role: "assistant", content: JSON.stringify({ name: "Alice" }) }
+          }]
+        }
+      }))))
+
+    it.effect("omits true from streaming requests while preserving tool strictness", () =>
+      Effect.gen(function*() {
+        const tool = Tool.make("FlexibleTool", { parameters: Schema.Struct({ query: Schema.String }) })
+          .annotate(Tool.Strict, false)
+        yield* LanguageModel.streamText({
+          prompt: "Use a tool",
+          toolkit: Toolkit.make(tool),
+          disableToolCallResolution: true
+        }).pipe(
+          Stream.runDrain,
+          Effect.provide(OpenRouterLanguageModel.model("openai/gpt-4o-mini", { strictJsonSchema: true }))
+        )
+
+        const requests = yield* MockHttpClient.requests
+        const body = yield* getRequestBody(requests[0])
+        strictEqual(body.stream, true)
+        strictEqual(body.tools[0].function.strict, false)
+        assert.notProperty(body, "strictJsonSchema")
+      }).pipe(Effect.provide(makeStreamTestLayer([]))))
+  })
+
   describe("generateText", () => {
     describe("message preparation", () => {
       describe("audio file parts", () => {
@@ -171,6 +214,42 @@ describe("OpenRouterLanguageModel", () => {
             }])
           }).pipe(Effect.provide(makeTestLayer())))
       })
+
+      it.effect("preserves string tool results", () =>
+        Effect.gen(function*() {
+          yield* LanguageModel.generateText({
+            prompt: Prompt.make([
+              { role: "user", content: "Use the tool" },
+              {
+                role: "assistant",
+                content: [Prompt.toolCallPart({
+                  id: "call_text",
+                  name: "text_tool",
+                  params: {},
+                  providerExecuted: false
+                })]
+              },
+              {
+                role: "tool",
+                content: [Prompt.toolResultPart({
+                  id: "call_text",
+                  name: "text_tool",
+                  result: "PLAIN_TEXT_SENTINEL\n",
+                  isFailure: false,
+                  providerExecuted: false
+                })]
+              }
+            ]),
+            disableToolCallResolution: true
+          }).pipe(Effect.provide(OpenRouterLanguageModel.model("google/gemini-2.5-flash")))
+
+          const requests = yield* MockHttpClient.requests
+          const body = yield* getRequestBody(requests[0])
+          const toolResult = body.messages.find((message: any) => message.role === "tool")
+
+          assert.isDefined(toolResult)
+          strictEqual(toolResult.content, "PLAIN_TEXT_SENTINEL\n")
+        }).pipe(Effect.provide(makeTestLayer())))
     })
 
     describe("tool preparation", () => {
@@ -208,9 +287,129 @@ describe("OpenRouterLanguageModel", () => {
           deepStrictEqual(tool.function.parameters, inputSchema)
         }).pipe(Effect.provide(makeTestLayer())))
     })
+
+    describe("usage", () => {
+      it.effect("derives text and uncached tokens when details are subsets of their totals", () =>
+        Effect.gen(function*() {
+          const result = yield* LanguageModel.generateText({ prompt: "Hello" }).pipe(
+            Effect.provide(OpenRouterLanguageModel.model("openai/gpt-4o-mini"))
+          )
+
+          deepStrictEqual(
+            result.usage.inputTokens,
+            { uncached: 70, total: 100, cacheRead: 30, cacheWrite: 0 },
+            "subset input usage"
+          )
+          deepStrictEqual(result.usage.outputTokens, { total: 50, text: 30, reasoning: 20 }, "subset output usage")
+        }).pipe(Effect.provide(makeTestLayer({
+          body: {
+            usage: {
+              prompt_tokens: 100,
+              prompt_tokens_details: { cached_tokens: 30 },
+              completion_tokens: 50,
+              completion_tokens_details: { reasoning_tokens: 20 },
+              total_tokens: 150
+            }
+          }
+        }))))
+
+      it.effect("preserves totals when detail counts equal their parent counts", () =>
+        Effect.gen(function*() {
+          const result = yield* LanguageModel.generateText({ prompt: "Hello" }).pipe(
+            Effect.provide(OpenRouterLanguageModel.model("openai/gpt-4o-mini"))
+          )
+
+          deepStrictEqual(
+            result.usage.inputTokens,
+            { uncached: 0, total: 100, cacheRead: 100, cacheWrite: 0 },
+            "input usage at equality"
+          )
+          deepStrictEqual(result.usage.outputTokens, { total: 20, text: 0, reasoning: 20 }, "output usage at equality")
+        }).pipe(Effect.provide(makeTestLayer({
+          body: {
+            usage: {
+              prompt_tokens: 100,
+              prompt_tokens_details: { cached_tokens: 100 },
+              completion_tokens: 20,
+              completion_tokens_details: { reasoning_tokens: 20 },
+              total_tokens: 120
+            }
+          }
+        }))))
+
+      it.effect("treats reasoning tokens as disjoint when they exceed completion tokens", () =>
+        Effect.gen(function*() {
+          const result = yield* LanguageModel.generateText({ prompt: "Hello" }).pipe(
+            Effect.provide(OpenRouterLanguageModel.model("openai/gpt-4o-mini"))
+          )
+
+          deepStrictEqual(result.usage.outputTokens, { total: 30, text: 10, reasoning: 20 }, "disjoint reasoning usage")
+        }).pipe(Effect.provide(makeTestLayer({
+          body: {
+            usage: {
+              prompt_tokens: 100,
+              completion_tokens: 10,
+              completion_tokens_details: { reasoning_tokens: 20 },
+              total_tokens: 110
+            }
+          }
+        }))))
+
+      it.effect("treats cached tokens as disjoint when they exceed prompt tokens", () =>
+        Effect.gen(function*() {
+          const result = yield* LanguageModel.generateText({ prompt: "Hello" }).pipe(
+            Effect.provide(OpenRouterLanguageModel.model("openai/gpt-4o-mini"))
+          )
+
+          deepStrictEqual(
+            result.usage.inputTokens,
+            { uncached: 100, total: 400, cacheRead: 300, cacheWrite: 0 },
+            "disjoint cached usage"
+          )
+        }).pipe(Effect.provide(makeTestLayer({
+          body: {
+            usage: {
+              prompt_tokens: 100,
+              prompt_tokens_details: { cached_tokens: 300 },
+              completion_tokens: 10,
+              total_tokens: 110
+            }
+          }
+        }))))
+    })
   })
 
   describe("streamText", () => {
+    describe("usage", () => {
+      it.effect("treats streamed reasoning tokens as disjoint when they exceed completion tokens", () =>
+        Effect.gen(function*() {
+          const parts = yield* LanguageModel.streamText({ prompt: "Hello" }).pipe(
+            Stream.runCollect,
+            Effect.provide(OpenRouterLanguageModel.model("openai/gpt-4o-mini")),
+            Effect.provide(makeStreamTestLayer([{
+              id: "response-1",
+              object: "chat.completion.chunk",
+              model: "openai/gpt-4o-mini",
+              created: 1,
+              choices: [],
+              usage: {
+                prompt_tokens: 100,
+                completion_tokens: 10,
+                completion_tokens_details: { reasoning_tokens: 20 },
+                total_tokens: 110
+              }
+            }]))
+          )
+
+          const finishPart = parts.find((part) => part.type === "finish")
+          deepStrictEqual(
+            finishPart?.usage.outputTokens,
+            { total: 30, text: 10, reasoning: 20 },
+            "streamed disjoint reasoning usage"
+          )
+        }))
+    })
+
     it.effect("preserves streamed citation start and end indexes", () =>
       Effect.gen(function*() {
         const parts = yield* LanguageModel.streamText({ prompt: "cite a source" }).pipe(
@@ -439,20 +638,27 @@ const getRequestBody = (request: HttpClientRequest.HttpClientRequest) =>
 
 const makeStreamTestLayer = (events: ReadonlyArray<typeof Generated.ChatStreamChunk.Encoded>) => {
   const body = events.map((event) => `data: ${JSON.stringify(event)}\n\n`).join("") + "data: [DONE]\n\n"
-  const httpClient = HttpClient.makeWith(
-    Effect.fnUntraced(function*(requestEffect) {
-      const request = yield* requestEffect
-      return HttpClientResponse.fromWeb(
-        request,
-        new Response(body, {
-          status: 200,
-          headers: { "content-type": "text/event-stream" }
-        })
-      )
-    }),
-    Effect.succeed as HttpClient.HttpClient.Preprocess<HttpClientError.HttpClientError, never>
-  )
+  const httpClientLayer = Layer.effectContext(Effect.gen(function*() {
+    const capturedRequests = yield* Ref.make<ReadonlyArray<HttpClientRequest.HttpClientRequest>>([])
+    const httpClient = HttpClient.makeWith(
+      Effect.fnUntraced(function*(requestEffect) {
+        const request = yield* requestEffect
+        yield* Ref.update(capturedRequests, Array.append(request))
+        return HttpClientResponse.fromWeb(
+          request,
+          new Response(body, {
+            status: 200,
+            headers: { "content-type": "text/event-stream" }
+          })
+        )
+      }),
+      Effect.succeed as HttpClient.HttpClient.Preprocess<HttpClientError.HttpClientError, never>
+    )
+    return Context.make(HttpClient.HttpClient, httpClient).pipe(
+      Context.add(MockHttpClient, MockHttpClient.of({ requests: Ref.get(capturedRequests) }))
+    )
+  }))
   return OpenRouterClient.layer({ apiKey: Redacted.make("sk-test-key") }).pipe(
-    Layer.provide(Layer.succeed(HttpClient.HttpClient, httpClient))
+    Layer.provideMerge(httpClientLayer)
   )
 }
diff --git a/repos/effect/packages/ai/openrouter/test/OpenRouterSchema.test.ts b/repos/effect/packages/ai/openrouter/test/OpenRouterSchema.test.ts
new file mode 100644
index 000000000..6e05c34c1
--- /dev/null
+++ b/repos/effect/packages/ai/openrouter/test/OpenRouterSchema.test.ts
@@ -0,0 +1,144 @@
+import * as OpenRouterSchema from "@effect/ai-openrouter/OpenRouterSchema"
+import { assert, describe, it } from "@effect/vitest"
+import { Schema } from "effect"
+
+const choiceAnswer = {
+  type: "choice",
+  choice: "billing",
+  probabilities: { billing: 0.84, technical: 0.159, sales: 0.001 },
+  confidence: 0.596
+}
+
+const scoreAnswer = {
+  type: "score",
+  score: 1.6,
+  legend: { "0": "Calm", "1": "Frustrated", "2": "Very angry" },
+  probabilities: { "0": 0.05, "1": 0.3, "2": 0.65 },
+  confidence: 0.78
+}
+
+const noulAnswer = { type: "noul", noul: 0.999 }
+
+describe("OpenRouterSchema", () => {
+  it("encodes a decisions request with every question type", () => {
+    const request = {
+      model: "openai/gpt-4o-mini",
+      state: { message: "My card was charged twice.", orderId: "A-104" },
+      questions: {
+        department: {
+          type: "choice",
+          instructions: "Which team should handle this",
+          criteria: { billing: "Payment issues", technical: "Bugs" }
+        },
+        frustration: {
+          type: "score",
+          instructions: "How frustrated the customer appears",
+          criteria: ["Calm", "Frustrated", "Very angry"]
+        },
+        urgent: {
+          type: "noul",
+          instructions: "The message conveys urgency",
+          criteria: { false: "No time pressure", true: "Needs action now" }
+        }
+      }
+    } as const
+
+    const decoded = Schema.decodeUnknownSync(OpenRouterSchema.DecisionsRequest)(request)
+    const encoded = Schema.encodeSync(OpenRouterSchema.DecisionsRequest)(decoded)
+
+    assert.deepStrictEqual(JSON.parse(JSON.stringify(encoded)), request)
+  })
+
+  it("accepts a request carrying routing and tracing options", () => {
+    const decoded = Schema.decodeUnknownSync(OpenRouterSchema.DecisionsRequest)({
+      model: "openai/gpt-4o-mini",
+      state: "hello",
+      questions: { urgent: { type: "noul", instructions: "Urgent" } },
+      provider: { order: ["openai"] },
+      session_id: "session-1",
+      user: "user-1"
+    })
+
+    assert.strictEqual(decoded.session_id, "session-1")
+    assert.strictEqual(decoded.user, "user-1")
+  })
+
+  it("accepts a noul question without criteria", () => {
+    const decoded = Schema.decodeUnknownSync(OpenRouterSchema.NoulQuestion)({
+      type: "noul",
+      instructions: "The message conveys urgency"
+    })
+
+    assert.strictEqual(decoded.type, "noul")
+    assert.isUndefined(decoded.criteria)
+  })
+
+  it.each([
+    { name: "string", state: "a plain string" },
+    { name: "object", state: { message: "hi", orderId: "A-1" } },
+    { name: "array", state: ["first", "second"] }
+  ])("accepts a $name state", ({ state }) => {
+    const decoded = Schema.decodeUnknownSync(OpenRouterSchema.DecisionsRequest)({
+      model: "openai/gpt-4o-mini",
+      state,
+      questions: { urgent: { type: "noul", instructions: "Urgent" } }
+    })
+
+    assert.deepStrictEqual(decoded.state, state)
+  })
+
+  it("decodes a response with choice, score and noul answers", () => {
+    const response = {
+      id: "dec_123",
+      model: "openai/gpt-4o-mini",
+      provider: "OpenAI",
+      answers: { department: choiceAnswer, frustration: scoreAnswer, urgent: noulAnswer },
+      usage: { input_tokens: 312, output_tokens: 48, cost: 0.00042 }
+    }
+
+    const decoded = Schema.decodeUnknownSync(OpenRouterSchema.DecisionsResponse)(response)
+
+    assert.deepStrictEqual(JSON.parse(JSON.stringify(decoded)), response)
+  })
+
+  it("decodes a response without id, provider or cost", () => {
+    const decoded = Schema.decodeUnknownSync(OpenRouterSchema.DecisionsResponse)({
+      model: "openai/gpt-4o-mini",
+      answers: { urgent: noulAnswer },
+      usage: { input_tokens: 10, output_tokens: 2 }
+    })
+
+    assert.isUndefined(decoded.id)
+    assert.isUndefined(decoded.provider)
+    assert.isUndefined(decoded.usage.cost)
+  })
+
+  it.each([
+    { name: "choice answer without probabilities", answer: { type: "choice", choice: "billing" } },
+    { name: "choice answer without confidence", answer: { type: "choice", choice: "billing", probabilities: {} } },
+    { name: "score answer without probabilities", answer: { type: "score", score: 1.6 } },
+    { name: "score answer without legend", answer: { type: "score", score: 1.6, probabilities: { "0": 1 } } }
+  ])("decodes a $name, since the field is optional upstream", ({ answer }) => {
+    const decoded = Schema.decodeUnknownSync(OpenRouterSchema.Answer)(answer)
+
+    assert.strictEqual(decoded.type, (answer as { type: string }).type)
+  })
+
+  it.each([
+    { name: "choice answer without choice", answer: { type: "choice", probabilities: { billing: 1 } } },
+    { name: "score answer without score", answer: { type: "score", probabilities: { "0": 1 } } },
+    { name: "noul answer without noul", answer: { type: "noul" } },
+    { name: "answer with an unknown type", answer: { type: "rank", rank: [] } }
+  ])("rejects a $name", ({ answer }) => {
+    assert.throws(() => Schema.decodeUnknownSync(OpenRouterSchema.Answer)(answer))
+  })
+
+  it("rejects a response without usage", () => {
+    assert.throws(() =>
+      Schema.decodeUnknownSync(OpenRouterSchema.DecisionsResponse)({
+        model: "openai/gpt-4o-mini",
+        answers: { urgent: noulAnswer }
+      })
+    )
+  })
+})
diff --git a/repos/effect/packages/ai/openrouter/typetest/OpenRouterDecisionModel.tst.ts b/repos/effect/packages/ai/openrouter/typetest/OpenRouterDecisionModel.tst.ts
new file mode 100644
index 000000000..8a809d756
--- /dev/null
+++ b/repos/effect/packages/ai/openrouter/typetest/OpenRouterDecisionModel.tst.ts
@@ -0,0 +1,69 @@
+import { type OpenRouterClient, OpenRouterDecisionModel } from "@effect/ai-openrouter"
+import { Effect, type Layer, Schema } from "effect"
+import { Decision, DecisionModel, type Model } from "effect/unstable/ai"
+import { describe, expect, it } from "tstyche"
+
+const Triage = Decision.make({
+  input: Schema.String,
+  decisions: {
+    department: Decision.classify({
+      instructions: "Which team should handle this",
+      criteria: { billing: "Payments", technical: "Bugs" }
+    }),
+    urgent: Decision.probability({
+      instructions: "The message conveys urgency",
+      criteria: { false: "No time pressure", true: "Needs action now" }
+    })
+  }
+})
+
+describe("OpenRouterDecisionModel", () => {
+  it("model provides DecisionModel and requires OpenRouterClient", () => {
+    expect(OpenRouterDecisionModel.model("openai/gpt-4o-mini")).type.toBe<
+      Model.Model<"openrouter", DecisionModel.DecisionModel, OpenRouterClient.OpenRouterClient>
+    >()
+  })
+
+  it("layer provides DecisionModel and requires OpenRouterClient", () => {
+    expect(OpenRouterDecisionModel.layer({ model: "openai/gpt-4o-mini" })).type.toBe<
+      Layer.Layer<DecisionModel.DecisionModel, never, OpenRouterClient.OpenRouterClient>
+    >()
+  })
+
+  it("make builds a DecisionModel from the client service", () => {
+    expect(OpenRouterDecisionModel.make({ model: "openai/gpt-4o-mini" })).type.toBe<
+      Effect.Effect<DecisionModel.DecisionModel, never, OpenRouterClient.OpenRouterClient>
+    >()
+  })
+
+  it("accepts any model id, since OpenRouter ids are namespaced strings", () => {
+    expect(OpenRouterDecisionModel.model).type.toBeCallableWith("anthropic/claude-sonnet-4")
+    expect(OpenRouterDecisionModel.model).type.toBeCallableWith("some-new-provider/some-new-model")
+  })
+
+  it("satisfies a decide program's DecisionModel requirement", () => {
+    const program = DecisionModel.decide(Triage, { input: "hello" }).pipe(
+      Effect.provide(OpenRouterDecisionModel.model("openai/gpt-4o-mini"))
+    )
+
+    type Requirements = typeof program extends Effect.Effect<any, any, infer R> ? R : never
+
+    expect<Requirements>().type.toBe<OpenRouterClient.OpenRouterClient>()
+  })
+
+  it("accepts routing and tracing options in the layer config", () => {
+    expect(OpenRouterDecisionModel.layer).type.toBeCallableWith({
+      model: "openai/gpt-4o-mini",
+      config: { session_id: "session-1", user: "user-1" }
+    })
+  })
+
+  it("exposes Config as a context service whose fields are all optional", () => {
+    expect<{ readonly user: string }>().type.toBeAssignableTo<
+      typeof OpenRouterDecisionModel.Config.Service
+    >()
+    expect<{ readonly session_id: string }>().type.toBeAssignableTo<
+      typeof OpenRouterDecisionModel.Config.Service
+    >()
+  })
+})
diff --git a/repos/effect/packages/ai/typesafe/CHANGELOG.md b/repos/effect/packages/ai/typesafe/CHANGELOG.md
new file mode 100644
index 000000000..e7f74e183
--- /dev/null
+++ b/repos/effect/packages/ai/typesafe/CHANGELOG.md
@@ -0,0 +1,16 @@
+# @effect/ai-typesafe
+
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- [#8287](https://github.com/Effect-TS/effect/pull/8287) [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2) Thanks @tim-smart! - Add `@effect/ai-typesafe`, a `DecisionModel` provider for TypeSafe's System One API.
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
diff --git a/repos/effect/packages/ai/typesafe/README.md b/repos/effect/packages/ai/typesafe/README.md
new file mode 100644
index 000000000..6f22fecd9
--- /dev/null
+++ b/repos/effect/packages/ai/typesafe/README.md
@@ -0,0 +1,7 @@
+# @effect/ai-typesafe
+
+TypeSafe System One provider for Effect's `DecisionModel`. Supports classification, ordered ratings, and probabilities through Effect `HttpClient`.
+
+Use `TypeSafeClient.layerConfig()` to read `TYPESAFE_API_KEY`, then provide `TypeSafeDecisionModel.model("jev-latest")` to a decision workflow. Versioned model identifiers such as `jev-1.13.0` are also supported.
+
+The client does not retry automatically. Rate-limit errors include the provider's retry delay when available. Provider distributions are preserved, not normalized; they must satisfy the core `DecisionModel` validation, including its current `1e-6` sum tolerance. TypeSafe's rounding behavior has not been verified against the live API.
diff --git a/repos/effect/packages/ai/typesafe/package.json b/repos/effect/packages/ai/typesafe/package.json
new file mode 100644
index 000000000..f3150394b
--- /dev/null
+++ b/repos/effect/packages/ai/typesafe/package.json
@@ -0,0 +1,69 @@
+{
+  "name": "@effect/ai-typesafe",
+  "version": "4.0.0-rc.117",
+  "type": "module",
+  "license": "MIT",
+  "description": "A TypeSafe DecisionModel provider for Effect",
+  "homepage": "https://effect.website",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Effect-TS/effect.git",
+    "directory": "packages/ai/typesafe"
+  },
+  "bugs": {
+    "url": "https://github.com/Effect-TS/effect/issues"
+  },
+  "tags": [
+    "typescript",
+    "ai",
+    "typesafe"
+  ],
+  "keywords": [
+    "typescript",
+    "ai",
+    "typesafe"
+  ],
+  "sideEffects": [],
+  "exports": {
+    "./package.json": "./package.json",
+    ".": "./src/index.ts",
+    "./*": "./src/*.ts",
+    "./internal/*": null,
+    "./index": null,
+    "./*/index": null
+  },
+  "files": [
+    "src/**/*.ts",
+    "dist/**/*.js",
+    "dist/**/*.js.map",
+    "dist/**/*.d.ts",
+    "dist/**/*.d.ts.map",
+    "AGENTS.md",
+    "CLAUDE.md",
+    "ai-docs/**/*"
+  ],
+  "publishConfig": {
+    "access": "public",
+    "provenance": true,
+    "exports": {
+      "./package.json": "./package.json",
+      ".": "./dist/index.js",
+      "./*": "./dist/*.js",
+      "./internal/*": null,
+      "./index": null,
+      "./*/index": null
+    }
+  },
+  "scripts": {
+    "codegen": "effect-utils codegen",
+    "build": "tsc -b tsconfig.json && pnpm babel",
+    "babel": "babel dist --plugins annotate-pure-calls --out-dir dist --source-maps",
+    "check": "tsc -b tsconfig.json"
+  },
+  "devDependencies": {
+    "effect": "workspace:^"
+  },
+  "peerDependencies": {
+    "effect": "workspace:^"
+  }
+}
diff --git a/repos/effect/packages/ai/typesafe/src/TypeSafeClient.ts b/repos/effect/packages/ai/typesafe/src/TypeSafeClient.ts
new file mode 100644
index 000000000..f480682e0
--- /dev/null
+++ b/repos/effect/packages/ai/typesafe/src/TypeSafeClient.ts
@@ -0,0 +1,143 @@
+/**
+ * HTTP client for TypeSafe System One and model discovery.
+ *
+ * @since 4.0.0
+ */
+import * as Config from "effect/Config"
+import * as Context from "effect/Context"
+import * as Effect from "effect/Effect"
+import { flow, identity } from "effect/Function"
+import * as Layer from "effect/Layer"
+import * as Redacted from "effect/Redacted"
+import type * as Schema from "effect/Schema"
+import * as AiError from "effect/unstable/ai/AiError"
+import * as HttpClient from "effect/unstable/http/HttpClient"
+import type * as HttpClientError from "effect/unstable/http/HttpClientError"
+import * as HttpClientRequest from "effect/unstable/http/HttpClientRequest"
+import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse"
+import * as Errors from "./internal/errors.ts"
+import { TypeSafeConfig } from "./TypeSafeConfig.ts"
+import * as TypeSafeSchema from "./TypeSafeSchema.ts"
+
+/**
+ * Low-level TypeSafe operations.
+ *
+ * @category services
+ * @since 4.0.0
+ */
+export interface Service {
+  readonly client: HttpClient.HttpClient
+  readonly systemOne: (
+    request: typeof TypeSafeSchema.SystemOneRequest.Encoded
+  ) => Effect.Effect<typeof TypeSafeSchema.SystemOneResponse.Type, AiError.AiError>
+  readonly listModels: () => Effect.Effect<typeof TypeSafeSchema.ListModelsResponse.Type, AiError.AiError>
+}
+
+/**
+ * TypeSafe client service.
+ *
+ * @category services
+ * @since 4.0.0
+ */
+export class TypeSafeClient extends Context.Service<TypeSafeClient, Service>()("@effect/ai-typesafe/TypeSafeClient") {}
+
+/**
+ * Authentication, endpoint and HTTP customization options.
+ *
+ * @category options
+ * @since 4.0.0
+ */
+export interface Options {
+  readonly apiKey?: Redacted.Redacted<string> | undefined
+  readonly apiUrl?: string | undefined
+  readonly transformClient?: ((client: HttpClient.HttpClient) => HttpClient.HttpClient) | undefined
+}
+
+const decodeSystemOne = HttpClientResponse.schemaBodyJson(TypeSafeSchema.SystemOneResponse)
+const decodeListModels = HttpClientResponse.schemaBodyJson(TypeSafeSchema.ListModelsResponse)
+
+/**
+ * Builds a client without automatic retries. Scoped transforms run after the constructor transform.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const make = Effect.fnUntraced(
+  function*(options: Options): Effect.fn.Return<Service, never, HttpClient.HttpClient> {
+    const base = yield* HttpClient.HttpClient
+    const client = base.pipe(
+      HttpClient.mapRequest(flow(
+        HttpClientRequest.prependUrl(options.apiUrl ?? "https://api.typesafe.ai/v1"),
+        options.apiKey ? HttpClientRequest.bearerToken(Redacted.value(options.apiKey)) : identity,
+        HttpClientRequest.acceptJson
+      )),
+      HttpClient.filterStatusOk,
+      options.transformClient ?? identity
+    )
+    const resolveClient = Effect.map(
+      TypeSafeConfig.getOrUndefined,
+      (config) => config?.transformClient?.(client) ?? client
+    )
+    const execute = <A>(
+      request: HttpClientRequest.HttpClientRequest,
+      decode: (
+        response: HttpClientResponse.HttpClientResponse
+      ) => Effect.Effect<A, HttpClientError.HttpClientError | Schema.SchemaError>,
+      method: string
+    ) =>
+      resolveClient.pipe(
+        Effect.flatMap((client) => client.execute(request)),
+        Effect.flatMap(decode),
+        Effect.catchTags({
+          HttpClientError: (error) => Errors.mapHttpClientError(error, method),
+          SchemaError: (error) => Effect.fail(Errors.mapSchemaError(error, method))
+        })
+      )
+    return TypeSafeClient.of({
+      client,
+      systemOne: (payload) =>
+        HttpClientRequest.bodyJson(HttpClientRequest.post("/systemone"), payload).pipe(
+          Effect.mapError((error) =>
+            AiError.make({
+              module: "TypeSafeClient",
+              method: "systemOne",
+              reason: new AiError.InvalidRequestError({ description: String(error) })
+            })
+          ),
+          Effect.flatMap((request) => execute(request, decodeSystemOne, "systemOne"))
+        ),
+      listModels: () => execute(HttpClientRequest.get("/models"), decodeListModels, "listModels")
+    })
+  }
+)
+
+/**
+ * Provides a client from explicit options.
+ *
+ * @category layers
+ * @since 4.0.0
+ */
+export const layer = (options: Options): Layer.Layer<TypeSafeClient, never, HttpClient.HttpClient> =>
+  Layer.effect(TypeSafeClient, make(options))
+
+/**
+ * Provides a client from configuration, defaulting to TYPESAFE_API_KEY.
+ *
+ * @category layers
+ * @since 4.0.0
+ */
+export const layerConfig = (options?: {
+  readonly apiKey?: Config.Config<Redacted.Redacted<string> | undefined> | undefined
+  readonly apiUrl?: Config.Config<string> | undefined
+  readonly transformClient?: ((client: HttpClient.HttpClient) => HttpClient.HttpClient) | undefined
+}): Layer.Layer<TypeSafeClient, Config.ConfigError, HttpClient.HttpClient> =>
+  Layer.effect(
+    TypeSafeClient,
+    Effect.gen(function*() {
+      return yield* make({
+        apiKey: yield* (options?.apiKey ?? Config.Redacted("TYPESAFE_API_KEY")),
+        apiUrl: options?.apiUrl ? yield* options.apiUrl : undefined,
+        transformClient: options?.transformClient
+      })
+    })
+  )
diff --git a/repos/effect/packages/ai/typesafe/src/TypeSafeConfig.ts b/repos/effect/packages/ai/typesafe/src/TypeSafeConfig.ts
new file mode 100644
index 000000000..cf3384d4f
--- /dev/null
+++ b/repos/effect/packages/ai/typesafe/src/TypeSafeConfig.ts
@@ -0,0 +1,68 @@
+/**
+ * Scoped HTTP client customization for TypeSafe requests.
+ *
+ * @since 4.0.0
+ */
+import * as Context from "effect/Context"
+import * as Effect from "effect/Effect"
+import { dual } from "effect/Function"
+import type { HttpClient } from "effect/unstable/http/HttpClient"
+
+/**
+ * Scoped configuration read when executing TypeSafe requests.
+ *
+ * @see {@link withClientTransform} for scoping an HTTP client transformation
+ *
+ * @category services
+ * @since 4.0.0
+ */
+export class TypeSafeConfig extends Context.Service<
+  TypeSafeConfig,
+  TypeSafeConfig.Service
+>()("@effect/ai-typesafe/TypeSafeConfig") {
+  /**
+   * Reads the current configuration, if present.
+   *
+   * @since 4.0.0
+   */
+  static readonly getOrUndefined: Effect.Effect<typeof TypeSafeConfig.Service | undefined> = Effect.map(
+    Effect.context<never>(),
+    Context.getOrUndefined(TypeSafeConfig)
+  )
+}
+
+/**
+ * Types used by the `TypeSafeConfig` context service.
+ *
+ * @since 4.0.0
+ */
+export declare namespace TypeSafeConfig {
+  /**
+   * Per-request HTTP client configuration.
+   *
+   * @category services
+   * @since 4.0.0
+   */
+  export interface Service {
+    readonly transformClient?: ((client: HttpClient) => HttpClient) | undefined
+  }
+}
+
+/**
+ * Transforms the TypeSafe HTTP client for requests made by the supplied effect.
+ * Replaces any existing scoped transform; compose them manually to apply both.
+ *
+ * @category configuration
+ * @since 4.0.0
+ */
+export const withClientTransform: {
+  (transform: (client: HttpClient) => HttpClient): <A, E, R>(self: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
+  <A, E, R>(self: Effect.Effect<A, E, R>, transform: (client: HttpClient) => HttpClient): Effect.Effect<A, E, R>
+} = dual(2, <A, E, R>(
+  self: Effect.Effect<A, E, R>,
+  transformClient: (client: HttpClient) => HttpClient
+) =>
+  Effect.flatMap(
+    TypeSafeConfig.getOrUndefined,
+    (config) => Effect.provideService(self, TypeSafeConfig, { ...config, transformClient })
+  ))
diff --git a/repos/effect/packages/ai/typesafe/src/TypeSafeDecisionModel.ts b/repos/effect/packages/ai/typesafe/src/TypeSafeDecisionModel.ts
new file mode 100644
index 000000000..083530999
--- /dev/null
+++ b/repos/effect/packages/ai/typesafe/src/TypeSafeDecisionModel.ts
@@ -0,0 +1,106 @@
+/**
+ * TypeSafe's System One implementation of DecisionModel.
+ *
+ * @since 4.0.0
+ */
+import * as Effect from "effect/Effect"
+import * as Layer from "effect/Layer"
+import * as DecisionModel from "effect/unstable/ai/DecisionModel"
+import * as AiModel from "effect/unstable/ai/Model"
+import { TypeSafeClient } from "./TypeSafeClient.ts"
+import type * as TypeSafeSchema from "./TypeSafeSchema.ts"
+
+/**
+ * Known TypeSafe model identifiers. Constructors also accept custom identifiers.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type Model = "jev-latest" | "jev-preview" | "jev-1.13.0"
+
+/**
+ * Creates a decision model with TypeSafe provider metadata.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const model = (
+  model: Model | (string & {})
+): AiModel.Model<"typesafe", DecisionModel.DecisionModel, TypeSafeClient> =>
+  AiModel.make("typesafe", model, layer({ model }))
+
+/**
+ * Builds a decision service. Provider values are preserved without normalization;
+ * DecisionModel validates distributions and derives rating labels.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const make = Effect.fnUntraced(
+  function*(
+    options: { readonly model: Model | (string & {}) }
+  ): Effect.fn.Return<DecisionModel.DecisionModel, never, TypeSafeClient> {
+    const client = yield* TypeSafeClient
+    return yield* DecisionModel.make({
+      decide: Effect.fnUntraced(function*({ state, decisions }) {
+        const questions: Record<string, typeof TypeSafeSchema.Question.Encoded> = Object.create(null)
+        for (const [key, decision] of Object.entries(decisions)) {
+          switch (decision._tag) {
+            case "Classify":
+              questions[key] = { type: "choice", instructions: decision.instructions, criteria: decision.criteria }
+              break
+            case "Rate":
+              questions[key] = { type: "score", instructions: decision.instructions, criteria: decision.criteria }
+              break
+            case "Probability":
+              questions[key] = { type: "noul", instructions: decision.instructions, criteria: decision.criteria }
+              break
+          }
+        }
+        const response = yield* client.systemOne({ model: options.model, state, questions })
+        const answers: Record<string, DecisionModel.ProviderAnswer> = Object.create(null)
+        for (const [key, decision] of Object.entries(decisions)) {
+          const answer = response.answers[key]
+          switch (answer?.type) {
+            case "choice":
+              answers[key] = {
+                _tag: "Classify",
+                label: answer.choice,
+                probabilities: answer.probabilities,
+                confidence: answer.confidence
+              }
+              break
+            case "score": {
+              const levels = decision._tag === "Rate" ? decision.criteria : []
+              const probabilities: Record<string, number> = Object.create(null)
+              for (let index = 0; index < levels.length; index++) {
+                const probability = answer.probabilities[String(index)]
+                if (probability !== undefined) probabilities[levels[index]] = probability
+              }
+              answers[key] = { _tag: "Rate", rating: answer.score, probabilities, confidence: answer.confidence }
+              break
+            }
+            case "noul":
+              answers[key] = { _tag: "Probability", probability: answer.noul }
+              break
+          }
+        }
+        return {
+          answers,
+          usage: { inputTokens: response.usage?.input_tokens, outputTokens: response.usage?.output_tokens }
+        }
+      })
+    })
+  }
+)
+
+/**
+ * Provides DecisionModel using an existing TypeSafeClient.
+ *
+ * @category layers
+ * @since 4.0.0
+ */
+export const layer = (
+  options: { readonly model: Model | (string & {}) }
+): Layer.Layer<DecisionModel.DecisionModel, never, TypeSafeClient> =>
+  Layer.effect(DecisionModel.DecisionModel, make(options))
diff --git a/repos/effect/packages/ai/typesafe/src/TypeSafeSchema.ts b/repos/effect/packages/ai/typesafe/src/TypeSafeSchema.ts
new file mode 100644
index 000000000..f5cafcc04
--- /dev/null
+++ b/repos/effect/packages/ai/typesafe/src/TypeSafeSchema.ts
@@ -0,0 +1,134 @@
+/**
+ * Codecs for the TypeSafe System One API.
+ *
+ * @since 4.0.0
+ */
+import * as Schema from "effect/Schema"
+
+/**
+ * A classification question.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ChoiceQuestion = Schema.Struct({
+  type: Schema.Literal("choice"),
+  instructions: Schema.String,
+  criteria: Schema.Record(Schema.String, Schema.String)
+})
+
+/**
+ * An ordered rating question.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ScoreQuestion = Schema.Struct({
+  type: Schema.Literal("score"),
+  instructions: Schema.String,
+  criteria: Schema.Array(Schema.String)
+})
+
+/**
+ * A probability question.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const NoulQuestion = Schema.Struct({
+  type: Schema.Literal("noul"),
+  instructions: Schema.String,
+  criteria: Schema.optional(Schema.Struct({ false: Schema.String, true: Schema.String }))
+})
+
+/**
+ * A System One question.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const Question = Schema.Union([ChoiceQuestion, ScoreQuestion, NoulQuestion])
+
+/**
+ * A batch of questions against encoded state.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const SystemOneRequest = Schema.Struct({
+  model: Schema.String,
+  state: Schema.Json,
+  questions: Schema.Record(Schema.String, Question)
+})
+
+/**
+ * A classification distribution.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ChoiceAnswer = Schema.Struct({
+  type: Schema.Literal("choice"),
+  choice: Schema.String,
+  probabilities: Schema.Record(Schema.String, Schema.Number),
+  confidence: Schema.Number
+})
+
+/**
+ * A zero-based rating and index-keyed distribution.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ScoreAnswer = Schema.Struct({
+  type: Schema.Literal("score"),
+  score: Schema.Number,
+  probabilities: Schema.Record(Schema.String, Schema.Number),
+  confidence: Schema.Number,
+  legend: Schema.optional(Schema.Record(Schema.String, Schema.String))
+})
+
+/**
+ * A Bernoulli probability.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const NoulAnswer = Schema.Struct({ type: Schema.Literal("noul"), noul: Schema.Number })
+
+/**
+ * A System One answer.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const Answer = Schema.Union([ChoiceAnswer, ScoreAnswer, NoulAnswer])
+
+/**
+ * Answers and token usage for a batch.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const SystemOneResponse = Schema.Struct({
+  model: Schema.String,
+  answers: Schema.Record(Schema.String, Answer),
+  usage: Schema.optional(Schema.Struct({
+    input_tokens: Schema.optional(Schema.Number),
+    output_tokens: Schema.optional(Schema.Number)
+  }))
+})
+
+/**
+ * Available TypeSafe models.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ListModelsResponse = Schema.Struct({
+  models: Schema.Array(Schema.Struct({
+    name: Schema.String,
+    description: Schema.optional(Schema.String),
+    release_date: Schema.optional(Schema.String)
+  }))
+})
diff --git a/repos/effect/packages/ai/typesafe/src/index.ts b/repos/effect/packages/ai/typesafe/src/index.ts
new file mode 100644
index 000000000..39d0be791
--- /dev/null
+++ b/repos/effect/packages/ai/typesafe/src/index.ts
@@ -0,0 +1,25 @@
+/**
+ * @since 4.0.0
+ */
+
+// @barrel
+
+/**
+ * @since 4.0.0
+ */
+export * as TypeSafeClient from "./TypeSafeClient.ts"
+
+/**
+ * @since 4.0.0
+ */
+export * as TypeSafeConfig from "./TypeSafeConfig.ts"
+
+/**
+ * @since 4.0.0
+ */
+export * as TypeSafeDecisionModel from "./TypeSafeDecisionModel.ts"
+
+/**
+ * @since 4.0.0
+ */
+export * as TypeSafeSchema from "./TypeSafeSchema.ts"
diff --git a/repos/effect/packages/ai/typesafe/src/internal/errors.ts b/repos/effect/packages/ai/typesafe/src/internal/errors.ts
new file mode 100644
index 000000000..0828ee6ad
--- /dev/null
+++ b/repos/effect/packages/ai/typesafe/src/internal/errors.ts
@@ -0,0 +1,113 @@
+import * as Duration from "effect/Duration"
+import * as Effect from "effect/Effect"
+import * as Num from "effect/Number"
+import * as Option from "effect/Option"
+import * as Redactable from "effect/Redactable"
+import * as Schema from "effect/Schema"
+import * as AiError from "effect/unstable/ai/AiError"
+import type * as HttpClientError from "effect/unstable/http/HttpClientError"
+import type * as HttpClientRequest from "effect/unstable/http/HttpClientRequest"
+
+const requestDetails = (request: HttpClientRequest.HttpClientRequest) => ({
+  method: request.method,
+  url: request.url,
+  urlParams: Array.from(request.urlParams),
+  hash: Option.getOrUndefined(request.hash),
+  headers: Redactable.redact(request.headers) as Record<string, string>
+})
+
+const ErrorBody = Schema.Struct({
+  message: Schema.optional(Schema.String),
+  type: Schema.optional(Schema.String),
+  code: Schema.optional(Schema.String)
+})
+
+const decodeErrorBody = Schema.decodeUnknownOption(ErrorBody)
+
+const nonNegative = (value: string | undefined): number | undefined => {
+  if (value === undefined) return undefined
+  const parsed = Option.getOrUndefined(Num.parse(value))
+  return parsed !== undefined && Number.isFinite(parsed) && parsed >= 0 ? parsed : undefined
+}
+
+const retryAfter = (headers: Readonly<Record<string, string>>) => {
+  const ms = nonNegative(headers["retry-after-ms"])
+  if (ms !== undefined) return Duration.millis(ms)
+  const raw = headers["retry-after"]
+  if (raw === undefined || raw.trim() === "") return undefined
+  const seconds = nonNegative(raw)
+  if (seconds !== undefined) return Duration.seconds(seconds)
+  const date = Date.parse(raw)
+  return Number.isNaN(date) ? undefined : Duration.millis(Math.max(0, date - Date.now()))
+}
+
+export const mapSchemaError = (error: Schema.SchemaError, method: string): AiError.AiError =>
+  AiError.make({
+    module: "TypeSafeClient",
+    method,
+    reason: AiError.InvalidOutputError.fromSchemaError(error)
+  })
+
+export const mapHttpClientError = Effect.fnUntraced(
+  function*(error: HttpClientError.HttpClientError, method: string): Effect.fn.Return<never, AiError.AiError> {
+    const source = error.reason
+    let reason: AiError.AiErrorReason
+    switch (source._tag) {
+      case "TransportError":
+      case "EncodeError":
+      case "InvalidUrlError":
+        reason = new AiError.NetworkError({
+          reason: source._tag,
+          description: source.description,
+          request: requestDetails(source.request)
+        })
+        break
+      case "DecodeError":
+      case "EmptyBodyError":
+        reason = new AiError.InvalidOutputError({
+          description: source.description ?? "Failed to decode TypeSafe response"
+        })
+        break
+      case "StatusCodeError": {
+        const { request, response } = source
+        const body = yield* response.text.pipe(Effect.catch(() => Effect.succeed(source.description)))
+        const parsed = yield* Effect.try(() => JSON.parse(body ?? "")).pipe(Effect.orElseSucceed(() => undefined))
+        const details = Option.getOrUndefined(decodeErrorBody(parsed))
+        const http = {
+          request: requestDetails(request),
+          response: { status: response.status, headers: Redactable.redact(response.headers) as Record<string, string> },
+          body
+        }
+        const description = AiError.buildErrorDescription({
+          status: response.status,
+          method: request.method,
+          url: request.url,
+          body,
+          message: details?.message,
+          errorCode: details?.code,
+          errorType: details?.type,
+          requestId: response.headers["x-typesafe-request-id"]
+        })
+        if (response.status === 429) {
+          reason = new AiError.RateLimitError({
+            retryAfter: retryAfter(response.headers),
+            http,
+            metadata: {
+              typesafe: {
+                requestId: response.headers["x-typesafe-request-id"] ?? null,
+                errorCode: details?.code ?? null,
+                errorType: details?.type ?? null
+              }
+            }
+          })
+        } else if (response.status === 404 || response.status === 422) {
+          reason = new AiError.InvalidRequestError({ description, http })
+        } else {
+          reason = AiError.reasonFromHttpStatus({ status: response.status, description, http })
+        }
+        break
+      }
+    }
+    return yield* AiError.make({ module: "TypeSafeClient", method, reason })
+  }
+)
diff --git a/repos/effect/packages/ai/typesafe/test/TypeSafeClient.test.ts b/repos/effect/packages/ai/typesafe/test/TypeSafeClient.test.ts
new file mode 100644
index 000000000..38f5ace3a
--- /dev/null
+++ b/repos/effect/packages/ai/typesafe/test/TypeSafeClient.test.ts
@@ -0,0 +1,568 @@
+import * as TypeSafeClient from "@effect/ai-typesafe/TypeSafeClient"
+import * as TypeSafeConfig from "@effect/ai-typesafe/TypeSafeConfig"
+import { assert, describe, it } from "@effect/vitest"
+import { Config, ConfigProvider, Context, Duration, Effect, Layer, Redacted } from "effect"
+import * as HttpClient from "effect/unstable/http/HttpClient"
+import * as HttpClientError from "effect/unstable/http/HttpClientError"
+import * as HttpClientRequest from "effect/unstable/http/HttpClientRequest"
+import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse"
+import { vi } from "vitest"
+const systemOneRequest = {
+  state: "My card was charged twice.",
+  model: "jev-latest",
+  questions: {
+    urgent: {
+      type: "noul",
+      instructions: "The message conveys urgency",
+      criteria: { false: "No time pressure", true: "Needs action now" }
+    }
+  }
+} as const
+
+const systemOneBody = {
+  model: "jev-latest",
+  answers: {
+    urgent: { type: "noul", noul: 0.99 }
+  },
+  usage: { input_tokens: 360, output_tokens: 39 }
+}
+
+describe("TypeSafeClient", () => {
+  describe("make", () => {
+    it.effect("sets Bearer token from apiKey", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        yield* client.systemOne(systemOneRequest)
+
+        const requests = yield* MockHttpClient.requests
+        assert.strictEqual(requests[0]?.headers["authorization"], "Bearer ts-test-12345")
+      }).pipe(Effect.provide(makeTestLayer({
+        apiKey: Redacted.make("ts-test-12345")
+      }))))
+
+    it.effect("posts systemone requests to the default URL as JSON", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        const response = yield* client.systemOne(systemOneRequest)
+
+        const requests = yield* MockHttpClient.requests
+        assert.strictEqual(requests[0]?.method, "POST")
+        assert.strictEqual(requests[0]?.url, "https://api.typesafe.ai/v1/systemone")
+        assert.strictEqual(requests[0]?.headers["content-type"], "application/json")
+        assert.deepStrictEqual(yield* getRequestBody(requests[0]), systemOneRequest)
+        assert.strictEqual(response.model, "jev-latest")
+        assert.deepStrictEqual(response.usage, { input_tokens: 360, output_tokens: 39 })
+      }).pipe(Effect.provide(makeTestLayer())))
+
+    it.effect("uses custom apiUrl when provided", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        yield* client.systemOne(systemOneRequest)
+
+        const requests = yield* MockHttpClient.requests
+        assert.strictEqual(requests[0]?.url, "https://custom.api.com/v2/systemone")
+      }).pipe(Effect.provide(makeTestLayer({
+        apiKey: Redacted.make("test-key"),
+        apiUrl: "https://custom.api.com/v2"
+      }))))
+
+    it.effect("lists models from the models endpoint", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        const response = yield* client.listModels()
+
+        const requests = yield* MockHttpClient.requests
+        assert.strictEqual(requests[0]?.method, "GET")
+        assert.strictEqual(requests[0]?.url, "https://api.typesafe.ai/v1/models")
+        assert.deepStrictEqual(response.models, [
+          { name: "jev-1.13.0", description: "Jev 1.13", release_date: "2026-08-01" }
+        ])
+      }).pipe(Effect.provide(makeTestLayer(undefined, {
+        status: 200,
+        body: {
+          models: [{ name: "jev-1.13.0", description: "Jev 1.13", release_date: "2026-08-01" }]
+        }
+      }))))
+
+    it.effect("applies transformClient option", () => {
+      let transformApplied = false
+      return Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        yield* client.systemOne(systemOneRequest)
+        assert.isTrue(transformApplied)
+      }).pipe(Effect.provide(makeTestLayer({
+        apiKey: Redacted.make("test-key"),
+        transformClient: (client) => {
+          transformApplied = true
+          return client
+        }
+      })))
+    })
+
+    it.effect("exposes transformed HttpClient via client field", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        yield* client.client.execute(HttpClientRequest.get("/models"))
+
+        const requests = yield* MockHttpClient.requests
+        assert.strictEqual(requests[0]?.url, "https://api.typesafe.ai/v1/models")
+        assert.strictEqual(requests[0]?.headers["authorization"], "Bearer test-key")
+        assert.strictEqual(requests[0]?.headers["x-client-field"], "enabled")
+      }).pipe(Effect.provide(makeTestLayer({
+        apiKey: Redacted.make("test-key"),
+        transformClient: (client) =>
+          client.pipe(HttpClient.mapRequest(HttpClientRequest.setHeader("x-client-field", "enabled")))
+      }))))
+
+    it.effect("applies TypeSafeConfig transformClient after options transformClient", () => {
+      let optionsTransformApplied = false
+      let configTransformApplied = false
+
+      return Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        yield* client.systemOne(systemOneRequest).pipe(
+          TypeSafeConfig.withClientTransform((client) => {
+            configTransformApplied = true
+            return client.pipe(
+              HttpClient.mapRequest(HttpClientRequest.setHeader("x-typesafe-transform", "config"))
+            )
+          })
+        )
+
+        const requests = yield* MockHttpClient.requests
+        assert.isTrue(optionsTransformApplied)
+        assert.isTrue(configTransformApplied)
+        assert.strictEqual(requests[0]?.headers["x-typesafe-transform"], "config")
+      }).pipe(Effect.provide(makeTestLayer({
+        apiKey: Redacted.make("test-key"),
+        transformClient: (client) => {
+          optionsTransformApplied = true
+          return client.pipe(
+            HttpClient.mapRequest(HttpClientRequest.setHeader("x-typesafe-transform", "options"))
+          )
+        }
+      })))
+    })
+  })
+
+  describe("layer", () => {
+    it.effect("creates working service", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        assert.isNotNull(client.client)
+      }).pipe(Effect.provide(makeTestLayer())))
+
+    it.effect("layerConfig loads from Config", () => {
+      const configProvider = ConfigProvider.fromEnv({
+        env: {
+          MY_API_KEY: "ts-config-key",
+          MY_API_URL: "https://config.api.com/v1"
+        }
+      })
+
+      return Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        yield* client.systemOne(systemOneRequest)
+
+        const requests = yield* MockHttpClient.requests
+        assert.strictEqual(requests[0]?.headers["authorization"], "Bearer ts-config-key")
+        assert.strictEqual(requests[0]?.url, "https://config.api.com/v1/systemone")
+      }).pipe(Effect.provide(makeConfigTestLayer(configProvider)))
+    })
+
+    it.effect("layerConfig defaults to TYPESAFE_API_KEY", () => {
+      const configProvider = ConfigProvider.fromEnv({
+        env: {
+          TYPESAFE_API_KEY: "ts-env-key"
+        }
+      })
+
+      return Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        yield* client.systemOne(systemOneRequest)
+
+        const requests = yield* MockHttpClient.requests
+        assert.strictEqual(requests[0]?.headers["authorization"], "Bearer ts-env-key")
+        assert.strictEqual(requests[0]?.url, "https://api.typesafe.ai/v1/systemone")
+      }).pipe(Effect.provide(
+        TypeSafeClient.layerConfig().pipe(
+          Layer.provideMerge(HttpClientLayer),
+          Layer.provide(Layer.succeed(MockTypeSafeResponse, { response: defaultResponse })),
+          Layer.provide(ConfigProvider.layer(configProvider))
+        )
+      ))
+    })
+  })
+
+  describe("request behavior", () => {
+    it.effect("redacts the authorization header in AI error context", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        const result = yield* client.systemOne(systemOneRequest).pipe(Effect.flip)
+
+        assert.strictEqual(result.reason._tag, "InvalidRequestError")
+        if (result.reason._tag !== "InvalidRequestError" || result.reason.http === undefined) {
+          return yield* Effect.die(new Error("Expected InvalidRequestError with HTTP context"))
+        }
+        assert.strictEqual(String(result.reason.http.request.headers["authorization"]), "<redacted>")
+        assert.strictEqual(result.reason.http.response?.status, 422)
+      }).pipe(Effect.provide(makeTestLayer({
+        apiKey: Redacted.make("secret-key")
+      }, {
+        status: 422,
+        body: { message: "questions must not be empty" }
+      }))))
+  })
+
+  describe("error mapping", () => {
+    it.effect("maps undocumented 409 status to the generic UnknownError fallback", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        const result = yield* client.systemOne(systemOneRequest).pipe(Effect.flip)
+
+        assert.strictEqual(result.reason._tag, "UnknownError")
+        if (result.reason._tag === "UnknownError") {
+          assert.strictEqual(result.reason.http?.response?.status, 409)
+          assert.include(result.reason.description ?? "", "Conflict")
+        }
+      }).pipe(Effect.provide(makeTestLayer(undefined, {
+        status: 409,
+        body: { message: "Conflict" }
+      }))))
+
+    it.effect("retains 429 diagnostics in provider metadata", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        const result = yield* client.systemOne(systemOneRequest).pipe(Effect.flip)
+
+        assert.strictEqual(result.reason._tag, "RateLimitError")
+        if (result.reason._tag === "RateLimitError") {
+          assert.deepStrictEqual(result.reason.metadata.typesafe, {
+            requestId: "req_typesafe_429",
+            errorCode: "rate_limit_exceeded",
+            errorType: "requests"
+          })
+          assert.strictEqual(result.reason.http?.response?.status, 429)
+        }
+      }).pipe(Effect.provide(makeTestLayer(undefined, {
+        status: 429,
+        body: { message: "Slow down", code: "rate_limit_exceeded", type: "requests" },
+        headers: { "x-typesafe-request-id": "req_typesafe_429" }
+      }))))
+
+    describe("HTTP-date Retry-After", { concurrent: false }, () => {
+      for (
+        const { date, expected, name } of [
+          { name: "future", date: "Fri, 18 Sep 2026 12:00:30 GMT", expected: 30000 },
+          { name: "past", date: "Fri, 18 Sep 2026 11:59:30 GMT", expected: 0 }
+        ]
+      ) {
+        it.effect("honors a " + name + " HTTP-date Retry-After", () =>
+          Effect.gen(function*() {
+            const now = vi.spyOn(Date, "now").mockReturnValue(Date.parse("2026-09-18T12:00:00Z"))
+            try {
+              const client = yield* TypeSafeClient.TypeSafeClient
+              const result = yield* client.systemOne(systemOneRequest).pipe(Effect.flip)
+
+              assert.strictEqual(result.reason._tag, "RateLimitError")
+              if (result.reason._tag === "RateLimitError") {
+                assert.isDefined(result.reason.retryAfter)
+                assert.strictEqual(Duration.toMillis(result.reason.retryAfter!), expected)
+              }
+            } finally {
+              now.mockRestore()
+            }
+          }).pipe(Effect.provide(makeTestLayer(undefined, {
+            status: 429,
+            body: { message: "Rate limit exceeded" },
+            headers: { "retry-after": date }
+          }))))
+      }
+    })
+
+    it.effect("maps TransportError to NetworkError reason", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.make({
+          apiKey: Redacted.make("test-key")
+        })
+        const result = yield* client.systemOne(systemOneRequest).pipe(Effect.flip)
+
+        assert.strictEqual(result._tag, "AiError")
+        assert.strictEqual(result.module, "TypeSafeClient")
+        assert.strictEqual(result.method, "systemOne")
+        assert.strictEqual(result.reason._tag, "NetworkError")
+      }).pipe(Effect.provide(Layer.succeed(HttpClient.HttpClient, makeTransportErrorHttpClient()))))
+
+    it.effect("maps 400 status to InvalidRequestError reason", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        const result = yield* client.systemOne(systemOneRequest).pipe(Effect.flip)
+
+        assert.strictEqual(result._tag, "AiError")
+        assert.strictEqual(result.module, "TypeSafeClient")
+        assert.strictEqual(result.method, "systemOne")
+        assert.strictEqual(result.reason._tag, "InvalidRequestError")
+      }).pipe(Effect.provide(makeTestLayer(undefined, {
+        status: 400,
+        body: { message: "Bad request" }
+      }))))
+
+    it.effect("maps 401 status to AuthenticationError reason", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        const result = yield* client.systemOne(systemOneRequest).pipe(Effect.flip)
+
+        assert.strictEqual(result._tag, "AiError")
+        assert.strictEqual(result.reason._tag, "AuthenticationError")
+        if (result.reason._tag === "AuthenticationError") {
+          assert.strictEqual(result.reason.kind, "InvalidKey")
+          assert.include(result.reason.description ?? "", "Invalid API key")
+          assert.include(result.reason.description ?? "", "req_typesafe")
+        }
+      }).pipe(Effect.provide(makeTestLayer(undefined, {
+        status: 401,
+        body: { message: "Invalid API key" },
+        headers: { "x-typesafe-request-id": "req_typesafe" }
+      }))))
+
+    it.effect("maps 403 status to AuthenticationError with InsufficientPermissions", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        const result = yield* client.systemOne(systemOneRequest).pipe(Effect.flip)
+
+        assert.strictEqual(result.reason._tag, "AuthenticationError")
+        if (result.reason._tag === "AuthenticationError") {
+          assert.strictEqual(result.reason.kind, "InsufficientPermissions")
+        }
+      }).pipe(Effect.provide(makeTestLayer(undefined, {
+        status: 403,
+        body: { message: "Access denied" }
+      }))))
+
+    it.effect("maps 404 status to InvalidRequestError reason", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        const result = yield* client.systemOne(systemOneRequest).pipe(Effect.flip)
+
+        assert.strictEqual(result.reason._tag, "InvalidRequestError")
+      }).pipe(Effect.provide(makeTestLayer(undefined, {
+        status: 404,
+        body: { message: "Not found" }
+      }))))
+
+    it.effect("maps 422 status to InvalidRequestError reason with the message", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        const result = yield* client.systemOne(systemOneRequest).pipe(Effect.flip)
+
+        assert.strictEqual(result.reason._tag, "InvalidRequestError")
+        if (result.reason._tag === "InvalidRequestError") {
+          assert.include(result.reason.description, "criteria must contain at least two levels")
+        }
+      }).pipe(Effect.provide(makeTestLayer(undefined, {
+        status: 422,
+        body: { message: "criteria must contain at least two levels" }
+      }))))
+
+    it.effect("maps 429 status to RateLimitError honoring Retry-After seconds", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        const result = yield* client.systemOne(systemOneRequest).pipe(Effect.flip)
+
+        assert.strictEqual(result.reason._tag, "RateLimitError")
+        if (result.reason._tag === "RateLimitError") {
+          assert.isDefined(result.reason.retryAfter)
+          assert.strictEqual(Duration.toMillis(result.reason.retryAfter!), 2000)
+        }
+      }).pipe(Effect.provide(makeTestLayer(undefined, {
+        status: 429,
+        body: { message: "Rate limit exceeded" },
+        headers: { "retry-after": "2" }
+      }))))
+
+    it.effect("maps 429 status to RateLimitError honoring retry-after-ms", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        const result = yield* client.systemOne(systemOneRequest).pipe(Effect.flip)
+
+        assert.strictEqual(result.reason._tag, "RateLimitError")
+        if (result.reason._tag === "RateLimitError") {
+          assert.isDefined(result.reason.retryAfter)
+          assert.strictEqual(Duration.toMillis(result.reason.retryAfter!), 1500)
+        }
+      }).pipe(Effect.provide(makeTestLayer(undefined, {
+        status: 429,
+        body: { message: "Rate limit exceeded" },
+        headers: { "retry-after-ms": "1500" }
+      }))))
+
+    it.effect("maps 429 status without retry headers to RateLimitError without retryAfter", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        const result = yield* client.systemOne(systemOneRequest).pipe(Effect.flip)
+
+        assert.strictEqual(result.reason._tag, "RateLimitError")
+        if (result.reason._tag === "RateLimitError") {
+          assert.isUndefined(result.reason.retryAfter)
+        }
+      }).pipe(Effect.provide(makeTestLayer(undefined, {
+        status: 429,
+        body: { message: "Rate limit exceeded" }
+      }))))
+
+    it.effect("maps 529 status to InternalProviderError reason", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        const result = yield* client.systemOne(systemOneRequest).pipe(Effect.flip)
+
+        assert.strictEqual(result.reason._tag, "InternalProviderError")
+        if (result.reason._tag === "InternalProviderError") {
+          assert.strictEqual(result.reason.http?.response?.status, 529)
+        }
+      }).pipe(Effect.provide(makeTestLayer(undefined, {
+        status: 529,
+        body: { message: "Overloaded" }
+      }))))
+
+    it.effect("maps 500 status to InternalProviderError reason", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        const result = yield* client.systemOne(systemOneRequest).pipe(Effect.flip)
+
+        assert.strictEqual(result.reason._tag, "InternalProviderError")
+      }).pipe(Effect.provide(makeTestLayer(undefined, {
+        status: 500,
+        body: { message: "Internal error" }
+      }))))
+
+    it.effect("maps a malformed success body to InvalidOutputError reason", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        const result = yield* client.systemOne(systemOneRequest).pipe(Effect.flip)
+
+        assert.strictEqual(result._tag, "AiError")
+        assert.strictEqual(result.method, "systemOne")
+        assert.strictEqual(result.reason._tag, "InvalidOutputError")
+      }).pipe(Effect.provide(makeTestLayer(undefined, {
+        status: 200,
+        body: { model: "jev-latest", answers: { urgent: { type: "noul" } } }
+      }))))
+
+    it.effect("maps listModels failures with the listModels method", () =>
+      Effect.gen(function*() {
+        const client = yield* TypeSafeClient.TypeSafeClient
+        const result = yield* client.listModels().pipe(Effect.flip)
+
+        assert.strictEqual(result.module, "TypeSafeClient")
+        assert.strictEqual(result.method, "listModels")
+        assert.strictEqual(result.reason._tag, "AuthenticationError")
+      }).pipe(Effect.provide(makeTestLayer(undefined, {
+        status: 401,
+        body: { message: "Invalid API key" }
+      }))))
+  })
+})
+
+interface MockResponse {
+  readonly status?: number
+  readonly body: unknown
+  readonly headers?: Record<string, string>
+}
+
+class MockTypeSafeResponse extends Context.Service<MockTypeSafeResponse, {
+  readonly response: MockResponse
+}>()("MockTypeSafeResponse") {}
+
+class MockHttpClient extends Context.Service<MockHttpClient, {
+  readonly requests: Effect.Effect<ReadonlyArray<HttpClientRequest.HttpClientRequest>>
+}>()("MockHttpClient") {
+  static requests = MockHttpClient.use((client) => client.requests)
+}
+
+const makeHttpClientContext = Effect.gen(function*() {
+  const capturedRequests: Array<HttpClientRequest.HttpClientRequest> = []
+  const mock = yield* MockTypeSafeResponse
+
+  const httpClient = HttpClient.makeWith(
+    Effect.fnUntraced(function*(requestEffect) {
+      const request = yield* requestEffect
+      capturedRequests.push(request)
+      return makeResponse(request, mock.response)
+    }),
+    Effect.succeed as HttpClient.HttpClient.Preprocess<HttpClientError.HttpClientError, never>
+  )
+
+  const mockHttpClient: MockHttpClient["Service"] = {
+    requests: Effect.sync(() => capturedRequests)
+  }
+
+  return Context.make(HttpClient.HttpClient, httpClient).pipe(
+    Context.add(MockHttpClient, mockHttpClient)
+  )
+})
+
+const HttpClientLayer = Layer.effectContext(makeHttpClientContext)
+
+const defaultResponse: MockResponse = {
+  status: 200,
+  body: systemOneBody
+}
+
+const makeTestLayer = (
+  options: TypeSafeClient.Options = { apiKey: Redacted.make("test-key") },
+  response: MockResponse = defaultResponse
+) =>
+  TypeSafeClient.layer(options).pipe(
+    Layer.provideMerge(HttpClientLayer),
+    Layer.provide(Layer.succeed(MockTypeSafeResponse, { response }))
+  )
+
+const makeConfigTestLayer = (configProvider: ConfigProvider.ConfigProvider) =>
+  TypeSafeClient.layerConfig({
+    apiKey: Config.Redacted("MY_API_KEY"),
+    apiUrl: Config.String("MY_API_URL")
+  }).pipe(
+    Layer.provideMerge(HttpClientLayer),
+    Layer.provide(Layer.succeed(MockTypeSafeResponse, { response: defaultResponse })),
+    Layer.provide(ConfigProvider.layer(configProvider))
+  )
+
+const makeTransportErrorHttpClient = (): HttpClient.HttpClient =>
+  HttpClient.makeWith<HttpClientError.HttpClientError, never, HttpClientError.HttpClientError, never>(
+    (requestEffect) =>
+      Effect.flatMap(requestEffect, (request) =>
+        Effect.fail(
+          new HttpClientError.HttpClientError({
+            reason: new HttpClientError.TransportError({
+              request,
+              cause: new Error("Connection refused")
+            })
+          })
+        )),
+    Effect.succeed
+  )
+
+const makeResponse = (
+  request: HttpClientRequest.HttpClientRequest,
+  response: MockResponse
+): HttpClientResponse.HttpClientResponse =>
+  HttpClientResponse.fromWeb(
+    request,
+    new Response(JSON.stringify(response.body), {
+      status: response.status ?? 200,
+      headers: {
+        "content-type": "application/json",
+        ...response.headers
+      }
+    })
+  )
+
+const getRequestBody = (request: HttpClientRequest.HttpClientRequest) =>
+  Effect.gen(function*() {
+    const body = request.body
+    if (body._tag === "Uint8Array") {
+      const text = new TextDecoder().decode(body.body)
+      return JSON.parse(text)
+    }
+    return yield* Effect.die(new Error("Expected Uint8Array body"))
+  })
diff --git a/repos/effect/packages/ai/typesafe/test/TypeSafeDecisionModel.test.ts b/repos/effect/packages/ai/typesafe/test/TypeSafeDecisionModel.test.ts
new file mode 100644
index 000000000..a9e7dbab3
--- /dev/null
+++ b/repos/effect/packages/ai/typesafe/test/TypeSafeDecisionModel.test.ts
@@ -0,0 +1,609 @@
+import { TypeSafeClient, TypeSafeDecisionModel } from "@effect/ai-typesafe"
+import { assert, describe, it } from "@effect/vitest"
+import { Effect, Layer, Redacted, Schema } from "effect"
+import { Decision, DecisionModel, Model } from "effect/unstable/ai"
+import { HttpClient, type HttpClientError, type HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
+
+const Ticket = Schema.Struct({
+  message: Schema.String,
+  orderId: Schema.String
+})
+
+const TicketTriage = Decision.make({
+  input: Ticket,
+  decisions: {
+    department: Decision.classify({
+      instructions: "Which team should handle this",
+      criteria: {
+        billing: "Payment or subscription issues",
+        technical: "Bugs or integration problems",
+        sales: "Pricing or account questions"
+      }
+    }),
+    frustration: Decision.rate({
+      instructions: "How frustrated the customer appears",
+      criteria: ["Calm, just stating facts", "Frustrated but civil", "Very angry, strong language"]
+    }),
+    urgent: Decision.probability({
+      instructions: "The message conveys urgency or time-sensitivity",
+      criteria: {
+        false: "No time pressure",
+        true: "Needs action now"
+      }
+    })
+  }
+})
+
+const ticket = {
+  message: "Hi, I've been trying to connect my Stripe account for 3 days and it keeps failing. Please help ASAP.",
+  orderId: "A-104"
+}
+
+const systemOneResponse = {
+  model: "jev-latest",
+  answers: {
+    department: {
+      type: "choice",
+      choice: "billing",
+      probabilities: { billing: 0.84, technical: 0.159, sales: 0.001 },
+      confidence: 0.596
+    },
+    frustration: {
+      type: "score",
+      score: 1.6,
+      legend: {
+        "0": "Calm, just stating facts",
+        "1": "Frustrated but civil",
+        "2": "Very angry, strong language"
+      },
+      probabilities: { "0": 0.05, "1": 0.3, "2": 0.65 },
+      confidence: 0.78
+    },
+    urgent: {
+      type: "noul",
+      noul: 0.999
+    }
+  },
+  usage: { input_tokens: 312, output_tokens: 48 }
+}
+
+describe("TypeSafeDecisionModel", () => {
+  it.effect("omits absent probability criteria from the encoded question", () =>
+    Effect.gen(function*() {
+      const definition = Decision.make({
+        input: Schema.String,
+        decisions: {
+          urgent: Decision.probability({ instructions: "Needs action now" })
+        }
+      })
+      const { answers } = yield* DecisionModel.decide(definition, { input: "Help ASAP" }).pipe(
+        Effect.provide(TypeSafeDecisionModel.layer({ model: "jev-latest" })),
+        Effect.provide(makeClientLayer((request) =>
+          Effect.gen(function*() {
+            const { questions } = yield* getRequestBody(request)
+            assert.deepStrictEqual(questions.urgent, {
+              type: "noul",
+              instructions: "Needs action now"
+            })
+
+            return jsonResponse(request, {
+              model: "jev-latest",
+              answers: { urgent: { type: "noul", noul: 0.75 } },
+              usage: { input_tokens: 20, output_tokens: 4 }
+            })
+          })
+        ))
+      )
+
+      assert.deepStrictEqual(answers.urgent, { probability: 0.75 })
+    }))
+
+  for (const key of ["__proto__", "constructor", "toString"]) {
+    it.effect("round trips a classification label named " + key, () =>
+      Effect.gen(function*() {
+        const definition = Decision.make({
+          input: Schema.String,
+          decisions: {
+            category: Decision.classify({
+              instructions: "Choose a category",
+              criteria: { [key]: "Special category", ordinary: "Ordinary category" }
+            })
+          }
+        })
+        const { answers } = yield* DecisionModel.decide(definition, { input: "Help" }).pipe(
+          Effect.provide(TypeSafeDecisionModel.layer({ model: "jev-latest" })),
+          Effect.provide(makeClientLayer((request) =>
+            Effect.gen(function*() {
+              const { questions } = yield* getRequestBody(request)
+              const criteria = questions.category.criteria
+
+              assert.isTrue(Object.hasOwn(criteria, key))
+              assert.isTrue(Object.getOwnPropertyDescriptor(criteria, key)?.enumerable)
+              assert.deepStrictEqual(Object.keys(criteria), [key, "ordinary"])
+              assert.strictEqual(criteria[key], "Special category")
+              assert.strictEqual(Object.getPrototypeOf(criteria), Object.prototype)
+
+              return jsonResponse(request, {
+                model: "jev-latest",
+                answers: {
+                  category: {
+                    type: "choice",
+                    choice: key,
+                    probabilities: { [key]: 0.75, ordinary: 0.25 },
+                    confidence: 0.5
+                  }
+                }
+              })
+            })
+          ))
+        )
+        const { label, probabilities } = answers.category
+
+        assert.isTrue(Object.hasOwn(probabilities, key))
+        assert.isTrue(Object.getOwnPropertyDescriptor(probabilities, key)?.enumerable)
+        assert.deepStrictEqual(Object.keys(probabilities), [key, "ordinary"])
+        assert.deepStrictEqual(probabilities, { [key]: 0.75, ordinary: 0.25 })
+        assert.strictEqual(label, key)
+        assert.strictEqual(Object.getPrototypeOf(probabilities), null)
+      }))
+
+    it.effect("maps a score distribution to a rate level named " + key, () =>
+      Effect.gen(function*() {
+        const definition = Decision.make({
+          input: Schema.String,
+          decisions: {
+            intensity: Decision.rate({ instructions: "How intense", criteria: ["low", key, "high"] })
+          }
+        })
+        const { answers } = yield* DecisionModel.decide(definition, { input: "Help" }).pipe(
+          Effect.provide(TypeSafeDecisionModel.layer({ model: "jev-latest" })),
+          Effect.provide(makeClientLayer((request) =>
+            Effect.gen(function*() {
+              const { questions } = yield* getRequestBody(request)
+              assert.deepStrictEqual(questions.intensity.criteria, ["low", key, "high"])
+
+              return jsonResponse(request, {
+                model: "jev-latest",
+                answers: {
+                  intensity: {
+                    type: "score",
+                    score: 1.1,
+                    legend: { "0": "low", "1": key, "2": "high" },
+                    probabilities: { "0": 0.1, "1": 0.7, "2": 0.2 },
+                    confidence: 0.5
+                  }
+                }
+              })
+            })
+          ))
+        )
+        const { label, probabilities, rating } = answers.intensity
+
+        assert.isTrue(Object.hasOwn(probabilities, key))
+        assert.isTrue(Object.getOwnPropertyDescriptor(probabilities, key)?.enumerable)
+        assert.deepStrictEqual(Object.keys(probabilities), ["low", key, "high"])
+        assert.deepStrictEqual(probabilities, { low: 0.1, [key]: 0.7, high: 0.2 })
+        assert.strictEqual(label, key)
+        assert.strictEqual(rating, 1.1)
+        assert.strictEqual(Object.getPrototypeOf(probabilities), null)
+      }))
+
+    it.effect("sends an own enumerable question named " + key, () =>
+      Effect.gen(function*() {
+        const definition = Decision.make({
+          input: Schema.String,
+          decisions: {
+            [key]: Decision.probability({
+              instructions: "Needs action now",
+              criteria: { false: "No", true: "Yes" }
+            })
+          }
+        })
+        const { answers } = yield* DecisionModel.decide(definition, { input: "Help" }).pipe(
+          Effect.provide(TypeSafeDecisionModel.layer({ model: "jev-latest" })),
+          Effect.provide(makeClientLayer((request) =>
+            Effect.gen(function*() {
+              const { questions } = yield* getRequestBody(request)
+
+              assert.strictEqual(Object.getPrototypeOf(questions), Object.prototype)
+              assert.isTrue(Object.hasOwn(questions, key))
+              assert.isTrue(Object.getOwnPropertyDescriptor(questions, key)?.enumerable)
+              assert.deepStrictEqual(Object.keys(questions), [key])
+              assert.deepStrictEqual(questions[key], {
+                type: "noul",
+                instructions: "Needs action now",
+                criteria: { false: "No", true: "Yes" }
+              })
+
+              return jsonResponse(request, {
+                model: "jev-latest",
+                answers: { [key]: { type: "noul", noul: 0.75 } },
+                usage: { input_tokens: 20, output_tokens: 4 }
+              })
+            })
+          ))
+        )
+
+        assert.strictEqual(Object.getPrototypeOf(answers), null)
+        assert.isTrue(Object.hasOwn(answers, key))
+        assert.isTrue(Object.getOwnPropertyDescriptor(answers, key)?.enumerable)
+        assert.deepStrictEqual(Object.keys(answers), [key])
+        assert.deepStrictEqual(answers[key], { probability: 0.75 })
+      }))
+  }
+
+  it.effect("model provides DecisionModel with typesafe provider metadata", () =>
+    Effect.gen(function*() {
+      const provider = yield* Model.ProviderName
+      const modelName = yield* Model.ModelName
+      const model = yield* DecisionModel.DecisionModel
+
+      assert.strictEqual(provider, "typesafe")
+      assert.strictEqual(modelName, "jev-latest")
+      assert.isDefined(model.decide)
+    }).pipe(
+      Effect.provide(TypeSafeDecisionModel.model("jev-latest")),
+      Effect.provideService(TypeSafeClient.TypeSafeClient, noopTypeSafeClient)
+    ))
+
+  it.effect("sends the encoded input as state and every decision as a question in one request", () =>
+    Effect.gen(function*() {
+      const requests: Array<HttpClientRequest.HttpClientRequest> = []
+      const clientLayer = makeClientLayer((request) => {
+        requests.push(request)
+        return Effect.succeed(jsonResponse(request, systemOneResponse))
+      })
+
+      yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provide(TypeSafeDecisionModel.layer({ model: "jev-latest" })),
+        Effect.provide(clientLayer)
+      )
+
+      assert.strictEqual(requests.length, 1)
+      assert.strictEqual(requests[0].method, "POST")
+      assert.strictEqual(requests[0].url, "https://api.typesafe.ai/v1/systemone")
+      assert.strictEqual(requests[0].headers["authorization"], "Bearer ts-test-key")
+
+      const body = yield* getRequestBody(requests[0])
+      assert.deepStrictEqual(body, {
+        state: {
+          message: ticket.message,
+          orderId: "A-104"
+        },
+        model: "jev-latest",
+        questions: {
+          department: {
+            type: "choice",
+            instructions: "Which team should handle this",
+            criteria: {
+              billing: "Payment or subscription issues",
+              technical: "Bugs or integration problems",
+              sales: "Pricing or account questions"
+            }
+          },
+          frustration: {
+            type: "score",
+            instructions: "How frustrated the customer appears",
+            criteria: ["Calm, just stating facts", "Frustrated but civil", "Very angry, strong language"]
+          },
+          urgent: {
+            type: "noul",
+            instructions: "The message conveys urgency or time-sensitivity",
+            criteria: {
+              false: "No time pressure",
+              true: "Needs action now"
+            }
+          }
+        }
+      })
+    }))
+
+  it.effect("maps choice, score, and noul answers onto classify, rate, and probability answers", () =>
+    Effect.gen(function*() {
+      const { answers, usage } = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provide(TypeSafeDecisionModel.layer({ model: "jev-latest" })),
+        Effect.provide(makeClientLayer((request) => Effect.succeed(jsonResponse(request, systemOneResponse))))
+      )
+
+      assert.strictEqual(answers.department.label, "billing")
+      assert.deepStrictEqual(answers.department.probabilities, { billing: 0.84, technical: 0.159, sales: 0.001 })
+      assert.strictEqual(answers.department.confidence, 0.596)
+
+      assert.strictEqual(answers.frustration.rating, 1.6)
+      assert.strictEqual(answers.frustration.label, "Very angry, strong language")
+      assert.deepStrictEqual(answers.frustration.probabilities, {
+        "Calm, just stating facts": 0.05,
+        "Frustrated but civil": 0.3,
+        "Very angry, strong language": 0.65
+      })
+      assert.strictEqual(answers.frustration.confidence, 0.78)
+
+      assert.strictEqual(answers.urgent.probability, 0.999)
+      assert.isFalse("confidence" in answers.urgent)
+
+      assert.strictEqual(usage.inputTokens, 312)
+      assert.strictEqual(usage.outputTokens, 48)
+    }))
+
+  it.effect("encodes an explicitly undefined optional input field as JSON null", () =>
+    Effect.gen(function*() {
+      const requests: Array<HttpClientRequest.HttpClientRequest> = []
+      const definition = Decision.make({
+        input: Schema.Struct({ message: Schema.String, orderId: Schema.optional(Schema.String) }),
+        decisions: TicketTriage.decisions
+      })
+      const { answers } = yield* DecisionModel.decide(definition, {
+        input: { message: ticket.message, orderId: undefined }
+      }).pipe(
+        Effect.provide(TypeSafeDecisionModel.layer({ model: "jev-latest" })),
+        Effect.provide(makeClientLayer((request) => {
+          requests.push(request)
+          return Effect.succeed(jsonResponse(request, systemOneResponse))
+        }))
+      )
+
+      assert.strictEqual(requests.length, 1)
+      const body = yield* getRequestBody(requests[0])
+      assert.deepStrictEqual(body.state, { message: ticket.message, orderId: null })
+      assert.strictEqual(answers.urgent.probability, 0.999)
+    }))
+
+  for (
+    const { extra, inputTokens, name, outputTokens } of [
+      { name: "absent usage", extra: {}, inputTokens: undefined, outputTokens: undefined },
+      { name: "empty usage", extra: { usage: {} }, inputTokens: undefined, outputTokens: undefined },
+      { name: "input tokens only", extra: { usage: { input_tokens: 312 } }, inputTokens: 312, outputTokens: undefined },
+      { name: "output tokens only", extra: { usage: { output_tokens: 48 } }, inputTokens: undefined, outputTokens: 48 }
+    ]
+  ) {
+    it.effect("preserves answers with " + name, () =>
+      Effect.gen(function*() {
+        const { usage: _usage, ...response } = systemOneResponse
+        const { answers, usage } = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+          Effect.provide(TypeSafeDecisionModel.layer({ model: "jev-latest" })),
+          Effect.provide(makeClientLayer((request) => Effect.succeed(jsonResponse(request, { ...response, ...extra }))))
+        )
+
+        assert.strictEqual(answers.department.label, "billing")
+        assert.strictEqual(answers.frustration.rating, 1.6)
+        assert.strictEqual(answers.urgent.probability, 0.999)
+        assert.strictEqual(usage.inputTokens, inputTokens)
+        assert.strictEqual(usage.outputTokens, outputTokens)
+      }))
+  }
+
+  it.effect("sends a pinned model id through unchanged", () =>
+    Effect.gen(function*() {
+      const requests: Array<HttpClientRequest.HttpClientRequest> = []
+
+      const modelName = yield* Effect.gen(function*() {
+        yield* DecisionModel.decide(TicketTriage, { input: ticket })
+        return yield* Model.ModelName
+      }).pipe(
+        Effect.provide(TypeSafeDecisionModel.model("jev-1.13.0")),
+        Effect.provide(makeClientLayer((request) => {
+          requests.push(request)
+          return Effect.succeed(jsonResponse(request, { ...systemOneResponse, model: "jev-1.13.0" }))
+        }))
+      )
+
+      const body = yield* getRequestBody(requests[0])
+      assert.strictEqual(modelName, "jev-1.13.0")
+      assert.strictEqual(body.model, "jev-1.13.0")
+    }))
+
+  it.effect("passes a string input through as a string state", () =>
+    Effect.gen(function*() {
+      const requests: Array<HttpClientRequest.HttpClientRequest> = []
+      const Sentiment = Decision.make({
+        input: Schema.String,
+        decisions: {
+          urgent: Decision.probability({
+            instructions: "The message conveys urgency",
+            criteria: { false: "No time pressure", true: "Needs action now" }
+          })
+        }
+      })
+
+      yield* DecisionModel.decide(Sentiment, { input: "My card was charged twice." }).pipe(
+        Effect.provide(TypeSafeDecisionModel.layer({ model: "jev-latest" })),
+        Effect.provide(makeClientLayer((request) => {
+          requests.push(request)
+          return Effect.succeed(jsonResponse(request, {
+            model: "jev-latest",
+            answers: { urgent: { type: "noul", noul: 0.93 } },
+            usage: { input_tokens: 20, output_tokens: 4 }
+          }))
+        }))
+      )
+
+      const body = yield* getRequestBody(requests[0])
+      assert.strictEqual(body.state, "My card was charged twice.")
+    }))
+
+  it.effect("passes an array input through as an array state", () =>
+    Effect.gen(function*() {
+      const requests: Array<HttpClientRequest.HttpClientRequest> = []
+      const Conversation = Decision.make({
+        input: Schema.Array(Schema.String),
+        decisions: {
+          urgent: Decision.probability({
+            instructions: "The message conveys urgency",
+            criteria: { false: "No time pressure", true: "Needs action now" }
+          })
+        }
+      })
+
+      yield* DecisionModel.decide(Conversation, {
+        input: ["Hi", "My customer number is TS1337.", "My card was charged twice."]
+      }).pipe(
+        Effect.provide(TypeSafeDecisionModel.layer({ model: "jev-latest" })),
+        Effect.provide(makeClientLayer((request) => {
+          requests.push(request)
+          return Effect.succeed(jsonResponse(request, {
+            model: "jev-latest",
+            answers: { urgent: { type: "noul", noul: 0.93 } },
+            usage: { input_tokens: 20, output_tokens: 4 }
+          }))
+        }))
+      )
+
+      const body = yield* getRequestBody(requests[0])
+      assert.deepStrictEqual(body.state, ["Hi", "My customer number is TS1337.", "My card was charged twice."])
+    }))
+
+  it.effect("fails with InvalidOutputError when an answer type does not match the decision", () =>
+    Effect.gen(function*() {
+      const error = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provide(TypeSafeDecisionModel.layer({ model: "jev-latest" })),
+        Effect.provide(makeClientLayer((request) =>
+          Effect.succeed(jsonResponse(request, {
+            ...systemOneResponse,
+            answers: {
+              ...systemOneResponse.answers,
+              urgent: {
+                type: "choice",
+                choice: "true",
+                probabilities: { true: 0.9, false: 0.1 },
+                confidence: 0.8
+              }
+            }
+          }))
+        )),
+        Effect.flip
+      )
+
+      assert.strictEqual(error._tag, "AiError")
+      assert.strictEqual(error.reason._tag, "InvalidOutputError")
+    }))
+
+  it.effect("fails with InvalidOutputError when an answer is missing", () =>
+    Effect.gen(function*() {
+      const { urgent: _urgent, ...answers } = systemOneResponse.answers
+      const error = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provide(TypeSafeDecisionModel.layer({ model: "jev-latest" })),
+        Effect.provide(
+          makeClientLayer((request) => Effect.succeed(jsonResponse(request, { ...systemOneResponse, answers })))
+        ),
+        Effect.flip
+      )
+
+      assert.strictEqual(error._tag, "AiError")
+      assert.strictEqual(error.reason._tag, "InvalidOutputError")
+    }))
+
+  it.effect("fails with InvalidOutputError when a score answer omits probabilities", () =>
+    Effect.gen(function*() {
+      const { probabilities: _probabilities, ...frustration } = systemOneResponse.answers.frustration
+      const error = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provide(TypeSafeDecisionModel.layer({ model: "jev-latest" })),
+        Effect.provide(makeClientLayer((request) =>
+          Effect.succeed(jsonResponse(request, {
+            ...systemOneResponse,
+            answers: { ...systemOneResponse.answers, frustration }
+          }))
+        )),
+        Effect.flip
+      )
+
+      assert.strictEqual(error._tag, "AiError")
+      assert.strictEqual(error.reason._tag, "InvalidOutputError")
+    }))
+
+  it.effect("fails with InvalidOutputError when a score distribution skips a level index", () =>
+    Effect.gen(function*() {
+      const error = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provide(TypeSafeDecisionModel.layer({ model: "jev-latest" })),
+        Effect.provide(makeClientLayer((request) =>
+          Effect.succeed(jsonResponse(request, {
+            ...systemOneResponse,
+            answers: {
+              ...systemOneResponse.answers,
+              frustration: {
+                ...systemOneResponse.answers.frustration,
+                probabilities: { "0": 0.35, "2": 0.65 }
+              }
+            }
+          }))
+        )),
+        Effect.flip
+      )
+
+      assert.strictEqual(error._tag, "AiError")
+      assert.strictEqual(error.reason._tag, "InvalidOutputError")
+    }))
+
+  it.effect("surfaces client errors through decide", () =>
+    Effect.gen(function*() {
+      const error = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provide(TypeSafeDecisionModel.layer({ model: "jev-latest" })),
+        Effect.provide(makeClientLayer((request) =>
+          Effect.succeed(
+            HttpClientResponse.fromWeb(
+              request,
+              new Response(JSON.stringify({ message: "Rate limit exceeded" }), {
+                status: 429,
+                headers: { "content-type": "application/json", "retry-after": "3" }
+              })
+            )
+          )
+        )),
+        Effect.flip
+      )
+
+      assert.strictEqual(error._tag, "AiError")
+      assert.strictEqual(error.reason._tag, "RateLimitError")
+    }))
+})
+
+const makeClientLayer = (
+  handler: (
+    request: HttpClientRequest.HttpClientRequest
+  ) => Effect.Effect<HttpClientResponse.HttpClientResponse, HttpClientError.HttpClientError>
+) =>
+  TypeSafeClient.layer({ apiKey: Redacted.make("ts-test-key") }).pipe(
+    Layer.provide(Layer.succeed(HttpClient.HttpClient, makeHttpClient(handler)))
+  )
+
+const makeHttpClient = (
+  handler: (
+    request: HttpClientRequest.HttpClientRequest
+  ) => Effect.Effect<HttpClientResponse.HttpClientResponse, HttpClientError.HttpClientError>
+) =>
+  HttpClient.makeWith(
+    Effect.fnUntraced(function*(requestEffect) {
+      const request = yield* requestEffect
+      return yield* handler(request)
+    }),
+    Effect.succeed as HttpClient.HttpClient.Preprocess<HttpClientError.HttpClientError, never>
+  )
+
+const jsonResponse = (
+  request: HttpClientRequest.HttpClientRequest,
+  body: unknown
+): HttpClientResponse.HttpClientResponse =>
+  HttpClientResponse.fromWeb(
+    request,
+    new Response(JSON.stringify(body), {
+      status: 200,
+      headers: {
+        "content-type": "application/json"
+      }
+    })
+  )
+
+const getRequestBody = (request: HttpClientRequest.HttpClientRequest) =>
+  Effect.gen(function*() {
+    const body = request.body
+    if (body._tag === "Uint8Array") {
+      const text = new TextDecoder().decode(body.body)
+      return JSON.parse(text)
+    }
+    return yield* Effect.die(new Error("Expected Uint8Array body"))
+  })
+
+const noopTypeSafeClient: TypeSafeClient.Service = {
+  client: undefined as unknown as TypeSafeClient.Service["client"],
+  systemOne: () => Effect.die(new Error("noop")),
+  listModels: () => Effect.die(new Error("noop"))
+}
diff --git a/repos/effect/packages/ai/typesafe/test/TypeSafeSchema.test.ts b/repos/effect/packages/ai/typesafe/test/TypeSafeSchema.test.ts
new file mode 100644
index 000000000..4de6ac02e
--- /dev/null
+++ b/repos/effect/packages/ai/typesafe/test/TypeSafeSchema.test.ts
@@ -0,0 +1,134 @@
+import * as TypeSafeSchema from "@effect/ai-typesafe/TypeSafeSchema"
+import { assert, describe, it } from "@effect/vitest"
+import { Schema } from "effect"
+
+const choiceAnswer = {
+  type: "choice",
+  choice: "billing",
+  probabilities: { billing: 0.84, technical: 0.159, sales: 0.001 },
+  confidence: 0.596
+}
+
+const scoreAnswer = {
+  type: "score",
+  score: 1.6,
+  legend: { "0": "Calm", "1": "Frustrated", "2": "Very angry" },
+  probabilities: { "0": 0.05, "1": 0.3, "2": 0.65 },
+  confidence: 0.78
+}
+
+const noulAnswer = {
+  type: "noul",
+  noul: 0.999
+}
+
+describe("TypeSafeSchema", () => {
+  it("encodes a systemone request with every question type", () => {
+    const request = {
+      state: { message: "My card was charged twice.", order_id: "A-104" },
+      model: "jev-latest",
+      questions: {
+        department: {
+          type: "choice",
+          instructions: "Which team should handle this",
+          criteria: { billing: "Payment or subscription issues", technical: "Bugs or integration problems" }
+        },
+        frustration: {
+          type: "score",
+          instructions: "How frustrated the customer appears",
+          criteria: ["Calm", "Frustrated", "Very angry"]
+        },
+        urgent: {
+          type: "noul",
+          instructions: "The message conveys urgency",
+          criteria: { false: "No time pressure", true: "Needs action now" }
+        }
+      }
+    } as const
+
+    const decoded = Schema.decodeUnknownSync(TypeSafeSchema.SystemOneRequest)(request)
+    const encoded = Schema.encodeSync(TypeSafeSchema.SystemOneRequest)(decoded)
+
+    assert.deepStrictEqual(JSON.parse(JSON.stringify(encoded)), request)
+  })
+
+  it("accepts a noul question without criteria", () => {
+    const decoded = Schema.decodeUnknownSync(TypeSafeSchema.NoulQuestion)({
+      type: "noul",
+      instructions: "The message conveys urgency"
+    })
+
+    assert.strictEqual(decoded.type, "noul")
+    assert.isUndefined(decoded.criteria)
+  })
+
+  it("decodes a systemone response with choice, score, and noul answers", () => {
+    const response = {
+      model: "jev-latest",
+      answers: {
+        department: choiceAnswer,
+        frustration: scoreAnswer,
+        urgent: noulAnswer
+      },
+      usage: { input_tokens: 312, output_tokens: 48 }
+    }
+
+    const decoded = Schema.decodeUnknownSync(TypeSafeSchema.SystemOneResponse)(response)
+
+    assert.deepStrictEqual(JSON.parse(JSON.stringify(decoded)), response)
+  })
+
+  it("decodes a score answer without a legend", () => {
+    const { legend: _legend, ...withoutLegend } = scoreAnswer
+    const decoded = Schema.decodeUnknownSync(TypeSafeSchema.ScoreAnswer)(withoutLegend)
+
+    assert.strictEqual(decoded.score, 1.6)
+    assert.deepStrictEqual(decoded.probabilities, { "0": 0.05, "1": 0.3, "2": 0.65 })
+  })
+
+  it.each([
+    { name: "score answer without probabilities", answer: { type: "score", score: 1.6, confidence: 0.78 } },
+    { name: "score answer without score", answer: { type: "score", probabilities: { "0": 1 }, confidence: 1 } },
+    { name: "choice answer without probabilities", answer: { type: "choice", choice: "billing", confidence: 1 } },
+    { name: "choice answer without choice", answer: { type: "choice", probabilities: { billing: 1 }, confidence: 1 } },
+    { name: "noul answer without noul", answer: { type: "noul" } },
+    { name: "answer with an unknown type", answer: { type: "rank", rank: [] } }
+  ])("rejects a $name", ({ answer }) => {
+    assert.throws(() => Schema.decodeUnknownSync(TypeSafeSchema.Answer)(answer))
+  })
+
+  it.each([
+    { name: "absent usage", extra: {} },
+    { name: "empty usage", extra: { usage: {} } },
+    { name: "input tokens only", extra: { usage: { input_tokens: 312 } } },
+    { name: "output tokens only", extra: { usage: { output_tokens: 48 } } }
+  ])("decodes a response with $name", ({ extra }) => {
+    const response = { model: "jev-latest", answers: { urgent: noulAnswer }, ...extra }
+    const decoded = Schema.decodeUnknownSync(TypeSafeSchema.SystemOneResponse)(response)
+
+    assert.deepStrictEqual(JSON.parse(JSON.stringify(decoded)), response)
+  })
+
+  it.each([
+    { name: "neither optional field", model: { name: "jev-latest" } },
+    { name: "description only", model: { name: "jev-latest", description: "Latest Jev" } },
+    { name: "release date only", model: { name: "jev-latest", release_date: "2026-08-01" } }
+  ])("decodes a model with $name", ({ model }) => {
+    const response = { models: [model] }
+    const decoded = Schema.decodeUnknownSync(TypeSafeSchema.ListModelsResponse)(response)
+
+    assert.deepStrictEqual(JSON.parse(JSON.stringify(decoded)), response)
+  })
+
+  it("decodes a models list response", () => {
+    const response = {
+      models: [
+        { name: "jev-1.13.0", description: "Jev 1.13", release_date: "2026-08-01" }
+      ]
+    }
+
+    const decoded = Schema.decodeUnknownSync(TypeSafeSchema.ListModelsResponse)(response)
+
+    assert.deepStrictEqual(JSON.parse(JSON.stringify(decoded)), response)
+  })
+})
diff --git a/repos/effect/packages/ai/typesafe/tsconfig.json b/repos/effect/packages/ai/typesafe/tsconfig.json
new file mode 100644
index 000000000..e2a8ca19a
--- /dev/null
+++ b/repos/effect/packages/ai/typesafe/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "extends": "../../../tsconfig.base.json",
+  "include": ["src"],
+  "references": [
+    { "path": "../../effect" }
+  ]
+}
diff --git a/repos/effect/packages/ai/typesafe/typetest/TypeSafeDecisionModel.tst.ts b/repos/effect/packages/ai/typesafe/typetest/TypeSafeDecisionModel.tst.ts
new file mode 100644
index 000000000..0c963a8f2
--- /dev/null
+++ b/repos/effect/packages/ai/typesafe/typetest/TypeSafeDecisionModel.tst.ts
@@ -0,0 +1,78 @@
+import { TypeSafeClient, TypeSafeDecisionModel } from "@effect/ai-typesafe"
+import { type Config, Effect, type Layer, Redacted, Schema } from "effect"
+import { Decision, DecisionModel, type Model } from "effect/unstable/ai"
+import type { HttpClient } from "effect/unstable/http"
+import { describe, expect, it } from "tstyche"
+
+declare const acceptsKnownModel: (model: TypeSafeDecisionModel.Model) => void
+
+const Triage = Decision.make({
+  input: Schema.String,
+  decisions: {
+    urgent: Decision.probability({
+      instructions: "The message conveys urgency",
+      criteria: { false: "No time pressure", true: "Needs action now" }
+    })
+  }
+})
+
+describe("TypeSafeDecisionModel", () => {
+  describe("Model", () => {
+    it("keeps the known model ids as literals, while the constructors still accept custom ids", () => {
+      expect(acceptsKnownModel).type.toBeCallableWith("jev-latest")
+      expect(acceptsKnownModel).type.toBeCallableWith("jev-preview")
+      expect(acceptsKnownModel).type.toBeCallableWith("jev-1.13.0")
+      expect(acceptsKnownModel).type.not.toBeCallableWith("not-a-real-model")
+      expect(TypeSafeDecisionModel.model).type.toBeCallableWith("not-a-real-model")
+      expect(TypeSafeDecisionModel.layer).type.toBeCallableWith({ model: "not-a-real-model" })
+    })
+  })
+
+  describe("model", () => {
+    it("provides DecisionModel and requires TypeSafeClient", () => {
+      expect(TypeSafeDecisionModel.model("jev-latest")).type.toBe<
+        Model.Model<"typesafe", DecisionModel.DecisionModel, TypeSafeClient.TypeSafeClient>
+      >()
+    })
+
+    it("satisfies a decide program's DecisionModel requirement", () => {
+      const program = DecisionModel.decide(Triage, { input: "My card was charged twice." }).pipe(
+        Effect.provide(TypeSafeDecisionModel.model("jev-latest"))
+      )
+
+      type Requirements = typeof program extends Effect.Effect<any, any, infer R> ? R : never
+
+      expect<Requirements>().type.toBe<TypeSafeClient.TypeSafeClient>()
+    })
+  })
+
+  describe("layer", () => {
+    it("provides DecisionModel and requires TypeSafeClient", () => {
+      expect(TypeSafeDecisionModel.layer({ model: "jev-latest" })).type.toBe<
+        Layer.Layer<DecisionModel.DecisionModel, never, TypeSafeClient.TypeSafeClient>
+      >()
+    })
+  })
+
+  describe("make", () => {
+    it("builds a DecisionModel from the TypeSafeClient service", () => {
+      expect(TypeSafeDecisionModel.make({ model: "jev-latest" })).type.toBe<
+        Effect.Effect<DecisionModel.DecisionModel, never, TypeSafeClient.TypeSafeClient>
+      >()
+    })
+  })
+})
+
+describe("TypeSafeClient", () => {
+  it("layer requires only HttpClient", () => {
+    expect(TypeSafeClient.layer({ apiKey: Redacted.make("ts-test-key") })).type.toBe<
+      Layer.Layer<TypeSafeClient.TypeSafeClient, never, HttpClient.HttpClient>
+    >()
+  })
+
+  it("layerConfig fails with ConfigError", () => {
+    expect(TypeSafeClient.layerConfig()).type.toBe<
+      Layer.Layer<TypeSafeClient.TypeSafeClient, Config.ConfigError, HttpClient.HttpClient>
+    >()
+  })
+})
diff --git a/repos/effect/packages/atom/react/CHANGELOG.md b/repos/effect/packages/atom/react/CHANGELOG.md
index ba66b0a15..68cbcf6a3 100644
--- a/repos/effect/packages/atom/react/CHANGELOG.md
+++ b/repos/effect/packages/atom/react/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @effect/atom-react
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7744](https://github.com/Effect-TS/effect/pull/7744) [`474860b`](https://github.com/Effect-TS/effect/commit/474860b4629ca2d01f7bff8f310bce3f3f35c42c) Thanks @kitlangton! - Ensure `useAtomRef` updates after switching refs when the new value matches the previous ref's value.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/atom/react/package.json b/repos/effect/packages/atom/react/package.json
index 6c6f494dc..bcea696d4 100644
--- a/repos/effect/packages/atom/react/package.json
+++ b/repos/effect/packages/atom/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/atom-react",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "React bindings for the Effect Atom modules",
@@ -65,17 +65,17 @@
     "scheduler": ">=0.25.0 <0.28.0"
   },
   "devDependencies": {
-    "@testing-library/dom": "^10.4.1",
+    "@testing-library/dom": "^10.4.2",
     "@testing-library/jest-dom": "^7.0.1",
     "@testing-library/react": "^16.3.3",
-    "@types/react": "^19.2.18",
-    "@types/react-dom": "^19.2.5",
-    "@types/scheduler": "^0.26.0",
+    "@types/react": "^19.3.0",
+    "@types/react-dom": "^19.3.0",
+    "@types/scheduler": "^0.28.0",
     "effect": "workspace:^",
-    "jsdom": "^30.0.1",
-    "react": "^19.2.8",
-    "react-dom": "^19.2.8",
-    "react-error-boundary": "^6.1.3",
-    "scheduler": "^0.27.0"
+    "jsdom": "~30.0.1",
+    "react": "^19.3.0",
+    "react-dom": "^19.3.0",
+    "react-error-boundary": "^6.1.5",
+    "scheduler": "^0.28.0"
   }
 }
diff --git a/repos/effect/packages/atom/react/src/Hooks.ts b/repos/effect/packages/atom/react/src/Hooks.ts
index 4632ea333..5fe03b33b 100644
--- a/repos/effect/packages/atom/react/src/Hooks.ts
+++ b/repos/effect/packages/atom/react/src/Hooks.ts
@@ -435,8 +435,8 @@ export const useAtomSubscribe = <A>(
  * @since 4.0.0
  */
 export const useAtomRef = <A>(ref: AtomRef.ReadonlyRef<A>): A => {
-  const [, setValue] = React.useState(ref.value)
-  React.useEffect(() => ref.subscribe(setValue), [ref])
+  const [, forceUpdate] = React.useReducer((n) => n + 1, 0)
+  React.useEffect(() => ref.subscribe(forceUpdate), [ref])
   return ref.value
 }
 
diff --git a/repos/effect/packages/atom/react/test/index.test.tsx b/repos/effect/packages/atom/react/test/index.test.tsx
index 06c2668b9..f00e71a6f 100644
--- a/repos/effect/packages/atom/react/test/index.test.tsx
+++ b/repos/effect/packages/atom/react/test/index.test.tsx
@@ -4,6 +4,7 @@ import { Cause, Context, Effect, Latch, Layer } from "effect"
 import * as Schema from "effect/Schema"
 import * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
 import * as Atom from "effect/unstable/reactivity/Atom"
+import * as AtomRef from "effect/unstable/reactivity/AtomRef"
 import * as AtomRegistry from "effect/unstable/reactivity/AtomRegistry"
 import * as Hydration from "effect/unstable/reactivity/Hydration"
 import * as React from "react"
@@ -11,10 +12,18 @@ import { Suspense } from "react"
 import { renderToString } from "react-dom/server"
 import { ErrorBoundary } from "react-error-boundary"
 import { beforeEach, describe, expect, it, test, vi } from "vitest"
-import { HydrationBoundary, RegistryContext, RegistryProvider, useAtomSuspense, useAtomValue } from "../src/index.ts"
+import {
+  HydrationBoundary,
+  RegistryContext,
+  RegistryProvider,
+  useAtomRef,
+  useAtomSuspense,
+  useAtomValue
+} from "../src/index.ts"
 import * as ScopedAtom from "../src/ScopedAtom.ts"
 
-describe("atom-react", () => {
+// Tests share the DOM and registry.
+describe("atom-react", { concurrent: false }, () => {
   let registry: AtomRegistry.AtomRegistry
 
   beforeEach(() => {
@@ -180,6 +189,24 @@ describe("atom-react", () => {
     })
   })
 
+  test("useAtomRef updates after switching refs", () => {
+    const first = AtomRef.make(0)
+    const second = AtomRef.make(1)
+
+    function TestComponent({ source }: { readonly source: AtomRef.ReadonlyRef<number> }) {
+      return <div data-testid="value">{useAtomRef(source)}</div>
+    }
+
+    const { rerender } = render(<TestComponent source={first} />)
+    rerender(<TestComponent source={second} />)
+
+    act(() => {
+      second.set(0)
+    })
+
+    expect(screen.getByTestId("value")).toHaveTextContent("0")
+  })
+
   describe("ScopedAtom", () => {
     test("throws when used outside Provider", () => {
       const counter = ScopedAtom.make(() => Atom.make(0))
diff --git a/repos/effect/packages/atom/solid/CHANGELOG.md b/repos/effect/packages/atom/solid/CHANGELOG.md
index 849829970..c5b287547 100644
--- a/repos/effect/packages/atom/solid/CHANGELOG.md
+++ b/repos/effect/packages/atom/solid/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @effect/atom-solid
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7533](https://github.com/Effect-TS/effect/pull/7533) [`7e24e3a`](https://github.com/Effect-TS/effect/commit/7e24e3a5ef62fd46f8fbee814c7da8f94d834c75) Thanks @apoorvdarshan! - Allow `RegistryProvider` to leave `defaultIdleTTL` undefined, matching the React binding and enabling immediate cleanup of unused atoms unless a TTL is explicitly configured.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/atom/solid/package.json b/repos/effect/packages/atom/solid/package.json
index 0bfe68b26..f2feb710d 100644
--- a/repos/effect/packages/atom/solid/package.json
+++ b/repos/effect/packages/atom/solid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/atom-solid",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "SolidJS bindings for the Effect Atom modules",
@@ -65,10 +65,10 @@
   },
   "devDependencies": {
     "@solidjs/testing-library": "^0.8.10",
-    "@testing-library/dom": "^10.4.1",
+    "@testing-library/dom": "^10.4.2",
     "@testing-library/jest-dom": "^7.0.1",
     "effect": "workspace:^",
-    "jsdom": "^30.0.1",
+    "jsdom": "~30.0.1",
     "solid-js": "^1.9.15"
   }
 }
diff --git a/repos/effect/packages/atom/solid/src/RegistryContext.ts b/repos/effect/packages/atom/solid/src/RegistryContext.ts
index 7c1b6c0f2..111cfab28 100644
--- a/repos/effect/packages/atom/solid/src/RegistryContext.ts
+++ b/repos/effect/packages/atom/solid/src/RegistryContext.ts
@@ -68,7 +68,7 @@ export const RegistryProvider = (options: {
     scheduleTask: options.scheduleTask,
     initialValues: options.initialValues,
     timeoutResolution: options.timeoutResolution,
-    defaultIdleTTL: options.defaultIdleTTL ?? 400
+    defaultIdleTTL: options.defaultIdleTTL
   })
   onCleanup(() => registry.dispose())
   return createComponent(RegistryContext.Provider, {
diff --git a/repos/effect/packages/atom/vue/CHANGELOG.md b/repos/effect/packages/atom/vue/CHANGELOG.md
index 0cfa84462..9d5309f25 100644
--- a/repos/effect/packages/atom/vue/CHANGELOG.md
+++ b/repos/effect/packages/atom/vue/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @effect/atom-vue
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7746](https://github.com/Effect-TS/effect/pull/7746) [`74ff5c3`](https://github.com/Effect-TS/effect/commit/74ff5c31380db8816006bad7031e0a76032dcc08) Thanks @kitlangton! - Fix `useAtomRef` returning a stale value after switching refs.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/atom/vue/package.json b/repos/effect/packages/atom/vue/package.json
index 97d57eaab..36747dab5 100644
--- a/repos/effect/packages/atom/vue/package.json
+++ b/repos/effect/packages/atom/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/atom-vue",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "Vue bindings for the Effect Atom modules",
@@ -61,7 +61,7 @@
   },
   "devDependencies": {
     "effect": "workspace:^",
-    "vue": "^3.5.42"
+    "vue": "^3.5.43"
   },
   "peerDependencies": {
     "effect": "workspace:^",
diff --git a/repos/effect/packages/atom/vue/src/index.ts b/repos/effect/packages/atom/vue/src/index.ts
index a2f434007..b4fff5a91 100644
--- a/repos/effect/packages/atom/vue/src/index.ts
+++ b/repos/effect/packages/atom/vue/src/index.ts
@@ -206,6 +206,7 @@ export const useAtomRef = <A>(atomRef: () => AtomRef.ReadonlyRef<A>): Readonly<R
     onCleanup(ref.subscribe((next: A) => {
       value.value = next
     }))
+    value.value = ref.value
   })
   return value as Readonly<Ref<A>>
 }
diff --git a/repos/effect/packages/atom/vue/test/index.test.ts b/repos/effect/packages/atom/vue/test/index.test.ts
index 79cf1df55..ae0b2f885 100644
--- a/repos/effect/packages/atom/vue/test/index.test.ts
+++ b/repos/effect/packages/atom/vue/test/index.test.ts
@@ -1,5 +1,24 @@
-import { describe, test } from "vitest"
+import { useAtomRef } from "@effect/atom-vue"
+import { assert, describe, it } from "@effect/vitest"
+import * as AtomRef from "effect/unstable/reactivity/AtomRef"
+import { effectScope, nextTick, shallowRef } from "vue"
 
 describe("atom-vue", () => {
-  test("", () => {})
+  describe("useAtomRef", () => {
+    it("publishes the current value when the selected ref changes", async () => {
+      const first = AtomRef.make(1)
+      const second = AtomRef.make(10)
+      const selected = shallowRef(first)
+      const scope = effectScope()
+      try {
+        const value = scope.run(() => useAtomRef(() => selected.value))!
+
+        selected.value = second
+        await nextTick()
+        assert.strictEqual(value.value, 10)
+      } finally {
+        scope.stop()
+      }
+    })
+  })
 })
diff --git a/repos/effect/packages/effect/ARBITRARY-FOLLOW-UPS.md b/repos/effect/packages/effect/ARBITRARY-FOLLOW-UPS.md
deleted file mode 100644
index 862a47e3a..000000000
--- a/repos/effect/packages/effect/ARBITRARY-FOLLOW-UPS.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# Native Arbitrary Follow-ups
-
-This file tracks unfinished work for the native Schema-first Arbitrary implementation. Settled behavior and technical
-decisions belong in [ARBITRARY.md](ARBITRARY.md); migration guidance belongs in
-[ARBITRARY-MIGRATION.md](ARBITRARY-MIGRATION.md). Remove an item from this file when it is resolved rather than keeping
-completed implementation history here.
-
-Every production change must preserve the existing guarantees:
-
-- Schema remains the only catalog of primitive and structural generator constructors;
-- discarded roots are bounded by `maxDiscards`;
-- inspected shrink candidates, including rejected nodes, are bounded by `maxShrinks`;
-- shrinking and replay remain deterministic for supported pure callbacks;
-- recursive and mutually recursive Schemas retain their productivity guarantees;
-- `Sample`, the shrink carrier, the PRNG, generation budgets, and compiler metadata remain private;
-- runtime performance and bundle cost are measured before and after the change.
-
-## Conditional research
-
-These items are intentionally dormant until their trigger is observed.
-
-### Finite-domain metadata
-
-Evaluate private finite-domain metadata only if constructive unique generation demonstrates a real exhaustion or
-productivity problem. Do not add public cardinality vocabulary preemptively.
-
-### Decoded collection and Declaration profiling
-
-Profile collection generation Links and Declaration decoding only when a new runtime baseline identifies a regression.
-ReadonlyMap and ReadonlySet are compiler-owned; Effect-specific HashMap, HashSet, and Chunk keep declaration-local
-generation Links.
-
-### Schema-scoped distribution customization
-
-Revisit application-owned distribution overrides, including deterministic Faker integration, only after a concrete
-use case establishes the required scope and bundle boundary. A future design must work for checked and nested Schemas,
-must not overload filter or declaration annotations with a second contract, and must not require synthetic Schemas in
-test integrations. Prefer a derivation-time override mechanism over executable metadata captured by production Schema
-modules.
-
-### Trace-informed shrinking
-
-Compare the current `Sample` tree with private structural spans or trace-informed shrinking only when a reproducible
-case shows poor shrunk output or excessive candidate traversal.
-
-### Concrete failing-input persistence
-
-Evaluate persistence and reuse of concrete failing inputs last. After `map` or `flatMap`, an Arbitrary may no longer
-have a Schema or codec capable of serializing its output, while the existing opaque replay token remains persistable.
-
-## Verification policy
-
-For every activated item, use the narrowest representative validation and record exact commands and artifacts:
-
-- focused Arbitrary runtime tests and typetests when the public types change;
-- package type checking and linting;
-- seeded generation, shrinking, and replay characterization relevant to the slice;
-- focused warm and cold runtime scenarios;
-- focused Arbitrary bundle fixtures plus production Schema bundle sentinels.
-
-Do not update public JSDoc, [ARBITRARY.md](ARBITRARY.md), the migration guide, or the changeset until the corresponding
-behavior has passed its semantic, runtime, and bundle gates.
diff --git a/repos/effect/packages/effect/ARBITRARY-MIGRATION.md b/repos/effect/packages/effect/ARBITRARY-MIGRATION.md
deleted file mode 100644
index c40815c2d..000000000
--- a/repos/effect/packages/effect/ARBITRARY-MIGRATION.md
+++ /dev/null
@@ -1,335 +0,0 @@
-# Migrating to Native Arbitrary
-
-This guide covers migration from the fast-check bridge published in `effect@4.0.0-rc.109` to the native,
-Schema-first module at `effect/unstable/arbitrary`.
-
-The new module removes fast-check from the `effect` package. Applications may still install and use fast-check
-directly, but Effect Schema generation and `@effect/vitest` property tests no longer depend on it.
-
-For the new API and its semantics, see [Arbitrary in Effect](ARBITRARY.md).
-
-## Import Changes
-
-The following APIs have been removed:
-
-- `effect/testing/FastCheck`;
-- `Schema.toArbitrary`;
-- `Schema.Arbitrary`;
-- the legacy `Schema.Annotations.ToArbitrary` contract and declaration-level `toArbitrary` annotation;
-- the legacy `arbitrary` filter annotation;
-- raw fast-check arbitrary inputs and `fastCheck` options in `@effect/vitest`.
-
-Import the native module explicitly:
-
-```ts
-import { Arbitrary } from "effect/unstable/arbitrary"
-```
-
-If other tests still use fast-check-specific APIs, add fast-check as a direct development dependency and import it
-from `"fast-check"`. Do not import it through Effect.
-
-## Generating Samples
-
-Previously, `Schema.toArbitrary` returned a factory that needed the fast-check module:
-
-```ts
-import { Schema } from "effect"
-import { FastCheck } from "effect/testing"
-
-const Person = Schema.Struct({
-  name: Schema.String,
-  age: Schema.Int
-})
-
-const personArbitrary = Schema.toArbitrary(Person)(FastCheck)
-const samples = FastCheck.sample(personArbitrary, { numRuns: 20, seed: 42 })
-```
-
-Now derive and sample through the Effect-native module:
-
-```ts
-import { Effect, Schema } from "effect"
-import { Arbitrary } from "effect/unstable/arbitrary"
-
-const Person = Schema.Struct({
-  name: Schema.String,
-  age: Schema.Int
-})
-
-const personArbitrary = Arbitrary.schema(Person)
-const samples = await Effect.runPromise(
-  Arbitrary.sampleEffect(personArbitrary, { count: 20, seed: 42 })
-)
-```
-
-`Arbitrary.sampleEffect` returns an `Effect` because sampling is interruptible, uses Effect `Random` when no seed is
-provided, and reports bounded generation exhaustion as a typed `SampleError`.
-
-The generated values still use the decoded Schema `Type`. The sequence and distribution are not compatible with
-fast-check, even when the same numeric seed is used.
-
-## Checking Properties
-
-Previously, fast-check owned both the property and the runner:
-
-```ts
-import { Schema } from "effect"
-import { FastCheck } from "effect/testing"
-
-const integer = Schema.toArbitrary(Schema.Int)(FastCheck)
-
-FastCheck.assert(
-  FastCheck.property(integer, (value) => Number.isInteger(value)),
-  { numRuns: 100, seed: 42 }
-)
-```
-
-Now `Arbitrary.checkEffect` runs a pure or Effectful property and returns a structured result:
-
-```ts
-import { Effect, Schema } from "effect"
-import { Arbitrary } from "effect/unstable/arbitrary"
-
-const result = await Effect.runPromise(
-  Arbitrary.checkEffect(
-    Arbitrary.schema(Schema.Int),
-    (value) => Number.isInteger(value),
-    { runs: 100, seed: 42 }
-  )
-)
-```
-
-Unlike `FastCheck.assert`, `Arbitrary.checkEffect` does not throw for an ordinary falsification. Handle `Passed`,
-`Falsified`, `Exhausted`, and `ReplayMismatch` explicitly, or use `@effect/vitest`, which converts non-passing results
-into test failures.
-
-Typed failures from Effectful properties are preserved in `Falsified.failure`. Defects and interruption continue
-through the returned Effect.
-
-## Option Mapping
-
-The most common options map as follows:
-
-| Previous fast-check option | Native option        | Migration note                                                     |
-| -------------------------- | -------------------- | ------------------------------------------------------------------ |
-| `numRuns`                  | `count` or `runs`    | Use `count` for `sampleEffect` and `runs` for `checkEffect`.       |
-| `seed`                     | `seed`               | The type is compatible, but generated sequences are not.           |
-| `path`                     | `replay`             | Existing fast-check paths cannot be converted.                     |
-| `maxSkipsPerRun`           | `maxDiscards`        | Native uses one absolute discard budget, not a multiplier per run. |
-| `examples`                 | No direct equivalent | Keep explicit regression cases as ordinary tests.                  |
-| `endOnFailure`             | `maxShrinks`         | Use `maxShrinks: 0` to stop at the initial failure.                |
-| `interruptAfterTimeLimit`  | Effect interruption  | Apply an Effect or test timeout around the check.                  |
-| `skipAllAfterTimeLimit`    | No direct equivalent | Prefer explicit run and discard bounds.                            |
-| `verbose`                  | No direct equivalent | Inspect `CheckResult` or use `@effect/vitest` failure output.      |
-
-Review any less common fast-check runner option manually. The native API deliberately does not reproduce the complete
-`fc.Parameters` surface.
-
-## Replay Migration
-
-Fast-check replay used a seed plus a shrink `path`. Native replay uses one opaque token returned by a `Falsified`
-result:
-
-```ts
-const replayed = Arbitrary.checkEffect(arbitrary, property, {
-  replay: previousFailure.replay
-})
-```
-
-There is no conversion from a fast-check seed and path to a native replay token. Re-run the property with the native
-engine, then record the new token from its `Falsified` result.
-
-Replay tokens are intended for reproducing and diagnosing a current failure. Because the module is unstable, they are
-not guaranteed to survive upgrades. Preserve important failing inputs as explicit regression tests.
-
-## Migrating Declaration Annotations
-
-The old `toArbitrary` annotation directly constructed a fast-check arbitrary and exposed fast-check recursion and
-constraint details:
-
-```ts
-import { Schema } from "effect"
-
-class UserId {
-  readonly value: number
-  constructor(value: number) {
-    this.value = value
-  }
-}
-
-const UserIdSchema = Schema.instanceOf(UserId, {
-  toArbitrary: () => (fc) => fc.integer({ min: 1, max: 1_000_000 }).map((value) => new UserId(value))
-})
-```
-
-The native `toCodecArbitrary` annotation describes a generatable representation as a Schema `Link`:
-
-```ts
-import { Schema, SchemaTransformation } from "effect"
-
-class UserId {
-  readonly value: number
-  constructor(value: number) {
-    this.value = value
-  }
-}
-
-const UserIdSchema = Schema.instanceOf(UserId, {
-  toCodecArbitrary: () =>
-    Schema.link<UserId>()(
-      Schema.Int.check(Schema.isBetween({ minimum: 1, maximum: 1_000_000 })),
-      SchemaTransformation.transform({
-        decode: (value) => new UserId(value),
-        encode: (id) => id.value
-      })
-    )
-})
-```
-
-Before adding `toCodecArbitrary`, check whether the declaration already has a useful `toCodecJson` or `toCodec`.
-Native derivation falls back to those canonical codecs automatically. Add an arbitrary-specific Link only when the
-canonical representation is opaque or generates valid values too rarely.
-
-The migration changes where generation logic lives:
-
-| Legacy contract                                | Native contract                                                |
-| ---------------------------------------------- | -------------------------------------------------------------- |
-| Returns a `fast-check.Arbitrary`               | Returns a `SchemaAST.Link` through `Schema.link`.              |
-| Receives generated arbitrary type parameters   | Receives decoded Schema type parameters.                       |
-| Receives fast-check constraints and recursion  | Receives normalized constraints.                               |
-| Manages terminal recursive branches explicitly | Leaves recursion analysis and budgets to the native compiler.  |
-| Uses arbitrary combinators                     | Uses Schema constructors, checks, and a Schema transformation. |
-
-The original declaration remains authoritative. Values decoded by the Link are checked against it. Failed decodes and
-rejected values become bounded discards.
-
-### Custom Filter Metadata
-
-The old `arbitrary` filter annotation has been replaced by `arbitraryConstraint`. Ordinary custom filters continue to
-work as residual filters without generation metadata:
-
-```ts
-import { Schema } from "effect"
-
-const Even = Schema.Int.check(
-  Schema.makeFilter((value) => value % 2 === 0)
-)
-```
-
-Residual filtering is bounded, so a very selective or impossible predicate may produce `SampleError` or `Exhausted`.
-
-If the previous annotation supplied a recognized constructive constraint, move it to `arbitraryConstraint` and adapt
-its shape. The predicate remains authoritative:
-
-```ts
-import { Order, Schema } from "effect"
-
-const Positive = Schema.Number.check(
-  Schema.makeFilter(
-    (value) => value > 0,
-    {
-      arbitraryConstraint: {
-        order: Order.Number,
-        minimum: 0,
-        exclusiveMinimum: true
-      }
-    }
-  )
-)
-```
-
-The main constraint-shape changes are:
-
-| Previous field                       | Native field                                                        |
-| ------------------------------------ | ------------------------------------------------------------------- |
-| `ordered.order`                      | `order`                                                             |
-| `ordered.minimum` / `maximum`        | `minimum` / `maximum`                                               |
-| `ordered.exclusiveMinimum` / maximum | `exclusiveMinimum: true` / `exclusiveMaximum: true`                 |
-| `integer: true`                      | `number: "integer"`                                                 |
-| `noNaN` and `noInfinity`             | `number: "finite"` when both restrictions apply                     |
-| collection `minLength` / `maxLength` | `minLength`, `minSize`, or `minProperties` and its matching maximum |
-| string pattern                       | `{ source, flags }` in `patterns`                                   |
-| `unique: true`                       | `uniqueBy: identity`                                                |
-| `candidate`                          | No direct equivalent                                                |
-
-Choose the cardinality field that matches the Schema domain: `minLength` and `maxLength` for strings and arrays,
-`minSize` and `maxSize` for sized collections, and `minProperties` and `maxProperties` for object properties.
-
-For an opaque declaration that needs a reusable statistically better source domain, express that source as a Schema
-Link with `toCodecArbitrary`.
-
-## Migrating `@effect/vitest`
-
-Property inputs may be Schemas, native Arbitraries, or mixtures of both.
-
-Schema-only properties need only an option rename:
-
-```ts
-// Before
-it.prop(
-  "commutative",
-  [Schema.Int, Schema.Int],
-  ([a, b]) => a + b === b + a,
-  { fastCheck: { numRuns: 200, seed: 42 } }
-)
-
-// After
-it.prop(
-  "commutative",
-  [Schema.Int, Schema.Int],
-  ([a, b]) => a + b === b + a,
-  { arbitrary: { runs: 200, seed: 42 } }
-)
-```
-
-Raw or mixed fast-check inputs are no longer accepted:
-
-```ts
-// No longer supported
-it.prop("raw arbitrary", [fc.integer()], ([value]) => Number.isInteger(value))
-it.prop("mixed", [Schema.String, fc.integer()], ([text, value]) => true)
-```
-
-Replace those inputs with Schemas when they describe a domain supported by Schema, or compose a native Arbitrary:
-
-```ts
-import { Arbitrary } from "effect/unstable/arbitrary"
-
-const integer = Arbitrary.schema(Schema.Int)
-
-it.prop("native arbitrary", [integer], ([value]) => Number.isInteger(value))
-it.prop("mixed", [Schema.String, integer], ([text, value]) => typeof text === "string" && Number.isInteger(value))
-```
-
-If a test genuinely needs a fast-check-specific arbitrary or runner feature, use fast-check directly with Vitest
-rather than passing it through `@effect/vitest`.
-
-`it.prop`, `it.effect.prop`, and `it.live.prop` all accept native check options under `arbitrary`.
-
-## Behavioral Differences to Review
-
-Migration is not only an import rename. Review the following differences:
-
-- native generation and shrinking have different distributions and may find different shrunk inputs;
-- native checking returns structured results instead of using fast-check's assertion exceptions;
-- generation that cannot find enough valid samples is bounded and reports `SampleError` or `Exhausted`;
-- pure and Effectful properties share one interruptible runner;
-- recursive and mutually recursive Schemas are analyzed as a graph and must have a finite generation path;
-- replay tokens, seeds, and shrink paths are not compatible with fast-check;
-- generated values are the decoded Schema `Type`;
-- properties must not mutate generated values.
-
-## Migration Checklist
-
-1. Replace `effect/testing/FastCheck` imports. Use the native Arbitrary module for Schema generation and import
-   `"fast-check"` directly only where it is still independently required.
-2. Replace `Schema.toArbitrary(schema)(FastCheck)` with `Arbitrary.schema(schema)`.
-3. Replace `FastCheck.sample` with `Arbitrary.sampleEffect` and run the returned Effect.
-4. Replace `FastCheck.check` or `FastCheck.assert` for Schema-derived inputs with `Arbitrary.checkEffect`, then handle its
-   structured result.
-5. Rename `@effect/vitest` options from `fastCheck` to `arbitrary` and convert `numRuns` to `runs`.
-6. Replace raw fast-check inputs in `@effect/vitest` with Schemas or native Arbitraries.
-7. Migrate declaration-level `toArbitrary` callbacks to the `toCodecArbitrary` Link-returning contract and replace old
-   filter-level `arbitrary` annotations with `arbitraryConstraint`.
-8. Re-run properties with the native engine and record new replay tokens or explicit regression examples.
-9. Review discard limits for selective custom filters.
diff --git a/repos/effect/packages/effect/ARBITRARY.md b/repos/effect/packages/effect/ARBITRARY.md
index 9c7778024..aaba320f6 100644
--- a/repos/effect/packages/effect/ARBITRARY.md
+++ b/repos/effect/packages/effect/ARBITRARY.md
@@ -18,9 +18,6 @@ The API used here is currently available from `effect/unstable/arbitrary`. The `
 the ideas are stable, but names, result types, generation policies, and replay format may still change before this
 module is promoted.
 
-If you are upgrading from the earlier Schema arbitrary integration available in `effect@4.0.0-rc.109`, see the
-[migration guide](ARBITRARY-MIGRATION.md).
-
 ## Writing a First Property
 
 Consider the rule “adding zero does not change an integer.” With `@effect/vitest`, we can write it directly:
@@ -165,6 +162,22 @@ match the input. After a failure, it simplifies one member at a time. Empty tupl
 Effect occasionally creates generated records without inherited `Object` methods. This can reveal code that assumes
 methods such as `hasOwnProperty` always exist. Prefer `Object.hasOwn(value, key)` when checking generated objects.
 
+Use `array` for variable-length collections of an existing Arbitrary:
+
+```ts
+const command = integers.pipe(Arbitrary.map((value) => ({ _tag: "Add" as const, value })))
+const commands = Arbitrary.array(command, { maxLength: 50 })
+```
+
+`minLength` defaults to zero. Generation grows with `size`, honors explicit minima even at size zero, and respects
+`maxLength`. Invalid bounds throw immediately. After a failure, `array` tries removing blocks, including prefixes and
+interior blocks, while retaining the other elements in their original order. Retained objects keep their identity.
+It also simplifies individual elements. The bounded search may stop before finding the smallest possible failure.
+
+This differs from generating a length and using `flatMap` with `all`: shrinking that length regenerates the dependent
+contents. Use `array` when shrinking should remove commands from the failing sequence. `Arbitrary.schema` applied to
+`Schema.Array` uses the same block-removal strategy; prefer it when the complete collection is already a Schema.
+
 Use `flatMap` when one generated value decides what can be generated next. Create the possible generators before the
 callback when you can, because creating a Schema inside the callback repeats that work each time it runs:
 
@@ -977,7 +990,7 @@ Effect finalizers still run. A timeout cannot stop a synchronous JavaScript call
 
 The module starts from Schema and currently does not provide:
 
-- separate Arbitrary constructors for strings, numbers, arrays, and objects; describe those inputs with Schema;
+- a second catalog of Schema-like constructors for strings, numbers, and objects; describe those inputs with Schema;
 - a public low-level generator constructor or direct access to simplification steps;
 - weighted choice; use [targeted scenarios](#targeting-rare-scenarios) to guarantee that a test reaches an important
   situation;
@@ -1045,6 +1058,11 @@ The module therefore exposes `schema` and a small set of operations for combinin
 whose structure is hidden can provide a simpler Schema through `toCodecArbitrary`; it does not need a second language
 for generators.
 
+`Arbitrary.array(item, options)` composes an existing element Arbitrary, including one built with `map`, `filter`,
+`flatMap`, or `all`. It supports deleting commands while retaining the failing sequence's remaining values, which a
+dependent length generator cannot preserve. Schema remains the place to describe primitive values and checked data
+structures.
+
 The implementation stored inside `Arbitrary<A>` remains private. Users can combine and run an Arbitrary without
 depending on how Effect currently generates or simplifies values. Reconsider this decision only if an important input
 cannot be described by Schema or built clearly from existing Arbitraries.
@@ -1142,8 +1160,7 @@ generated sequences, probabilities, and intermediate simplifications may change.
 
 The unstable interface does not currently expose:
 
-- separate Arbitrary constructors for primitive values and structures, or direct access to internal samples and
-  simplification steps;
+- a second catalog of Schema-like constructors, or direct access to internal samples and simplification steps;
 - weighted distribution controls;
 - custom simplification that is not attached to a Schema;
 - support for generators from other libraries or a broad set of runner settings;
@@ -1228,17 +1245,27 @@ can alter generated values, simplification, replay, performance, or bundle size
   to `Schema.Struct`, `Schema.Record`, `Schema.Json`, and record-shaped `all`, but not to arrays, tuples, declarations, or
   collection classes.
 - Integer and BigInt generation avoids favoring some values accidentally. It tries boundary values more often on some
-  runs. Number generation includes signed zero, very small values, infinities, and `NaN` when the Schema permits them.
-  Finite and integer checks exclude the values they promise to exclude.
-- The magnitude of unbounded integers grows with `size`. Ordinary strings combine printable ASCII with a fixed set of
-  JavaScript edge cases. Regular-expression length is measured in UTF-16 code units, matching JavaScript strings.
+  runs. Unbounded BigInts select their bit length separately from their value, mixing ordinary magnitudes with much
+  wider values even at a small `size`. Number generation includes signed zero, very small values, infinities, and `NaN`
+  when the Schema permits them. Finite and integer checks exclude the values they promise to exclude.
+- BigDecimal generation selects precision and decimal exponent independently, while ordered constraints are projected
+  to the selected scale. Its simplifications operate on the represented numeric value, so a fixed generated scale does
+  not dictate the final counterexample. Local simplification continues between passing and failing values with a finite
+  limit on added precision. Ordinary strings combine printable ASCII with a fixed set of JavaScript edge cases.
+  Regular-expression length is measured in UTF-16 code units, matching JavaScript strings.
 - Exact probabilities, the value produced by a particular seed, and the order of simplifications may change. Source
   code comments credit algorithms adapted from other property-testing and random-number implementations.
 
 #### Generating and Simplifying Data Structures
 
-- Arrays first remove optional or repeated items and then simplify remaining items. Objects choose optional properties
-  without favoring earlier declarations. If the first choice is too large for the available recursion space, Effect
+- Arrays try removing progressively smaller blocks at successive positions and simplifying individual items. Deletions
+  retain the other elements and their shrink history, so an earlier element candidate can be tried again after deletion
+  changes the property context. This history is lazy and local to a collection generation. Products and objects also
+  retain shared child histories, so exploring a filtered descendant cannot exhaust a sibling's shrink candidates.
+  Ordinary field shrinking continues from the field being simplified; structural deletions restart field traversal.
+  Tuple prefixes and fixed tails cannot be deleted; optional positions can only be removed from the end when the tuple
+  permits it. Whole-array minima apply to every deletion. Objects choose optional properties without favoring earlier
+  declarations. If the first choice is too large for the available recursion space, Effect
   uses the smallest choice that still satisfies the Schema instead of rejecting a Schema that can produce a value.
   Simplification removes optional properties, simplifies values, and then simplifies generated keys while keeping keys
   unique.
diff --git a/repos/effect/packages/effect/CHANGELOG.md b/repos/effect/packages/effect/CHANGELOG.md
index 39af4f04f..00ce9d8bc 100644
--- a/repos/effect/packages/effect/CHANGELOG.md
+++ b/repos/effect/packages/effect/CHANGELOG.md
@@ -1,5 +1,1051 @@
 # effect
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- [#8331](https://github.com/Effect-TS/effect/pull/8331) [`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9) Thanks @tim-smart! - Bound local sends that wait for an unregistered cluster entity type. These sends now fail with an `Entity type ... not registered` defect at the shared runner registration deadline. Once that startup deadline has elapsed, sends to not-yet-registered dynamic entity types fail immediately.
+
+- [#8319](https://github.com/Effect-TS/effect/pull/8319) [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724) Thanks @fubhy! - Extend `NetAddress.toCanonical` to accept internet addresses. IPv4-mapped IPv6 addresses become IPv4 while retaining the port. Other addresses retain their identity and IPv6 scope metadata.
+
+- [#8317](https://github.com/Effect-TS/effect/pull/8317) [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3) Thanks @tim-smart! - Fix cluster workflows stalling after request resets.
+
+- [#8323](https://github.com/Effect-TS/effect/pull/8323) [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1) Thanks @fubhy! - Add validated multicast address refinements for IP and MAC addresses.
+
+- [#8310](https://github.com/Effect-TS/effect/pull/8310) [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0) Thanks @williamrobertson13! - Fix memory leaks in `Pool.makeWithTTL` with the usage strategy by releasing retired resources and consumed acquisition errors from the TTL queue.
+
+- [#8326](https://github.com/Effect-TS/effect/pull/8326) [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b) Thanks @lloydrichards! - Normalize identified MCP output schemas to object roots across protocol versions.
+  Support identified object schemas in MCP elicitation requests.
+
+- [#8318](https://github.com/Effect-TS/effect/pull/8318) [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9) Thanks @fubhy! - Add `Queue.shutdownUnsafe` to synchronously discard buffered messages and settle pending queue operations from callbacks. Both `Queue.shutdown` and `Queue.shutdownUnsafe` return `false` when the queue has already been shut down or completed; previously, `Queue.shutdown` always returned `true`.
+
+- [#8325](https://github.com/Effect-TS/effect/pull/8325) [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a) Thanks @fubhy! - Add `NetAddress.formatNativeHost` and `NetAddress.formatMulticastInterface` with explicit platform and scope ID map parameters for native socket APIs.
+
+- [#8308](https://github.com/Effect-TS/effect/pull/8308) [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca) Thanks @tristanz! - Release savepoints after nested transactions succeed or successfully roll back in PostgreSQL, PGlite, MySQL, libSQL, and the Node, Bun, React Native, and WASM SQLite clients. This frees PostgreSQL transaction locks before the outer transaction completes.
+  
+  Custom SQL clients can opt in through the new `releaseSavepoint` option. Clients that omit it are unchanged.
+
+- [#8323](https://github.com/Effect-TS/effect/pull/8323) [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1) Thanks @fubhy! - Add generic branded NetAddress classifications and named validating schemas.
+  Singleton address constants retain their base-family types; guards expose
+  classifications on demand. Operations that derive new address bits return only
+  the IPv4 or IPv6 family until callers revalidate the classification.
+
+- [#8305](https://github.com/Effect-TS/effect/pull/8305) [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5) Thanks @tim-smart! - Make `criteria` optional for `Decision.probability`. When supplied, `criteria` still requires descriptions for both `false` and `true`.
+  
+  `Decision.Probability.criteria` is now optional, so consumers reading outcome descriptions (for example, `decision.criteria.true`) must first guard against `undefined`.
+
+- [#8329](https://github.com/Effect-TS/effect/pull/8329) [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741) Thanks @tim-smart! - Warn when conflicting cluster workflow definitions reuse a tag.
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- [#7908](https://github.com/Effect-TS/effect/pull/7908) [`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f) Thanks @gcanti! - Add experimental JIT and AOT schema compilers that work through the existing
+  `SchemaParser` APIs and share a decoder registry. Enable JIT globally with
+  `effect/unstable/schema/SchemaJITCompiler/enable`, selectively with
+  `SchemaJITCompiler.enable(ast)`, or install generated AOT decoders without
+  requiring dynamic function construction. The new
+  `effect/unstable/schema/SchemaAOTCompiler/Build` entrypoint discovers direct
+  Schema exports from explicit module loaders and writes a self-installing AOT
+  module through Effect's `FileSystem` and `Path` services. Compiled decoders can
+  provide optional synchronous `decode` and `make` operations; normal
+  `SchemaParser` calls consume them transparently and retain `decodeEffect` and
+  `makeEffect` as the detailed fallbacks. AOT targets declare the operations to
+  prepare, so generated modules contain only those operation families and use
+  the interpreter if an omitted operation is later called.
+  
+  ### Breaking changes
+  
+  `SchemaGetter.Getter` is now a tagged union that distinguishes synchronous,
+  optional, and effectful transformations. Getter values now expose only `pipe`.
+  Use the dual `SchemaGetter.map`, `SchemaGetter.compose`, and `SchemaGetter.run`
+  functions instead of the former methods. Keeping these operations standalone
+  lets bundlers remove composition code when an application does not use it.
+  
+  The public `Getter` constructor is removed. Use
+  `SchemaGetter.transformOptionalEffect` instead of `new SchemaGetter.Getter`.
+  `SchemaGetter.onSome` and `SchemaGetter.onNone` are also removed. Use
+  `transformEffect` for an effectful transformation of present values and
+  `transformOptionalEffect` when the transformation handles missing values.
+  
+  `Transformation#compose` is replaced by the dual standalone function
+  `SchemaTransformation.composeTransformation`. Replace `first.compose(second)`
+  with `SchemaTransformation.composeTransformation(first, second)` or
+  `SchemaTransformation.composeTransformation(second)(first)`.
+  
+  `SchemaTransformation.make` is renamed to
+  `SchemaTransformation.makeTransformation`. `SchemaTransformation.Transformation`
+  and `SchemaTransformation.Middleware` now implement `Pipeable`, so both values
+  can be passed through standalone combinators with `.pipe(...)`.
+  
+  `SchemaAST.Context.constructorDefault` now stores the constructor-default
+  `Effect` directly instead of wrapping it in a `SchemaAST.Link`. Constructor
+  defaults apply only during construction, so the direct representation avoids
+  giving them encoding semantics and lets construction reuse already-completed
+  synchronous Effects. Code that constructs or inspects `SchemaAST.Context`
+  should pass or read the default `Effect` directly.
+
+- [#8287](https://github.com/Effect-TS/effect/pull/8287) [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2) Thanks @tim-smart! - Add `Decision` and `DecisionModel` to `effect/unstable/ai` for batched classification, rating, and probability estimates over schema-encoded input.
+
+- [#8221](https://github.com/Effect-TS/effect/pull/8221) [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d) Thanks @gcanti! - Add `Arbitrary.array(item, { minLength, maxLength })` for variable-length arrays of custom Arbitraries. Shrinking removes blocks of commands while preserving the remaining values and their order, and also simplifies individual elements.
+  
+  Schema-derived arrays now also try removing prefixes and interior blocks. Shrinking composed values and Schema objects preserves child candidates that were previously lost when exploring another branch.
+  
+  Shrunk results and replay paths may change from earlier native releases. Re-run affected properties to obtain new replay tokens, and preserve important failing inputs as regression tests.
+
+- [#8233](https://github.com/Effect-TS/effect/pull/8233) [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356) Thanks @gold-beyond! - Add `Crypto.randomULID` to generate ULIDs from the current `Clock` timestamp and cryptographically secure random bytes.
+
+- [#8256](https://github.com/Effect-TS/effect/pull/8256) [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf) Thanks @tim-smart! - Align the `Effect` and `Stream` APIs and fix several Stream type signatures.
+  
+  - `Effect.orElseSucceed` now passes the error to the fallback function, matching `Stream.orElseSucceed`.
+  - `Effect.isEffect` narrows to `Effect<unknown, unknown, unknown>` instead of `any`.
+  - `Stream.bind`, `Stream.bindEffect` and `Stream.let` allow re-binding an existing field and produce the same record type as their `Effect` counterparts.
+  - `Stream.Success`, `Stream.Error` and `Stream.Services` are unconstrained and distributive like the `Effect` versions.
+  - `Stream.partition` returns `[passes, fails]` and takes a `capacity` option, matching `Stream.partitionQueue` and `Stream.partitionEffect`. Its default capacity remains 16.
+  - `Stream.mapBoth` takes `onElement` / `onError`, matching `Stream.tapBoth`.
+  - `Stream.scan` and `Stream.scanEffect` take a lazy initial state.
+  - `Stream.catchTags` rejects unknown tag keys like `Effect.catchTags`.
+  - Fixed the data-first overloads of `Stream.runIntoPubSub` (error type was dropped), `Stream.cross` (swapped type parameter names) and `Stream.mapAccumArray` (`onHalt` return type).
+  - Added `Stream.as`, `Stream.tapDefect`, `Stream.tapErrorTag` and `Stream.unwrapReason`.
+  - Stream concurrency options use the `Types.Concurrency` alias, and JSDoc categories were consolidated across both modules.
+
+- [#8235](https://github.com/Effect-TS/effect/pull/8235) [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b) Thanks @tim-smart! - Retain durable deferred completions received before a workflow owner's first local run so replay can complete while the deferred reply is still being persisted.
+  
+  Keep pending completions in a cache keyed weakly by cluster activation. Handler rebuilds retain completions, and overlapping activations cannot clear each other's results. Results can be collected once their activation scope becomes unreachable; closing a scope alone does not guarantee collection.
+  
+  Release RPC stream and queue consumers when their request write fiber is interrupted.
+
+- [#8243](https://github.com/Effect-TS/effect/pull/8243) [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f) Thanks @tim-smart! - Fix lost durable deferred wake-ups when a ClusterWorkflowEngine execution suspends before its run reply is persisted. Deferred completions now wait for the current run reply before resuming, so discarded executions can replay without relying on caller retries.
+
+- [#8254](https://github.com/Effect-TS/effect/pull/8254) [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a) Thanks @tim-smart! - Fix file response content types: honor the `contentType` option and preserve explicit headers, including MIME types set by `HttpStaticServer`. The default `HttpPlatform.layer` now infers missing content types from file extensions.
+  
+  Web file responses on the default, Node, and Deno platforms prefer explicit content types, then nonempty `File.type`, then the file extension.
+  
+  Removed the unused `contentLength` option from `HttpServerResponse.file`; lengths are calculated from the file and requested range.
+
+- [#8229](https://github.com/Effect-TS/effect/pull/8229) [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac) Thanks @tim-smart! - Fix a deadlock in the memory workflow engine when a durable deferred is completed from a finalizer in the workflow awaiting it, including `DurableDeferred.into` inside `DurableDeferred.raceAll`.
+
+- [#8206](https://github.com/Effect-TS/effect/pull/8206) [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06) Thanks @tim-smart! - Fix multipart file streams hanging on body read errors and preserve error causes when persisting files.
+
+- [#8284](https://github.com/Effect-TS/effect/pull/8284) [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8) Thanks @tim-smart! - `HttpServerResponse.toWeb` now keeps a raw `Response`'s headers and `Set-Cookie` values when the body is omitted (HEAD, or status 204, 205 or 304). Bodyless outer statuses keep the outer status and status text; HEAD keeps the raw `Response`'s. Outer cookies are appended to native `Set-Cookie` headers instead of replacing them.
+
+- [#8202](https://github.com/Effect-TS/effect/pull/8202) [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153) Thanks @xia-chao! - Fix `RcRef.make` to treat `idleTimeToLive: 0` like `Duration.zero` and `"0 millis"` instead of an omitted option.
+
+- [#8298](https://github.com/Effect-TS/effect/pull/8298) [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537) Thanks @gcanti! - Fix `Schema.Redacted` to wrap the transformed result of its inner schema during decoding and encoding.
+
+- [#8227](https://github.com/Effect-TS/effect/pull/8227) [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746) Thanks @tim-smart! - Release non-persisted, interruptible `RunnerServer` handlers and mailbox slots when callers disconnect.
+  
+  Preserve dynamic `WithTransaction` annotations during replay and re-delivery.
+
+- [#8261](https://github.com/Effect-TS/effect/pull/8261) [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9) Thanks @nikhilsnayak! - Add HTTP `QUERY` support to clients, routers, HttpApi endpoints, and AI request metadata. Configure CORS support through `allowedMethods`; defaults are unchanged.
+  
+  OpenAPI 3.1 output represents `QUERY` through `x-oai-additionalOperations`, which requires consumer support for that extension. The OpenAPI generator accepts the extension and the native OpenAPI 3.2 `query` field.
+
+- [#8255](https://github.com/Effect-TS/effect/pull/8255) [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825) Thanks @tim-smart! - Preserve literal suffixes such as `:wait` in `/operations/:id:wait` across `HttpApiClient`, `HttpApiBuilder`, and OpenAPI paths.
+  
+  Server routes without a params schema keep their existing matching for `RouteContext` consumers. Schemas whose keys cannot be enumerated keep the existing fallback.
+
+- [#8228](https://github.com/Effect-TS/effect/pull/8228) [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72) Thanks @lloydrichards! - Support prompt titles in `McpServer.prompt` and `McpServer.registerPrompt`.
+
+- [#8228](https://github.com/Effect-TS/effect/pull/8228) [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72) Thanks @lloydrichards! - Add an `instructions` option to MCP servers for initialization and discovery responses.
+
+- [#7265](https://github.com/Effect-TS/effect/pull/7265) [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c) Thanks @lloydrichards! - Add server support for MCP protocol version 2026-07-28 through 2026_07_28
+
+- [#8272](https://github.com/Effect-TS/effect/pull/8272) [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3) Thanks @fubhy! - Add `NetAddress.formatHost` and `NetAddress.inetAddressFromHostString` for socket APIs that accept numeric hosts and ports separately, preserving IPv6 scope IDs. Add `NetAddress.scopeIdsFromInterfaces` to build a scope map for resolving named IPv6 zones from supplied network interface entries without performing operating-system lookups.
+
+- [#8293](https://github.com/Effect-TS/effect/pull/8293) [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b) Thanks @gcanti! - Treat `Never` as an uninhabited branch during `Arbitrary.schema` derivation. Schemas with another finite generation path, including optional properties, unions, and empty collections, no longer fail derivation.
+
+- [#8212](https://github.com/Effect-TS/effect/pull/8212) [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b) Thanks @IMax153! - Restrict `ByteSize.Input` strings to canonical non-negative integers with recognized units, rejecting malformed literals at compile time. Parse external strings and fractional quantities with `ByteSize.fromString` or `ByteSize.fromStringUnsafe` before passing them to APIs accepting `ByteSize.Input`.
+
+- [#8228](https://github.com/Effect-TS/effect/pull/8228) [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72) Thanks @lloydrichards! - Honor `Tool.Strict` in MCP input schemas and argument validation. Strict dynamic tools require Effect schemas; raw JSON Schema is rejected at registration.
+  
+  Support identified input schemas for non-strict tools. Invalid arguments use `InvalidParams` on protocols before 2025-11-25 and `isError: true` results on newer protocols.
+  
+  Distinguish validation failures from declared handler failures. Declared failures return `isError: true` without `structuredContent`: error mode uses `Error.message` or schema-encoded text, and return mode uses the encoded payload. Declared failures do not produce internal-error diagnostics.
+  
+  Log and report internal failures, including defects and encoding errors, while keeping client messages generic.
+  
+  Allow `Toolkit.handle` to accept `SchemaAST.ParseOptions` for parameter decoding. Expose the `Toolkit.FailureOrigin` cause annotation and shared `Tool.FailureOrigin` type, with the same origin available in `Tool.HandlerResult.failureOrigin` on returned failures.
+
+- [#8269](https://github.com/Effect-TS/effect/pull/8269) [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f) Thanks @tim-smart! - Add `HttpApi.ParseOptions` to configure server and client codecs at the API, group, or endpoint level.
+  
+  `Sse.decodeSchema` and `ChannelSchema.decode` accept parse options, and `Schema.Cause` encodes reasons to their wire fields.
+  
+  SSE decoding omits absent IDs, including with default options. Use `Schema.optional(Schema.String)` instead of `Schema.UndefinedOr(Schema.String)` for IDs. With `onExcessProperty: "error"`, declare `event` (default: `"message"`) and any `id`, including inherited IDs.
+  
+  `HttpApiSchema.StreamSse` data-mode types and OpenAPI schemas now make `id` optional.
+
+- [#8296](https://github.com/Effect-TS/effect/pull/8296) [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5) Thanks @gcanti! - Improve Schema-derived BigInt and BigDecimal arbitraries with wider magnitude, precision, and exponent coverage and numeric boundary shrinking.
+  
+  Cover intermediate magnitudes up to large one-sided BigInt bounds, handle BigDecimal bounds with widely different scales, and refine decimal counterexamples between simple values.
+
+- [#8260](https://github.com/Effect-TS/effect/pull/8260) [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55) Thanks @xia-chao! - Fix repeated `text`, `json`, `arrayBuffer`, and `urlParamsBody` reads in `HttpServerResponse.toClientResponse` for raw Web `Response` bodies, preserving the original response for serving.
+
+- [#8270](https://github.com/Effect-TS/effect/pull/8270) [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b) Thanks @tim-smart! - Fix YAML indentless sequences, multiline scalar folding, and comments. Reject unsupported compact nested sequences (`- - value`) and document streams.
+  
+  Previously accepted values such as `description: Use when: deploy` and `description: Deploy:` now throw `SyntaxError`: YAML forbids colons followed by whitespace or end-of-value in plain scalars. Quote these values, for example `description: "Use when: deploy"`.
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- [#8196](https://github.com/Effect-TS/effect/pull/8196) [`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3) Thanks @gcanti! - Optimize schema initialization while preserving custom constructor options.
+
+- [#8190](https://github.com/Effect-TS/effect/pull/8190) [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff) Thanks @javascript-unsafe! - Omit response bodies for statuses 204, 205, and 304 in `HttpServerResponse.toWeb` and the Bun/Deno HTTP adapters, preventing invalid Web responses and hung requests. Cancel omitted raw `ReadableStream` bodies, and finalize request resources without starting omitted Effect streams.
+
+- [#8187](https://github.com/Effect-TS/effect/pull/8187) [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8) Thanks @tim-smart! - Parameterize persistence lookup keys in both SQL backing stores' `getMany` queries.
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- [#8177](https://github.com/Effect-TS/effect/pull/8177) [`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353) Thanks @tim-smart! - Allow `Effect.cachedWithTTL` to compute the TTL from each completed `Exit`, so successes and failures can use different cache durations.
+
+- [#8164](https://github.com/Effect-TS/effect/pull/8164) [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe) Thanks @sam-goodwin! - Keep Node and Bun file stats usable when optional numeric metadata exceeds the safe integer range by returning `Option.none()` for those fields.
+
+- [#8162](https://github.com/Effect-TS/effect/pull/8162) [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3) Thanks @tim-smart! - Fix published declarations referencing symbols stripped as `@internal`, which broke consumers compiling with `skipLibCheck: false`. `Effectable.d.ts` now uses the public `Effect.TypeId`, `Match.d.ts` no longer aliases an internal `Contextual` type, `Schema.d.ts` ships the `AnnotationSchemaConstraint` alias it references, and the CLI's `toFlagDoc` helper is marked internal so it no longer leaks `Param.getParamMetadata`.
+
+- [#8160](https://github.com/Effect-TS/effect/pull/8160) [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7) Thanks @gcanti! - Fix `SchemaRepresentation.toCodeDocument` generating invalid TypeScript for optional tuple elements containing unions or nested readonly tuples. Optional element types are now parenthesized, for example `readonly [(string | number)?]` instead of `readonly [string | number?]`. Generated runtime schemas are unchanged.
+
+- [#8158](https://github.com/Effect-TS/effect/pull/8158) [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac) Thanks @gcanti! - Fix `SchemaRepresentation.toCodeDocument` dropping Struct fields named `__proto__` from generated schemas. These fields now use computed keys, such as `Schema.Struct({ ["__proto__"]: Schema.String })`, so the generated schema validates them correctly.
+
+- [#8169](https://github.com/Effect-TS/effect/pull/8169) [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71) Thanks @gcanti! - Improve `SchemaRepresentation.fromJsonSchemaDocument` and `fromJsonSchemaMultiDocument`:
+  
+  - Import `{ not: {} }` as `Schema.Never` ([#8137](https://github.com/Effect-TS/effect/issues/8137)).
+  
+  - Import closed records with one `patternProperties` entry, `additionalProperties: false`, and no declared or required properties when `patterns: "apply"` is enabled. These were previously rejected.
+  
+    ```json
+    {
+      "type": "object",
+      "patternProperties": { "^a": { "type": "number" } },
+      "additionalProperties": false
+    }
+    ```
+  
+    ```ts
+    Schema.Record(
+      Schema.String.check(Schema.isPattern(/^a/)),
+      Schema.Finite
+    )
+    ```
+  
+  - Reject open patterned objects with `patterns: "apply"` instead of generating incompatible TypeScript index signatures.
+  
+    ```json
+    {
+      "type": "object",
+      "patternProperties": { "^a": { "type": "number" } },
+      "additionalProperties": true
+    }
+    ```
+  
+    Import now explains that the generated TypeScript index signatures would give incorrect types to unmatched keys, and reports the source path. The same applies when `additionalProperties` is omitted or `{}`. Patterns can still be combined with a closed object in `allOf` when the result has a finite set of keys. Use `patterns: "ignore"` only if you intend to discard the pattern and its value constraints.
+  
+  - Reject references inside a subschema with its own `$id` instead of potentially resolving against the wrong definitions. Resolve or flatten these references before importing. A `$id` on the document root remains supported.
+  
+    ```json
+    {
+      "$id": "https://example.com/root",
+      "$defs": { "Value": { "type": "string" } },
+      "type": "object",
+      "properties": {
+        "child": {
+          "$id": "child",
+          "$defs": { "Value": { "type": "number" } },
+          "$ref": "#/$defs/Value"
+        }
+      }
+    }
+    ```
+  
+    Here `child` refers to the nested numeric `Value`, not the root string `Value`. Import now reports that references inside a subschema with its own `$id` are unsupported instead of incorrectly using the root definition.
+  
+  - Explain import failures using JSON Schema keyword names, the reason for rejection, and the source path. Reference errors distinguish missing definitions, unsupported reference formats, and circular aliases. Pattern errors explain how to opt in for trusted schemas or explicitly discard the constraints.
+
+- [#8162](https://github.com/Effect-TS/effect/pull/8162) [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3) Thanks @tim-smart! - Rename `Schema.Annotations.ToArbitrary.Constraint` to `Schema.Annotations.ToArbitrary.FilterConstraint`.
+  
+  Code that refers to the previous type name should update its type annotations to use `FilterConstraint`.
+
+- [#8181](https://github.com/Effect-TS/effect/pull/8181) [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d) Thanks @Ishkirat-Singh! - Make `message` optional for `Prompt.Select` and `Prompt.MultiSelect`. When omitted, prompts display only the choices and submission shows a tick followed by the selected titles. `Prompt.AutoComplete` still requires a message.
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7738](https://github.com/Effect-TS/effect/pull/7738) [`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e) Thanks @kitlangton! - Retain completed tool approval results in non-streaming responses so Chat records them and does not replay approved tools on later turns.
+
+- [#7483](https://github.com/Effect-TS/effect/pull/7483) [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92) Thanks @tim-smart! - Align runtime type IDs with their module paths. Effect markers now omit legacy grouping prefixes and the `unstable` path segment, while OpenTelemetry spans use the `OtelTracer` module path. Custom implementations that copy these marker strings must adopt the corrected IDs.
+
+- [#8014](https://github.com/Effect-TS/effect/pull/8014) [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab) Thanks @kitlangton! - Fix `Effect.all` to retain errors and required services from every branch of a union of record inputs.
+
+- [#8095](https://github.com/Effect-TS/effect/pull/8095) [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b) Thanks @gcanti! - Fix `Arbitrary.schema` to respect applicable index signatures when generating and shrinking object properties, including fixed fields in `Schema.StructWithRest` and overlapping records.
+  
+  Combine compatible string, number, and bigint constraints during generation so cases such as a `String` field constrained by a `NonEmptyString` record remain productive at size zero. Other intersections are validated and may exhaust the discard budget.
+
+- [#7796](https://github.com/Effect-TS/effect/pull/7796) [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c) Thanks @kitlangton! - Fix `Schema.ArrayEnsure` to preserve array-valued element branches and outer-array encoding cardinality.
+
+- [#8067](https://github.com/Effect-TS/effect/pull/8067) [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa) Thanks @purwasadr! - Fix `AtomRpc.query` returning `never` for RPCs whose middleware declares service `requires`. The return-type conditional now infers all six `Rpc` type parameters, matching `mutation` and every utility in `Rpc`.
+
+- [#7463](https://github.com/Effect-TS/effect/pull/7463) [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b) Thanks @tim-smart! - Remove the `mime` runtime dependency. The new `effect/unstable/http/Mime` module provides top-level lookup functions
+  backed by a vendored standard MIME registry.
+
+- [#7477](https://github.com/Effect-TS/effect/pull/7477) [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803) Thanks @candrewlee14! - Allow sockets to use browser, Bun, and Node WebSocket implementations without consumer casts. Platform constructors
+  now support typed opening-handshake headers where available.
+
+- [#7587](https://github.com/Effect-TS/effect/pull/7587) [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6) Thanks @kitlangton! - Fix `Cache.invalidateWhen` and `ScopedCache.invalidateWhen` deleting a replacement entry while waiting for an earlier lookup.
+
+- [#7585](https://github.com/Effect-TS/effect/pull/7585) [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f) Thanks @kitlangton! - Fix interruption of `Cache.refresh` for a missing key removing a newer value written by `Cache.set`.
+
+- [#7596](https://github.com/Effect-TS/effect/pull/7596) [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659) Thanks @kitlangton! - Fix `Cache.refresh` and `ScopedCache.refresh` exceeding capacity when an existing key is evicted while its refresh is in progress. Publishing the refreshed entry now evicts older entries as needed, releasing their resources in `ScopedCache`.
+
+- [#7595](https://github.com/Effect-TS/effect/pull/7595) [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8) Thanks @kitlangton! - Fix `Cache.refresh` for an initially missing key deleting a newer cached value when the refresh completes with zero time to live.
+
+- [#7614](https://github.com/Effect-TS/effect/pull/7614) [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551) Thanks @kitlangton! - Prevent `Cache` from retaining synchronously interrupted lookups.
+
+- [#7563](https://github.com/Effect-TS/effect/pull/7563) [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a) Thanks @alvarosevilla95! - Respect custom HTTP header redaction when recording server span attributes.
+
+- [#7254](https://github.com/Effect-TS/effect/pull/7254) [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9) Thanks @gcanti! - Add the experimental Schema-first `effect/unstable/arbitrary/Arbitrary` module for native generation without
+  fast-check. `Arbitrary.schema` derives an opaque arbitrary from the decoded Schema `Type`, `Arbitrary.sampleEffect`
+  provides interruptible sampling with typed exhaustion, and `Arbitrary.checkEffect` returns structured property results.
+  The initial implementation supports bounded discards, shrinking, replay, and recursive and mutually recursive Schemas.
+  `SampleError` and `Exhausted` include the effective seed so discarded runs remain reproducible even when the caller did
+  not provide one. `Arbitrary.isArbitrary` identifies values through the module's nominal protocol. Numeric constraints
+  retain `NaN` when it is accepted by their supported `Order.Number` bounds. Union derivation validates `oneOf`
+  exclusivity and isolates lazy cross-member shrinking from unrelated random generation. Object derivation keeps
+  optional-property selection constructive when candidate fields have different recursive costs.
+  Struct, Record, JSON-object, and record-shaped `Arbitrary.all` outputs periodically use a null prototype as an edge
+  case, preserving that prototype throughout shrinking and replay without perturbing structural PRNG choices. The change
+  adds 0.01–0.03 KB gzip to representative Arbitrary fixtures and leaves production-only bundle sentinels unchanged.
+  
+  Add `Arbitrary.map`, `Arbitrary.flatMap`, `Arbitrary.filter`, `Arbitrary.filterMap`, and `Arbitrary.all` for composing
+  derived Arbitraries without exposing a second catalog of primitive constructors. Filtering remains bounded and
+  promotes valid shrink descendants through rejected nodes. `maxShrinks` bounds every inspected shrink candidate,
+  including candidates rejected before property evaluation, while retaining the best shrunk input found when the
+  budget is exhausted. `flatMap` provides deterministic dependent generation, source-first shrinking, post-source PRNG
+  checkpoints, and one shared residual recursion budget. `all` combines tuples, iterables, and records with a shared
+  budget, randomized internal generation order, stable output shape, and independent member shrinking. Arbitrary values
+  implement `Pipeable` for composition with data-last combinators.
+  
+  Add the experimental Schema `arbitraryConstraint` and `toCodecArbitrary` annotations and their
+  `Schema.Annotations.ToArbitrary` types. Declarations can provide a Schema Link optimized for generation, while filters
+  can contribute native semantic constraints. The callback receives decoded type parameters and normalized constraints.
+  The compiler owns efficient representations for common built-ins, including JSON, RegExp, URL, Date, byte arrays,
+  ReadonlyMap, and ReadonlySet. Effect-specific HashMap, HashSet, Chunk, Graph, BigDecimal, and date-time declarations keep
+  local generation Links, while declarations with productive canonical codecs require no arbitrary-specific annotation.
+  `Schema.isUniqueKey` provides key-based Map uniqueness for explicit array representations.
+  
+  The same ownership policy applies to formatter and equivalence derivation: implementations for common declarations
+  live in their compiler, while domain-specific and dynamically constructed declarations retain local annotations.
+  Declarations whose intrinsic `Equal` implementation already matches their Schema equivalence need no annotation or
+  compiler special case. This keeps unused common callbacks out of production Schema bundles.
+  
+  Against the previous layout, `schema-toArbitrary` decreases from 36.68 KB to 33.24 KB gzip and
+  `arbitrary-combinators` decreases from 37.16 KB to 33.70 KB. `schema-toFormatter` increases from 18.92 KB to 19.49 KB
+  and `schema-toEquivalence` increases from 19.05 KB to 19.39 KB because callers that explicitly derive these capabilities
+  now retain the common declaration handlers. Generic production fixtures remain unchanged; an equivalence-specific
+  production fixture using common declarations decreases from 20.75 KB to 20.48 KB, while declarations whose intrinsic
+  equality is sufficient decrease from 23.42 KB to 23.34 KB. An Arbitrary-specific production fixture using common
+  declarations decreases from 20.35 KB to 19.61 KB, while one using the locally annotated BigDecimal and date-time
+  declarations increases from 18.34 KB to 23.01 KB.
+  The complete 31-scenario native Arbitrary comparison reports no statistically classified runtime regression; the five
+  moved BigDecimal and date-time scenarios remain within measurement noise.
+  
+  Add `SchemaGetter.forbiddenEncoding`, a reusable getter for the encode side of decode-only Schema transformations.
+  
+  Remove the fast-check bridge from the `effect` package, including `Schema.toArbitrary` and
+  `effect/testing/FastCheck`. Replace the legacy `Schema.Annotations.ToArbitrary` callback contract with the native
+  Schema-first types. The `effect` package no longer depends on fast-check.
+  
+  Migrate `TestSchema.Asserts.verifyLosslessTransformation` and `TestSchema.Asserts.arbitrary().verifyGeneration` to the
+  native runner. Both methods now accept native check options directly, bound unsuccessful generation, and include the
+  shrunk input and replay token in property failures.
+  
+  Use the Arbitrary runner for all `@effect/vitest` property tests. Property inputs may combine Schemas and Arbitraries,
+  and are composed directly with `Arbitrary.all`; check options are available through `arbitrary`. Raw fast-check
+  arbitraries and the `fastCheck` options object are no longer supported. As with the previous fast-check adapter, thrown
+  exceptions, defects, and typed failures from a property are shrinkable falsifications; Effect interruption remains an
+  interruption.
+  
+  Optimize constructive regular-expression generation by caching feasible lengths on the compiled pattern, computing
+  sequence-suffix feasibility once, and precomputing character-class metadata. Seeded generation, shrinking, and replay
+  remain unchanged.
+  
+  Optimize `BigDecimal.Order` and `BigDecimal.Equivalence` with a shared hybrid comparator. Ordinary scale differences
+  use cached, bounded coefficient alignment, while large differences are compared without materializing their decimal
+  zeroes. `BigDecimal.make` now rejects scales that are not safe integers.
+  
+  Before its removal, the materialized fast-check bridge fixture
+  `schema-toArbitrary-materialized-fast-check.ts` measured 79.00 KB minified and gzipped.
+  
+  Representative runtime measurements against corresponding hand-written fast-check 4.9.0 arbitraries are shown below.
+  Values are median latency on Node 24.12.0 and Apple M3; lower is better. Both implementations validate the
+  same output domains, although their generation distributions are not identical. Native speedup is fast-check latency
+  divided by Native latency, so higher is better.
+  
+  | Scenario                            | fast-check |  Native | Native speedup |
+  | ----------------------------------- | ---------: | ------: | -------------: |
+  | 32 recursive samples                |     150 µs |  103 µs |          1.45x |
+  | 128 optional Struct samples         |     244 µs | 86.0 µs |          2.84x |
+  | 128 constrained strings             |     742 µs | 49.7 µs |         14.86x |
+  | RegExp derivation and first sample  |    13.4 ms | 30.8 µs |        429.02x |
+  | 64 RegExp strings                   |     595 µs |  919 µs |          0.64x |
+  | RegExp failure and shrinking        |     168 µs | 88.2 µs |          1.91x |
+  | 128 bounded numbers                 |    68.9 µs | 21.8 µs |          3.18x |
+  | 128 `Uint8Array` samples            |    98.3 µs | 74.4 µs |          1.32x |
+  | 128 `BigDecimal` samples            |    66.6 µs | 56.3 µs |          1.18x |
+  | 128 `DateTime.Utc` samples          |    71.2 µs | 50.5 µs |          1.42x |
+  | 128 named time zones                |    52.2 µs | 27.9 µs |          1.85x |
+  | 128 time zones                      |    63.7 µs | 33.8 µs |          1.89x |
+  | 128 zoned date-times                |     130 µs |  112 µs |          1.16x |
+  | 32 samples through Schema filter    |    65.9 µs | 49.4 µs |          1.33x |
+  | 32 unique arrays                    |     156 µs |  132 µs |          1.18x |
+  | 128 literal samples                 |    40.0 µs | 3.70 µs |         10.78x |
+  | 128 mapped samples                  |    59.0 µs | 14.1 µs |          4.21x |
+  | 128 samples through passing filter  |    58.9 µs | 13.9 µs |          4.23x |
+  | 32 samples through selective filter |    66.1 µs | 42.9 µs |          1.54x |
+  | 128 `filterMap` samples             |    75.7 µs | 31.5 µs |          2.40x |
+  | Filtered failure and shrinking      |    12.7 µs | 7.71 µs |          1.66x |
+  | 128 `all` tuple samples             |    43.5 µs | 18.5 µs |          2.35x |
+  | 128 `all` record samples            |    81.0 µs | 30.4 µs |          2.66x |
+  | 128 dependent `flatMap` samples     |     125 µs | 67.2 µs |          1.86x |
+  | `flatMap` failure and shrinking     |    20.1 µs | 6.71 µs |          2.99x |
+  | Replay `flatMap` shrink path        |    14.3 µs | 6.57 µs |          2.17x |
+  | Passing property, 100 runs          |    42.3 µs | 27.1 µs |          1.56x |
+  | `TestSchema`, 100 generations       |    44.5 µs | 35.9 µs |          1.24x |
+  | First failure plus one shrink       |    8.77 µs | 1.30 µs |          6.75x |
+  | Replay recorded failure             |    6.35 µs | 1.19 µs |          5.36x |
+  
+  Cold recursive derivation is not included because the native fixture constructs and compiles a Schema, while the
+  fast-check fixture constructs a hand-written arbitrary; it is not a like-for-like warm-generator comparison.
+  
+  Add a guide for the native module and a migration guide from the fast-check bridge published in `effect@4.0.0-rc.109`.
+
+- [#7822](https://github.com/Effect-TS/effect/pull/7822) [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5) Thanks @tim-smart! - Add `Stream.catchDefect` and `Channel.catchDefect` for recovering from defects without catching typed failures or interruptions.
+
+- [#7657](https://github.com/Effect-TS/effect/pull/7657) [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27) Thanks @kitlangton! - Remove `Channel.runDone`; use `Channel.runDrain` to consume all output and return the completion value.
+
+- [#7989](https://github.com/Effect-TS/effect/pull/7989) [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99) Thanks @kitlangton! - Preserve astral Unicode escapes and following arguments in `ChildProcess.make` and `ChildProcess.prefix` template literals.
+
+- [#8018](https://github.com/Effect-TS/effect/pull/8018) [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3) Thanks @tim-smart! - Wait for Node child process groups to exit during scoped release and `kill`.
+  
+  After signalling a process group, both operations now wait for its leader and descendants. Without `forceKillAfter`, the wait is limited to one second and never escalates. With `forceKillAfter`, the group receives `SIGKILL` at the deadline, followed by a final wait of up to one second. Native timers keep escalation working under a `TestClock`, and cleanup no longer depends on stdio closing.
+  
+  `exitCode` and `isRunning` remain tied to the leader's exit, and a leader that already exited successfully still leaves its group untouched. Process group checks count zombies, so cleanup may wait for the full bound under a non-reaping PID 1.
+
+- [#7617](https://github.com/Effect-TS/effect/pull/7617) [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e) Thanks @kitlangton! - Fix `Chunk` concatenation to preserve sliced elements.
+
+- [#7453](https://github.com/Effect-TS/effect/pull/7453) [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c) Thanks @gcanti! - Rename the built-in `Config` constructors to PascalCase and rename `Config.mapOrFail` to `Config.mapEffect`. `Config.Array` and `Config.Record` now construct configs directly, with overloads for pathless options or a path followed by options, while their specialized schemas and the other built-in schemas are kept internal.
+  
+  This is a breaking naming cleanup for the Effect 4 release candidate. It makes casing consistently identify typed config constructors, aligns effectful mapping with the rest of the library, and prevents implementation schemas from expanding the public `Config` interface.
+
+- [#8020](https://github.com/Effect-TS/effect/pull/8020) [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b) Thanks @kitlangton! - Ensure `Effect.acquireUseRelease` releases an acquired resource and `Effect.useSpan` ends its span when the use callback throws before returning an effect. The thrown exception remains a defect, but no longer skips cleanup.
+
+- [#8087](https://github.com/Effect-TS/effect/pull/8087) [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82) Thanks @tim-smart! - use `new` instantiation for streams
+
+- [#7802](https://github.com/Effect-TS/effect/pull/7802) [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429) Thanks @kitlangton! - Preserve flags and nested commands when completing a CLI subcommand through its alias.
+
+- [#7804](https://github.com/Effect-TS/effect/pull/7804) [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8) Thanks @kitlangton! - Include inherited shared flags in descendant CLI completions.
+
+- [#8086](https://github.com/Effect-TS/effect/pull/8086) [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d) Thanks @MaxFreedomPollard! - Allow `=` in values parsed by `Primitive.keyValuePair`, `Flag.keyValuePair`, and `Param.keyValuePair` in `effect/unstable/cli`.
+
+- [#7687](https://github.com/Effect-TS/effect/pull/7687) [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72) Thanks @kitlangton! - Allow optional alternative CLI flags.
+
+- [#8121](https://github.com/Effect-TS/effect/pull/8121) [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9) Thanks @tim-smart! - Rename CLI constructors to PascalCase, aligning scalar names with `Schema` and `Config`. This is a breaking change; parsing behavior is unchanged.
+  
+  In `Primitive`, `Param`, `Flag`, and `Argument`, capitalize existing constructor names, with these exceptions:
+  
+  | Previous  | New        | Modules               |
+  | --------- | ---------- | --------------------- |
+  | `integer` | `Int`      | All four              |
+  | `float`   | `Finite`   | All four              |
+  | `none`    | `Never`    | All four              |
+  | `choice`  | `Literals` | Param, Flag, Argument |
+  
+  `Primitive.choice` becomes `Primitive.Choice`; `choiceWithValue` becomes `ChoiceWithValue` where available.
+  
+  In `Prompt`, capitalize control constructors except `text` → `String`, `integer` → `Int`, and `float` → `Number`. Rename public types `IntegerOptions` → `IntOptions` and `FloatOptions` → `NumberOptions`. Shared `TextOptions` is unchanged. `Prompt.Number` retains its existing parser, without a finite-number restriction.
+  
+  In `GlobalFlag`, rename `action` → `Action` and `setting` → `Setting`. Factories and combinators, including `Command.make` and `Prompt.succeed`, keep their names.
+  
+  Update public `_tag` matches and completion descriptors:
+  
+  - `Primitive`: `"Integer"` → `"Int"`, `"Float"` → `"Finite"`, `"None"` → `"Never"`.
+  - `Completions.FlagType` and `Completions.ArgumentType`: `"Integer"` → `"Int"`, `"Float"` → `"Finite"`.
+  
+  Sentinels still always fail; their internal parameter name is now `"__never__"`. Help labels and completion scripts are unchanged.
+
+- [#7685](https://github.com/Effect-TS/effect/pull/7685) [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd) Thanks @kitlangton! - Fix defaulted variadic arguments when omitted.
+
+- [#8059](https://github.com/Effect-TS/effect/pull/8059) [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c) Thanks @kitlangton! - Fix CLI wizard handling of negative numbers and other flag values beginning with `-`.
+
+- [#7489](https://github.com/Effect-TS/effect/pull/7489) [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0) Thanks @tim-smart! - Cluster no longer retains fiber ids for every local teardown.
+  
+  Transient persisted interrupts are now classified from live teardown state
+  (entity, shard, singleton, entity type, and node shutdown) instead of a
+  process-lifetime set of fiber ids. The registry is bounded by in-flight
+  teardowns and returns to baseline after entity reap storms.
+
+- [#7939](https://github.com/Effect-TS/effect/pull/7939) [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c) Thanks @kitlangton! - Fix `Reply.Reply` codecs to require client services when decoding and server services when encoding.
+
+- [#7485](https://github.com/Effect-TS/effect/pull/7485) [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c) Thanks @tim-smart! - Transient routing states for persisted cluster messages no longer surface as errors.
+  
+  If an entity moves runners or is shut down before replying, the caller keeps
+  waiting for the reply via message storage while the entity moves. If the local
+  runner is shutting down while a caller is waiting, the call is interrupted
+  instead of failing with `EntityNotAssignedToRunner`: the request is already
+  durable and will be served under the next owner.
+  
+  Durable workflows treat such an interrupt as an abandoned run attempt: the run
+  stops with nothing persisted, without running compensations or resuming the
+  parent, ready to replay on the replacement runner.
+
+- [#7933](https://github.com/Effect-TS/effect/pull/7933) [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13) Thanks @kitlangton! - Fix saved curried `Context.get` calls incorrectly inferring their required service as `unknown`.
+
+- [#8064](https://github.com/Effect-TS/effect/pull/8064) [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52) Thanks @Avaq! - Fix the `CookiesError` tag in `effect/unstable/http` from `CookieError` to `CookiesError` to match the class name.
+
+- [#7621](https://github.com/Effect-TS/effect/pull/7621) [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5) Thanks @kitlangton! - Apply DateTime calendar parts without intermediate overflow.
+
+- [#7884](https://github.com/Effect-TS/effect/pull/7884) [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec) Thanks @kitlangton! - Fix `ConfigProvider.fromDotEnvContents` variable expansion to preserve replacement tokens such as `$&` in referenced values.
+
+- [#7840](https://github.com/Effect-TS/effect/pull/7840) [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36) Thanks @kitlangton! - Fix `DurableClock.sleep` to preserve explicit `0` and `0n` in-memory thresholds.
+
+- [#7941](https://github.com/Effect-TS/effect/pull/7941) [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0) Thanks @kitlangton! - Require schema encoding services when `DurableDeferred.into` records an exit.
+
+- [#7750](https://github.com/Effect-TS/effect/pull/7750) [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05) Thanks @kitlangton! - Update dynamic tools to advertise replacement parameter schemas after `setParameters`.
+
+- [#7572](https://github.com/Effect-TS/effect/pull/7572) [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496) Thanks @tim-smart! - Align CLI help tables by terminal display width for wide, emoji, combining, and zero-width graphemes.
+
+- [#7588](https://github.com/Effect-TS/effect/pull/7588) [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494) Thanks @tim-smart! - Route tool call parameter validation failures through the tool's `failureMode` and drop `ToolParameterValidationError.toolParams`.
+
+- [#7643](https://github.com/Effect-TS/effect/pull/7643) [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af) Thanks @tim-smart! - Reduce memory usage in Effect primitives and fibers.
+  
+  Breaking: context-derived `Fiber` fields now live under `fiber.cache`. The
+  `currentScheduler`, `currentSpan`, `currentLogLevel`, `currentStackFrame`, and
+  `currentPreventYield` fields are now `scheduler`, `span`, `logLevel`,
+  `stackFrame`, and `preventYield`. Access `minimumLogLevel` and
+  `maxOpsBeforeYield` through `cache` as well.
+
+- [#7650](https://github.com/Effect-TS/effect/pull/7650) [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee) Thanks @tim-smart! - Reduce HTTP server allocation churn when tracing is not configured and for requests that complete synchronously.
+
+- [#7649](https://github.com/Effect-TS/effect/pull/7649) [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2) Thanks @tim-smart! - Reduce per-request RPC server allocations.
+
+- [#7772](https://github.com/Effect-TS/effect/pull/7772) [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de) Thanks @tim-smart! - Improve HTTP server throughput by reducing routing, request handling, response
+  construction, and body encoding overhead. Add `Effect.withFiberSucceed` for
+  synchronously computing successful values from the current fiber. Copy pooled
+  byte views by their exact range when exposing `ArrayBuffer` values.
+
+- [#7956](https://github.com/Effect-TS/effect/pull/7956) [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a) Thanks @tim-smart! - Reduce HTTP server overhead: complete freshly created header maps in place in
+  `HttpServerResponse.setHeader` and `setHeaders`, compare static route prefixes
+  with a prepared `startsWith`, map `HttpApi` schema errors eagerly for completed
+  decoder results, and implement `Effect.cached` as a dedicated one-time memo
+  without time-to-live machinery.
+
+- [#7426](https://github.com/Effect-TS/effect/pull/7426) [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468) Thanks @tim-smart! - Replace `@effect/sql-pg`'s `pg` runtime with a native PostgreSQL client. `PgConnection` and `PgPool` now handle connection setup, binary queries, prepared statements, pipelining, streaming, notifications, cancellation, and custom codecs. `PgConnection.listen` and `PgClient.listen` return scoped notification dequeues after PostgreSQL confirms the subscription. `PgClient` uses the native stack, and the legacy `fromPool`, `fromClient`, and `makeWith` constructors are removed.
+  
+  ### Breaking changes
+  
+  - `fromPool`, `fromClient`, and `makeWith` are removed. Use `make` for a pool or `makeClient` for one connection.
+  - `PgClient.listen` returns a scoped `Effect<Dequeue<string>, SqlError, Scope>` instead of a `Stream`. Acquisition completes after PostgreSQL confirms `LISTEN`, so notifications sent after it returns cannot be missed.
+  - `PgClientConfig.types` now accepts a `PgTypes.Registry` instead of `pg.CustomTypesConfig`. Plain object parameters are no longer inferred as JSON; wrap them with `sql.json`.
+  - Query strings must contain one statement. PostgreSQL's extended protocol rejects multi-statement strings.
+  - Results use the native binary codecs. In particular, `int8` decodes to `bigint`, `date` to a string, timestamps to Unix epoch milliseconds, and `bytea` or unknown OIDs to `Uint8Array`. `executeRaw` returns the native `PgConnection.Result` shape rather than `pg.Result`.
+  - Named prepared statements are enabled by default. Set `prepare: false` when using a pooler that cannot preserve prepared statements between queries. `Statement.unprepared` and `Statement.valuesUnprepared` use unnamed extended queries without adding entries to the prepared-statement cache.
+  
+  Inferred parameters stay permissive: strings bind untyped so the backend derives the type from the statement, and safe integers beyond the `int4` range bind as `int8`.
+  
+  Add `Pool.reserve` for exclusive access to a concurrent pool item, and fix waiter wakeups and capacity replacement after invalidation.
+
+- [#7514](https://github.com/Effect-TS/effect/pull/7514) [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb) Thanks @tim-smart! - Add Socket.upgrade, for upgrading tcp sockets using STARTTLS
+
+- [#7568](https://github.com/Effect-TS/effect/pull/7568) [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf) Thanks @tim-smart! - Normalize core service and runtime identities under their owning module namespaces.
+
+- [#8001](https://github.com/Effect-TS/effect/pull/8001) [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e) Thanks @kitlangton! - Fix `Effect.fnUntracedEager` to pass the original function arguments to each transform after the current effect, matching `Effect.fn` and `Effect.fnUntraced`.
+
+- [#8005](https://github.com/Effect-TS/effect/pull/8005) [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8) Thanks @kitlangton! - Fix `Effect.updateServiceScoped` cleanup when an inner service provider has already completed. Closing the scope now preserves the service's absence instead of failing with a missing-service defect.
+
+- [#8007](https://github.com/Effect-TS/effect/pull/8007) [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94) Thanks @kitlangton! - Preserve the original cause in `Effect.catchReason` and `Effect.catchReasons` when no nested reason matches and no fallback is provided.
+
+- [#7915](https://github.com/Effect-TS/effect/pull/7915) [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a) Thanks @kitlangton! - Fix `Effectable.Class` evaluation by delegating to its abstract `asEffect()` method. The method is called on the instance for each execution, preserving current receiver state and provided services.
+
+- [#7907](https://github.com/Effect-TS/effect/pull/7907) [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e) Thanks @KhraksMamtsov! - Add `Effectable.Mixin` to insert the Effect prototype into an existing class inheritance chain. The returned abstract class requires an `asEffect` method and derives its Effect type from that method through polymorphic `this`.
+
+- [#8009](https://github.com/Effect-TS/effect/pull/8009) [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f) Thanks @kitlangton! - Fix the `onError` and `onSyncError` argument tuple types in `Effect.effectify` to include only caller inputs, excluding the synthesized callback. Mapper annotations that expected a callback slot must use the caller-input tuple instead. Runtime behavior is unchanged.
+
+- [#7902](https://github.com/Effect-TS/effect/pull/7902) [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f) Thanks @kitlangton! - Fix `EntityProxyServer` handler layers to include client-side codec service requirements.
+
+- [#7889](https://github.com/Effect-TS/effect/pull/7889) [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf) Thanks @kitlangton! - Honor the entity layer's `disableFatalDefects` option in `Entity.makeTestClient`. When enabled, a handler defect no longer fails other pending calls to the same entity ID. The failing call still reports its defect; omitted or false options retain fatal-defect behavior.
+
+- [#7862](https://github.com/Effect-TS/effect/pull/7862) [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921) Thanks @kitlangton! - Retry `EventLogRemote` writes and change streams when authentication returns `Forbidden`.
+
+- [#7842](https://github.com/Effect-TS/effect/pull/7842) [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe) Thanks @kitlangton! - Return one empty chunk when `ChunkedMessage.split` receives an empty `Uint8Array`.
+
+- [#7525](https://github.com/Effect-TS/effect/pull/7525) [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132) Thanks @fubhy! - Add `ByteSize` module and use it across the ecosystem
+
+- [#8115](https://github.com/Effect-TS/effect/pull/8115) [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7) Thanks @tim-smart! - Calculate `HttpBody.file`, `HttpBody.fileFromInfo`, and `HttpClientRequest.bodyFile` content lengths with exact bigint arithmetic and EOF clamping.
+
+- [#7784](https://github.com/Effect-TS/effect/pull/7784) [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146) Thanks @kitlangton! - Ensure `ExecutionPlan.captureRequirements` provides captured services to effectful `while` predicates.
+
+- [#7460](https://github.com/Effect-TS/effect/pull/7460) [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821) Thanks @tim-smart! - Fix contextual typing for `Match` tag and discriminator handler maps when handlers use `Effect.fn` or `Effect.fnUntraced`.
+
+- [#8070](https://github.com/Effect-TS/effect/pull/8070) [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad) Thanks @tim-smart! - Fix parallel child workflows inside activities to dispatch before suspending, release activity resources during durable waits, and resume reliably when children complete during cleanup.
+
+- [#7677](https://github.com/Effect-TS/effect/pull/7677) [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023) Thanks @kitlangton! - Set `duplex` for raw Web stream request bodies in `FetchHttpClient`.
+
+- [#7615](https://github.com/Effect-TS/effect/pull/7615) [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e) Thanks @kitlangton! - Fix `FiberMap` losing track of fibers started under the same key by a replaced fiber's synchronous finalizer, ensuring they are interrupted when the map's scope closes.
+
+- [#7967](https://github.com/Effect-TS/effect/pull/7967) [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff) Thanks @kitlangton! - Preserve an already registered fiber when `FiberHandle` or `FiberMap` registers it again with `onlyIfMissing: true`, instead of interrupting it and clearing the entry.
+
+- [#8083](https://github.com/Effect-TS/effect/pull/8083) [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380) Thanks @nikelborm! - Exposed the platform specific pretty loggers separately.
+
+- [#7788](https://github.com/Effect-TS/effect/pull/7788) [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb) Thanks @kitlangton! - Fix `FileSystem.sink` to retain its default write flag when `flag` is undefined.
+
+- [#8074](https://github.com/Effect-TS/effect/pull/8074) [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114) Thanks @nikelborm! - Removed unused stderr option from Logger.consolePretty signature
+
+- [#7965](https://github.com/Effect-TS/effect/pull/7965) [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010) Thanks @kitlangton! - Match `AtomHttpApi` query and mutation success types to the generated HTTP client,
+  including SSE, binary streams, and header-wrapped responses. Stream transport,
+  decoding, and SSE errors now appear in the stream's error channel instead of
+  `never`, so code that assumed a failure-free stream may need to handle them.
+  Runtime and serialization behavior are unchanged.
+
+- [#7959](https://github.com/Effect-TS/effect/pull/7959) [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e) Thanks @kitlangton! - Fix `AtomHttpApi` query and mutation dispatch for top-level API groups.
+
+- [#7961](https://github.com/Effect-TS/effect/pull/7961) [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87) Thanks @kitlangton! - Honor explicit `timeToLive: 0` and `timeToLive: 0n` in `AtomRpc` and `AtomHttpApi` queries. Zero now opts out of the registry's default idle retention, matching other zero-duration inputs, so an unmounted query can be disposed and fetched again on remount. Omitting `timeToLive` still uses the registry default.
+
+- [#7963](https://github.com/Effect-TS/effect/pull/7963) [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982) Thanks @kitlangton! - Fix `AtomRpc` mutation and query atoms to include client middleware errors in their result error types.
+
+- [#7740](https://github.com/Effect-TS/effect/pull/7740) [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd) Thanks @kitlangton! - Forward `Atom.withFallback` writes to the primary atom.
+
+- [#7693](https://github.com/Effect-TS/effect/pull/7693) [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe) Thanks @kitlangton! - Fix `HttpMiddleware.cors` to preserve `Origin` and other required `Vary` dimensions.
+
+- [#8140](https://github.com/Effect-TS/effect/pull/8140) [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f) Thanks @gcanti! - Fix `Types.DeepMutable` to preserve built-in objects, Effect data types, and other objects with methods or symbol-keyed properties while recursively making arrays, tuples, maps, sets, and plain records mutable.
+
+- [#7695](https://github.com/Effect-TS/effect/pull/7695) [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda) Thanks @kitlangton! - Use body status and encoding defaults in `HttpApiSchema.encodeToWithHeaders`.
+
+- [#8110](https://github.com/Effect-TS/effect/pull/8110) [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0) Thanks @tim-smart! - Prevent precision loss in Node/Bun filesystem operations and `HttpPlatform` file responses.
+
+- [#8111](https://github.com/Effect-TS/effect/pull/8111) [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd) Thanks @tim-smart! - Clamp HttpPlatform file response ranges to the file size so Content-Length matches the bytes available. Oversized reads stop at EOF, and offsets at or past EOF return an empty body with Content-Length 0. Apply the same clamping to the default Web file response implementation.
+
+- [#7699](https://github.com/Effect-TS/effect/pull/7699) [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da) Thanks @kitlangton! - Fix `HttpApiClient` decoding form-urlencoded responses.
+
+- [#7705](https://github.com/Effect-TS/effect/pull/7705) [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3) Thanks @kitlangton! - Run registered pre-response handlers before `HttpApiTest` returns responses.
+
+- [#7701](https://github.com/Effect-TS/effect/pull/7701) [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc) Thanks @kitlangton! - Fix `HttpApiClient.urlBuilder` dropping base URL pathnames.
+
+- [#7661](https://github.com/Effect-TS/effect/pull/7661) [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e) Thanks @kitlangton! - Add `JsonPointer.parseUriFragment` and `JsonPointer.formatUriFragment` for converting RFC 6901 URI fragments, and use them to preserve percent-encoded definition names in exported JSON Schema references. JSON Schema compilation now rejects malformed local definition references returned by `toJsonSchema` hooks. Such hooks must percent-encode characters that URI fragments do not permit, for example `%` as `%25` and `#` as `%23`.
+
+- [#7675](https://github.com/Effect-TS/effect/pull/7675) [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658) Thanks @kitlangton! - Normalize MIME type parameters and whitespace in `Mime.getAllExtensions`.
+
+- [#8108](https://github.com/Effect-TS/effect/pull/8108) [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c) Thanks @tim-smart! - On Node and Deno, `FileSystem.File.seek` now rejects negative resulting positions with a `BadArgument` platform error, leaving the cursor unchanged. Its return type is now `Effect<bigint, PlatformError>`.
+
+- [#8148](https://github.com/Effect-TS/effect/pull/8148) [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528) Thanks @tim-smart! - Preserve the response Content-Type when compressing file, raw, stream, and byte-array responses on Node, Bun, Deno, and the web platform, including headers overridden after body construction.
+
+- [#7703](https://github.com/Effect-TS/effect/pull/7703) [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259) Thanks @kitlangton! - Apply endpoint OpenAPI overrides and transforms after schema generation.
+
+- [#8057](https://github.com/Effect-TS/effect/pull/8057) [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063) Thanks @kitlangton! - Fix `Prompt.date` carrying typed digits into the next field when pressing Tab, including when navigation wraps.
+
+- [#7742](https://github.com/Effect-TS/effect/pull/7742) [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972) Thanks @kitlangton! - Prevent `Reactivity.query` cleanup from failing when keys are repeated.
+
+- [#7659](https://github.com/Effect-TS/effect/pull/7659) [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77) Thanks @kitlangton! - Preserve pending leftovers when a `Sink.flatMap` continuation completes without consuming input.
+
+- [#7671](https://github.com/Effect-TS/effect/pull/7671) [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf) Thanks @kitlangton! - Preserve SSE events with mixed line endings.
+
+- [#7691](https://github.com/Effect-TS/effect/pull/7691) [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189) Thanks @kitlangton! - Ignore Range headers on non-GET requests in HttpStaticServer.
+
+- [#8109](https://github.com/Effect-TS/effect/pull/8109) [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971) Thanks @tim-smart! - Parse HttpStaticServer byte range integers exactly, including values above Number.MAX_SAFE_INTEGER. Oversized starts now return 416 with Content-Range instead of falling back to 200. Oversized ends clamp to the last byte, and oversized suffixes return the whole file as 206.
+
+- [#7697](https://github.com/Effect-TS/effect/pull/7697) [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6) Thanks @kitlangton! - Fix `HttpApiBuilder` ignoring the status annotation on a `HttpApiSchema.WithHeaders` wrapper around a streaming success, which defected when the wrapper and inner statuses differed.
+
+- [#7667](https://github.com/Effect-TS/effect/pull/7667) [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0) Thanks @kitlangton! - Fix `Toml.parse` rejecting child tables in separate array-of-tables entries.
+
+- [#8106](https://github.com/Effect-TS/effect/pull/8106) [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3) Thanks @tim-smart! - Fix tool result serialization to select the codec using `isFailure` and preserve `encodedResult` through `Response.AllParts` round trips.
+  
+  Add `Tool.failureResultSchema(tool)` and `Tool.ExecutionFailure` to handle user failures, `AiError`, and denied or interrupted calls consistently. Also export `HttpRequestDetails` and `HttpResponseDetails` from `AiError`; the `Response` exports remain available.
+  
+  ### Breaking changes
+  
+  - Stored results must match the selected schema. With success `Schema.Number` and failure `Schema.NumberFromString`, migrate failed results from `404` to `"404"`.
+  - `Response.ToolResultPart` returns `Schema.Codec` instead of `Schema.decodeTo`. Update annotations that depend on the old type.
+  - `Tool.FailureResult` and `Tool.Result`, including their encoded variants, now include `Tool.ExecutionFailure` in both failure modes. Handle it when narrowing failed results.
+
+- [#8132](https://github.com/Effect-TS/effect/pull/8132) [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818) Thanks @LeonardoTrapani! - Fix activity count leaks when workflow activity acquisition is interrupted, which could block later workflow suspension.
+
+- [#7669](https://github.com/Effect-TS/effect/pull/7669) [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b) Thanks @kitlangton! - Fix folded YAML scalars to preserve paragraph and indentation breaks.
+
+- [#7872](https://github.com/Effect-TS/effect/pull/7872) [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6) Thanks @kitlangton! - Preserve defined falsy Error causes (`0`, `false`, `""`, `null`, `0n`, and `NaN`) in `Formatter.format` output. Missing and explicitly `undefined` causes remain omitted.
+
+- [#7451](https://github.com/Effect-TS/effect/pull/7451) [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2) Thanks @gcanti! - Fix equivalence derivation for schema class APIs by adopting the equivalence of
+  their declared fields. Class declarations previously fell back to
+  `Equal.equals`, which also compared runtime properties outside the schema and
+  could make field-equivalent class instances compare as unequal.
+
+- [#7920](https://github.com/Effect-TS/effect/pull/7920) [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5) Thanks @kitlangton! - Fix `Graph.bellmanFord` reporting a negative cycle as affecting a target across an impassable, positive-infinite-weight edge. Targets separated from the cycle by such edges now retain their finite shortest path or remain unreachable, while targets reachable from the cycle through finite-weight edges still report an error.
+
+- [#7625](https://github.com/Effect-TS/effect/pull/7625) [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138) Thanks @kitlangton! - Prevent `HashMap` iterators from exposing mutable internal collision entries.
+
+- [#7886](https://github.com/Effect-TS/effect/pull/7886) [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020) Thanks @kitlangton! - Fix `HashRing.getShards` skipping an eligible node at the first ring position when other nodes have reached their allocation quota.
+
+- [#7629](https://github.com/Effect-TS/effect/pull/7629) [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc) Thanks @kitlangton! - Compare header names case-insensitively in `Headers.isRedactedName`.
+
+- [#7627](https://github.com/Effect-TS/effect/pull/7627) [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53) Thanks @kitlangton! - Fix `Headers.redact` and `Headers.isRedactedName` skipping matches when a redaction pattern is a global or sticky regular expression.
+
+- [#7945](https://github.com/Effect-TS/effect/pull/7945) [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26) Thanks @kitlangton! - Constrain the data-first `HttpClient.catch(client, recover)` overload to recover with
+  `HttpClientResponse` values, matching the data-last overload. Callbacks returning other
+  success types are now rejected; use `Effect.catch` on the result of `client.execute(request)`
+  to recover to arbitrary values.
+
+- [#7922](https://github.com/Effect-TS/effect/pull/7922) [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939) Thanks @kitlangton! - Fix `HttpClient.followRedirects` bypassing response-level recovery when request preprocessing fails.
+
+- [#8131](https://github.com/Effect-TS/effect/pull/8131) [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb) Thanks @gcanti! - Fix `HttpClientResponse.schemaJson` and `HttpClientResponse.schemaNoBody` to apply parse options when decoding response
+  schemas.
+
+- [#7679](https://github.com/Effect-TS/effect/pull/7679) [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8) Thanks @kitlangton! - Close request scopes for streaming HEAD responses.
+
+- [#7681](https://github.com/Effect-TS/effect/pull/7681) [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7) Thanks @kitlangton! - Preserve `Content-Length` headers in `HttpServerResponse.fromWeb`.
+
+- [#7689](https://github.com/Effect-TS/effect/pull/7689) [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595) Thanks @kitlangton! - Normalize router prefixes before removing them from handler request URLs.
+
+- [#7898](https://github.com/Effect-TS/effect/pull/7898) [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e) Thanks @kitlangton! - Fix `HttpRunner` HTTP and WebSocket client URLs adding an extra leading slash to slash-prefixed paths. Insert the address/path separator only when it is missing, preserving intentional leading and interior slashes.
+  
+  This path correction is normally masked by router normalization, but prevents route misses for non-root paths when duplicate-slash normalization is disabled. Applications that compensate for the extra slash may need to remove that compensation. Router defaults and shared trailing-slash handling are unchanged.
+
+- [#7927](https://github.com/Effect-TS/effect/pull/7927) [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b) Thanks @tim-smart! - Reduce cold start cost of `HttpRouter` and `HttpEffect` web handlers.
+  
+  - `HttpServerRespondable` no longer imports `Schema` to detect schema errors, which removes the Schema modules from bundles that do not otherwise use them (about 23% of a minimal `HttpRouter` bundle).
+  - `HttpRouter.toWebHandler`, `HttpEffect.toWebHandlerLayer` and `HttpEffect.toWebHandlerLayerWith` now build the layer immediately instead of on the first request. A failed build never surfaces as an unhandled rejection; every request rejects with the build error instead.
+
+- [#7561](https://github.com/Effect-TS/effect/pull/7561) [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0) Thanks @jensdev! - Fix `HttpApiMiddleware`-declared errors being duplicated and mis-encoded.
+
+- [#7954](https://github.com/Effect-TS/effect/pull/7954) [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6) Thanks @fitchmultz! - Allow generated `HttpApiClient` methods and `AtomHttpApi` queries and mutations to accept native SSE decode options per call through the request's `sseOptions` field.
+
+- [#7994](https://github.com/Effect-TS/effect/pull/7994) [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad) Thanks @tim-smart! - Prevent unencodable atom values from aborting dehydration of the rest of an atom registry.
+
+- [#7935](https://github.com/Effect-TS/effect/pull/7935) [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc) Thanks @kitlangton! - Fix `Layer.tapError` and `Layer.tapCause` to require observers that accept the source layer's complete error type.
+
+- [#7983](https://github.com/Effect-TS/effect/pull/7983) [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69) Thanks @kitlangton! - Honor `captureStackTrace` in both forms of `Layer.withSpan`. Layer construction diagnostics previously reported a location inside `Layer.ts` instead of the `withSpan` call site, and ignored `captureStackTrace: false` or a supplied lazy stack.
+
+- [#7937](https://github.com/Effect-TS/effect/pull/7937) [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d) Thanks @kitlangton! - Preserve resource acquisition errors on `LayerMap.Service` when `preload: true` is set. The yielded service instance and its `get`, `contextEffect`, and `contextEffectOption` accessors now retain the resource error type because a resource can fail when reacquired, even if preloading succeeded.
+  
+  Consumers that assumed these accessors had a `never` error must handle the resource error. Runtime behavior is unchanged.
+
+- [#7874](https://github.com/Effect-TS/effect/pull/7874) [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2) Thanks @kitlangton! - Fix `Logger.toFile` dropping the remainder of a log batch when a successful file write writes only part of the buffer. File logging now uses the complete-write contract; write errors continue to be ignored.
+
+- [#7814](https://github.com/Effect-TS/effect/pull/7814) [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80) Thanks @kitlangton! - Fix `McpServer` HTTP resource templates failing to resolve.
+
+- [#7816](https://github.com/Effect-TS/effect/pull/7816) [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225) Thanks @kitlangton! - Fix `McpServer.registerPrompt` callback types to use decoded prompt parameters.
+
+- [#7495](https://github.com/Effect-TS/effect/pull/7495) [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2) Thanks @IMax153! - McpServer no longer sends `null` or array tool results as `structuredContent`, which MCP requires to be a JSON object.
+
+- [#7835](https://github.com/Effect-TS/effect/pull/7835) [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910) Thanks @kitlangton! - Remove queued control envelopes when clearing an address from in-memory message storage.
+
+- [#7993](https://github.com/Effect-TS/effect/pull/7993) [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030) Thanks @kitlangton! - Ensure metrics with equal attributes share a series regardless of attribute insertion order.
+
+- [#7991](https://github.com/Effect-TS/effect/pull/7991) [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c) Thanks @kitlangton! - Fix metrics reused across different `MetricRegistry` services to read and update the active registry while preserving each registry's values when revisited.
+
+- [#7665](https://github.com/Effect-TS/effect/pull/7665) [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b) Thanks @kitlangton! - Fix `Model.FieldOption` to preserve omitted variants.
+
+- [#7987](https://github.com/Effect-TS/effect/pull/7987) [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875) Thanks @kitlangton! - Add `Multipart.isStreamPart` to recognize only a text `Field` or streamed `File`, while preserving `Multipart.isPart` for all branded multipart parts, including `PersistedFile` values.
+
+- [#7519](https://github.com/Effect-TS/effect/pull/7519) [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf) Thanks @gcanti! - Fix `Schema.mutable` to preserve array and tuple metadata and reject node-level encodings.
+
+- [#7776](https://github.com/Effect-TS/effect/pull/7776) [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6) Thanks @kitlangton! - Preserve values added to an empty `MutableList` by `prependAll` when appending more values.
+
+- [#7571](https://github.com/Effect-TS/effect/pull/7571) [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6) Thanks @tim-smart! - Export the `Random.Random` service interface and `Metric.MetricRegistry` type so custom service implementations can be annotated without accessing `Context.Reference` phantom types.
+
+- [#7524](https://github.com/Effect-TS/effect/pull/7524) [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6) Thanks @fubhy! - Add `NetAddress` under `effect/unstable/net` for MAC, IP, internet socket, and Unix socket addresses, with checked parsing, schemas, equality, canonical string serialization, and URL formatting. Companion modules `IpInterface` and `IpNetwork` represent IP interfaces and CIDR networks.
+  
+  HTTP and socket servers now expose `NetAddress.SocketAddress`. Replace TCP `hostname` access with `NetAddress.formatIp(address.address)` and use `UnixPathAddress.path` for Unix sockets. URL helpers bracket IPv6 addresses and reject scoped IPv6. Bun and Deno HTTP server layers can now fail with `ServeError` when listener address conversion fails.
+  
+  PostgreSQL `inet` values now use `IpInterface`; `cidr` values use `IpNetwork` and reject addresses with host bits set.
+
+- [#7443](https://github.com/Effect-TS/effect/pull/7443) [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72) Thanks @youngspe! - Terminate the `Stream.fromEventListener` stream after one item if `once: true`.
+
+- [#7510](https://github.com/Effect-TS/effect/pull/7510) [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134) Thanks @gcanti! - Normalize numeric collection and batch counts across `Stream`, `Channel`, `Sink`, `MutableList`, `RequestResolver`, `Queue`, `TxQueue`, `PubSub`, and `HashRing`, preventing fractional, `NaN`, and non-positive counts from producing incorrect output, exceptions, waits for the wrong batch size, or non-terminating pulls.
+
+- [#7910](https://github.com/Effect-TS/effect/pull/7910) [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3) Thanks @kitlangton! - Fix `Number.remainder` to preserve negative-zero dividends with ordinary finite divisors.
+
+- [#7547](https://github.com/Effect-TS/effect/pull/7547) [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b) Thanks @tim-smart! - Improve `PersistedQueue` reliability across SQL, Redis, and memory stores. Retry policy now lives on `make()`, attempts count on claim, retries follow a `Schedule`, and exhausted or undecodable elements are dead-lettered. Add retention cleanup, durable acknowledgement retries, storage schema fixes, local poll wakeups, and fixes for the memory take race and Redis dedup growth.
+
+- [#7778](https://github.com/Effect-TS/effect/pull/7778) [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325) Thanks @kitlangton! - Ensure `Optic.pick` and `Optic.omit` delete focused optional fields omitted from a replacement.
+
+- [#7780](https://github.com/Effect-TS/effect/pull/7780) [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13) Thanks @kitlangton! - Fix `Optic.optionalKey` to splice tuple elements selected by string indices.
+
+- [#7782](https://github.com/Effect-TS/effect/pull/7782) [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005) Thanks @kitlangton! - Fix `Order.combineAll` consuming one-shot iterables after the first comparison.
+
+- [#7931](https://github.com/Effect-TS/effect/pull/7931) [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada) Thanks @tim-smart! - Fix disabled OTLP batching to skip empty exports and avoid resending buffered items.
+
+- [#7929](https://github.com/Effect-TS/effect/pull/7929) [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013) Thanks @tim-smart! - Speed up `OtlpTracer` span creation and export. Spans now allocate identifiers, attributes, and events lazily, and `Encoding.randomHex` produces flat strings for 16 and 32 character identifiers so serialization no longer flattens ropes.
+
+- [#7584](https://github.com/Effect-TS/effect/pull/7584) [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db) Thanks @kitlangton! - Fix `PartitionedSemaphore` leaving a new waiter suspended when a previously resumed waiter for the same partition is interrupted before its acquisition completes.
+
+- [#7766](https://github.com/Effect-TS/effect/pull/7766) [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3) Thanks @kitlangton! - Persist synchronous defects thrown by `PersistedCache` lookups.
+
+- [#7604](https://github.com/Effect-TS/effect/pull/7604) [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b) Thanks @kitlangton! - Keep `Pool.reserve` items out of shared circulation when other borrowers return or overlapping reservations close. Restore available slots only after the last reservation closes.
+
+- [#8078](https://github.com/Effect-TS/effect/pull/8078) [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb) Thanks @tim-smart! - Port `HttpApiBuilder.handler` from v3 to define reusable endpoint callbacks with inferred request, response, error, and service types.
+
+- [#7663](https://github.com/Effect-TS/effect/pull/7663) [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e) Thanks @kitlangton! - Preserve schema classes when extracting their default `VariantSchema` variant.
+
+- [#7760](https://github.com/Effect-TS/effect/pull/7760) [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f) Thanks @kitlangton! - Preserve negative counter deltas in OTLP and OpenTelemetry metric exports.
+
+- [#7478](https://github.com/Effect-TS/effect/pull/7478) [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100) Thanks @gcanti! - Normalize numeric collection counts consistently across `Array`, `Chunk`, `Iterable`, and `String`, and make `TupleOf` fall back to `Array` for positive fractional lengths.
+
+- [#8097](https://github.com/Effect-TS/effect/pull/8097) [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519) Thanks @tim-smart! - Keep the previous prompt frame visible until the next frame or submission is ready to display.
+
+- [#7637](https://github.com/Effect-TS/effect/pull/7637) [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e) Thanks @kitlangton! - Preserve text parts and provider options when serializing prompts.
+
+- [#7639](https://github.com/Effect-TS/effect/pull/7639) [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224) Thanks @kitlangton! - Preserve generated files when converting AI responses to prompts.
+
+- [#7603](https://github.com/Effect-TS/effect/pull/7603) [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81) Thanks @kitlangton! - Fix capacity-one PubSub subscriber cursors after sliding past messages, including duplicate delivery and invalid state when unsubscribing from a slid message.
+
+- [#7487](https://github.com/Effect-TS/effect/pull/7487) [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80) Thanks @tim-smart! - Redesign `Socket` around a scoped, pull-based reader with transport backpressure.
+  
+  `Socket` now exposes `reader` and `writer`. Client reader acquisition dials and yields a pull of non-empty batches: one buffer for TCP and one entry per WebSocket frame. TCP applies backpressure while paused; pausable WebSockets pause at `highWaterMark` (64 KiB by default) and resume after draining. Browser WebSockets cannot pause, so they can fail with `SocketReadError` at a configured `highWaterMark`. Writes await native drain signals and batch with `cork` / `uncork` where available.
+  
+  ### Breaking changes
+  
+  - `Socket.run`, `Socket.runString`, and `Socket.runRaw` are removed. Acquire `socket.reader` (or `Socket.readerBytes` / `Socket.readerString`) in a scope and pull in a loop. Code before the first pull replaces `onOpen`.
+  - `Socket.make` now takes `{ reader, writer }`. The writer acquisition is infallible and yields a `Writer` with `write` and `writeAll`; both operations can still fail with `SocketError`.
+  - Every close fails the pull with `SocketError` wrapping `SocketCloseError`. The close-code predicates are removed; use `Effect.retry` around the scoped read loop to reconnect.
+  - `Socket.toChannel` and `Socket.toChannelString` now read from the pull and fail on close. `Socket.toStream` is added for read-only consumption.
+  - `fromWebSocket` drops the `onInitialRun` option; `SendQueueCapacity` is removed.
+  - Accepted server sockets pause immediately. Their reader attaches to the existing connection and cannot reconnect after close.
+
+- [#7806](https://github.com/Effect-TS/effect/pull/7806) [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59) Thanks @tim-smart! - Add `Queue.flush` and `Queue.flushUnsafe` for manually releasing pending takers, including after synchronous offers.
+
+- [#7576](https://github.com/Effect-TS/effect/pull/7576) [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b) Thanks @kitlangton! - Fix `Queue` message duplication, capacity overruns, and consumer defects when a resumed producer synchronously uses the same queue. Zero-capacity queues now reserve each handed-off message for its consumer before resuming the producer.
+
+- [#7498](https://github.com/Effect-TS/effect/pull/7498) [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8) Thanks @gjermundgaraba! - Allow `SqlEventJournal` to decode entry identifiers and payloads from SQL drivers that return BLOB values as `ArrayBuffer`.
+
+- [#7644](https://github.com/Effect-TS/effect/pull/7644) [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318) Thanks @gcanti! - Remove the redundant `Graph.Proto` interface. Use `Graph.Graph<N, E, Graph.Kind>` when accepting any immutable graph.
+
+- [#7497](https://github.com/Effect-TS/effect/pull/7497) [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760) Thanks @javascript-unsafe! - Treat `NaN` as a non-positive count in `Stream.take`.
+
+- [#7864](https://github.com/Effect-TS/effect/pull/7864) [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6) Thanks @kitlangton! - Fix `Random.nextBetween` and `Crypto.randomBetween` returning their exclusive upper bound when floating-point arithmetic rounds up.
+
+- [#7985](https://github.com/Effect-TS/effect/pull/7985) [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956) Thanks @kitlangton! - Report the exact remaining store lifetime in `RateLimiter` fixed-window `resetAfter` metadata when `onExceeded` is `"delay"`, instead of rounding up to a whole window. Admission, returned delays, and remaining-token counts are unchanged.
+
+- [#7516](https://github.com/Effect-TS/effect/pull/7516) [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049) Thanks @kitlangton! - Fix `RcMap` and `LayerMap` cleanup after invalidating an actively borrowed entry and reacquiring the same key.
+  The invalidated resource is released when its last borrower closes, even with infinite idle TTL, without removing
+  the replacement entry. Old idle timers also leave replacement entries untouched.
+
+- [#7605](https://github.com/Effect-TS/effect/pull/7605) [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0) Thanks @kitlangton! - Fix `RcMap` entries getting stuck when the lookup function throws synchronously. Later borrowers now receive the defect, and unused entries are released according to their idle TTL instead of permanently consuming capacity.
+
+- [#7598](https://github.com/Effect-TS/effect/pull/7598) [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6) Thanks @kitlangton! - Keep `RcRef` closed when an in-flight acquisition finishes after its owning scope has closed. Release the late-acquired resource and interrupt waiting borrowers instead of making the resource available again.
+
+- [#7586](https://github.com/Effect-TS/effect/pull/7586) [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3) Thanks @kitlangton! - Prevent `RcRef` borrower cleanup from discarding replacement resources after invalidation or reopening a reference after its owner scope has closed.
+
+- [#7565](https://github.com/Effect-TS/effect/pull/7565) [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0) Thanks @typedrat! - Type `Cause.Reason#annotate` as accepting a `Context` only.
+
+- [#7461](https://github.com/Effect-TS/effect/pull/7461) [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d) Thanks @tim-smart! - Remove the MessagePack encoding and RPC serialization APIs together with the `msgpackr` dependency. Event-log persistence and remote messages now use SchemaBinary, and cluster transports use SchemaBinary unless NDJSON is selected explicitly.
+
+- [#8143](https://github.com/Effect-TS/effect/pull/8143) [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8) Thanks @gcanti! - Rename `SchemaGetter.transformOrFail` to `SchemaGetter.transformEffect` and `SchemaTransformation.transformOrFail` to `SchemaTransformation.transformEffect`. Replace calls to the old names with their `transformEffect` equivalents.
+
+- [#8022](https://github.com/Effect-TS/effect/pull/8022) [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085) Thanks @kitlangton! - Correct the `Effect.repeatOrElse` fallback type to expose the previous step's `Schedule.Metadata`, matching the existing runtime value.
+
+- [#7520](https://github.com/Effect-TS/effect/pull/7520) [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518) Thanks @ebramanti! - Report recovered MCP toolkit failures and defects to configured `ErrorReporter`s, including declared tool failures returned with `isError: true`.
+
+- [#7583](https://github.com/Effect-TS/effect/pull/7583) [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10) Thanks @kitlangton! - Fix `RequestResolver.withCache` retaining abandoned entries when a pending request is cancelled
+
+- [#7613](https://github.com/Effect-TS/effect/pull/7613) [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85) Thanks @kitlangton! - Preserve completed results and propagate resolver failures from `RequestResolver.persisted`.
+
+- [#7594](https://github.com/Effect-TS/effect/pull/7594) [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710) Thanks @kitlangton! - Keep completed results in `RequestResolver.withCache` when a losing `RequestResolver.race` resolver is interrupted after the winner completes, avoiding repeated backend requests on subsequent equal lookups.
+
+- [#7979](https://github.com/Effect-TS/effect/pull/7979) [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83) Thanks @kitlangton! - Preserve typed errors, defects, and interrupts from `RequestResolver.fromEffectTagged` handlers.
+
+- [#7981](https://github.com/Effect-TS/effect/pull/7981) [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0) Thanks @kitlangton! - Fix `RequestResolver.fromEffectTagged` to consume handler results as an iterable, allowing arrays, iterators, and generators to resolve requests in order.
+
+- [#8024](https://github.com/Effect-TS/effect/pull/8024) [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4) Thanks @kitlangton! - Fix `Types.RequiredKeys` dropping named required keys on types with index signatures. Derived type annotations may need to include these keys.
+
+- [#7496](https://github.com/Effect-TS/effect/pull/7496) [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed) Thanks @nikhilsnayak! - Add `HttpClientResponse.url`, including query parameters and excluding the hash. When redirects are followed, it reports
+  the final URL.
+
+- [#7683](https://github.com/Effect-TS/effect/pull/7683) [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3) Thanks @kitlangton! - Preserve zero and empty-string request IDs in JSON-RPC control messages.
+
+- [#7930](https://github.com/Effect-TS/effect/pull/7930) [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671) Thanks @tim-smart! - The default scheduler falls back to a microtask when setting a timer throws. Cloudflare Workers disallow timers in global scope, so an effect that yielded while running at module load failed with "Disallowed operation called within global scope".
+
+- [#7558](https://github.com/Effect-TS/effect/pull/7558) [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a) Thanks @gcanti! - Move the built-in schema revivers from `Schema` to `SchemaRepresentation`.
+  Rename the reviver constructors to `makeReviverDeclaration`,
+  `makeReviverFilter`, and `makeReviverFilterGroup`.
+  
+  Change `Schema.toEncoderXml` to fail with `SchemaIssue.Issue` directly instead
+  of wrapping failures in `SchemaError`. Consumers that read `error.issue` should
+  now use the error value itself.
+
+- [#7641](https://github.com/Effect-TS/effect/pull/7641) [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0) Thanks @kitlangton! - Preserve array-valued leaves when `SchemaGetter.makeTreeRecord` aggregates duplicate paths.
+
+- [#7673](https://github.com/Effect-TS/effect/pull/7673) [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de) Thanks @kitlangton! - Preserve leading U+FEFF characters in SchemaBinary string values when decoding.
+
+- [#8131](https://github.com/Effect-TS/effect/pull/8131) [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb) Thanks @gcanti! - Align Schema construction and parsing semantics, simplify parse options, accept inherited declared fields, and move Union settings into a node-local options object.
+  
+  ### Breaking changes
+  
+  - `Class.make`, `Class.makeOption`, and `Class.makeEffect` now return an existing instance unchanged. This avoids duplicate initialization and makes the construction APIs consistent. Use `new MyClass(input)` when a distinct instance is required.
+  
+  - `Literal(0)` and `Literal(-0)` continue to accept either signed zero, but decoding and encoding now preserve the input sign. Add an explicit transformation when a canonical sign is required.
+  
+  - `parseOptions` annotations no longer affect parsing. Options passed when creating or calling a decoder, encoder, or constructor adapter now apply to the complete operation. Move operation-wide settings from annotations to the relevant parser API.
+  
+  - `propertyOrder` has been removed from `ParseOptions` because preserving input order required a separate, rarely used object reconstruction path. Schema parsing no longer guarantees that decoded object keys follow their input order. Remove the option and apply any required presentation or serialization order after parsing.
+  
+  - `concurrency` now applies only to product children: tuple elements, array elements, struct fields, record entries, and structs with rest. It follows `Effect.forEach` semantics, defaults to sequential execution, and applies independently at every nested product. Union candidates remain sequential because speculative candidate evaluation can run transformations that are not selected. Existing product parsing can keep the option. Replace code that relied on concurrent Union candidates with explicitly coordinated parser calls. With concurrent Record key transformations, completion order determines the retained value when transformed keys collide.
+  
+  - `onExcessProperty: "preserve"` has been removed because it allowed unvalidated values absent from the schema type to cross the parsing boundary. Model additional properties with `Record` or `StructWithRest`; `"ignore"` and `"error"` remain available.
+  
+  - Declared `Struct` fields may now be inherited and are copied to own properties in the output. Dynamic `Record` index signatures remain own-only, while finite literal record keys are declared and may be inherited. The `__proto__` field remains own-only. Check ownership before parsing when every declared field must be own.
+  
+  - `SchemaAST.Union.mode` moved to `SchemaAST.Union.options?.mode` so node-local constructor settings live in one options object instead of special top-level fields. An absent value defaults to `"anyOf"`. `SchemaRepresentation.Union` now serializes `{ options: { mode: "oneOf" } }`; update direct AST access and regenerate or migrate persisted representation documents. The public `Schema.Union(members, { mode })` call is unchanged.
+
+- [#8147](https://github.com/Effect-TS/effect/pull/8147) [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14) Thanks @gcanti! - JSON Schema generation now follows the canonical JSON codec more closely and leaves unmodeled object properties open by default, matching Effect decoding.
+  
+  ### Breaking changes
+  
+  `Schema.ToJsonSchemaOptions.additionalProperties` has been replaced by `onExcessProperty`:
+  
+  - Replace `{ additionalProperties: true }` with `{ onExcessProperty: "ignore" }`.
+  - Replace `{ additionalProperties: false }` with `{ onExcessProperty: "error" }`.
+  - Replace a schema-valued `additionalProperties` option with `Schema.Record` or `Schema.StructWithRest`.
+  
+  `Schema.Enum` now rejects non-finite numeric members. `Schema.isMultipleOf` now rejects zero and non-finite divisors, and normalizes negative divisors.
+  
+  Generation is more accurate for index signatures, empty structs, template literal alternatives, capitalized strings, and unique symbols. Conjunctive index keys remain open by default; `onExcessProperty: "error"` constrains them with `propertyNames`.
+
+- [#7606](https://github.com/Effect-TS/effect/pull/7606) [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261) Thanks @kitlangton! - Fix `ScopedCache.invalidateAll` discarding entries created by reentrant resource finalizers without releasing them. Entries are now removed before their finalizers run, so replacement resources remain cached and are released when the cache closes.
+
+- [#7612](https://github.com/Effect-TS/effect/pull/7612) [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d) Thanks @kitlangton! - Capture synchronous defects thrown by `ScopedCache.refresh` lookup callbacks.
+
+- [#8026](https://github.com/Effect-TS/effect/pull/8026) [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0) Thanks @kitlangton! - Fix `Effect.annotateLogsScoped` to restore or remove unchanged `NaN` annotations when the scope closes.
+
+- [#8155](https://github.com/Effect-TS/effect/pull/8155) [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032) Thanks @tim-smart! - Use branded interfaces for `Reactivity`, `LanguageModel`, `EmbeddingModel`, and `Chat`. Refer to each service's same-name type instead of `.Service` or `["Service"]`; custom implementations must include `[TypeId]: TypeId`.
+
+- [#7913](https://github.com/Effect-TS/effect/pull/7913) [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea) Thanks @Hoishin! - Fix HttpRouter nested prefixed application order
+
+- [#7906](https://github.com/Effect-TS/effect/pull/7906) [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515) Thanks @kitlangton! - Honor services explicitly supplied when registering cluster entities while retaining construction-context services as fallbacks.
+
+- [#8114](https://github.com/Effect-TS/effect/pull/8114) [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe) Thanks @tim-smart! - Skip optional stack capture when `Error.stackTraceLimit` is zero.
+
+- [#8090](https://github.com/Effect-TS/effect/pull/8090) [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a) Thanks @tim-smart! - Reduce the basic Effect bundle size by keeping cause deduplication local, making encoding lookup tables tree-shakeable, removing redundant cause field declarations, and simplifying primitive hash dispatch without changing hash values.
+
+- [#7825](https://github.com/Effect-TS/effect/pull/7825) [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2) Thanks @kitlangton! - Resume paused WebSockets after their readers take ownership.
+
+- [#7827](https://github.com/Effect-TS/effect/pull/7827) [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f) Thanks @kitlangton! - Count buffered WebSocket text frames by their UTF-8 byte length when enforcing `highWaterMark`.
+
+- [#7798](https://github.com/Effect-TS/effect/pull/7798) [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6) Thanks @kitlangton! - Emit CR-terminated lines from `Stream.splitLines` without pulling upstream again.
+
+- [#7443](https://github.com/Effect-TS/effect/pull/7443) [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72) Thanks @youngspe! - Loosen Stream.addEventListener type parameter
+
+- [#7844](https://github.com/Effect-TS/effect/pull/7844) [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39) Thanks @kitlangton! - Preserve callback error identity in `SqlEventJournal.write` and `SqlEventJournal.withRemoteUncommited`.
+
+- [#7837](https://github.com/Effect-TS/effect/pull/7837) [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481) Thanks @kitlangton! - Preserve reply IDs in SQL-backed `MessageStorage.unprocessedMessagesById` reads.
+
+- [#7635](https://github.com/Effect-TS/effect/pull/7635) [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37) Thanks @kitlangton! - Fix placeholder numbering for cached fragments used in returning helpers.
+
+- [#7493](https://github.com/Effect-TS/effect/pull/7493) [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d) Thanks @utopyin! - Add `Statement.SpanPropagationEnabled` to scope driver span parenting under `sql.execute` for any SQL client. Disabled by default.
+  
+  ```ts
+  import { Effect } from "effect"
+  import { Statement } from "effect/unstable/sql"
+  
+  query.pipe(Effect.provideService(Statement.SpanPropagationEnabled, true))
+  ```
+
+- [#7633](https://github.com/Effect-TS/effect/pull/7633) [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2) Thanks @kitlangton! - Fix SQL returning helpers to compile identifiers with dialect-specific escaping.
+
+- [#7860](https://github.com/Effect-TS/effect/pull/7860) [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4) Thanks @kitlangton! - Ensure PostgreSQL shard acquisition and refresh return only the requested shards.
+
+- [#7904](https://github.com/Effect-TS/effect/pull/7904) [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7) Thanks @kitlangton! - Include the model's decoding services in the public requirements of `SqlModel.makeResolvers().insert`, alongside its existing input-encoding services.
+  
+  This intentionally tightens compile-time checking: previously accepted callers must now provide the services already needed to decode inserted rows at runtime. Provide those services when executing the insert with `SqlResolver.request`. `insertVoid` still requires only input-encoding services, and service-free models need no changes. Runtime behavior is unchanged.
+
+- [#7655](https://github.com/Effect-TS/effect/pull/7655) [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667) Thanks @kitlangton! - Fix `Stream.rechunk` failing on large source chunks.
+
+- [#7538](https://github.com/Effect-TS/effect/pull/7538) [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553) Thanks @gwagjiug! - Parse `Content-Length` metadata strictly across HTTP modules, ignoring malformed or unsafe values instead of coercing them.
+
+- [#7522](https://github.com/Effect-TS/effect/pull/7522) [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96) Thanks @gwagjiug! - Ignore `Set-Cookie` headers whose cookie names do not satisfy the RFC 6265 token syntax.
+
+- [#7619](https://github.com/Effect-TS/effect/pull/7619) [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0) Thanks @kitlangton! - Honor numeric property selectors in Struct selection and mapping utilities.
+
+- [#7560](https://github.com/Effect-TS/effect/pull/7560) [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b) Thanks @gcanti! - Expose `SchemaAST` nodes, `SchemaIssue` nodes, `SchemaGetter.Getter`, and the `SchemaTransformation` models through structural instance interfaces instead of concrete class declarations. The constructors remain usable with `new` and `instanceof`, but their `prototype` is no longer part of the public TypeScript API. Replace type-level access through a constructor's `prototype` with the corresponding named instance interface, such as `SchemaGetter.Getter<T, E, R>`.
+  
+  `SchemaAST.Base` is no longer exported. Use `SchemaAST.AST` when accepting any AST node, and use the `SchemaAST.is*` guards to narrow individual variants.
+
+- [#7790](https://github.com/Effect-TS/effect/pull/7790) [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2) Thanks @kitlangton! - Fix the curried `SynchronizedRef.modifySomeEffect` overload to accept only the callback, matching its runtime behavior.
+
+- [#7569](https://github.com/Effect-TS/effect/pull/7569) [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a) Thanks @tim-smart! - Stop declaring `SynchronizedRef` as a subtype of `Ref`, preventing `Ref` combinators from accepting values that do not implement the required runtime representation.
+
+- [#8012](https://github.com/Effect-TS/effect/pull/8012) [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441) Thanks @kitlangton! - Preserve the source error type when a saved `Effect.tapDefect` operator is applied. The source error is now inferred from each application instead of when the operator is created. Runtime behavior is unchanged.
+
+- [#7427](https://github.com/Effect-TS/effect/pull/7427) [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e) Thanks @tim-smart! - Use SchemaBinary as the default RPC serialization for TCP cluster connections, including configurable frame limits.
+  
+  Cluster payloads are encoded with the binary codec on the wire. When a persisted reply cannot be encoded for JSON storage, the defect fallback that storage records is now also the reply delivered to waiting callers, so live replies always match what was persisted.
+  
+  SchemaBinary codecs are memoized by schema identity and wire mode, so per-message codec requests reuse the derived codec instead of rebuilding it.
+
+- [#8094](https://github.com/Effect-TS/effect/pull/8094) [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294) Thanks @gcanti! - Separate template literal validation from transformed tuple parsing. `TemplateLiteralParser` now propagates its parts' decoding and encoding service requirements.
+  
+  ### Breaking changes
+  
+  `Schema.TemplateLiteral` and `SchemaAST.TemplateLiteral` now throw during construction when a part contains an encoding, including inside unions and nested templates. This also rejects transformations whose decoded and encoded types are equal. Brands and supported checks without encodings remain valid.
+  
+  Use `Schema.Literals([0, 1])` to describe bit spellings or `Schema.Finite` to describe finite numeric spellings. Use `Schema.TemplateLiteralParser` when you need to decode transformed parts into a tuple. Explicit `Schema.toType` or `Schema.toEncoded` projections can remove an encoding, but do not necessarily preserve the strings accepted by the old template. For example, a `Finite` part rejects the empty segment accepted by `FiniteFromString`.
+  
+  `Schema.toEncoded(Schema.TemplateLiteralParser(...))` now validates the structure of the template instead of accepting any string. Use `Schema.String` when unrestricted strings are intended.
+  
+  When parser parts require services, provide those services to the corresponding decoding or encoding effect. These requirements were previously omitted from the parser's types.
+
+- [#7870](https://github.com/Effect-TS/effect/pull/7870) [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5) Thanks @kitlangton! - Fix `TestSchema.Asserts.ast.fields.equals` to compare ASTs for all own struct fields, including symbol and non-enumerable keys. Equivalent field schemas now compare equally regardless of schema instance identity, while differing ASTs and distinct symbol keys remain unequal.
+
+- [#8127](https://github.com/Effect-TS/effect/pull/8127) [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70) Thanks @tim-smart! - dispatch websocket events directly
+
+- [#7448](https://github.com/Effect-TS/effect/pull/7448) [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea) Thanks @candrewlee14! - Fix response tool part assignability after narrowing generic intersected tool records.
+
+- [#7486](https://github.com/Effect-TS/effect/pull/7486) [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd) Thanks @tim-smart! - Make automatic tool resolution interruption-safe for incomplete language model responses.
+
+- [#7481](https://github.com/Effect-TS/effect/pull/7481) [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3) Thanks @jpenilla! - Restore the `Effect.timeout` error message so `TimeoutError` includes the elapsed duration.
+
+- [#8032](https://github.com/Effect-TS/effect/pull/8032) [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77) Thanks @kitlangton! - Fix `Effect.timeoutOrElse` to finish interrupting the source before evaluating the fallback, preventing the source from winning after the timeout.
+  
+  Fallbacks now run in the caller fiber and inherit its interruptibility and supervision.
+
+- [#8103](https://github.com/Effect-TS/effect/pull/8103) [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24) Thanks @tim-smart! - Fix token-bucket `retryAfter`, `delay` and `resetAfter` in the memory and Redis stores. Timing now follows whole-token refill boundaries and accounts for elapsed time, including fractional token costs. Redis preserves signed fractional counts and keeps keys until capacity actually refills.
+  
+  `RateLimiterStore.tokenBucket` now returns `[remaining, elapsedMillis]` instead of `remaining`. Custom stores must return both values from the same atomic operation; see the `tokenBucket` docs for the contract. Returning `[remaining, 0]` keeps the old timing bug.
+
+- [#7912](https://github.com/Effect-TS/effect/pull/7912) [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9) Thanks @kitlangton! - Fix `Tokenizer.truncate` to account for token costs between messages.
+
+- [#7748](https://github.com/Effect-TS/effect/pull/7748) [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219) Thanks @kitlangton! - Encode tool results with the schema for their known success or failure branch.
+
+- [#8030](https://github.com/Effect-TS/effect/pull/8030) [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa) Thanks @kitlangton! - Fix `Effect.track(metric, mapper)` to reject source errors the mapper cannot handle.
+
+- [#7774](https://github.com/Effect-TS/effect/pull/7774) [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0) Thanks @kitlangton! - Preserve valued prefix nodes when removing a longer key from a `Trie`.
+
+- [#8016](https://github.com/Effect-TS/effect/pull/8016) [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf) Thanks @kitlangton! - Correct the error types of `Effect.try` and `Effect.tryPromise`. Direct function forms retain `Cause.UnknownError`, while `{ try, catch }` options use the error type returned by `catch`.
+  
+  Explicit two-generic direct calls, union-valued arguments, and generic aliases that combine the two forms no longer compile. Use `{ try, catch }` with a real error mapper, or narrow a union before calling the constructor.
+  
+  Runtime behavior, callback arguments, and error mapping are unchanged.
+
+- [#7924](https://github.com/Effect-TS/effect/pull/7924) [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435) Thanks @kitlangton! - Correct `Tuple.evolve` result types when a transform may be `undefined`. The result now includes both the transformed and unchanged element types, matching the existing runtime behavior. Accepted inputs and runtime behavior are unchanged.
+  
+  Code relying on the previous, incorrect result type must handle both outcomes. For example, a number-to-string transform that may be absent now produces `number | string`, so callers assuming a number-only result must adjust.
+
+- [#7553](https://github.com/Effect-TS/effect/pull/7553) [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070) Thanks @tim-smart! - Move the Cookie, Cookies, Headers, and UrlParams schemas from `effect/unstable/http` to `effect/Schema`, including their record and JSON-field helper schemas.
+
+- [#7623](https://github.com/Effect-TS/effect/pull/7623) [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9) Thanks @kitlangton! - Fix `UrlParams.fromInput` to stringify `null` values.
+
+- [#7631](https://github.com/Effect-TS/effect/pull/7631) [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf) Thanks @kitlangton! - Prevent `UrlParams.setAll` from mutating reusable overrides.
+
+- [#7855](https://github.com/Effect-TS/effect/pull/7855) [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77) Thanks @gcanti! - Treat only unpadded decimal integers from `0` through `4294967294` as array indices in environment-backed configuration and bracket-path decoding. This preserves numeric-looking object keys and prevents out-of-range environment keys from producing impossible array lengths. Bracket paths that intend to address arrays must use `[1]` instead of `[01]`.
+
+- [#7551](https://github.com/Effect-TS/effect/pull/7551) [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b) Thanks @tim-smart! - Cluster shard-lock recovery no longer stalls behind a wedged reserved SQL connection.
+  
+  While lock storage is unhealthy, the empty liveness probe (`refresh(address, [])`) now runs on the shared pool instead of the reserved lock connection, so a hung reserved connection cannot block recovery. Failed probes are also logged as warnings instead of being silently swallowed.
+
+- [#8028](https://github.com/Effect-TS/effect/pull/8028) [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c) Thanks @kitlangton! - Fix `Effect.withErrorReporting` to return an `Effect` instead of preserving input
+  subtypes such as `Exit`, whose subtype-specific fields are not present on the wrapper.
+
+- [#7570](https://github.com/Effect-TS/effect/pull/7570) [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595) Thanks @tim-smart! - Fix `Worker.run` hanging uninterruptibly when a worker dies before the ready handshake.
+
 ## 4.0.0-rc.112
 
 ### Minor Changes
diff --git a/repos/effect/packages/effect/MCP.md b/repos/effect/packages/effect/MCP.md
index 66258490c..53f77d24f 100644
--- a/repos/effect/packages/effect/MCP.md
+++ b/repos/effect/packages/effect/MCP.md
@@ -9,17 +9,16 @@ It's important to understand the architecture of the Effect MCP server.
 Here is an example of a MCP server implementation:
 
 ```typescript
-import { NodeRuntime, NodeSink, NodeStream } from "@effect/platform-node"
-import { Effect, Layer, Logger } from "effect"
-import { Schema } from "effect/schema"
+import { NodeRuntime, NodeStdio } from "@effect/platform-node"
+import { Effect, Layer, Logger, Schema } from "effect"
 import { McpProtocol, McpServer, Tool, Toolkit } from "effect/unstable/ai"
 
 // Define a simple tool
 const DemoTool = Tool.make("DemoTool", {
   description: "A demo tool that echoes back the input",
-  parameters: {
+  parameters: Schema.Struct({
     message: Schema.String
-  },
+  }),
   success: Schema.String
 })
 
@@ -58,12 +57,12 @@ const ServerLayer = Layer.mergeAll(
     McpServer.layerStdio({
       name: "Demo MCP Server",
       version: "1.0.0",
-      protocols: [McpProtocol.v2025_06_18],
-      stdin: NodeStream.stdin,
-      stdout: NodeSink.stdout
+      protocols: [McpProtocol.v2025_06_18]
     })
   ),
-  Layer.provide(Logger.layer([Logger.consolePretty({ stderr: true })]))
+  Layer.provide(NodeStdio.layer),
+  Layer.provide(Logger.layer([Logger.consolePretty()])),
+  Layer.provideMerge(Layer.succeed(Logger.LogToStderr, true))
 )
 
 Layer.launch(ServerLayer).pipe(NodeRuntime.runMain)
@@ -99,8 +98,7 @@ resource is defined as a template that specifies its location, behavior, and met
 parameters, completions, and content generation.
 
 ```typescript
-import { Effect } from "effect"
-import { Schema } from "effect/schema"
+import { Effect, Schema } from "effect"
 import { McpSchema, McpServer } from "effect/unstable/ai"
 
 const SimpleResource = McpServer.resource({
@@ -141,8 +139,7 @@ structured, parameterized instructions or messages that the client can send to t
 generation logic in a declarative way.
 
 ```typescript
-import { Effect } from "effect"
-import { Schema } from "effect/schema"
+import { Effect, Schema } from "effect"
 import { McpServer } from "effect/unstable/ai"
 
 const DemoPrompt = McpServer.prompt({
@@ -169,24 +166,23 @@ contract while the actual logic is provided separately through an implementation
 grouped into toolkits, which can be combined and converted into layers.
 
 ```typescript
-import { Effect, Layer } from "effect"
-import { Schema } from "effect/schema"
+import { Effect, Layer, Schema } from "effect"
 import { McpServer, Tool, Toolkit } from "effect/unstable/ai"
 
 const DemoTool = Tool.make("DemoTool", {
   description: "This is a demo tool for the documentation",
-  parameters: {
+  parameters: Schema.Struct({
     demoId: Schema.Number,
     demoName: Schema.String
-  },
+  }),
   success: Schema.String
 })
 
 const OtherDemoTool = Tool.make("OtherDemoTool", {
   description: "Another demo tool",
-  parameters: {
+  parameters: Schema.Struct({
     value: Schema.Number
-  },
+  }),
   success: Schema.String
 })
 
@@ -217,8 +213,7 @@ defines both the message shown to the user and the expected response schema, ens
 validated user input.
 
 ```typescript
-import { Effect } from "effect"
-import { Schema } from "effect/schema"
+import { Effect, Schema } from "effect"
 import { McpServer } from "effect/unstable/ai"
 
 const DemoElicitation = McpServer.elicit({
@@ -369,7 +364,7 @@ const ServerLayer = Layer.mergeAll(
     })
   ),
   Layer.provide(NodeStdio.layer),
-  Layer.provide(Layer.succeed(Logger.LogToStderr)(true))
+  Layer.provideMerge(Layer.succeed(Logger.LogToStderr, true))
 )
 
 // Run the server
diff --git a/repos/effect/packages/effect/SCHEMA.md b/repos/effect/packages/effect/SCHEMA.md
index 3812de314..98e96898d 100644
--- a/repos/effect/packages/effect/SCHEMA.md
+++ b/repos/effect/packages/effect/SCHEMA.md
@@ -35,7 +35,7 @@ Use Schema to:
 11. **Middlewares** — intercept decoding/encoding to provide fallbacks or inject services.
 12. **Advanced topics** — internal type model and type hierarchy (for library authors).
 13. **Integrations** — working examples for TanStack Form and Elysia.
-14. **Migration from v3** — API mapping from Schema v3 to v4.
+14. **[Migration from v3](../../migration/schema.md)** — API mapping from Schema v3 to v4.
 
 ## Runtime Performance
 
@@ -51,24 +51,151 @@ Values are microseconds per operation and lower is better. Results vary between
 machines, so they are most useful for understanding relative costs. A dash
 means that the library does not provide that benchmark.
 
-| Scenario                              | Effect Schema |    Valibot |      Zod 4 |
-| ------------------------------------- | ------------: | ---------: | ---------: |
-| Create a schema                       |        118.23 |  **40.24** |     318.56 |
-| Create a schema and parser            |    **130.50** |          — |          — |
-| Validate valid data                   |     **5.415** |       5.63 |          — |
-| Validate invalid data                 |         1.348 | **0.2431** |          — |
-| Parse valid data and collect errors   |         5.366 |   **5.22** |       7.16 |
-| Parse invalid data and collect errors |     **9.100** |      15.70 |      41.58 |
-| Parse valid data and stop early       |     **5.294** |       5.37 |          — |
-| Parse invalid data and stop early     |         1.352 | **0.2572** |          — |
-| Standard Schema, valid data           |         5.935 |       5.35 |   **3.83** |
-| Standard Schema, invalid data         |    **15.203** |      16.51 |      32.85 |
-| Standard Schema, valid, stop early    |     **5.843** |          — |          — |
-| Standard Schema, invalid, stop early  |     **2.244** |          — |          — |
-| Encode with a typed codec             |        0.3420 |          — | **0.0405** |
-| Decode with a typed codec             |        0.3762 |          — | **0.0463** |
-| Encode unknown input                  |    **0.3472** |          — |          — |
-| Decode unknown input                  |    **0.3637** |          — |          — |
+| Scenario                              | Effect Schema | Valibot 1.5.0 | Zod 4.6.2 |
+| ------------------------------------- | ------------: | ------------: | --------: |
+| Create a schema                       |       60.1297 |        1.0926 |   83.7496 |
+| Validate valid data                   |        4.1473 |        3.5389 |         — |
+| Validate invalid data                 |        0.2571 |        0.1823 |         — |
+| Parse valid data and collect errors   |        5.0261 |        3.5393 |    7.0073 |
+| Parse invalid data and collect errors |        7.4838 |        5.7206 |   19.3064 |
+| Parse valid data and stop early       |        4.1559 |        3.5941 |         — |
+| Parse invalid data and stop early     |        0.2525 |        0.1917 |         — |
+| Standard Schema, valid data           |    **5.3408** |        3.5565 |    3.5755 |
+| Standard Schema, invalid data         |       11.7723 |        5.4422 |   15.9974 |
+| Encode with a typed codec             |        0.0827 |             — |    0.0441 |
+| Decode with a typed codec             |        0.1063 |             — |    0.0427 |
+
+## Experimental schema compilers
+
+Enable JIT compilation at application startup with a side-effect import:
+
+```ts
+import "effect/unstable/schema/SchemaJITCompiler/enable"
+```
+
+Alternatively, `SchemaJITCompiler.enable(schema.ast)` enables one AST and the
+dependencies reached while parsing it. Importing `SchemaJITCompiler` or the
+`unstable/schema` barrel alone does not enable compilation. Operations are
+prepared on first use. If dynamic function construction is blocked or compilation
+fails, the interpreter remains available. Exceptions from executing a parser are
+not treated as compilation failures and do not trigger a retry.
+
+JIT and AOT use the same source generator. To generate an AOT module at build
+time, call `SchemaAOTCompiler.compile(targets)` with an ordered array of ASTs
+and the operations to prepare:
+
+```ts
+SchemaAOTCompiler.compile([
+  { ast: User.ast, operations: ["decode"] },
+  { ast: SchemaAST.toType(User.ast), operations: ["is", "make"] }
+])
+```
+
+The module exports `install(asts)`. Call it with the target ASTs in the same
+order before using normal `SchemaParser` functions. Generated modules contain
+only the requested operation families and their dependencies. Operations that
+were not requested use the interpreter if they are called. Generated modules
+do not import the generator and work where `new Function` is forbidden.
+
+The low-level installation trusts the supplied root order and AST definitions.
+Target `SchemaAST.toType(schema.ast)` with `is` or `make` for guards and
+construction. Target `SchemaAST.flip(schema.ast)` with `decode` for encoding.
+
+`effect/unstable/schema/SchemaAOTCompiler/Build` provides the higher-level
+workflow. Its `build` function loads direct Schema exports, writes a
+self-installing module through `FileSystem`, and prepares decoding by default:
+
+```ts
+import * as SchemaAOTCompilerBuild from "effect/unstable/schema/SchemaAOTCompiler/Build"
+
+SchemaAOTCompilerBuild.build({
+  modules: {
+    "./schemas/User.js": () => import("./schemas/User.js"),
+    "./schemas/Order.js": () => import("./schemas/Order.js")
+  },
+  baseUrl: import.meta.url,
+  outFile: "./generated/schema-aot.js"
+})
+```
+
+Import the generated file at application startup. Module keys identify imports
+relative to `baseUrl`; each loader must return that same module during the
+build. The lazy record produced by `import.meta.glob` can be passed directly.
+Request `encode`, `is`, or `make` explicitly when those directions also need
+AOT roots. Loading executes the selected application modules during the build.
+Run the returned Effect with the platform's `FileSystem` and `Path` services,
+and ensure the bundler retains the generated side-effect import.
+
+Regenerate AOT modules when schema definitions or the Effect version change.
+Callbacks and symbols are read from runtime ASTs, not serialized.
+
+### One registry for all implementations
+
+A single `WeakMap` associates each exact AST with its decoder entry. The cache
+stores functions, never parsing results. The interpreter, JIT, AOT and
+`SchemaCompiler.set(ast, decoder)` all use it.
+
+| Operation      | Result                                      | Purpose                                                                                         |
+| -------------- | ------------------------------------------- | ----------------------------------------------------------------------------------------------- |
+| `decodeEffect` | `Effect` with output or detailed issues     | Required complete decoding, including asynchronous work and transformations.                    |
+| `decode`       | Output or `SchemaCompiler.invalid`          | Optional synchronous decoding fast path without detailed diagnostics.                           |
+| `is`           | Boolean                                     | Optional validation without constructing output.                                                |
+| `make`         | Output or `SchemaCompiler.invalid`          | Optional synchronous construction fast path without detailed diagnostics.                       |
+| `makeEffect`   | `Effect` with a constructed value or issues | Optional specialized construction. The registry caches the interpreted constructor when absent. |
+
+Decoding tries `decode` when available. Success provides the output directly;
+failure calls `decodeEffect` for diagnostics. The diagnostic traversal uses child
+decoders directly, without restarting their validation fast paths. A boolean
+guard prefers `is`, otherwise it uses ordinary decoding (including `decode`
+when available). An `invalid` result needs that diagnostic fallback because the
+marker is also a possible input value. Composite checks
+can require stripped, reconstructed values, so `is` is omitted when it cannot
+avoid constructing those values safely.
+
+Each operation initializes independently. Synchronous construction tries `make`
+when available and falls back to `makeEffect` for detailed issues. Compilers omit
+`make` whenever replay could repeat defaults, Class constructors,
+transformations, middleware, or other effects. `makeEffect` itself never uses
+validation replay. Field defaults belong to the parent occurrence, not to
+construction of the root. Runtime parse options, including product concurrency,
+retain the interpreter's semantics.
+
+Installing a decoder replaces the entry for that AST. Existing consumers that
+already captured an entry retain it. Late installation is allowed, but startup
+installation is needed to optimize every consumer. Custom decoders supplied to
+`set` are trusted to implement the AST's semantics.
+
+An AOT module installs entries for explicitly requested roots and their static
+dependencies. Each generated operation initializes on first use. All entries
+live in the same `WeakMap`: there is no separate AOT cache, and a later
+`SchemaCompiler.set` for the same AST replaces any compiled entry in the same way.
+
+### What is specialized
+
+Encoding-free graphs of supported primitives, Objects, Arrays, tuples, Unions
+and template literals can use generated validators. Struct and homogeneous Array
+decoding and construction also have generated loops. Pure fixed Struct and
+homogeneous Array constructors can additionally use the synchronous `make` fast
+path; composite children are resolved through the same registry. These loops
+share the interpreter's diagnostic and asynchronous continuation helpers.
+Other detailed traversals and constructors use the existing interpreter with
+registry-resolved children; there is no separate diagnostic interpreter in the
+compiler.
+
+Transformations and middleware never participate in validation replay. A single
+synchronous transformation between supported leaf types can use generated
+orchestration directly. Other transformations and middleware use the interpreted
+orchestration, while pure child checkpoints can still use generated validators.
+Suspend is resolved lazily by JIT. AOT does not evaluate Suspend thunks at build
+time, so dynamically reached schemas fall back to the interpreter unless installed
+separately. Declaration callbacks remain runtime code; their type parameters can
+be compiled.
+
+Checks and property getters in replayable validation must be deterministic and
+free of side effects. Proxy inputs and modifications to built-in object behavior
+are not supported by the optimization contract. Large or unsupported graphs
+retain interpreted paths. AOT removes dynamic source generation, not all parser
+initialization or the need for runtime schema objects.
 
 # Defining Elementary Schemas
 
@@ -286,6 +413,10 @@ You can use `Schema.TemplateLiteral` to define structured string patterns made o
 
 Template literal matching is based on the semantics of each part rather than only a generated regular expression. Checks on string, number, and bigint schema parts are applied while matching each segment.
 
+Parts must not contain encodings. Construction throws for transformed parts, including transformations inside unions and transformations whose decoded and encoded types are equal. Brands and supported checks without encodings remain valid. Use `Schema.TemplateLiteralParser` when the parts need to decode values, such as `BooleanFromBit` or `FiniteFromString`.
+
+To describe bit spellings directly, use `Schema.Literals([0, 1])` as the part. To describe finite numeric spellings, use `Schema.Finite`. Replacing `FiniteFromString` with `Finite` changes the accepted spelling rules: a finite numeric part does not accept an empty segment. Explicit `Schema.toType` and `Schema.toEncoded` projections remove transformations, but can also change the constraints a template validates.
+
 **Example** (Constraining parts of an email-like string)
 
 ```ts
@@ -322,6 +453,12 @@ Failure(Cause([Fail(SchemaError(Expected a string matching template literal part
 
 If you want to extract the parts of a string that match a template, you can use `Schema.TemplateLiteralParser`. This allows you to parse the input into its individual components rather than treat it as a single string.
 
+The parser transforms a template built from the encoded sides of the parts into a tuple that retains their decoders and checks. Encoding applies the parts' encoders and joins the segments. The parser requires the decoding and encoding services of its parts in the corresponding direction.
+
+`Schema.toEncoded(parser)` validates that source template. Use `Schema.String` if you need to accept unrestricted strings.
+
+Ambiguous templates use greedy segmentation with backtracking. Encoding a tuple and decoding the resulting string can produce a different tuple when a segment contains a separator used by the template.
+
 **Example** (Parsing a template literal into components)
 
 ```ts
@@ -899,25 +1036,12 @@ Failure(Cause([Fail(SchemaError: Custom message
 */
 ```
 
-### Preserve unexpected keys
-
-You can preserve unexpected keys by setting `onExcessProperty` to `preserve`.
-
-**Example** (Preserving unexpected keys)
-
-```ts
-import { Schema } from "effect"
-
-const schema = Schema.Struct({
-  a: Schema.String
-})
+### Handling unexpected keys
 
-console.log(String(Schema.decodeUnknownExit(schema)({ a: "a", b: "b" }, { onExcessProperty: "preserve" })))
-/*
-Output:
-Success({"b":"b","a":"a"})
-*/
-```
+Unexpected keys are ignored by default. Set `onExcessProperty` to `error` to
+reject them. To retain additional keys, describe and validate them with
+`Schema.Record` or `Schema.StructWithRest` so they are represented in the
+schema's type.
 
 ### Index Signatures
 
@@ -1683,7 +1807,7 @@ the later selected property wins if a transformation produces a duplicate key.
 With concurrency greater than `1`, completion order determines which value is
 retained.
 
-**Example** (Keeping the later selected value when parsing sequentially)
+**Example** (Keeping the later selected value)
 
 ```ts
 import { Schema, SchemaTransformation } from "effect"
@@ -2288,7 +2412,7 @@ const URLSchema = Schema.declare(
         // The JSON representation is a plain string
         Schema.String,
         // How to convert between URL and string
-        SchemaTransformation.transformOrFail<URL, string>({
+        SchemaTransformation.transformEffect<URL, string>({
           // JSON string -> URL (may fail if the string is not a valid URL)
           decode: (s, options) =>
             Effect.try({
@@ -3083,57 +3207,65 @@ Transformation<T, E, RD, RE>
 - `RD`: the context used while decoding
 - `RE`: the context used while encoding
 
-A `Transformation` consists of two `Getter` functions:
+A `Transformation` consists of two `Getter` values:
 
 - `decode: Getter<T, E, RD>` — transforms a value during decoding
 - `encode: Getter<E, T, RE>` — transforms a value during encoding
 
-Each `Getter` receives an input and an optional context and returns either a value or an error. Getters can be composed to build more complex logic.
+Each `Getter` is a tagged description of one operation:
+
+- `Transform` transforms a present value synchronously.
+- `TransformOptional` transforms an `Option` synchronously and can handle a missing value.
+- `TransformEffect` and `TransformOptionalEffect` are the corresponding effectful forms.
+- `Passthrough` returns its input unchanged.
+
+Getter values expose `pipe`. Use the dual standalone functions `SchemaGetter.map` and `SchemaGetter.compose` to build
+larger transformations. `SchemaGetter.run` executes a getter directly and always returns an `Effect`; schemas execute
+their getters through `SchemaParser` instead.
 
 **Example** (Implementation of `Transformation.trim`)
 
 ```ts
+import { SchemaGetter, SchemaTransformation } from "effect"
+
 /**
  * @category String transformations
  * @since 4.0.0
  */
-export function trim(): Transformation<string, string> {
-  return new Transformation(Getter.trim(), Getter.passthrough())
+export function trim(): SchemaTransformation.Transformation<string, string> {
+  return new SchemaTransformation.Transformation(SchemaGetter.trim(), SchemaGetter.passthrough())
 }
 ```
 
 In this case:
 
-- The `decode` process uses `Getter.trim()` to remove leading and trailing whitespace.
-- The `encode` process uses `Getter.passthrough()`, which returns the input as is.
+- The `decode` process uses `SchemaGetter.trim()` to remove leading and trailing whitespace.
+- The `encode` process uses `SchemaGetter.passthrough()`, which returns the input as is.
 
 ## Composing Transformations
 
-You can combine transformations using the `.compose` method. The resulting transformation applies the `decode` and `encode` logic of both transformations in sequence.
+You can combine transformations using `SchemaTransformation.composeTransformation`. The resulting transformation applies the `decode` and `encode` logic of both transformations in sequence.
 
 **Example** (Trim and lowercase a string)
 
 ```ts
-import { Option, SchemaTransformation } from "effect"
+import { Schema, SchemaTransformation } from "effect"
 
 // Compose two transformations: trim followed by toLowerCase
-const trimToLowerCase = SchemaTransformation.trim().compose(SchemaTransformation.toLowerCase())
+const trimToLowerCase = SchemaTransformation.composeTransformation(
+  SchemaTransformation.trim(),
+  SchemaTransformation.toLowerCase()
+)
+const schema = Schema.String.pipe(Schema.decode(trimToLowerCase))
 
-// Run the decode logic manually to inspect the result
-console.log(trimToLowerCase.decode.run(Option.some("  Abc"), {}))
-/*
-{
-  _id: 'Exit',
-  _tag: 'Success',
-  value: { _id: 'Option', _tag: 'Some', value: 'abc' }
-}
-*/
+Schema.decodeUnknownSync(schema)("  Abc")
+// "abc"
 ```
 
 In this example:
 
-- The `decode` logic applies `Getter.trim()` followed by `Getter.toLowerCase()`, producing a string that is trimmed and lowercased.
-- The `encode` logic is `Getter.passthrough()`, which simply returns the input as-is.
+- The `decode` logic applies `SchemaGetter.trim()` followed by `SchemaGetter.toLowerCase()`, producing a string that is trimmed and lowercased.
+- The `encode` logic is `SchemaGetter.passthrough()`, which returns the input unchanged.
 
 ## Transforming One Schema into Another
 
@@ -3214,7 +3346,7 @@ const Kilometers = Schema.Finite.pipe(
 )
 ```
 
-You can define transformations that may fail during decoding or encoding using `SchemaTransformation.transformOrFail`.
+You can define transformations that may fail during decoding or encoding using `SchemaTransformation.transformEffect`.
 
 This is useful when you need to validate input or enforce rules that may not always succeed.
 
@@ -3226,7 +3358,7 @@ import { Effect, Schema, SchemaIssue, SchemaTransformation } from "effect"
 const URLFromString = Schema.String.pipe(
   Schema.decodeTo(
     Schema.instanceOf(URL),
-    SchemaTransformation.transformOrFail({
+    SchemaTransformation.transformEffect({
       decode: (s, options) =>
         Effect.try({
           try: () => new URL(s),
@@ -5122,6 +5254,29 @@ Schema can derive JSON Schemas, test data generators (Arbitraries), equivalence
 
 By default, a schema produces a draft-2020-12 JSON Schema.
 
+The generated document is intended for preliminary validation. JSON Schema and
+Effect checks do not always have identical semantics, so the Effect decoder
+remains the final authority. Passing JSON Schema validation does not guarantee
+that decoding will succeed.
+
+Properties not modeled by an object schema use `onExcessProperty: "ignore"` by
+default, matching the decoder default. This emits `additionalProperties: true`.
+Pass `{ onExcessProperty: "error" }` to the generator and decoder to reject
+unmatched properties whenever the key space is representable. An
+index-signature key check that cannot be represented leaves unmatched
+properties open so that JSON Schema does not reject inputs Effect may accept.
+The generator does not merge conjunctive key patterns into a new regular
+expression. With `onExcessProperty: "ignore"`, it leaves that index signature
+open. With `onExcessProperty: "error"`, it uses the generated key schemas under
+`propertyNames`. Properties not already selected by `properties` or
+`patternProperties` may satisfy any index-signature value schema; the Effect
+decoder enforces the exact association between keys and values.
+
+Known differences include Unicode code-point versus UTF-16 string length,
+JavaScript RegExp flags, property checks applied before versus after decoding,
+and `oneOf` with overlapping members. Custom `toJsonSchema` callbacks are also
+responsible for the semantics they emit.
+
 The result is a data structure including:
 
 - the source of the JSON Schema (e.g. `draft-2020-12`, `draft-07`, etc...)
@@ -5335,7 +5490,7 @@ console.log(JSON.stringify(document, null, 2))
         "type": "string"
       }
     },
-    "additionalProperties": false
+    "additionalProperties": true
   },
   "definitions": {}
 }
@@ -5373,7 +5528,7 @@ console.log(JSON.stringify(document, null, 2))
         ]
       }
     },
-    "additionalProperties": false
+    "additionalProperties": true
   },
   "definitions": {}
 }
@@ -5454,12 +5609,12 @@ console.log(JSON.stringify(document.schema, null, 2))
   "required": [
     "headers"
   ],
-  "additionalProperties": false
+  "additionalProperties": true
 }
 */
 
 // Example (Decode a JSON-safe value using the same serializer)
-// If a value matches the JSON Schema above, you can decode it with the serializer.
+// JSON Schema is the preliminary check; the serializer remains the final validator.
 console.log(String(Schema.decodeUnknownExit(serializer)(json)))
 // Success({"headers":Headers([["a","b"]])})
 ```
@@ -5561,7 +5716,7 @@ console.log(JSON.stringify(document, null, 2))
       "required": [
         "a"
       ],
-      "additionalProperties": false
+      "additionalProperties": true
     }
   },
   "definitions": {}
@@ -6009,7 +6164,7 @@ const json = SchemaRepresentation.toJson(
 
 const document = SchemaRepresentation.fromJson(json)
 const rebuilt = SchemaRepresentation.fromRepresentation(document, {
-  revivers: [Schema.isMinLengthReviver]
+  revivers: [SchemaRepresentation.isMinLengthReviver]
 })
 
 console.log(Schema.is(rebuilt)("abc"))
@@ -6018,9 +6173,9 @@ console.log(Schema.is(rebuilt)("a"))
 // false
 ```
 
-Effect exports individual revivers next to the built-in declarations and checks they reconstruct, such as
-`Schema.OptionReviver`, `Schema.DateReviver`, and `Schema.isMinLengthReviver`. Supply every reviver required by the
-document; a missing or duplicate `id`, or a payload that does not satisfy its reviver's `payloadSchema`, is an error.
+`SchemaRepresentation` exports individual revivers for built-in declarations and checks, such as
+`OptionReviver`, `DateReviver`, and `isMinLengthReviver`. Supply every reviver required by the document; a missing or
+duplicate `id`, or a payload that does not satisfy its reviver's `payloadSchema`, is an error.
 
 `fromRepresentations` rebuilds the ordered roots of a `MultiDocument` in a shared reference environment. Only references
 reachable from those roots are revived.
@@ -6033,7 +6188,7 @@ There are separate reviver contracts for opaque declarations, leaf filters, and
 - `FilterReviver<P>`
 - `FilterGroupReviver<P>`
 
-Use `makeDeclarationReviver`, `makeFilterReviver`, and `makeFilterGroupReviver` to infer `P` from `payloadSchema`.
+Use `makeReviverDeclaration`, `makeReviverFilter`, and `makeReviverFilterGroup` to infer `P` from `payloadSchema`.
 
 ```ts
 import { Schema, SchemaRepresentation } from "effect"
@@ -6050,7 +6205,7 @@ function minLength(
   })
 }
 
-const minLengthReviver = SchemaRepresentation.makeFilterReviver(
+const minLengthReviver = SchemaRepresentation.makeReviverFilter(
   id,
   Schema.Struct({ minimum: Schema.Number }),
   ({ annotations, payload }) => minLength(payload.minimum, annotations)
@@ -6070,9 +6225,23 @@ with resolved identifiers and leaves anonymous non-recursive candidates inline,
 candidates still receive references, using a synthetic name when necessary. Pass `referencePolicy` in the options to use a
 different allocation rule.
 
+Generated JSON Schema is a preliminary validation layer. The Effect decoder
+remains the final authority because string length, RegExp flags,
+decoded-object property checks, and `oneOf` can differ between the two
+validators. The default `onExcessProperty: "ignore"` emits
+`additionalProperties: true`; use `onExcessProperty: "error"` in both
+generation and decoding to reject unmatched properties whenever the key space
+is representable. Unrepresentable index-signature key checks leave unmatched
+properties open under the default mode. The compiler does not merge
+conjunctive key patterns into a new regular expression. In `error` mode it uses
+the generated key schemas under `propertyNames`. For properties not otherwise
+selected, it accepts any index-signature value schema and leaves the exact
+key-value association to the Effect decoder.
+
 At the lower level, `SchemaRepresentation.toJsonSchemaDocument(document)` compiles a live `Document`, and
 `toJsonSchemaMultiDocument` compiles a live `MultiDocument`. Check-level `toJsonSchema` callbacks contribute JSON Schema
 constraints. Opaque declarations that have not been structurally lowered compile to an unconstrained JSON Schema.
+Callback authors are responsible for the semantics of their output.
 
 `toJsonSchema` callbacks must treat their input schemas as immutable and return a valid JSON Schema object graph. After a
 callback returns, it must not mutate that object or anything reachable from it; returning a new graph is the supported way
@@ -6093,28 +6262,62 @@ schema with revivers first.
 It does not return a representation document.
 
 Only direct local references to top-level definitions in the form `#/$defs/<escaped-token>` are supported. Root
-references, external references, and pointers below a definition throw an `Unsupported reference` error. A direct
-reference to a missing definition throws an `Invalid reference` error.
+references, external references, and pointers below a definition are rejected with the supported reference format.
+Missing definitions are reported by name. References reached inside a nested schema
+resource introduced by `$id` are rejected with their path instead of being resolved against the top-level definitions.
+A root `$id`, or a nested `$id` without reached references, is supported.
+
+Import errors explain which constraint or reference cannot be translated and include its source path.
 
 `fromJsonSchemaMultiDocument` returns the ordered root schemas. It translates only definitions reachable from those
 roots. To pass the result to a representation compiler, call `toRepresentations` with the returned schemas' ASTs.
 
-Import translates a Draft 2020-12 subset. `$dynamicRef`, `contains`, `dependentRequired`, `dependentSchemas`, `not`,
-active `if` / `then` / `else`, `unevaluatedItems`, and `unevaluatedProperties` throw an
-`Unsupported JSON Schema keyword` error. Inactive conditional keywords and `minContains` / `maxContains` without
+Import translates `{ not: {} }` as `Never`, including in optional properties. Other uses of `not` are unsupported.
+
+Import reuses Effect schemas and built-in checks. It is a best-effort translation, not a guarantee of identical
+validation or a lossless round trip:
+
+- `additionalProperties: true`, `{}`, or an omitted `additionalProperties` imports additional values as `Schema.Json`.
+  These properties are validated and retained, including with `onExcessProperty: "error"`.
+- Closed objects normally have no catch-all for additional properties. The decoder strips excess properties by default;
+  use `onExcessProperty: "error"` to reject them. Closed empty objects instead import as
+  `Schema.Record(Schema.String, Schema.Never)` and reject string-keyed entries regardless of that option.
+  A closed object with a single
+  `patternProperties` entry and no named or required properties imports as a filtered `Schema.Record` when patterns
+  are applied. Object keyword scopes still constrain declared properties when intersecting schemas.
+  Combinations requiring an index signature to exclude
+  explicit properties or patterned keys remain unsupported and are rejected with an explanation of the limitation.
+- With `patterns: "apply"`, open patterned objects are also rejected. Their filtered
+  index and catch-all would produce incompatible TypeScript index signatures. This includes `additionalProperties`
+  set to `true`, `{}`, or omitted. An intersection with a closed object can still be imported when it reduces the
+  result to a finite set of properties.
+- `minProperties`, `maxProperties`, and `propertyNames` use the existing checks on the decoded object, after excess
+  properties have been stripped. No separate validation of the original object is added.
+- String length checks count UTF-16 code units, not Unicode code points. For example, `"😀"` satisfies an imported
+  `minLength: 2` and fails an imported `maxLength: 1`, unlike JSON Schema validation.
+- `integer` uses `Schema.isInt` and rejects integers outside JavaScript's safe integer range.
+- Applied patterns use the existing `Schema.isPattern` check without adding a Unicode flag.
+
+An Effect struct exported with `additionalProperties: true` therefore imports with a JSON-valued index signature,
+even if the original struct had none. The imported decoder retains additional properties that the original decoder
+would strip. Use the imported schema's actual checks and parse options when reasoning about validation.
+
+Import translates a Draft 2020-12 subset. `$dynamicRef`, `contains`, `dependentRequired`, `dependentSchemas`,
+active `if` / `then` / `else`, `unevaluatedItems`, and `unevaluatedProperties` are rejected with an error identifying
+the unsupported keyword. Inactive conditional keywords and `minContains` / `maxContains` without
 `contains` have no validation effect and are ignored. Unknown extension keywords are ignored and their semantics are not
-enforced. Objects and arrays used as `const` values or `enum` members throw an
-`Unsupported structured JSON Schema value` error. The optional `onEnter` callback can normalize each JSON Schema node
+enforced. Objects and arrays used as `const` values or `enum` members are rejected. Only strings, numbers, booleans, and
+null are supported. The optional `onEnter` callback can normalize each JSON Schema node
 before it is translated.
 
 Intersections of overlapping unions are limited to disjoint root-type partitions and finite primitive `anyOf` literal
-sets. Other union intersections, including cases that would duplicate a nested choice, throw an
-`Unsupported intersection of overlapping unions` error.
+sets. Other union intersections, including cases that would duplicate a nested choice, are rejected.
 
 Regular expression constraints reached during translation are rejected by default because imported patterns use the
 runtime's native regular expression engine and may block validation for an unbounded amount of time. Set
-`patterns: "apply"` only for trusted documents. Set `patterns: "ignore"` to skip reached pattern constraints explicitly;
-the resulting schema accepts values that the source document may reject. The policy includes `pattern`, the keys of
+`patterns: "apply"` only for trusted documents. Set `patterns: "ignore"` to skip reached pattern constraints explicitly.
+This can admit values the source rejects, but it can also reject previously valid values inside `oneOf` when removing
+constraints makes multiple branches match. The policy includes `pattern`, the keys of
 `patternProperties`, and patterns nested in `propertyNames`. Ignoring `patternProperties` also skips its value constraints
 and `additionalProperties`, because matching keys cannot be determined without evaluating the patterns.
 
@@ -6134,6 +6337,46 @@ Opaque declarations and checks provide code through their `toCode` callbacks. `t
 reviver option. To generate code from persisted JSON, first reconstruct the schemas with `fromRepresentation` or
 `fromRepresentations`, then create a new live representation so the revivers can restore the callbacks.
 
+# Parsing Options
+
+## Concurrent Product Parsing
+
+The `concurrency` parse option controls how many children of a product schema may parse at the same time. It uses the
+same semantics as `Effect.forEach`: `undefined` and `1` are sequential, a number greater than `1` sets a bound, and
+`"unbounded"` removes the bound. Synchronous children remain eager and do not require a fiber.
+
+The option applies to tuple elements, array elements, struct fields, record entries, and structs with rest. It applies
+independently at every nested product. For example, with `concurrency: 2`, two outer array elements may each parse two
+inner elements concurrently. The option is runtime-only; it is not stored in the schema AST or its representation.
+
+Union members remain sequential. A product inside the union member currently being evaluated still receives the
+option.
+
+**Example** (Decoding array elements concurrently)
+
+```ts
+import { Effect, Schema, SchemaGetter } from "effect"
+
+const item = Schema.String.pipe(Schema.decode({
+  decode: SchemaGetter.transformEffect((value) => Effect.sleep("10 millis").pipe(Effect.as(value))),
+  encode: SchemaGetter.passthrough()
+}))
+
+const program = Schema.decodeUnknownEffect(Schema.Array(item))(
+  ["a", "b", "c"],
+  { concurrency: 2 }
+)
+
+const result = await Effect.runPromise(program)
+// ["a", "b", "c"]
+```
+
+Tuple and array results retain their element positions, as the result of `Effect.forEach` does. Other observable work
+follows completion order. With `errors: "first"`, the first observed child failure terminates the product and interrupts
+the remaining children. With `errors: "all"`, issues are accumulated as children complete. If transformed record keys
+collide, the last assignment to complete wins. Concurrent work may already have performed effects when another child
+fails or the parser interrupts it.
+
 # Error Handling and Formatting
 
 When validation fails, Schema produces structured error objects that describe what went wrong. Formatters turn those error objects into human-readable messages you can display to users or write to logs.
diff --git a/repos/effect/packages/effect/benchmark/http/serverAllocations.ts b/repos/effect/packages/effect/benchmark/http/serverAllocations.ts
new file mode 100644
index 000000000..927a0cac5
--- /dev/null
+++ b/repos/effect/packages/effect/benchmark/http/serverAllocations.ts
@@ -0,0 +1,138 @@
+import { HttpRouter, HttpServerResponse } from "effect/unstable/http"
+import * as inspector from "node:inspector/promises"
+
+const WARMUP = 5_000
+const REQUESTS = 50_000
+const RETAINED_LIMIT = 64
+const CHURN_LIMIT = 17_000
+const DEFERRED_REQUESTS = 20_000
+const DEFERRED_CONCURRENCY = 32
+// main deferred a per-request span-end task via setImmediate (~4k bytes/request
+// held until the loop turns); the native-tracer fast path ends the span inline.
+const DEFERRED_LIMIT = 512
+
+const gc = (globalThis as any).gc as undefined | (() => void)
+if (gc === undefined) {
+  console.error("run with --expose-gc")
+  process.exit(1)
+}
+
+const session = new inspector.Session()
+session.connect()
+
+const { dispose, handler } = HttpRouter.toWebHandler(
+  HttpRouter.add("GET", "/ping", HttpServerResponse.text("pong")),
+  { disableLogger: true }
+)
+
+const run = async (count: number) => {
+  for (let i = 0; i < count; i++) {
+    const response = await handler(new Request("http://localhost/ping"))
+    await response.arrayBuffer()
+  }
+}
+
+// a promise-chained load never yields to the event loop, so any per-request
+// macrotask (setImmediate) the request path schedules accumulates unrun
+const runConcurrent = async (count: number) => {
+  let remaining = count
+  const worker = async () => {
+    while (remaining > 0) {
+      remaining--
+      const response = await handler(new Request("http://localhost/ping"))
+      await response.arrayBuffer()
+    }
+  }
+  await Promise.all(Array.from({ length: DEFERRED_CONCURRENCY }, worker))
+}
+
+interface ProfileNode {
+  callFrame: { functionName: string; url: string; lineNumber: number }
+  selfSize: number
+  children?: Array<ProfileNode>
+}
+
+const topFrames = (head: ProfileNode) => {
+  const byFrame = new Map<string, number>()
+  let total = 0
+  const visit = (node: ProfileNode) => {
+    if (node.selfSize > 0) {
+      const f = node.callFrame
+      const url = f.url.replace(/^.*\/(packages|node_modules)\//, "$1/")
+      const key = `${f.functionName || "(anonymous)"} @ ${url}:${f.lineNumber + 1}`
+      byFrame.set(key, (byFrame.get(key) ?? 0) + node.selfSize)
+      total += node.selfSize
+    }
+    node.children?.forEach(visit)
+  }
+  visit(head)
+  return {
+    total,
+    frames: [...byFrame.entries()].sort((a, b) => b[1] - a[1]).slice(0, 15)
+  }
+}
+
+// Allow FinalizationRegistry callbacks to run before measuring retained heap.
+const heapUsed = async () => {
+  for (let i = 0; i < 5; i++) {
+    gc()
+    await new Promise((resolve) => setImmediate(resolve))
+  }
+  return process.memoryUsage().heapUsed
+}
+
+await run(WARMUP)
+
+const heapBefore = await heapUsed()
+await run(REQUESTS)
+const heapAfter = await heapUsed()
+
+// A promise-chained burst never yields to the event loop, so synchronous-GC
+// heap deltas expose per-request work deferred into macrotask queues.
+await runConcurrent(WARMUP)
+gc()
+gc()
+const deferredBefore = process.memoryUsage().heapUsed
+await runConcurrent(DEFERRED_REQUESTS)
+gc()
+gc()
+const deferredAfter = process.memoryUsage().heapUsed
+
+await session.post("HeapProfiler.startSampling", {
+  samplingInterval: 16384,
+  includeObjectsCollectedByMajorGC: true,
+  includeObjectsCollectedByMinorGC: true
+})
+await run(REQUESTS)
+const { profile } = await session.post("HeapProfiler.stopSampling")
+
+await dispose()
+
+const { frames, total } = topFrames(profile.head as ProfileNode)
+const churnPerRequest = Math.round(total / REQUESTS)
+const retainedPerRequest = Math.round((heapAfter - heapBefore) / REQUESTS)
+const deferredPerRequest = Math.round((deferredAfter - deferredBefore) / DEFERRED_REQUESTS)
+
+console.log(`requests:            ${REQUESTS}`)
+console.log(`allocated/request:   ${churnPerRequest} bytes (limit ${CHURN_LIMIT})`)
+console.log(`retained/request:    ${retainedPerRequest} bytes (limit ${RETAINED_LIMIT})`)
+console.log(`deferred/request:    ${deferredPerRequest} bytes (limit ${DEFERRED_LIMIT})`)
+console.log("top allocation sites:")
+for (const [key, size] of frames) {
+  const pct = ((size / total) * 100).toFixed(1).padStart(5)
+  console.log(`  ${pct}%  ${(size / 1024 / 1024).toFixed(2).padStart(7)} MiB  ${key}`)
+}
+
+if (retainedPerRequest > RETAINED_LIMIT) {
+  console.error(`FAIL: retained heap grows ${retainedPerRequest} bytes/request`)
+  process.exit(1)
+}
+if (deferredPerRequest > DEFERRED_LIMIT) {
+  console.error(`FAIL: microtask-only burst holds ${deferredPerRequest} bytes/request exceeds ${DEFERRED_LIMIT}`)
+  process.exit(1)
+}
+if (churnPerRequest > CHURN_LIMIT) {
+  console.error(`FAIL: allocation churn ${churnPerRequest} bytes/request exceeds ${CHURN_LIMIT}`)
+  process.exit(1)
+}
+console.log("PASS")
diff --git a/repos/effect/packages/effect/package.json b/repos/effect/packages/effect/package.json
index 15d5aae5a..abc2681bf 100644
--- a/repos/effect/packages/effect/package.json
+++ b/repos/effect/packages/effect/package.json
@@ -1,7 +1,7 @@
 {
   "name": "effect",
   "type": "module",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "license": "MIT",
   "description": "The missing standard library for TypeScript, for writing production-grade software.",
   "homepage": "https://effect.website",
@@ -25,7 +25,10 @@
     "concurrency",
     "observability"
   ],
-  "sideEffects": [],
+  "sideEffects": [
+    "./src/unstable/schema/SchemaJITCompiler/enable.ts",
+    "./dist/unstable/schema/SchemaJITCompiler/enable.js"
+  ],
   "exports": {
     "./package.json": "./package.json",
     ".": "./src/index.ts",
@@ -39,6 +42,7 @@
     "./unstable/eventlog": "./src/unstable/eventlog/index.ts",
     "./unstable/http": "./src/unstable/http/index.ts",
     "./unstable/httpapi": "./src/unstable/httpapi/index.ts",
+    "./unstable/net": "./src/unstable/net/index.ts",
     "./unstable/observability": "./src/unstable/observability/index.ts",
     "./unstable/persistence": "./src/unstable/persistence/index.ts",
     "./unstable/process": "./src/unstable/process/index.ts",
@@ -82,6 +86,7 @@
       "./unstable/eventlog": "./dist/unstable/eventlog/index.js",
       "./unstable/http": "./dist/unstable/http/index.js",
       "./unstable/httpapi": "./dist/unstable/httpapi/index.js",
+      "./unstable/net": "./dist/unstable/net/index.js",
       "./unstable/observability": "./dist/unstable/observability/index.js",
       "./unstable/persistence": "./dist/unstable/persistence/index.js",
       "./unstable/process": "./dist/unstable/process/index.js",
@@ -107,13 +112,13 @@
     "check": "tsc -b tsconfig.json"
   },
   "devDependencies": {
-    "@types/node": "^26.4.0",
+    "@types/node": "^26.6.2",
     "ajv": "^8.20.0",
     "ajv-draft-04": "^1.0.0",
-    "ast-types": "^0.16.1",
+    "ast-types": "^0.16.3",
     "immer": "^11.1.18",
     "protobufjs": "^8.8.0",
-    "tinybench": "^6.1.4",
-    "valibot": "^1.4.2"
+    "tinybench": "^6.2.0",
+    "valibot": "^1.5.0"
   }
 }
diff --git a/repos/effect/packages/effect/runtimeperf/README.md b/repos/effect/packages/effect/runtimeperf/README.md
index 8265911a7..bbfc32a6e 100644
--- a/repos/effect/packages/effect/runtimeperf/README.md
+++ b/repos/effect/packages/effect/runtimeperf/README.md
@@ -42,6 +42,7 @@ pnpm runtimeperf object-32-valid
 pnpm runtimeperf schema/object-32-valid-effect
 pnpm runtimeperf --family arrays
 pnpm runtimeperf --implementation zod4
+pnpm runtimeperf --implementation zod4-compiled
 ```
 
 Override measurement settings:
@@ -86,6 +87,13 @@ adapters, recursion and cold paths. The `schema-benchmarks` suite contains the
 complete timing matrices exposed by the upstream Effect, Valibot and Zod
 adapters.
 
+The `moltar-parse-safe` and `moltar-assert-loose` suites preserve Moltar's
+object shape. Their valid cases reproduce the upstream timed operation; the
+extra-property and invalid cases are Effect extensions. They compare
+interpreted Effect, Effect JIT and AOT, Valibot, ordinary and jitless Zod where
+applicable, and Zod `compile`, using the dependency versions recorded in each
+report.
+
 The `arbitrary` suite compares the native public API with direct fast-check v4 arbitraries in separate processes. It
 measures derivation through the first recursive sample, steady-state recursive
 sampling, optional-Struct sampling, fixed-length string generation to exercise constraint pushdown,
@@ -103,6 +111,11 @@ end-to-end public API comparison, but the work is not identical: native replay
 verifies the original failure and its full shrink path, while fast-check can
 start directly from its recorded path.
 
+Array cases cover passing checks and shrinking a four-command sequence while preserving an ordered pair. The latter
+starts from the same explicit sequence in both engines, using a fixed seed for native generation and an example for
+fast-check. Base/head validation preserves the failure without requiring identical shrunk outputs, so its timing also
+reflects changes in how much of the shrink tree is explored. The runtime regression tests assert the smaller result.
+
 The regular-expression fixtures validate the same language, and both fixed-seed warm fixtures must reach multiple
 lengths and every alternative family. Their exact distributions remain implementation-defined, so cross-library
 timings are diagnostic while base/head comparisons protect the cost of each implementation's established behavior.
@@ -118,13 +131,18 @@ Zod parsing cases import `zod/v4` and call `safeParse` with `{ jitless: true }`;
 its Standard Schema and codec cases use their native APIs. Valibot uses the
 corresponding `is`, `safeParse` and Standard Schema APIs. The focused Effect
 adapter family measures the overhead of public APIs that wrap parser issues.
+The compiler comparison calls `z.compile(schema, { strict: true })` and uses
+Zod's `validate` API for boolean checks. Ten representative scenarios also run
+against equivalent Valibot schemas using `parse` and `is`.
 
 ## Measurement model
 
-Each worker validates the fixture before and after measuring. Calibration finds
-a batch large enough for the configured target duration. Each implementation
-uses its own calibrated batch and executes in a separate process, with rotating
-order within the scenario.
+Each worker validates the fixture before and after measuring. The Effect
+fixture calibrates one batch size that every implementation in the same
+scenario uses. This keeps the enclosing loop identical across implementations;
+V8 can otherwise optimize sub-10 ns callbacks differently at different batch
+sizes. Each implementation executes in a separate process, with rotating order
+within the scenario.
 
 Tinybench measures one synchronous batched task. The primary process result is:
 
diff --git a/repos/effect/packages/effect/runtimeperf/compare.mts b/repos/effect/packages/effect/runtimeperf/compare.mts
index 7c2cf346e..1b08f7c4e 100644
--- a/repos/effect/packages/effect/runtimeperf/compare.mts
+++ b/repos/effect/packages/effect/runtimeperf/compare.mts
@@ -1,13 +1,14 @@
 import { spawnSync } from "node:child_process"
-import { existsSync, mkdirSync, mkdtempSync, rmSync, symlinkSync } from "node:fs"
+import { cpSync, existsSync, mkdirSync, mkdtempSync, rmSync, symlinkSync } from "node:fs"
 import os from "node:os"
-import { join } from "node:path"
+import { dirname, join } from "node:path"
 import process from "node:process"
 import { materializeFixture } from "./materialize.mts"
 import { analyzePairs } from "./stats.mts"
 import {
   aggregateMeasurements,
   calibrateFixture,
+  comparePath,
   configPath,
   coverageSummary,
   effectDir,
@@ -16,6 +17,7 @@ import {
   libraryVersions,
   loadRegistry,
   makeRunId,
+  materializePath,
   measureFixture,
   parseArgs,
   printTable,
@@ -25,6 +27,8 @@ import {
   resolveDefaults,
   selectFixtures,
   sha256,
+  statsPath,
+  utilsPath,
   workerPath,
   writeJson
 } from "./utils.mts"
@@ -90,6 +94,22 @@ const createWorktree = (runRoot, name, sha) => {
   return path
 }
 
+const applyWorktreeChanges = (path, untracked) => {
+  const diff = runGit(["diff", "--binary", "HEAD", "--"])
+  if (diff !== "") {
+    const result = run("git", ["apply", "--binary", "-"], { cwd: path, input: `${diff}\n` })
+    if (result.error) throw result.error
+    if (result.status !== 0) {
+      throw new Error(`${result.stdout}${result.stderr}`.trim())
+    }
+  }
+  for (const file of untracked) {
+    const target = join(path, file.path)
+    mkdirSync(dirname(target), { recursive: true })
+    cpSync(join(repoRoot, file.path), target, { recursive: true })
+  }
+}
+
 const worktreeState = () => {
   const diff = runGit(["diff", "--binary", "HEAD", "--"])
   const untrackedOutput = runGit([
@@ -136,16 +156,13 @@ const main = () => {
   try {
     const baseRoot = createWorktree(runRoot, "base", baseSha)
     worktrees.push(baseRoot)
-    const headRoot = options.head === "worktree"
-      ? repoRoot
-      : createWorktree(runRoot, "head", headSha)
-    if (headRoot !== repoRoot) worktrees.push(headRoot)
+    const headRoot = createWorktree(runRoot, "head", headSha)
+    worktrees.push(headRoot)
+    if (options.head === "worktree") applyWorktreeChanges(headRoot, state.untracked)
 
     for (const fixture of selected) {
       const baseFixturePath = materializeFixture(baseRoot, fixture)
-      const headFixturePath = headRoot === repoRoot
-        ? fixture.fixturePath
-        : materializeFixture(headRoot, fixture)
+      const headFixturePath = materializeFixture(headRoot, fixture)
       const baseCalibration = calibrateFixture(fixture, defaults, baseFixturePath)
       const headCalibration = calibrateFixture(fixture, defaults, headFixturePath)
       const batchSize = Math.max(baseCalibration.batchSize, headCalibration.batchSize)
@@ -227,7 +244,11 @@ const main = () => {
     artifactMode: "repository",
     coverage: coverageSummary(selected),
     hashes: {
+      compare: hashFile(comparePath),
       config: hashFile(configPath),
+      materialize: hashFile(materializePath),
+      stats: hashFile(statsPath),
+      utils: hashFile(utilsPath),
       worker: hashFile(workerPath),
       fixtures: Object.fromEntries(
         [...new Set(selected.map((fixture) => fixture.fixturePath))]
diff --git a/repos/effect/packages/effect/runtimeperf/config.json b/repos/effect/packages/effect/runtimeperf/config.json
index 261711dcd..4258f6083 100644
--- a/repos/effect/packages/effect/runtimeperf/config.json
+++ b/repos/effect/packages/effect/runtimeperf/config.json
@@ -322,6 +322,21 @@
               ],
               "size": 1
             },
+            {
+              "name": "array-check-pass-100-native",
+              "export": "arrayCheckPass100",
+              "scenario": "arbitrary-array-check-pass-100",
+              "operation": "check-array",
+              "size": 50
+            },
+            {
+              "name": "array-check-falsify-shrink-native",
+              "export": "arrayCheckFalsifyAndShrink",
+              "scenario": "arbitrary-array-check-falsify-shrink",
+              "operation": "check-array-and-shrink",
+              "path": "failure",
+              "size": 4
+            },
             {
               "name": "check-pass-100-native",
               "export": "checkPass100",
@@ -571,6 +586,21 @@
               "path": "failure",
               "size": 1
             },
+            {
+              "name": "array-check-pass-100-fast-check-v4",
+              "export": "arrayCheckPass100",
+              "scenario": "arbitrary-array-check-pass-100",
+              "operation": "check-array",
+              "size": 50
+            },
+            {
+              "name": "array-check-falsify-shrink-fast-check-v4",
+              "export": "arrayCheckFalsifyAndShrink",
+              "scenario": "arbitrary-array-check-falsify-shrink",
+              "operation": "check-array-and-shrink",
+              "path": "failure",
+              "size": 4
+            },
             {
               "name": "check-pass-100-fast-check-v4",
               "export": "checkPass100",
@@ -1042,6 +1072,45 @@
               "path": "valid",
               "size": 32
             },
+            {
+              "name": "array-32-suspended-concurrency-4",
+              "export": "array32SuspendedConcurrent4",
+              "scenario": "array-32-suspended-concurrency-4",
+              "family": "arrays",
+              "astTags": [
+                "Arrays",
+                "String",
+                "Transformation"
+              ],
+              "path": "valid",
+              "size": 32
+            },
+            {
+              "name": "object-32-suspended-concurrency-4",
+              "export": "object32SuspendedConcurrent4",
+              "scenario": "object-32-suspended-concurrency-4",
+              "family": "objects",
+              "astTags": [
+                "Objects",
+                "String",
+                "Transformation"
+              ],
+              "path": "valid",
+              "size": 32
+            },
+            {
+              "name": "record-32-suspended-concurrency-4",
+              "export": "record32SuspendedConcurrent4",
+              "scenario": "record-32-suspended-concurrency-4",
+              "family": "records",
+              "astTags": [
+                "Objects",
+                "String",
+                "Transformation"
+              ],
+              "path": "valid",
+              "size": 32
+            },
             {
               "name": "literal-2-valid-last",
               "export": "literal2ValidLast",
@@ -1104,17 +1173,6 @@
               "path": "valid",
               "size": 2
             },
-            {
-              "name": "property-order-original",
-              "export": "propertyOrderOriginal",
-              "scenario": "property-order-original",
-              "family": "parse-options",
-              "astTags": [
-                "Objects"
-              ],
-              "path": "valid",
-              "size": 3
-            },
             {
               "name": "recursive-tree-depth-16-valid",
               "export": "recursiveTreeDepth16Valid",
@@ -1143,6 +1201,13 @@
             "size": 2
           },
           "cases": [
+            {
+              "name": "adapter-make-valid",
+              "export": "makeValid",
+              "scenario": "adapter-make-valid",
+              "operation": "make",
+              "adapter": "Sync"
+            },
             {
               "name": "adapter-parser-decode-exit-invalid",
               "export": "parserExitInvalid",
@@ -1218,6 +1283,44 @@
             "size": 32
           },
           "cases": [
+            {
+              "name": "schema-creation-object-2-effect",
+              "export": "effectSchemaCreationObject2",
+              "scenario": "schema-creation-object-2",
+              "implementation": "effect",
+              "operation": "schema",
+              "size": 2
+            },
+            {
+              "name": "schema-creation-object-32-effect",
+              "export": "effectSchemaCreationObject32",
+              "scenario": "schema-creation-object-32",
+              "implementation": "effect",
+              "operation": "schema"
+            },
+            {
+              "name": "schema-creation-object-256-effect",
+              "export": "effectSchemaCreationObject256",
+              "scenario": "schema-creation-object-256",
+              "implementation": "effect",
+              "operation": "schema",
+              "size": 256
+            },
+            {
+              "name": "schema-creation-encoded-record-effect",
+              "export": "effectSchemaCreationEncodedRecord",
+              "scenario": "schema-creation-encoded-record",
+              "implementation": "effect",
+              "operation": "schema"
+            },
+            {
+              "name": "first-make-object-2-effect",
+              "export": "effectFirstMakeObject2",
+              "scenario": "first-make-object-2",
+              "implementation": "effect",
+              "operation": "first-make",
+              "size": 2
+            },
             {
               "name": "schema-creation-template-literal-effect",
               "export": "effectSchemaCreationTemplateLiteral",
@@ -1229,6 +1332,17 @@
               ],
               "size": 5
             },
+            {
+              "name": "schema-creation-template-literal-256-effect",
+              "export": "effectSchemaCreationTemplateLiteral256",
+              "scenario": "schema-creation-template-literal-256",
+              "implementation": "effect",
+              "operation": "schema",
+              "astTags": [
+                "TemplateLiteral"
+              ],
+              "size": 256
+            },
             {
               "name": "first-decode-checked-object-32-effect",
               "export": "effectFirstDecodeCheckedObject32",
@@ -1589,6 +1703,1536 @@
           ]
         }
       ]
+    },
+    {
+      "name": "moltar-parse-safe",
+      "fixtures": [
+        {
+          "file": "suites/moltar/fixtures/interpreted.ts",
+          "defaults": {
+            "tier": 2,
+            "family": "moltar-parse-safe",
+            "implementation": "effect",
+            "operation": "decode-unknown-sync",
+            "astTags": ["Objects", "String", "Number", "Boolean"],
+            "size": "moltar-object"
+          },
+          "cases": [
+            {
+              "name": "effect-valid",
+              "export": "parseValid",
+              "scenario": "moltar-parse-safe-valid",
+              "path": "valid"
+            },
+            {
+              "name": "effect-extra-valid",
+              "export": "parseExtraValid",
+              "scenario": "moltar-parse-safe-extra-valid",
+              "path": "extra-valid"
+            },
+            {
+              "name": "effect-invalid",
+              "export": "parseInvalid",
+              "scenario": "moltar-parse-safe-invalid",
+              "path": "invalid"
+            }
+          ]
+        },
+        {
+          "file": "suites/moltar/fixtures/jit.ts",
+          "defaults": {
+            "tier": 2,
+            "family": "moltar-parse-safe",
+            "implementation": "effect-jit",
+            "operation": "decode-unknown-sync",
+            "astTags": ["Objects", "String", "Number", "Boolean"],
+            "size": "moltar-object"
+          },
+          "cases": [
+            {
+              "name": "effect-jit-valid",
+              "export": "parseValid",
+              "scenario": "moltar-parse-safe-valid",
+              "path": "valid"
+            },
+            {
+              "name": "effect-jit-extra-valid",
+              "export": "parseExtraValid",
+              "scenario": "moltar-parse-safe-extra-valid",
+              "path": "extra-valid"
+            },
+            {
+              "name": "effect-jit-invalid",
+              "export": "parseInvalid",
+              "scenario": "moltar-parse-safe-invalid",
+              "path": "invalid"
+            }
+          ]
+        },
+        {
+          "file": "suites/moltar/fixtures/aot.ts",
+          "defaults": {
+            "tier": 2,
+            "family": "moltar-parse-safe",
+            "implementation": "effect-aot",
+            "operation": "decode-unknown-sync",
+            "astTags": ["Objects", "String", "Number", "Boolean"],
+            "size": "moltar-object"
+          },
+          "cases": [
+            {
+              "name": "effect-aot-valid",
+              "export": "parseValid",
+              "scenario": "moltar-parse-safe-valid",
+              "path": "valid"
+            },
+            {
+              "name": "effect-aot-extra-valid",
+              "export": "parseExtraValid",
+              "scenario": "moltar-parse-safe-extra-valid",
+              "path": "extra-valid"
+            },
+            {
+              "name": "effect-aot-invalid",
+              "export": "parseInvalid",
+              "scenario": "moltar-parse-safe-invalid",
+              "path": "invalid"
+            }
+          ]
+        },
+        {
+          "file": "suites/moltar/fixtures/valibot.ts",
+          "defaults": {
+            "tier": 2,
+            "family": "moltar-parse-safe",
+            "implementation": "valibot",
+            "operation": "parse",
+            "astTags": [],
+            "size": "moltar-object"
+          },
+          "cases": [
+            {
+              "name": "valibot-valid",
+              "export": "parseValid",
+              "scenario": "moltar-parse-safe-valid",
+              "path": "valid"
+            },
+            {
+              "name": "valibot-extra-valid",
+              "export": "parseExtraValid",
+              "scenario": "moltar-parse-safe-extra-valid",
+              "path": "extra-valid"
+            },
+            {
+              "name": "valibot-invalid",
+              "export": "parseInvalid",
+              "scenario": "moltar-parse-safe-invalid",
+              "path": "invalid"
+            }
+          ]
+        },
+        {
+          "file": "suites/moltar/fixtures/zod.ts",
+          "defaults": {
+            "tier": 2,
+            "family": "moltar-parse-safe",
+            "astTags": [],
+            "size": "moltar-object"
+          },
+          "cases": [
+            {
+              "name": "zod-valid",
+              "export": "parseValid",
+              "scenario": "moltar-parse-safe-valid",
+              "implementation": "zod4",
+              "operation": "parse",
+              "path": "valid"
+            },
+            {
+              "name": "zod-extra-valid",
+              "export": "parseExtraValid",
+              "scenario": "moltar-parse-safe-extra-valid",
+              "implementation": "zod4",
+              "operation": "parse",
+              "path": "extra-valid"
+            },
+            {
+              "name": "zod-invalid",
+              "export": "parseInvalid",
+              "scenario": "moltar-parse-safe-invalid",
+              "implementation": "zod4",
+              "operation": "parse",
+              "path": "invalid"
+            },
+            {
+              "name": "zod-jitless-valid",
+              "export": "parseJitlessValid",
+              "scenario": "moltar-parse-safe-valid",
+              "implementation": "zod4-jitless",
+              "operation": "parse-jitless",
+              "path": "valid"
+            },
+            {
+              "name": "zod-jitless-extra-valid",
+              "export": "parseJitlessExtraValid",
+              "scenario": "moltar-parse-safe-extra-valid",
+              "implementation": "zod4-jitless",
+              "operation": "parse-jitless",
+              "path": "extra-valid"
+            },
+            {
+              "name": "zod-jitless-invalid",
+              "export": "parseJitlessInvalid",
+              "scenario": "moltar-parse-safe-invalid",
+              "implementation": "zod4-jitless",
+              "operation": "parse-jitless",
+              "path": "invalid"
+            },
+            {
+              "name": "zod-compiled-valid",
+              "export": "parseCompiledValid",
+              "scenario": "moltar-parse-safe-valid",
+              "implementation": "zod4-compiled",
+              "operation": "parse-compiled",
+              "path": "valid"
+            },
+            {
+              "name": "zod-compiled-extra-valid",
+              "export": "parseCompiledExtraValid",
+              "scenario": "moltar-parse-safe-extra-valid",
+              "implementation": "zod4-compiled",
+              "operation": "parse-compiled",
+              "path": "extra-valid"
+            },
+            {
+              "name": "zod-compiled-invalid",
+              "export": "parseCompiledInvalid",
+              "scenario": "moltar-parse-safe-invalid",
+              "implementation": "zod4-compiled",
+              "operation": "parse-compiled",
+              "path": "invalid"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "moltar-assert-loose",
+      "fixtures": [
+        {
+          "file": "suites/moltar/fixtures/interpreted.ts",
+          "defaults": {
+            "tier": 2,
+            "family": "moltar-assert-loose",
+            "implementation": "effect",
+            "operation": "is",
+            "astTags": ["Objects", "String", "Number", "Boolean"],
+            "size": "moltar-object"
+          },
+          "cases": [
+            {
+              "name": "effect-valid",
+              "export": "isValid",
+              "scenario": "moltar-assert-loose-valid",
+              "path": "valid"
+            },
+            {
+              "name": "effect-extra-valid",
+              "export": "isExtraValid",
+              "scenario": "moltar-assert-loose-extra-valid",
+              "path": "extra-valid"
+            },
+            {
+              "name": "effect-invalid",
+              "export": "isInvalid",
+              "scenario": "moltar-assert-loose-invalid",
+              "path": "invalid"
+            }
+          ]
+        },
+        {
+          "file": "suites/moltar/fixtures/jit.ts",
+          "defaults": {
+            "tier": 2,
+            "family": "moltar-assert-loose",
+            "implementation": "effect-jit",
+            "operation": "is",
+            "astTags": ["Objects", "String", "Number", "Boolean"],
+            "size": "moltar-object"
+          },
+          "cases": [
+            {
+              "name": "effect-jit-valid",
+              "export": "isValid",
+              "scenario": "moltar-assert-loose-valid",
+              "path": "valid"
+            },
+            {
+              "name": "effect-jit-extra-valid",
+              "export": "isExtraValid",
+              "scenario": "moltar-assert-loose-extra-valid",
+              "path": "extra-valid"
+            },
+            {
+              "name": "effect-jit-invalid",
+              "export": "isInvalid",
+              "scenario": "moltar-assert-loose-invalid",
+              "path": "invalid"
+            }
+          ]
+        },
+        {
+          "file": "suites/moltar/fixtures/aot.ts",
+          "defaults": {
+            "tier": 2,
+            "family": "moltar-assert-loose",
+            "implementation": "effect-aot",
+            "operation": "is",
+            "astTags": ["Objects", "String", "Number", "Boolean"],
+            "size": "moltar-object"
+          },
+          "cases": [
+            {
+              "name": "effect-aot-valid",
+              "export": "isValid",
+              "scenario": "moltar-assert-loose-valid",
+              "path": "valid"
+            },
+            {
+              "name": "effect-aot-extra-valid",
+              "export": "isExtraValid",
+              "scenario": "moltar-assert-loose-extra-valid",
+              "path": "extra-valid"
+            },
+            {
+              "name": "effect-aot-invalid",
+              "export": "isInvalid",
+              "scenario": "moltar-assert-loose-invalid",
+              "path": "invalid"
+            }
+          ]
+        },
+        {
+          "file": "suites/moltar/fixtures/valibot.ts",
+          "defaults": {
+            "tier": 2,
+            "family": "moltar-assert-loose",
+            "implementation": "valibot",
+            "operation": "is",
+            "astTags": [],
+            "size": "moltar-object"
+          },
+          "cases": [
+            {
+              "name": "valibot-valid",
+              "export": "isValid",
+              "scenario": "moltar-assert-loose-valid",
+              "path": "valid"
+            },
+            {
+              "name": "valibot-extra-valid",
+              "export": "isExtraValid",
+              "scenario": "moltar-assert-loose-extra-valid",
+              "path": "extra-valid"
+            },
+            {
+              "name": "valibot-invalid",
+              "export": "isInvalid",
+              "scenario": "moltar-assert-loose-invalid",
+              "path": "invalid"
+            }
+          ]
+        },
+        {
+          "file": "suites/moltar/fixtures/zod.ts",
+          "defaults": {
+            "tier": 2,
+            "family": "moltar-assert-loose",
+            "astTags": [],
+            "size": "moltar-object"
+          },
+          "cases": [
+            {
+              "name": "zod-parse-valid",
+              "export": "assertParseValid",
+              "scenario": "moltar-assert-loose-valid",
+              "implementation": "zod4",
+              "operation": "parse-and-assert",
+              "path": "valid"
+            },
+            {
+              "name": "zod-parse-extra-valid",
+              "export": "assertParseExtraValid",
+              "scenario": "moltar-assert-loose-extra-valid",
+              "implementation": "zod4",
+              "operation": "parse-and-assert",
+              "path": "extra-valid"
+            },
+            {
+              "name": "zod-jitless-validate-valid",
+              "export": "isJitlessValid",
+              "scenario": "moltar-assert-loose-valid",
+              "implementation": "zod4-jitless",
+              "operation": "validate-jitless",
+              "path": "valid"
+            },
+            {
+              "name": "zod-jitless-validate-extra-valid",
+              "export": "isJitlessExtraValid",
+              "scenario": "moltar-assert-loose-extra-valid",
+              "implementation": "zod4-jitless",
+              "operation": "validate-jitless",
+              "path": "extra-valid"
+            },
+            {
+              "name": "zod-jitless-validate-invalid",
+              "export": "isJitlessInvalid",
+              "scenario": "moltar-assert-loose-invalid",
+              "implementation": "zod4-jitless",
+              "operation": "validate-jitless",
+              "path": "invalid"
+            },
+            {
+              "name": "zod-validate-valid",
+              "export": "isValid",
+              "scenario": "moltar-assert-loose-valid",
+              "implementation": "zod4-validate",
+              "operation": "validate",
+              "path": "valid"
+            },
+            {
+              "name": "zod-validate-extra-valid",
+              "export": "isExtraValid",
+              "scenario": "moltar-assert-loose-extra-valid",
+              "implementation": "zod4-validate",
+              "operation": "validate",
+              "path": "extra-valid"
+            },
+            {
+              "name": "zod-validate-invalid",
+              "export": "isInvalid",
+              "scenario": "moltar-assert-loose-invalid",
+              "implementation": "zod4-validate",
+              "operation": "validate",
+              "path": "invalid"
+            },
+            {
+              "name": "zod-compiled-valid",
+              "export": "isCompiledValid",
+              "scenario": "moltar-assert-loose-valid",
+              "implementation": "zod4-compiled",
+              "operation": "validate-compiled",
+              "path": "valid"
+            },
+            {
+              "name": "zod-compiled-extra-valid",
+              "export": "isCompiledExtraValid",
+              "scenario": "moltar-assert-loose-extra-valid",
+              "implementation": "zod4-compiled",
+              "operation": "validate-compiled",
+              "path": "extra-valid"
+            },
+            {
+              "name": "zod-compiled-invalid",
+              "export": "isCompiledInvalid",
+              "scenario": "moltar-assert-loose-invalid",
+              "implementation": "zod4-compiled",
+              "operation": "validate-compiled",
+              "path": "invalid"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "compiler-rebuild",
+      "fixtures": [
+        {
+          "file": "suites/compiler-rebuild/fixtures/interpreted.ts",
+          "defaults": {
+            "tier": 1,
+            "family": "interpreted",
+            "implementation": "effect",
+            "astTags": [
+              "Objects",
+              "String",
+              "Number",
+              "Boolean"
+            ],
+            "operation": "decode",
+            "path": "valid",
+            "size": 3
+          },
+          "cases": [
+            {
+              "name": "interpreted-parseValid",
+              "export": "parseValid",
+              "scenario": "compiler-rebuild-parseValid"
+            },
+            {
+              "name": "interpreted-parseExtra",
+              "export": "parseExtra",
+              "scenario": "compiler-rebuild-parseExtra",
+              "size": 4
+            },
+            {
+              "name": "interpreted-parseInvalid",
+              "export": "parseInvalid",
+              "scenario": "compiler-rebuild-parseInvalid",
+              "path": "invalid"
+            },
+            {
+              "name": "interpreted-isValid",
+              "export": "isValid",
+              "scenario": "compiler-rebuild-isValid",
+              "operation": "is"
+            },
+            {
+              "name": "interpreted-isInvalid",
+              "export": "isInvalid",
+              "scenario": "compiler-rebuild-isInvalid",
+              "operation": "is",
+              "path": "invalid"
+            },
+            {
+              "name": "interpreted-encode",
+              "export": "encode",
+              "scenario": "compiler-rebuild-encode",
+              "operation": "encode"
+            },
+            {
+              "name": "interpreted-strict",
+              "export": "strict",
+              "scenario": "compiler-rebuild-strict"
+            },
+            {
+              "name": "interpreted-nested",
+              "export": "nested",
+              "scenario": "compiler-rebuild-nested",
+              "astTags": [
+                "Objects",
+                "Arrays",
+                "String",
+                "Number",
+                "Boolean"
+              ],
+              "size": 2
+            },
+            {
+              "name": "interpreted-array",
+              "export": "array",
+              "scenario": "compiler-rebuild-array",
+              "astTags": [
+                "Arrays",
+                "Objects",
+                "String",
+                "Number",
+                "Boolean"
+              ],
+              "size": 32
+            },
+            {
+              "name": "interpreted-arrayInvalid",
+              "export": "arrayInvalid",
+              "scenario": "compiler-rebuild-arrayInvalid",
+              "path": "invalid",
+              "astTags": [
+                "Arrays",
+                "Objects",
+                "String",
+                "Number",
+                "Boolean"
+              ],
+              "size": 33
+            },
+            {
+              "name": "interpreted-tuple",
+              "export": "tuple",
+              "scenario": "compiler-rebuild-tuple",
+              "astTags": [
+                "Arrays",
+                "String",
+                "Number",
+                "Boolean"
+              ],
+              "size": 34
+            },
+            {
+              "name": "interpreted-record",
+              "export": "record",
+              "scenario": "compiler-rebuild-record",
+              "size": 32
+            },
+            {
+              "name": "interpreted-recordTransformedKeys",
+              "export": "recordTransformedKeys",
+              "scenario": "compiler-rebuild-recordTransformedKeys",
+              "astTags": [
+                "Objects",
+                "String"
+              ],
+              "size": 32
+            },
+            {
+              "name": "interpreted-union",
+              "export": "union",
+              "scenario": "compiler-rebuild-union",
+              "astTags": [
+                "Union",
+                "Objects",
+                "Literal",
+                "Number"
+              ],
+              "size": 8
+            },
+            {
+              "name": "interpreted-oneOf",
+              "export": "oneOf",
+              "scenario": "compiler-rebuild-oneOf",
+              "astTags": [
+                "Union",
+                "Objects",
+                "String",
+                "Number"
+              ],
+              "size": 2
+            },
+            {
+              "name": "interpreted-transform",
+              "export": "transform",
+              "scenario": "compiler-rebuild-transform",
+              "astTags": [
+                "Objects",
+                "String",
+                "Number"
+              ],
+              "size": 32
+            },
+            {
+              "name": "interpreted-transformInvalid",
+              "export": "transformInvalid",
+              "scenario": "compiler-rebuild-transformInvalid",
+              "path": "invalid",
+              "astTags": [
+                "String",
+                "Number"
+              ],
+              "size": 1
+            },
+            {
+              "name": "interpreted-rootTransform",
+              "export": "rootTransform",
+              "scenario": "compiler-rebuild-rootTransform",
+              "astTags": [
+                "String",
+                "Number"
+              ],
+              "size": 1
+            },
+            {
+              "name": "interpreted-middleware",
+              "export": "middleware",
+              "scenario": "compiler-rebuild-middleware"
+            },
+            {
+              "name": "interpreted-recursive",
+              "export": "recursive",
+              "scenario": "compiler-rebuild-recursive",
+              "astTags": [
+                "Objects",
+                "Arrays",
+                "Suspend",
+                "Number"
+              ],
+              "size": 31
+            },
+            {
+              "name": "interpreted-suspendRoot",
+              "export": "suspendRoot",
+              "scenario": "compiler-rebuild-suspendRoot",
+              "astTags": [
+                "Suspend",
+                "Objects",
+                "Number"
+              ],
+              "size": 1
+            },
+            {
+              "name": "interpreted-declaration",
+              "export": "declaration",
+              "scenario": "compiler-rebuild-declaration",
+              "astTags": [
+                "Declaration",
+                "Objects",
+                "String",
+                "Number",
+                "Boolean"
+              ],
+              "size": 32
+            },
+            {
+              "name": "interpreted-makeStruct",
+              "export": "makeStruct",
+              "scenario": "compiler-rebuild-makeStruct",
+              "operation": "make",
+              "astTags": [
+                "Objects",
+                "Number"
+              ],
+              "size": 32
+            },
+            {
+              "name": "interpreted-makeArray",
+              "export": "makeArray",
+              "scenario": "compiler-rebuild-makeArray",
+              "operation": "make",
+              "astTags": [
+                "Arrays",
+                "Objects",
+                "String",
+                "Number",
+                "Boolean"
+              ],
+              "size": 32
+            },
+            {
+              "name": "interpreted-makeUnion",
+              "export": "makeUnion",
+              "scenario": "compiler-rebuild-makeUnion",
+              "operation": "make",
+              "astTags": [
+                "Union",
+                "Objects",
+                "Literal",
+                "Number"
+              ],
+              "size": 8
+            }
+          ]
+        },
+        {
+          "file": "suites/compiler-rebuild/fixtures/jit.ts",
+          "defaults": {
+            "tier": 1,
+            "family": "jit",
+            "implementation": "effect-jit",
+            "astTags": [
+              "Objects",
+              "String",
+              "Number",
+              "Boolean"
+            ],
+            "operation": "decode",
+            "path": "valid",
+            "size": 3
+          },
+          "cases": [
+            {
+              "name": "jit-parseValid",
+              "export": "parseValid",
+              "scenario": "compiler-rebuild-parseValid"
+            },
+            {
+              "name": "jit-parseExtra",
+              "export": "parseExtra",
+              "scenario": "compiler-rebuild-parseExtra",
+              "size": 4
+            },
+            {
+              "name": "jit-parseInvalid",
+              "export": "parseInvalid",
+              "scenario": "compiler-rebuild-parseInvalid",
+              "path": "invalid"
+            },
+            {
+              "name": "jit-isValid",
+              "export": "isValid",
+              "scenario": "compiler-rebuild-isValid",
+              "operation": "is"
+            },
+            {
+              "name": "jit-isInvalid",
+              "export": "isInvalid",
+              "scenario": "compiler-rebuild-isInvalid",
+              "operation": "is",
+              "path": "invalid"
+            },
+            {
+              "name": "jit-encode",
+              "export": "encode",
+              "scenario": "compiler-rebuild-encode",
+              "operation": "encode"
+            },
+            {
+              "name": "jit-strict",
+              "export": "strict",
+              "scenario": "compiler-rebuild-strict"
+            },
+            {
+              "name": "jit-nested",
+              "export": "nested",
+              "scenario": "compiler-rebuild-nested",
+              "astTags": [
+                "Objects",
+                "Arrays",
+                "String",
+                "Number",
+                "Boolean"
+              ],
+              "size": 2
+            },
+            {
+              "name": "jit-array",
+              "export": "array",
+              "scenario": "compiler-rebuild-array",
+              "astTags": [
+                "Arrays",
+                "Objects",
+                "String",
+                "Number",
+                "Boolean"
+              ],
+              "size": 32
+            },
+            {
+              "name": "jit-arrayInvalid",
+              "export": "arrayInvalid",
+              "scenario": "compiler-rebuild-arrayInvalid",
+              "path": "invalid",
+              "astTags": [
+                "Arrays",
+                "Objects",
+                "String",
+                "Number",
+                "Boolean"
+              ],
+              "size": 33
+            },
+            {
+              "name": "jit-tuple",
+              "export": "tuple",
+              "scenario": "compiler-rebuild-tuple",
+              "astTags": [
+                "Arrays",
+                "String",
+                "Number",
+                "Boolean"
+              ],
+              "size": 34
+            },
+            {
+              "name": "jit-record",
+              "export": "record",
+              "scenario": "compiler-rebuild-record",
+              "size": 32
+            },
+            {
+              "name": "jit-recordTransformedKeys",
+              "export": "recordTransformedKeys",
+              "scenario": "compiler-rebuild-recordTransformedKeys",
+              "astTags": [
+                "Objects",
+                "String"
+              ],
+              "size": 32
+            },
+            {
+              "name": "jit-union",
+              "export": "union",
+              "scenario": "compiler-rebuild-union",
+              "astTags": [
+                "Union",
+                "Objects",
+                "Literal",
+                "Number"
+              ],
+              "size": 8
+            },
+            {
+              "name": "jit-oneOf",
+              "export": "oneOf",
+              "scenario": "compiler-rebuild-oneOf",
+              "astTags": [
+                "Union",
+                "Objects",
+                "String",
+                "Number"
+              ],
+              "size": 2
+            },
+            {
+              "name": "jit-transform",
+              "export": "transform",
+              "scenario": "compiler-rebuild-transform",
+              "astTags": [
+                "Objects",
+                "String",
+                "Number"
+              ],
+              "size": 32
+            },
+            {
+              "name": "jit-transformInvalid",
+              "export": "transformInvalid",
+              "scenario": "compiler-rebuild-transformInvalid",
+              "path": "invalid",
+              "astTags": [
+                "String",
+                "Number"
+              ],
+              "size": 1
+            },
+            {
+              "name": "jit-rootTransform",
+              "export": "rootTransform",
+              "scenario": "compiler-rebuild-rootTransform",
+              "astTags": [
+                "String",
+                "Number"
+              ],
+              "size": 1
+            },
+            {
+              "name": "jit-middleware",
+              "export": "middleware",
+              "scenario": "compiler-rebuild-middleware"
+            },
+            {
+              "name": "jit-recursive",
+              "export": "recursive",
+              "scenario": "compiler-rebuild-recursive",
+              "astTags": [
+                "Objects",
+                "Arrays",
+                "Suspend",
+                "Number"
+              ],
+              "size": 31
+            },
+            {
+              "name": "jit-suspendRoot",
+              "export": "suspendRoot",
+              "scenario": "compiler-rebuild-suspendRoot",
+              "astTags": [
+                "Suspend",
+                "Objects",
+                "Number"
+              ],
+              "size": 1
+            },
+            {
+              "name": "jit-declaration",
+              "export": "declaration",
+              "scenario": "compiler-rebuild-declaration",
+              "astTags": [
+                "Declaration",
+                "Objects",
+                "String",
+                "Number",
+                "Boolean"
+              ],
+              "size": 32
+            },
+            {
+              "name": "jit-makeStruct",
+              "export": "makeStruct",
+              "scenario": "compiler-rebuild-makeStruct",
+              "operation": "make",
+              "astTags": [
+                "Objects",
+                "Number"
+              ],
+              "size": 32
+            },
+            {
+              "name": "jit-makeArray",
+              "export": "makeArray",
+              "scenario": "compiler-rebuild-makeArray",
+              "operation": "make",
+              "astTags": [
+                "Arrays",
+                "Objects",
+                "String",
+                "Number",
+                "Boolean"
+              ],
+              "size": 32
+            },
+            {
+              "name": "jit-makeUnion",
+              "export": "makeUnion",
+              "scenario": "compiler-rebuild-makeUnion",
+              "operation": "make",
+              "astTags": [
+                "Union",
+                "Objects",
+                "Literal",
+                "Number"
+              ],
+              "size": 8
+            }
+          ]
+        },
+        {
+          "file": "suites/compiler-rebuild/fixtures/aot.ts",
+          "defaults": {
+            "tier": 1,
+            "family": "aot",
+            "implementation": "effect-aot",
+            "astTags": [
+              "Objects",
+              "String",
+              "Number",
+              "Boolean"
+            ],
+            "operation": "decode",
+            "path": "valid",
+            "size": 3
+          },
+          "cases": [
+            {
+              "name": "aot-parseValid",
+              "export": "parseValid",
+              "scenario": "compiler-rebuild-parseValid"
+            },
+            {
+              "name": "aot-parseExtra",
+              "export": "parseExtra",
+              "scenario": "compiler-rebuild-parseExtra",
+              "size": 4
+            },
+            {
+              "name": "aot-parseInvalid",
+              "export": "parseInvalid",
+              "scenario": "compiler-rebuild-parseInvalid",
+              "path": "invalid"
+            },
+            {
+              "name": "aot-isValid",
+              "export": "isValid",
+              "scenario": "compiler-rebuild-isValid",
+              "operation": "is"
+            },
+            {
+              "name": "aot-isInvalid",
+              "export": "isInvalid",
+              "scenario": "compiler-rebuild-isInvalid",
+              "operation": "is",
+              "path": "invalid"
+            },
+            {
+              "name": "aot-encode",
+              "export": "encode",
+              "scenario": "compiler-rebuild-encode",
+              "operation": "encode"
+            },
+            {
+              "name": "aot-strict",
+              "export": "strict",
+              "scenario": "compiler-rebuild-strict"
+            },
+            {
+              "name": "aot-nested",
+              "export": "nested",
+              "scenario": "compiler-rebuild-nested",
+              "astTags": [
+                "Objects",
+                "Arrays",
+                "String",
+                "Number",
+                "Boolean"
+              ],
+              "size": 2
+            },
+            {
+              "name": "aot-array",
+              "export": "array",
+              "scenario": "compiler-rebuild-array",
+              "astTags": [
+                "Arrays",
+                "Objects",
+                "String",
+                "Number",
+                "Boolean"
+              ],
+              "size": 32
+            },
+            {
+              "name": "aot-arrayInvalid",
+              "export": "arrayInvalid",
+              "scenario": "compiler-rebuild-arrayInvalid",
+              "path": "invalid",
+              "astTags": [
+                "Arrays",
+                "Objects",
+                "String",
+                "Number",
+                "Boolean"
+              ],
+              "size": 33
+            },
+            {
+              "name": "aot-tuple",
+              "export": "tuple",
+              "scenario": "compiler-rebuild-tuple",
+              "astTags": [
+                "Arrays",
+                "String",
+                "Number",
+                "Boolean"
+              ],
+              "size": 34
+            },
+            {
+              "name": "aot-record",
+              "export": "record",
+              "scenario": "compiler-rebuild-record",
+              "size": 32
+            },
+            {
+              "name": "aot-recordTransformedKeys",
+              "export": "recordTransformedKeys",
+              "scenario": "compiler-rebuild-recordTransformedKeys",
+              "astTags": [
+                "Objects",
+                "String"
+              ],
+              "size": 32
+            },
+            {
+              "name": "aot-union",
+              "export": "union",
+              "scenario": "compiler-rebuild-union",
+              "astTags": [
+                "Union",
+                "Objects",
+                "Literal",
+                "Number"
+              ],
+              "size": 8
+            },
+            {
+              "name": "aot-oneOf",
+              "export": "oneOf",
+              "scenario": "compiler-rebuild-oneOf",
+              "astTags": [
+                "Union",
+                "Objects",
+                "String",
+                "Number"
+              ],
+              "size": 2
+            },
+            {
+              "name": "aot-transform",
+              "export": "transform",
+              "scenario": "compiler-rebuild-transform",
+              "astTags": [
+                "Objects",
+                "String",
+                "Number"
+              ],
+              "size": 32
+            },
+            {
+              "name": "aot-transformInvalid",
+              "export": "transformInvalid",
+              "scenario": "compiler-rebuild-transformInvalid",
+              "path": "invalid",
+              "astTags": [
+                "String",
+                "Number"
+              ],
+              "size": 1
+            },
+            {
+              "name": "aot-rootTransform",
+              "export": "rootTransform",
+              "scenario": "compiler-rebuild-rootTransform",
+              "astTags": [
+                "String",
+                "Number"
+              ],
+              "size": 1
+            },
+            {
+              "name": "aot-middleware",
+              "export": "middleware",
+              "scenario": "compiler-rebuild-middleware"
+            },
+            {
+              "name": "aot-recursive",
+              "export": "recursive",
+              "scenario": "compiler-rebuild-recursive",
+              "astTags": [
+                "Objects",
+                "Arrays",
+                "Suspend",
+                "Number"
+              ],
+              "size": 31
+            },
+            {
+              "name": "aot-suspendRoot",
+              "export": "suspendRoot",
+              "scenario": "compiler-rebuild-suspendRoot",
+              "astTags": [
+                "Suspend",
+                "Objects",
+                "Number"
+              ],
+              "size": 1
+            },
+            {
+              "name": "aot-declaration",
+              "export": "declaration",
+              "scenario": "compiler-rebuild-declaration",
+              "astTags": [
+                "Declaration",
+                "Objects",
+                "String",
+                "Number",
+                "Boolean"
+              ],
+              "size": 32
+            },
+            {
+              "name": "aot-makeStruct",
+              "export": "makeStruct",
+              "scenario": "compiler-rebuild-makeStruct",
+              "operation": "make",
+              "astTags": [
+                "Objects",
+                "Number"
+              ],
+              "size": 32
+            },
+            {
+              "name": "aot-makeArray",
+              "export": "makeArray",
+              "scenario": "compiler-rebuild-makeArray",
+              "operation": "make",
+              "astTags": [
+                "Arrays",
+                "Objects",
+                "String",
+                "Number",
+                "Boolean"
+              ],
+              "size": 32
+            },
+            {
+              "name": "aot-makeUnion",
+              "export": "makeUnion",
+              "scenario": "compiler-rebuild-makeUnion",
+              "operation": "make",
+              "astTags": [
+                "Union",
+                "Objects",
+                "Literal",
+                "Number"
+              ],
+              "size": 8
+            }
+          ]
+        },
+        {
+          "file": "suites/compiler-rebuild/fixtures/valibot.ts",
+          "defaults": {
+            "tier": 1,
+            "family": "valibot",
+            "implementation": "valibot",
+            "astTags": [],
+            "operation": "decode",
+            "path": "valid",
+            "size": 3
+          },
+          "cases": [
+            {
+              "name": "valibot-parseValid",
+              "export": "parseValid",
+              "scenario": "compiler-rebuild-parseValid"
+            },
+            {
+              "name": "valibot-parseInvalid",
+              "export": "parseInvalid",
+              "scenario": "compiler-rebuild-parseInvalid",
+              "path": "invalid"
+            },
+            {
+              "name": "valibot-isValid",
+              "export": "isValid",
+              "scenario": "compiler-rebuild-isValid",
+              "operation": "is"
+            },
+            {
+              "name": "valibot-isInvalid",
+              "export": "isInvalid",
+              "scenario": "compiler-rebuild-isInvalid",
+              "operation": "is",
+              "path": "invalid"
+            },
+            {
+              "name": "valibot-array",
+              "export": "array",
+              "scenario": "compiler-rebuild-array",
+              "size": 32
+            },
+            {
+              "name": "valibot-record",
+              "export": "record",
+              "scenario": "compiler-rebuild-record",
+              "size": 32
+            },
+            {
+              "name": "valibot-recordTransformedKeys",
+              "export": "recordTransformedKeys",
+              "scenario": "compiler-rebuild-recordTransformedKeys",
+              "size": 32
+            },
+            {
+              "name": "valibot-union",
+              "export": "union",
+              "scenario": "compiler-rebuild-union",
+              "size": 8
+            },
+            {
+              "name": "valibot-transform",
+              "export": "transform",
+              "scenario": "compiler-rebuild-transform",
+              "size": 32
+            },
+            {
+              "name": "valibot-makeStruct",
+              "export": "makeStruct",
+              "scenario": "compiler-rebuild-makeStruct",
+              "operation": "make",
+              "size": 32
+            },
+            {
+              "name": "valibot-makeArray",
+              "export": "makeArray",
+              "scenario": "compiler-rebuild-makeArray",
+              "operation": "make",
+              "size": 32
+            }
+          ]
+        },
+        {
+          "file": "suites/compiler-rebuild/fixtures/zod-jitless.ts",
+          "defaults": {
+            "tier": 1,
+            "family": "zod-jitless",
+            "implementation": "zod4-jitless",
+            "astTags": [],
+            "operation": "decode",
+            "path": "valid",
+            "size": 3
+          },
+          "cases": [
+            {
+              "name": "zod-jitless-parseValid",
+              "export": "parseValid",
+              "scenario": "compiler-rebuild-parseValid"
+            },
+            {
+              "name": "zod-jitless-parseInvalid",
+              "export": "parseInvalid",
+              "scenario": "compiler-rebuild-parseInvalid",
+              "path": "invalid"
+            },
+            {
+              "name": "zod-jitless-isValid",
+              "export": "isValid",
+              "scenario": "compiler-rebuild-isValid",
+              "operation": "is"
+            },
+            {
+              "name": "zod-jitless-isInvalid",
+              "export": "isInvalid",
+              "scenario": "compiler-rebuild-isInvalid",
+              "operation": "is",
+              "path": "invalid"
+            },
+            {
+              "name": "zod-jitless-array",
+              "export": "array",
+              "scenario": "compiler-rebuild-array",
+              "size": 32
+            },
+            {
+              "name": "zod-jitless-record",
+              "export": "record",
+              "scenario": "compiler-rebuild-record",
+              "size": 32
+            },
+            {
+              "name": "zod-jitless-recordTransformedKeys",
+              "export": "recordTransformedKeys",
+              "scenario": "compiler-rebuild-recordTransformedKeys",
+              "size": 32
+            },
+            {
+              "name": "zod-jitless-union",
+              "export": "union",
+              "scenario": "compiler-rebuild-union",
+              "size": 8
+            },
+            {
+              "name": "zod-jitless-transform",
+              "export": "transform",
+              "scenario": "compiler-rebuild-transform",
+              "size": 32
+            },
+            {
+              "name": "zod-jitless-makeStruct",
+              "export": "makeStruct",
+              "scenario": "compiler-rebuild-makeStruct",
+              "operation": "make",
+              "size": 32
+            },
+            {
+              "name": "zod-jitless-makeArray",
+              "export": "makeArray",
+              "scenario": "compiler-rebuild-makeArray",
+              "operation": "make",
+              "size": 32
+            }
+          ]
+        },
+        {
+          "file": "suites/compiler-rebuild/fixtures/zod-compiled.ts",
+          "defaults": {
+            "tier": 1,
+            "family": "zod-compiled",
+            "implementation": "zod4-compiled",
+            "astTags": [],
+            "operation": "decode",
+            "path": "valid",
+            "size": 3
+          },
+          "cases": [
+            {
+              "name": "zod-compiled-parseValid",
+              "export": "parseValid",
+              "scenario": "compiler-rebuild-parseValid"
+            },
+            {
+              "name": "zod-compiled-parseExtra",
+              "export": "parseExtra",
+              "scenario": "compiler-rebuild-parseExtra",
+              "size": 4
+            },
+            {
+              "name": "zod-compiled-parseInvalid",
+              "export": "parseInvalid",
+              "scenario": "compiler-rebuild-parseInvalid",
+              "path": "invalid"
+            },
+            {
+              "name": "zod-compiled-isValid",
+              "export": "isValid",
+              "scenario": "compiler-rebuild-isValid",
+              "operation": "is"
+            },
+            {
+              "name": "zod-compiled-isInvalid",
+              "export": "isInvalid",
+              "scenario": "compiler-rebuild-isInvalid",
+              "operation": "is",
+              "path": "invalid"
+            },
+            {
+              "name": "zod-compiled-encode",
+              "export": "encode",
+              "scenario": "compiler-rebuild-encode",
+              "operation": "encode"
+            },
+            {
+              "name": "zod-compiled-strict",
+              "export": "strict",
+              "scenario": "compiler-rebuild-strict"
+            },
+            {
+              "name": "zod-compiled-nested",
+              "export": "nested",
+              "scenario": "compiler-rebuild-nested",
+              "size": 2
+            },
+            {
+              "name": "zod-compiled-array",
+              "export": "array",
+              "scenario": "compiler-rebuild-array",
+              "size": 32
+            },
+            {
+              "name": "zod-compiled-arrayInvalid",
+              "export": "arrayInvalid",
+              "scenario": "compiler-rebuild-arrayInvalid",
+              "path": "invalid",
+              "size": 33
+            },
+            {
+              "name": "zod-compiled-record",
+              "export": "record",
+              "scenario": "compiler-rebuild-record",
+              "size": 32
+            },
+            {
+              "name": "zod-compiled-recordTransformedKeys",
+              "export": "recordTransformedKeys",
+              "scenario": "compiler-rebuild-recordTransformedKeys",
+              "size": 32
+            },
+            {
+              "name": "zod-compiled-union",
+              "export": "union",
+              "scenario": "compiler-rebuild-union",
+              "size": 8
+            },
+            {
+              "name": "zod-compiled-transform",
+              "export": "transform",
+              "scenario": "compiler-rebuild-transform",
+              "size": 32
+            },
+            {
+              "name": "zod-compiled-transformInvalid",
+              "export": "transformInvalid",
+              "scenario": "compiler-rebuild-transformInvalid",
+              "path": "invalid",
+              "size": 1
+            },
+            {
+              "name": "zod-compiled-declaration",
+              "export": "declaration",
+              "scenario": "compiler-rebuild-declaration",
+              "size": 32
+            },
+            {
+              "name": "zod-compiled-makeStruct",
+              "export": "makeStruct",
+              "scenario": "compiler-rebuild-makeStruct",
+              "operation": "make",
+              "size": 32
+            },
+            {
+              "name": "zod-compiled-makeArray",
+              "export": "makeArray",
+              "scenario": "compiler-rebuild-makeArray",
+              "operation": "make",
+              "size": 32
+            },
+            {
+              "name": "zod-compiled-makeUnion",
+              "export": "makeUnion",
+              "scenario": "compiler-rebuild-makeUnion",
+              "operation": "make",
+              "size": 8
+            }
+          ]
+        }
+      ]
     }
   ]
 }
diff --git a/repos/effect/packages/effect/runtimeperf/run.mts b/repos/effect/packages/effect/runtimeperf/run.mts
index b97665f60..3cac08601 100644
--- a/repos/effect/packages/effect/runtimeperf/run.mts
+++ b/repos/effect/packages/effect/runtimeperf/run.mts
@@ -18,7 +18,11 @@ import {
   relativeToRepo,
   reportPath,
   resolveDefaults,
+  runPath,
+  scenarioBatchSize,
   selectFixtures,
+  statsPath,
+  utilsPath,
   workerPath,
   writeJson
 } from "./utils.mts"
@@ -31,7 +35,7 @@ Options:
   --warmup-time <ms>
   --tier <0-3>
   --family <name>
-  --implementation <effect|fast-check-v4|valibot|zod4>
+  --implementation <effect|effect-jit|effect-aot|fast-check-v4|valibot|zod4|zod4-jitless|zod4-validate|zod4-compiled>
 `
 
 const rotate = (items, offset) => items.map((_, index) => items[(index + offset) % items.length])
@@ -52,12 +56,12 @@ const main = () => {
 
   for (const [scenario, group] of groups) {
     const calibrations = new Map(group.map((fixture) => [fixture, calibrateFixture(fixture, defaults)]))
+    const batchSize = scenarioBatchSize(group, calibrations)
     const byTarget = new Map(group.map((fixture) => [fixture.target, []]))
 
     for (let round = 0; round < defaults.rounds; round++) {
       for (const fixture of rotate(group, round % group.length)) {
-        const calibration = calibrations.get(fixture)
-        const measurement = measureFixture(fixture, defaults, calibration.batchSize)
+        const measurement = measureFixture(fixture, defaults, batchSize)
         byTarget.get(fixture.target).push(measurement)
         executionOrder.push({ scenario, round: round + 1, target: fixture.target })
       }
@@ -68,7 +72,7 @@ const main = () => {
       const measurements = byTarget.get(fixture.target)
       results.push({
         fixture,
-        batchSize: calibration.batchSize,
+        batchSize,
         calibration,
         measurements,
         aggregate: aggregateMeasurements(measurements)
@@ -81,7 +85,7 @@ const main = () => {
     const effect = group.find((result) => result.fixture.implementation === "effect")
     if (!effect) continue
     for (const candidate of group) {
-      if (candidate === effect) continue
+      if (candidate.fixture.implementation === "effect") continue
       crossLibrary.push({
         scenario,
         implementation: candidate.fixture.implementation,
@@ -116,16 +120,14 @@ const main = () => {
       cpu: os.cpus()[0]?.model ?? "unknown"
     },
     libraries: libraryVersions(),
-    crossLibraryDecodeApis: {
-      effect: "SchemaParser.decodeUnknownExit (SchemaIssue)",
-      valibot: "safeParser",
-      zod4: "safeParse ({ jitless: true })"
-    },
     artifactMode: "repository",
     git: currentGitState(),
     coverage: coverageSummary(selected),
     hashes: {
       config: hashFile(configPath),
+      run: hashFile(runPath),
+      stats: hashFile(statsPath),
+      utils: hashFile(utilsPath),
       worker: hashFile(workerPath),
       fixtures: Object.fromEntries(
         [...new Set(selected.map((fixture) => fixture.fixturePath))]
@@ -140,11 +142,12 @@ const main = () => {
   writeJson(path, report)
   const comparisons = new Map(crossLibrary.map((item) => [`${item.scenario}/${item.implementation}`, item]))
   printTable(
-    ["scenario", "implementation", "ns/op", "mad", "vs Effect"],
+    ["scenario", "family", "implementation", "ns/op", "mad", "vs Effect"],
     results.map((result) => {
       const comparison = comparisons.get(`${result.fixture.scenario}/${result.fixture.implementation}`)
       return [
         result.fixture.scenario,
+        result.fixture.family,
         result.fixture.implementation,
         formatNs(result.aggregate.median),
         formatNs(result.aggregate.mad),
diff --git a/repos/effect/packages/effect/runtimeperf/suites/arbitrary/fixtures/fast-check-v4.ts b/repos/effect/packages/effect/runtimeperf/suites/arbitrary/fixtures/fast-check-v4.ts
index 374da26c4..5418e34f3 100644
--- a/repos/effect/packages/effect/runtimeperf/suites/arbitrary/fixtures/fast-check-v4.ts
+++ b/repos/effect/packages/effect/runtimeperf/suites/arbitrary/fixtures/fast-check-v4.ts
@@ -376,6 +376,33 @@ export const checkPass100 = () => {
   }
 }
 
+export const arrayCheckPass100 = () => {
+  const property = FastCheck.property(FastCheck.array(FastCheck.integer(), { maxLength: 50 }), () => true)
+  return {
+    run: () => FastCheck.check(property, { numRuns: 100, seed }),
+    validate: (result: FastCheck.RunDetails<[Array<number>]>) => {
+      assert.equal(result.failed, false)
+      assert.equal(result.numRuns, 100)
+      assert.equal(result.numSkips, 0)
+    }
+  }
+}
+
+export const arrayCheckFalsifyAndShrink = () => {
+  const arbitrary = FastCheck.array(FastCheck.constantFrom(8, 27, 0, 1), { maxLength: 4 })
+  const property = FastCheck.property(
+    arbitrary,
+    (values) => !(values.includes(27) && values.indexOf(0) > values.indexOf(27))
+  )
+  return {
+    run: () => FastCheck.check(property, { examples: [[[8, 27, 0, 1]]], numRuns: 1, seed }),
+    validate: (result: FastCheck.RunDetails<[Array<number>]>) => {
+      assert.equal(result.failed, true)
+      assert.deepEqual(result.counterexample, [[27, 0]])
+    }
+  }
+}
+
 export const testSchemaVerifyGeneration100 = () => ({
   run: () => {
     const schema = Schema.Int
diff --git a/repos/effect/packages/effect/runtimeperf/suites/arbitrary/fixtures/native.ts b/repos/effect/packages/effect/runtimeperf/suites/arbitrary/fixtures/native.ts
index 79d46504b..99a70d9dd 100644
--- a/repos/effect/packages/effect/runtimeperf/suites/arbitrary/fixtures/native.ts
+++ b/repos/effect/packages/effect/runtimeperf/suites/arbitrary/fixtures/native.ts
@@ -391,6 +391,34 @@ export const checkPass100 = () => {
   }
 }
 
+export const arrayCheckPass100 = () => {
+  const arbitrary = Arbitrary.schema(Schema.Array(Schema.Int))
+  const program = Arbitrary.checkEffect(arbitrary, () => true, { runs: 100, seed, size: 50 })
+  return {
+    run: () => Effect.runSync(program),
+    validate: (result: Arbitrary.CheckResult<ReadonlyArray<number>, never>) => {
+      assert.deepEqual(result, { _tag: "Passed", runs: 100, discards: 0 })
+    }
+  }
+}
+
+export const arrayCheckFalsifyAndShrink = () => {
+  const arbitrary = Arbitrary.schema(Schema.Array(Schema.Literals([8, 27, 0, 1])))
+  const property = (values: ReadonlyArray<number>) => !(values.includes(27) && values.indexOf(0) > values.indexOf(27))
+  const program = Arbitrary.checkEffect(arbitrary, property, { runs: 1, seed: 1967, size: 4 })
+  return {
+    run: () => Effect.runSync(program),
+    validate: (result: Arbitrary.CheckResult<ReadonlyArray<number>, never>) => {
+      assert.equal(result._tag, "Falsified")
+      if (result._tag !== "Falsified") return
+      assert.deepEqual(result.initialInput, [8, 27, 0, 1])
+      // Both revisions must preserve the failure; the regression test checks the new, smaller result.
+      assert.equal(property(result.shrunkInput), false)
+      assert.ok(result.shrunkInput.length <= 3)
+    }
+  }
+}
+
 export const testSchemaVerifyGeneration100 = () => {
   const asserts = new TestSchema.Asserts(Schema.Int)
   return {
diff --git a/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/README.md b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/README.md
new file mode 100644
index 000000000..25997e2c2
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/README.md
@@ -0,0 +1,81 @@
+# Compiler rebuild comparison
+
+The `compiler-rebuild` suite measures 25 public SchemaParser operations with the
+interpreter, selective JIT and generated AOT modules. Nineteen cases also run
+against `z.compile(schema, { strict: true })`; eleven representative cases run
+against Valibot and Zod with `{ jitless: true }`. The fixture families name the
+execution mode. Cases
+cover simple and nested Structs, Arrays, tuples, Records, transformed Record
+keys, anyOf/oneOf Unions, transformations, middleware, recursive and suspended
+schemas, Declarations, construction,
+and successful and failing validation.
+
+The Effect tuple has a trailing element after its rest element, Zod compilation
+does not support recursive schemas or `z.xor`, and Zod has no equivalent
+decoding middleware. Those four cases intentionally have no Zod fixture. Zod
+compilation only accelerates forward parsing, so the encode case measures its
+documented runtime fallback. Zod parsing stands in for Effect construction
+because Zod has no separate constructor operation. Valibot parsing with defaults
+is used for the same comparison.
+
+```sh
+pnpm runtimeperf-compare compiler-rebuild --base schema-compiler
+pnpm runtimeperf-compare compiler-rebuild --base main --family interpreted
+pnpm runtimeperf compiler-rebuild
+```
+
+The first command compares the current working tree with the archived compiler
+branch. The second isolates changes to interpreted parsing against main. Schema
+and parser construction are outside the steady-state measurements. AOT fixtures
+generate their version-specific module in a separate process before loading it.
+
+The standard paired harness records five alternating rounds, validates every
+fixture before and after measurement, uses a common batch within each pair, and
+reports bootstrap confidence intervals. Cross-mode rankings are descriptive;
+the paired base/head comparison is the regression evidence.
+
+## Retained heap and first use
+
+For a current cross-library comparison of retained heap, V8 code memory, peak
+RSS and preparation CPU, run:
+
+```sh
+node packages/effect/runtimeperf/suites/compiler-rebuild/run-resources.mts \
+  tmp/schema-compiler-resources.json 5 100,500
+node packages/effect/runtimeperf/suites/compiler-rebuild/report-resources.mts \
+  tmp/schema-compiler-resources.json
+```
+
+Each sample runs in a fresh process. The report calculates median per-schema
+slopes between 100 and 500 distinct schemas, which removes fixed module and
+lazy initialization costs. Fixture inputs are released before retained-memory
+measurement. Preparation CPU includes adapter creation and first use; AOT also
+includes loading and installing the generated module. AOT source generation is
+reported separately because it runs at build time. Hot synchronous CPU is
+already represented by the normal runtime measurements.
+
+The older Effect-only probe below remains available for comparisons with its
+existing archived results.
+
+The standalone cost probe accepts a checkout root, mode, operation, shape and
+schema count. Run several fresh processes per combination and alternate the
+checkout order. Supported modes are `interpreted`, `jit` and `aot`; operations
+are `decode`, `invalid`, `is` and `make`; shapes are `struct`, `array`, `transform`
+and `default`.
+
+```sh
+node --expose-gc packages/effect/runtimeperf/suites/compiler-rebuild/costs.mts heap "$PWD" jit decode struct 500
+node --expose-gc packages/effect/runtimeperf/suites/compiler-rebuild/costs.mts cold "$PWD" jit decode struct 500
+```
+
+Heap measurements exclude schema construction and module imports, and retain
+both schema objects and public parser functions. They include operation setup
+and first use. Forced GC removes transient parse output and issues. The AOT
+generator runs in a separate process, so its retained heap is not attributed to
+the runtime application.
+
+First-use measurements include constructing a fresh schema, installing its
+compiler when requested, creating a public parser and calling it. They exclude
+module imports and AOT source generation. Repeated shapes can benefit from V8's
+source cache, so this is not process startup latency. Treat these timing probes
+as exploratory, separately from the paired throughput results.
diff --git a/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/costs.mts b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/costs.mts
new file mode 100644
index 000000000..1280c9921
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/costs.mts
@@ -0,0 +1,127 @@
+import assert from "node:assert/strict"
+import { execFileSync } from "node:child_process"
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs"
+import { join } from "node:path"
+import { fileURLToPath, pathToFileURL } from "node:url"
+
+const [command, root, mode, operation, shape = "struct", countString = "500"] = process.argv.slice(2)
+const count = Number(countString)
+const includes = (values: ReadonlyArray<string>, value: string | undefined) =>
+  value !== undefined && values.includes(value)
+if (command !== "heap" && command !== "cold" && command !== "generate") {
+  throw new Error("command must be heap, cold or generate")
+}
+if (root === undefined) throw new Error("root is required")
+if (!includes(["interpreted", "jit", "aot"], mode)) {
+  throw new Error("mode must be interpreted, jit or aot")
+}
+if (!includes(["decode", "invalid", "is", "make"], operation)) {
+  throw new Error("operation must be decode, invalid, is or make")
+}
+if (!includes(["struct", "array", "transform", "default"], shape)) {
+  throw new Error("shape must be struct, array, transform or default")
+}
+if (!Number.isSafeInteger(count) || count <= 0) throw new Error("count must be a positive integer")
+const load = (path: string) => import(pathToFileURL(join(root, "packages/effect/src", path + ".ts")).href)
+const Schema = await load("Schema")
+const Parser = await load("SchemaParser")
+const AST = await load("SchemaAST")
+const Effect = await load("Effect")
+const create = () => {
+  const struct = Schema.Struct({ name: Schema.String, age: Schema.Number, active: Schema.Boolean })
+  return shape === "array" ? Schema.Array(struct)
+    : shape === "transform" ? Schema.Struct({ value: Schema.NumberFromString })
+    : shape === "default" ? Schema.Struct({ value: Schema.Number.pipe(Schema.withConstructorDefault(Effect.succeed(1))) })
+    : struct
+}
+const valid = shape === "array" ? Array.from({ length: 32 }, () => ({ name: "Ada", age: 37, active: true }))
+  : shape === "transform" ? { value: "1" }
+  : shape === "default" ? { value: 1 }
+  : { name: "Ada", age: 37, active: true }
+const typeValid = shape === "transform" ? { value: 1 } : valid
+const input = operation === "invalid" ? { name: "Ada", age: "bad", active: true }
+  : operation === "make" && shape === "default" ? {}
+  : operation === "make" || operation === "is" ? typeValid
+  : valid
+const expected = shape === "transform" || shape === "default" ? { value: 1 } : valid
+
+if (command === "generate") {
+  const AOT = await load("unstable/schema/SchemaAOTCompiler")
+  const schema = create()
+  const targetOperation = operation === "make" ? "make" : operation === "is" ? "is" : "decode"
+  const ast = targetOperation === "decode" ? schema.ast : AST.toType(schema.ast)
+  writeFileSync(process.argv[8], AOT.compile([{ ast, operations: [targetOperation] }]))
+} else {
+  for (let i = 0; i < 5; i++) globalThis.gc?.()
+  const beforeImport = process.memoryUsage().heapUsed
+  let enable: ((ast: unknown) => void) | undefined
+  let install: ((asts: Array<unknown>) => void) | undefined
+  let directory: string | undefined
+  if (mode === "jit") {
+    enable = (await load("unstable/schema/SchemaJITCompiler")).enable
+  } else if (mode === "aot") {
+    directory = mkdtempSync(join(root, "packages/effect/.compiler-memory-"))
+    const generated = join(directory, "generated.mjs")
+    execFileSync(process.execPath, [fileURLToPath(import.meta.url), "generate", root, mode, operation, shape, countString, generated])
+    install = (await import(pathToFileURL(generated).href)).install
+  }
+  for (let i = 0; i < 5; i++) globalThis.gc?.()
+  const moduleBytes = process.memoryUsage().heapUsed - beforeImport
+  const prepare = (schema: any) => {
+    const ast = operation === "make" || operation === "is" ? AST.toType(schema.ast) : schema.ast
+    if (enable) enable(ast)
+    if (install) install([ast])
+    return operation === "make" ? Parser.make(schema)
+      : operation === "is" ? Parser.is(schema)
+      : Parser.decodeUnknownSync(schema)
+  }
+  const run = (parse: (input: unknown) => unknown) => {
+    try {
+      return parse(input)
+    } catch (error) {
+      if (operation !== "invalid") throw error
+      return error
+    }
+  }
+  const validate = (value: unknown) => {
+    if (operation === "invalid") {
+      assert.ok(value instanceof Error)
+      assert.equal(value.message, "Schema validation failed")
+      assert.equal("cause" in value, true)
+    }
+    else if (operation === "is") assert.equal(value, true)
+    else assert.deepEqual(value, expected)
+  }
+  try {
+    for (let i = 0; i < 20; i++) validate(run(prepare(create())))
+    if (command === "heap") {
+      assert.equal(typeof globalThis.gc, "function")
+      const schemas = Array.from({ length: count }, create)
+      for (let i = 0; i < 5; i++) globalThis.gc!()
+      const before = process.memoryUsage().heapUsed
+      const parsers = schemas.map((schema) => {
+        const parse = prepare(schema)
+        validate(run(parse))
+        return parse
+      })
+      for (let i = 0; i < 5; i++) globalThis.gc!()
+      const after = process.memoryUsage().heapUsed
+      // Keep schemas and adapters alive across the measurement.
+      assert.equal(parsers.length, count)
+      assert.equal(schemas.length, count)
+      process.stdout.write(JSON.stringify({ mode, operation, shape, count, moduleBytes, bytesPerSchema: (after - before) / count }))
+    } else if (command === "cold") {
+      const samples = []
+      for (let round = 0; round < 7; round++) {
+        let value: unknown
+        const start = process.hrtime.bigint()
+        for (let i = 0; i < count; i++) value = run(prepare(create()))
+        samples.push(Number(process.hrtime.bigint() - start) / count)
+        validate(value)
+      }
+      process.stdout.write(JSON.stringify({ mode, operation, shape, count, nsPerSchema: samples }))
+    }
+  } finally {
+    if (directory) rmSync(directory, { recursive: true, force: true })
+  }
+}
diff --git a/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/aot.ts b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/aot.ts
new file mode 100644
index 000000000..cb95c7d3f
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/aot.ts
@@ -0,0 +1,39 @@
+import { execFileSync } from "node:child_process"
+import { mkdtempSync, rmSync } from "node:fs"
+import { join } from "node:path"
+import { fileURLToPath, pathToFileURL } from "node:url"
+import { fixture, roots } from "./cases.ts"
+const directory = mkdtempSync(fileURLToPath(new URL("./.aot-", import.meta.url)))
+try {
+  const file = join(directory, "generated.mjs")
+  execFileSync(process.execPath, [fileURLToPath(new URL("./generate.mts", import.meta.url)), file])
+  const generated = await import(pathToFileURL(file).href)
+  generated.install(roots)
+} finally {
+  rmSync(directory, { recursive: true, force: true })
+}
+export const parseValid = () => fixture("parseValid")
+export const parseExtra = () => fixture("parseExtra")
+export const parseInvalid = () => fixture("parseInvalid")
+export const isValid = () => fixture("isValid")
+export const isInvalid = () => fixture("isInvalid")
+export const encode = () => fixture("encode")
+export const strict = () => fixture("strict")
+export const nested = () => fixture("nested")
+export const array = () => fixture("array")
+export const arrayInvalid = () => fixture("arrayInvalid")
+export const tuple = () => fixture("tuple")
+export const record = () => fixture("record")
+export const recordTransformedKeys = () => fixture("recordTransformedKeys")
+export const union = () => fixture("union")
+export const oneOf = () => fixture("oneOf")
+export const transform = () => fixture("transform")
+export const transformInvalid = () => fixture("transformInvalid")
+export const rootTransform = () => fixture("rootTransform")
+export const middleware = () => fixture("middleware")
+export const recursive = () => fixture("recursive")
+export const suspendRoot = () => fixture("suspendRoot")
+export const declaration = () => fixture("declaration")
+export const makeStruct = () => fixture("makeStruct")
+export const makeArray = () => fixture("makeArray")
+export const makeUnion = () => fixture("makeUnion")
diff --git a/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/cases.ts b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/cases.ts
new file mode 100644
index 000000000..16e22ae4f
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/cases.ts
@@ -0,0 +1,143 @@
+import * as Effect from "effect/Effect"
+import * as Schema from "effect/Schema"
+import * as SchemaAST from "effect/SchemaAST"
+import * as SchemaParser from "effect/SchemaParser"
+import * as SchemaTransformation from "effect/SchemaTransformation"
+import assert from "node:assert/strict"
+
+export const person = () => Schema.Struct({ name: Schema.String, age: Schema.Number, active: Schema.Boolean })
+export const input = { name: "Ada", age: 37, active: true }
+const small = person()
+const nested = Schema.Struct({ user: person(), tags: Schema.Array(Schema.String) })
+const array = Schema.Array(person())
+const arrayInput = Array.from({ length: 32 }, () => ({ ...input }))
+const tuple = Schema.TupleWithRest(Schema.Tuple([Schema.String]), [Schema.Number, Schema.Boolean])
+const tupleInput = ["head", ...Array.from({ length: 32 }, (_, i) => i), true]
+const record = Schema.Record(Schema.String, person())
+const recordInput = Object.fromEntries(arrayInput.map((value, i) => [String(i), value]))
+const transformedKeyRecord = Schema.Record(
+  Schema.String.pipe(Schema.decode(SchemaTransformation.snakeToCamel())),
+  Schema.String
+)
+const transformedKeyRecordInput = Object.fromEntries(
+  Array.from({ length: 32 }, (_, index) => [`field_${index}_value`, `value${index}`])
+)
+const transformedKeyRecordOutput = Object.fromEntries(
+  Array.from({ length: 32 }, (_, index) => [`field${index}Value`, `value${index}`])
+)
+const union = Schema.Union(
+  Array.from({ length: 8 }, (_, i) => Schema.Struct({ tag: Schema.Literal(i), value: Schema.Number }))
+)
+const oneOf = Schema.Union([Schema.Struct({ a: Schema.String }), Schema.Struct({ b: Schema.Number })], {
+  mode: "oneOf"
+})
+const fields = Object.fromEntries(Array.from({ length: 32 }, (_, i) => [`v${i}`, Schema.NumberFromString]))
+const transformed = Schema.Struct(fields)
+const transformedInput = Object.fromEntries(Array.from({ length: 32 }, (_, i) => [`v${i}`, String(i)]))
+const transformedOutput = Object.fromEntries(Array.from({ length: 32 }, (_, i) => [`v${i}`, i]))
+const checkedTransform = Schema.String.pipe(
+  Schema.decodeTo(
+    Schema.Number.check(Schema.isGreaterThan(0)),
+    SchemaTransformation.transform({ decode: Number, encode: String })
+  )
+)
+const rootTransform = Schema.FiniteFromString
+const middleware = small.pipe(Schema.middlewareDecoding((effect) => effect))
+const declaration = Schema.ReadonlySet(person())
+const declarationInput = new Set(arrayInput)
+interface Node {
+  readonly value: number
+  readonly children: ReadonlyArray<Node>
+}
+const recursive: Schema.Codec<Node> = Schema.Struct({
+  value: Schema.Number,
+  children: Schema.Array(Schema.suspend(() => recursive))
+})
+const node = (depth: number): Node => ({
+  value: depth,
+  children: depth === 0 ? [] : [node(depth - 1), node(depth - 1)]
+})
+const recursiveInput = node(4)
+const suspendRoot = Schema.suspend(() => Schema.Struct({ value: Schema.Number }))
+const defaults = Schema.Struct(
+  Object.fromEntries(
+    Array.from(
+      { length: 32 },
+      (_, i) => [`v${i}`, Schema.Number.pipe(Schema.withConstructorDefault(Effect.succeed(i)))]
+    )
+  )
+)
+
+type Case = {
+  schema: Schema.Constraint
+  input: unknown
+  expected: unknown
+  operation?: "is" | "make" | "encode"
+  invalid?: boolean
+  options?: SchemaAST.ParseOptions
+}
+
+export const cases: Record<string, Case> = {
+  parseValid: { schema: small, input, expected: input },
+  parseExtra: { schema: small, input: { ...input, extra: 1 }, expected: input },
+  parseInvalid: { schema: small, input: { ...input, age: "bad" }, expected: true, invalid: true },
+  isValid: { schema: small, input, expected: true, operation: "is" },
+  isInvalid: { schema: small, input: { ...input, age: "bad" }, expected: false, operation: "is" },
+  encode: { schema: small, input, expected: input, operation: "encode" },
+  strict: { schema: small, input, expected: input, options: { onExcessProperty: "error" } },
+  nested: { schema: nested, input: { user: input, tags: ["a", "b"] }, expected: { user: input, tags: ["a", "b"] } },
+  array: { schema: array, input: arrayInput, expected: arrayInput },
+  arrayInvalid: { schema: array, input: [...arrayInput, { ...input, age: "bad" }], expected: true, invalid: true },
+  tuple: { schema: tuple, input: tupleInput, expected: tupleInput },
+  record: { schema: record, input: recordInput, expected: recordInput },
+  recordTransformedKeys: {
+    schema: transformedKeyRecord,
+    input: transformedKeyRecordInput,
+    expected: transformedKeyRecordOutput
+  },
+  union: { schema: union, input: { tag: 7, value: 1 }, expected: { tag: 7, value: 1 } },
+  oneOf: { schema: oneOf, input: { b: 1 }, expected: { b: 1 } },
+  transform: { schema: transformed, input: transformedInput, expected: transformedOutput },
+  transformInvalid: { schema: checkedTransform, input: "-1", expected: true, invalid: true },
+  rootTransform: { schema: rootTransform, input: "123", expected: 123 },
+  middleware: { schema: middleware, input, expected: input },
+  recursive: { schema: recursive, input: recursiveInput, expected: recursiveInput },
+  suspendRoot: { schema: suspendRoot, input: { value: 1 }, expected: { value: 1 } },
+  declaration: { schema: declaration, input: declarationInput, expected: declarationInput },
+  makeStruct: { schema: defaults, input: {}, expected: transformedOutput, operation: "make" },
+  makeArray: { schema: array, input: arrayInput, expected: arrayInput, operation: "make" },
+  makeUnion: { schema: union, input: { tag: 7, value: 1 }, expected: { tag: 7, value: 1 }, operation: "make" }
+}
+
+export const targets = Object.values(cases).map(({ operation, schema }) =>
+  operation === "encode"
+    ? { ast: SchemaAST.flip(schema.ast), operations: ["decode"] as const }
+    : operation === "is" || operation === "make"
+    ? { ast: SchemaAST.toType(schema.ast), operations: [operation] as const }
+    : { ast: schema.ast, operations: ["decode"] as const }
+)
+export const roots = targets.map((target) => target.ast)
+
+export const fixture = (name: string) => {
+  const { schema, input, expected, operation, invalid, options } = cases[name]
+  const parse = operation === "is" ?
+    SchemaParser.is(schema)
+    : operation === "make" ?
+    SchemaParser.make(schema)
+    : operation === "encode" ?
+    SchemaParser.encodeUnknownSync(schema as Schema.ConstraintEncoder<unknown>)
+    : SchemaParser.decodeUnknownSync(schema as Schema.ConstraintDecoder<unknown>, options)
+  return {
+    run: invalid ?
+      () => {
+        try {
+          parse(input)
+          return false
+        } catch {
+          return true
+        }
+      } :
+      () => parse(input),
+    validate: (result: unknown) => assert.deepEqual(result, expected)
+  }
+}
diff --git a/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/generate.mts b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/generate.mts
new file mode 100644
index 000000000..defdd093e
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/generate.mts
@@ -0,0 +1,5 @@
+import { writeFileSync } from "node:fs"
+import { compile } from "effect/unstable/schema/SchemaAOTCompiler"
+import { targets } from "./cases.ts"
+
+writeFileSync(process.argv[2], compile(targets))
diff --git a/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/interpreted.ts b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/interpreted.ts
new file mode 100644
index 000000000..8412c30a9
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/interpreted.ts
@@ -0,0 +1,26 @@
+import { fixture } from "./cases.ts"
+export const parseValid = () => fixture("parseValid")
+export const parseExtra = () => fixture("parseExtra")
+export const parseInvalid = () => fixture("parseInvalid")
+export const isValid = () => fixture("isValid")
+export const isInvalid = () => fixture("isInvalid")
+export const encode = () => fixture("encode")
+export const strict = () => fixture("strict")
+export const nested = () => fixture("nested")
+export const array = () => fixture("array")
+export const arrayInvalid = () => fixture("arrayInvalid")
+export const tuple = () => fixture("tuple")
+export const record = () => fixture("record")
+export const recordTransformedKeys = () => fixture("recordTransformedKeys")
+export const union = () => fixture("union")
+export const oneOf = () => fixture("oneOf")
+export const transform = () => fixture("transform")
+export const transformInvalid = () => fixture("transformInvalid")
+export const rootTransform = () => fixture("rootTransform")
+export const middleware = () => fixture("middleware")
+export const recursive = () => fixture("recursive")
+export const suspendRoot = () => fixture("suspendRoot")
+export const declaration = () => fixture("declaration")
+export const makeStruct = () => fixture("makeStruct")
+export const makeArray = () => fixture("makeArray")
+export const makeUnion = () => fixture("makeUnion")
diff --git a/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/jit.ts b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/jit.ts
new file mode 100644
index 000000000..8c4894735
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/jit.ts
@@ -0,0 +1,28 @@
+import { enable } from "effect/unstable/schema/SchemaJITCompiler"
+import { fixture, roots } from "./cases.ts"
+for (const ast of roots) enable(ast)
+export const parseValid = () => fixture("parseValid")
+export const parseExtra = () => fixture("parseExtra")
+export const parseInvalid = () => fixture("parseInvalid")
+export const isValid = () => fixture("isValid")
+export const isInvalid = () => fixture("isInvalid")
+export const encode = () => fixture("encode")
+export const strict = () => fixture("strict")
+export const nested = () => fixture("nested")
+export const array = () => fixture("array")
+export const arrayInvalid = () => fixture("arrayInvalid")
+export const tuple = () => fixture("tuple")
+export const record = () => fixture("record")
+export const recordTransformedKeys = () => fixture("recordTransformedKeys")
+export const union = () => fixture("union")
+export const oneOf = () => fixture("oneOf")
+export const transform = () => fixture("transform")
+export const transformInvalid = () => fixture("transformInvalid")
+export const rootTransform = () => fixture("rootTransform")
+export const middleware = () => fixture("middleware")
+export const recursive = () => fixture("recursive")
+export const suspendRoot = () => fixture("suspendRoot")
+export const declaration = () => fixture("declaration")
+export const makeStruct = () => fixture("makeStruct")
+export const makeArray = () => fixture("makeArray")
+export const makeUnion = () => fixture("makeUnion")
diff --git a/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/valibot.ts b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/valibot.ts
new file mode 100644
index 000000000..e729d5fff
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/valibot.ts
@@ -0,0 +1,93 @@
+import * as Str from "effect/String"
+import assert from "node:assert/strict"
+import * as v from "valibot"
+
+const person = () => v.object({ name: v.string(), age: v.number(), active: v.boolean() })
+const input = { name: "Ada", age: 37, active: true }
+const small = person()
+const arraySchema = v.array(person())
+const arrayInput = Array.from({ length: 32 }, () => ({ ...input }))
+const recordSchema = v.record(v.string(), person())
+const recordInput = Object.fromEntries(arrayInput.map((value, i) => [String(i), value]))
+const transformedKeyRecordSchema = v.record(
+  v.pipe(v.string(), v.transform(Str.snakeToCamel)),
+  v.string()
+)
+const transformedKeyRecordInput = Object.fromEntries(
+  Array.from({ length: 32 }, (_, i) => [`field_${i}_value`, String(i)])
+)
+const transformedKeyRecordOutput = Object.fromEntries(
+  Array.from({ length: 32 }, (_, i) => [`field${i}Value`, String(i)])
+)
+const unionSchema = v.variant(
+  "tag",
+  Array.from({ length: 8 }, (_, i) => v.object({ tag: v.literal(i), value: v.number() }))
+)
+const transformedSchema = v.object(
+  Object.fromEntries(
+    Array.from({ length: 32 }, (_, i) => [`v${i}`, v.pipe(v.string(), v.transform(Number))])
+  )
+)
+const transformedInput = Object.fromEntries(Array.from({ length: 32 }, (_, i) => [`v${i}`, String(i)]))
+const transformedOutput = Object.fromEntries(Array.from({ length: 32 }, (_, i) => [`v${i}`, i]))
+const defaultsSchema = v.object(
+  Object.fromEntries(Array.from({ length: 32 }, (_, i) => [`v${i}`, v.optional(v.number(), i)]))
+)
+
+type Case = {
+  readonly schema: v.BaseSchema<unknown, unknown, v.BaseIssue<unknown>>
+  readonly input: unknown
+  readonly expected: unknown
+  readonly operation?: "is" | "make"
+  readonly invalid?: boolean
+}
+
+const cases: Record<string, Case> = {
+  parseValid: { schema: small, input, expected: input },
+  parseInvalid: { schema: small, input: { ...input, age: "bad" }, expected: true, invalid: true },
+  isValid: { schema: small, input, expected: true, operation: "is" },
+  isInvalid: { schema: small, input: { ...input, age: "bad" }, expected: false, operation: "is" },
+  array: { schema: arraySchema, input: arrayInput, expected: arrayInput },
+  record: { schema: recordSchema, input: recordInput, expected: recordInput },
+  recordTransformedKeys: {
+    schema: transformedKeyRecordSchema,
+    input: transformedKeyRecordInput,
+    expected: transformedKeyRecordOutput
+  },
+  union: { schema: unionSchema, input: { tag: 7, value: 1 }, expected: { tag: 7, value: 1 } },
+  transform: { schema: transformedSchema, input: transformedInput, expected: transformedOutput },
+  makeStruct: { schema: defaultsSchema, input: {}, expected: transformedOutput, operation: "make" },
+  makeArray: { schema: arraySchema, input: arrayInput, expected: arrayInput, operation: "make" }
+}
+
+const fixture = (name: string) => {
+  const { schema, input, expected, operation, invalid } = cases[name]
+  const parse = operation === "is"
+    ? (input: unknown) => v.is(schema, input)
+    : (input: unknown) => v.parse(schema, input)
+  return {
+    run: invalid
+      ? () => {
+        try {
+          parse(input)
+          return false
+        } catch {
+          return true
+        }
+      }
+      : () => parse(input),
+    validate: (result: unknown) => assert.deepEqual(result, expected)
+  }
+}
+
+export const parseValid = () => fixture("parseValid")
+export const parseInvalid = () => fixture("parseInvalid")
+export const isValid = () => fixture("isValid")
+export const isInvalid = () => fixture("isInvalid")
+export const array = () => fixture("array")
+export const record = () => fixture("record")
+export const recordTransformedKeys = () => fixture("recordTransformedKeys")
+export const union = () => fixture("union")
+export const transform = () => fixture("transform")
+export const makeStruct = () => fixture("makeStruct")
+export const makeArray = () => fixture("makeArray")
diff --git a/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/zod-cases.ts b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/zod-cases.ts
new file mode 100644
index 000000000..b2e271b59
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/zod-cases.ts
@@ -0,0 +1,133 @@
+import * as Str from "effect/String"
+import assert from "node:assert/strict"
+import * as z from "zod/v4"
+
+const person = () => z.object({ name: z.string(), age: z.number(), active: z.boolean() })
+const input = { name: "Ada", age: 37, active: true }
+const small = person()
+const nestedSchema = z.object({ user: person(), tags: z.array(z.string()) })
+const arraySchema = z.array(person())
+const arrayInput = Array.from({ length: 32 }, () => ({ ...input }))
+const recordSchema = z.record(z.string(), person())
+const recordInput = Object.fromEntries(arrayInput.map((value, i) => [String(i), value]))
+const transformedKeyRecordSchema = z.record(
+  z.string().overwrite(Str.snakeToCamel),
+  z.string()
+)
+const transformedKeyRecordInput = Object.fromEntries(
+  Array.from({ length: 32 }, (_, i) => [`field_${i}_value`, String(i)])
+)
+const transformedKeyRecordOutput = Object.fromEntries(
+  Array.from({ length: 32 }, (_, i) => [`field${i}Value`, String(i)])
+)
+const unionSchema = z.union(
+  Array.from({ length: 8 }, (_, i) => z.object({ tag: z.literal(i), value: z.number() })) as [
+    z.ZodObject,
+    z.ZodObject,
+    ...Array<z.ZodObject>
+  ]
+)
+const fields = Object.fromEntries(
+  Array.from({ length: 32 }, (_, i) => [`v${i}`, z.string().transform(Number)])
+)
+const transformedSchema = z.object(fields)
+const transformedInput = Object.fromEntries(Array.from({ length: 32 }, (_, i) => [`v${i}`, String(i)]))
+const transformedOutput = Object.fromEntries(Array.from({ length: 32 }, (_, i) => [`v${i}`, i]))
+const checkedTransform = z.string().transform(Number).pipe(z.number().positive())
+const declarationSchema = z.set(person())
+const declarationInput = new Set(arrayInput)
+const defaultsSchema = z.object(
+  Object.fromEntries(Array.from({ length: 32 }, (_, i) => [`v${i}`, z.number().default(i)]))
+)
+
+type Case = {
+  readonly schema: z.ZodType
+  readonly input: unknown
+  readonly expected: unknown
+  readonly operation?: "is" | "make" | "encode"
+  readonly invalid?: boolean
+}
+
+const cases: Record<string, Case> = {
+  parseValid: { schema: small, input, expected: input },
+  parseExtra: { schema: small, input: { ...input, extra: 1 }, expected: input },
+  parseInvalid: { schema: small, input: { ...input, age: "bad" }, expected: true, invalid: true },
+  isValid: { schema: small, input, expected: true, operation: "is" },
+  isInvalid: { schema: small, input: { ...input, age: "bad" }, expected: false, operation: "is" },
+  encode: { schema: small, input, expected: input, operation: "encode" },
+  strict: {
+    schema: z.strictObject({ name: z.string(), age: z.number(), active: z.boolean() }),
+    input,
+    expected: input
+  },
+  nested: {
+    schema: nestedSchema,
+    input: { user: input, tags: ["a", "b"] },
+    expected: { user: input, tags: ["a", "b"] }
+  },
+  array: { schema: arraySchema, input: arrayInput, expected: arrayInput },
+  arrayInvalid: {
+    schema: arraySchema,
+    input: [...arrayInput, { ...input, age: "bad" }],
+    expected: true,
+    invalid: true
+  },
+  record: { schema: recordSchema, input: recordInput, expected: recordInput },
+  recordTransformedKeys: {
+    schema: transformedKeyRecordSchema,
+    input: transformedKeyRecordInput,
+    expected: transformedKeyRecordOutput
+  },
+  union: { schema: unionSchema, input: { tag: 7, value: 1 }, expected: { tag: 7, value: 1 } },
+  transform: { schema: transformedSchema, input: transformedInput, expected: transformedOutput },
+  transformInvalid: { schema: checkedTransform, input: "-1", expected: true, invalid: true },
+  declaration: { schema: declarationSchema, input: declarationInput, expected: declarationInput },
+  makeStruct: { schema: defaultsSchema, input: {}, expected: transformedOutput, operation: "make" },
+  makeArray: { schema: arraySchema, input: arrayInput, expected: arrayInput, operation: "make" },
+  makeUnion: {
+    schema: unionSchema,
+    input: { tag: 7, value: 1 },
+    expected: { tag: 7, value: 1 },
+    operation: "make"
+  }
+}
+
+const makeFixture = (
+  { input, expected, invalid }: Case,
+  parse: (input: unknown) => unknown
+) => {
+  return {
+    run: invalid ?
+      () => {
+        try {
+          parse(input)
+          return false
+        } catch {
+          return true
+        }
+      } :
+      () => parse(input),
+    validate: (result: unknown) => assert.deepEqual(result, expected)
+  }
+}
+
+export const compiledFixture = (name: string) => {
+  const value = cases[name]
+  const schema = z.compile(value.schema, { strict: true })
+  const parse = value.operation === "is" ?
+    (input: unknown) => z.validate(schema, input)
+    : value.operation === "encode" ?
+    (input: unknown) => z.encode(schema, input)
+    : (input: unknown) => schema.parse(input)
+  return makeFixture(value, parse)
+}
+
+export const jitlessFixture = (name: string) => {
+  const value = cases[name]
+  const parse = value.operation === "is" ?
+    (input: unknown) => z.validate(value.schema, input, { jitless: true })
+    : value.operation === "encode" ?
+    (input: unknown) => z.encode(value.schema, input, { jitless: true })
+    : (input: unknown) => value.schema.parse(input, { jitless: true })
+  return makeFixture(value, parse)
+}
diff --git a/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/zod-compiled.ts b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/zod-compiled.ts
new file mode 100644
index 000000000..4fa0b3f8d
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/zod-compiled.ts
@@ -0,0 +1,21 @@
+import { compiledFixture as fixture } from "./zod-cases.ts"
+
+export const parseValid = () => fixture("parseValid")
+export const parseExtra = () => fixture("parseExtra")
+export const parseInvalid = () => fixture("parseInvalid")
+export const isValid = () => fixture("isValid")
+export const isInvalid = () => fixture("isInvalid")
+export const encode = () => fixture("encode")
+export const strict = () => fixture("strict")
+export const nested = () => fixture("nested")
+export const array = () => fixture("array")
+export const arrayInvalid = () => fixture("arrayInvalid")
+export const record = () => fixture("record")
+export const recordTransformedKeys = () => fixture("recordTransformedKeys")
+export const union = () => fixture("union")
+export const transform = () => fixture("transform")
+export const transformInvalid = () => fixture("transformInvalid")
+export const declaration = () => fixture("declaration")
+export const makeStruct = () => fixture("makeStruct")
+export const makeArray = () => fixture("makeArray")
+export const makeUnion = () => fixture("makeUnion")
diff --git a/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/zod-jitless.ts b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/zod-jitless.ts
new file mode 100644
index 000000000..fc84ea473
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/fixtures/zod-jitless.ts
@@ -0,0 +1,13 @@
+import { jitlessFixture as fixture } from "./zod-cases.ts"
+
+export const parseValid = () => fixture("parseValid")
+export const parseInvalid = () => fixture("parseInvalid")
+export const isValid = () => fixture("isValid")
+export const isInvalid = () => fixture("isInvalid")
+export const array = () => fixture("array")
+export const record = () => fixture("record")
+export const recordTransformedKeys = () => fixture("recordTransformedKeys")
+export const union = () => fixture("union")
+export const transform = () => fixture("transform")
+export const makeStruct = () => fixture("makeStruct")
+export const makeArray = () => fixture("makeArray")
diff --git a/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/report-resources.mts b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/report-resources.mts
new file mode 100644
index 000000000..99e2aa6f0
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/report-resources.mts
@@ -0,0 +1,235 @@
+import { readFileSync } from "node:fs"
+import { resolve } from "node:path"
+
+type Sample = {
+  readonly aotBuild?: {
+    readonly generateCpu: { readonly cpuMicros: number }
+    readonly maxRssBytes: number
+    readonly schemaCpu: { readonly cpuMicros: number }
+    readonly sourceBytes: number
+  }
+  readonly case: string
+  readonly count: number
+  readonly cpu: {
+    readonly aotModule?: { readonly cpuMicros: number }
+    readonly firstCall: { readonly cpuMicros: number }
+    readonly prepare: { readonly cpuMicros: number }
+  }
+  readonly implementation: string
+  readonly memory: {
+    readonly compilerPerSchema: Memory
+    readonly module: Memory
+    readonly retainedLibraryPerSchema: Memory
+  }
+  readonly round: number
+}
+
+type Memory = {
+  readonly bytecodeBytes: number
+  readonly codeBytes: number
+  readonly externalSourceBytes: number
+  readonly heapBytes: number
+  readonly maxRssBytes: number
+}
+
+type Report = {
+  readonly environment: Record<string, string>
+  readonly measurement: {
+    readonly cases: ReadonlyArray<string>
+    readonly counts: ReadonlyArray<number>
+    readonly implementations: ReadonlyArray<string>
+    readonly rounds: number
+  }
+  readonly results: ReadonlyArray<Sample>
+}
+
+const path = resolve(process.argv[2] ?? "tmp/schema-compiler-resources.json")
+const report = JSON.parse(readFileSync(path, "utf8")) as Report
+const lowCount = Math.min(...report.measurement.counts)
+const highCount = Math.max(...report.measurement.counts)
+if (lowCount === highCount) throw new Error("the report needs at least two schema counts")
+
+const median = (values: ReadonlyArray<number>) => {
+  const sorted = values.toSorted((a, b) => a - b)
+  const middle = Math.floor(sorted.length / 2)
+  return sorted.length % 2 === 0 ? (sorted[middle - 1] + sorted[middle]) / 2 : sorted[middle]
+}
+
+const samples = (implementation: string, caseName: string) => {
+  const pairs = []
+  for (let round = 0; round < report.measurement.rounds; round++) {
+    const low = report.results.find((sample) =>
+      sample.round === round && sample.implementation === implementation && sample.case === caseName &&
+      sample.count === lowCount
+    )
+    const high = report.results.find((sample) =>
+      sample.round === round && sample.implementation === implementation && sample.case === caseName &&
+      sample.count === highCount
+    )
+    if (low === undefined || high === undefined) throw new Error(`missing samples for ${implementation}/${caseName}`)
+    pairs.push({ high, low })
+  }
+  return pairs
+}
+
+const perSchemaSlope = (
+  implementation: string,
+  caseName: string,
+  value: (sample: Sample) => number
+) => median(samples(implementation, caseName).map(({ high, low }) =>
+  (value(high) * highCount - value(low) * lowCount) / (highCount - lowCount)))
+
+const totalSlope = (
+  implementation: string,
+  caseName: string,
+  value: (sample: Sample) => number
+) => median(samples(implementation, caseName).map(({ high, low }) =>
+  (value(high) - value(low)) / (highCount - lowCount)))
+
+const heap = (implementation: string, caseName: string) =>
+  perSchemaSlope(implementation, caseName, (sample) => sample.memory.retainedLibraryPerSchema.heapBytes) / 1024
+const code = (implementation: string, caseName: string) =>
+  perSchemaSlope(
+    implementation,
+    caseName,
+    (sample) => {
+      const memory = sample.memory.retainedLibraryPerSchema
+      return memory.bytecodeBytes + memory.codeBytes + memory.externalSourceBytes
+    }
+  ) / 1024
+const peakRss = (implementation: string, caseName: string) =>
+  perSchemaSlope(implementation, caseName, (sample) => sample.memory.retainedLibraryPerSchema.maxRssBytes) / 1024
+const startupCpu = (implementation: string, caseName: string) =>
+  totalSlope(
+    implementation,
+    caseName,
+    (sample) =>
+      sample.cpu.prepare.cpuMicros + sample.cpu.firstCall.cpuMicros +
+      (implementation === "effect-aot" ? sample.cpu.aotModule?.cpuMicros ?? 0 : 0)
+  )
+
+const fixedDelta = (
+  left: string,
+  right: string,
+  value: (sample: Sample) => number
+) => {
+  const differences = []
+  for (const caseName of report.measurement.cases) {
+    for (let round = 0; round < report.measurement.rounds; round++) {
+      for (const count of report.measurement.counts) {
+        const find = (implementation: string) => report.results.find((sample) =>
+          sample.implementation === implementation && sample.case === caseName && sample.round === round &&
+          sample.count === count
+        )!
+        differences.push(value(find(left)) - value(find(right)))
+      }
+    }
+  }
+  return median(differences)
+}
+
+const names: Record<string, string> = {
+  "array-decode": "Array of 32 Structs",
+  "default-make": "Construct 32 defaults",
+  "struct-decode": "Struct decode",
+  "struct-invalid": "Struct invalid decode",
+  "struct-is": "Struct guard",
+  "transform-decode": "32 transformations",
+  "union-decode": "Discriminated Union (8)"
+}
+
+const table = (
+  implementations: ReadonlyArray<string>,
+  value: (implementation: string, caseName: string) => number,
+  unit: string,
+  digits: number
+) => {
+  const labels: Record<string, string> = {
+    "effect-aot": "Effect AOT",
+    "effect-interpreted": "Effect interpreted",
+    "effect-jit": "Effect JIT",
+    "valibot": "Valibot",
+    "zod-compiled": "Zod compile",
+    "zod-jitless": "Zod jitless"
+  }
+  const lines = [
+    `| Case | ${implementations.map((implementation) => labels[implementation]).join(" | ")} |`,
+    `|---|${implementations.map(() => "---:").join("|")}|`
+  ]
+  for (const caseName of report.measurement.cases) {
+    lines.push(
+      `| ${names[caseName]} | ${
+        implementations.map((implementation) => `${value(implementation, caseName).toFixed(digits)} ${unit}`).join(" | ")
+      } |`
+    )
+  }
+  return lines.join("\n")
+}
+
+const interpreted = ["effect-interpreted", "valibot", "zod-jitless"]
+const compiled = ["effect-jit", "effect-aot", "zod-compiled"]
+const environment = report.environment
+
+process.stdout.write(`# Schema compiler resource comparison
+
+Incremental costs are median per-schema slopes between ${lowCount} and ${highCount} distinct schemas across ${
+  report.measurement.rounds
+} fresh-process rounds. Lower is better. Fixed module imports and fixture inputs are excluded.
+
+Environment: Node ${environment.node}, V8 ${environment.v8}, ${environment.cpu}, ${environment.platform} ${
+  environment.arch
+}; Valibot ${environment.valibot}, Zod ${environment.zod}.
+
+Importing the JIT compiler retains ${
+  (fixedDelta("effect-jit", "effect-interpreted", (sample) => sample.memory.module.heapBytes) / 1024).toFixed(1)
+} KiB of additional fixed JavaScript heap and ${
+  (fixedDelta("effect-jit", "effect-interpreted", (sample) =>
+    sample.memory.module.codeBytes + sample.memory.module.bytecodeBytes + sample.memory.module.externalSourceBytes) / 1024)
+    .toFixed(1)
+} KiB of V8 code, bytecode and source in this source-tree setup.
+
+## Retained JavaScript heap
+
+### Interpreted
+
+${table(interpreted, heap, "KiB/schema", 2)}
+
+### Compiled
+
+${table(compiled, heap, "KiB/schema", 2)}
+
+## Retained V8 code, bytecode and source
+
+${table(compiled, code, "KiB/schema", 2)}
+
+## Runtime preparation CPU
+
+This includes adapter creation and the first call. AOT also includes importing and installing the generated module. AOT build-time generation is excluded.
+
+### Interpreted
+
+${table(interpreted, startupCpu, "µs/schema", 1)}
+
+### Compiled
+
+${table(compiled, startupCpu, "µs/schema", 1)}
+
+## Peak runtime RSS growth
+
+${table(compiled, peakRss, "KiB/schema", 1)}
+
+## AOT build cost
+
+| Case | CPU | Generated source | Peak RSS growth |
+|---|---:|---:|---:|
+${report.measurement.cases.map((caseName) => {
+  const cpu = totalSlope(
+    "effect-aot",
+    caseName,
+    (sample) => (sample.aotBuild?.schemaCpu.cpuMicros ?? 0) + (sample.aotBuild?.generateCpu.cpuMicros ?? 0)
+  )
+  const source = totalSlope("effect-aot", caseName, (sample) => sample.aotBuild?.sourceBytes ?? 0) / 1024
+  const rss = totalSlope("effect-aot", caseName, (sample) => sample.aotBuild?.maxRssBytes ?? 0) / 1024
+  return `| ${names[caseName]} | ${cpu.toFixed(1)} µs/schema | ${source.toFixed(2)} KiB/schema | ${rss.toFixed(1)} KiB/schema |`
+}).join("\n")}
+`)
diff --git a/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/resources.mts b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/resources.mts
new file mode 100644
index 000000000..8de96f956
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/resources.mts
@@ -0,0 +1,479 @@
+import assert from "node:assert/strict"
+import { execFileSync } from "node:child_process"
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs"
+import { join } from "node:path"
+import { fileURLToPath, pathToFileURL } from "node:url"
+import * as v8 from "node:v8"
+
+const implementations = [
+  "effect-interpreted",
+  "effect-jit",
+  "effect-aot",
+  "valibot",
+  "zod-jitless",
+  "zod-compiled"
+] as const
+type Implementation = typeof implementations[number]
+
+const cases = [
+  "struct-decode",
+  "struct-invalid",
+  "struct-is",
+  "array-decode",
+  "union-decode",
+  "transform-decode",
+  "default-make"
+] as const
+type CaseName = typeof cases[number]
+
+type BuiltCase = {
+  readonly schema: unknown
+  input: unknown
+  expected: unknown
+  readonly invalid?: boolean
+  readonly ast?: unknown
+}
+
+type Parser = (input: unknown) => unknown
+
+const [command, root, implementationArgument, caseArgument, countArgument, output] = process.argv.slice(2)
+const includes = <A extends string>(values: ReadonlyArray<A>, value: string | undefined): value is A =>
+  value !== undefined && values.includes(value as A)
+
+if (command !== "measure" && command !== "generate") {
+  throw new Error("command must be measure or generate")
+}
+if (root === undefined) throw new Error("root is required")
+if (!includes(implementations, implementationArgument)) {
+  throw new Error(`implementation must be one of: ${implementations.join(", ")}`)
+}
+if (!includes(cases, caseArgument)) {
+  throw new Error(`case must be one of: ${cases.join(", ")}`)
+}
+const implementation: Implementation = implementationArgument
+const caseName: CaseName = caseArgument
+const count = Number(countArgument)
+if (!Number.isSafeInteger(count) || count <= 0) throw new Error("count must be a positive integer")
+
+const forceGc = () => {
+  assert.equal(typeof globalThis.gc, "function", "run this probe with --expose-gc")
+  for (let i = 0; i < 5; i++) globalThis.gc!()
+}
+
+type CpuSample = {
+  readonly cpuMicros: number
+  readonly systemMicros: number
+  readonly userMicros: number
+  readonly wallNanos: number
+}
+
+const measureCpu = async <A,>(f: () => A | Promise<A>): Promise<readonly [A, CpuSample]> => {
+  const cpuStart = process.cpuUsage()
+  const wallStart = process.hrtime.bigint()
+  const value = await f()
+  const wallNanos = Number(process.hrtime.bigint() - wallStart)
+  const cpu = process.cpuUsage(cpuStart)
+  return [value, {
+    cpuMicros: cpu.user + cpu.system,
+    systemMicros: cpu.system,
+    userMicros: cpu.user,
+    wallNanos
+  }]
+}
+
+type MemorySample = {
+  readonly bytecodeBytes: number
+  readonly codeBytes: number
+  readonly externalSourceBytes: number
+  readonly heapBytes: number
+  readonly maxRssBytes: number
+  readonly rssBytes: number
+}
+
+const memory = (): MemorySample => {
+  const usage = process.memoryUsage()
+  const code = v8.getHeapCodeStatistics()
+  return {
+    bytecodeBytes: code.bytecode_and_metadata_size,
+    codeBytes: code.code_and_metadata_size,
+    externalSourceBytes: code.external_script_source_size,
+    heapBytes: usage.heapUsed,
+    maxRssBytes: process.resourceUsage().maxRSS * 1024,
+    rssBytes: usage.rss
+  }
+}
+
+const delta = (after: MemorySample, before: MemorySample) => ({
+  bytecodeBytes: after.bytecodeBytes - before.bytecodeBytes,
+  codeBytes: after.codeBytes - before.codeBytes,
+  externalSourceBytes: after.externalSourceBytes - before.externalSourceBytes,
+  heapBytes: after.heapBytes - before.heapBytes,
+  maxRssBytes: after.maxRssBytes - before.maxRssBytes,
+  rssBytes: after.rssBytes - before.rssBytes
+})
+
+const perSchema = (sample: ReturnType<typeof delta>) => ({
+  bytecodeBytes: sample.bytecodeBytes / count,
+  codeBytes: sample.codeBytes / count,
+  externalSourceBytes: sample.externalSourceBytes / count,
+  heapBytes: sample.heapBytes / count,
+  maxRssBytes: sample.maxRssBytes / count,
+  rssBytes: sample.rssBytes / count
+})
+
+const loadEffectModule = (path: string) =>
+  import(pathToFileURL(join(root, "packages/effect/src", `${path}.ts`)).href)
+
+const loadEffectSchemaModules = async () => ({
+  Effect: await loadEffectModule("Effect"),
+  Schema: await loadEffectModule("Schema"),
+  SchemaAST: await loadEffectModule("SchemaAST")
+})
+
+type EffectSchemaModules = Awaited<ReturnType<typeof loadEffectSchemaModules>>
+
+const buildEffectCase = ({ Effect, Schema, SchemaAST }: EffectSchemaModules, index: number): BuiltCase => {
+  const suffix = String(index)
+  const name = `name${suffix}`
+  const age = `age${suffix}`
+  const active = `active${suffix}`
+  const person = () => Schema.Struct({ [name]: Schema.String, [age]: Schema.Number, [active]: Schema.Boolean })
+  const value = { [name]: "Ada", [age]: 37, [active]: true }
+  switch (caseName) {
+    case "struct-decode": {
+      const schema = person()
+      return { schema, ast: schema.ast, input: value, expected: value }
+    }
+    case "struct-invalid": {
+      const schema = person()
+      return { schema, ast: schema.ast, input: { ...value, [age]: "bad" }, expected: true, invalid: true }
+    }
+    case "struct-is": {
+      const schema = person()
+      return { schema, ast: SchemaAST.toType(schema.ast), input: value, expected: true }
+    }
+    case "array-decode": {
+      const schema = Schema.Array(person())
+      const input = Array.from({ length: 32 }, () => ({ ...value }))
+      return { schema, ast: schema.ast, input, expected: input }
+    }
+    case "union-decode": {
+      const tag = `tag${suffix}`
+      const schema = Schema.Union(
+        Array.from({ length: 8 }, (_, member) =>
+          Schema.Struct({ [tag]: Schema.Literal(member), [`value${suffix}`]: Schema.Number }))
+      )
+      const input = { [tag]: 7, [`value${suffix}`]: 1 }
+      return { schema, ast: schema.ast, input, expected: input }
+    }
+    case "transform-decode": {
+      const schema = Schema.Struct(
+        Object.fromEntries(Array.from({ length: 32 }, (_, field) => [`v${suffix}_${field}`, Schema.NumberFromString]))
+      )
+      const input = Object.fromEntries(Array.from({ length: 32 }, (_, field) => [`v${suffix}_${field}`, String(field)]))
+      const expected = Object.fromEntries(Array.from({ length: 32 }, (_, field) => [`v${suffix}_${field}`, field]))
+      return { schema, ast: schema.ast, input, expected }
+    }
+    case "default-make": {
+      const schema = Schema.Struct(
+        Object.fromEntries(
+          Array.from(
+            { length: 32 },
+            (_, field) => [
+              `v${suffix}_${field}`,
+              Schema.Number.pipe(Schema.withConstructorDefault(Effect.succeed(field)))
+            ]
+          )
+        )
+      )
+      const expected = Object.fromEntries(Array.from({ length: 32 }, (_, field) => [`v${suffix}_${field}`, field]))
+      return { schema, ast: SchemaAST.toType(schema.ast), input: {}, expected }
+    }
+  }
+}
+
+const loadEffect = async (jit: boolean) => {
+  const modules = await loadEffectSchemaModules()
+  const SchemaParser = await loadEffectModule("SchemaParser")
+  const enable = jit ? (await loadEffectModule("unstable/schema/SchemaJITCompiler")).enable : undefined
+
+  const prepare = (built: ReadonlyArray<BuiltCase>): ReadonlyArray<Parser> => {
+    return built.map(({ ast, schema }) => {
+      if (enable !== undefined) enable(ast)
+      if (caseName === "struct-is") return SchemaParser.is(schema)
+      if (caseName === "default-make") return SchemaParser.make(schema)
+      return SchemaParser.decodeUnknownSync(schema)
+    })
+  }
+
+  return { build: (index: number) => buildEffectCase(modules, index), prepare }
+}
+
+const loadZod = async (compiled: boolean) => {
+  const z = await import("zod/v4")
+
+  const build = (index: number): BuiltCase => {
+    const suffix = String(index)
+    const name = `name${suffix}`
+    const age = `age${suffix}`
+    const active = `active${suffix}`
+    const person = () => z.object({ [name]: z.string(), [age]: z.number(), [active]: z.boolean() })
+    const value = { [name]: "Ada", [age]: 37, [active]: true }
+    switch (caseName) {
+      case "struct-decode":
+        return { schema: person(), input: value, expected: value }
+      case "struct-invalid":
+        return { schema: person(), input: { ...value, [age]: "bad" }, expected: true, invalid: true }
+      case "struct-is":
+        return { schema: person(), input: value, expected: true }
+      case "array-decode": {
+        const input = Array.from({ length: 32 }, () => ({ ...value }))
+        return { schema: z.array(person()), input, expected: input }
+      }
+      case "union-decode": {
+        const tag = `tag${suffix}`
+        const schema = z.union(
+          Array.from({ length: 8 }, (_, member) =>
+            z.object({ [tag]: z.literal(member), [`value${suffix}`]: z.number() })) as [
+              ReturnType<typeof person>,
+              ReturnType<typeof person>,
+              ...Array<ReturnType<typeof person>>
+            ]
+        )
+        const input = { [tag]: 7, [`value${suffix}`]: 1 }
+        return { schema, input, expected: input }
+      }
+      case "transform-decode": {
+        const schema = z.object(
+          Object.fromEntries(
+            Array.from({ length: 32 }, (_, field) => [`v${suffix}_${field}`, z.string().transform(Number)])
+          )
+        )
+        const input = Object.fromEntries(Array.from({ length: 32 }, (_, field) => [`v${suffix}_${field}`, String(field)]))
+        const expected = Object.fromEntries(Array.from({ length: 32 }, (_, field) => [`v${suffix}_${field}`, field]))
+        return { schema, input, expected }
+      }
+      case "default-make": {
+        const schema = z.object(
+          Object.fromEntries(
+            Array.from({ length: 32 }, (_, field) => [`v${suffix}_${field}`, z.number().default(field)])
+          )
+        )
+        const expected = Object.fromEntries(Array.from({ length: 32 }, (_, field) => [`v${suffix}_${field}`, field]))
+        return { schema, input: {}, expected }
+      }
+    }
+  }
+
+  const prepare = (built: ReadonlyArray<BuiltCase>): ReadonlyArray<Parser> => {
+    return built.map(({ schema }) => {
+      const target = compiled ? z.compile(schema, { strict: true }) : schema
+      if (caseName === "struct-is") {
+        return compiled
+          ? (input: unknown) => z.validate(target, input)
+          : (input: unknown) => z.validate(target, input, { jitless: true })
+      }
+      return compiled
+        ? (input: unknown) => target.parse(input)
+        : (input: unknown) => target.parse(input, { jitless: true })
+    })
+  }
+
+  return { build, prepare }
+}
+
+const loadValibot = async () => {
+  const v = await import("valibot")
+
+  const build = (index: number): BuiltCase => {
+    const suffix = String(index)
+    const name = `name${suffix}`
+    const age = `age${suffix}`
+    const active = `active${suffix}`
+    const person = () => v.object({ [name]: v.string(), [age]: v.number(), [active]: v.boolean() })
+    const value = { [name]: "Ada", [age]: 37, [active]: true }
+    switch (caseName) {
+      case "struct-decode":
+        return { schema: person(), input: value, expected: value }
+      case "struct-invalid":
+        return { schema: person(), input: { ...value, [age]: "bad" }, expected: true, invalid: true }
+      case "struct-is":
+        return { schema: person(), input: value, expected: true }
+      case "array-decode": {
+        const input = Array.from({ length: 32 }, () => ({ ...value }))
+        return { schema: v.array(person()), input, expected: input }
+      }
+      case "union-decode": {
+        const tag = `tag${suffix}`
+        const schema = v.variant(
+          tag,
+          Array.from({ length: 8 }, (_, member) =>
+            v.object({ [tag]: v.literal(member), [`value${suffix}`]: v.number() }))
+        )
+        const input = { [tag]: 7, [`value${suffix}`]: 1 }
+        return { schema, input, expected: input }
+      }
+      case "transform-decode": {
+        const schema = v.object(
+          Object.fromEntries(
+            Array.from({ length: 32 }, (_, field) => [
+              `v${suffix}_${field}`,
+              v.pipe(v.string(), v.transform(Number))
+            ])
+          )
+        )
+        const input = Object.fromEntries(Array.from({ length: 32 }, (_, field) => [`v${suffix}_${field}`, String(field)]))
+        const expected = Object.fromEntries(Array.from({ length: 32 }, (_, field) => [`v${suffix}_${field}`, field]))
+        return { schema, input, expected }
+      }
+      case "default-make": {
+        const schema = v.object(
+          Object.fromEntries(
+            Array.from({ length: 32 }, (_, field) => [`v${suffix}_${field}`, v.optional(v.number(), field)])
+          )
+        )
+        const expected = Object.fromEntries(Array.from({ length: 32 }, (_, field) => [`v${suffix}_${field}`, field]))
+        return { schema, input: {}, expected }
+      }
+    }
+  }
+
+  const prepare = (built: ReadonlyArray<BuiltCase>): ReadonlyArray<Parser> => {
+    return built.map(({ schema }) =>
+      caseName === "struct-is"
+        ? (input: unknown) => v.is(schema, input)
+        : (input: unknown) => v.parse(schema, input))
+  }
+
+  return { build, prepare }
+}
+
+const runParser = (parser: Parser, built: BuiltCase): unknown => {
+  if (!built.invalid) return parser(built.input)
+  try {
+    parser(built.input)
+    return false
+  } catch {
+    return true
+  }
+}
+
+const validate = (actual: unknown, built: BuiltCase) => assert.deepEqual(actual, built.expected)
+
+if (command === "generate") {
+  if (output === undefined) throw new Error("output is required for generate")
+  const [modules, moduleCpu] = await measureCpu(async () => {
+    return {
+      ...await loadEffectSchemaModules(),
+      AOT: await loadEffectModule("unstable/schema/SchemaAOTCompiler")
+    }
+  })
+  const [built, schemaCpu] = await measureCpu(() =>
+    Array.from({ length: count }, (_, index) => buildEffectCase(modules, index).ast)
+  )
+  const operation = caseName === "struct-is" ? "is" : caseName === "default-make" ? "make" : "decode"
+  const [source, generateCpu] = await measureCpu(() =>
+    modules.AOT.compile(built.map((ast) => ({ ast, operations: [operation] }))))
+  writeFileSync(output, source)
+  process.stdout.write(JSON.stringify({
+    generateCpu,
+    heapBytes: process.memoryUsage().heapUsed,
+    maxRssBytes: process.resourceUsage().maxRSS * 1024,
+    moduleCpu,
+    schemaCpu,
+    sourceBytes: Buffer.byteLength(source)
+  }))
+} else {
+  forceGc()
+  const beforeModule = memory()
+  const [library, moduleCpu] = await measureCpu(() => {
+    switch (implementation) {
+      case "effect-interpreted":
+        return loadEffect(false)
+      case "effect-jit":
+      case "effect-aot":
+        return loadEffect(implementation === "effect-jit")
+      case "zod-jitless":
+      case "zod-compiled":
+        return loadZod(implementation === "zod-compiled")
+      case "valibot":
+        return loadValibot()
+    }
+  })
+  forceGc()
+  const afterModule = memory()
+
+  const [built, schemaCpu] = await measureCpu(() => Array.from({ length: count }, (_, index) => library.build(index)))
+  forceGc()
+  const afterSchemas = memory()
+
+  let aotBuild: unknown
+  let aotModuleCpu: CpuSample | undefined
+  let directory: string | undefined
+  let parsers: ReadonlyArray<Parser>
+  let prepareCpu: CpuSample
+  try {
+    if (implementation === "effect-aot") {
+      directory = mkdtempSync(join(root, "packages/effect/.compiler-resources-"))
+      const generated = join(directory, "generated.mjs")
+      aotBuild = JSON.parse(execFileSync(
+        process.execPath,
+        ["--expose-gc", fileURLToPath(import.meta.url), "generate", root, implementation, caseName, String(count), generated],
+        { encoding: "utf8" }
+      ))
+      const [installed, measuredModuleCpu] = await measureCpu(async () => {
+        const generatedModule = await import(pathToFileURL(generated).href)
+        generatedModule.install(built.map((value) => value.ast))
+      })
+      void installed
+      aotModuleCpu = measuredModuleCpu
+    }
+    const prepared = await measureCpu(() => library.prepare(built))
+    parsers = prepared[0]
+    prepareCpu = prepared[1]
+    forceGc()
+    const afterPrepare = memory()
+
+    const [results, firstCallCpu] = await measureCpu(() => parsers.map((parser, index) => runParser(parser, built[index])))
+    results.forEach((actual, index) => validate(actual, built[index]))
+    results.length = 0
+    forceGc()
+    const afterFirstCall = memory()
+
+    for (const value of built) {
+      value.input = undefined
+      value.expected = undefined
+    }
+    forceGc()
+    const afterRelease = memory()
+
+    assert.equal(built.length, count)
+    assert.equal(parsers.length, count)
+    process.stdout.write(JSON.stringify({
+      aotBuild,
+      case: caseName,
+      count,
+      cpu: {
+        aotModule: aotModuleCpu,
+        firstCall: firstCallCpu,
+        module: moduleCpu,
+        prepare: prepareCpu,
+        schema: schemaCpu
+      },
+      implementation,
+      memory: {
+        compilerPerSchema: perSchema(delta(afterFirstCall, afterSchemas)),
+        firstCallPerSchema: perSchema(delta(afterFirstCall, afterPrepare)),
+        module: delta(afterModule, beforeModule),
+        preparePerSchema: perSchema(delta(afterPrepare, afterSchemas)),
+        retainedLibraryPerSchema: perSchema(delta(afterRelease, afterModule)),
+        schemaPerSchema: perSchema(delta(afterSchemas, afterModule)),
+        totalWithFixturePerSchema: perSchema(delta(afterFirstCall, afterModule))
+      }
+    }))
+  } finally {
+    if (directory !== undefined) {
+      rmSync(directory, { recursive: true, force: true })
+    }
+  }
+}
diff --git a/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/run-resources.mts b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/run-resources.mts
new file mode 100644
index 000000000..daa0ccb47
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/compiler-rebuild/run-resources.mts
@@ -0,0 +1,93 @@
+import { execFileSync } from "node:child_process"
+import { mkdirSync, readFileSync, writeFileSync } from "node:fs"
+import os from "node:os"
+import { dirname, join, resolve } from "node:path"
+import { createRequire } from "node:module"
+import { fileURLToPath } from "node:url"
+
+const implementations = [
+  "effect-interpreted",
+  "valibot",
+  "zod-jitless",
+  "effect-jit",
+  "effect-aot",
+  "zod-compiled"
+] as const
+
+const cases = [
+  "struct-decode",
+  "struct-invalid",
+  "struct-is",
+  "array-decode",
+  "union-decode",
+  "transform-decode",
+  "default-make"
+] as const
+
+const [outputArgument = "tmp/schema-compiler-resources.json", roundsArgument = "5", countsArgument = "100,500"] =
+  process.argv.slice(2)
+const rounds = Number(roundsArgument)
+const counts = countsArgument.split(",").map(Number)
+if (!Number.isSafeInteger(rounds) || rounds <= 0) throw new Error("rounds must be a positive integer")
+if (counts.some((count) => !Number.isSafeInteger(count) || count <= 0)) {
+  throw new Error("counts must be comma-separated positive integers")
+}
+
+const root = process.cwd()
+const output = resolve(outputArgument)
+const worker = fileURLToPath(new URL("./resources.mts", import.meta.url))
+const require = createRequire(import.meta.url)
+const packageVersion = (name: string) => {
+  let directory = dirname(require.resolve(name))
+  while (true) {
+    try {
+      const metadata = JSON.parse(readFileSync(join(directory, "package.json"), "utf8"))
+      if (metadata.name === name) return metadata.version as string
+    } catch {
+      // Continue at the parent directory.
+    }
+    const parent = dirname(directory)
+    if (parent === directory) throw new Error(`package.json not found for ${name}`)
+    directory = parent
+  }
+}
+
+const results: Array<unknown> = []
+for (let round = 0; round < rounds; round++) {
+  const orderedImplementations = round % 2 === 0 ? implementations : implementations.toReversed()
+  const orderedCounts = round % 2 === 0 ? counts : counts.toReversed()
+  for (const count of orderedCounts) {
+    for (const caseName of cases) {
+      for (const implementation of orderedImplementations) {
+        const sample = JSON.parse(execFileSync(
+          process.execPath,
+          ["--expose-gc", worker, "measure", root, implementation, caseName, String(count)],
+          { encoding: "utf8", maxBuffer: 16 * 1024 * 1024 }
+        ))
+        results.push({ round, ...sample })
+      }
+    }
+    process.stderr.write(`resource round ${round + 1}/${rounds}, count ${count} complete\n`)
+  }
+}
+
+mkdirSync(dirname(output), { recursive: true })
+writeFileSync(output, JSON.stringify({
+  environment: {
+    arch: process.arch,
+    cpu: os.cpus()[0]?.model ?? "unknown",
+    node: process.version,
+    platform: process.platform,
+    valibot: packageVersion("valibot"),
+    v8: process.versions.v8,
+    zod: packageVersion("zod")
+  },
+  measurement: {
+    cases,
+    counts,
+    implementations,
+    rounds
+  },
+  results
+}, null, 2))
+process.stdout.write(`${output}\n`)
diff --git a/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/aot.ts b/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/aot.ts
new file mode 100644
index 000000000..1a4021125
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/aot.ts
@@ -0,0 +1,17 @@
+import { execFileSync } from "node:child_process"
+import { mkdtempSync, rmSync } from "node:fs"
+import { join } from "node:path"
+import { fileURLToPath, pathToFileURL } from "node:url"
+import { roots } from "./cases.ts"
+
+const directory = mkdtempSync(fileURLToPath(new URL("./.aot-", import.meta.url)))
+try {
+  const file = join(directory, "generated.mjs")
+  execFileSync(process.execPath, [fileURLToPath(new URL("./generate.mts", import.meta.url)), file])
+  const generated = await import(pathToFileURL(file).href)
+  generated.install(roots)
+} finally {
+  rmSync(directory, { recursive: true, force: true })
+}
+
+export { isExtraValid, isInvalid, isValid, parseExtraValid, parseInvalid, parseValid } from "./cases.ts"
diff --git a/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/cases.ts b/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/cases.ts
new file mode 100644
index 000000000..ba38d5ea0
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/cases.ts
@@ -0,0 +1,65 @@
+import * as Schema from "effect/Schema"
+import * as SchemaAST from "effect/SchemaAST"
+import * as SchemaParser from "effect/SchemaParser"
+import assert from "node:assert/strict"
+import { invalidData, validData, validDataWithExtras } from "./data.ts"
+
+export const schema = Schema.Struct({
+  number: Schema.Number,
+  negNumber: Schema.Number,
+  maxNumber: Schema.Number,
+  string: Schema.String,
+  longString: Schema.String,
+  boolean: Schema.Boolean,
+  deeplyNested: Schema.Struct({
+    foo: Schema.String,
+    num: Schema.Number,
+    bool: Schema.Boolean
+  })
+})
+
+export const targets = [
+  { ast: schema.ast, operations: ["decode"] },
+  { ast: SchemaAST.toType(schema.ast), operations: ["is"] },
+  { ast: SchemaAST.flip(schema.ast), operations: ["decode"] }
+] as const
+export const roots = targets.map((target) => target.ast)
+
+const parseCase = (input: unknown, invalid = false) => () => {
+  const parse = SchemaParser.decodeUnknownSync(schema)
+  return {
+    run: invalid
+      ? () => {
+        try {
+          parse(input)
+          return false
+        } catch {
+          return true
+        }
+      }
+      : () => parse(input),
+    validate: invalid
+      ? (result: unknown) => assert.equal(result, true)
+      : (result: unknown) => assert.deepEqual(result, validData)
+  }
+}
+
+const guardCase = (input: unknown, expected: boolean) => () => {
+  const guard = SchemaParser.is(schema)
+  return {
+    run: expected
+      ? () => {
+        if (!guard(input)) throw new Error("Invalid")
+        return true
+      }
+      : () => guard(input),
+    validate: (result: unknown) => assert.equal(result, expected)
+  }
+}
+
+export const parseValid = parseCase(validData)
+export const parseExtraValid = parseCase(validDataWithExtras)
+export const parseInvalid = parseCase(invalidData, true)
+export const isValid = guardCase(validData, true)
+export const isExtraValid = guardCase(validDataWithExtras, true)
+export const isInvalid = guardCase(invalidData, false)
diff --git a/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/data.ts b/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/data.ts
new file mode 100644
index 000000000..d247f4eb0
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/data.ts
@@ -0,0 +1,31 @@
+// Extracted from moltar/typescript-runtime-type-benchmarks at
+// d1791e68fc1108ef47da50547e80900e177a9d10.
+// Upstream license: MIT, declared in package.json at that commit.
+export const validData = Object.freeze({
+  number: 1,
+  negNumber: -1,
+  maxNumber: Number.MAX_VALUE,
+  string: "string",
+  longString:
+    "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Vivendum intellegat et qui, ei denique consequuntur vix. Semper aeterno percipit ut his, sea ex utinam referrentur repudiandae. No epicuri hendrerit consetetur sit, sit dicta adipiscing ex, in facete detracto deterruisset duo. Quot populo ad qui. Sit fugit nostrum et. Ad per diam dicant interesset, lorem iusto sensibus ut sed. No dicam aperiam vis. Pri posse graeco definitiones cu, id eam populo quaestio adipiscing, usu quod malorum te. Ex nam agam veri, dicunt efficiantur ad qui, ad legere adversarium sit. Commune platonem mel id, brute adipiscing duo an. Vivendum intellegat et qui, ei denique consequuntur vix. Offendit eleifend moderatius ex vix, quem odio mazim et qui, purto expetendis cotidieque quo cu, veri persius vituperata ei nec. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.",
+  boolean: true,
+  deeplyNested: {
+    foo: "bar",
+    num: 1,
+    bool: false
+  }
+})
+
+export const validDataWithExtras = Object.freeze({
+  ...validData,
+  extraAttribute: "foo",
+  deeplyNested: {
+    ...validData.deeplyNested,
+    extraNestedAttribute: "bar"
+  }
+})
+
+export const invalidData = Object.freeze({
+  ...validData,
+  number: "invalid"
+})
diff --git a/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/generate.mts b/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/generate.mts
new file mode 100644
index 000000000..defdd093e
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/generate.mts
@@ -0,0 +1,5 @@
+import { writeFileSync } from "node:fs"
+import { compile } from "effect/unstable/schema/SchemaAOTCompiler"
+import { targets } from "./cases.ts"
+
+writeFileSync(process.argv[2], compile(targets))
diff --git a/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/interpreted.ts b/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/interpreted.ts
new file mode 100644
index 000000000..448732fda
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/interpreted.ts
@@ -0,0 +1 @@
+export { isExtraValid, isInvalid, isValid, parseExtraValid, parseInvalid, parseValid } from "./cases.ts"
diff --git a/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/jit.ts b/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/jit.ts
new file mode 100644
index 000000000..005d5588a
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/jit.ts
@@ -0,0 +1,6 @@
+import { enable } from "effect/unstable/schema/SchemaJITCompiler"
+import { roots } from "./cases.ts"
+
+for (const ast of roots) enable(ast)
+
+export { isExtraValid, isInvalid, isValid, parseExtraValid, parseInvalid, parseValid } from "./cases.ts"
diff --git a/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/valibot.ts b/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/valibot.ts
new file mode 100644
index 000000000..4de6e0cb2
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/valibot.ts
@@ -0,0 +1,53 @@
+import assert from "node:assert/strict"
+import * as v from "valibot"
+import { invalidData, validData, validDataWithExtras } from "./data.ts"
+
+const shape = {
+  number: v.number(),
+  negNumber: v.number(),
+  maxNumber: v.number(),
+  string: v.string(),
+  longString: v.string(),
+  boolean: v.boolean(),
+  deeplyNested: v.object({
+    foo: v.string(),
+    num: v.number(),
+    bool: v.boolean()
+  })
+}
+
+const parseSchema = v.object(shape)
+const guardSchema = v.looseObject({ ...shape, deeplyNested: v.looseObject(shape.deeplyNested.entries) })
+
+const parseCase = (input: unknown, invalid = false) => () => ({
+  run: invalid
+    ? () => {
+      try {
+        v.parse(parseSchema, input)
+        return false
+      } catch {
+        return true
+      }
+    }
+    : () => v.parse(parseSchema, input),
+  validate: invalid
+    ? (result: unknown) => assert.equal(result, true)
+    : (result: unknown) => assert.deepEqual(result, validData)
+})
+
+const guardCase = (input: unknown, expected: boolean) => () => ({
+  run: expected
+    ? () => {
+      if (!v.is(guardSchema, input)) throw new Error("Invalid")
+      return true
+    }
+    : () => v.is(guardSchema, input),
+  validate: (result: unknown) => assert.equal(result, expected)
+})
+
+export const parseValid = parseCase(validData)
+export const parseExtraValid = parseCase(validDataWithExtras)
+export const parseInvalid = parseCase(invalidData, true)
+export const isValid = guardCase(validData, true)
+export const isExtraValid = guardCase(validDataWithExtras, true)
+export const isInvalid = guardCase(invalidData, false)
diff --git a/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/zod.ts b/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/zod.ts
new file mode 100644
index 000000000..245da3a85
--- /dev/null
+++ b/repos/effect/packages/effect/runtimeperf/suites/moltar/fixtures/zod.ts
@@ -0,0 +1,117 @@
+import assert from "node:assert/strict"
+import * as z from "zod/v4"
+import { invalidData, validData, validDataWithExtras } from "./data.ts"
+
+const makeShape = () => ({
+  number: z.number(),
+  negNumber: z.number(),
+  maxNumber: z.number(),
+  string: z.string(),
+  longString: z.string(),
+  boolean: z.boolean(),
+  deeplyNested: z.object({
+    foo: z.string(),
+    num: z.number(),
+    bool: z.boolean()
+  })
+})
+
+const makeParseSchema = () => z.object(makeShape())
+const makeGuardSchema = () => {
+  const shape = makeShape()
+  return z.object({ ...shape, deeplyNested: shape.deeplyNested.passthrough() }).passthrough()
+}
+
+const parseCase = (
+  compile: (schema: ReturnType<typeof makeParseSchema>) => (input: unknown) => unknown,
+  input: unknown,
+  invalid = false
+) =>
+() => {
+  const parse = compile(makeParseSchema())
+  return {
+    run: invalid
+      ? () => {
+        try {
+          parse(input)
+          return false
+        } catch {
+          return true
+        }
+      }
+      : () => parse(input),
+    validate: invalid
+      ? (result: unknown) => assert.equal(result, true)
+      : (result: unknown) => assert.deepEqual(result, validData)
+  }
+}
+
+const guardCase = (
+  compile: (schema: ReturnType<typeof makeGuardSchema>) => (input: unknown) => boolean,
+  input: unknown,
+  expected: boolean
+) =>
+() => {
+  const validate = compile(makeGuardSchema())
+  return {
+    run: expected
+      ? () => {
+        if (!validate(input)) throw new Error("Invalid")
+        return true
+      }
+      : () => validate(input),
+    validate: (result: unknown) => assert.equal(result, expected)
+  }
+}
+
+const assertParseCase = (
+  compile: (schema: ReturnType<typeof makeGuardSchema>) => (input: unknown) => unknown,
+  input: unknown
+) =>
+() => {
+  const parse = compile(makeGuardSchema())
+  return {
+    run: () => {
+      parse(input)
+      return true
+    },
+    validate: (result: unknown) => assert.equal(result, true)
+  }
+}
+
+const parse = (schema: ReturnType<typeof makeParseSchema>) => (input: unknown) => schema.parse(input)
+const parseJitless = (schema: ReturnType<typeof makeParseSchema>) => (input: unknown) =>
+  schema.parse(input, { jitless: true })
+const parseCompiled = (schema: ReturnType<typeof makeParseSchema>) => {
+  const compiled = z.compile(schema, { strict: true })
+  return (input: unknown) => compiled.parse(input)
+}
+const validate = (schema: ReturnType<typeof makeGuardSchema>) => (input: unknown) => z.validate(schema, input)
+const validateJitless = (schema: ReturnType<typeof makeGuardSchema>) => (input: unknown) =>
+  z.validate(schema, input, { jitless: true })
+const validateCompiled = (schema: ReturnType<typeof makeGuardSchema>) => {
+  const compiled = z.compile(schema, { strict: true })
+  return (input: unknown) => z.validate(compiled, input)
+}
+const assertParse = (schema: ReturnType<typeof makeGuardSchema>) => (input: unknown) => schema.parse(input)
+
+export const parseValid = parseCase(parse, validData)
+export const parseExtraValid = parseCase(parse, validDataWithExtras)
+export const parseInvalid = parseCase(parse, invalidData, true)
+export const parseJitlessValid = parseCase(parseJitless, validData)
+export const parseJitlessExtraValid = parseCase(parseJitless, validDataWithExtras)
+export const parseJitlessInvalid = parseCase(parseJitless, invalidData, true)
+export const parseCompiledValid = parseCase(parseCompiled, validData)
+export const parseCompiledExtraValid = parseCase(parseCompiled, validDataWithExtras)
+export const parseCompiledInvalid = parseCase(parseCompiled, invalidData, true)
+export const isValid = guardCase(validate, validData, true)
+export const isExtraValid = guardCase(validate, validDataWithExtras, true)
+export const isInvalid = guardCase(validate, invalidData, false)
+export const isJitlessValid = guardCase(validateJitless, validData, true)
+export const isJitlessExtraValid = guardCase(validateJitless, validDataWithExtras, true)
+export const isJitlessInvalid = guardCase(validateJitless, invalidData, false)
+export const isCompiledValid = guardCase(validateCompiled, validData, true)
+export const isCompiledExtraValid = guardCase(validateCompiled, validDataWithExtras, true)
+export const isCompiledInvalid = guardCase(validateCompiled, invalidData, false)
+export const assertParseValid = assertParseCase(assertParse, validData)
+export const assertParseExtraValid = assertParseCase(assertParse, validDataWithExtras)
diff --git a/repos/effect/packages/effect/runtimeperf/suites/schema-benchmarks/fixtures/effect-beta.ts b/repos/effect/packages/effect/runtimeperf/suites/schema-benchmarks/fixtures/effect-beta.ts
index b21c0dd2d..06ddb89a5 100644
--- a/repos/effect/packages/effect/runtimeperf/suites/schema-benchmarks/fixtures/effect-beta.ts
+++ b/repos/effect/packages/effect/runtimeperf/suites/schema-benchmarks/fixtures/effect-beta.ts
@@ -66,7 +66,10 @@ const parsingCase = (input, errors, success) => () => {
   const run = Schema.decodeUnknownOption(makeSchema())
   return {
     run: () => run(input, { errors }),
-    validate: (result) => assert.equal(Option.isSome(result), success)
+    validate: (result) => {
+      assert.equal(Option.isSome(result), success)
+      if (success && Option.isSome(result)) assert.deepEqual(result.value, validData)
+    }
   }
 }
 
diff --git a/repos/effect/packages/effect/runtimeperf/suites/schema-benchmarks/fixtures/valibot.ts b/repos/effect/packages/effect/runtimeperf/suites/schema-benchmarks/fixtures/valibot.ts
index fdff6a1b5..25676aad2 100644
--- a/repos/effect/packages/effect/runtimeperf/suites/schema-benchmarks/fixtures/valibot.ts
+++ b/repos/effect/packages/effect/runtimeperf/suites/schema-benchmarks/fixtures/valibot.ts
@@ -16,7 +16,7 @@ const makeSchema = () => {
   })
   const rating = v.object({
     id: v.number(),
-    stars: v.pipe(v.number(), v.minValue(1), v.maxValue(5)),
+    stars: v.pipe(v.number(), v.minValue(0), v.maxValue(5)),
     title: v.pipe(v.string(), v.minLength(1), v.maxLength(100)),
     text: v.pipe(v.string(), v.minLength(1), v.maxLength(1000)),
     images: v.array(image)
@@ -56,7 +56,10 @@ const parsingCase = (input, options, success) => () => {
   const schema = makeSchema()
   return {
     run: () => v.safeParse(schema, input, options),
-    validate: (result) => assert.equal(result.success, success)
+    validate: (result) => {
+      assert.equal(result.success, success)
+      if (success) assert.deepEqual(result.output, validData)
+    }
   }
 }
 
@@ -72,6 +75,7 @@ const standardCase = (input, success) => () => {
     validate: (result) => {
       assert.equal(typeof result?.then, "undefined")
       assert.equal(result.issues === undefined, success)
+      if (success) assert.deepEqual(result.value, validData)
     }
   }
 }
diff --git a/repos/effect/packages/effect/runtimeperf/suites/schema-benchmarks/fixtures/zod.ts b/repos/effect/packages/effect/runtimeperf/suites/schema-benchmarks/fixtures/zod.ts
index 81e56f482..609f06c49 100644
--- a/repos/effect/packages/effect/runtimeperf/suites/schema-benchmarks/fixtures/zod.ts
+++ b/repos/effect/packages/effect/runtimeperf/suites/schema-benchmarks/fixtures/zod.ts
@@ -29,7 +29,7 @@ const makeSchema = () => {
     description: z.string().min(1).max(500),
     price: z.number().min(1).max(10000),
     discount: z.number().min(1).max(100).nullable(),
-    quantity: z.number().min(0).max(10),
+    quantity: z.number().min(1).max(10),
     tags: z.array(z.string().min(1).max(30)),
     images: z.array(image),
     ratings: z.array(rating)
@@ -46,7 +46,10 @@ const parsingCase = (input, success) => () => {
   const options = { jitless: true }
   return {
     run: () => schema.safeParse(input, options),
-    validate: (result) => assert.equal(result.success, success)
+    validate: (result) => {
+      assert.equal(result.success, success)
+      if (success) assert.deepEqual(result.data, validData)
+    }
   }
 }
 
@@ -60,6 +63,7 @@ const standardCase = (input, success) => () => {
     validate: (result) => {
       assert.equal(typeof result?.then, "undefined")
       assert.equal(result.issues === undefined, success)
+      if (success) assert.deepEqual(result.value, validData)
     }
   }
 }
diff --git a/repos/effect/packages/effect/runtimeperf/suites/schema/fixtures/adapters.ts b/repos/effect/packages/effect/runtimeperf/suites/schema/fixtures/adapters.ts
index 2a84cab07..f9fd2ac05 100644
--- a/repos/effect/packages/effect/runtimeperf/suites/schema/fixtures/adapters.ts
+++ b/repos/effect/packages/effect/runtimeperf/suites/schema/fixtures/adapters.ts
@@ -11,6 +11,11 @@ const schema = Schema.Struct({
 const input = { a: "a", b: 1 }
 const invalidInput = { a: "a", b: "invalid" }
 
+export const makeValid = () => ({
+  run: () => schema.make(input),
+  validate: (result) => assert.deepEqual(result, input)
+})
+
 export const parserExitInvalid = () => {
   const run = SchemaParser.decodeUnknownExit(schema)
   return {
@@ -23,7 +28,10 @@ export const exitValid = () => {
   const run = Schema.decodeUnknownExit(schema)
   return {
     run: () => run(input),
-    validate: (result) => assert.equal(result._tag, "Success")
+    validate: (result) => {
+      assert.equal(result._tag, "Success")
+      assert.deepEqual(result.value, input)
+    }
   }
 }
 
@@ -39,7 +47,10 @@ export const optionValid = () => {
   const run = Schema.decodeUnknownOption(schema)
   return {
     run: () => run(input),
-    validate: (result) => assert.equal(Option.isSome(result), true)
+    validate: (result) => {
+      assert.equal(Option.isSome(result), true)
+      if (Option.isSome(result)) assert.deepEqual(result.value, input)
+    }
   }
 }
 
@@ -55,7 +66,10 @@ export const resultValid = () => {
   const run = Schema.decodeUnknownResult(schema)
   return {
     run: () => run(input),
-    validate: (result) => assert.equal(Result.isSuccess(result), true)
+    validate: (result) => {
+      assert.equal(Result.isSuccess(result), true)
+      if (Result.isSuccess(result)) assert.deepEqual(result.success, input)
+    }
   }
 }
 
diff --git a/repos/effect/packages/effect/runtimeperf/suites/schema/fixtures/behavior.ts b/repos/effect/packages/effect/runtimeperf/suites/schema/fixtures/behavior.ts
index 8ed02deaf..dc7895913 100644
--- a/repos/effect/packages/effect/runtimeperf/suites/schema/fixtures/behavior.ts
+++ b/repos/effect/packages/effect/runtimeperf/suites/schema/fixtures/behavior.ts
@@ -7,25 +7,37 @@ import assert from "node:assert/strict"
 
 const decodeCase = (schema, input, success, options) => () => {
   const run = Schema.decodeUnknownExit(schema, options)
+  const isOutput = success ? Schema.is(schema) : undefined
   return {
     run: () => run(input),
-    validate: (result) => assert.equal(result._tag, success ? "Success" : "Failure")
+    validate: (result) => {
+      assert.equal(result._tag, success ? "Success" : "Failure")
+      if (result._tag === "Success") assert.equal(isOutput?.(result.value), true)
+    }
   }
 }
 
 const decodeParserCase = (schema, input, success, options) => () => {
   const run = SchemaParser.decodeUnknownExit(schema, options)
+  const isOutput = success ? Schema.is(schema) : undefined
   return {
     run: () => run(input),
-    validate: (result) => assert.equal(result._tag, success ? "Success" : "Failure")
+    validate: (result) => {
+      assert.equal(result._tag, success ? "Success" : "Failure")
+      if (result._tag === "Success") assert.equal(isOutput?.(result.value), true)
+    }
   }
 }
 
 const encodeParserCase = (schema, input, success, options) => () => {
   const run = SchemaParser.encodeUnknownExit(schema, options)
+  const isOutput = success ? Schema.is(Schema.flip(schema)) : undefined
   return {
     run: () => run(input),
-    validate: (result) => assert.equal(result._tag, success ? "Success" : "Failure")
+    validate: (result) => {
+      assert.equal(result._tag, success ? "Success" : "Failure")
+      if (result._tag === "Success") assert.equal(isOutput?.(result.value), true)
+    }
   }
 }
 
@@ -146,7 +158,7 @@ export const optionalPresentValid = decodeCase(
 export const optionalPresentInvalid = decodeCase(optionalStruct, { required: "value", optionalKey: 1 }, false)
 
 const suspendedString = Schema.String.pipe(Schema.decode({
-  decode: new SchemaGetter.Getter((input) => Effect.suspend(() => Effect.succeed(input))),
+  decode: SchemaGetter.transformOptionalEffect((input) => Effect.suspend(() => Effect.succeed(input))),
   encode: SchemaGetter.passthrough()
 }))
 const suspendedObjectFields = Object.fromEntries(
@@ -162,6 +174,32 @@ export const object32SuspendedMiddleValid = decodeParserCase(
   true
 )
 
+const suspendedArrayInput = Array.from({ length: 32 }, (_, index) => `value${index}`)
+const suspendedObjectAllFields = Object.fromEntries(
+  Array.from({ length: 32 }, (_, index) => [`field${index}`, suspendedString])
+)
+
+export const array32SuspendedConcurrent4 = decodeParserCase(
+  Schema.Array(suspendedString),
+  suspendedArrayInput,
+  true,
+  { concurrency: 4 }
+)
+
+export const object32SuspendedConcurrent4 = decodeParserCase(
+  Schema.Struct(suspendedObjectAllFields),
+  suspendedObjectInput,
+  true,
+  { concurrency: 4 }
+)
+
+export const record32SuspendedConcurrent4 = decodeParserCase(
+  Schema.Record(Schema.String, suspendedString),
+  suspendedObjectInput,
+  true,
+  { concurrency: 4 }
+)
+
 const literal2 = Schema.Literals(["value0", "value1"])
 const literal100 = Schema.Literals(Array.from({ length: 100 }, (_, index) => `value${index}`))
 const homogeneousUnion100 = Schema.Union(
@@ -189,19 +227,6 @@ export const taggedWithFallbackValid = decodeParserCase(
   true
 )
 
-const propertyOrderSchema = Schema.Struct({
-  a: Schema.String,
-  b: Schema.String
-})
-const propertyOrderInput = { extra: "extra", b: "b", a: "a" }
-
-export const propertyOrderOriginal = decodeCase(
-  propertyOrderSchema,
-  propertyOrderInput,
-  true,
-  { onExcessProperty: "preserve", propertyOrder: "original" }
-)
-
 const recursiveTree = Schema.Struct({
   value: Schema.String,
   children: Schema.Array(Schema.suspend(() => recursiveTree))
diff --git a/repos/effect/packages/effect/runtimeperf/suites/schema/fixtures/cold.ts b/repos/effect/packages/effect/runtimeperf/suites/schema/fixtures/cold.ts
index 2f62d5ac0..7ad53b379 100644
--- a/repos/effect/packages/effect/runtimeperf/suites/schema/fixtures/cold.ts
+++ b/repos/effect/packages/effect/runtimeperf/suites/schema/fixtures/cold.ts
@@ -14,7 +14,32 @@ const makeEffectCheckedSchema = () =>
 const makeEffectTemplateLiteralSchema = () =>
   Schema.TemplateLiteral(["prefix-", Schema.String, "-middle-", Schema.Number, "-suffix"])
 
+const templateLiteral256Parts = Array.from({ length: 256 }, (_, index) => Schema.Literal(`part${index}`))
+const makeEffectTemplateLiteral256Schema = () => Schema.TemplateLiteral(templateLiteral256Parts)
+
 const makeEffectRecordSchema = () => Schema.Record(Schema.String, Schema.String)
+const makeEffectEncodedRecordSchema = () =>
+  Schema.Record(
+    Schema.String.pipe(Schema.decodeTo(Schema.Number, SchemaTransformation.passthrough())),
+    Schema.String
+  )
+
+const makeEffectObject2Schema = () =>
+  Schema.Struct({
+    name: Schema.String,
+    age: Schema.Number
+  })
+
+const makeObjectFields = (size: number) =>
+  Object.fromEntries(Array.from({ length: size }, (_, index) => [`field${index}`, Schema.NonEmptyString]))
+
+const object32Fields = makeObjectFields(32)
+const object256Fields = makeObjectFields(256)
+
+const makeEffectObject32Schema = () => Schema.Struct(object32Fields)
+const makeEffectObject256Schema = () => Schema.Struct(object256Fields)
+
+const object2Input = { name: "John", age: 42 }
 
 const literalValues100 = Array.from({ length: 100 }, (_, index) => `value${index}`)
 
@@ -53,9 +78,42 @@ export const effectSchemaCreationTemplateLiteral = () => ({
   validate: (schema) => assert.equal(schema.ast._tag, "TemplateLiteral")
 })
 
+export const effectSchemaCreationTemplateLiteral256 = () => ({
+  run: makeEffectTemplateLiteral256Schema,
+  validate: (schema) => assert.equal(schema.ast._tag, "TemplateLiteral")
+})
+
+export const effectSchemaCreationObject2 = () => ({
+  run: makeEffectObject2Schema,
+  validate: (schema) => assert.equal(schema.ast._tag, "Objects")
+})
+
+export const effectSchemaCreationObject32 = () => ({
+  run: makeEffectObject32Schema,
+  validate: (schema) => assert.equal(schema.ast._tag, "Objects")
+})
+
+export const effectSchemaCreationObject256 = () => ({
+  run: makeEffectObject256Schema,
+  validate: (schema) => assert.equal(schema.ast._tag, "Objects")
+})
+
+export const effectSchemaCreationEncodedRecord = () => ({
+  run: makeEffectEncodedRecordSchema,
+  validate: (schema) => assert.equal(schema.ast._tag, "Objects")
+})
+
+export const effectFirstMakeObject2 = () => ({
+  run: () => makeEffectObject2Schema().make(object2Input),
+  validate: (result) => assert.deepEqual(result, object2Input)
+})
+
 export const effectFirstDecodeCheckedObject32 = () => ({
   run: () => SchemaParser.decodeUnknownExit(makeEffectCheckedSchema())(input),
-  validate: (result) => assert.equal(result._tag, "Success")
+  validate: (result) => {
+    assert.equal(result._tag, "Success")
+    assert.deepEqual(result.value, input)
+  }
 })
 
 export const effectFirstDecodeTemplateLiteral = () => ({
@@ -65,17 +123,26 @@ export const effectFirstDecodeTemplateLiteral = () => ({
 
 export const effectFirstDecodeRecord32 = () => ({
   run: () => SchemaParser.decodeUnknownExit(makeEffectRecordSchema())(input),
-  validate: (result) => assert.equal(result._tag, "Success")
+  validate: (result) => {
+    assert.equal(result._tag, "Success")
+    assert.deepEqual(result.value, input)
+  }
 })
 
 export const effectFirstDecodeLiteral100 = () => ({
   run: () => SchemaParser.decodeUnknownExit(makeEffectLiteral100Schema())("value99"),
-  validate: (result) => assert.equal(result._tag, "Success")
+  validate: (result) => {
+    assert.equal(result._tag, "Success")
+    assert.equal(result.value, "value99")
+  }
 })
 
 export const effectFirstDecodeTagged100 = () => ({
   run: () => SchemaParser.decodeUnknownExit(makeEffectTagged100Schema())(taggedInput),
-  validate: (result) => assert.equal(result._tag, "Success")
+  validate: (result) => {
+    assert.equal(result._tag, "Success")
+    assert.deepEqual(result.value, taggedInput)
+  }
 })
 
 export const effectFirstDecodeEncodingChain8 = () => ({
diff --git a/repos/effect/packages/effect/runtimeperf/test/registry.test.mts b/repos/effect/packages/effect/runtimeperf/test/registry.test.mts
index 1598b6344..4596e8bc9 100644
--- a/repos/effect/packages/effect/runtimeperf/test/registry.test.mts
+++ b/repos/effect/packages/effect/runtimeperf/test/registry.test.mts
@@ -2,14 +2,33 @@ import assert from "node:assert/strict"
 import { readFile } from "node:fs/promises"
 import { describe, it } from "node:test"
 import { pathToFileURL } from "node:url"
-import { loadRegistry } from "../utils.mts"
+import { loadRegistry, scenarioBatchSize } from "../utils.mts"
 
 describe("runtimeperf registry", () => {
+  it("uses the Effect calibration for every implementation in a scenario", () => {
+    const zod = { implementation: "zod4-compiled" }
+    const effect = { implementation: "effect" }
+    assert.equal(scenarioBatchSize([zod, effect], new Map([
+      [zod, { batchSize: 4_096 }],
+      [effect, { batchSize: 256 }]
+    ])), 256)
+  })
+
   it("uses unique fixture targets and valid implementations", () => {
     const { fixtures } = loadRegistry()
     assert.equal(new Set(fixtures.map((fixture) => fixture.target)).size, fixtures.length)
     for (const fixture of fixtures) {
-      assert.ok(["effect", "fast-check-v4", "valibot", "zod4"].includes(fixture.implementation))
+      assert.ok([
+        "effect",
+        "effect-aot",
+        "effect-jit",
+        "fast-check-v4",
+        "valibot",
+        "zod4",
+        "zod4-compiled",
+        "zod4-jitless",
+        "zod4-validate"
+      ].includes(fixture.implementation))
     }
   })
 
@@ -19,7 +38,7 @@ describe("runtimeperf registry", () => {
       fixtures.filter((fixture) => fixture.suite === "arbitrary"),
       (fixture) => fixture.scenario
     )
-    assert.equal(scenarios.size, 31)
+    assert.equal(scenarios.size, 33)
     for (const fixtures of scenarios.values()) {
       assert.deepEqual(fixtures.map((fixture) => fixture.implementation).sort(), ["effect", "fast-check-v4"])
       const metadata = (fixture) => ({
@@ -103,7 +122,7 @@ describe("runtimeperf registry", () => {
     const { fixtures } = loadRegistry()
     const zodFiles = new Set(
       fixtures
-        .filter((fixture) => fixture.implementation === "zod4")
+        .filter((fixture) => fixture.suite === "schema-benchmarks" && fixture.implementation === "zod4")
         .map((fixture) => fixture.fixturePath)
     )
     assert.ok(zodFiles.size > 0)
@@ -115,6 +134,34 @@ describe("runtimeperf registry", () => {
     }
   })
 
+  it("uses strict Zod compilation for the compiler comparison fixtures", async () => {
+    const { fixtures } = loadRegistry()
+    const compiled = fixtures.filter((fixture) =>
+      fixture.suite === "compiler-rebuild" && fixture.implementation === "zod4-compiled"
+    )
+    assert.equal(compiled.length, 19)
+    const paths = new Set(compiled.map((fixture) => fixture.fixturePath))
+    assert.equal(paths.size, 1)
+    const source = await readFile([...paths][0], "utf8")
+    assert.match(source, /from "\.\/zod-cases\.ts"/)
+    const shared = await readFile(new URL("../suites/compiler-rebuild/fixtures/zod-cases.ts", import.meta.url), "utf8")
+    assert.match(shared, /from "zod\/v4"/)
+    assert.match(shared, /z\.compile\(value\.schema, \{ strict: true \}\)/)
+  })
+
+  it("uses interpreted Zod for the jitless compiler comparison fixtures", async () => {
+    const { fixtures } = loadRegistry()
+    const jitless = fixtures.filter((fixture) =>
+      fixture.suite === "compiler-rebuild" && fixture.implementation === "zod4-jitless"
+    )
+    assert.equal(jitless.length, 11)
+    const paths = new Set(jitless.map((fixture) => fixture.fixturePath))
+    assert.equal(paths.size, 1)
+    const source = await readFile(new URL("../suites/compiler-rebuild/fixtures/zod-cases.ts", import.meta.url), "utf8")
+    assert.match(source, /z\.validate\(value\.schema, input, \{ jitless: true \}\)/)
+    assert.match(source, /value\.schema\.parse\(input, \{ jitless: true \}\)/)
+  })
+
   it("loads, runs and validates every fixture export", async () => {
     const { fixtures } = loadRegistry()
     const modules = new Map()
diff --git a/repos/effect/packages/effect/runtimeperf/utils.mts b/repos/effect/packages/effect/runtimeperf/utils.mts
index 2dc6210b0..2df3859b5 100644
--- a/repos/effect/packages/effect/runtimeperf/utils.mts
+++ b/repos/effect/packages/effect/runtimeperf/utils.mts
@@ -8,6 +8,11 @@ import { aggregate } from "./stats.mts"
 export const runtimeperfDir = dirname(fileURLToPath(import.meta.url))
 export const effectDir = resolve(runtimeperfDir, "..")
 export const repoRoot = resolve(effectDir, "../..")
+export const runPath = join(runtimeperfDir, "run.mts")
+export const comparePath = join(runtimeperfDir, "compare.mts")
+export const materializePath = join(runtimeperfDir, "materialize.mts")
+export const statsPath = join(runtimeperfDir, "stats.mts")
+export const utilsPath = fileURLToPath(import.meta.url)
 export const workerPath = join(runtimeperfDir, "worker.mts")
 export const configPath = join(runtimeperfDir, "config.json")
 export const resultsRoot = join(repoRoot, "tmp", "runtimeperf", "results")
@@ -147,7 +152,7 @@ export const selectFixtures = (fixtures, options, { effectOnly = false } = {}) =
     selected = selected.filter((fixture) => fixture.implementation === options.implementation)
   }
   if (effectOnly) {
-    selected = selected.filter((fixture) => fixture.implementation === "effect")
+    selected = selected.filter((fixture) => fixture.implementation.startsWith("effect"))
   }
   if (selected.length === 0) {
     throw new Error("No runtimeperf fixtures matched the selection")
@@ -216,6 +221,13 @@ export const measureFixture = (fixture, defaults, batchSize, fixturePath = fixtu
 
 export const aggregateMeasurements = (measurements) => aggregate(measurements.map((item) => item.nsPerOp))
 
+export const scenarioBatchSize = (fixtures, calibrations) => {
+  const reference = fixtures.find((fixture) => fixture.implementation === "effect") ?? fixtures[0]
+  const calibration = calibrations.get(reference)
+  if (calibration === undefined) throw new Error("Missing scenario reference calibration")
+  return calibration.batchSize
+}
+
 export const coverageSummary = (fixtures) => ({
   tiers: [...new Set(fixtures.map((fixture) => fixture.tier))].sort(),
   families: [...new Set(fixtures.map((fixture) => fixture.family))].sort(),
@@ -223,7 +235,7 @@ export const coverageSummary = (fixtures) => ({
   effectAstTags: [
     ...new Set(
       fixtures
-        .filter((fixture) => fixture.implementation === "effect")
+        .filter((fixture) => fixture.implementation.startsWith("effect"))
         .flatMap((fixture) => fixture.astTags)
     )
   ].sort()
diff --git a/repos/effect/packages/effect/src/Array.ts b/repos/effect/packages/effect/src/Array.ts
index 032af6080..8813ded8c 100644
--- a/repos/effect/packages/effect/src/Array.ts
+++ b/repos/effect/packages/effect/src/Array.ts
@@ -909,6 +909,18 @@ export const isReadonlyArrayNonEmpty: <A>(self: ReadonlyArray<A>) => self is Non
  */
 export const length = <A>(self: ReadonlyArray<A>): number => self.length
 
+/**
+ * Checks whether a string represents a JavaScript array index: a non-negative
+ * integer below `2 ** 32 - 1`, written without leading zeroes, a sign, or
+ * exponent notation.
+ *
+ * @internal
+ */
+export function isCanonicalArrayIndex(key: string): boolean {
+  const index = Number(key)
+  return String(index) === key && Number.isInteger(index) && index >= 0 && index < 2 ** 32 - 1
+}
+
 /** @internal */
 export function isOutOfBounds<A>(i: number, as: ReadonlyArray<A>): boolean {
   return !Number.isFinite(i) || i < 0 || i >= as.length
diff --git a/repos/effect/packages/effect/src/ByteSize.ts b/repos/effect/packages/effect/src/ByteSize.ts
index 7dbba16b5..ddacee0f7 100644
--- a/repos/effect/packages/effect/src/ByteSize.ts
+++ b/repos/effect/packages/effect/src/ByteSize.ts
@@ -5,19 +5,14 @@
  *
  * @since 4.0.0
  */
-import * as Combiner from "./Combiner.ts"
-import * as Equal from "./Equal.ts"
+import * as BI from "./BigInt.ts"
+import type * as Brand from "./Brand.ts"
+import type * as Combiner from "./Combiner.ts"
 import type * as Equ from "./Equivalence.ts"
 import { dual } from "./Function.ts"
-import * as Hash from "./Hash.ts"
-import type * as Inspectable from "./Inspectable.ts"
-import { NodeInspectSymbol } from "./Inspectable.ts"
 import * as Option from "./Option.ts"
-import * as order from "./Order.ts"
-import type { Pipeable } from "./Pipeable.ts"
-import { pipeArguments } from "./Pipeable.ts"
-import { hasProperty } from "./Predicate.ts"
-import * as Reducer from "./Reducer.ts"
+import type * as order from "./Order.ts"
+import type * as Reducer from "./Reducer.ts"
 
 const TypeId = "~effect/ByteSize"
 
@@ -32,18 +27,50 @@ const binaryBase = BigInt(1024)
  * @category models
  * @since 4.0.0
  */
-export interface ByteSize extends Equal.Equal, Pipeable, Inspectable.Inspectable {
-  readonly [TypeId]: typeof TypeId
-  readonly value: bigint
-}
+export type ByteSize = Brand.Branded<bigint, typeof TypeId>
 
 /**
  * Values accepted by byte-size decoding operations.
  *
+ * **Details**
+ *
+ * String inputs require a non-negative decimal integer without leading zeros,
+ * followed by a canonical unit symbol or lowercase unit name, optionally
+ * separated by one space. Numeric inputs are validated at runtime.
+ *
+ * @see {@link fromString} for external strings and fractional quantities
+ * @see {@link fromStringUnsafe} for throwing string validation
  * @category models
  * @since 4.0.0
  */
-export type Input = ByteSize | bigint | number | string
+export type Input = ByteSize | bigint | number | `${IntegerQuantity}${"" | " "}${InputUnit}`
+
+// Combining these constraints excludes signs, radix prefixes, leading zeros,
+// fractions, and exponent notation without limiting the number of digits.
+type IntegerQuantity = "0" | (`${bigint}` & `${"1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"}${string}`)
+
+type InputUnit =
+  | Unit
+  | `${
+    | ""
+    | "kilo"
+    | "mega"
+    | "giga"
+    | "tera"
+    | "peta"
+    | "exa"
+    | "zetta"
+    | "yotta"
+    | "ronna"
+    | "quetta"
+    | "kibi"
+    | "mebi"
+    | "gibi"
+    | "tebi"
+    | "pebi"
+    | "exbi"
+    | "zebi"
+    | "yobi"}byte${"" | "s"}`
 
 /**
  * Canonical decimal byte unit symbols.
@@ -147,33 +174,7 @@ const allUnits = [...decimalUnits, ...binaryUnits.slice(1)]
 const unitsByName = new Map(allUnits.flatMap((unit) => unit.names.map((name) => [name, unit] as const)))
 const unitsBySymbol = new Map(allUnits.map((unit) => [unit.symbol, unit] as const))
 
-const ByteSizeProto: Omit<ByteSize, "value"> = {
-  [TypeId]: TypeId,
-  [Hash.symbol](this: ByteSize) {
-    return Hash.hash(this.value)
-  },
-  [Equal.symbol](this: ByteSize, that: unknown): boolean {
-    return isByteSize(that) && this.value === that.value
-  },
-  toString(this: ByteSize) {
-    return `${this.value} ${this.value === bigint1 ? "byte" : "bytes"}`
-  },
-  toJSON(this: ByteSize) {
-    return { _id: "ByteSize", bytes: `${this.value}` }
-  },
-  [NodeInspectSymbol]() {
-    return this.toJSON()
-  },
-  pipe() {
-    return pipeArguments(this, arguments)
-  }
-}
-
-const make = (value: bigint): ByteSize => {
-  const byteSize = Object.create(ByteSizeProto)
-  byteSize.value = value
-  return byteSize
-}
+const make = (value: bigint): ByteSize => value as ByteSize
 
 /**
  * The byte size containing zero bytes.
@@ -206,7 +207,21 @@ const fromQuantity = (quantity: number | bigint, unit: UnitInfo): ByteSize => {
   return make(BigInt(value))
 }
 
-const parse = (input: string): ByteSize => {
+/**
+ * Parses a byte-size string and throws for invalid syntax, unsupported units,
+ * or quantities that do not represent non-negative integral bytes.
+ *
+ * **Details**
+ *
+ * Accepts decimal fractions, canonical SI and IEC symbols, lowercase unit
+ * names, and whitespace around the quantity and unit. Parsing uses exact
+ * bigint arithmetic, including above the safe integer range.
+ *
+ * @see {@link fromString} for non-throwing validation
+ * @category constructors
+ * @since 4.0.0
+ */
+export const fromStringUnsafe = (input: string): ByteSize => {
   const match = /^\s*(\d+)(?:\.(\d+))?\s*([A-Za-z]+)\s*$/.exec(input)
   if (match === null) return invalid(`unsupported syntax ${JSON.stringify(input)}`)
   const unit = unitsByName.get(match[3])
@@ -220,6 +235,21 @@ const parse = (input: string): ByteSize => {
   return make(numerator / scale)
 }
 
+/**
+ * Parses a byte-size string, returning `None` for invalid syntax, unsupported
+ * units, or quantities that do not represent non-negative integral bytes.
+ *
+ * **Details**
+ *
+ * Accepts external strings and fractional quantities using the same syntax
+ * as `fromStringUnsafe`.
+ *
+ * @see {@link fromStringUnsafe} for throwing validation
+ * @category constructors
+ * @since 4.0.0
+ */
+export const fromString: (input: string) => Option.Option<ByteSize> = Option.liftThrowable(fromStringUnsafe)
+
 /**
  * Decodes a trusted input into a byte size and throws for invalid input.
  *
@@ -234,9 +264,7 @@ export const fromInputUnsafe = (input: Input): ByteSize => {
     case "number":
       return fromNumber(input)
     case "string":
-      return parse(input)
-    case "object":
-      if (isByteSize(input)) return input
+      return fromStringUnsafe(input)
   }
   return invalid(`unsupported input ${input}`)
 }
@@ -267,126 +295,126 @@ const unitConstructor = (symbol: Unit) => (value: number | bigint): ByteSize =>
  * @category constructors
  * @since 4.0.0
  */
-export const kilobytes = unitConstructor("kB")
+export const kilobytes: (value: number | bigint) => ByteSize = unitConstructor("kB")
 /**
  * Creates a decimal megabyte value.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const megabytes = unitConstructor("MB")
+export const megabytes: (value: number | bigint) => ByteSize = unitConstructor("MB")
 /**
  * Creates a decimal gigabyte value.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const gigabytes = unitConstructor("GB")
+export const gigabytes: (value: number | bigint) => ByteSize = unitConstructor("GB")
 /**
  * Creates a decimal terabyte value.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const terabytes = unitConstructor("TB")
+export const terabytes: (value: number | bigint) => ByteSize = unitConstructor("TB")
 /**
  * Creates a decimal petabyte value.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const petabytes = unitConstructor("PB")
+export const petabytes: (value: number | bigint) => ByteSize = unitConstructor("PB")
 /**
  * Creates a decimal exabyte value.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const exabytes = unitConstructor("EB")
+export const exabytes: (value: number | bigint) => ByteSize = unitConstructor("EB")
 /**
  * Creates a decimal zettabyte value.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const zettabytes = unitConstructor("ZB")
+export const zettabytes: (value: number | bigint) => ByteSize = unitConstructor("ZB")
 /**
  * Creates a decimal yottabyte value.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const yottabytes = unitConstructor("YB")
+export const yottabytes: (value: number | bigint) => ByteSize = unitConstructor("YB")
 /**
  * Creates a decimal ronnabyte value.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const ronnabytes = unitConstructor("RB")
+export const ronnabytes: (value: number | bigint) => ByteSize = unitConstructor("RB")
 /**
  * Creates a decimal quettabyte value.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const quettabytes = unitConstructor("QB")
+export const quettabytes: (value: number | bigint) => ByteSize = unitConstructor("QB")
 /**
  * Creates a binary kibibyte value.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const kibibytes = unitConstructor("KiB")
+export const kibibytes: (value: number | bigint) => ByteSize = unitConstructor("KiB")
 /**
  * Creates a binary mebibyte value.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const mebibytes = unitConstructor("MiB")
+export const mebibytes: (value: number | bigint) => ByteSize = unitConstructor("MiB")
 /**
  * Creates a binary gibibyte value.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const gibibytes = unitConstructor("GiB")
+export const gibibytes: (value: number | bigint) => ByteSize = unitConstructor("GiB")
 /**
  * Creates a binary tebibyte value.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const tebibytes = unitConstructor("TiB")
+export const tebibytes: (value: number | bigint) => ByteSize = unitConstructor("TiB")
 /**
  * Creates a binary pebibyte value.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const pebibytes = unitConstructor("PiB")
+export const pebibytes: (value: number | bigint) => ByteSize = unitConstructor("PiB")
 /**
  * Creates a binary exbibyte value.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const exbibytes = unitConstructor("EiB")
+export const exbibytes: (value: number | bigint) => ByteSize = unitConstructor("EiB")
 /**
  * Creates a binary zebibyte value.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const zebibytes = unitConstructor("ZiB")
+export const zebibytes: (value: number | bigint) => ByteSize = unitConstructor("ZiB")
 /**
  * Creates a binary yobibyte value.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const yobibytes = unitConstructor("YiB")
+export const yobibytes: (value: number | bigint) => ByteSize = unitConstructor("YiB")
 
 /**
  * Checks whether a value is a byte size.
@@ -394,7 +422,7 @@ export const yobibytes = unitConstructor("YiB")
  * @category guards
  * @since 4.0.0
  */
-export const isByteSize = (input: unknown): input is ByteSize => hasProperty(input, TypeId)
+export const isByteSize = (input: unknown): input is ByteSize => typeof input === "bigint" && input >= bigint0
 
 /**
  * Checks whether a byte size is zero.
@@ -402,7 +430,7 @@ export const isByteSize = (input: unknown): input is ByteSize => hasProperty(inp
  * @category predicates
  * @since 4.0.0
  */
-export const isZero = (self: ByteSize): boolean => self.value === bigint0
+export const isZero = (self: ByteSize): boolean => self === bigint0
 
 /**
  * Returns the exact byte count as a bigint.
@@ -410,7 +438,7 @@ export const isZero = (self: ByteSize): boolean => self.value === bigint0
  * @category getters
  * @since 4.0.0
  */
-export const toBigInt = (self: ByteSize): bigint => self.value
+export const toBigInt = (self: ByteSize): bigint => self
 
 /**
  * Converts a byte size to a safe integer, returning `None` when it is too large.
@@ -418,10 +446,7 @@ export const toBigInt = (self: ByteSize): bigint => self.value
  * @category converting
  * @since 4.0.0
  */
-export const toNumber = (self: ByteSize): Option.Option<number> => {
-  const value = Number(self.value)
-  return Number.isSafeInteger(value) ? Option.some(value) : Option.none()
-}
+export const toNumber: (self: ByteSize) => Option.Option<number> = BI.toNumber
 
 /**
  * Converts a byte size to a safe integer and throws when it is too large.
@@ -430,7 +455,7 @@ export const toNumber = (self: ByteSize): Option.Option<number> => {
  * @since 4.0.0
  */
 export const toNumberUnsafe = (self: ByteSize): number =>
-  Option.getOrThrowWith(toNumber(self), () => new Error(`ByteSize exceeds Number.MAX_SAFE_INTEGER: ${self.value}`))
+  Option.getOrThrowWith(toNumber(self), () => new Error(`ByteSize exceeds Number.MAX_SAFE_INTEGER: ${self}`))
 
 /**
  * Converts a byte size to an approximate number of the specified unit.
@@ -441,7 +466,7 @@ export const toNumberUnsafe = (self: ByteSize): number =>
 export const toUnit: {
   (unit: Unit): (self: ByteSize) => number
   (self: ByteSize, unit: Unit): number
-} = dual(2, (self: ByteSize, unit: Unit) => Number(self.value) / Number(unitsBySymbol.get(unit)!.factor))
+} = dual(2, (self: ByteSize, unit: Unit) => Number(self) / Number(unitsBySymbol.get(unit)!.factor))
 
 /**
  * Provides an order for byte sizes.
@@ -449,9 +474,7 @@ export const toUnit: {
  * @category instances
  * @since 4.0.0
  */
-export const Order: order.Order<ByteSize> = order.make((self, that) =>
-  self.value < that.value ? -1 : self.value > that.value ? 1 : 0
-)
+export const Order: order.Order<ByteSize> = BI.Order
 
 /**
  * Provides an equivalence for byte sizes.
@@ -459,7 +482,7 @@ export const Order: order.Order<ByteSize> = order.make((self, that) =>
  * @category instances
  * @since 4.0.0
  */
-export const Equivalence: Equ.Equivalence<ByteSize> = (self, that) => self.value === that.value
+export const Equivalence: Equ.Equivalence<ByteSize> = BI.Equivalence
 
 /**
  * Returns whether a byte size is in an inclusive range.
@@ -470,7 +493,7 @@ export const Equivalence: Equ.Equivalence<ByteSize> = (self, that) => self.value
 export const between: {
   (options: { minimum: ByteSize; maximum: ByteSize }): (self: ByteSize) => boolean
   (self: ByteSize, options: { minimum: ByteSize; maximum: ByteSize }): boolean
-} = order.isBetween(Order)
+} = BI.between
 
 /**
  * Returns the smaller byte size.
@@ -481,7 +504,7 @@ export const between: {
 export const min: {
   (that: ByteSize): (self: ByteSize) => ByteSize
   (self: ByteSize, that: ByteSize): ByteSize
-} = order.min(Order)
+} = BI.min as any
 
 /**
  * Returns the larger byte size.
@@ -492,7 +515,7 @@ export const min: {
 export const max: {
   (that: ByteSize): (self: ByteSize) => ByteSize
   (self: ByteSize, that: ByteSize): ByteSize
-} = order.max(Order)
+} = BI.max as any
 
 /**
  * Constrains a byte size to an inclusive range.
@@ -503,7 +526,7 @@ export const max: {
 export const clamp: {
   (options: { minimum: ByteSize; maximum: ByteSize }): (self: ByteSize) => ByteSize
   (self: ByteSize, options: { minimum: ByteSize; maximum: ByteSize }): ByteSize
-} = order.clamp(Order)
+} = BI.clamp as any
 
 /**
  * Checks whether the first byte size is less than the second.
@@ -514,7 +537,7 @@ export const clamp: {
 export const isLessThan: {
   (that: ByteSize): (self: ByteSize) => boolean
   (self: ByteSize, that: ByteSize): boolean
-} = order.isLessThan(Order)
+} = BI.isLessThan
 
 /**
  * Checks whether the first byte size is at most the second.
@@ -525,7 +548,7 @@ export const isLessThan: {
 export const isLessThanOrEqualTo: {
   (that: ByteSize): (self: ByteSize) => boolean
   (self: ByteSize, that: ByteSize): boolean
-} = order.isLessThanOrEqualTo(Order)
+} = BI.isLessThanOrEqualTo
 
 /**
  * Checks whether the first byte size is greater than the second.
@@ -536,7 +559,7 @@ export const isLessThanOrEqualTo: {
 export const isGreaterThan: {
   (that: ByteSize): (self: ByteSize) => boolean
   (self: ByteSize, that: ByteSize): boolean
-} = order.isGreaterThan(Order)
+} = BI.isGreaterThan
 
 /**
  * Checks whether the first byte size is at least the second.
@@ -547,7 +570,7 @@ export const isGreaterThan: {
 export const isGreaterThanOrEqualTo: {
   (that: ByteSize): (self: ByteSize) => boolean
   (self: ByteSize, that: ByteSize): boolean
-} = order.isGreaterThanOrEqualTo(Order)
+} = BI.isGreaterThanOrEqualTo
 
 /**
  * Checks whether two byte sizes contain the same count.
@@ -569,7 +592,7 @@ export const equals: {
 export const sum: {
   (that: ByteSize): (self: ByteSize) => ByteSize
   (self: ByteSize, that: ByteSize): ByteSize
-} = dual(2, (self: ByteSize, that: ByteSize) => make(self.value + that.value))
+} = BI.sum as any
 
 /**
  * Subtracts byte sizes, returning `None` on underflow.
@@ -582,8 +605,7 @@ export const subtract: {
   (self: ByteSize, that: ByteSize): Option.Option<ByteSize>
 } = dual(
   2,
-  (self: ByteSize, that: ByteSize) =>
-    self.value < that.value ? Option.none() : Option.some(make(self.value - that.value))
+  (self: ByteSize, that: ByteSize) => self < that ? Option.none() : Option.some(make(self - that))
 )
 
 /**
@@ -596,8 +618,8 @@ export const subtractUnsafe: {
   (that: ByteSize): (self: ByteSize) => ByteSize
   (self: ByteSize, that: ByteSize): ByteSize
 } = dual(2, (self: ByteSize, that: ByteSize) => {
-  if (self.value < that.value) throw new Error(`ByteSize subtraction underflow: ${self.value} - ${that.value}`)
-  return make(self.value - that.value)
+  if (self < that) throw new Error(`ByteSize subtraction underflow: ${self} - ${that}`)
+  return make(self - that)
 })
 
 const scalar = (input: number | bigint, positive: boolean): bigint | undefined => {
@@ -616,7 +638,7 @@ export const times: {
   (self: ByteSize, multiplier: number | bigint): Option.Option<ByteSize>
 } = dual(2, (self: ByteSize, multiplier: number | bigint) => {
   const value = scalar(multiplier, false)
-  return value === undefined ? Option.none() : Option.some(make(self.value * value))
+  return value === undefined ? Option.none() : Option.some(make(self * value))
 })
 
 /**
@@ -630,7 +652,7 @@ export const divide: {
   (self: ByteSize, divisor: number | bigint): Option.Option<ByteSize>
 } = dual(2, (self: ByteSize, divisor: number | bigint) => {
   const value = scalar(divisor, true)
-  return value === undefined ? Option.none() : Option.some(make(self.value / value))
+  return value === undefined ? Option.none() : Option.some(make(self / value))
 })
 
 const validatePrecision = (precision: number): number => {
@@ -660,19 +682,19 @@ export const format = (self: ByteSize, options: FormatOptions = {}): string => {
   const precision = validatePrecision(options.precision ?? 2)
   const trailingZeros = options.trailingZeros ?? false
   if (options.unit !== undefined) {
-    return formatWithUnit(self.value, unitsBySymbol.get(options.unit)!, precision, trailingZeros)
+    return formatWithUnit(self, unitsBySymbol.get(options.unit)!, precision, trailingZeros)
   }
   const units = options.system === "decimal" ? decimalUnits : binaryUnits
-  if (self.value === bigint0) return "0 B"
+  if (self === bigint0) return "0 B"
   let index = units.length - 1
-  while (index > 0 && self.value < units[index].factor) index--
+  while (index > 0 && self < units[index].factor) index--
   if (index < units.length - 1) {
     const scale = BigInt(10) ** BigInt(precision)
-    const rounded = (self.value * scale * BigInt(2) + units[index].factor) / (units[index].factor * BigInt(2))
+    const rounded = (self * scale * BigInt(2) + units[index].factor) / (units[index].factor * BigInt(2))
     const base = options.system === "decimal" ? decimalBase : binaryBase
     if (rounded >= base * scale) index++
   }
-  return formatWithUnit(self.value, units[index], precision, trailingZeros)
+  return formatWithUnit(self, units[index], precision, trailingZeros)
 }
 
 /**
@@ -681,7 +703,7 @@ export const format = (self: ByteSize, options: FormatOptions = {}): string => {
  * @category math
  * @since 4.0.0
  */
-export const ReducerSum: Reducer.Reducer<ByteSize> = Reducer.make(sum, zero)
+export const ReducerSum: Reducer.Reducer<ByteSize> = BI.ReducerSum as any
 
 /**
  * Combiner that keeps the largest byte size.
@@ -689,7 +711,7 @@ export const ReducerSum: Reducer.Reducer<ByteSize> = Reducer.make(sum, zero)
  * @category math
  * @since 4.0.0
  */
-export const CombinerMax: Combiner.Combiner<ByteSize> = Combiner.max(Order)
+export const CombinerMax: Combiner.Combiner<ByteSize> = BI.CombinerMax as any
 
 /**
  * Combiner that keeps the smallest byte size.
@@ -697,4 +719,4 @@ export const CombinerMax: Combiner.Combiner<ByteSize> = Combiner.max(Order)
  * @category math
  * @since 4.0.0
  */
-export const CombinerMin: Combiner.Combiner<ByteSize> = Combiner.min(Order)
+export const CombinerMin: Combiner.Combiner<ByteSize> = BI.CombinerMin as any
diff --git a/repos/effect/packages/effect/src/Cache.ts b/repos/effect/packages/effect/src/Cache.ts
index d1e3091b2..0bc335802 100644
--- a/repos/effect/packages/effect/src/Cache.ts
+++ b/repos/effect/packages/effect/src/Cache.ts
@@ -447,7 +447,10 @@ export const get: {
           MutableHashMap.remove(self.map, key)
         }
       })
-      MutableHashMap.set(self.map, key, entry)
+      const exit = entry.fiber.pollUnsafe()
+      if (exit === undefined || !effect.exitHasInterrupts(exit)) {
+        MutableHashMap.set(self.map, key, entry)
+      }
       if (Number.isFinite(self.capacity)) {
         checkCapacity(self)
       }
@@ -1041,6 +1044,10 @@ export const invalidateWhen: {
       return oentry.await().pipe(
         effect.map((value) => {
           if (f(value)) {
+            const current = MutableHashMap.get(self.map, key)
+            if (Option.isNone(current) || current.value !== oentry) {
+              return false
+            }
             MutableHashMap.remove(self.map, key)
             return true
           }
@@ -1165,12 +1172,18 @@ export const refresh: {
       }
       entry.fiber.addObserver((exit) => {
         if (effect.exitHasInterrupts(exit)) {
-          if (!existing) MutableHashMap.remove(self.map, key)
+          const current = MutableHashMap.get(self.map, key)
+          if (Option.isSome(current) && current.value === entry) {
+            MutableHashMap.remove(self.map, key)
+          }
           return
         }
         const ttl = self.timeToLive(exit, key)
         if (Duration.isZero(ttl)) {
-          MutableHashMap.remove(self.map, key)
+          const current = MutableHashMap.get(self.map, key)
+          if (existing || (Option.isSome(current) && current.value === entry)) {
+            MutableHashMap.remove(self.map, key)
+          }
           return effect.void
         }
         entry.expiresAt = Duration.isFinite(ttl)
@@ -1178,6 +1191,7 @@ export const refresh: {
           : undefined
         if (existing) {
           MutableHashMap.set(self.map, key, entry)
+          checkCapacity(self)
         }
       })
       return entry.await()
diff --git a/repos/effect/packages/effect/src/Cause.ts b/repos/effect/packages/effect/src/Cause.ts
index 2511f27bc..9cda574ab 100644
--- a/repos/effect/packages/effect/src/Cause.ts
+++ b/repos/effect/packages/effect/src/Cause.ts
@@ -261,7 +261,7 @@ export declare namespace Cause {
     readonly [ReasonTypeId]: typeof ReasonTypeId
     readonly _tag: Tag
     readonly annotations: ReadonlyMap<string, unknown>
-    annotate(annotations: Context.Context<never> | ReadonlyMap<string, unknown>, options?: {
+    annotate(annotations: Context.Context<never>, options?: {
       readonly overwrite?: boolean | undefined
     }): this
   }
diff --git a/repos/effect/packages/effect/src/Channel.ts b/repos/effect/packages/effect/src/Channel.ts
index d119dcf6c..5845d91ba 100644
--- a/repos/effect/packages/effect/src/Channel.ts
+++ b/repos/effect/packages/effect/src/Channel.ts
@@ -2035,7 +2035,7 @@ export const mapDoneEffect: {
 )
 
 const concurrencyIsSequential = (
-  concurrency: number | "unbounded" | undefined
+  concurrency: Types.Concurrency | undefined
 ) => concurrency === undefined || (concurrency !== "unbounded" && concurrency <= 1)
 
 /**
@@ -2074,7 +2074,7 @@ export const mapEffect: {
   <OutElem, OutElem1, OutErr1, Env1>(
     f: (d: OutElem, i: number) => Effect.Effect<OutElem1, OutErr1, Env1>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Types.Concurrency | undefined
       readonly unordered?: boolean | undefined
     }
   ): <OutErr, OutDone, InElem, InErr, InDone, Env>(
@@ -2084,7 +2084,7 @@ export const mapEffect: {
     self: Channel<OutElem, OutErr, OutDone, InElem, InErr, InDone, Env>,
     f: (d: OutElem, i: number) => Effect.Effect<OutElem1, OutErr1, Env1>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Types.Concurrency | undefined
       readonly unordered?: boolean | undefined
     }
   ): Channel<OutElem1, OutErr | OutErr1, OutDone, InElem, InErr, InDone, Env | Env1>
@@ -2094,7 +2094,7 @@ export const mapEffect: {
     self: Channel<OutElem, OutErr, OutDone, InElem, InErr, InDone, Env>,
     f: (d: OutElem, i: number) => Effect.Effect<OutElem1, OutErr1, Env1>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Types.Concurrency | undefined
       readonly unordered?: boolean | undefined
     }
   ): Channel<OutElem1, OutErr | OutErr1, OutDone, InElem, InErr, InDone, Env | Env1> =>
@@ -2138,7 +2138,7 @@ const mapEffectConcurrent = <
   self: Channel<OutElem, OutErr, OutDone, InElem, InErr, InDone, Env>,
   f: (o: OutElem, i: number) => Effect.Effect<OutElem2, EX, RX>,
   options: {
-    readonly concurrency: number | "unbounded"
+    readonly concurrency: Types.Concurrency
     readonly unordered?: boolean | undefined
   }
 ): Channel<OutElem2, OutErr | EX, OutDone, InElem, InErr, InDone, Env | RX> =>
@@ -2320,7 +2320,7 @@ export const tap: {
   <OutElem, X, OutErr1, Env1>(
     f: (d: Types.NoInfer<OutElem>) => Effect.Effect<X, OutErr1, Env1>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Types.Concurrency | undefined
     }
   ): <OutErr, OutDone, InElem, InErr, InDone, Env>(
     self: Channel<OutElem, OutErr, OutDone, InElem, InErr, InDone, Env>
@@ -2329,7 +2329,7 @@ export const tap: {
     self: Channel<OutElem, OutErr, OutDone, InElem, InErr, InDone, Env>,
     f: (d: Types.NoInfer<OutElem>) => Effect.Effect<X, OutErr1, Env1>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Types.Concurrency | undefined
     }
   ): Channel<OutElem, OutErr | OutErr1, OutDone, InElem, InErr, InDone, Env | Env1>
 } = dual(
@@ -2338,7 +2338,7 @@ export const tap: {
     self: Channel<OutElem, OutErr, OutDone, InElem, InErr, InDone, Env>,
     f: (d: Types.NoInfer<OutElem>) => Effect.Effect<X, OutErr1, Env1>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Types.Concurrency | undefined
     }
   ): Channel<OutElem, OutErr | OutErr1, OutDone, InElem, InErr, InDone, Env | Env1> =>
     mapEffect(self, (a) => Effect.as(f(a), a), options)
@@ -2384,7 +2384,7 @@ export const flatMap: {
   <OutElem, OutElem1, OutErr1, OutDone1, InElem1, InErr1, InDone1, Env1>(
     f: (d: OutElem) => Channel<OutElem1, OutErr1, OutDone1, InElem1, InErr1, InDone1, Env1>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Types.Concurrency | undefined
       readonly bufferSize?: number | undefined
     }
   ): <OutErr, OutDone, InElem, InErr, InDone, Env>(
@@ -2417,7 +2417,7 @@ export const flatMap: {
     self: Channel<OutElem, OutErr, OutDone, InElem, InErr, InDone, Env>,
     f: (d: OutElem) => Channel<OutElem1, OutErr1, OutDone1, InElem1, InErr1, InDone1, Env1>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Types.Concurrency | undefined
       readonly bufferSize?: number | undefined
     }
   ): Channel<
@@ -2450,7 +2450,7 @@ export const flatMap: {
     self: Channel<OutElem, OutErr, OutDone, InElem, InErr, InDone, Env>,
     f: (d: OutElem) => Channel<OutElem1, OutErr1, OutDone1, InElem1, InErr1, InDone1, Env1>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Types.Concurrency | undefined
       readonly bufferSize?: number | undefined
     }
   ): Channel<
@@ -2543,7 +2543,7 @@ const flatMapConcurrent = <
   self: Channel<OutElem, OutErr, OutDone, InElem, InErr, InDone, Env>,
   f: (d: OutElem) => Channel<OutElem1, OutErr1, OutDone1, InElem1, InErr1, InDone1, Env1>,
   options: {
-    readonly concurrency: number | "unbounded"
+    readonly concurrency: Types.Concurrency
     readonly bufferSize?: number | undefined
   }
 ): Channel<
@@ -4143,6 +4143,97 @@ export const catchCause: {
     })
   }))
 
+/**
+ * Recovers from defects using the provided function.
+ *
+ * **Details**
+ *
+ * Typed failures and interruptions are not caught.
+ *
+ * **Example** (Recovering from a defect)
+ *
+ * ```ts import.meta.vitest
+ * import { Channel, Effect } from "effect"
+ *
+ * const channel = Channel.fromEffect(Effect.die("boom")).pipe(
+ *   Channel.catchDefect((defect) => Channel.succeed(`recovered: ${defect}`))
+ * )
+ *
+ * Effect.runSync(Channel.runCollect(channel)) // => ["recovered: boom"]
+ * ```
+ *
+ * @category error handling
+ * @since 4.0.0
+ */
+export const catchDefect: {
+  <OutElem1, OutErr1, OutDone1, InElem1, InErr1, InDone1, Env1>(
+    f: (defect: unknown) => Channel<OutElem1, OutErr1, OutDone1, InElem1, InErr1, InDone1, Env1>
+  ): <OutElem, OutErr, OutDone, InElem, InErr, InDone, Env>(
+    self: Channel<OutElem, OutErr, OutDone, InElem, InErr, InDone, Env>
+  ) => Channel<
+    OutElem | OutElem1,
+    OutErr | OutErr1,
+    OutDone | OutDone1,
+    InElem & InElem1,
+    InErr & InErr1,
+    InDone & InDone1,
+    Env | Env1
+  >
+  <
+    OutElem,
+    OutErr,
+    OutDone,
+    InElem,
+    InErr,
+    InDone,
+    Env,
+    OutElem1,
+    OutErr1,
+    OutDone1,
+    InElem1,
+    InErr1,
+    InDone1,
+    Env1
+  >(
+    self: Channel<OutElem, OutErr, OutDone, InElem, InErr, InDone, Env>,
+    f: (defect: unknown) => Channel<OutElem1, OutErr1, OutDone1, InElem1, InErr1, InDone1, Env1>
+  ): Channel<
+    OutElem | OutElem1,
+    OutErr | OutErr1,
+    OutDone | OutDone1,
+    InElem & InElem1,
+    InErr & InErr1,
+    InDone & InDone1,
+    Env | Env1
+  >
+} = dual(2, <
+  OutElem,
+  OutErr,
+  OutDone,
+  InElem,
+  InErr,
+  InDone,
+  Env,
+  OutElem1,
+  OutErr1,
+  OutDone1,
+  InElem1,
+  InErr1,
+  InDone1,
+  Env1
+>(
+  self: Channel<OutElem, OutErr, OutDone, InElem, InErr, InDone, Env>,
+  f: (defect: unknown) => Channel<OutElem1, OutErr1, OutDone1, InElem1, InErr1, InDone1, Env1>
+): Channel<
+  OutElem | OutElem1,
+  OutErr | OutErr1,
+  OutDone | OutDone1,
+  InElem & InElem1,
+  InErr & InErr1,
+  InDone & InDone1,
+  Env | Env1
+> => catchCauseFilter(self, Cause.findDefect, f))
+
 /**
  * Runs an effect with the full failure `Cause` when the channel fails, then
  * fails the returned channel with the original cause.
@@ -5983,7 +6074,7 @@ export const switchMap: {
   <OutElem, OutElem1, OutErr1, OutDone1, InElem1, InErr1, InDone1, Env1>(
     f: (d: OutElem) => Channel<OutElem1, OutErr1, OutDone1, InElem1, InErr1, InDone1, Env1>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Types.Concurrency | undefined
       readonly bufferSize?: number | undefined
     }
   ): <OutErr, OutDone, InElem, InErr, InDone, Env>(
@@ -6016,7 +6107,7 @@ export const switchMap: {
     self: Channel<OutElem, OutErr, OutDone, InElem, InErr, InDone, Env>,
     f: (d: OutElem) => Channel<OutElem1, OutErr1, OutDone1, InElem1, InErr1, InDone1, Env1>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Types.Concurrency | undefined
       readonly bufferSize?: number | undefined
     }
   ): Channel<
@@ -6049,7 +6140,7 @@ export const switchMap: {
     self: Channel<OutElem, OutErr, OutDone, InElem, InErr, InDone, Env>,
     f: (d: OutElem) => Channel<OutElem1, OutErr1, OutDone1, InElem1, InErr1, InDone1, Env1>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Types.Concurrency | undefined
       readonly bufferSize?: number | undefined
     }
   ): Channel<
@@ -6109,7 +6200,7 @@ export const switchMap: {
  */
 export const mergeAll: {
   (options: {
-    readonly concurrency: number | "unbounded"
+    readonly concurrency: Types.Concurrency
     readonly bufferSize?: number | undefined
     readonly switch?: boolean | undefined
   }): <OutElem, OutErr1, OutDone1, InElem1, InErr1, InDone1, Env1, OutErr, OutDone, InElem, InErr, InDone, Env>(
@@ -6142,7 +6233,7 @@ export const mergeAll: {
       Env
     >,
     options: {
-      readonly concurrency: number | "unbounded"
+      readonly concurrency: Types.Concurrency
       readonly bufferSize?: number | undefined
       readonly switch?: boolean | undefined
     }
@@ -6168,7 +6259,7 @@ export const mergeAll: {
       Env
     >,
     { bufferSize = 16, concurrency, switch: switch_ = false }: {
-      readonly concurrency: number | "unbounded"
+      readonly concurrency: Types.Concurrency
       readonly bufferSize?: number | undefined
       readonly switch?: boolean | undefined
     }
@@ -6515,9 +6606,8 @@ export const splitLines = <Err, Done>(): Channel<
       // Accumulates text that has not yet been terminated by a line break.
       // Content is carried across chunks until a terminator is found.
       let stringBuilder = ""
-      // Set when a chunk ends with \r so the next chunk can check whether
-      // the following character is \n (completing a \r\n pair) or not
-      // (standalone \r, which is itself a line terminator).
+      // A trailing \r completes the line immediately. Remember it only to
+      // suppress a leading \n in the next nonempty string.
       let midCRLF = false
       // Remembers the upstream Done value after the first time the upstream
       // signals completion, so subsequent pulls return Done immediately
@@ -6544,11 +6634,8 @@ export const splitLines = <Err, Done>(): Channel<
             let indexOfLF = str.indexOf("\n")
             if (midCRLF) {
               if (indexOfLF === 0) {
-                pushLine("")
                 from = 1
                 indexOfLF = str.indexOf("\n", from)
-              } else {
-                pushLine("")
               }
               midCRLF = false
             }
@@ -6558,18 +6645,19 @@ export const splitLines = <Err, Done>(): Channel<
                 from = indexOfLF + 1
                 indexOfLF = str.indexOf("\n", from)
               } else {
+                pushLine(str.substring(from, indexOfCR))
                 if (str.length === indexOfCR + 1) {
                   midCRLF = true
+                  from = str.length
                   indexOfCR = -1
                 } else {
-                  pushLine(str.substring(from, indexOfCR))
                   from = indexOfCR + (indexOfLF === indexOfCR + 1 ? 2 : 1)
                   indexOfCR = str.indexOf("\r", from)
                   indexOfLF = str.indexOf("\n", from)
                 }
               }
             }
-            stringBuilder = stringBuilder + str.substring(from, str.length - (midCRLF ? 1 : 0))
+            stringBuilder = stringBuilder + str.substring(from)
           }
         }
         return Arr.isReadonlyArrayNonEmpty(chunkBuilder) ? chunkBuilder : null
@@ -6584,7 +6672,7 @@ export const splitLines = <Err, Done>(): Channel<
           onFailure: Effect.failCause,
           onDone: (leftover) => {
             done = Option.some(leftover)
-            if (stringBuilder.length > 0 || midCRLF) {
+            if (stringBuilder.length > 0) {
               const last = stringBuilder
               stringBuilder = ""
               midCRLF = false
@@ -7699,7 +7787,7 @@ export const bind: {
     name: Exclude<N, keyof OutElem>,
     f: (a: NoInfer<OutElem>) => Channel<B, OutErr2, OutDone2, InElem2, InErr2, InDone2, Env2>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Types.Concurrency | undefined
       readonly bufferSize?: number | undefined
     }
   ): <OutErr, OutDone, InElem, InErr, InDone, Env>(
@@ -7734,7 +7822,7 @@ export const bind: {
     name: Exclude<N, keyof OutElem>,
     f: (a: NoInfer<OutElem>) => Channel<B, OutErr2, OutDone2, InElem2, InErr2, InDone2, Env2>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Types.Concurrency | undefined
       readonly bufferSize?: number | undefined
     }
   ): Channel<
@@ -7767,7 +7855,7 @@ export const bind: {
   name: Exclude<N, keyof OutElem>,
   f: (a: NoInfer<OutElem>) => Channel<B, OutErr2, OutDone2, InElem2, InErr2, InDone2, Env2>,
   options?: {
-    readonly concurrency?: number | "unbounded" | undefined
+    readonly concurrency?: Types.Concurrency | undefined
     readonly bufferSize?: number | undefined
   }
 ): Channel<
@@ -8068,16 +8156,6 @@ export const runCollect = <OutElem, OutErr, OutDone, Env>(
     return acc
   })
 
-/**
- * Runs a channel and outputs the done value.
- *
- * @category running
- * @since 4.0.0
- */
-export const runDone = <OutElem, OutErr, OutDone, Env>(
-  self: Channel<OutElem, OutErr, OutDone, unknown, unknown, unknown, Env>
-): Effect.Effect<OutDone, OutErr, Env> => runWith(self, identity_, Effect.succeed)
-
 /**
  * Runs a channel until the first output element is available, returning it in
  * an `Option`.
diff --git a/repos/effect/packages/effect/src/ChannelSchema.ts b/repos/effect/packages/effect/src/ChannelSchema.ts
index 6f91859ec..b2a84f438 100644
--- a/repos/effect/packages/effect/src/ChannelSchema.ts
+++ b/repos/effect/packages/effect/src/ChannelSchema.ts
@@ -12,6 +12,7 @@ import * as Channel from "./Channel.ts"
 import * as Effect from "./Effect.ts"
 import { dual } from "./Function.ts"
 import * as Schema from "./Schema.ts"
+import type * as SchemaAST from "./SchemaAST.ts"
 
 /**
  * Creates a channel that encodes non-empty chunks of schema values into the
@@ -96,7 +97,8 @@ export const encodeUnknown: <S extends Schema.Constraint>(
  * @since 4.0.0
  */
 export const decode = <S extends Schema.Constraint>(
-  schema: S
+  schema: S,
+  options?: SchemaAST.ParseOptions
 ) =>
 <IE = never, Done = unknown>(): Channel.Channel<
   Arr.NonEmptyReadonlyArray<S["Type"]>,
@@ -107,7 +109,7 @@ export const decode = <S extends Schema.Constraint>(
   Done,
   S["DecodingServices"]
 > => {
-  const decode = Schema.decodeEffect(Schema.NonEmptyArray(schema))
+  const decode = Schema.decodeEffect(Schema.NonEmptyArray(schema), options)
   return Channel.fromTransform((upstream, _scope) => Effect.succeed(Effect.flatMap(upstream, (chunk) => decode(chunk))))
 }
 
@@ -131,7 +133,8 @@ export const decode = <S extends Schema.Constraint>(
  * @since 4.0.0
  */
 export const decodeUnknown: <S extends Schema.Constraint>(
-  schema: S
+  schema: S,
+  options?: SchemaAST.ParseOptions
 ) => <IE = never, Done = unknown>() => Channel.Channel<
   Arr.NonEmptyReadonlyArray<S["Type"]>,
   IE | Schema.SchemaError,
diff --git a/repos/effect/packages/effect/src/Chunk.ts b/repos/effect/packages/effect/src/Chunk.ts
index 1fe33b94d..1e6a6d94a 100644
--- a/repos/effect/packages/effect/src/Chunk.ts
+++ b/repos/effect/packages/effect/src/Chunk.ts
@@ -249,7 +249,7 @@ const makeChunk = <A>(backing: Backing<A>): Chunk<A> => {
     }
     case "ISlice": {
       chunk.length = backing.length
-      chunk.depth = backing.chunk.depth + 1
+      chunk.depth = 0
       chunk.left = _empty
       chunk.right = _empty
       break
diff --git a/repos/effect/packages/effect/src/Config.ts b/repos/effect/packages/effect/src/Config.ts
index c6eadaba4..3db34fb22 100644
--- a/repos/effect/packages/effect/src/Config.ts
+++ b/repos/effect/packages/effect/src/Config.ts
@@ -12,7 +12,6 @@ import * as ConfigProvider from "./ConfigProvider.ts"
 import * as Effect from "./Effect.ts"
 import * as Effectable from "./Effectable.ts"
 import { dual, memoize } from "./Function.ts"
-import * as InternalConfig from "./internal/config.ts"
 import * as InternalRecord from "./internal/record.ts"
 import * as LogLevel_ from "./LogLevel.ts"
 import * as Option from "./Option.ts"
@@ -692,7 +691,7 @@ const decodeFromCursor = (
     SchemaAST.unknown,
     ast,
     new SchemaTransformation.Transformation(
-      SchemaGetter.transformOrFail((input: unknown) => decode(input as ConfigCursor)),
+      SchemaGetter.transformEffect((input: unknown) => decode(input as ConfigCursor)),
       SchemaGetter.passthrough()
     )
   )
@@ -1194,7 +1193,8 @@ export function Array<V extends Schema.ConstraintCodec<unknown, unknown>>(
   const arrayString = Schema.String.pipe(
     Schema.decodeTo(Schema.toCodecStringTree(array), {
       decode: SchemaGetter.split(resolvedOptions),
-      encode: SchemaGetter.passthrough<ReadonlyArray<string>, Schema.StringTree>({ strict: false }).compose(
+      encode: SchemaGetter.compose(
+        SchemaGetter.passthrough<ReadonlyArray<string>, Schema.StringTree>({ strict: false }),
         SchemaGetter.transform((input) => input.join(separator))
       )
     })
@@ -1271,7 +1271,8 @@ export function Record<
   const recordString = Schema.String.pipe(
     Schema.decodeTo(Schema.toCodecStringTree(record), {
       decode: split.decode,
-      encode: SchemaGetter.passthrough<Record<string, string>, Schema.StringTree>({ strict: false }).compose(
+      encode: SchemaGetter.compose(
+        SchemaGetter.passthrough<Record<string, string>, Schema.StringTree>({ strict: false }),
         split.encode
       )
     })
@@ -1314,7 +1315,7 @@ export function Record<
  * @since 2.0.0
  */
 export function Boolean(name?: string) {
-  return schema(InternalConfig.boolean, name)
+  return schema(Schema.BooleanLiterals, name)
 }
 
 /**
diff --git a/repos/effect/packages/effect/src/ConfigProvider.ts b/repos/effect/packages/effect/src/ConfigProvider.ts
index 9d588b77d..8dd6622c3 100644
--- a/repos/effect/packages/effect/src/ConfigProvider.ts
+++ b/repos/effect/packages/effect/src/ConfigProvider.ts
@@ -9,6 +9,7 @@
  * @since 4.0.0
  */
 
+import * as Arr from "./Array.ts"
 import * as Context from "./Context.ts"
 import * as Data from "./Data.ts"
 import * as Effect from "./Effect.ts"
@@ -958,8 +959,6 @@ function buildEnvTrie(env: Record<string, string | undefined>): EnvTrieNode {
   return trie
 }
 
-const NUMERIC_INDEX = /^(0|[1-9][0-9]*)$/
-
 function nodeAtEnv(
   trie: EnvTrieNode,
   env: Record<string, string | undefined>,
@@ -976,7 +975,7 @@ function nodeAtEnv(
     return leafValue === undefined ? undefined : makeValue(leafValue)
   }
 
-  const allNumeric = children.every((k) => NUMERIC_INDEX.test(k))
+  const allNumeric = children.every(Arr.isCanonicalArrayIndex)
   if (allNumeric) {
     const length = Math.max(...children.map((k) => parseInt(k, 10))) + 1
     return makeArray(length, leafValue)
@@ -1136,7 +1135,7 @@ function interpolate(envValue: string, parsed: Record<string, string>): string {
       : defaultValue ?? ""
 
     return interpolate(
-      envValue.replace(group, value),
+      envValue.replace(group, () => value),
       parsed
     )
   }
diff --git a/repos/effect/packages/effect/src/Context.ts b/repos/effect/packages/effect/src/Context.ts
index 3db89c975..52ee4d14c 100644
--- a/repos/effect/packages/effect/src/Context.ts
+++ b/repos/effect/packages/effect/src/Context.ts
@@ -1031,6 +1031,7 @@ export const getUnsafe: {
  * @since 2.0.0
  */
 export const get: {
+  <I, S>(service: Key<I, S>): (self: Context<I>) => S
   <Services, I extends Services, S>(service: Key<I, S>): (self: Context<Services>) => S
   <Services, I extends Services, S>(self: Context<Services>, service: Key<I, S>): S
 } = getUnsafe
diff --git a/repos/effect/packages/effect/src/Crypto.ts b/repos/effect/packages/effect/src/Crypto.ts
index 489525f05..fa16326e0 100644
--- a/repos/effect/packages/effect/src/Crypto.ts
+++ b/repos/effect/packages/effect/src/Crypto.ts
@@ -11,6 +11,8 @@
  */
 import * as Context from "./Context.ts"
 import * as Effect from "./Effect.ts"
+import * as random from "./internal/random.ts"
+import * as Ulid from "./internal/ulid.ts"
 import * as Uuid from "./internal/uuid.ts"
 import * as PlatformError from "./PlatformError.ts"
 
@@ -151,6 +153,21 @@ export interface Crypto {
    * Generates a cryptographically secure UUIDv7 string.
    */
   readonly randomUUIDv7: Effect.Effect<string, PlatformError.PlatformError>
+
+  /**
+   * Generates a cryptographically secure ULID string.
+   *
+   * **Details**
+   *
+   * ULIDs contain 26 uppercase Crockford base32 characters. The first 10 encode
+   * the `Clock` timestamp in milliseconds; the remaining 16 encode 80 random
+   * bits. ULIDs sort by timestamp, with no ordering guarantee within the same
+   * millisecond.
+   *
+   * Timestamp normalization matches UUIDv7: fractions are truncated, values are
+   * clamped to the 48-bit range, and `NaN` encodes as zero.
+   */
+  readonly randomULID: Effect.Effect<string, PlatformError.PlatformError>
 }
 
 /**
@@ -251,7 +268,7 @@ export const make = (
     random: Effect.sync(() => nextDoubleUnsafe()),
     randomBoolean: Effect.sync(() => nextDoubleUnsafe() > 0.5),
     randomInt: Effect.sync(() => nextIntUnsafe()),
-    randomBetween: (min, max) => Effect.sync(() => nextDoubleUnsafe() * (max - min) + min),
+    randomBetween: (min, max) => Effect.sync(() => random.nextBetween(min, max, nextDoubleUnsafe())),
     randomIntBetween(min, max, options) {
       const extra = options?.halfOpen === true ? 0 : 1
       return Effect.sync(() => {
@@ -274,6 +291,9 @@ export const make = (
     randomUUIDv4: Effect.sync(() => Uuid.v4String(randomBytesUnsafe(16))),
     randomUUIDv7: Effect.clockWith((clock) =>
       Effect.succeed(Uuid.v7String(clock.currentTimeMillisUnsafe(), randomBytesUnsafe(16)))
+    ),
+    randomULID: Effect.clockWith((clock) =>
+      Effect.succeed(Ulid.ulidString(clock.currentTimeMillisUnsafe(), randomBytesUnsafe(10)))
     )
   })
 }
diff --git a/repos/effect/packages/effect/src/Deferred.ts b/repos/effect/packages/effect/src/Deferred.ts
index afe2ab3a9..14e75b964 100644
--- a/repos/effect/packages/effect/src/Deferred.ts
+++ b/repos/effect/packages/effect/src/Deferred.ts
@@ -117,6 +117,12 @@ const DeferredProto = {
   }
 }
 
+const DeferredImpl = function(this: any) {
+  this.resumes = undefined
+  this.effect = undefined
+} as unknown as { new<A, E>(): Deferred<A, E>; prototype: any }
+DeferredImpl.prototype = DeferredProto
+
 /**
  * Creates an empty `Deferred` synchronously outside the `Effect` runtime.
  *
@@ -137,12 +143,7 @@ const DeferredProto = {
  * @category unsafe
  * @since 4.0.0
  */
-export const makeUnsafe = <A, E = never>(): Deferred<A, E> => {
-  const self = Object.create(DeferredProto)
-  self.resumes = undefined
-  self.effect = undefined
-  return self
-}
+export const makeUnsafe = <A, E = never>(): Deferred<A, E> => new DeferredImpl<A, E>()
 
 /**
  * Creates a new `Deferred`.
diff --git a/repos/effect/packages/effect/src/Effect.ts b/repos/effect/packages/effect/src/Effect.ts
index 15c76d4aa..476db097f 100644
--- a/repos/effect/packages/effect/src/Effect.ts
+++ b/repos/effect/packages/effect/src/Effect.ts
@@ -40,7 +40,7 @@ import { CurrentLogAnnotations, CurrentLogSpans } from "./References.ts"
 import type * as Request from "./Request.ts"
 import type { RequestResolver } from "./RequestResolver.ts"
 import type * as Result from "./Result.ts"
-import type { Schedule } from "./Schedule.ts"
+import type { Metadata as ScheduleMetadata, Schedule } from "./Schedule.ts"
 import type { Scheduler } from "./Scheduler.ts"
 import type { Scope } from "./Scope.ts"
 import type {
@@ -227,7 +227,7 @@ export type Services<T> = T extends Effect<infer _A, infer _E, infer _R> ? _R
  * @category guards
  * @since 2.0.0
  */
-export const isEffect: (u: unknown) => u is Effect<any, any, any> = core.isEffect
+export const isEffect: (u: unknown) => u is Effect<unknown, unknown, unknown> = core.isEffect
 
 /**
  * Iterator interface for Effect generators, enabling Effect values to work with generator functions.
@@ -256,6 +256,7 @@ export interface EffectIterator<T extends Effect<any, any, any>> {
  * Namespace containing type utilities for the `Effect.all` function, which handles
  * collecting multiple effects into various output structures.
  *
+ * @category collecting
  * @since 2.0.0
  */
 export declare namespace All {
@@ -331,13 +332,8 @@ export declare namespace All {
           ] ? Mode extends true ? Result.Result<_A, _E> : _A
             : never
         },
-      Mode extends true ? never
-        : keyof T extends never ? never
-        : T[keyof T] extends Effect<infer _A, infer _E, infer _R> ? _E
-        : never,
-      keyof T extends never ? never
-        : T[keyof T] extends Effect<infer _A, infer _E, infer _R> ? _R
-        : never
+      Mode extends true ? never : Error<ObjectValues<T>>,
+      Services<ObjectValues<T>>
     >
     : never
 
@@ -377,6 +373,8 @@ export declare namespace All {
     : [Arg] extends [Iterable<EffectAny>] ? ReturnIterable<Arg, IsDiscard<O>, IsResult<O>>
     : [Arg] extends [Record<string, EffectAny>] ? ReturnObject<Arg, IsDiscard<O>, IsResult<O>>
     : never
+
+  type ObjectValues<T> = T extends unknown ? T[keyof T] : never
 }
 
 /**
@@ -488,7 +486,7 @@ export declare namespace All {
  * ```
  *
  * @see {@link forEach} for iterating over elements and applying an effect.
- * @category combining
+ * @category collecting
  * @since 2.0.0
  */
 export const all: <
@@ -529,7 +527,7 @@ export const all: <
  * await Effect.runPromise(program) // => [['0 is even', '2 is even'], [1, 3]]
  * ```
  *
- * @category filtering
+ * @category collecting
  * @since 2.0.0
  */
 export const partition: {
@@ -578,7 +576,7 @@ export const partition: {
  * output // => ["Adding 1 at index 0", "Adding 2 at index 1", "Adding 3 at index 2", 6]
  * ```
  *
- * @category folding
+ * @category collecting
  * @since 2.0.0
  */
 export const reduce: {
@@ -617,7 +615,7 @@ export const reduce: {
  * await Effect.runPromiseExit(program) // => Exit.fail(["0 is even", "2 is even"])
  * ```
  *
- * @category validation
+ * @category collecting
  * @since 2.0.0
  */
 export const validate: {
@@ -671,7 +669,7 @@ export const validate: {
  * await Effect.runPromise(program) // => Option.some(3)
  * ```
  *
- * @category searching
+ * @category collecting
  * @since 2.0.0
  */
 export const findFirst: {
@@ -699,7 +697,7 @@ export const findFirst: {
  *
  * @see {@link findFirst} for the simpler effectful predicate-based variant
  *
- * @category searching
+ * @category collecting
  * @since 4.0.0
  */
 export const findFirstFilter: {
@@ -773,7 +771,7 @@ export const findFirstFilter: {
  * ```
  *
  * @see {@link all} for combining multiple effects into one.
- * @category sequencing
+ * @category collecting
  * @since 2.0.0
  */
 export const forEach: {
@@ -811,7 +809,7 @@ export const forEach: {
  * await Effect.runPromise(empty) // => Option.none()
  * ```
  *
- * @category getters
+ * @category collecting
  * @since 2.0.0
  */
 export const head: <A, E, R>(
@@ -966,11 +964,12 @@ export const promise: <A>(
  * @category constructors
  * @since 2.0.0
  */
-export const tryPromise: <A, E = Cause.UnknownError>(
-  options:
-    | { readonly try: (signal: AbortSignal) => PromiseLike<A>; readonly catch: (error: unknown) => E }
-    | ((signal: AbortSignal) => PromiseLike<A>)
-) => Effect<A, E> = internal.tryPromise
+export const tryPromise: {
+  <A>(options: (signal: AbortSignal) => PromiseLike<A>): Effect<A, Cause.UnknownError>
+  <A, E>(
+    options: { readonly try: (signal: AbortSignal) => PromiseLike<A>; readonly catch: (error: unknown) => E }
+  ): Effect<A, E>
+} = internal.tryPromise
 
 /**
  * Creates an `Effect` that always succeeds with a given value.
@@ -1272,7 +1271,7 @@ export const never: Effect<never> = internal.never
  * Effect.runSync(program) // => { x: 2, y: 3, sum: 5 }
  * ```
  *
- * @category constructors
+ * @category do notation
  * @since 2.0.0
  */
 export const Do: Effect<{}> = internal.Do
@@ -1289,7 +1288,7 @@ export const Do: Effect<{}> = internal.Do
  * @see {@link Do} for starting from an empty accumulated record
  * @see {@link bind} for adding fields produced by effects
  *
- * @category mapping
+ * @category do notation
  * @since 2.0.0
  */
 export const bindTo: {
@@ -1331,7 +1330,7 @@ export {
    * @see {@link Do} for starting from an empty accumulated record
    * @see {@link gen} for sequencing without accumulating a record
    *
-   * @category mapping
+   * @category do notation
    * @since 2.0.0
    */
   let_ as let
@@ -1361,7 +1360,7 @@ export {
  * @see {@link bindTo} for naming the success value of an existing effect
  * @see {@link gen} for generator-based sequencing without accumulating a record
  *
- * @category sequencing
+ * @category do notation
  * @since 2.0.0
  */
 export const bind: {
@@ -1461,6 +1460,7 @@ export const gen: {
 /**
  * Type helpers for `Effect.gen` generator return signatures.
  *
+ * @category constructors
  * @since 2.0.0
  */
 export declare namespace gen {
@@ -1635,12 +1635,13 @@ export const failCauseSync: <E>(
  */
 export const die: (defect: unknown) => Effect<never> = internal.die
 
-const try_: <A, E = Cause.UnknownError>(
-  options: {
+const try_: {
+  <A>(options: LazyArg<A>): Effect<A, Cause.UnknownError>
+  <A, E>(options: {
     readonly try: LazyArg<A>
     readonly catch: (error: unknown) => E
-  } | LazyArg<A>
-) => Effect<A, E> = internal.try
+  }): Effect<A, E>
+} = internal.try
 
 export {
   /**
@@ -1777,6 +1778,26 @@ export const withFiber: <A, E = never, R = never>(
   evaluate: (fiber: Fiber<unknown, unknown>) => Effect<A, E, R>
 ) => Effect<A, E, R> = core.withFiber
 
+/**
+ * Accesses the current fiber to compute a successful value.
+ *
+ * **Example** (Computing a value from the current fiber)
+ *
+ * ```ts import.meta.vitest
+ * import { Effect } from "effect"
+ *
+ * const program = Effect.withFiberSucceed((fiber) => typeof fiber.id)
+ *
+ * Effect.runSync(program) // => "number"
+ * ```
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const withFiberSucceed: <A, R = never>(
+  evaluate: (fiber: Fiber<unknown, unknown>) => A
+) => Effect<A, never, R> = core.withFiberSucceed
+
 // -----------------------------------------------------------------------------
 // Conversions
 // -----------------------------------------------------------------------------
@@ -3695,7 +3716,7 @@ export const orDie: <A, E, R>(self: Effect<A, E, R>) => Effect<A, never, R> = in
  * output // => ["expected error: NetworkError", Exit.fail("NetworkError")]
  * ```
  *
- * @category sequencing
+ * @category error handling
  * @since 2.0.0
  */
 export const tapError: {
@@ -3742,7 +3763,7 @@ export const tapError: {
  * output // => ["expected error: 504", Exit.fail(new NetworkError({ statusCode: 504 }))]
  * ```
  *
- * @category sequencing
+ * @category error handling
  * @since 2.0.0
  */
 export const tapErrorTag: {
@@ -3797,7 +3818,7 @@ export const tapErrorTag: {
  * output // => ["Logging cause: Something went wrong", Exit.fail("Something went wrong")]
  * ```
  *
- * @category sequencing
+ * @category error handling
  * @since 4.0.0
  */
 export const tapCause: {
@@ -3838,7 +3859,7 @@ export const tapCause: {
  * output // => ["Logging failure cause: Network timeout", Exit.fail("Network timeout")]
  * ```
  *
- * @category sequencing
+ * @category error handling
  * @since 4.0.0
  */
 export const tapCauseIf: {
@@ -3872,7 +3893,7 @@ export const tapCauseIf: {
  * @see {@link tapCause} for observing every failure cause
  * @see {@link catchCauseFilter} for recovering from selected causes instead of only observing them
  *
- * @category sequencing
+ * @category error handling
  * @since 4.0.0
  */
 export const tapCauseFilter: {
@@ -3918,11 +3939,11 @@ export const tapCauseFilter: {
  * output // => ["defect: Something went wrong", Exit.die("Something went wrong")]
  * ```
  *
- * @category sequencing
+ * @category error handling
  * @since 2.0.0
  */
 export const tapDefect: {
-  <E, B, E2, R2>(f: (defect: unknown) => Effect<B, E2, R2>): <A, R>(self: Effect<A, E, R>) => Effect<A, E | E2, R | R2>
+  <B, E2, R2>(f: (defect: unknown) => Effect<B, E2, R2>): <A, E, R>(self: Effect<A, E, R>) => Effect<A, E | E2, R | R2>
   <A, E, R, B, E2, R2>(self: Effect<A, E, R>, f: (defect: unknown) => Effect<B, E2, R2>): Effect<A, E | E2, R | R2>
 } = internal.tapDefect
 
@@ -3968,6 +3989,7 @@ export const eventually: <A, E, R>(self: Effect<A, E, R>) => Effect<A, never, R>
 /**
  * Type helpers for retrying effects.
  *
+ * @category error handling
  * @since 2.0.0
  */
 export declare namespace Retry {
@@ -4399,8 +4421,8 @@ export const withErrorReporting: <
 >(
   effectOrOptions: Arg,
   options?: { readonly defectsOnly?: boolean | undefined } | undefined
-) => [Arg] extends [Effect<infer _A, infer _E, infer _R>] ? Arg : <A, E, R>(self: Effect<A, E, R>) => Effect<A, E, R> =
-  internal.withErrorReporting
+) => [Arg] extends [Effect<infer A, infer E, infer R>] ? Effect<A, E, R>
+  : <A, E, R>(self: Effect<A, E, R>) => Effect<A, E, R> = internal.withErrorReporting
 
 // -----------------------------------------------------------------------------
 // Fallback
@@ -4412,8 +4434,9 @@ export const withErrorReporting: <
  * **Details**
  *
  * If the source effect succeeds, its value is preserved. If it fails in the
- * error channel, `orElseSucceed` evaluates the fallback and succeeds with that
- * value, removing the typed error from the returned effect.
+ * error channel, `orElseSucceed` evaluates the fallback with that error and
+ * succeeds with the returned value, removing the typed error from the returned
+ * effect.
  *
  * Defects and interruptions are not recovered by this operator.
  *
@@ -4432,21 +4455,21 @@ export const withErrorReporting: <
  *   }
  * }
  *
- * const program = Effect.orElseSucceed(validate(-1), () => 18)
+ * const program = Effect.orElseSucceed(validate(-1), (error) => error === "IllegalAgeError" ? 18 : 0)
  *
- * Effect.runSyncExit(program) // => Exit.succeed(18)
+ * Effect.runSyncExit(program) // => Exit.succeed(0)
  * ```
  *
  * @category error handling
  * @since 2.0.0
  */
 export const orElseSucceed: {
-  <A2>(
-    evaluate: LazyArg<A2>
-  ): <A, E, R>(self: Effect<A, E, R>) => Effect<A2 | A, never, R>
+  <E, A2>(
+    f: (error: NoInfer<E>) => A2
+  ): <A, R>(self: Effect<A, E, R>) => Effect<A2 | A, never, R>
   <A, E, R, A2>(
     self: Effect<A, E, R>,
-    evaluate: LazyArg<A2>
+    f: (error: E) => A2
   ): Effect<A | A2, never, R>
 } = internal.orElseSucceed
 
@@ -4589,21 +4612,8 @@ export const timeoutOption: {
 } = internal.timeoutOption
 
 /**
- * Applies a timeout to an effect, with a fallback effect executed if the timeout is reached.
- *
- * **When to use**
- *
- * Use when a timeout of an `Effect` should switch to a fallback effect.
- *
- * **Details**
- *
- * The fallback effect is created lazily by `orElse` and may introduce its own
- * success, failure, and requirement types.
- *
- * **Gotchas**
- *
- * If the timeout wins, the source effect is interrupted before the fallback is
- * run.
+ * Applies a timeout to an effect, lazily evaluating `orElse` after interrupting
+ * the source if the timeout is reached.
  *
  * **Example** (Falling back on timeout)
  *
@@ -4936,7 +4946,7 @@ export const raceFirst: {
  * output // => [[2, 4], [2, 3]]
  * ```
  *
- * @category filtering
+ * @category collecting
  * @since 2.0.0
  */
 export const filter: {
@@ -4981,7 +4991,7 @@ export const filter: {
  * @see {@link filter} for keeping original elements with a boolean predicate, refinement, or effectful predicate
  * @see {@link filterMapEffect} for using an effectful `Filter`
  *
- * @category filtering
+ * @category collecting
  * @since 2.0.0
  */
 export const filterMap: {
@@ -5015,7 +5025,7 @@ export const filterMap: {
  * @see {@link filterMap} for using a synchronous `Filter`
  * @see {@link filter} for keeping original elements with a predicate
  *
- * @category filtering
+ * @category collecting
  * @since 4.0.0
  */
 export const filterMapEffect: {
@@ -7112,8 +7122,8 @@ export const onExitFilter: {
 export const cached: <A, E, R>(self: Effect<A, E, R>) => Effect<Effect<A, E, R>> = internal.cached
 
 /**
- * Returns an effect that caches its result for a specified `Duration`,
- * known as "timeToLive" (TTL).
+ * Returns an effect that caches its result for a fixed duration or a duration
+ * computed from its `Exit`, known as "timeToLive" (TTL).
  *
  * **When to use**
  *
@@ -7132,6 +7142,17 @@ export const cached: <A, E, R>(self: Effect<A, E, R>) => Effect<Effect<A, E, R>>
  * After the specified duration has passed, the cache expires, and the effect
  * will be recomputed upon the next evaluation.
  *
+ * `timeToLive` accepts a `Duration.Input` or a function from `Exit<A, E>` to
+ * `Duration.Input`. The function runs once after each fresh computation,
+ * including failures, so successes and failures can have different TTLs. It
+ * does not run when the cache is created or when a cached result is reused.
+ * The callback also receives interruption exits, which are cached for the
+ * returned duration.
+ *
+ * The TTL starts when the computation completes. Concurrent callers share the
+ * pending computation. A zero TTL expires immediately, and an infinite TTL
+ * keeps the result indefinitely.
+ *
  * **Example** (Memoizing an effect with TTL)
  *
  * ```ts import.meta.vitest
@@ -7156,6 +7177,26 @@ export const cached: <A, E, R>(self: Effect<A, E, R>) => Effect<Effect<A, E, R>>
  * output // => ["expensive task...", "result 1", "result 1", "result 1"]
  * ```
  *
+ * **Example** (Caching successes while retrying failures)
+ *
+ * ```ts import.meta.vitest
+ * import { Effect, Exit } from "effect"
+ *
+ * let attempts = 0
+ * const task = Effect.suspend(() =>
+ *   ++attempts === 1 ? Effect.fail("temporary failure") : Effect.succeed(42)
+ * )
+ * const program = Effect.gen(function*() {
+ *   const cached = yield* task.pipe(
+ *     Effect.cachedWithTTL((exit) => Exit.isSuccess(exit) ? "1 hour" : 0)
+ *   )
+ *   yield* Effect.exit(cached)
+ *   return yield* cached
+ * })
+ *
+ * Effect.runSync(program) // => 42
+ * ```
+ *
  * @see {@link cached} for a similar function that caches the result
  * indefinitely.
  * @see {@link cachedInvalidateWithTTL} for a similar function that includes an
@@ -7164,8 +7205,17 @@ export const cached: <A, E, R>(self: Effect<A, E, R>) => Effect<Effect<A, E, R>>
  * @since 2.0.0
  */
 export const cachedWithTTL: {
+  <A, E>(
+    timeToLive: (exit: Exit.Exit<A, E>) => Duration.Input
+  ): <R>(self: Effect<A, E, R>) => Effect<Effect<A, E, R>>
   (timeToLive: Duration.Input): <A, E, R>(self: Effect<A, E, R>) => Effect<Effect<A, E, R>>
-  <A, E, R>(self: Effect<A, E, R>, timeToLive: Duration.Input): Effect<Effect<A, E, R>>
+  <A, E>(
+    timeToLive: Duration.Input | ((exit: Exit.Exit<A, E>) => Duration.Input)
+  ): <R>(self: Effect<A, E, R>) => Effect<Effect<A, E, R>>
+  <A, E, R>(
+    self: Effect<A, E, R>,
+    timeToLive: Duration.Input | ((exit: Exit.Exit<A, E>) => Duration.Input)
+  ): Effect<Effect<A, E, R>>
 } = internal.cachedWithTTL
 
 /**
@@ -7445,6 +7495,7 @@ export const abortSignal: Effect<AbortSignal, never, Scope> = internal.abortSign
 /**
  * Type helpers for repeating effects.
  *
+ * @category repetition
  * @since 2.0.0
  */
 export declare namespace Repeat {
@@ -7661,10 +7712,10 @@ export const repeat: {
  * const program = Effect.repeatOrElse(
  *   task,
  *   Schedule.recurs(3),
- *   (error, attempts) =>
+ *   (error, previous) =>
  *     Effect.sync(() => { output.push(
  *       `Final failure: ${error}, after ${
- *         Option.getOrElse(attempts, () => 0)
+ *         Option.isSome(previous) ? previous.value.attempt : 0
  *       } attempts`
  *     ) }).pipe(Effect.map(() => 0))
  * )
@@ -7679,12 +7730,12 @@ export const repeat: {
 export const repeatOrElse: {
   <R2, A, B, E, E2, E3, R3>(
     schedule: Schedule<B, A, E2, R2>,
-    orElse: (error: E | E2, option: Option<B>) => Effect<B, E3, R3>
+    orElse: (error: E | E2, option: Option<ScheduleMetadata<B, A>>) => Effect<B, E3, R3>
   ): <R>(self: Effect<A, E, R>) => Effect<B, E3, R | R2 | R3>
   <A, E, R, R2, B, E2, E3, R3>(
     self: Effect<A, E, R>,
     schedule: Schedule<B, A, E2, R2>,
-    orElse: (error: E | E2, option: Option<B>) => Effect<B, E3, R3>
+    orElse: (error: E | E2, option: Option<ScheduleMetadata<B, A>>) => Effect<B, E3, R3>
   ): Effect<B, E3, R | R2 | R3>
 } = internalSchedule.repeatOrElse
 
@@ -8686,7 +8737,7 @@ export const forkDetach: <
  * @see {@link forkIn} for forking into an explicit scope
  * @see {@link forkScoped} for forking fibers tied to the current scope
  *
- * @category sequencing
+ * @category forking
  * @since 2.0.0
  */
 export const awaitAllChildren: <A, E, R>(self: Effect<A, E, R>) => Effect<A, E, R> = internal.awaitAllChildren
@@ -9304,6 +9355,7 @@ export const runSyncExitWith: <R>(
  *
  * Use these to describe generator-based signatures and traced or untraced variants.
  *
+ * @category constructors
  * @since 3.11.0
  */
 export declare namespace fn {
@@ -13893,15 +13945,18 @@ export const logTrace: (...message: ReadonlyArray<any>) => Effect<void> = intern
  * @category logging
  * @since 4.0.0
  */
-export const withLogger = dual<
+export const withLogger: {
   <Output>(
     logger: Logger<unknown, Output>
-  ) => <A, E, R>(effect: Effect<A, E, R>) => Effect<A, E, R>,
+  ): <A, E, R>(effect: Effect<A, E, R>) => Effect<A, E, R>
   <A, E, R, Output>(
     effect: Effect<A, E, R>,
     logger: Logger<unknown, Output>
-  ) => Effect<A, E, R>
->(2, (effect, logger) =>
+  ): Effect<A, E, R>
+} = dual(2, <A, E, R, Output>(
+  effect: Effect<A, E, R>,
+  logger: Logger<unknown, Output>
+): Effect<A, E, R> =>
   internal.updateService(
     effect,
     internal.CurrentLoggers,
@@ -13943,28 +13998,24 @@ export const withLogger = dual<
  * @category logging
  * @since 2.0.0
  */
-export const annotateLogs = dual<
-  {
-    (
-      key: string,
-      value: unknown
-    ): <A, E, R>(effect: Effect<A, E, R>) => Effect<A, E, R>
-    (
-      values: Record<string, unknown>
-    ): <A, E, R>(effect: Effect<A, E, R>) => Effect<A, E, R>
-  },
-  {
-    <A, E, R>(
-      effect: Effect<A, E, R>,
-      key: string,
-      value: unknown
-    ): Effect<A, E, R>
-    <A, E, R>(
-      effect: Effect<A, E, R>,
-      values: Record<string, unknown>
-    ): Effect<A, E, R>
-  }
->(
+export const annotateLogs: {
+  (
+    key: string,
+    value: unknown
+  ): <A, E, R>(effect: Effect<A, E, R>) => Effect<A, E, R>
+  (
+    values: Record<string, unknown>
+  ): <A, E, R>(effect: Effect<A, E, R>) => Effect<A, E, R>
+  <A, E, R>(
+    effect: Effect<A, E, R>,
+    key: string,
+    value: unknown
+  ): Effect<A, E, R>
+  <A, E, R>(
+    effect: Effect<A, E, R>,
+    values: Record<string, unknown>
+  ): Effect<A, E, R>
+} = dual(
   (args) => isEffect(args[0]),
   <A, E, R>(
     effect: Effect<A, E, R>,
@@ -14060,12 +14111,12 @@ export const annotateLogsScoped: {
  * @category logging
  * @since 2.0.0
  */
-export const withLogSpan = dual<
-  (label: string) => <A, E, R>(effect: Effect<A, E, R>) => Effect<A, E, R>,
-  <A, E, R>(effect: Effect<A, E, R>, label: string) => Effect<A, E, R>
->(
+export const withLogSpan: {
+  (label: string): <A, E, R>(effect: Effect<A, E, R>) => Effect<A, E, R>
+  <A, E, R>(effect: Effect<A, E, R>, label: string): Effect<A, E, R>
+} = dual(
   2,
-  (effect, label) =>
+  <A, E, R>(effect: Effect<A, E, R>, label: string): Effect<A, E, R> =>
     internal.flatMap(internal.currentTimeMillis, (now) =>
       internal.updateService(effect, CurrentLogSpans, (spans) => {
         const span: [label: string, timestamp: number] = [label, now]
@@ -14078,14 +14129,10 @@ export const withLogSpan = dual<
 // -----------------------------------------------------------------------------
 
 /**
- * Updates the `Metric` every time the `Effect` is executed.
+ * Updates a metric after each effect execution, optionally mapping its `Exit` to
+ * the metric's input.
  *
- * **Details**
- *
- * Also accepts an optional function which can be used to map the `Exit` value
- * of the `Effect` into a valid `Input` for the `Metric`.
- *
- * **Example** (Incrementing a metric for each execution)
+ * **Example** (Counting executions)
  *
  * ```ts import.meta.vitest
  * import { Effect, Metric } from "effect"
@@ -14102,12 +14149,11 @@ export const withLogSpan = dual<
  * Effect.runSync(Metric.value(counter)).count // => 1
  * ```
  *
- * **Example** (Mapping exits before updating a metric)
+ * **Example** (Mapping exits)
  *
  * ```ts import.meta.vitest
  * import { Effect, Exit, Metric } from "effect"
  *
- * // Track different exit types with custom mapping
  * const exitTracker = Metric.frequency("exit_types", {
  *   description: "Tracks success/failure/defect counts"
  * })
@@ -14132,7 +14178,7 @@ export const track: {
   <Input, State, E, A>(
     metric: Metric.Metric<Input, State>,
     f: (exit: Exit.Exit<A, E>) => Input
-  ): <E, R>(self: Effect<A, E, R>) => Effect<A, E, R>
+  ): <E2 extends E, R>(self: Effect<A, E2, R>) => Effect<A, E2, R>
   <State, E, A>(
     metric: Metric.Metric<Exit.Exit<NoInfer<A>, NoInfer<E>>, State>
   ): <R>(self: Effect<A, E, R>) => Effect<A, E, R>
@@ -14497,7 +14543,7 @@ export const trackDuration: {
  * Effect.runSync(runnable) // => "Transaction complete"
  * ```
  *
- * @category services
+ * @category transactions
  * @since 4.0.0
  */
 export class Transaction extends Context.Service<
@@ -14696,6 +14742,7 @@ export const txRetry: Effect<never, never, Transaction> = flatMap(
 /**
  * Type helpers for converting callback-based functions into `Effect` functions.
  *
+ * @category converting
  * @since 4.0.0
  */
 export declare namespace Effectify {
@@ -14939,6 +14986,9 @@ export declare namespace Effectify {
     : never
 }
 
+type EffectifyArgs<F extends (...args: Array<any>) => any> = Parameters<F> extends [...infer Args, any] ? Args
+  : Parameters<F>
+
 /**
  * Converts an error-first callback API into a function that returns an
  * `Effect`.
@@ -14995,12 +15045,12 @@ export const effectify: {
   <F extends (...args: Array<any>) => any>(fn: F): Effectify.Effectify<F, Effectify.EffectifyError<F>>
   <F extends (...args: Array<any>) => any, E>(
     fn: F,
-    onError: (error: Effectify.EffectifyError<F>, args: Parameters<F>) => E
+    onError: (error: Effectify.EffectifyError<F>, args: EffectifyArgs<F>) => E
   ): Effectify.Effectify<F, E>
   <F extends (...args: Array<any>) => any, E, E2>(
     fn: F,
-    onError: (error: Effectify.EffectifyError<F>, args: Parameters<F>) => E,
-    onSyncError: (error: unknown, args: Parameters<F>) => E2
+    onError: (error: Effectify.EffectifyError<F>, args: EffectifyArgs<F>) => E,
+    onSyncError: (error: unknown, args: EffectifyArgs<F>) => E2
   ): Effectify.Effectify<F, E | E2>
 } =
   (<A>(fn: Function, onError?: (e: any, args: any) => any, onSyncError?: (e: any, args: any) => any) =>
diff --git a/repos/effect/packages/effect/src/Effectable.ts b/repos/effect/packages/effect/src/Effectable.ts
index f4a114ad8..b38518f65 100644
--- a/repos/effect/packages/effect/src/Effectable.ts
+++ b/repos/effect/packages/effect/src/Effectable.ts
@@ -1,6 +1,6 @@
 /**
  * Low-level helpers for making custom values behave like Effects. The module
- * exposes a prototype builder and an abstract base class that let
+ * exposes a prototype builder, an abstract base class, and a mixin that let
  * domain-specific values, such as service keys or configuration descriptions,
  * be evaluated by Effect and yielded inside `Effect.gen`.
  *
@@ -24,6 +24,7 @@ import { evaluate, makePrimitiveProto } from "./internal/core.ts"
  * When the effect is evaluated, it calls `evaluate` with the current fiber.
  *
  * @see {@link Class} for a class-based approach to defining custom Effect values
+ * @see {@link Mixin} for wrapping an existing class constructor
  *
  * @category prototypes
  * @since 4.0.0
@@ -40,14 +41,16 @@ export const Prototype = <A extends Effect.Effect<any, any, any>>(options: {
     [evaluate]: options.evaluate
   }) as any
 
+const proto = Prototype<Class<any, any, any>>({
+  label: "Effectable",
+  evaluate(_) {
+    return this.asEffect()
+  }
+})
+
 const Base: new<A, E, R>() => Effect.Effect<A, E, R> = (() => {
   const Base = function() {}
-  Base.prototype = Prototype({
-    label: "Effectable",
-    evaluate(_) {
-      return this
-    }
-  })
+  Base.prototype = proto
   return Base as any
 })()
 
@@ -60,9 +63,75 @@ const Base: new<A, E, R>() => Effect.Effect<A, E, R> = (() => {
  * as `Effect` values.
  *
  * @see {@link Prototype} for a lower-level primitive approach to creating custom Effect-like values without a class
+ * @see {@link Mixin} for wrapping an existing class constructor
  * @category constructors
  * @since 2.0.0
  */
 export abstract class Class<A, E = never, R = never> extends Base<A, E, R> {
-  abstract override: Effect.Effect<A, E, R>
+  abstract asEffect(): Effect.Effect<A, E, R>
+}
+
+type AsEffectReturn<Self> = Self extends {
+  asEffect(): infer A extends Effect.Effect<any, any, any>
+} ? A
+  : never
+
+declare abstract class MixinBase extends Class<any, any, any> {
+  constructor(...args: ReadonlyArray<any>)
+  override readonly [Effect.TypeId]: AsEffectReturn<this>[Effect.TypeId]
+  override [Symbol.iterator](): Effect.EffectIterator<AsEffectReturn<this>>
+}
+
+/**
+ * Returns a subclass of the provided class that inserts the Effect prototype
+ * into the inheritance chain.
+ *
+ * **When to use**
+ *
+ * Use to make instances of an existing class behave as `Effect` values without
+ * extending {@link Class} or modifying the original prototype.
+ *
+ * **Details**
+ *
+ * Pass the class to wrap, then implement `asEffect` on the final class. The
+ * returned class is abstract, and the success, error, and service types are
+ * inferred from the concrete `asEffect` return type. Concrete and abstract base
+ * classes are supported. Constructor parameters and instance members are
+ * preserved, except that Effect's prototype members shadow base prototype
+ * members with the same name: `pipe`, `toString`, `toJSON`, `[Symbol.iterator]`,
+ * and `[Symbol.for("nodejs.util.inspect.custom")]`.
+ *
+ * **Example** (Evaluating a mixed-in class)
+ *
+ * ```ts import.meta.vitest
+ * import { Effect, Effectable } from "effect"
+ *
+ * class Box {
+ *   constructor(readonly value: number) {}
+ * }
+ *
+ * class EffectBox extends Effectable.Mixin(Box) {
+ *   asEffect() {
+ *     return Effect.succeed(this.value)
+ *   }
+ * }
+ *
+ * const box = new EffectBox(2)
+ * Effect.isEffect(box) // => true
+ * await Effect.runPromise(box) // => 2
+ * ```
+ *
+ * @see {@link Prototype} for a lower-level primitive approach to creating custom Effect-like values without a class
+ * @see {@link Class} for a base constructor to extend
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Mixin = <TBase extends abstract new(...args: ReadonlyArray<any>) => object>(
+  klass: TBase
+): TBase & typeof MixinBase => {
+  abstract class Mixed extends klass {
+    abstract asEffect(): Effect.Effect<any, any, any>
+  }
+  Object.defineProperties(Mixed.prototype, Object.getOwnPropertyDescriptors(proto))
+  return Mixed as TBase & typeof MixinBase
 }
diff --git a/repos/effect/packages/effect/src/Encoding.ts b/repos/effect/packages/effect/src/Encoding.ts
index f4b32aa89..25dcc1312 100644
--- a/repos/effect/packages/effect/src/Encoding.ts
+++ b/repos/effect/packages/effect/src/Encoding.ts
@@ -424,13 +424,104 @@ export const encodeHex: (input: Uint8Array | string) => string = (input) =>
  * @since 4.0.0
  */
 export const randomHex = (length: number): string => {
-  let result = ""
-  for (let i = length >>> 3; i > 0; i--) {
-    const word = (Math.random() * 0x100000000) >>> 0
-    result += byteToHex[word >>> 24] + byteToHex[(word >>> 16) & 0xff] + byteToHex[(word >>> 8) & 0xff] +
-      byteToHex[word & 0xff]
+  switch (length) {
+    case 16:
+      return randomHex16()
+    case 32:
+      return randomHex32()
+    default: {
+      let result = ""
+      for (let i = length >>> 3; i > 0; i--) {
+        result += randomHex8()
+      }
+      return result
+    }
   }
-  return result
+}
+
+const hexCharCodes = Uint8Array.from("0123456789abcdef", (c) => c.charCodeAt(0))
+
+const randomWord = (): number => (Math.random() * 0x100000000) >>> 0
+
+// Trace and span identifiers are the common lengths. A single
+// String.fromCharCode call produces a flat string, which avoids rope
+// flattening when the identifier is later serialized.
+const randomHex8 = (): string => {
+  const a = randomWord()
+  return String.fromCharCode(
+    hexCharCodes[a >>> 28],
+    hexCharCodes[(a >>> 24) & 15],
+    hexCharCodes[(a >>> 20) & 15],
+    hexCharCodes[(a >>> 16) & 15],
+    hexCharCodes[(a >>> 12) & 15],
+    hexCharCodes[(a >>> 8) & 15],
+    hexCharCodes[(a >>> 4) & 15],
+    hexCharCodes[a & 15]
+  )
+}
+
+const randomHex16 = (): string => {
+  const a = randomWord()
+  const b = randomWord()
+  return String.fromCharCode(
+    hexCharCodes[a >>> 28],
+    hexCharCodes[(a >>> 24) & 15],
+    hexCharCodes[(a >>> 20) & 15],
+    hexCharCodes[(a >>> 16) & 15],
+    hexCharCodes[(a >>> 12) & 15],
+    hexCharCodes[(a >>> 8) & 15],
+    hexCharCodes[(a >>> 4) & 15],
+    hexCharCodes[a & 15],
+    hexCharCodes[b >>> 28],
+    hexCharCodes[(b >>> 24) & 15],
+    hexCharCodes[(b >>> 20) & 15],
+    hexCharCodes[(b >>> 16) & 15],
+    hexCharCodes[(b >>> 12) & 15],
+    hexCharCodes[(b >>> 8) & 15],
+    hexCharCodes[(b >>> 4) & 15],
+    hexCharCodes[b & 15]
+  )
+}
+
+const randomHex32 = (): string => {
+  const a = randomWord()
+  const b = randomWord()
+  const c = randomWord()
+  const d = randomWord()
+  return String.fromCharCode(
+    hexCharCodes[a >>> 28],
+    hexCharCodes[(a >>> 24) & 15],
+    hexCharCodes[(a >>> 20) & 15],
+    hexCharCodes[(a >>> 16) & 15],
+    hexCharCodes[(a >>> 12) & 15],
+    hexCharCodes[(a >>> 8) & 15],
+    hexCharCodes[(a >>> 4) & 15],
+    hexCharCodes[a & 15],
+    hexCharCodes[b >>> 28],
+    hexCharCodes[(b >>> 24) & 15],
+    hexCharCodes[(b >>> 20) & 15],
+    hexCharCodes[(b >>> 16) & 15],
+    hexCharCodes[(b >>> 12) & 15],
+    hexCharCodes[(b >>> 8) & 15],
+    hexCharCodes[(b >>> 4) & 15],
+    hexCharCodes[b & 15],
+    hexCharCodes[c >>> 28],
+    hexCharCodes[(c >>> 24) & 15],
+    hexCharCodes[(c >>> 20) & 15],
+    hexCharCodes[(c >>> 16) & 15],
+    hexCharCodes[(c >>> 12) & 15],
+    hexCharCodes[(c >>> 8) & 15],
+    hexCharCodes[(c >>> 4) & 15],
+    hexCharCodes[c & 15],
+    hexCharCodes[d >>> 28],
+    hexCharCodes[(d >>> 24) & 15],
+    hexCharCodes[(d >>> 20) & 15],
+    hexCharCodes[(d >>> 16) & 15],
+    hexCharCodes[(d >>> 12) & 15],
+    hexCharCodes[(d >>> 8) & 15],
+    hexCharCodes[(d >>> 4) & 15],
+    hexCharCodes[d & 15]
+  )
 }
 
 /**
@@ -771,10 +862,7 @@ const base64UrlEncodeUint8Array = (data: Uint8Array) =>
 
 // Hex internals
 
-const byteToHex: Array<string> = []
-for (let i = 0; i < 256; i++) {
-  byteToHex.push(i.toString(16).padStart(2, "0"))
-}
+const byteToHex: Array<string> = Array.from({ length: 256 }, (_, i) => i.toString(16).padStart(2, "0"))
 
 const hexEncodeUint8Array = (bytes: Uint8Array): string => {
   let result = ""
diff --git a/repos/effect/packages/effect/src/ExecutionPlan.ts b/repos/effect/packages/effect/src/ExecutionPlan.ts
index 236004359..135385f76 100644
--- a/repos/effect/packages/effect/src/ExecutionPlan.ts
+++ b/repos/effect/packages/effect/src/ExecutionPlan.ts
@@ -289,6 +289,9 @@ const Proto: Omit<ExecutionPlan<any>, "steps"> = {
     return effect.contextWith((context: Context.Context<any>) =>
       effect.succeed(makeProto(self.steps.map((step) => ({
         ...step,
+        while: step.while
+          ? (input: any) => effect.provideContext(step.while!(input), context)
+          : undefined,
         provide: Layer.isLayer(step.provide)
           ? Layer.provide(step.provide, Layer.succeedContext(context))
           : step.provide
diff --git a/repos/effect/packages/effect/src/Fiber.ts b/repos/effect/packages/effect/src/Fiber.ts
index 4e511ee27..4eae1625c 100644
--- a/repos/effect/packages/effect/src/Fiber.ts
+++ b/repos/effect/packages/effect/src/Fiber.ts
@@ -13,12 +13,13 @@ import type { Effect } from "./Effect.ts"
 import type { Exit } from "./Exit.ts"
 import * as effect from "./internal/effect.ts"
 import type { LogLevel } from "./LogLevel.ts"
+import type { FiberRuntimeMetricsService } from "./Metric.ts"
 import type { Pipeable } from "./Pipeable.ts"
 import { hasProperty } from "./Predicate.ts"
 import type { StackFrame } from "./References.ts"
 import type { Scheduler, SchedulerDispatcher } from "./Scheduler.ts"
 import type { Scope } from "./Scope.ts"
-import type { AnySpan } from "./Tracer.ts"
+import type { AnySpan, Tracer } from "./Tracer.ts"
 import type { Covariant } from "./Types.ts"
 
 const TypeId = "~effect/Fiber"
@@ -75,14 +76,8 @@ export interface Fiber<out A, out E = never> extends Pipeable {
   readonly getRef: <A>(ref: Context.Reference<A>) => A
   readonly context: Context.Context<never>
   setContext(context: Context.Context<never>): void
-  readonly currentScheduler: Scheduler
+  readonly cache: Fiber.Cache
   readonly currentDispatcher: SchedulerDispatcher
-  readonly currentSpan?: AnySpan | undefined
-  readonly currentLogLevel: LogLevel
-  readonly minimumLogLevel: LogLevel
-  readonly currentStackFrame?: StackFrame | undefined
-  readonly maxOpsBeforeYield: number
-  readonly currentPreventYield: boolean
   readonly addObserver: (cb: (exit: Exit<A, E>) => void) => () => void
   readonly interruptUnsafe: (
     fiberId?: number | undefined,
@@ -155,6 +150,36 @@ export declare namespace Fiber {
     readonly _A: Covariant<A>
     readonly _E: Covariant<E>
   }
+
+  /**
+   * Context-derived values cached for the fiber's current `Context`.
+   *
+   * **When to use**
+   *
+   * Use to read runtime services resolved from the fiber's context, such as
+   * the scheduler, current span, or log levels.
+   *
+   * **Details**
+   *
+   * The cache object is computed once per context cache root and shared by
+   * every fiber running with that root, so it must be treated as immutable.
+   *
+   * @category models
+   * @since 4.0.0
+   */
+  export interface Cache {
+    readonly scheduler: Scheduler
+    readonly tracer: Tracer | undefined
+    readonly tracerContext: Tracer["context"] | undefined
+    readonly tracerEnabled: boolean
+    readonly span: AnySpan | undefined
+    readonly logLevel: LogLevel
+    readonly minimumLogLevel: LogLevel
+    readonly stackFrame: StackFrame | undefined
+    readonly runtimeMetrics: FiberRuntimeMetricsService | undefined
+    readonly maxOpsBeforeYield: number
+    readonly preventYield: boolean
+  }
 }
 
 const await_: <A, E>(self: Fiber<A, E>) => Effect<Exit<A, E>> = effect.fiberAwait
diff --git a/repos/effect/packages/effect/src/FiberHandle.ts b/repos/effect/packages/effect/src/FiberHandle.ts
index 7a004bfa1..2317b7a42 100644
--- a/repos/effect/packages/effect/src/FiberHandle.ts
+++ b/repos/effect/packages/effect/src/FiberHandle.ts
@@ -332,10 +332,10 @@ export const setUnsafe: {
     fiber.interruptUnsafe(internalFiberId)
     return
   } else if (self.state.fiber !== undefined) {
-    if (options?.onlyIfMissing === true) {
-      fiber.interruptUnsafe(internalFiberId)
+    if (self.state.fiber === fiber) {
       return
-    } else if (self.state.fiber === fiber) {
+    } else if (options?.onlyIfMissing === true) {
+      fiber.interruptUnsafe(internalFiberId)
       return
     }
     self.state.fiber.interruptUnsafe(internalFiberId)
diff --git a/repos/effect/packages/effect/src/FiberMap.ts b/repos/effect/packages/effect/src/FiberMap.ts
index 828632ac5..a8b7f1fbe 100644
--- a/repos/effect/packages/effect/src/FiberMap.ts
+++ b/repos/effect/packages/effect/src/FiberMap.ts
@@ -305,7 +305,8 @@ const isInternalInterruption = Filter.toPredicate(Filter.compose(
  *
  * When the fiber completes, it is removed from the map. If the key already has
  * a fiber, that previous fiber is interrupted unless `onlyIfMissing` is set;
- * in that case the new fiber is interrupted and the existing entry is kept.
+ * in that case a different new fiber is interrupted and the existing entry is
+ * kept, while re-registering the existing fiber is a no-op.
  *
  * **Example** (Adding a fiber unsafely)
  *
@@ -367,16 +368,19 @@ export const setUnsafe: {
 
   const previous = MutableHashMap.get(self.state.backing, key)
   if (previous._tag === "Some") {
-    if (options?.onlyIfMissing === true) {
-      fiber.interruptUnsafe(internalFiberId)
+    if (previous.value === fiber) {
       return
-    } else if (previous.value === fiber) {
+    } else if (options?.onlyIfMissing === true) {
+      fiber.interruptUnsafe(internalFiberId)
       return
     }
-    previous.value.interruptUnsafe(internalFiberId)
   }
 
+  // Install the replacement before interruption can re-enter the map through a finalizer.
   MutableHashMap.set(self.state.backing, key, fiber)
+  if (previous._tag === "Some") {
+    previous.value.interruptUnsafe(internalFiberId)
+  }
   fiber.addObserver((exit) => {
     if (self.state._tag === "Closed") {
       return
@@ -405,7 +409,8 @@ export const setUnsafe: {
  *
  * When the fiber completes, it is removed from the map. If the key already has
  * a fiber, that previous fiber is interrupted unless `onlyIfMissing` is set;
- * in that case the new fiber is interrupted and the existing entry is kept.
+ * in that case a different new fiber is interrupted and the existing entry is
+ * kept, while re-registering the existing fiber is a no-op.
  *
  * This is the Effect-wrapped version of `setUnsafe`.
  *
diff --git a/repos/effect/packages/effect/src/FileSystem.ts b/repos/effect/packages/effect/src/FileSystem.ts
index 03d02dc18..9ea4cf350 100644
--- a/repos/effect/packages/effect/src/FileSystem.ts
+++ b/repos/effect/packages/effect/src/FileSystem.ts
@@ -5,13 +5,13 @@
  * Platform packages provide concrete layers, while this module defines the
  * operations for reading, writing, inspecting, streaming, and watching files.
  * Operations return `Effect`, `Stream`, or `Sink` values and fail with
- * `PlatformError`. The module also includes file handles, size helpers, open
- * flags, watch events, and the watch backend service.
+ * `PlatformError`. The module also includes file handles, open flags, watch
+ * events, and the watch backend service.
  *
  * @since 4.0.0
  */
 import * as Arr from "./Array.ts"
-import type * as Brand from "./Brand.ts"
+import * as ByteSize from "./ByteSize.ts"
 import * as Cause from "./Cause.ts"
 import * as Context from "./Context.ts"
 import * as Effect from "./Effect.ts"
@@ -39,12 +39,12 @@ const TypeId = "~effect/FileSystem"
  * **Example** (Accessing file system operations)
  *
  * ```ts import.meta.vitest
- * import { Effect, FileSystem } from "effect"
+ * import { ByteSize, Effect, FileSystem } from "effect"
  *
  * const fileSystem = FileSystem.makeNoop({
  *   exists: () => Effect.succeed(true),
  *   makeDirectory: () => Effect.void,
- *   stat: () => Effect.succeed({ size: FileSystem.Size(22) } as FileSystem.File.Info),
+ *   stat: () => Effect.succeed({ size: ByteSize.bytes(22) } as FileSystem.File.Info),
  *   readFileString: () => Effect.succeed("{\"env\": \"development\"}")
  * })
  *
@@ -68,7 +68,7 @@ const TypeId = "~effect/FileSystem"
  * })
  *
  * const result = Effect.runSync(Effect.provideService(program, FileSystem.FileSystem, fileSystem))
- * result.size // => 22n
+ * ByteSize.toBigInt(result.size) // => 22n
  * result.content // => "{\"env\": \"development\"}"
  * ```
  *
@@ -299,7 +299,7 @@ export interface FileSystem {
     }
   ) => Sink.Sink<void, Uint8Array, never, PlatformError>
   /**
-   * Get information about a file at `path`.
+   * Get information about a file at `path`. See `File.Info` for metadata limits.
    */
   readonly stat: (
     path: string
@@ -321,9 +321,9 @@ export interface FileSystem {
   readonly stream: (
     path: string,
     options?: {
-      readonly bytesToRead?: SizeInput | undefined
-      readonly chunkSize?: SizeInput | undefined
-      readonly offset?: SizeInput | undefined
+      readonly bytesToRead?: ByteSize.Input | undefined
+      readonly chunkSize?: number | undefined
+      readonly offset?: ByteSize.Input | undefined
     }
   ) => Stream.Stream<Uint8Array, PlatformError>
   /**
@@ -339,7 +339,7 @@ export interface FileSystem {
    */
   readonly truncate: (
     path: string,
-    length?: SizeInput
+    length?: number
   ) => Effect.Effect<void, PlatformError>
   /**
    * Change the file system timestamps of the file at `path`.
@@ -383,199 +383,6 @@ export interface FileSystem {
   ) => Effect.Effect<void, PlatformError>
 }
 
-/**
- * Represents a file size in bytes using a branded bigint.
- *
- * **Details**
- *
- * This type ensures type safety when working with file sizes, preventing
- * accidental mixing of regular numbers with size values. The underlying
- * bigint allows for handling very large file sizes beyond JavaScript's
- * number precision limits.
- *
- * **Example** (Creating branded file sizes)
- *
- * ```ts import.meta.vitest
- * import { FileSystem } from "effect"
- *
- * FileSystem.Size(1024) // => 1024n
- * FileSystem.Size(BigInt("9007199254740992")) // => 9007199254740992n
- * ```
- *
- * @category sizes
- * @since 4.0.0
- */
-export type Size = Brand.Branded<bigint, "Size">
-
-/**
- * Input type for size parameters that accepts multiple numeric types.
- *
- * **Details**
- *
- * This union type allows file system operations to accept size values in
- * different formats for convenience, which are then normalized to the
- * branded `Size` type internally.
- *
- * **Example** (Using size inputs)
- *
- * ```ts import.meta.vitest
- * import { FileSystem } from "effect"
- *
- * const inputs: ReadonlyArray<FileSystem.SizeInput> = [
- *   1024,
- *   2048n,
- *   FileSystem.Size(4096)
- * ]
- * inputs.map(FileSystem.Size) // => [1024n, 2048n, 4096n]
- * ```
- *
- * @category sizes
- * @since 4.0.0
- */
-export type SizeInput = bigint | number | Size
-
-/**
- * Creates a `Size` from various numeric input types.
- *
- * **Details**
- *
- * Converts numbers, bigints, or existing Size values into a properly
- * branded Size type. This function handles the conversion and ensures
- * type safety for file size operations.
- *
- * **Example** (Converting size inputs)
- *
- * ```ts import.meta.vitest
- * import { FileSystem } from "effect"
- *
- * // From number
- * const size1 = FileSystem.Size(1024)
- * typeof size1 // => "bigint"
- *
- * // From bigint
- * const size2 = FileSystem.Size(BigInt(2048))
- *
- * // From existing Size (identity)
- * const size3 = FileSystem.Size(size1)
- * const sizes = [size2, size3] // => [2048n, 1024n]
- * ```
- *
- * @category sizes
- * @since 4.0.0
- */
-export const Size = (bytes: SizeInput): Size => typeof bytes === "bigint" ? bytes as Size : BigInt(bytes) as Size
-
-/**
- * Creates a `Size` representing kilobytes (1024 bytes).
- *
- * **Details**
- *
- * Converts a number of kilobytes to the equivalent size in bytes.
- * Uses binary kilobytes (1024 bytes) rather than decimal (1000 bytes).
- *
- * **Example** (Creating kibibyte sizes)
- *
- * ```ts import.meta.vitest
- * import { FileSystem } from "effect"
- *
- * FileSystem.KiB(64) // => 65536n
- * FileSystem.KiB(100) // => 102400n
- * ```
- *
- * @category sizes
- * @since 4.0.0
- */
-export const KiB = (n: number): Size => Size(n * 1024)
-
-/**
- * Creates a `Size` representing mebibytes (1024² bytes).
- *
- * **Details**
- *
- * Converts a number of mebibytes to the equivalent size in bytes.
- * Uses binary mebibytes (1,048,576 bytes) rather than decimal megabytes.
- *
- * **Example** (Creating mebibyte sizes)
- *
- * ```ts import.meta.vitest
- * import { FileSystem } from "effect"
- *
- * FileSystem.MiB(10) // => 10485760n
- * FileSystem.MiB(100) // => 104857600n
- * ```
- *
- * @category sizes
- * @since 4.0.0
- */
-export const MiB = (n: number): Size => Size(n * 1024 * 1024)
-
-/**
- * Creates a `Size` representing gibibytes (1024³ bytes).
- *
- * **Details**
- *
- * Converts a number of gibibytes to the equivalent size in bytes.
- * Uses binary gibibytes (1,073,741,824 bytes) rather than decimal gigabytes.
- *
- * **Example** (Creating gibibyte sizes)
- *
- * ```ts import.meta.vitest
- * import { FileSystem } from "effect"
- *
- * FileSystem.GiB(1) // => 1073741824n
- * ```
- *
- * @category sizes
- * @since 4.0.0
- */
-export const GiB = (n: number): Size => Size(n * 1024 * 1024 * 1024)
-
-/**
- * Creates a `Size` representing tebibytes (1024⁴ bytes).
- *
- * **Details**
- *
- * Converts a number of tebibytes to the equivalent size in bytes.
- * Uses binary tebibytes (1,099,511,627,776 bytes) rather than decimal terabytes.
- *
- * **Example** (Creating tebibyte sizes)
- *
- * ```ts import.meta.vitest
- * import { FileSystem } from "effect"
- *
- * FileSystem.TiB(1) // => 1099511627776n
- * ```
- *
- * @category sizes
- * @since 4.0.0
- */
-export const TiB = (n: number): Size => Size(n * 1024 * 1024 * 1024 * 1024)
-
-const bigint1024 = BigInt(1024)
-const bigintPiB = bigint1024 * bigint1024 * bigint1024 * bigint1024 * bigint1024
-
-/**
- * Creates a `Size` representing pebibytes (1024⁵ bytes).
- *
- * **Details**
- *
- * Converts a number of pebibytes to the equivalent size in bytes.
- * Uses binary pebibytes (1,125,899,906,842,624 bytes) rather than decimal petabytes.
- * This function uses BigInt arithmetic to handle the very large numbers involved.
- *
- * **Example** (Creating pebibyte sizes)
- *
- * ```ts import.meta.vitest
- * import { FileSystem } from "effect"
- *
- * FileSystem.PiB(2) // => 2251799813685248n
- * ```
- *
- * @category sizes
- * @since 4.0.0
- */
-export const PiB = (n: number): Size => Size(BigInt(n) * bigintPiB)
-
 /**
  * File open flags that determine how a file is opened and what operations are allowed.
  *
@@ -660,7 +467,7 @@ export type OpenFlag =
  * @category services
  * @since 4.0.0
  */
-export const FileSystem: Context.Service<FileSystem, FileSystem> = Context.Service("effect/platform/FileSystem")
+export const FileSystem: Context.Service<FileSystem, FileSystem> = Context.Service("effect/FileSystem")
 
 /**
  * Creates a FileSystem implementation from a partial implementation.
@@ -712,12 +519,16 @@ export const make = (
         })),
     stream: Effect.fnUntraced(function*(path, options) {
       const file = yield* impl.open(path, { flag: "r" })
-      if (options?.offset) {
-        yield* file.seek(options.offset, "start")
+      const offset = options?.offset === undefined ? undefined : ByteSize.fromInputUnsafe(options.offset)
+      if (offset) {
+        yield* file.seek(offset, "start")
       }
-      const bytesToRead = options?.bytesToRead !== undefined ? Size(options.bytesToRead) : undefined
+      const bytesToRead = options?.bytesToRead === undefined
+        ? undefined
+        : ByteSize.fromInputUnsafe(options.bytesToRead)
       let totalBytesRead = BigInt(0)
-      const chunkSize = Size(options?.chunkSize ?? 64 * 1024)
+      // Validate chunk sizes even for zero-byte reads.
+      const chunkSize = Number(BigInt(options?.chunkSize ?? 64 * 1024))
       const readChunk = file.readAlloc(chunkSize)
       return Stream.fromPull(Effect.succeed(
         Effect.flatMap(
@@ -726,7 +537,7 @@ export const make = (
               return Cause.done()
             }
             return bytesToRead !== undefined && (bytesToRead - totalBytesRead) < chunkSize
-              ? file.readAlloc(bytesToRead - totalBytesRead)
+              ? file.readAlloc(Number(bytesToRead - totalBytesRead))
               : readChunk
           }),
           Option.match({
@@ -741,7 +552,7 @@ export const make = (
     }, Stream.unwrap),
     sink: (path, options) =>
       pipe(
-        impl.open(path, { flag: "w", ...options }),
+        impl.open(path, { ...options, flag: options?.flag ?? "w" }),
         Effect.map((file) => Sink.forEach((_: Uint8Array) => file.writeAll(_))),
         Sink.unwrap
       ),
@@ -1005,20 +816,20 @@ export const isFile = (u: unknown): u is File => hasProperty(u, FileTypeId)
  * **Example** (Working with file handles)
  *
  * ```ts import.meta.vitest
- * import { Effect, FileSystem, Option } from "effect"
+ * import { ByteSize, Effect, FileSystem, Option } from "effect"
  *
  * const file: FileSystem.File = {
  *   [FileSystem.FileTypeId]: FileSystem.FileTypeId,
- *   stat: Effect.succeed({ size: FileSystem.Size(5) } as FileSystem.File.Info),
- *   seek: () => Effect.succeed(FileSystem.Size(0)),
+ *   stat: Effect.succeed({ size: ByteSize.bytes(5) } as FileSystem.File.Info),
+ *   seek: () => Effect.succeed(BigInt(0)),
  *   sync: Effect.void,
  *   read: (buffer) => Effect.sync(() => {
  *     buffer.set([1, 2, 3, 4, 5])
- *     return FileSystem.Size(5)
+ *     return 5
  *   }),
  *   readAlloc: () => Effect.succeed(Option.none()),
  *   truncate: () => Effect.void,
- *   write: (buffer) => Effect.succeed(FileSystem.Size(buffer.length)),
+ *   write: (buffer) => Effect.succeed(buffer.length),
  *   writeAll: () => Effect.void
  * }
  *
@@ -1031,7 +842,10 @@ export const isFile = (u: unknown): u is File => hasProperty(u, FileTypeId)
  *   return { size: stats.size, bytesRead, buffer: Array.from(buffer) }
  * })
  *
- * Effect.runSync(program) // => { size: 5n, bytesRead: 5n, buffer: [1, 2, 3, 4, 5] }
+ * const result = Effect.runSync(program)
+ * ByteSize.toBigInt(result.size) // => 5n
+ * result.bytesRead // => 5
+ * result.buffer // => [1, 2, 3, 4, 5]
  * ```
  *
  * @category models
@@ -1039,13 +853,19 @@ export const isFile = (u: unknown): u is File => hasProperty(u, FileTypeId)
  */
 export interface File {
   readonly [FileTypeId]: typeof FileTypeId
+  /**
+   * Get information about the open file. See `File.Info` for metadata limits.
+   */
   readonly stat: Effect.Effect<File.Info, PlatformError>
-  readonly seek: (offset: SizeInput, from: SeekMode) => Effect.Effect<Size>
+  /**
+   * Seeks before the start fail with `BadArgument` and leave the cursor unchanged.
+   */
+  readonly seek: (offset: bigint, from: SeekMode) => Effect.Effect<bigint, PlatformError>
   readonly sync: Effect.Effect<void, PlatformError>
-  readonly read: (buffer: Uint8Array) => Effect.Effect<Size, PlatformError>
-  readonly readAlloc: (size: SizeInput) => Effect.Effect<Option.Option<Uint8Array>, PlatformError>
-  readonly truncate: (length?: SizeInput) => Effect.Effect<void, PlatformError>
-  readonly write: (buffer: Uint8Array) => Effect.Effect<Size, PlatformError>
+  readonly read: (buffer: Uint8Array) => Effect.Effect<number, PlatformError>
+  readonly readAlloc: (size: number) => Effect.Effect<Option.Option<Uint8Array>, PlatformError>
+  readonly truncate: (length?: number) => Effect.Effect<void, PlatformError>
+  readonly write: (buffer: Uint8Array) => Effect.Effect<number, PlatformError>
   readonly writeAll: (buffer: Uint8Array) => Effect.Effect<void, PlatformError>
 }
 
@@ -1086,10 +906,14 @@ export declare namespace File {
    * permissions, and size information. This structure is returned by file
    * stat operations.
    *
+   * Node and Bun preserve `size` and `blksize` exactly. Optional `number`
+   * metadata is `Option.none()` when absent or outside the safe integer range.
+   * Unsafe `dev` or `mode` values fail the stat operation with `BadArgument`.
+   *
    * **Example** (Inspecting file information)
    *
    * ```ts import.meta.vitest
-   * import { FileSystem, Option } from "effect"
+   * import { ByteSize, FileSystem, Option } from "effect"
    *
    * const info: FileSystem.File.Info = {
    *   type: "File",
@@ -1103,13 +927,13 @@ export declare namespace File {
    *   uid: Option.none(),
    *   gid: Option.none(),
    *   rdev: Option.none(),
-   *   size: FileSystem.Size(5),
+   *   size: ByteSize.bytes(5),
    *   blksize: Option.none(),
    *   blocks: Option.none()
    * }
    *
    * info.type // => "File"
-   * info.size // => 5n
+   * ByteSize.toBigInt(info.size) // => 5n
    * info.mode.toString(8) // => "644"
    *
    * const modified = Option.match(info.mtime, {
@@ -1135,8 +959,8 @@ export declare namespace File {
     readonly uid: Option.Option<number>
     readonly gid: Option.Option<number>
     readonly rdev: Option.Option<number>
-    readonly size: Size
-    readonly blksize: Option.Option<Size>
+    readonly size: ByteSize.ByteSize
+    readonly blksize: Option.Option<ByteSize.ByteSize>
     readonly blocks: Option.Option<number>
   }
 }
@@ -1296,4 +1120,4 @@ export class WatchBackend extends Context.Service<WatchBackend, {
     stat: File.Info,
     options?: WatchOptions
   ) => Option.Option<Stream.Stream<WatchEvent, PlatformError>>
-}>()("effect/platform/FileSystem/WatchBackend") {}
+}>()("effect/FileSystem/WatchBackend") {}
diff --git a/repos/effect/packages/effect/src/Formatter.ts b/repos/effect/packages/effect/src/Formatter.ts
index 915cca9df..9121c252d 100644
--- a/repos/effect/packages/effect/src/Formatter.ts
+++ b/repos/effect/packages/effect/src/Formatter.ts
@@ -169,7 +169,7 @@ export function format(input: unknown, options?: {
         v["toString"] !== Array.prototype.toString
       ) {
         const s = safeToString(v)
-        output = v instanceof Error && v.cause ? `${s} (cause: ${recur(v.cause, d)})` : s
+        output = v instanceof Error && v.cause !== undefined ? `${s} (cause: ${recur(v.cause, d)})` : s
       } else if (Symbol.iterator in v) {
         output = `${v.constructor.name}(${recur(Array.from(v as any), d)})`
       } else {
diff --git a/repos/effect/packages/effect/src/Graph.ts b/repos/effect/packages/effect/src/Graph.ts
index b1b94c533..7f9ae698b 100644
--- a/repos/effect/packages/effect/src/Graph.ts
+++ b/repos/effect/packages/effect/src/Graph.ts
@@ -19,7 +19,6 @@ import * as csr from "./internal/graphCsr.ts"
 import * as MutableHashMap from "./MutableHashMap.ts"
 import * as Option from "./Option.ts"
 import type { Pipeable } from "./Pipeable.ts"
-import { hasProperty } from "./Predicate.ts"
 import type { Covariant, Invariant } from "./Types.ts"
 
 const TypeId = internal.TypeId
@@ -147,22 +146,6 @@ export interface Snapshot<out N, out E, out T extends Kind> {
   readonly edges: ReadonlyArray<IndexedEdge<E>>
 }
 
-/**
- * Common public protocol for graph values.
- *
- * **Details**
- *
- * Contains only the runtime marker and shared protocols. Graph storage is kept
- * internal; use module functions such as `nodes`, `edges`, `getNode`, and
- * `getEdge` to inspect graph contents.
- *
- * @category protocols
- * @since 3.18.0
- */
-export interface Proto<out N, out E> extends Iterable<readonly [NodeIndex, N]>, Equal.Equal, Pipeable, Inspectable {
-  readonly [TypeId]: Graph.Variance<N, E>
-}
-
 /**
  * Immutable graph interface.
  *
@@ -181,7 +164,10 @@ export interface Proto<out N, out E> extends Iterable<readonly [NodeIndex, N]>,
  * @category models
  * @since 3.18.0
  */
-export interface Graph<out N, out E, T extends Kind = "directed"> extends Proto<N, E> {
+export interface Graph<out N, out E, T extends Kind = "directed">
+  extends Iterable<readonly [NodeIndex, N]>, Equal.Equal, Pipeable, Inspectable
+{
+  readonly [TypeId]: Graph.Variance<N, E>
   readonly type: T
   readonly mutable: false
 }
@@ -415,9 +401,9 @@ const withMutationGuard = <N, E, T extends Kind, A>(
  * @category guards
  * @since 4.0.0
  */
-export const isGraph = <N = unknown, E = unknown, T extends Kind = Kind, U = never>(
+export const isGraph: <N = unknown, E = unknown, T extends Kind = Kind, U = never>(
   u: U | Graph<N, E, T> | MutableGraph<N, E, T>
-): u is Graph<N, E, T> | MutableGraph<N, E, T> => hasProperty(u, TypeId)
+) => u is Graph<N, E, T> | MutableGraph<N, E, T> = internal.isGraph
 
 /**
  * Reconstructs an immutable graph from its indexed active structure.
@@ -6941,7 +6927,7 @@ export const bellmanFord: {
   const edges = csr.getEdges(cache)
   const edgeIds = csr.getEdgeIds(cache)
   const edgeCache = csr.getEdgeEndpoints(cache)
-  const outgoing = csr.getOutgoing(cache)
+  const outgoing = csr.getOutgoingWithEdges(cache)
   const source = csr.getNodeIndex(cache, config.source)!
   const target = csr.getNodeIndex(cache, config.target)!
   const weights = new Float64Array(edges.length)
@@ -7034,7 +7020,9 @@ export const bellmanFord: {
     while (head < tail) {
       const node = queue[head++]
       for (let i = outgoing.rowOffsets[node]; i < outgoing.rowOffsets[node + 1]; i++) {
-        markAffected(outgoing.columnIndices[i])
+        if (weights[outgoing.edgeIndices[i]] !== Infinity) {
+          markAffected(outgoing.columnIndices[i])
+        }
       }
     }
   }
diff --git a/repos/effect/packages/effect/src/Hash.ts b/repos/effect/packages/effect/src/Hash.ts
index 797c61fcf..99f226526 100644
--- a/repos/effect/packages/effect/src/Hash.ts
+++ b/repos/effect/packages/effect/src/Hash.ts
@@ -106,10 +106,6 @@ export const hash: <A>(self: A) => number = <A>(self: A) => {
       return number(self)
     case "bigint":
       return string(self.toString(10))
-    case "boolean":
-      return string(String(self))
-    case "symbol":
-      return string(String(self))
     case "string":
       return string(self)
     case "undefined":
@@ -153,9 +149,8 @@ export const hash: <A>(self: A) => number = <A>(self: A) => {
       }
     }
     default:
-      throw new Error(
-        `BUG: unhandled typeof ${typeof self} - please report an issue at https://github.com/Effect-TS/effect/issues`
-      )
+      // The remaining primitive types are boolean and symbol.
+      return string(String(self))
   }
 }
 
@@ -318,14 +313,8 @@ export const isHash = (u: unknown): u is Hash => hasProperty(u, symbol)
  * @since 2.0.0
  */
 export const number = (n: number) => {
-  if (n !== n) {
-    return string("NaN")
-  }
-  if (n === Infinity) {
-    return string("Infinity")
-  }
-  if (n === -Infinity) {
-    return string("-Infinity")
+  if (n !== n || n === Infinity || n === -Infinity) {
+    return string(String(n))
   }
   let h = n | 0
   if (h !== n) {
diff --git a/repos/effect/packages/effect/src/HashRing.ts b/repos/effect/packages/effect/src/HashRing.ts
index 490832a97..789bf0500 100644
--- a/repos/effect/packages/effect/src/HashRing.ts
+++ b/repos/effect/packages/effect/src/HashRing.ts
@@ -420,7 +420,7 @@ function getIndexForInput<A extends PrimaryKey.PrimaryKey>(
     return [a, distA]
   }
   const range = Math.max(lo, len - lo)
-  for (let i = 1; i < range; i++) {
+  for (let i = 1; i <= range; i++) {
     let index = lo - i
     if (index >= 0 && index < len && !exclude.has(ring[index][1])) {
       return [index, Math.abs(ring[index][0] - hash)]
diff --git a/repos/effect/packages/effect/src/JsonPatch.ts b/repos/effect/packages/effect/src/JsonPatch.ts
index 605d24e2b..8d0943dd3 100644
--- a/repos/effect/packages/effect/src/JsonPatch.ts
+++ b/repos/effect/packages/effect/src/JsonPatch.ts
@@ -307,8 +307,8 @@ function tokenize(pointer: string): Array<string> {
   return pointer.split("/").slice(1).map(unescapeToken)
 }
 
-/** Convert a reference token to a non-negative array index (rejects `-` and negatives). */
-function toIndex(token: string): number {
+/** Converts a JSON Pointer reference token to a non-negative array index. */
+function toJsonPointerArrayIndex(token: string): number {
   if (!/^(0|[1-9]\d*)$/.test(token)) {
     throw new Error(`Invalid array index: "${token}"`)
   }
@@ -332,7 +332,7 @@ function applyOperation(doc: Schema.Json, op: JsonPatchOperation): Schema.Json {
     if (lastToken === "-" && op.op !== "add") {
       throw new Error(`"-" is not valid for ${op.op} at "${op.path}".`)
     }
-    const index = lastToken === "-" ? parent.length : toIndex(lastToken)
+    const index = lastToken === "-" ? parent.length : toJsonPointerArrayIndex(lastToken)
     const maxIndex = op.op === "add" ? parent.length : parent.length - 1
     if (index > maxIndex) throw new Error(`Array index out of bounds at "${op.path}".`)
     const updated = parent.slice()
@@ -374,7 +374,7 @@ function resolveParent(
     const token = tokens[i]
 
     if (Array.isArray(cur)) {
-      const idx = toIndex(token)
+      const idx = toJsonPointerArrayIndex(token)
       if (idx >= cur.length) return null
       stack.push({ container: cur, token: idx })
       cur = cur[idx]
diff --git a/repos/effect/packages/effect/src/JsonPointer.ts b/repos/effect/packages/effect/src/JsonPointer.ts
index 385d578b6..78392b9da 100644
--- a/repos/effect/packages/effect/src/JsonPointer.ts
+++ b/repos/effect/packages/effect/src/JsonPointer.ts
@@ -1,8 +1,8 @@
 /**
- * Helpers for escaping and unescaping JSON Pointer path segments. JSON Pointer
- * uses `/` to separate path tokens inside a JSON document, so token text must
- * encode literal `~` and `/` characters. This module provides the two RFC 6901
- * token conversions used by JSON Patch and related path handling.
+ * Helpers for escaping JSON Pointer path segments and converting JSON Pointer
+ * URI fragments. JSON Pointer uses `/` to separate path tokens inside a JSON
+ * document, so token text must encode literal `~` and `/` characters. URI
+ * fragments additionally apply percent-encoding after JSON Pointer escaping.
  *
  * @since 4.0.0
  */
@@ -78,3 +78,96 @@ export function escapeToken(token: string): string {
 export function unescapeToken(token: string): string {
   return token.replace(/~1/g, "/").replace(/~0/g, "~")
 }
+
+/** @internal */
+export function formatUriFragmentToken(token: string): string {
+  return encodeURI(escapeToken(token)).replace(/#/g, "%23")
+}
+
+/** @internal */
+export function decodeUriFragment(fragment: string): string | undefined {
+  if (fragment.length === 0 || fragment === "#") return ""
+  if (!fragment.startsWith("#")) return undefined
+  const encoded = fragment.slice(1)
+  try {
+    if (encodeURI(encoded).replace(/%25/g, "%").replace(/#/g, "%23") !== encoded) return undefined
+    const pointer = decodeURIComponent(encoded)
+    return pointer.startsWith("/") && !/~(?:[^01]|$)/.test(pointer) ? pointer : undefined
+  } catch {
+    return undefined
+  }
+}
+
+/**
+ * Parses a JSON Pointer URI fragment into decoded path tokens.
+ *
+ * **When to use**
+ *
+ * Use when you need to resolve a URI fragment against a JSON document.
+ *
+ * **Details**
+ *
+ * Percent-encoding is decoded before the pointer is split into tokens, then
+ * each token is decoded with {@link unescapeToken}. The empty string and `#`
+ * both represent the document root.
+ *
+ * **Gotchas**
+ *
+ * Returns `undefined` when the input is not a URI fragment, contains characters
+ * that require percent-encoding, or contains an invalid JSON Pointer escape
+ * sequence.
+ *
+ * **Example** (Parsing URI fragments)
+ *
+ * ```ts import.meta.vitest
+ * import { JsonPointer } from "effect"
+ *
+ * JsonPointer.parseUriFragment("#/users/a~1b") // => ["users", "a/b"]
+ * JsonPointer.parseUriFragment("#/caf%C3%A9") // => ["café"]
+ * JsonPointer.parseUriFragment("#/%") // => undefined
+ * JsonPointer.parseUriFragment("#/a#b") // => undefined
+ * ```
+ *
+ * @see {@link formatUriFragment} for the inverse operation
+ * @category decoding
+ * @since 4.0.0
+ */
+export function parseUriFragment(fragment: string): ReadonlyArray<string> | undefined {
+  const pointer = decodeUriFragment(fragment)
+  return pointer === undefined ? undefined : pointer.length === 0 ? [] : pointer.slice(1).split("/").map(unescapeToken)
+}
+
+/**
+ * Formats path tokens as a JSON Pointer URI fragment.
+ *
+ * **When to use**
+ *
+ * Use when you need a URI fragment that identifies a value in a JSON document.
+ *
+ * **Details**
+ *
+ * Each token is encoded with {@link escapeToken} before URI percent-encoding
+ * is applied. An empty path is formatted as `#`.
+ *
+ * **Gotchas**
+ *
+ * Throws a `URIError` when a token contains an unpaired surrogate.
+ *
+ * **Example** (Formatting a URI fragment)
+ *
+ * ```ts import.meta.vitest
+ * import { JsonPointer } from "effect"
+ *
+ * JsonPointer.formatUriFragment(["users", "a/b", "Rate%"]) // => "#/users/a~1b/Rate%25"
+ * ```
+ *
+ * @see {@link parseUriFragment} for the inverse operation
+ * @category encoding
+ * @since 4.0.0
+ */
+export function formatUriFragment(path: ReadonlyArray<string>): string {
+  return path.reduce(
+    (fragment, token) => `${fragment}/${formatUriFragmentToken(token)}`,
+    "#"
+  )
+}
diff --git a/repos/effect/packages/effect/src/JsonSchema.ts b/repos/effect/packages/effect/src/JsonSchema.ts
index 054b8e6b6..5cbd69837 100644
--- a/repos/effect/packages/effect/src/JsonSchema.ts
+++ b/repos/effect/packages/effect/src/JsonSchema.ts
@@ -9,7 +9,7 @@
  * @since 4.0.0
  */
 import * as InternalRecord from "./internal/record.ts"
-import { escapeToken, unescapeToken } from "./JsonPointer.ts"
+import { formatUriFragment, parseUriFragment } from "./JsonPointer.ts"
 import * as Predicate from "./Predicate.ts"
 
 /**
@@ -218,9 +218,9 @@ function isMetaSchemaUri(value: unknown, uri: string): boolean {
 }
 
 function rewriteOpenApiComponentsReference(reference: string): string {
-  const path = reference.startsWith("#") ? parsePointerFragment(reference) : undefined
+  const path = reference.startsWith("#") ? parseUriFragment(reference) : undefined
   return path !== undefined && path[0] === "components" && path[1] === "schemas"
-    ? formatPointerFragment(["$defs", ...path.slice(2)])
+    ? formatUriFragment(["$defs", ...path.slice(2)])
     : reference
 }
 
@@ -627,7 +627,7 @@ export function toMultiDocumentOpenApi3_1(multiDocument: MultiDocument<"draft-20
     return transformSchema(schema, (schema, inEmbeddedResource) => {
       rejectKeywordCollisions(schema, OPEN_API_31_TARGET_COLLISIONS, "OpenAPI 3.1", "Draft 2020-12")
       rewriteSchemaRef(schema, (reference, keyword) => {
-        const path = reference.startsWith("#") ? parsePointerFragment(reference) : undefined
+        const path = reference.startsWith("#") ? parseUriFragment(reference) : undefined
         if (path === undefined || path[0] !== "$defs" || path.length < 2) return reference
         const key = path[1]
         if (isRootResource) {
@@ -643,7 +643,7 @@ export function toMultiDocumentOpenApi3_1(multiDocument: MultiDocument<"draft-20
         }
         return inEmbeddedResource
           ? reference
-          : formatPointerFragment(["components", "schemas", keyMap.get(key) ?? key, ...path.slice(2)])
+          : formatUriFragment(["components", "schemas", keyMap.get(key) ?? key, ...path.slice(2)])
       })
     }) as JsonSchema
   }
@@ -682,7 +682,7 @@ export function sanitizeOpenApiComponentsSchemasKey(s: string): string {
 
 /** @internal */
 export function getReferenceKey($ref: string): string | undefined {
-  const path = $ref.startsWith("#") ? parsePointerFragment($ref) : undefined
+  const path = $ref.startsWith("#") ? parseUriFragment($ref) : undefined
   return path !== undefined && path.length === 2 && path[0] === "$defs"
     ? path[1]
     : undefined
@@ -815,7 +815,7 @@ function runConverter<A>(adapter: Adapter, options: ConverterOptions | undefined
       let reference = value
       const resolved = resolveUrl(value, sourceResource)
       if (resolved !== undefined) {
-        const sourcePointer = parsePointerFragment(resolved.hash)
+        const sourcePointer = parseUriFragment(resolved.hash)
         resolved.hash = ""
         if (sourcePointer !== undefined) {
           const targetPath = locations.get(locationKey(resolved.href, sourcePointer))
@@ -927,29 +927,11 @@ function resolveResourceUri(value: unknown, base: string): string | undefined {
   return url.href
 }
 
-function parsePointerFragment(hash: string): Path | undefined {
-  if (hash.length === 0) return []
-  let pointer: string
-  try {
-    pointer = decodeURIComponent(hash.slice(1))
-  } catch {
-    return undefined
-  }
-  if (!pointer.startsWith("/")) return undefined
-  return /~(?:[^01]|$)/.test(pointer) ? undefined : pointer.slice(1).split("/").map(unescapeToken)
-}
-
 function relocateReference(reference: string, targetPath: Path): string {
   const index = reference.indexOf("#")
   if (index === -1 && targetPath.length === 0) return reference
   const uri = index === -1 ? reference : reference.slice(0, index)
-  return `${uri}${formatPointerFragment(targetPath)}`
-}
-
-function formatPointerFragment(path: Path): string {
-  return path.length === 0
-    ? "#"
-    : `#/${path.map((token) => encodeURI(escapeToken(token)).replace(/#/g, "%23")).join("/")}`
+  return `${uri}${formatUriFragment(targetPath)}`
 }
 
 function locationKey(resource: string, pointer: Path): string {
diff --git a/repos/effect/packages/effect/src/Layer.ts b/repos/effect/packages/effect/src/Layer.ts
index ede9373c1..c5bd8f629 100644
--- a/repos/effect/packages/effect/src/Layer.ts
+++ b/repos/effect/packages/effect/src/Layer.ts
@@ -1137,6 +1137,8 @@ export const effectDiscard = <X, E, R>(effect: Effect<X, E, R>): Layer<never, E,
 export const suspend = <A, E, R>(evaluate: LazyArg<Layer<A, E, R>>): Layer<A, E, R> =>
   fromBuildMemo((memoMap, scope) => internalEffect.suspend(() => evaluate().build(memoMap, scope)))
 
+const unwrapKey = Context.Service<Layer<any, any, any>>("effect/Layer/unwrap")
+
 /**
  * Unwraps a `Layer` from an `Effect`, flattening the nested structure.
  *
@@ -1173,10 +1175,7 @@ export const suspend = <A, E, R>(evaluate: LazyArg<Layer<A, E, R>>): Layer<A, E,
  */
 export const unwrap = <A, E1, R1, E, R>(
   self: Effect<Layer<A, E1, R1>, E, R>
-): Layer<A, E | E1, R1 | Exclude<R, Scope.Scope>> => {
-  const service = Context.Service<Layer<A, E1, R1>>("effect/Layer/unwrap")
-  return flatMap(effect(service)(self), Context.get(service))
-}
+): Layer<A, E | E1, R1 | Exclude<R, Scope.Scope>> => flatMap(effect(unwrapKey)(self), Context.get(unwrapKey))
 
 const mergeAllEffect = <Layers extends [Layer<never, any, any>, ...Array<Layer<never, any, any>>]>(
   layers: Layers,
@@ -1738,21 +1737,24 @@ export const tap: {
  * @since 2.0.0
  */
 export const tapError: {
-  <E, XE extends E, RIn2, E2, X>(
-    f: (e: XE) => Effect<X, E2, RIn2>
+  <E, _XE extends E, RIn2, E2, X>(
+    f: (e: Types.NoInfer<E>) => Effect<X, E2, RIn2>
   ): <RIn, ROut>(self: Layer<ROut, E, RIn>) => Layer<ROut, E | E2, RIn | Exclude<RIn2, Scope.Scope>>
-  <RIn, E, XE extends E, ROut, RIn2, E2, X>(
+  <E, RIn2, E2, X>(
+    f: (e: E) => Effect<X, E2, RIn2>
+  ): <RIn, ROut, E1 extends E = E>(self: Layer<ROut, E1, RIn>) => Layer<ROut, E1 | E2, RIn | Exclude<RIn2, Scope.Scope>>
+  <RIn, E, _XE extends E, ROut, RIn2, E2, X>(
     self: Layer<ROut, E, RIn>,
-    f: (e: XE) => Effect<X, E2, RIn2>
+    f: (e: Types.NoInfer<E>) => Effect<X, E2, RIn2>
   ): Layer<ROut, E | E2, RIn | Exclude<RIn2, Scope.Scope>>
-} = dual(2, <RIn, E, XE extends E, ROut, RIn2, E2, X>(
+} = dual(2, <RIn, E, ROut, RIn2, E2, X>(
   self: Layer<ROut, E, RIn>,
-  f: (e: XE) => Effect<X, E2, RIn2>
+  f: (e: E) => Effect<X, E2, RIn2>
 ): Layer<ROut, E | E2, RIn | Exclude<RIn2, Scope.Scope>> =>
   fromBuild((memoMap, scope) =>
     internalEffect.catch_(
       self.build(memoMap, scope),
-      (error) => Scope.provide(internalEffect.andThen(f(error as XE), internalEffect.fail(error)), scope)
+      (error) => Scope.provide(internalEffect.andThen(f(error), internalEffect.fail(error)), scope)
     )
   ))
 
@@ -1778,22 +1780,24 @@ export const tapError: {
  * @since 4.0.0
  */
 export const tapCause: {
-  <E, XE extends E, RIn2, E2, X>(
-    f: (cause: Cause.Cause<XE>) => Effect<X, E2, RIn2>
+  <E, _XE extends E, RIn2, E2, X>(
+    f: (cause: Cause.Cause<Types.NoInfer<E>>) => Effect<X, E2, RIn2>
   ): <RIn, ROut>(self: Layer<ROut, E, RIn>) => Layer<ROut, E | E2, RIn | Exclude<RIn2, Scope.Scope>>
-  <RIn, E, XE extends E, ROut, RIn2, E2, X>(
+  <E, RIn2, E2, X>(
+    f: (cause: Cause.Cause<E>) => Effect<X, E2, RIn2>
+  ): <RIn, ROut, E1 extends E = E>(self: Layer<ROut, E1, RIn>) => Layer<ROut, E1 | E2, RIn | Exclude<RIn2, Scope.Scope>>
+  <RIn, E, _XE extends E, ROut, RIn2, E2, X>(
     self: Layer<ROut, E, RIn>,
-    f: (cause: Cause.Cause<XE>) => Effect<X, E2, RIn2>
+    f: (cause: Cause.Cause<Types.NoInfer<E>>) => Effect<X, E2, RIn2>
   ): Layer<ROut, E | E2, RIn | Exclude<RIn2, Scope.Scope>>
-} = dual(2, <RIn, E, XE extends E, ROut, RIn2, E2, X>(
+} = dual(2, <RIn, E, ROut, RIn2, E2, X>(
   self: Layer<ROut, E, RIn>,
-  f: (cause: Cause.Cause<XE>) => Effect<X, E2, RIn2>
+  f: (cause: Cause.Cause<E>) => Effect<X, E2, RIn2>
 ): Layer<ROut, E | E2, RIn | Exclude<RIn2, Scope.Scope>> =>
   fromBuild((memoMap, scope) =>
     internalEffect.catchCause(
       self.build(memoMap, scope),
-      (cause) =>
-        Scope.provide(internalEffect.andThen(f(cause as Cause.Cause<XE>), internalEffect.failCause(cause)), scope)
+      (cause) => Scope.provide(internalEffect.andThen(f(cause), internalEffect.failCause(cause)), scope)
     )
   ))
 
@@ -2676,7 +2680,7 @@ export const withSpan: {
             (span) => internalEffect.addFinalizer((exit) => options.onEnd!(span, exit))
           )
           : internalEffect.makeSpanScoped(name, options),
-        (span) => withParentSpan(self, span)
+        (span) => withParentSpan(self, span, options)
       )
     )
   }
@@ -2689,7 +2693,7 @@ export const withSpan: {
             (span) => internalEffect.addFinalizer((exit) => options.onEnd!(span, exit))
           )
           : internalEffect.makeSpanScoped(name, options),
-        (span) => withParentSpan(self, span)
+        (span) => withParentSpan(self, span, options)
       )
     )
 } as any
diff --git a/repos/effect/packages/effect/src/LayerMap.ts b/repos/effect/packages/effect/src/LayerMap.ts
index eabd4ec59..d9bc31fe0 100644
--- a/repos/effect/packages/effect/src/LayerMap.ts
+++ b/repos/effect/packages/effect/src/LayerMap.ts
@@ -423,7 +423,7 @@ export const Service = <Self>() =>
     : Options extends { readonly layers: infer Layers } ? keyof Layers
     : never,
   Service.Success<Options>,
-  Options extends { readonly preload: true } ? never : Service.Error<Options>,
+  Service.Error<Options>,
   Service.Services<Options>,
   Options extends { readonly preload: true } ? Service.Error<Options>
     : Options extends { readonly preloadKeys: Iterable<any> } ? Service.Error<Options>
@@ -431,11 +431,13 @@ export const Service = <Self>() =>
   Options extends { readonly dependencies: ReadonlyArray<Layer.Layer<any, any, any>> } ? Options["dependencies"][number]
     : never
 > => {
-  const Err = globalThis.Error as any
   const limit = getStackTraceLimit()
-  setStackTraceLimit(2)
-  const creationError = new Err()
-  setStackTraceLimit(limit)
+  let creationError: Error | undefined
+  if (limit !== 0) {
+    setStackTraceLimit(2)
+    creationError = new globalThis.Error()
+    setStackTraceLimit(limit)
+  }
 
   function TagClass() {}
   const TagClass_ = TagClass as any as Mutable<TagClass<Self, Id, string, any, any, any, any, any>>
@@ -443,7 +445,7 @@ export const Service = <Self>() =>
   TagClass.key = id
   Object.defineProperty(TagClass, "stack", {
     get() {
-      return creationError.stack
+      return creationError?.stack
     }
   })
 
diff --git a/repos/effect/packages/effect/src/LayerRef.ts b/repos/effect/packages/effect/src/LayerRef.ts
index a96100773..4d18aeb85 100644
--- a/repos/effect/packages/effect/src/LayerRef.ts
+++ b/repos/effect/packages/effect/src/LayerRef.ts
@@ -349,11 +349,13 @@ export const Service = <Self>() =>
   [Preload] extends [true] ? E : never,
   Deps[number]
 > => {
-  const Err = globalThis.Error as any
   const limit = getStackTraceLimit()
-  setStackTraceLimit(2)
-  const creationError = new Err()
-  setStackTraceLimit(limit)
+  let creationError: Error | undefined
+  if (limit !== 0) {
+    setStackTraceLimit(2)
+    creationError = new globalThis.Error()
+    setStackTraceLimit(limit)
+  }
 
   function TagClass() {}
   const TagClass_ = TagClass as any as Mutable<TagClass<Self, Id, any, any, any, any, any>>
@@ -361,7 +363,7 @@ export const Service = <Self>() =>
   TagClass.key = id
   Object.defineProperty(TagClass, "stack", {
     get() {
-      return creationError.stack
+      return creationError?.stack
     }
   })
 
diff --git a/repos/effect/packages/effect/src/Logger.ts b/repos/effect/packages/effect/src/Logger.ts
index 168a53870..2cd9b881a 100644
--- a/repos/effect/packages/effect/src/Logger.ts
+++ b/repos/effect/packages/effect/src/Logger.ts
@@ -752,7 +752,9 @@ export const batched = dual<
 
 /**
  * A `Logger` which outputs logs in a "pretty" format and writes them to the
- * console.
+ * console. Chooses between tty and browser implementation. If the runtime
+ * platform is known and fixed, prefer {@link consolePrettyBrowser} or
+ * {@link consolePrettyTty}.
  *
  * **Details**
  *
@@ -763,24 +765,135 @@ export const batched = dual<
  * **Example** (Logging with pretty console output)
  *
  * ```ts import.meta.vitest
- * import { Logger } from "effect"
+ * import { Effect, Logger } from "effect"
+ *
+ * const prettyLogger = Logger.layer([Logger.consolePretty()])
+ *
+ * Effect.log("hello").pipe(
+ *   Effect.withLogSpan('label'),
+ *   Effect.annotateLogs('key', 'value'),
+ *   Effect.provide(prettyLogger),
+ *   Effect.runSync
+ * )
+ * ```
+ *
+ * **Example** (Logging with console.error, when the environment has TTY)
+ *
+ * ```ts import.meta.vitest
+ * import { Effect, Layer, Logger } from "effect"
  *
- * const prettyLogger = Logger.consolePretty({ colors: false })
- * Logger.isLogger(prettyLogger) // => true
+ * const prettyLoggerLayer = Layer.merge(
+ *   Logger.layer([Logger.consolePretty()]),
+ *   Layer.succeed(Logger.LogToStderr, true)
+ * )
+ *
+ * Effect.log('hello').pipe(
+ *   Effect.provide(prettyLoggerLayer),
+ *   Effect.runSync
+ * )
  * ```
  *
+ * @see {@link consolePrettyBrowser} for browser-specific implementation
+ * @see {@link consolePrettyTty} for the TTY-mode implementation
  * @category constructors
  * @since 4.0.0
  */
 export const consolePretty: (
   options?: {
     readonly colors?: "auto" | boolean | undefined
-    readonly stderr?: boolean | undefined
     readonly formatDate?: ((date: Date) => string) | undefined
     readonly mode?: "browser" | "tty" | "auto" | undefined
   }
 ) => Logger<unknown, void> = effect.consolePretty
 
+/**
+ * A `Logger` which outputs logs in a "pretty" format and writes them to the
+ * console. Intended to be used on platforms with a browser console.
+ *
+ * **Details**
+ *
+ * For example, pretty output can render as
+ * `[09:37:17.579] INFO (#1) label=0ms: hello` followed by an annotation line
+ * such as `key: value`.
+ *
+ * **Example** (Logging with pretty console output)
+ *
+ * ```ts import.meta.vitest
+ * import { Effect, Logger } from "effect"
+ *
+ * const prettyLogger = Logger.layer([Logger.consolePrettyBrowser()])
+ *
+ * Effect.log("hello").pipe(
+ *   Effect.withLogSpan('label'),
+ *   Effect.annotateLogs('key', 'value'),
+ *   Effect.provide(prettyLogger),
+ *   Effect.runSync
+ * )
+ * ```
+ *
+ * @see {@link consolePretty} for the platform-independent implementation
+ * @category constructors
+ * @since 4.0.0
+ */
+export const consolePrettyBrowser: (
+  options?: {
+    readonly colors?: boolean | undefined
+    readonly formatDate?: ((date: Date) => string) | undefined
+  }
+) => Logger<unknown, void> = effect.prettyLoggerBrowser
+
+/**
+ * A `Logger` which outputs logs in a "pretty" format and writes them to the
+ * console. Intended to be used on platforms with tty console.
+ *
+ * **Details**
+ *
+ * For example, pretty output can render as
+ * `[09:37:17.579] INFO (#1) label=0ms: hello` followed by an annotation line
+ * such as `key: value`.
+ *
+ * **Example** (Logging with pretty console output)
+ *
+ * ```ts import.meta.vitest
+ * import { Effect, Logger } from "effect"
+ *
+ * const prettyLogger = Logger.layer([Logger.consolePrettyTty()])
+ *
+ * Effect.log("hello").pipe(
+ *   Effect.withLogSpan('label'),
+ *   Effect.annotateLogs('key', 'value'),
+ *   Effect.provide(prettyLogger),
+ *   Effect.runSync
+ * )
+ * ```
+ *
+ * **Example** (Logging with console.error)
+ *
+ * ```ts import.meta.vitest
+ * import { Effect, Layer, Logger } from "effect"
+ *
+ * const prettyLoggerLayer = Layer.merge(
+ *   Logger.layer([Logger.consolePrettyTty()]),
+ *   Layer.succeed(Logger.LogToStderr, true)
+ * )
+ *
+ * Effect.log('hello').pipe(
+ *   Effect.provide(prettyLoggerLayer),
+ *   Effect.runSync
+ * )
+ * ```
+ *
+ * @see {@link consolePretty} for the platform-independent implementation
+ * @category constructors
+ * @since 4.0.0
+ */
+export const consolePrettyTty: (
+  options?: {
+    readonly colors?: boolean | undefined
+    readonly formatDate?: ((date: Date) => string) | undefined
+  }
+) => Logger<unknown, void> = effect.prettyLoggerTty
+
 /**
  * A `Logger` which outputs logs using the [logfmt](https://brandur.org/logfmt)
  * style and writes them to the console.
@@ -951,9 +1064,8 @@ export const layer = <
  *
  * const writes: Array<string> = []
  * const file = {
- *   write: (buffer: Uint8Array) => Effect.sync(() => {
+ *   writeAll: (buffer: Uint8Array) => Effect.sync(() => {
  *     writes.push(new TextDecoder().decode(buffer).trim())
- *     return FileSystem.Size(buffer.length)
  *   })
  * } as unknown as FileSystem.File
  * const fileSystem = FileSystem.makeNoop({ open: () => Effect.succeed(file) })
@@ -977,9 +1089,8 @@ export const layer = <
  *
  * const writes: Array<string> = []
  * const file = {
- *   write: (buffer: Uint8Array) => Effect.sync(() => {
+ *   writeAll: (buffer: Uint8Array) => Effect.sync(() => {
  *     writes.push(new TextDecoder().decode(buffer).trim())
- *     return FileSystem.Size(buffer.length)
  *   })
  * } as unknown as FileSystem.File
  * const fileSystem = FileSystem.makeNoop({ open: () => Effect.succeed(file) })
@@ -1030,7 +1141,7 @@ export const toFile = dual<
       const encoder = new TextEncoder()
       return yield* batched(self, {
         window: options?.batchWindow ?? 1000,
-        flush: (output) => effect.ignore(logFile.write(encoder.encode(output.join("\n") + "\n")))
+        flush: (output) => effect.ignore(logFile.writeAll(encoder.encode(output.join("\n") + "\n")))
       })
     })
 )
diff --git a/repos/effect/packages/effect/src/ManagedRuntime.ts b/repos/effect/packages/effect/src/ManagedRuntime.ts
index 90117459f..e0a99849d 100644
--- a/repos/effect/packages/effect/src/ManagedRuntime.ts
+++ b/repos/effect/packages/effect/src/ManagedRuntime.ts
@@ -317,7 +317,7 @@ export const make = <R, ER>(
               self.cachedContext = context
             })
         ),
-        { ...defaultRunOptions, scheduler: fiber.currentScheduler }
+        { ...defaultRunOptions, scheduler: fiber.cache.scheduler }
       )
     }
     return Effect.flatten(Fiber.await(buildFiber))
diff --git a/repos/effect/packages/effect/src/Match.ts b/repos/effect/packages/effect/src/Match.ts
index 918c44d20..1f3a4aaad 100644
--- a/repos/effect/packages/effect/src/Match.ts
+++ b/repos/effect/packages/effect/src/Match.ts
@@ -22,7 +22,7 @@ const TypeId = internal.TypeId
 
 // The conditional must stay deferred until P is inferred. Replacing it with an
 // intersection loses contextual typing for nested generic calls (microsoft/TypeScript#52864).
-type Contextual<P, Fallback> = internal.Contextual<P, Fallback>
+type Contextual<P, Fallback> = [P] extends [never] ? Fallback : P
 
 type TagHandlers<D extends string, R, Ret> = {
   readonly [Tag in Types.Tags<D, R> & string]: (_: Extract<R, Record<D, Tag>>) => Ret
diff --git a/repos/effect/packages/effect/src/Metric.ts b/repos/effect/packages/effect/src/Metric.ts
index 9a9093c66..14eb02edc 100644
--- a/repos/effect/packages/effect/src/Metric.ts
+++ b/repos/effect/packages/effect/src/Metric.ts
@@ -1609,7 +1609,15 @@ export const CurrentMetricAttributes = Context.Reference<Metric.AttributeSet>(Cu
   defaultValue: () => ({})
 })
 
-const MetricRegistryKey = "~effect/Metric/MetricRegistryKey"
+const MetricRegistryKey = "effect/Metric/MetricRegistry"
+
+/**
+ * The registry used to store metric metadata and hooks.
+ *
+ * @category services
+ * @since 4.0.0
+ */
+export type MetricRegistry = Map<string, Metric.Metadata<any, any>>
 
 /**
  * Context reference for the metric registry in the current context.
@@ -1637,7 +1645,7 @@ const MetricRegistryKey = "~effect/Metric/MetricRegistryKey"
  * @category services
  * @since 4.0.0
  */
-export const MetricRegistry = Context.Reference<Map<string, Metric.Metadata<any, any>>>(
+export const MetricRegistry: Context.Reference<MetricRegistry> = Context.Reference<MetricRegistry>(
   MetricRegistryKey,
   { defaultValue: () => new Map() }
 )
@@ -1652,8 +1660,7 @@ abstract class Metric$<in Input, out State> implements Metric<Input, State> {
   declare readonly Input: Contravariant<Input>
   declare readonly State: Covariant<State>
 
-  readonly #metadataCache = new WeakMap<Metric.Attributes, Metric.Metadata<Input, State>>()
-  #metadata: Metric.Metadata<Input, State> | undefined
+  readonly #metadata = new WeakMap<MetricRegistry, Metric.Metadata<Input, State>>()
 
   readonly id: string
   readonly description: string | undefined
@@ -1685,20 +1692,15 @@ abstract class Metric$<in Input, out State> implements Metric<Input, State> {
 
   hook(context: Context.Context<never>): Metric.Hooks<Input, State> {
     const extraAttributes = Context.get(context, CurrentMetricAttributes)
-    if (Object.keys(extraAttributes).length === 0) {
-      if (Predicate.isNotUndefined(this.#metadata)) {
-        return this.#metadata.hooks
-      }
-      this.#metadata = this.getOrCreate(context, this.attributes)
-      return this.#metadata.hooks
+    if (Object.keys(extraAttributes).length > 0) {
+      return this.getOrCreate(context, mergeAttributes(this.attributes, extraAttributes)).hooks
     }
-    const mergedAttributes = mergeAttributes(this.attributes, extraAttributes)
-    let metadata = this.#metadataCache.get(mergedAttributes)
-    if (Predicate.isNotUndefined(metadata)) {
-      return metadata.hooks
+    const registry = Context.get(context, MetricRegistry)
+    let metadata = this.#metadata.get(registry)
+    if (Predicate.isUndefined(metadata)) {
+      metadata = this.getOrCreate(context, this.attributes)
+      this.#metadata.set(registry, metadata)
     }
-    metadata = this.getOrCreate(context, mergedAttributes)
-    this.#metadataCache.set(mergedAttributes, metadata)
     return metadata.hooks
   }
 
@@ -3235,14 +3237,13 @@ const fiberFailures = counter("child_fiber_failures", {
  * ```ts import.meta.vitest
  * import { Metric } from "effect"
  *
- * Metric.FiberRuntimeMetricsKey // => "effect/observability/Metric/FiberRuntimeMetricsKey"
+ * Metric.FiberRuntimeMetricsKey // => "effect/Metric/FiberRuntimeMetrics"
  * ```
  *
  * @category constants
  * @since 4.0.0
  */
-export const FiberRuntimeMetricsKey: "effect/observability/Metric/FiberRuntimeMetricsKey" =
-  InternalMetric.FiberRuntimeMetricsKey
+export const FiberRuntimeMetricsKey: "effect/Metric/FiberRuntimeMetrics" = InternalMetric.FiberRuntimeMetricsKey
 
 /**
  * Interface for the fiber runtime metrics service that tracks fiber lifecycle events.
@@ -3496,7 +3497,9 @@ function makeHooks<Input, State>(
 }
 
 function serializeAttributes(attributes: Metric.Attributes): string {
-  return JSON.stringify(Array.isArray(attributes) ? attributes : Object.entries(attributes))
+  const entries = Array.isArray(attributes) ? [...attributes] : Object.entries(attributes)
+  entries.sort((a, b) => a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0)
+  return JSON.stringify(entries)
 }
 
 function mergeAttributes(
diff --git a/repos/effect/packages/effect/src/MutableList.ts b/repos/effect/packages/effect/src/MutableList.ts
index d75f55c39..3506009e8 100644
--- a/repos/effect/packages/effect/src/MutableList.ts
+++ b/repos/effect/packages/effect/src/MutableList.ts
@@ -291,6 +291,7 @@ export const prependAllUnsafe = <A>(self: MutableList<A>, messages: ReadonlyArra
     offset: 0,
     next: self.head
   }
+  if (!self.tail && messages.length > 0) self.tail = self.head
   self.length += self.head.array.length
 }
 
diff --git a/repos/effect/packages/effect/src/Number.ts b/repos/effect/packages/effect/src/Number.ts
index 10772b72c..b42e1c07e 100644
--- a/repos/effect/packages/effect/src/Number.ts
+++ b/repos/effect/packages/effect/src/Number.ts
@@ -643,7 +643,7 @@ export const remainder: {
   const selfDecCount = (selfString.split(".")[1] || "").length
   const divisorDecCount = (divisorString.split(".")[1] || "").length
   const decCount = selfDecCount > divisorDecCount ? selfDecCount : divisorDecCount
-  const selfInt = parseInt(self.toFixed(decCount).replace(".", ""))
+  const selfInt = self === 0 ? self : parseInt(self.toFixed(decCount).replace(".", ""))
   const divisorInt = parseInt(divisor.toFixed(decCount).replace(".", ""))
   return (selfInt % divisorInt) / Math.pow(10, decCount)
 })
diff --git a/repos/effect/packages/effect/src/Optic.ts b/repos/effect/packages/effect/src/Optic.ts
index f132e6617..c21149a6f 100644
--- a/repos/effect/packages/effect/src/Optic.ts
+++ b/repos/effect/packages/effect/src/Optic.ts
@@ -12,6 +12,7 @@
  * @since 4.0.0
  */
 
+import * as Arr from "./Array.ts"
 import { dual, identity } from "./Function.ts"
 import * as InternalRecord from "./internal/record.ts"
 import * as Option from "./Option.ts"
@@ -1001,8 +1002,11 @@ class OptionalImpl<S, A> implements Optional<S, A> {
           (a, s) => {
             const copy = cloneShallow(s)
             if (a === undefined) {
-              if (Array.isArray(copy) && typeof key === "number") {
-                copy.splice(key, 1)
+              if (
+                Array.isArray(copy) &&
+                (typeof key === "number" || (typeof key === "string" && Arr.isCanonicalArrayIndex(key)))
+              ) {
+                copy.splice(Number(key), 1)
               } else {
                 delete copy[key]
               }
@@ -1058,10 +1062,10 @@ class OptionalImpl<S, A> implements Optional<S, A> {
     )
   }
   pick(keys: any) {
-    return this.compose(makeLens(Struct.pick(keys), (p, a) => ({ ...a, ...p })))
+    return this.compose(makeLens(Struct.pick(keys), (p, a) => ({ ...Struct.omit(a, keys), ...p })))
   }
   omit(keys: any) {
-    return this.compose(makeLens(Struct.omit(keys), (o, a) => ({ ...a, ...o })))
+    return this.compose(makeLens(Struct.omit(keys), (o, a) => ({ ...Struct.pick(a, keys), ...o })))
   }
   notUndefined(): any {
     return this.refine(Predicate.isNotUndefined, { expected: "a value other than `undefined`" })
diff --git a/repos/effect/packages/effect/src/Order.ts b/repos/effect/packages/effect/src/Order.ts
index c52ea3604..211b44bbd 100644
--- a/repos/effect/packages/effect/src/Order.ts
+++ b/repos/effect/packages/effect/src/Order.ts
@@ -368,6 +368,7 @@ export function alwaysEqual<A>(): Order<A> {
  *
  * Applies orders in iteration order and short-circuits on the first non-zero
  * result. It returns `0` only if all orders return `0`.
+ * The collection is materialized when the order is created, so it must be finite.
  *
  * **Example** (Combining multiple Orders)
  *
@@ -397,9 +398,10 @@ export function alwaysEqual<A>(): Order<A> {
  * @since 2.0.0
  */
 export function combineAll<A>(collection: Iterable<Order<A>>): Order<A> {
+  const orders = Array.from(collection)
   return make((a1, a2) => {
     let out: Ordering = 0
-    for (const O of collection) {
+    for (const O of orders) {
       out = O(a1, a2)
       if (out !== 0) {
         return out
diff --git a/repos/effect/packages/effect/src/PartitionedSemaphore.ts b/repos/effect/packages/effect/src/PartitionedSemaphore.ts
index d700e46ee..07aaabfb6 100644
--- a/repos/effect/packages/effect/src/PartitionedSemaphore.ts
+++ b/repos/effect/packages/effect/src/PartitionedSemaphore.ts
@@ -216,8 +216,7 @@ export const makeUnsafe = <K = unknown>(options: {
       }
 
       const cleanup = () => {
-        waiters.delete(entry)
-        if (waiters.size === 0) {
+        if (waiters.delete(entry) && waiters.size === 0) {
           MutableHashMap.remove(partitions, key)
         }
       }
diff --git a/repos/effect/packages/effect/src/Pool.ts b/repos/effect/packages/effect/src/Pool.ts
index b160722d3..cdb5ee17c 100644
--- a/repos/effect/packages/effect/src/Pool.ts
+++ b/repos/effect/packages/effect/src/Pool.ts
@@ -119,6 +119,7 @@ export interface State<A, E> {
   isShuttingDown: boolean
   usage: number
   readonly resizeSemaphore: Semaphore.Semaphore
+  // Insertion order determines usage-TTL retirement order; reclaimed items move to the back.
   readonly items: Set<PoolItem<A, E>>
   availableHead: PoolItem<A, E> | undefined
   availableTail: PoolItem<A, E> | undefined
@@ -673,9 +674,12 @@ const wakeAll = <A, E>(self: Pool<A, E>): Effect.Effect<void> =>
     return internal.void
   })
 
+// Reservations prevent reuse without extending the lifetime of borrowed items.
+const reservations = new WeakMap<PoolItem<unknown, unknown>, number>()
+
 /** Adds a freshly acquired item, which has no use behind it, at the back. */
 const addAvailable = <A, E>(self: Pool<A, E>, item: PoolItem<A, E>): void => {
-  if (item.isAvailable) return
+  if (item.isAvailable || reservations.has(item)) return
   item.isAvailable = true
   item.availablePrevious = self.state.availableTail
   item.availableNext = undefined
@@ -701,7 +705,7 @@ const addAvailable = <A, E>(self: Pool<A, E>, item: PoolItem<A, E>): void => {
  * item is checked out either way.
  */
 const addAvailableFront = <A, E>(self: Pool<A, E>, item: PoolItem<A, E>): void => {
-  if (item.isAvailable) return
+  if (item.isAvailable || reservations.has(item)) return
   item.isAvailable = true
   item.availablePrevious = undefined
   item.availableNext = self.state.availableHead
@@ -783,9 +787,12 @@ export const reserve: {
   <A, E>(self: Pool<A, E>, item: A): Effect.Effect<void, never, Scope.Scope> =>
     Effect.asVoid(Effect.acquireRelease(
       Effect.sync(() => {
+        if (self.config.concurrency === 1) return undefined
         for (const poolItem of self.state.items) {
           if (poolItem.exit._tag !== "Success" || poolItem.exit.value !== item) continue
-          self.state.usage += self.config.concurrency - 1
+          const existing = reservations.get(poolItem)
+          if (existing === undefined) self.state.usage += self.config.concurrency - 1
+          reservations.set(poolItem, (existing ?? 0) + 1)
           removeAvailable(self, poolItem)
           return poolItem
         }
@@ -794,15 +801,22 @@ export const reserve: {
       (poolItem) =>
         core.withFiber((fiber) => {
           if (poolItem === undefined) return internal.void
+          const remaining = (reservations.get(poolItem) ?? 1) - 1
+          if (remaining > 0) {
+            reservations.set(poolItem, remaining)
+            return internal.void
+          }
+          reservations.delete(poolItem)
           self.state.usage -= self.config.concurrency - 1
           if (
+            !self.state.isShuttingDown &&
             self.state.items.has(poolItem) &&
             !self.state.invalidated.has(poolItem) &&
             poolItem.refCount < self.config.concurrency
           ) {
-            addAvailable(self, poolItem)
+            addAvailableFront(self, poolItem)
+            wakeWaiters(self, fiber, self.config.concurrency - poolItem.refCount)
           }
-          wakeWaiters(self, fiber, self.config.concurrency - 1)
           return internal.void
         })
     ))
@@ -891,10 +905,12 @@ const allocate = <A, E>(self: Pool<A, E>): Effect.Effect<PoolItem<A, E>> =>
         if (self.config.strategy === strategyNoop) {
           return exit._tag === "Success" ? Effect.succeed(item) : Effect.as(item.finalizer, item)
         }
+        const onAcquire = Effect.suspend(() =>
+          // A borrower may have removed the item before the callback runs.
+          self.state.items.has(item) ? self.config.strategy.onAcquire(item) : Effect.void
+        )
         return Effect.as(
-          exit._tag === "Success"
-            ? self.config.strategy.onAcquire(item)
-            : Effect.flatMap(item.finalizer, () => self.config.strategy.onAcquire(item)),
+          exit._tag === "Success" ? onAcquire : Effect.flatMap(item.finalizer, () => onAcquire),
           item
         )
       })
@@ -964,44 +980,48 @@ const strategyCreationTTL = Effect.fnUntraced(function*<A, E>(ttl: Duration.Inpu
   })
 })
 
-const strategyUsageTTL = Effect.fnUntraced(function*<A, E>(ttl: Duration.Input) {
-  const queue = yield* Queue.unbounded<PoolItem<A, E>>()
-  return identity<Strategy<A, E>>({
+const strategyUsageTTL = <A, E>(ttl: Duration.Input): Effect.Effect<Strategy<A, E>> =>
+  Effect.succeed<Strategy<A, E>>({
     run: (pool) => {
+      // `state.items` iterates in insertion order, so its oldest live entry is
+      // the next to retire. Using it directly means an item stops being
+      // referenced by this strategy as soon as it leaves the pool.
       const process: Effect.Effect<void> = Effect.suspend(() => {
-        const excess = activeSize(pool) - targetSize(pool)
-        if (excess <= 0) return Effect.void
-        return Queue.take(queue).pipe(
-          Effect.tap((item) => invalidatePoolItem(pool, item)),
-          Effect.flatMap(() => process)
-        )
+        if (activeSize(pool) <= targetSize(pool)) return Effect.void
+        for (const item of pool.state.items) {
+          if (pool.state.invalidated.has(item)) continue
+          return Effect.flatMap(invalidatePoolItem(pool, item), () => process)
+        }
+        return Effect.void
       })
       return process.pipe(
         Effect.delay(ttl),
         Effect.forever({ disableYield: true })
       )
     },
-    onAcquire: (item) => Queue.offer(queue, item),
+    onAcquire: (_) => Effect.void,
     reclaim(pool) {
       return Effect.suspend((): Effect.Effect<PoolItem<A, E> | undefined> => {
         if (pool.state.invalidated.size === 0) {
           return Effect.undefined
         }
         const item = Iterable.head(
-          Iterable.filter(pool.state.invalidated, (item) => !item.disableReclaim)
+          Iterable.filter(pool.state.invalidated, (item) => !item.disableReclaim && !reservations.has(item))
         )
         if (item._tag === "None") {
           return Effect.undefined
         }
         pool.state.invalidated.delete(item.value)
+        // Re-adding moves the reclaimed item to the back of the retirement order.
+        pool.state.items.delete(item.value)
+        pool.state.items.add(item.value)
         if (item.value.refCount < pool.config.concurrency) {
           addAvailable(pool, item.value)
         }
-        return Effect.as(Queue.offer(queue, item.value), item.value)
+        return Effect.succeed(item.value)
       })
     }
   })
-})
 
 const reportUnhandledError = <E>(cause: Cause.Cause<E>) =>
   Effect.withFiber<void>((fiber) => {
diff --git a/repos/effect/packages/effect/src/PubSub.ts b/repos/effect/packages/effect/src/PubSub.ts
index b8e978487..6861798fd 100644
--- a/repos/effect/packages/effect/src/PubSub.ts
+++ b/repos/effect/packages/effect/src/PubSub.ts
@@ -2020,29 +2020,22 @@ class BoundedPubSubSingleSubscription<in out A> implements PubSub.BackingSubscri
     if (this.self.subscribers === 0) {
       this.self.value = AbsentValue as unknown as A
     }
-    this.subscriberIndex += 1
+    this.subscriberIndex = this.self.publisherIndex
     return elem
   }
 
   pollUpTo(n: number): Array<A> {
-    n = Count.normalize(n)
-    if (this.isEmpty() || n < 1) {
+    if (Count.normalize(n) < 1 || this.isEmpty()) {
       return []
     }
-    const a = this.self.value
-    this.self.subscribers -= 1
-    if (this.self.subscribers === 0) {
-      this.self.value = AbsentValue as unknown as A
-    }
-    this.subscriberIndex += 1
-    return [a]
+    return [this.poll() as A]
   }
 
   unsubscribe(): void {
     if (!this.unsubscribed) {
       this.unsubscribed = true
       this.self.subscriberCount -= 1
-      if (this.subscriberIndex !== this.self.publisherIndex) {
+      if (this.self.subscribers !== 0 && this.subscriberIndex !== this.self.publisherIndex) {
         this.self.subscribers -= 1
         if (this.self.subscribers === 0) {
           this.self.value = AbsentValue as unknown as A
diff --git a/repos/effect/packages/effect/src/Queue.ts b/repos/effect/packages/effect/src/Queue.ts
index 43e61266b..6548a4185 100644
--- a/repos/effect/packages/effect/src/Queue.ts
+++ b/repos/effect/packages/effect/src/Queue.ts
@@ -1106,8 +1106,8 @@ export const interrupt = <A, E>(self: Enqueue<A, E>): Effect<boolean> =>
  *
  * **Details**
  *
- * The operation is idempotent and returns `true`, including when the queue has
- * already been shut down or completed.
+ * Returns `true` when the queue is shut down by this call, or `false` when it
+ * has already been shut down or completed.
  *
  * **Example** (Shutting down queues)
  *
@@ -1132,29 +1132,49 @@ export const interrupt = <A, E>(self: Enqueue<A, E>): Effect<boolean> =>
  * await Effect.runPromise(program) // => { wasShutdown: true, size: 0 }
  * ```
  *
+ * @see {@link shutdownUnsafe} for synchronous shutdown
  * @category completion
  * @since 2.0.0
  */
-export const shutdown = <A, E>(self: Enqueue<A, E>): Effect<boolean> =>
-  internalEffect.sync(() => {
-    if (self.state._tag === "Done") {
-      return true
-    }
-    MutableList.clear(self.messages)
-    const offers = self.state.offers
-    finalize(self, self.state._tag === "Open" ? exitInterrupt : self.state.exit)
-    if (offers.size > 0) {
-      for (const entry of offers) {
-        if (entry._tag === "Single") {
-          entry.resume(exitFalse)
-        } else {
-          entry.resume(core.exitSucceed(entry.remaining.slice(entry.offset)))
-        }
-      }
-      offers.clear()
+export const shutdown = <A, E>(self: Enqueue<A, E>): Effect<boolean> => internalEffect.sync(() => shutdownUnsafe(self))
+
+/**
+ * Shuts down the queue synchronously, discarding buffered messages and resuming
+ * pending operations.
+ *
+ * **When to use**
+ *
+ * Use when a synchronous callback must discard buffered messages and settle
+ * pending queue operations before returning.
+ *
+ * **Details**
+ *
+ * An open queue completes with an interruption. A queue already closing retains
+ * its completion cause. Call `failCauseUnsafe` first to shut down with a specific
+ * failure. Returns `true` when the queue is shut down by this call, or `false`
+ * when it has already been shut down or completed.
+ *
+ * @see {@link shutdown} for the effectful variant
+ * @see {@link failCauseUnsafe} to set a failure before discarding buffered messages
+ * @category completion
+ * @since 4.0.0
+ */
+export const shutdownUnsafe = <A, E>(self: Enqueue<A, E>): boolean => {
+  if (self.state._tag === "Done") {
+    return false
+  }
+  MutableList.clear(self.messages)
+  const offers = self.state.offers
+  finalize(self, self.state._tag === "Open" ? exitInterrupt : self.state.exit)
+  for (const entry of offers) {
+    if (entry._tag === "Single") {
+      entry.resume(exitFalse)
+    } else {
+      entry.resume(core.exitSucceed(entry.remaining.slice(entry.offset)))
     }
-    return true
-  })
+  }
+  return true
+}
 
 /**
  * Takes and returns all currently buffered messages without waiting for more.
@@ -1564,16 +1584,89 @@ export const takeUnsafe = <A, E>(self: Dequeue<A, E>): Exit<A, E> | undefined =>
     releaseCapacity(self)
     return core.exitSucceed(message)
   } else if (self.capacity <= 0 && self.state.offers.size > 0) {
-    self.capacity = 1
-    releaseCapacity(self)
-    self.capacity = 0
-    const message = MutableList.take(self.messages)!
+    const message = takeOfferUnsafe(self.state.offers)
     releaseCapacity(self)
     return core.exitSucceed(message)
   }
   return undefined
 }
 
+/**
+ * Manually releases current queue takers synchronously.
+ *
+ * **When to use**
+ *
+ * Use when synchronous offers should release waiting consumers immediately
+ * instead of waiting for the scheduled release task.
+ *
+ * **Details**
+ *
+ * This immediately runs the queue's taker-release pass instead of waiting for
+ * its scheduled task. It does not complete the queue or resume fibers waiting
+ * on `Queue.await`.
+ *
+ * **Example** (Releasing a waiting taker synchronously)
+ *
+ * ```ts import.meta.vitest
+ * import { Effect, Fiber, Queue } from "effect"
+ *
+ * const program = Effect.gen(function*() {
+ *   const queue = yield* Queue.unbounded<number>()
+ *   const taker = yield* Queue.take(queue).pipe(Effect.forkChild)
+ *   yield* Effect.yieldNow
+ *
+ *   Queue.offerUnsafe(queue, 1)
+ *   Queue.flushUnsafe(queue)
+ *
+ *   return yield* Fiber.join(taker)
+ * })
+ *
+ * await Effect.runPromise(program) // => 1
+ * ```
+ *
+ * @category offering
+ * @since 4.0.0
+ */
+export const flushUnsafe = <A, E>(self: Enqueue<A, E>): void => releaseTakers(self)
+
+/**
+ * Manually releases current queue takers.
+ *
+ * **When to use**
+ *
+ * Use when synchronous offers should release waiting consumers through an
+ * `Effect` instead of waiting for the scheduled release task.
+ *
+ * **Details**
+ *
+ * This immediately runs the queue's taker-release pass instead of waiting for
+ * its scheduled task. It does not complete the queue or resume fibers waiting
+ * on `Queue.await`.
+ *
+ * **Example** (Releasing a waiting taker)
+ *
+ * ```ts import.meta.vitest
+ * import { Effect, Fiber, Queue } from "effect"
+ *
+ * const program = Effect.gen(function*() {
+ *   const queue = yield* Queue.unbounded<number>()
+ *   const taker = yield* Queue.take(queue).pipe(Effect.forkChild)
+ *   yield* Effect.yieldNow
+ *
+ *   Queue.offerUnsafe(queue, 1)
+ *   yield* Queue.flush(queue)
+ *
+ *   return yield* Fiber.join(taker)
+ * })
+ *
+ * await Effect.runPromise(program) // => 1
+ * ```
+ *
+ * @category offering
+ * @since 4.0.0
+ */
+export const flush = <A, E>(self: Enqueue<A, E>): Effect<void> => internalEffect.sync(() => flushUnsafe(self))
+
 const await_ = <A, E>(self: Dequeue<A, E>): Effect<void, Exclude<E, Done>> =>
   internalEffect.callback<void, Exclude<E, Done>>((resume) => {
     const awaiter = (effect: Effect<void, E>) => resume(Pull.catchDone(effect, () => internalEffect.exitVoid))
@@ -1842,7 +1935,6 @@ const exitFailDone = core.exitFail(core.Done()) as Failure<never, Done>
 const exitInterrupt = internalEffect.exitInterrupt() as Failure<never, never>
 
 const releaseTakers = <A, E>(self: Enqueue<A, E>) => {
-  self.scheduleRunning = false
   if (self.state._tag === "Done" || self.state.takers.size === 0) {
     return
   }
@@ -1860,7 +1952,10 @@ const scheduleReleaseTaker = <A, E>(self: Enqueue<A, E>) => {
     return
   }
   self.scheduleRunning = true
-  self.dispatcher.scheduleTask(() => releaseTakers(self), 0)
+  self.dispatcher.scheduleTask(() => {
+    self.scheduleRunning = false
+    releaseTakers(self)
+  }, 0)
 }
 
 const takeBetweenUnsafe = <A, E>(
@@ -1872,11 +1967,8 @@ const takeBetweenUnsafe = <A, E>(
     return self.state.exit
   } else if (max <= 0 || min <= 0) {
     return core.exitSucceed([])
-  } else if (self.capacity <= 0 && self.state.offers.size > 0) {
-    self.capacity = 1
-    releaseCapacity(self)
-    self.capacity = 0
-    const messages = [MutableList.take(self.messages)!]
+  } else if (self.capacity <= 0 && self.messages.length === 0 && self.state.offers.size > 0) {
+    const messages = [takeOfferUnsafe(self.state.offers)]
     releaseCapacity(self)
     return core.exitSucceed(messages)
   }
@@ -1923,6 +2015,22 @@ const offerRemainingArray = <A, E>(self: Enqueue<A, E>, remaining: Array<A>) =>
   })
 }
 
+// Reserve a pending message for the consumer before the producer can reenter.
+const takeOfferUnsafe = <A>(offers: Set<Queue.OfferEntry<A>>): A => {
+  const entry = offers.values().next().value!
+  if (entry._tag === "Single") {
+    offers.delete(entry)
+    entry.resume(exitTrue)
+    return entry.message
+  }
+  const message = entry.remaining[entry.offset++]
+  if (entry.offset === entry.remaining.length) {
+    offers.delete(entry)
+    entry.resume(core.exitSucceed([]))
+  }
+  return message
+}
+
 const releaseCapacity = <A, E>(self: Dequeue<A, E>): boolean => {
   if (self.state._tag === "Done") {
     return Pull.isDoneCause(self.state.exit.cause)
@@ -1936,22 +2044,22 @@ const releaseCapacity = <A, E>(self: Dequeue<A, E>): boolean => {
     }
     return false
   }
-  let n = self.capacity - self.messages.length
+  // Resuming a producer can synchronously take, offer, or shut down this queue.
   for (const entry of self.state.offers) {
-    if (n === 0) break
+    let n = self.capacity - self.messages.length
+    if (n <= 0) break
     else if (entry._tag === "Single") {
       MutableList.append(self.messages, entry.message)
-      n--
-      entry.resume(exitTrue)
       self.state.offers.delete(entry)
+      entry.resume(exitTrue)
     } else {
       for (; entry.offset < entry.remaining.length; entry.offset++) {
         if (n === 0) return false
         MutableList.append(self.messages, entry.remaining[entry.offset])
         n--
       }
-      entry.resume(core.exitSucceed([]))
       self.state.offers.delete(entry)
+      entry.resume(core.exitSucceed([]))
     }
   }
   return false
@@ -1976,10 +2084,7 @@ const takeAllUnsafe = <A, E>(self: Dequeue<A, E>) => {
     releaseCapacity(self)
     return messages
   } else if (self.state._tag !== "Done" && self.state.offers.size > 0) {
-    self.capacity = 1
-    releaseCapacity(self)
-    self.capacity = 0
-    const messages = [MutableList.take(self.messages)!]
+    const messages = [takeOfferUnsafe(self.state.offers)]
     releaseCapacity(self)
     return messages
   }
diff --git a/repos/effect/packages/effect/src/Random.ts b/repos/effect/packages/effect/src/Random.ts
index 2afe37ea1..67b2c5781 100644
--- a/repos/effect/packages/effect/src/Random.ts
+++ b/repos/effect/packages/effect/src/Random.ts
@@ -17,6 +17,23 @@ import * as random from "./internal/random.ts"
 import type * as NonEmptyIterable from "./NonEmptyIterable.ts"
 import * as Predicate from "./Predicate.ts"
 
+/**
+ * The service used to generate pseudo-random numbers.
+ *
+ * @category services
+ * @since 4.0.0
+ */
+export interface Random {
+  /**
+   * Generates a random safe integer.
+   */
+  nextIntUnsafe(): number
+  /**
+   * Generates a random number between 0 (inclusive) and 1 (exclusive).
+   */
+  nextDoubleUnsafe(): number
+}
+
 /**
  * Represents a service for generating pseudo-random numbers.
  *
@@ -49,12 +66,9 @@ import * as Predicate from "./Predicate.ts"
  * @category services
  * @since 2.0.0
  */
-export const Random: Context.Reference<{
-  nextIntUnsafe(): number
-  nextDoubleUnsafe(): number
-}> = random.Random
+export const Random: Context.Reference<Random> = random.Random
 
-const randomWith = <A>(f: (random: typeof Random["Service"]) => A): Effect.Effect<A> =>
+const randomWith = <A>(f: (random: Random) => A): Effect.Effect<A> =>
   Effect.withFiber((fiber) => Effect.succeed(f(fiber.getRef(Random))))
 
 /**
@@ -139,7 +153,7 @@ export const nextInt: Effect.Effect<number> = randomWith((r) => r.nextIntUnsafe(
  * @since 4.0.0
  */
 export const nextBetween = (min: number, max: number): Effect.Effect<number> =>
-  randomWith((r) => r.nextDoubleUnsafe() * (max - min) + min)
+  randomWith((r) => random.nextBetween(min, max, r.nextDoubleUnsafe()))
 
 /**
  * Generates a random integer between `min` and `max`.
diff --git a/repos/effect/packages/effect/src/RcMap.ts b/repos/effect/packages/effect/src/RcMap.ts
index a99798939..e484c4fd2 100644
--- a/repos/effect/packages/effect/src/RcMap.ts
+++ b/repos/effect/packages/effect/src/RcMap.ts
@@ -370,7 +370,7 @@ export const get: {
           context.set(key, value)
         })
         context.set(Scope.Scope.key, entry.scope)
-        self.lookup(key).pipe(
+        Effect.suspend(() => self.lookup(key)).pipe(
           Effect.runForkWith(Context.makeUnsafe(context)),
           Fiber.runIn(entry.scope)
         ).addObserver((exit) => Deferred.doneUnsafe(entry.deferred, exit))
diff --git a/repos/effect/packages/effect/src/RcRef.ts b/repos/effect/packages/effect/src/RcRef.ts
index 3d64d5890..8c81fce74 100644
--- a/repos/effect/packages/effect/src/RcRef.ts
+++ b/repos/effect/packages/effect/src/RcRef.ts
@@ -158,8 +158,16 @@ export const make: <A, E, R>(
   options: {
     readonly acquire: Effect.Effect<A, E, R>
     /**
-     * When the reference count reaches zero, the resource will be released
-     * after this duration.
+     * How long to keep an idle resource after its last reference is released.
+     *
+     * If the resource has not been invalidated, finite durations, including `0`,
+     * schedule release in a forked fiber that the scope releasing the last
+     * reference does not await. An infinite duration keeps the idle resource
+     * until invalidation or the RcRef's scope closes.
+     *
+     * If this option is omitted or the resource has been invalidated with
+     * `RcRef.invalidate`, the scope releasing the last reference releases the
+     * resource and awaits completion.
      */
     readonly idleTimeToLive?: Duration.Input | undefined
   }
diff --git a/repos/effect/packages/effect/src/RequestResolver.ts b/repos/effect/packages/effect/src/RequestResolver.ts
index 10ed8edef..951c5f715 100644
--- a/repos/effect/packages/effect/src/RequestResolver.ts
+++ b/repos/effect/packages/effect/src/RequestResolver.ts
@@ -17,7 +17,7 @@ import type * as Duration from "./Duration.ts"
 import * as Effect from "./Effect.ts"
 import * as Exit from "./Exit.ts"
 import { constTrue, dual, identity } from "./Function.ts"
-import { exitFail, exitSucceed } from "./internal/core.ts"
+import { exitSucceed } from "./internal/core.ts"
 import * as Count from "./internal/count.ts"
 import * as effect from "./internal/effect.ts"
 import * as internal from "./internal/request.ts"
@@ -529,17 +529,18 @@ export const fromEffectTagged = <A extends Request.Any & { readonly _tag: string
       return Effect.forEach(
         grouped,
         ([tag, requests]) =>
-          Effect.matchCause((fns[tag] as any)(requests) as Effect.Effect<Array<any>, unknown, unknown>, {
+          Effect.matchCause((fns[tag] as any)(requests) as Effect.Effect<Iterable<any>, unknown, unknown>, {
             onFailure: (cause) => {
               for (let i = 0; i < requests.length; i++) {
                 const entry = requests[i]
-                entry.completeUnsafe(exitFail(cause) as any)
+                entry.completeUnsafe(Exit.failCause(cause) as any)
               }
             },
             onSuccess: (res) => {
-              for (let i = 0; i < res.length; i++) {
-                const entry = requests[i]
-                entry.completeUnsafe(exitSucceed(res[i]) as any)
+              let i = 0
+              for (const result of res) {
+                const entry = requests[i++]
+                entry.completeUnsafe(exitSucceed(result) as any)
               }
             }
           }),
@@ -1118,8 +1119,9 @@ export const asCache: {
  *
  * **Gotchas**
  *
- * Entries do not expire by time, and completed failures are cached the same as
- * successes. Request equality controls cache hits.
+ * Entries do not expire by time, and completed failures without interruptions
+ * are cached the same as successes. Results containing interruptions are not
+ * cached. Request equality controls cache hits.
  *
  * @see {@link asCache} for exposing the resolver as a `Cache` with time-to-live and service lookup controls
  * @see {@link persisted} for backing persistable requests with the configured persistence store
@@ -1167,7 +1169,16 @@ export const withCache: {
           MutableHashMap.set(cache, entry.request, cached)
           const prevComplete = entry.completeUnsafe
           entry.completeUnsafe = function(exit) {
-            cached.exit = exit as any
+            if (Exit.hasInterrupts(exit)) {
+              if (cached.exit === undefined) {
+                const current = MutableHashMap.get(cache, entry.request)
+                if (current._tag === "Some" && current.value === cached) {
+                  MutableHashMap.remove(cache, entry.request)
+                }
+              }
+            } else {
+              cached.exit = exit as any
+            }
             prevComplete(exit)
           }
           return true
@@ -1265,6 +1276,7 @@ export const persisted: {
         >)
         const leftover: Array<Request.Entry<A>> = []
         const toPersist = new Map<A, Request.Result<A>>()
+        const completed = new Set<Request.Entry<A>>()
         for (let i = 0; i < results.length; i++) {
           const entry = entries[i]
           const exit = results[i]
@@ -1274,6 +1286,7 @@ export const persisted: {
           ) {
             const prevComplete = entry.completeUnsafe
             entry.completeUnsafe = function(exit) {
+              completed.add(entry)
               toPersist.set(entry.request, exit as any)
               prevComplete(exit)
             }
@@ -1285,10 +1298,10 @@ export const persisted: {
         if (!Arr.isArrayNonEmpty(leftover)) {
           return
         }
-        yield* Effect.catchCause(self.runAll(leftover, key), (cause) => {
+        yield* Effect.catchCause(Effect.suspend(() => self.runAll(leftover, key)), (cause) => {
           for (let i = 0; i < leftover.length; i++) {
             const entry = leftover[i]
-            if (!toPersist.has(entry.request)) continue
+            if (completed.has(entry)) continue
             entry.completeUnsafe(Exit.failCause(cause) as any)
           }
           return Effect.void
diff --git a/repos/effect/packages/effect/src/Scheduler.ts b/repos/effect/packages/effect/src/Scheduler.ts
index 1a6b7f87d..a60495eb0 100644
--- a/repos/effect/packages/effect/src/Scheduler.ts
+++ b/repos/effect/packages/effect/src/Scheduler.ts
@@ -80,25 +80,35 @@ export const Scheduler: Context.Reference<Scheduler> = Context.Reference<Schedul
   defaultValue: () => new MixedScheduler()
 })
 
-const setImmediate = "setImmediate" in globalThis
-  ? (f: () => void) => {
+const setMicrotask = (f: () => void) => {
+  let cancelled = false
+  Promise.resolve().then(() => {
+    if (!cancelled) f()
+  })
+  return (): void => {
+    cancelled = true
+  }
+}
+
+const setTimer: (f: () => void) => () => void = "setImmediate" in globalThis
+  ? (f) => {
     // @ts-ignore
     const timer = globalThis.setImmediate(f)
     // @ts-ignore
     return (): void => globalThis.clearImmediate(timer)
   }
-  : (f: () => void) => {
+  : (f) => {
     const timer = setTimeout(f, 0)
     return (): void => clearTimeout(timer)
   }
 
-const setMicrotask = (f: () => void) => {
-  let cancelled = false
-  Promise.resolve().then(() => {
-    if (!cancelled) f()
-  })
-  return (): void => {
-    cancelled = true
+// Some runtimes (e.g. Cloudflare Workers) throw when a timer is set in global
+// scope. Fall back to a microtask so effects can still yield at module load.
+const setImmediate = (f: () => void) => {
+  try {
+    return setTimer(f)
+  } catch {
+    return setMicrotask(f)
   }
 }
 
@@ -172,7 +182,7 @@ export class MixedScheduler implements Scheduler {
    * @since 2.0.0
    */
   shouldYield(fiber: Fiber.Fiber<unknown, unknown>) {
-    return fiber.currentOpCount >= fiber.maxOpsBeforeYield
+    return fiber.currentOpCount >= fiber.cache.maxOpsBeforeYield
   }
 
   /**
diff --git a/repos/effect/packages/effect/src/Schema.ts b/repos/effect/packages/effect/src/Schema.ts
index 1073798fe..8cedb180b 100644
--- a/repos/effect/packages/effect/src/Schema.ts
+++ b/repos/effect/packages/effect/src/Schema.ts
@@ -12,7 +12,6 @@
  * @since 4.0.0
  */
 
-/** @effect-diagnostics schemaStructWithTag:skip-file */
 import * as Arr from "./Array.ts"
 import * as BigDecimal_ from "./BigDecimal.ts"
 import type * as Brand from "./Brand.ts"
@@ -30,8 +29,8 @@ import type * 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, memoize } from "./Function.ts"
-import * as Graph_ from "./Graph.ts"
+import { identity } from "./Function.ts"
+import type * as Graph_ from "./Graph.ts"
 import * as HashMap_ from "./HashMap.ts"
 import * as HashSet_ from "./HashSet.ts"
 import * as core from "./internal/core.ts"
@@ -39,15 +38,22 @@ import { effectIsExit } from "./internal/effect.ts"
 import * as InternalGraph from "./internal/graph.ts"
 import * as InternalRecord from "./internal/record.ts"
 import * as InternalAnnotations from "./internal/schema/annotations.ts"
-import * as InternalSchema from "./internal/schema/schema.ts"
+import * as InternalMake from "./internal/schema/make.ts"
+import * as InternalStandardSchema from "./internal/schema/standardSchema.ts"
+import * as InternalToCodec from "./internal/schema/toCodec.ts"
+import * as InternalToDifferJsonPatch from "./internal/schema/toDifferJsonPatch.ts"
+import * as InternalToEncoderXml from "./internal/schema/toEncoderXml.ts"
 import * as InternalEquivalence from "./internal/schema/toEquivalence.ts"
+import * as InternalToFormatter from "./internal/schema/toFormatter.ts"
+import * as InternalToIso from "./internal/schema/toIso.ts"
 import * as InternalToJsonSchemaDocument from "./internal/schema/toJsonSchemaDocument.ts"
 import * as InternalToRepresentation from "./internal/schema/toRepresentation.ts"
+import { isSchemaError as isSchemaErrorInternal, SchemaErrorTypeId } from "./internal/schemaError.ts"
 import { getStackTraceLimit, setStackTraceLimit } from "./internal/stackTraceLimit.ts"
-import * as JsonPatch from "./JsonPatch.ts"
-import * as JsonSchema from "./JsonSchema.ts"
+import type * as JsonPatch from "./JsonPatch.ts"
+import type * as JsonSchema from "./JsonSchema.ts"
 import { remainder } from "./Number.ts"
-import * as Optic_ from "./Optic.ts"
+import type * as Optic_ from "./Optic.ts"
 import * as Option_ from "./Option.ts"
 import * as Order from "./Order.ts"
 import * as Pipeable from "./Pipeable.ts"
@@ -56,7 +62,6 @@ import * as Record_ from "./Record.ts"
 import * as Redacted_ from "./Redacted.ts"
 import * as RegExp_ from "./RegExp.ts"
 import * as Result_ from "./Result.ts"
-import * as Scheduler from "./Scheduler.ts"
 import * as SchemaAST from "./SchemaAST.ts"
 import * as SchemaGetter from "./SchemaGetter.ts"
 import * as SchemaIssue from "./SchemaIssue.ts"
@@ -68,9 +73,14 @@ import type { Assign, Lambda, Mutable, Simplify } from "./Struct.ts"
 import * as Struct_ from "./Struct.ts"
 import type { RequiredKeys, UnionToIntersection } from "./Types.ts"
 import type { Unify } from "./Unify.ts"
+import * as Cookies_ from "./unstable/http/Cookies.ts"
+import * as Headers_ from "./unstable/http/Headers.ts"
+import * as UrlParams_ from "./unstable/http/UrlParams.ts"
+import * as IpInterface_ from "./unstable/net/IpInterface.ts"
+import * as IpNetwork_ from "./unstable/net/IpNetwork.ts"
+import * as NetAddress_ from "./unstable/net/NetAddress.ts"
 
-const TypeId = InternalSchema.TypeId
-
+const TypeId = InternalMake.TypeId
 /**
  * Whether a schema field is required or optional within a struct.
  *
@@ -81,7 +91,6 @@ const TypeId = InternalSchema.TypeId
  * @since 4.0.0
  */
 export type Optionality = "required" | "optional"
-
 /**
  * Whether a schema field is readonly or mutable within a struct.
  *
@@ -91,7 +100,6 @@ export type Optionality = "required" | "optional"
  * @since 4.0.0
  */
 export type Mutability = "readonly" | "mutable"
-
 /**
  * Whether a schema field has a constructor default value.
  *
@@ -102,14 +110,13 @@ export type Mutability = "readonly" | "mutable"
  * @since 4.0.0
  */
 export type ConstructorDefault = "no-default" | "with-default"
-
 /**
  * Options for `makeEffect`, `make`, and Class constructors.
  *
  * **When to use**
  *
- * Use when passing `disableChecks: true` to skip validation when you trust the data.
- * - Pass `parseOptions` to control error reporting behavior.
+ * Use when passing `disableChecks: true` to skip validation when you trust the
+ * data. Pass `parseOptions` to control parsing behavior.
  *
  * @see {@link BottomWithoutNew.makeEffect}
  * @see {@link BottomWithoutNew.make}
@@ -133,7 +140,6 @@ export interface MakeOptions {
     readonly value: unknown
   }
 }
-
 /**
  * The fully-parameterized schema interface without a construct signature.
  * Exposes all 14 type parameters controlling type inference, mutability,
@@ -165,26 +171,21 @@ export interface BottomWithoutNew<
   out EncodedOptionality extends Optionality = "required"
 > extends Pipeable.Pipeable {
   readonly [TypeId]: typeof TypeId
-
   readonly "ast": Ast
   readonly "Rebuild": Rebuild
   readonly "~type.parameters": TypeParameters
-
   readonly "Type": T
   readonly "Encoded": E
   readonly "DecodingServices": RD
   readonly "EncodingServices": RE
-
   readonly "~type.make.in": TypeMakeIn
-  readonly "~type.make": TypeMake // useful to type the `refine` interface
+  readonly "~type.make": TypeMake
   readonly "~type.constructor.default": TypeConstructorDefault
   readonly "Iso": Iso
-
   readonly "~type.mutability": TypeMutability
   readonly "~type.optionality": TypeOptionality
   readonly "~encoded.mutability": EncodedMutability
   readonly "~encoded.optionality": EncodedOptionality
-
   annotate(annotations: Annotations.Bottom<this["Type"], this["~type.parameters"]>): this["Rebuild"]
   annotateKey(annotations: Annotations.Key<this["Type"]>): this["Rebuild"]
   check(...checks: readonly [SchemaAST.Check<this["Type"]>, ...Array<SchemaAST.Check<this["Type"]>>]): this["Rebuild"]
@@ -245,20 +246,29 @@ export interface BottomWithoutNew<
    *
    * **When to use**
    *
-   * Use when constructor input may fail validation and you want to
-   * compose that failure with other `Effect` operations instead of throwing.
+   * Use when construction must compose with other `Effect` operations or when
+   * the result supplies a nested constructor default. Otherwise, use
+   * {@link BottomWithoutNew.make} when invalid construction should throw.
    *
    * **Details**
    *
-   * Validation failures are returned directly as `SchemaIssue.Issue` values
-   * and are not wrapped in `SchemaError`.
+   * `SchemaParser` uses `SchemaIssue.Issue` as its canonical structured failure,
+   * and this method exposes the same representation directly. Keeping the issue
+   * unwrapped lets an enclosing schema attach its own path when the effect is
+   * used with {@link withConstructorDefault}. It also avoids allocating a
+   * `SchemaError` and keeps its formatting path out of the resulting bundle.
+   *
+   * **Gotchas**
+   *
+   * Unlike the decoding helpers in `Schema`, validation failures are not wrapped
+   * in `SchemaError`. Map the issue to `SchemaError` or to a domain-specific error
+   * when a wrapped error is needed at the application boundary.
    *
    * @see {@link BottomWithoutNew.make} — construct synchronously when validation failure should throw
    * @see {@link BottomWithoutNew.makeOption} — construct synchronously and discard validation details
    */
   makeEffect(input: this["~type.make.in"], options?: MakeOptions): Effect.Effect<this["Type"], SchemaIssue.Issue>
 }
-
 /**
  * Fully-parameterized base interface for schemas that can be extended directly
  * by TypeScript classes.
@@ -316,7 +326,6 @@ export interface Bottom<
 {
   new(_: never): {}
 }
-
 /**
  * Lazy `BottomWithoutNew` variant for schema implementations that
  * compute their public views on demand.
@@ -369,7 +378,6 @@ export interface BottomLazyWithoutNew<
     EncodedOptionality
   >
 {}
-
 /**
  * Lazy `Bottom` variant for schemas that can be extended directly by TypeScript
  * classes.
@@ -413,7 +421,6 @@ export interface BottomLazy<
 {
   new(_: never): {}
 }
-
 /**
  * Type-level representation returned by {@link declareConstructor}.
  *
@@ -433,7 +440,6 @@ export interface declareConstructor<T, E, TypeParameters extends ReadonlyArray<C
     TypeParameters
   >
 {}
-
 /**
  * Creates a schema for a **parametric** type (a generic container such as
  * `Array<A>`, `Option<A>`, etc.) by accepting a list of type-parameter schemas
@@ -512,7 +518,6 @@ export function declareConstructor<T, E = T, Iso = T>() {
     )
   }
 }
-
 /**
  * Type-level representation returned by {@link declare}.
  *
@@ -522,7 +527,6 @@ export function declareConstructor<T, E = T, Iso = T>() {
 export interface declare<T, Iso = T> extends declareConstructor<T, T, readonly [], Iso> {
   readonly "Rebuild": declare<T, Iso>
 }
-
 /**
  * Creates a schema for a **non-parametric** opaque type using a type-guard
  * function. The schema accepts any unknown value and succeeds when `is` returns
@@ -568,7 +572,6 @@ export function declare<T, Iso = T>(
     annotations
   )
 }
-
 /**
  * Returns a schema widened to the fully-parameterized {@link Bottom} interface,
  * making all 14 type parameters visible to TypeScript.
@@ -619,7 +622,6 @@ export function revealBottom<S extends Top>(
 > {
   return bottom
 }
-
 /**
  * Adds metadata annotations to a schema without changing its runtime behavior.
  * This is the pipeable (curried) counterpart of the `.annotate` method.
@@ -652,7 +654,6 @@ export function revealBottom<S extends Top>(
 export function annotate<S extends Top>(annotations: Annotations.Bottom<S["Type"], S["~type.parameters"]>) {
   return (self: S) => self.annotate(annotations)
 }
-
 /**
  * Adds metadata annotations to the **encoded** side of a schema without
  * changing its runtime behavior. This is the encoded-side counterpart of
@@ -685,7 +686,6 @@ export function annotate<S extends Top>(annotations: Annotations.Bottom<S["Type"
 export function annotateEncoded<S extends Top>(annotations: Annotations.Bottom<S["Encoded"], readonly []>) {
   return (self: S): S["Rebuild"] => flip(flip(self).annotate(annotations))
 }
-
 /**
  * Adds key-level annotations to a schema field. This is the pipeable
  * (curried) counterpart of the `.annotateKey` method.
@@ -722,7 +722,6 @@ export function annotateKey<S extends Top>(annotations: Annotations.Key<S["Type"
     return self.rebuild(SchemaAST.annotateKey(self.ast, annotations))
   }
 }
-
 /**
  * The existential "any schema" type — all type parameters are erased to `unknown`.
  *
@@ -760,7 +759,6 @@ export interface Top extends
     Optionality
   >
 {}
-
 /**
  * Lightweight structural constraint for APIs that accept schema values but only
  * read their data and type-level views.
@@ -803,7 +801,6 @@ export interface Constraint {
   readonly "~encoded.optionality": Optionality
   readonly "~encoded.mutability": Mutability
 }
-
 /**
  * Lightweight structural constraint for APIs that need codec type views but do
  * not need the full schema protocol.
@@ -826,7 +823,6 @@ export interface ConstraintCodec<out T, out E = T, out RD = never, out RE = neve
   readonly "DecodingServices": RD
   readonly "EncodingServices": RE
 }
-
 /**
  * Lightweight structural constraint for APIs that need decoder type views but
  * do not need the full schema protocol.
@@ -845,7 +841,6 @@ export interface ConstraintCodec<out T, out E = T, out RD = never, out RE = neve
  * @since 4.0.0
  */
 export interface ConstraintDecoder<out T, out RD = never> extends ConstraintCodec<T, unknown, RD, unknown> {}
-
 /**
  * Lightweight structural constraint for APIs that need encoder type views but
  * do not need the full schema protocol.
@@ -864,7 +859,6 @@ export interface ConstraintDecoder<out T, out RD = never> extends ConstraintCode
  * @since 4.0.0
  */
 export interface ConstraintEncoder<out E, out RE = never> extends ConstraintCodec<unknown, E, unknown, RE> {}
-
 /**
  * Lightweight structural constraint for APIs that need schema views and the
  * rebuilt schema type, but do not call the full schema protocol.
@@ -881,7 +875,6 @@ export interface ConstraintEncoder<out E, out RE = never> extends ConstraintCode
 export interface ConstraintRebuildable extends Constraint {
   readonly "Rebuild": Constraint
 }
-
 /**
  * Namespace of type-level helpers for {@link Schema}.
  *
@@ -904,9 +897,11 @@ export declare namespace Schema {
    * @category utility types
    * @since 3.10.0
    */
-  export type Type<S> = S extends { readonly "Type": infer T } ? T : never
+  type Type<S> = S extends {
+    readonly "Type": infer T
+  } ? T :
+    never
 }
-
 /**
  * A typed view of a schema that tracks only the decoded (output) type `T`.
  *
@@ -941,7 +936,6 @@ export interface Schema<out T> extends Top {
   readonly "Type": T
   readonly "Rebuild": Schema<T>
 }
-
 /**
  * Namespace of type-level helpers for {@link Codec}.
  *
@@ -964,8 +958,10 @@ export declare namespace Codec {
    * @category utility types
    * @since 3.10.0
    */
-  export type Encoded<S> = S extends { readonly "Encoded": infer E } ? E : never
-
+  type Encoded<S> = S extends {
+    readonly "Encoded": infer E
+  } ? E :
+    never
   /**
    * Extracts the Effect services required during *decoding* from a schema.
    *
@@ -982,8 +978,10 @@ export declare namespace Codec {
    * @category utility types
    * @since 4.0.0
    */
-  export type DecodingServices<S> = S extends { readonly "DecodingServices": infer R } ? R : never
-
+  type DecodingServices<S> = S extends {
+    readonly "DecodingServices": infer R
+  } ? R :
+    never
   /**
    * Extracts the Effect services required during *encoding* from a schema.
    *
@@ -1000,9 +998,11 @@ export declare namespace Codec {
    * @category utility types
    * @since 4.0.0
    */
-  export type EncodingServices<S> = S extends { readonly "EncodingServices": infer R } ? R : never
+  type EncodingServices<S> = S extends {
+    readonly "EncodingServices": infer R
+  } ? R :
+    never
 }
-
 /**
  * A schema that tracks the decoded type `T`, the encoded type `E`, and the
  * Effect services required during decoding (`RD`) and encoding (`RE`).
@@ -1043,7 +1043,6 @@ export interface Codec<out T, out E = T, out RD = never, out RE = never> extends
   readonly "EncodingServices": RE
   readonly "Rebuild": Codec<T, E, RD, RE>
 }
-
 /**
  * A schema that tracks the decoded type `T` and the Effect services required
  * during decoding (`RD`).
@@ -1066,7 +1065,6 @@ export interface Decoder<out T, out RD = never> extends Schema<T> {
   readonly "EncodingServices": unknown
   readonly "Rebuild": Decoder<T, RD>
 }
-
 /**
  * A schema that tracks the encoded type `E` and the Effect services required
  * during encoding (`RE`).
@@ -1089,7 +1087,6 @@ export interface Encoder<out E, out RE = never> extends Schema<unknown> {
   readonly "EncodingServices": RE
   readonly "Rebuild": Encoder<E, RE>
 }
-
 /**
  * Returns a codec widened to the full {@link Codec} interface, prompting
  * TypeScript to infer all four type parameters (`T`, `E`, `RD`, `RE`).
@@ -1118,7 +1115,6 @@ export interface Encoder<out E, out RE = never> extends Schema<unknown> {
 export function revealCodec<T, E, RD, RE>(codec: Codec<T, E, RD, RE>) {
   return codec
 }
-
 /**
  * A schema that additionally supports optic (lens/prism) operations.
  *
@@ -1143,9 +1139,6 @@ export interface Optic<out T, out Iso> extends Schema<T> {
   readonly "EncodingServices": never
   readonly "Rebuild": Optic<T, Iso>
 }
-
-const SchemaErrorTypeId = "~effect/Schema/SchemaError"
-
 /**
  * Error thrown or returned when schema decoding or encoding fails.
  *
@@ -1196,7 +1189,6 @@ export class SchemaError extends Data.TaggedError("SchemaError")<{
     return `SchemaError(${this.message})`
   }
 }
-
 /**
  * Returns `true` if `u` is a {@link SchemaError}.
  *
@@ -1218,15 +1210,64 @@ export class SchemaError extends Data.TaggedError("SchemaError")<{
  * @since 4.0.0
  */
 export function isSchemaError(u: unknown): u is SchemaError {
-  return Predicate.hasProperty(u, SchemaErrorTypeId) && u[SchemaErrorTypeId] === SchemaErrorTypeId
+  return isSchemaErrorInternal(u)
+}
+
+function fromIssueEffect<A, R>(
+  self: Effect.Effect<A, SchemaIssue.Issue, R>
+): Effect.Effect<A, SchemaError, R> {
+  if (effectIsExit(self)) {
+    return fromIssueExit(self as Exit_.Exit<A, SchemaIssue.Issue>)
+  }
+  return Effect.catchCause(
+    self,
+    (cause) => Effect.failCauseSync(() => Cause_.map(cause, (issue) => new SchemaError(issue)))
+  )
+}
+
+function fromIssueExit<A>(exit: Exit_.Exit<A, SchemaIssue.Issue>): Exit_.Exit<A, SchemaError> {
+  return Exit_.isSuccess(exit)
+    ? exit as unknown as Exit_.Exit<A, SchemaError>
+    : Exit_.failCause(Cause_.map(exit.cause, (issue) => new SchemaError(issue)))
 }
 
-function makeStandardResult<A>(exit: Exit_.Exit<StandardSchemaV1.Result<A>>): StandardSchemaV1.Result<A> {
-  return Exit_.isSuccess(exit) ? exit.value : {
-    issues: [{ message: Cause_.pretty(exit.cause) }]
+function getSchemaErrorOrThrow(
+  cause: Cause_.Cause<SchemaError>,
+  message: string
+): SchemaError {
+  let schemaError: SchemaError | undefined
+  for (const reason of cause.reasons) {
+    if (!Cause_.isFailReason(reason) || !isSchemaError(reason.error)) {
+      throw new globalThis.Error(message, { cause })
+    }
+    schemaError ??= reason.error
+  }
+  if (schemaError === undefined) {
+    throw new globalThis.Error(message, { cause })
   }
+  return schemaError
+}
+
+function runSchemaErrorPromise<A>(
+  self: Effect.Effect<A, SchemaError>
+): Promise<A> {
+  return Effect.runPromiseExit(self).then((exit) => {
+    if (Exit_.isSuccess(exit)) {
+      return exit.value
+    }
+    throw getSchemaErrorOrThrow(exit.cause, "Promise adapter can only reject schema errors")
+  })
 }
 
+function runSchemaErrorSync<A>(
+  self: Effect.Effect<A, SchemaError>
+): A {
+  const exit = Effect.runSyncExit(self)
+  if (Exit_.isSuccess(exit)) {
+    return exit.value
+  }
+  throw getSchemaErrorOrThrow(exit.cause, "Sync adapter can only throw schema errors")
+}
 /**
  * Returns a "Standard Schema" object conforming to the [Standard Schema
  * v1](https://standardschema.dev/) specification.
@@ -1303,67 +1344,8 @@ export function toStandardSchemaV1<S extends ConstraintDecoder<unknown>>(
     readonly parseOptions?: SchemaAST.ParseOptions | undefined
   }
 ): StandardSchemaV1<S["Encoded"], S["Type"]> & S {
-  const decodeUnknownEffect = SchemaParser.decodeUnknownEffect(self) as (
-    input: unknown,
-    options?: SchemaAST.ParseOptions
-  ) => Effect.Effect<S["Type"], SchemaIssue.Issue>
-  const parseOptions: SchemaAST.ParseOptions = { errors: "all", ...options?.parseOptions }
-  const formatter = SchemaIssue.makeFormatterStandardSchemaV1(options)
-  const validate: StandardSchemaV1<S["Encoded"], S["Type"]>["~standard"]["validate"] = (value: unknown) => {
-    const scheduler = new Scheduler.MixedScheduler("sync")
-    const fiber = Effect.runFork(
-      Effect.match(decodeUnknownEffect(value, parseOptions), {
-        onFailure: formatter,
-        onSuccess: (value): StandardSchemaV1.Result<S["Type"]> => ({ value })
-      }),
-      { scheduler }
-    )
-    fiber.currentDispatcher?.flush()
-    const exit = fiber.pollUnsafe()
-    if (exit) {
-      return makeStandardResult(exit)
-    }
-    return new Promise((resolve) => {
-      fiber.addObserver((exit) => {
-        resolve(makeStandardResult(exit))
-      })
-    })
-  }
-  if ("~standard" in self) {
-    const out = self as any
-    if ("validate" in out["~standard"]) return out
-    Object.assign(out["~standard"], { validate })
-    return out
-  } else {
-    return Object.assign(self, {
-      "~standard": {
-        version: 1,
-        vendor: "effect",
-        validate
-      } as const
-    })
-  }
-}
-
-function toBaseStandardJSONSchemaV1(self: Constraint, target: StandardJSONSchemaV1.Target): JsonSchema.JsonSchema {
-  const doc2020_12 = toJsonSchemaDocument(self)
-  if (target === "draft-2020-12") {
-    const schema = doc2020_12.schema
-    if (Object.keys(doc2020_12.definitions).length > 0) {
-      schema.$defs = doc2020_12.definitions
-    }
-    return schema
-  } else if (target === "draft-07") {
-    const doc07 = JsonSchema.toDocumentDraft07(doc2020_12)
-    const schema = doc07.schema
-    if (Object.keys(doc07.definitions).length > 0) {
-      schema.definitions = doc07.definitions
-    }
-    return schema
-  }
-  throw new globalThis.Error(`Unsupported target: ${target}`)
+  return InternalStandardSchema.toStandardSchemaV1(self, options)
 }
-
 /**
  * Converts a schema to an experimental Standard JSON Schema V1 representation.
  *
@@ -1377,30 +1359,8 @@ function toBaseStandardJSONSchemaV1(self: Constraint, target: StandardJSONSchema
 export function toStandardJSONSchemaV1<S extends Constraint>(
   self: S
 ): StandardJSONSchemaV1<S["Encoded"], S["Type"]> & S {
-  const jsonSchema: StandardJSONSchemaV1.Props<S["Encoded"], S["Type"]>["jsonSchema"] = {
-    input(options) {
-      return toBaseStandardJSONSchemaV1(self, options.target)
-    },
-    output(options) {
-      return toBaseStandardJSONSchemaV1(toType(self), options.target)
-    }
-  }
-  if ("~standard" in self) {
-    const out = self as any
-    if ("jsonSchema" in out["~standard"]) return out
-    Object.assign(out["~standard"], { jsonSchema })
-    return out
-  } else {
-    return Object.assign(self, {
-      "~standard": {
-        version: 1,
-        vendor: "effect",
-        jsonSchema
-      } as const
-    })
-  }
+  return InternalStandardSchema.toStandardJSONSchemaV1(self)
 }
-
 /**
  * Creates a type guard function that checks if a value conforms to a given
  * schema.
@@ -1438,8 +1398,7 @@ export function toStandardJSONSchemaV1<S extends Constraint>(
  * @category guards
  * @since 3.10.0
  */
-export const is = SchemaParser.is
-
+export const is: typeof SchemaParser.is = SchemaParser.is
 /**
  * Creates an assertion function that throws an error if the input does not match
  * the schema.
@@ -1490,7 +1449,6 @@ export const is = SchemaParser.is
  */
 export const asserts: <S extends Constraint, I>(schema: S, input: I) => asserts input is I & S["Type"] =
   SchemaParser.asserts
-
 /**
  * Decodes an `unknown` input against a schema, returning an `Effect` that
  * succeeds with the decoded value or fails with a {@link SchemaError}.
@@ -1521,19 +1479,6 @@ export function decodeUnknownEffect<S extends Constraint>(schema: S, options?: S
     return fromIssueEffect(parser(input, options))
   }
 }
-
-function fromIssueEffect<A, R>(
-  self: Effect.Effect<A, SchemaIssue.Issue, R>
-): Effect.Effect<A, SchemaError, R> {
-  if (effectIsExit(self)) {
-    return fromIssueExit(self as Exit_.Exit<A, SchemaIssue.Issue>)
-  }
-  return Effect.catchCause(
-    self,
-    (cause) => Effect.failCauseSync(() => Cause_.map(cause, (issue) => new SchemaError(issue)))
-  )
-}
-
 /**
  * Decodes a typed input (the schema's `Encoded` type) against a schema,
  * returning an `Effect` that succeeds with the decoded value or fails with a
@@ -1562,45 +1507,6 @@ export const decodeEffect: <S extends Constraint>(
   input: S["Encoded"],
   options?: SchemaAST.ParseOptions
 ) => Effect.Effect<S["Type"], SchemaError, S["DecodingServices"]> = decodeUnknownEffect
-
-function getSchemaErrorOrThrow(
-  cause: Cause_.Cause<SchemaError>,
-  message: string
-): SchemaError {
-  let schemaError: SchemaError | undefined
-  for (const reason of cause.reasons) {
-    if (!Cause_.isFailReason(reason) || !isSchemaError(reason.error)) {
-      throw new globalThis.Error(message, { cause })
-    }
-    schemaError ??= reason.error
-  }
-  if (schemaError === undefined) {
-    throw new globalThis.Error(message, { cause })
-  }
-  return schemaError
-}
-
-function runSchemaErrorPromise<A>(
-  self: Effect.Effect<A, SchemaError>
-): Promise<A> {
-  return Effect.runPromiseExit(self).then((exit) => {
-    if (Exit_.isSuccess(exit)) {
-      return exit.value
-    }
-    throw getSchemaErrorOrThrow(exit.cause, "Promise adapter can only reject schema errors")
-  })
-}
-
-function runSchemaErrorSync<A>(
-  self: Effect.Effect<A, SchemaError>
-): A {
-  const exit = Effect.runSyncExit(self)
-  if (Exit_.isSuccess(exit)) {
-    return exit.value
-  }
-  throw getSchemaErrorOrThrow(exit.cause, "Sync adapter can only throw schema errors")
-}
-
 /**
  * Decodes an `unknown` input against a schema synchronously, returning an
  * `Exit` that is either a `Success` with the decoded value or a `Failure`.
@@ -1637,13 +1543,6 @@ export function decodeUnknownExit<S extends ConstraintDecoder<unknown>>(schema:
     return fromIssueExit(parser(input, options))
   }
 }
-
-function fromIssueExit<A>(exit: Exit_.Exit<A, SchemaIssue.Issue>): Exit_.Exit<A, SchemaError> {
-  return Exit_.isSuccess(exit)
-    ? exit as unknown as Exit_.Exit<A, SchemaError>
-    : Exit_.failCause(Cause_.map(exit.cause, (issue) => new SchemaError(issue)))
-}
-
 /**
  * Decodes a typed input (the schema's `Encoded` type) against a schema
  * synchronously, returning an `Exit` that is either a `Success` with the decoded
@@ -1678,7 +1577,6 @@ export const decodeExit: <S extends ConstraintDecoder<unknown>>(
   schema: S,
   options?: SchemaAST.ParseOptions
 ) => (input: S["Encoded"], options?: SchemaAST.ParseOptions) => Exit_.Exit<S["Type"], SchemaError> = decodeUnknownExit
-
 /**
  * Decodes an `unknown` input against a schema, returning an `Option` that is
  * `Some` with the decoded value on success or `None` for schema mismatches.
@@ -1709,7 +1607,6 @@ export const decodeUnknownOption: <S extends ConstraintDecoder<unknown>>(
   schema: S,
   options?: SchemaAST.ParseOptions
 ) => (input: unknown, options?: SchemaAST.ParseOptions) => Option_.Option<S["Type"]> = SchemaParser.decodeUnknownOption
-
 /**
  * Decodes a typed input (the schema's `Encoded` type) against a schema,
  * returning an `Option` that is `Some` with the decoded value on success or
@@ -1739,7 +1636,6 @@ export const decodeOption: <S extends ConstraintDecoder<unknown>>(
   schema: S,
   options?: SchemaAST.ParseOptions
 ) => (input: S["Encoded"], options?: SchemaAST.ParseOptions) => Option_.Option<S["Type"]> = SchemaParser.decodeOption
-
 /**
  * Decodes an `unknown` input against a schema, returning a `Result` that
  * succeeds with the decoded value or fails with a {@link SchemaError} for schema
@@ -1775,7 +1671,6 @@ export function decodeUnknownResult<S extends ConstraintDecoder<unknown>>(schema
     return Result_.mapError(parser(input, options), (issue) => new SchemaError(issue))
   }
 }
-
 /**
  * Decodes a typed input (the schema's `Encoded` type) against a schema,
  * returning a `Result` that succeeds with the decoded value or fails with a
@@ -1809,7 +1704,6 @@ export const decodeResult: <S extends ConstraintDecoder<unknown>>(
   options?: SchemaAST.ParseOptions
 ) => (input: S["Encoded"], options?: SchemaAST.ParseOptions) => Result_.Result<S["Type"], SchemaError> =
   decodeUnknownResult
-
 /**
  * Decodes an `unknown` input against a schema, returning a `Promise` that
  * resolves with the decoded value or rejects with a {@link SchemaError} for
@@ -1846,7 +1740,6 @@ export function decodeUnknownPromise<S extends ConstraintDecoder<unknown>>(
     return runSchemaErrorPromise(parser(input, options))
   }
 }
-
 /**
  * Decodes a typed input (the schema's `Encoded` type) against a schema,
  * returning a `Promise` that resolves with the decoded value or rejects with a
@@ -1878,7 +1771,6 @@ export const decodePromise: <S extends ConstraintDecoder<unknown>>(
   schema: S,
   options?: SchemaAST.ParseOptions
 ) => (input: S["Encoded"], options?: SchemaAST.ParseOptions) => Promise<S["Type"]> = decodeUnknownPromise
-
 /**
  * Decodes an `unknown` input against a schema synchronously, returning the
  * decoded value or throwing a {@link SchemaError} for schema mismatches.
@@ -1922,7 +1814,6 @@ export function decodeUnknownSync<S extends ConstraintDecoder<unknown>>(schema:
     return runSchemaErrorSync(parser(input, options))
   }
 }
-
 /**
  * Decodes a typed input (the schema's `Encoded` type) against a schema
  * synchronously, returning the decoded value or throwing a {@link SchemaError}
@@ -1953,7 +1844,6 @@ export const decodeSync: <S extends ConstraintDecoder<unknown>>(
   schema: S,
   options?: SchemaAST.ParseOptions
 ) => (input: S["Encoded"], options?: SchemaAST.ParseOptions) => S["Type"] = decodeUnknownSync
-
 /**
  * Encodes an `unknown` input against a schema, returning an `Effect` that
  * succeeds with the encoded value or fails with a {@link SchemaError}.
@@ -1994,7 +1884,6 @@ export function encodeUnknownEffect<S extends Constraint>(schema: S, options?: S
     return fromIssueEffect(parser(input, options))
   }
 }
-
 /**
  * Encodes a typed input (the schema's `Type`) against a schema, returning an
  * `Effect` that succeeds with the encoded value or fails with a
@@ -2023,7 +1912,6 @@ export const encodeEffect: <S extends Constraint>(
   input: S["Type"],
   options?: SchemaAST.ParseOptions
 ) => Effect.Effect<S["Encoded"], SchemaError, S["EncodingServices"]> = encodeUnknownEffect
-
 /**
  * Encodes an `unknown` input against a schema synchronously, returning an
  * `Exit` that is either a `Success` with the encoded value or a `Failure`.
@@ -2059,7 +1947,6 @@ export function encodeUnknownExit<S extends ConstraintEncoder<unknown>>(schema:
     return fromIssueExit(parser(input, options))
   }
 }
-
 /**
  * Encodes a typed input (the schema's `Type`) against a schema synchronously,
  * returning an `Exit` that is either a `Success` with the encoded value or a
@@ -2094,7 +1981,6 @@ export const encodeExit: <S extends ConstraintEncoder<unknown>>(
   schema: S,
   options?: SchemaAST.ParseOptions
 ) => (input: S["Type"], options?: SchemaAST.ParseOptions) => Exit_.Exit<S["Encoded"], SchemaError> = encodeUnknownExit
-
 /**
  * Encodes an `unknown` input against a schema, returning an `Option` that is
  * `Some` with the encoded value on success or `None` for schema mismatches.
@@ -2126,7 +2012,6 @@ export const encodeUnknownOption: <S extends ConstraintEncoder<unknown>>(
   options?: SchemaAST.ParseOptions
 ) => (input: unknown, options?: SchemaAST.ParseOptions) => Option_.Option<S["Encoded"]> =
   SchemaParser.encodeUnknownOption
-
 /**
  * Encodes a typed input (the schema's `Type`) against a schema, returning an
  * `Option` that is `Some` with the encoded value on success or `None` for schema
@@ -2156,7 +2041,6 @@ export const encodeOption: <S extends ConstraintEncoder<unknown>>(
   schema: S,
   options?: SchemaAST.ParseOptions
 ) => (input: S["Type"], options?: SchemaAST.ParseOptions) => Option_.Option<S["Encoded"]> = SchemaParser.encodeOption
-
 /**
  * Encodes an `unknown` input against a schema, returning a `Result` that
  * succeeds with the encoded value or fails with a {@link SchemaError} for schema
@@ -2191,7 +2075,6 @@ export function encodeUnknownResult<S extends ConstraintEncoder<unknown>>(schema
     return Result_.mapError(parser(input, options), (issue) => new SchemaError(issue))
   }
 }
-
 /**
  * Encodes a typed input (the schema's `Type`) against a schema, returning a
  * `Result` that succeeds with the encoded value or fails with a
@@ -2225,7 +2108,6 @@ export const encodeResult: <S extends ConstraintEncoder<unknown>>(
   options?: SchemaAST.ParseOptions
 ) => (input: S["Type"], options?: SchemaAST.ParseOptions) => Result_.Result<S["Encoded"], SchemaError> =
   encodeUnknownResult
-
 /**
  * Encodes an `unknown` input against a schema, returning a `Promise` that
  * resolves with the encoded value or rejects with a {@link SchemaError} for
@@ -2261,7 +2143,6 @@ export function encodeUnknownPromise<S extends ConstraintEncoder<unknown>>(
     return runSchemaErrorPromise(parser(input, options))
   }
 }
-
 /**
  * Encodes a typed input (the schema's `Type`) against a schema, returning a
  * `Promise` that resolves with the encoded value or rejects with a
@@ -2293,7 +2174,6 @@ export const encodePromise: <S extends ConstraintEncoder<unknown>>(
   schema: S,
   options?: SchemaAST.ParseOptions
 ) => (input: S["Type"], options?: SchemaAST.ParseOptions) => Promise<S["Encoded"]> = encodeUnknownPromise
-
 /**
  * Encodes an `unknown` input against a schema synchronously, throwing a
  * {@link SchemaError} for schema mismatches.
@@ -2326,7 +2206,6 @@ export function encodeUnknownSync<S extends ConstraintEncoder<unknown>>(schema:
     return runSchemaErrorSync(parser(input, options) as Effect.Effect<S["Encoded"], SchemaError>)
   }
 }
-
 /**
  * Encodes a typed input (the schema's `Type`) against a schema synchronously,
  * throwing a {@link SchemaError} for schema mismatches.
@@ -2355,7 +2234,6 @@ export const encodeSync: <S extends ConstraintEncoder<unknown>>(
   schema: S,
   options?: SchemaAST.ParseOptions
 ) => (input: S["Type"], options?: SchemaAST.ParseOptions) => S["Encoded"] = encodeUnknownSync
-
 /**
  * Creates a schema from an AST (Abstract Syntax Tree) node.
  *
@@ -2373,8 +2251,7 @@ export const encodeSync: <S extends ConstraintEncoder<unknown>>(
  * @category constructors
  * @since 3.10.0
  */
-export const make: <S extends Constraint>(ast: S["ast"], options?: object) => S = InternalSchema.make
-
+export const make: <S extends Constraint>(ast: S["ast"], options?: object) => S = InternalMake.make
 /**
  * Checks whether a value is a `Schema`.
  *
@@ -2384,7 +2261,6 @@ export const make: <S extends Constraint>(ast: S["ast"], options?: object) => S
 export function isSchema(u: unknown): u is Top {
   return Predicate.hasProperty(u, TypeId) && u[TypeId] === TypeId
 }
-
 /**
  * Type-level representation returned by {@link optionalKey}.
  *
@@ -2412,12 +2288,10 @@ export interface optionalKey<S extends Constraint> extends
   readonly "Iso": S["Iso"]
   readonly schema: S
 }
-
 interface optionalKeyLambda extends Lambda {
   <S extends Constraint>(self: S): optionalKey<S>
   readonly "~lambda.out": this["~lambda.in"] extends Constraint ? optionalKey<this["~lambda.in"]> : never
 }
-
 /**
  * Creates an exact optional key schema for struct fields. Unlike `optional`,
  * this creates exact optional properties (not `| undefined`) that can be
@@ -2440,16 +2314,14 @@ interface optionalKeyLambda extends Lambda {
  * @category combinators
  * @since 4.0.0
  */
-export const optionalKey = Struct_.lambda<optionalKeyLambda>((schema) =>
+export const optionalKey: optionalKeyLambda = Struct_.lambda<optionalKeyLambda>((schema) =>
   make(SchemaAST.optionalKey(schema.ast), { schema })
 )
-
 interface requiredKeyLambda extends Lambda {
   <S extends Constraint>(self: optionalKey<S>): S
   readonly "~lambda.out": this["~lambda.in"] extends optionalKey<Constraint> ? this["~lambda.in"]["schema"]
     : "Error: schema not eligible for requiredKey"
 }
-
 /**
  * Reverses `optionalKey` and returns the inner required schema.
  *
@@ -2461,8 +2333,7 @@ interface requiredKeyLambda extends Lambda {
  * @category combinators
  * @since 4.0.0
  */
-export const requiredKey = Struct_.lambda<requiredKeyLambda>((self) => self.schema)
-
+export const requiredKey: requiredKeyLambda = Struct_.lambda<requiredKeyLambda>((self) => self.schema)
 /**
  * Type-level representation returned by {@link optional}.
  *
@@ -2472,12 +2343,10 @@ export const requiredKey = Struct_.lambda<requiredKeyLambda>((self) => self.sche
 export interface optional<S extends Constraint> extends optionalKey<UndefinedOr<S>> {
   readonly "Rebuild": optional<S>
 }
-
 interface optionalLambda extends Lambda {
   <S extends Constraint>(self: S): optional<S>
   readonly "~lambda.out": this["~lambda.in"] extends Constraint ? optional<this["~lambda.in"]> : never
 }
-
 /**
  * Marks a struct field as optional, allowing the key to be absent or
  * `undefined`.
@@ -2507,17 +2376,15 @@ interface optionalLambda extends Lambda {
  * @category combinators
  * @since 3.10.0
  */
-export const optional = Struct_.lambda<optionalLambda>((self) => {
+export const optional: optionalLambda = Struct_.lambda<optionalLambda>((self) => {
   const schema = UndefinedOr(self)
   return make(SchemaAST.optional(self.ast), { schema })
 })
-
 interface requiredLambda extends Lambda {
   <S extends Constraint>(self: optional<S>): S
   readonly "~lambda.out": this["~lambda.in"] extends optional<Constraint> ? this["~lambda.in"]["schema"]["members"][0]
     : "Error: schema not eligible for required"
 }
-
 /**
  * Reverses `optional` and returns the inner schema.
  *
@@ -2533,8 +2400,7 @@ interface requiredLambda extends Lambda {
  * @category combinators
  * @since 3.10.0
  */
-export const required = Struct_.lambda<requiredLambda>((self) => self.schema.members[0])
-
+export const required: requiredLambda = Struct_.lambda<requiredLambda>((self) => self.schema.members[0])
 /**
  * Type-level representation returned by {@link mutableKey}.
  *
@@ -2562,12 +2428,10 @@ export interface mutableKey<S extends Constraint> extends
   readonly "Iso": S["Iso"]
   readonly schema: S
 }
-
 interface mutableKeyLambda extends Lambda {
   <S extends Constraint>(self: S): mutableKey<S>
   readonly "~lambda.out": this["~lambda.in"] extends Constraint ? mutableKey<this["~lambda.in"]> : never
 }
-
 /**
  * Makes a struct field mutable (removes the `readonly` modifier on the property).
  * Use {@link readonlyKey} to reverse.
@@ -2575,16 +2439,14 @@ interface mutableKeyLambda extends Lambda {
  * @category combinators
  * @since 4.0.0
  */
-export const mutableKey = Struct_.lambda<mutableKeyLambda>((schema) =>
+export const mutableKey: mutableKeyLambda = Struct_.lambda<mutableKeyLambda>((schema) =>
   make(SchemaAST.mutableKey(schema.ast), { schema })
 )
-
 interface readonlyKeyLambda extends Lambda {
   <S extends Constraint>(self: mutableKey<S>): S
   readonly "~lambda.out": this["~lambda.in"] extends mutableKey<Constraint> ? this["~lambda.in"]["schema"]
     : "Error: schema not eligible for readonlyKey"
 }
-
 /**
  * Reverses `mutableKey` and returns the inner readonly schema.
  *
@@ -2596,8 +2458,7 @@ interface readonlyKeyLambda extends Lambda {
  * @category combinators
  * @since 4.0.0
  */
-export const readonlyKey = Struct_.lambda<readonlyKeyLambda>((self) => self.schema)
-
+export const readonlyKey: readonlyKeyLambda = Struct_.lambda<readonlyKeyLambda>((self) => self.schema)
 /**
  * Type-level representation returned by {@link toType}.
  *
@@ -2625,12 +2486,10 @@ export interface toType<S extends Constraint> extends
   readonly "Iso": S["Iso"]
   readonly schema: S
 }
-
 interface toTypeLambda extends Lambda {
   <S extends Constraint>(self: S): toType<S>
   readonly "~lambda.out": this["~lambda.in"] extends Constraint ? toType<this["~lambda.in"]> : never
 }
-
 /**
  * Extracts the type-side schema: sets `Encoded` to equal the decoded `Type`,
  * discarding the encoding transformation path.
@@ -2638,8 +2497,9 @@ interface toTypeLambda extends Lambda {
  * @category transforming
  * @since 4.0.0
  */
-export const toType = Struct_.lambda<toTypeLambda>((schema) => make(SchemaAST.toType(schema.ast), { schema }))
-
+export const toType: toTypeLambda = Struct_.lambda<toTypeLambda>((schema) =>
+  make(SchemaAST.toType(schema.ast), { schema })
+)
 /**
  * Type-level representation returned by {@link toEncoded}.
  *
@@ -2667,12 +2527,10 @@ export interface toEncoded<S extends Constraint> extends
   readonly "Iso": S["Encoded"]
   readonly schema: S
 }
-
 interface toEncodedLambda extends Lambda {
   <S extends Constraint>(self: S): toEncoded<S>
   readonly "~lambda.out": this["~lambda.in"] extends Constraint ? toEncoded<this["~lambda.in"]> : never
 }
-
 /**
  * Extracts the encoded-side schema: sets `Type` to equal the `Encoded`,
  * discarding the decoding transformation path.
@@ -2680,10 +2538,10 @@ interface toEncodedLambda extends Lambda {
  * @category transforming
  * @since 4.0.0
  */
-export const toEncoded = Struct_.lambda<toEncodedLambda>((schema) => make(SchemaAST.toEncoded(schema.ast), { schema }))
-
+export const toEncoded: toEncodedLambda = Struct_.lambda<toEncodedLambda>((schema) =>
+  make(SchemaAST.toEncoded(schema.ast), { schema })
+)
 const FlipTypeId = "~effect/Schema/flip"
-
 /**
  * Type-level representation returned by {@link flip}.
  *
@@ -2716,7 +2574,6 @@ export interface flip<S extends Top> extends
 function isFlip$(schema: Top): schema is flip<any> {
   return Predicate.hasProperty(schema, FlipTypeId) && schema[FlipTypeId] === FlipTypeId
 }
-
 /**
  * Swaps the decoded and encoded sides of a schema.
  *
@@ -2748,7 +2605,6 @@ export function flip<S extends Top>(schema: S): flip<S> {
   }
   return make(SchemaAST.flip(schema.ast), { [FlipTypeId]: FlipTypeId, schema })
 }
-
 /**
  * Type-level representation returned by {@link Literal}.
  *
@@ -2761,7 +2617,6 @@ export interface Literal<L extends SchemaAST.LiteralValue>
   readonly literal: L
   transform<L2 extends SchemaAST.LiteralValue>(to: L2): decodeTo<Literal<L2>, Literal<L>>
 }
-
 /**
  * Creates a schema for a single literal value (string, number, bigint, boolean, or null).
  *
@@ -2793,7 +2648,6 @@ export function Literal<L extends SchemaAST.LiteralValue>(literal: L): Literal<L
   })
   return out
 }
-
 /**
  * Namespace for {@link TemplateLiteral} helper types.
  *
@@ -2807,22 +2661,22 @@ export declare namespace TemplateLiteral {
    *
    * The schema's encoded value must be a `string`, `number`, or `bigint` so it can
    * be converted into a template literal string segment.
+   * `TemplateLiteral` additionally rejects encodings at runtime;
+   * `TemplateLiteralParser` supports transformed parts.
    *
    * @category utility types
    * @since 4.0.0
    */
-  export interface SchemaPart extends Constraint {
+  interface SchemaPart extends Constraint {
     readonly Encoded: string | number | bigint
   }
-
   /**
    * Literal value that can be used directly as a part of a `TemplateLiteral`.
    *
    * @category utility types
    * @since 4.0.0
    */
-  export type LiteralPart = string | number | bigint
-
+  type LiteralPart = string | number | bigint
   /**
    * A single part of a `TemplateLiteral`, either an interpolated schema part or a
    * literal `string`, `number`, or `bigint`.
@@ -2830,23 +2684,18 @@ export declare namespace TemplateLiteral {
    * @category utility types
    * @since 4.0.0
    */
-  export type Part = SchemaPart | LiteralPart
-
+  type Part = SchemaPart | LiteralPart
   /**
    * Ordered list of parts used to construct a `TemplateLiteral` schema.
    *
    * @category utility types
    * @since 4.0.0
    */
-  export type Parts = ReadonlyArray<Part>
-
-  type AppendType<
-    Template extends string,
-    Next
-  > = Next extends LiteralPart ? `${Template}${Next}`
-    : Next extends { readonly Encoded: infer E extends LiteralPart } ? `${Template}${E}`
-    : never
-
+  type Parts = ReadonlyArray<Part>
+  type AppendType<Template extends string, Next> = Next extends LiteralPart ? `${Template}${Next}` : Next extends {
+    readonly Encoded: infer E extends LiteralPart
+  } ? `${Template}${E}` :
+  never
   /**
    * Computes the encoded string literal type produced by concatenating the encoded
    * forms of all template literal parts.
@@ -2854,10 +2703,8 @@ export declare namespace TemplateLiteral {
    * @category utility types
    * @since 3.10.0
    */
-  export type Encoded<Parts> = Parts extends readonly [...infer Init, infer Last] ? AppendType<Encoded<Init>, Last>
-    : ``
+  type Encoded<Parts> = Parts extends readonly [...infer Init, infer Last] ? AppendType<Encoded<Init>, Last> : ``
 }
-
 /**
  * Type-level representation returned by {@link TemplateLiteral}.
  *
@@ -2877,12 +2724,9 @@ export interface TemplateLiteral<Parts extends TemplateLiteral.Parts> extends
   readonly parts: Parts
 }
 
-function templateLiteralFromParts<Parts extends TemplateLiteral.Parts>(parts: Parts) {
-  return new SchemaAST.TemplateLiteral(
-    parts.map((part) => isSchema(part) ? part.ast : new SchemaAST.Literal(part as TemplateLiteral.LiteralPart))
-  )
+function templateLiteralParts(parts: TemplateLiteral.Parts) {
+  return parts.map((part) => isSchema(part) ? part.ast : new SchemaAST.Literal(part as TemplateLiteral.LiteralPart))
 }
-
 /**
  * Creates a schema that validates strings by matching ordered template literal
  * parts.
@@ -2898,6 +2742,13 @@ function templateLiteralFromParts<Parts extends TemplateLiteral.Parts>(parts: Pa
  * encoded type is `string`, `number`, or `bigint`. Checks on string, number,
  * and bigint schema parts are applied while matching each segment.
  *
+ * **Gotchas**
+ *
+ * Parts must not contain encodings, including inside unions or nested templates.
+ * Construction throws for transformed parts even when their decoded and encoded
+ * types are the same. Use {@link TemplateLiteralParser} to decode transformed parts.
+ * Brands and supported checks without encodings remain valid.
+ *
  * **Example** (Defining a URL path pattern)
  *
  * ```ts import.meta.vitest
@@ -2912,9 +2763,8 @@ function templateLiteralFromParts<Parts extends TemplateLiteral.Parts>(parts: Pa
  * @since 3.10.0
  */
 export function TemplateLiteral<const Parts extends TemplateLiteral.Parts>(parts: Parts): TemplateLiteral<Parts> {
-  return make(templateLiteralFromParts(parts), { parts })
+  return make(new SchemaAST.TemplateLiteral(templateLiteralParts(parts)), { parts })
 }
-
 /**
  * Namespace for {@link TemplateLiteralParser} helper types.
  *
@@ -2932,15 +2782,12 @@ export declare namespace TemplateLiteralParser {
    * @category utility types
    * @since 3.10.0
    */
-  export type Type<Parts> = Parts extends readonly [infer Head, ...infer Tail] ? readonly [
-      Head extends TemplateLiteral.LiteralPart ? Head :
-        Head extends ConstraintDecoder<infer T, unknown> ? T
-        : never,
+  type Type<Parts> = Parts extends readonly [infer Head, ...infer Tail] ? readonly [
+      Head extends TemplateLiteral.LiteralPart ? Head : Head extends ConstraintDecoder<infer T, unknown> ? T : never,
       ...Type<Tail>
-    ]
-    : []
+    ] :
+    []
 }
-
 /**
  * Type-level representation returned by {@link TemplateLiteralParser}.
  *
@@ -2955,14 +2802,13 @@ export interface TemplateLiteralParser<Parts extends TemplateLiteral.Parts> exte
 {
   readonly "Type": TemplateLiteralParser.Type<Parts>
   readonly "Encoded": TemplateLiteral.Encoded<Parts>
-  readonly "DecodingServices": never
-  readonly "EncodingServices": never
+  readonly "DecodingServices": Extract<Parts[number], Constraint>["DecodingServices"]
+  readonly "EncodingServices": Extract<Parts[number], Constraint>["EncodingServices"]
   readonly "~type.make.in": TemplateLiteralParser.Type<Parts>
   readonly "~type.make": TemplateLiteralParser.Type<Parts>
   readonly "Iso": TemplateLiteralParser.Type<Parts>
   readonly parts: Parts
 }
-
 /**
  * Schema for parsing matched template literal strings into typed tuple parts.
  *
@@ -2976,6 +2822,14 @@ export interface TemplateLiteralParser<Parts extends TemplateLiteral.Parts> exte
  * Unlike {@link TemplateLiteral}, this schema decodes the matched string into a
  * readonly tuple with one element per schema part. Checks on string, number,
  * and bigint schema parts are applied while matching each segment.
+ * The source template uses the encoded sides of the parts; the tuple retains
+ * their transformations, checks, and decoding and encoding service requirements.
+ *
+ * **Gotchas**
+ *
+ * Ambiguous templates use greedy segmentation with backtracking. Encoding a
+ * tuple and decoding the resulting string can therefore produce a different
+ * tuple when a segment contains a separator used by the template.
  *
  * **Example** (Parsing path parameters)
  *
@@ -2993,9 +2847,8 @@ 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 })
+  return make(SchemaAST.templateLiteralParser(templateLiteralParts(parts)), { parts })
 }
-
 /**
  * Type-level representation returned by {@link Enum}.
  *
@@ -3007,9 +2860,13 @@ export interface Enum<A extends { [x: string]: string | number }>
 {
   readonly enums: A
 }
-
 /**
  * Creates a schema from a TypeScript enum object. Validates that the input is one of the enum's values.
+ * Numeric enum values must be finite.
+ *
+ * **Gotchas**
+ *
+ * Throws when a numeric member is `NaN`, `Infinity`, or `-Infinity`.
  *
  * **Example** (Defining a direction enum)
  *
@@ -3038,7 +2895,6 @@ export function Enum<A extends { [x: string]: string | number }>(enums: A): Enum
     { enums }
   )
 }
-
 /**
  * Type-level representation of {@link Never}.
  *
@@ -3046,7 +2902,6 @@ export function Enum<A extends { [x: string]: string | number }>(enums: A): Enum
  * @since 3.10.0
  */
 export interface Never extends Bottom<never, never, never, never, SchemaAST.Never, Never> {}
-
 /**
  * Schema for the `never` type. Always fails validation — no value satisfies it.
  *
@@ -3054,7 +2909,6 @@ export interface Never extends Bottom<never, never, never, never, SchemaAST.Neve
  * @since 3.10.0
  */
 export const Never: Never = make(SchemaAST.never)
-
 /**
  * Type-level representation of {@link Any}.
  *
@@ -3062,7 +2916,6 @@ export const Never: Never = make(SchemaAST.never)
  * @since 3.10.0
  */
 export interface Any extends Bottom<any, any, never, never, SchemaAST.Any, Any> {}
-
 /**
  * Schema for the `any` type. Accepts any value without validation.
  *
@@ -3071,7 +2924,6 @@ export interface Any extends Bottom<any, any, never, never, SchemaAST.Any, Any>
  * @since 3.10.0
  */
 export const Any: Any = make(SchemaAST.any)
-
 /**
  * Type-level representation of {@link Unknown}.
  *
@@ -3079,7 +2931,6 @@ export const Any: Any = make(SchemaAST.any)
  * @since 3.10.0
  */
 export interface Unknown extends Bottom<unknown, unknown, never, never, SchemaAST.Unknown, Unknown> {}
-
 /**
  * Schema for the `unknown` type. Accepts any value without validation.
  *
@@ -3093,7 +2944,6 @@ export interface Unknown extends Bottom<unknown, unknown, never, never, SchemaAS
  * @since 3.10.0
  */
 export const Unknown: Unknown = make(SchemaAST.unknown)
-
 /**
  * Type-level representation of {@link Null}.
  *
@@ -3101,7 +2951,6 @@ export const Unknown: Unknown = make(SchemaAST.unknown)
  * @since 3.10.0
  */
 export interface Null extends Bottom<null, null, never, never, SchemaAST.Null, Null> {}
-
 /**
  * Schema for the `null` literal. Validates that the input is strictly `null`.
  *
@@ -3110,7 +2959,6 @@ export interface Null extends Bottom<null, null, never, never, SchemaAST.Null, N
  * @since 3.10.0
  */
 export const Null: Null = make(SchemaAST.null)
-
 /**
  * Type-level representation of {@link Undefined}.
  *
@@ -3118,7 +2966,6 @@ export const Null: Null = make(SchemaAST.null)
  * @since 3.10.0
  */
 export interface Undefined extends Bottom<undefined, undefined, never, never, SchemaAST.Undefined, Undefined> {}
-
 /**
  * Schema for the `undefined` literal. Validates that the input is strictly `undefined`.
  *
@@ -3127,7 +2974,6 @@ export interface Undefined extends Bottom<undefined, undefined, never, never, Sc
  * @since 3.10.0
  */
 export const Undefined: Undefined = make(SchemaAST.undefined)
-
 /**
  * Type-level representation of {@link String}.
  *
@@ -3135,7 +2981,6 @@ export const Undefined: Undefined = make(SchemaAST.undefined)
  * @since 4.0.0
  */
 export interface String extends Bottom<string, string, never, never, SchemaAST.String, String> {}
-
 /**
  * Schema for `string` values. Validates that the input is `typeof` `"string"`.
  *
@@ -3143,7 +2988,6 @@ export interface String extends Bottom<string, string, never, never, SchemaAST.S
  * @since 4.0.0
  */
 export const String: String = make(SchemaAST.string)
-
 /**
  * Type-level representation of {@link Number}.
  *
@@ -3151,7 +2995,6 @@ export const String: String = make(SchemaAST.string)
  * @since 4.0.0
  */
 export interface Number extends Bottom<number, number, never, never, SchemaAST.Number, Number> {}
-
 /**
  * Schema for `number` values, including `NaN`, `Infinity`, and `-Infinity`.
  *
@@ -3167,7 +3010,6 @@ export interface Number extends Bottom<number, number, never, never, SchemaAST.N
  * @since 4.0.0
  */
 export const Number: Number = make(SchemaAST.number)
-
 /**
  * Type-level representation of {@link Boolean}.
  *
@@ -3175,7 +3017,6 @@ export const Number: Number = make(SchemaAST.number)
  * @since 4.0.0
  */
 export interface Boolean extends Bottom<boolean, boolean, never, never, SchemaAST.Boolean, Boolean> {}
-
 /**
  * Schema for `boolean` values. Validates that the input is `typeof` `"boolean"`.
  *
@@ -3189,7 +3030,6 @@ export interface Boolean extends Bottom<boolean, boolean, never, never, SchemaAS
  * @since 4.0.0
  */
 export const Boolean: Boolean = make(SchemaAST.boolean)
-
 /**
  * Type-level representation of {@link Symbol}.
  *
@@ -3197,7 +3037,6 @@ export const Boolean: Boolean = make(SchemaAST.boolean)
  * @since 4.0.0
  */
 export interface Symbol extends Bottom<symbol, symbol, never, never, SchemaAST.Symbol, Symbol> {}
-
 /**
  * Schema for `symbol` values. Validates that the input is `typeof` `"symbol"`.
  *
@@ -3206,7 +3045,6 @@ export interface Symbol extends Bottom<symbol, symbol, never, never, SchemaAST.S
  * @since 4.0.0
  */
 export const Symbol: Symbol = make(SchemaAST.symbol)
-
 /**
  * Type-level representation of {@link BigInt}.
  *
@@ -3214,7 +3052,6 @@ export const Symbol: Symbol = make(SchemaAST.symbol)
  * @since 4.0.0
  */
 export interface BigInt extends Bottom<bigint, bigint, never, never, SchemaAST.BigInt, BigInt> {}
-
 /**
  * Schema for `bigint` values. Validates that the input is `typeof` `"bigint"`.
  *
@@ -3229,7 +3066,6 @@ export interface BigInt extends Bottom<bigint, bigint, never, never, SchemaAST.B
  * @since 4.0.0
  */
 export const BigInt: BigInt = make(SchemaAST.bigInt)
-
 /**
  * Type-level representation of {@link Void}.
  *
@@ -3237,7 +3073,6 @@ export const BigInt: BigInt = make(SchemaAST.bigInt)
  * @since 3.10.0
  */
 export interface Void extends Bottom<void, void, never, never, SchemaAST.Void, Void> {}
-
 /**
  * Schema for a TypeScript `void` return value.
  *
@@ -3258,7 +3093,6 @@ export interface Void extends Bottom<void, void, never, never, SchemaAST.Void, V
  * @since 3.10.0
  */
 export const Void: Void = make(SchemaAST.void)
-
 /**
  * Type-level representation of {@link ObjectKeyword}.
  *
@@ -3266,7 +3100,6 @@ export const Void: Void = make(SchemaAST.void)
  * @since 4.0.0
  */
 export interface ObjectKeyword extends Bottom<object, object, never, never, SchemaAST.ObjectKeyword, ObjectKeyword> {}
-
 /**
  * Schema for the `object` type. Validates that the input is a non-null object or function
  * (i.e. `typeof value === "object" && value !== null || typeof value === "function"`).
@@ -3275,7 +3108,6 @@ export interface ObjectKeyword extends Bottom<object, object, never, never, Sche
  * @since 4.0.0
  */
 export const ObjectKeyword: ObjectKeyword = make(SchemaAST.objectKeyword)
-
 /**
  * Type-level representation returned by {@link UniqueSymbol}.
  *
@@ -3285,10 +3117,15 @@ export const ObjectKeyword: ObjectKeyword = make(SchemaAST.objectKeyword)
 export interface UniqueSymbol<sym extends symbol>
   extends Bottom<sym, sym, never, never, SchemaAST.UniqueSymbol, UniqueSymbol<sym>>
 {}
-
 /**
  * Creates a schema for a specific symbol. Only that exact symbol satisfies the schema.
  *
+ * **Gotchas**
+ *
+ * Only globally registered symbols have a JSON encoding. Their canonical JSON
+ * form is the exact string returned by `String(symbol)`. A local symbol cannot
+ * be encoded as JSON.
+ *
  * **Example** (Defining a specific symbol)
  *
  * ```ts import.meta.vitest
@@ -3306,7 +3143,6 @@ export interface UniqueSymbol<sym extends symbol>
 export function UniqueSymbol<const sym extends symbol>(symbol: sym): UniqueSymbol<sym> {
   return make(new SchemaAST.UniqueSymbol(symbol))
 }
-
 /**
  * Namespace for struct field type utilities.
  *
@@ -3331,44 +3167,34 @@ export declare namespace Struct {
    * @category utility types
    * @since 3.10.0
    */
-  export type Fields = { readonly [x: PropertyKey]: Constraint }
-
+  type Fields = {
+    readonly [x: PropertyKey]: Constraint
+  }
   type TypeOptionalKeys<Fields extends Struct.Fields> = {
     [K in keyof Fields]: Fields[K] extends { readonly "~type.optionality": "optional" } ? K
       : never
   }[keyof Fields]
-
   type TypeMutableKeys<Fields extends Struct.Fields> = {
     [K in keyof Fields]: Fields[K] extends { readonly "~type.mutability": "mutable" } ? K
       : never
   }[keyof Fields]
-
   type SetOptional<A, K extends keyof A> = Omit<A, K> & Partial<Pick<A, K>>
-
   type Mutable<A> = { -readonly [K in keyof A]: A[K] }
-
   type SetMutable<A, K extends keyof A> = Omit<A, K> & Mutable<Pick<A, K>>
-
   type Side = "Type" | "Iso" | "Encoded"
-
   type EncodedOptionalKeys<Fields extends Struct.Fields> = {
     [K in keyof Fields]: Fields[K] extends { readonly "~encoded.optionality": "optional" } ? K
       : never
   }[keyof Fields]
-
   type EncodedMutableKeys<Fields extends Struct.Fields> = {
     [K in keyof Fields]: Fields[K] extends { readonly "~encoded.mutability": "mutable" } ? K
       : never
   }[keyof Fields]
-
   type SideOptionalKeys<F extends Fields, S extends Side> = S extends "Encoded" ? EncodedOptionalKeys<F>
     : TypeOptionalKeys<F>
-
   type SideMutableKeys<F extends Fields, S extends Side> = S extends "Encoded" ? EncodedMutableKeys<F>
     : TypeMutableKeys<F>
-
   type ReadonlySide<F extends Fields, S extends Side> = { readonly [K in keyof F]: F[K][S] }
-
   type View<
     F extends Fields,
     S extends Side,
@@ -3383,7 +3209,6 @@ export declare namespace Struct {
         Extract<keyof SetOptional<ReadonlySide<F, S>, O>, M>
       >
     >
-
   /**
    * Computes the decoded object type for a struct field map.
    *
@@ -3395,8 +3220,7 @@ export declare namespace Struct {
    * @category utility types
    * @since 3.10.0
    */
-  export type Type<F extends Fields> = View<F, "Type">
-
+  type Type<F extends Fields> = View<F, "Type">
   /**
    * Computes the iso object type for a struct field map from each field schema's
    * `Iso` type.
@@ -3409,8 +3233,7 @@ export declare namespace Struct {
    * @category utility types
    * @since 4.0.0
    */
-  export type Iso<F extends Fields> = View<F, "Iso">
-
+  type Iso<F extends Fields> = View<F, "Iso">
   /**
    * Computes the encoded object type for a struct field map.
    *
@@ -3423,8 +3246,7 @@ export declare namespace Struct {
    * @category utility types
    * @since 3.10.0
    */
-  export type Encoded<F extends Fields> = View<F, "Encoded">
-
+  type Encoded<F extends Fields> = View<F, "Encoded">
   /**
    * Union of all decoding service requirements needed by the schemas in a struct
    * field map.
@@ -3432,8 +3254,9 @@ export declare namespace Struct {
    * @category utility types
    * @since 4.0.0
    */
-  export type DecodingServices<F extends Fields> = { readonly [K in keyof F]: F[K]["DecodingServices"] }[keyof F]
-
+  type DecodingServices<F extends Fields> = {
+    readonly [K in keyof F]: F[K]["DecodingServices"]
+  }[keyof F]
   /**
    * Union of all encoding service requirements needed by the schemas in a struct
    * field map.
@@ -3441,20 +3264,18 @@ export declare namespace Struct {
    * @category utility types
    * @since 4.0.0
    */
-  export type EncodingServices<F extends Fields> = { readonly [K in keyof F]: F[K]["EncodingServices"] }[keyof F]
-
+  type EncodingServices<F extends Fields> = {
+    readonly [K in keyof F]: F[K]["EncodingServices"]
+  }[keyof F]
   type TypeConstructorDefaultedKeys<Fields extends Struct.Fields> = {
     [K in keyof Fields]: Fields[K] extends { readonly "~type.constructor.default": "with-default" } ? K
       : never
   }[keyof Fields]
-
   type ReadonlyMakeIn<F extends Fields> = { readonly [K in keyof F]: F[K]["~type.make"] }
-
   type MakeInView<
     F extends Fields,
     O extends keyof F = TypeOptionalKeys<F> | TypeConstructorDefaultedKeys<F>
   > = [O] extends [never] ? Simplify<ReadonlyMakeIn<F>> : Simplify<SetOptional<ReadonlyMakeIn<F>, O>>
-
   /**
    * Computes the input object type accepted when constructing a struct value.
    *
@@ -3466,9 +3287,8 @@ export declare namespace Struct {
    * @category utility types
    * @since 4.0.0
    */
-  export type MakeIn<F extends Fields> = MakeInView<F>
+  type MakeIn<F extends Fields> = MakeInView<F>
 }
-
 /**
  * Type-level representation returned by {@link Struct}.
  *
@@ -3545,7 +3365,6 @@ function makeStruct<const Fields extends Struct.Fields>(ast: SchemaAST.Objects,
     }
   })
 }
-
 /**
  * Defines a struct schema from a map of field schemas.
  *
@@ -3556,6 +3375,9 @@ function makeStruct<const Fields extends Struct.Fields>(ast: SchemaAST.Objects,
  *
  * The resulting schema's `Type` is a readonly object type with the fields'
  * decoded types. The `Encoded` form mirrors the field schemas' encoded types.
+ * Declared fields may be inherited and are copied to own properties in the
+ * output. The `__proto__` field is accepted only when it is an own property.
+ * Parsing does not guarantee that output keys retain their input order.
  *
  * **Example** (Defining a basic struct)
  *
@@ -3580,7 +3402,6 @@ function makeStruct<const Fields extends Struct.Fields>(ast: SchemaAST.Objects,
 export function Struct<const Fields extends Struct.Fields>(fields: Fields): Struct<Fields> {
   return makeStruct(SchemaAST.struct(fields, undefined), fields)
 }
-
 interface fieldsAssign<NewFields extends Struct.Fields> extends Lambda {
   <Fields extends Struct.Fields>(
     struct: Struct<Fields>
@@ -3589,7 +3410,6 @@ interface fieldsAssign<NewFields extends Struct.Fields> extends Lambda {
     ? Struct<Struct_.Simplify<Struct_.Assign<this["~lambda.in"]["fields"], NewFields>>>
     : "Error: schema not eligible for fieldsAssign"
 }
-
 /**
  * Adds fields to a struct schema through a struct-mapping lambda.
  *
@@ -3621,7 +3441,6 @@ interface fieldsAssign<NewFields extends Struct.Fields> extends Lambda {
 export function fieldsAssign<const NewFields extends Struct.Fields>(fields: NewFields) {
   return Struct_.lambda<fieldsAssign<NewFields>>((struct) => struct.mapFields(Struct_.assign(fields)))
 }
-
 /**
  * Type-level representation returned by {@link encodeKeys}.
  *
@@ -3646,7 +3465,6 @@ export interface encodeKeys<
 
 const canonicalPropertyKey = (key: PropertyKey): string | symbol =>
   typeof key === "symbol" ? key : globalThis.String(key)
-
 /**
  * Renames struct keys in the encoded form without changing the decoded type.
  *
@@ -3706,7 +3524,6 @@ export function encodeKeys<
     )) as any
   }
 }
-
 /**
  * Adds derived fields to a struct schema during decoding.
  *
@@ -3738,9 +3555,7 @@ export function encodeKeys<
  * @since 4.0.0
  */
 export function extendTo<S extends Struct<Struct.Fields>, const Fields extends Struct.Fields>(
-  /** The new fields to add */
   fields: Fields,
-  /** A function per field to derive its value from the original input */
   derive: { readonly [K in keyof Fields]: (s: S["Type"]) => Option_.Option<Fields[K]["Type"]> }
 ) {
   return (
@@ -3773,7 +3588,6 @@ export function extendTo<S extends Struct<Struct.Fields>, const Fields extends S
     )) as any
   }
 }
-
 /**
  * Namespace for `Record` type utilities.
  *
@@ -3797,11 +3611,10 @@ export declare namespace Record {
    * @category utility types
    * @since 4.0.0
    */
-  export interface Key extends Codec<PropertyKey, PropertyKey, unknown, unknown> {
+  interface Key extends Codec<PropertyKey, PropertyKey, unknown, unknown> {
     readonly "~type.make": PropertyKey
     readonly "Iso": PropertyKey
   }
-
   /**
    * Computes the decoded object type for a record schema from its key and value
    * schemas.
@@ -3815,13 +3628,24 @@ export declare namespace Record {
    * @category utility types
    * @since 3.10.0
    */
-  export type Type<Key extends Record.Key, Value extends Constraint> = Value extends
-    { readonly "~type.optionality": "optional" } ?
-    Value extends { readonly "~type.mutability": "mutable" } ? { [P in Key["Type"]]?: Value["Type"] }
-    : { readonly [P in Key["Type"]]?: Value["Type"] }
-    : Value extends { readonly "~type.mutability": "mutable" } ? { [P in Key["Type"]]: Value["Type"] }
-    : { readonly [P in Key["Type"]]: Value["Type"] }
-
+  type Type<Key extends Record.Key, Value extends Constraint> = Value extends {
+    readonly "~type.optionality": "optional"
+  } ? Value extends {
+      readonly "~type.mutability": "mutable"
+    } ? {
+        [P in Key["Type"]]?: Value["Type"]
+      } :
+    {
+      readonly [P in Key["Type"]]?: Value["Type"]
+    } :
+    Value extends {
+      readonly "~type.mutability": "mutable"
+    } ? {
+        [P in Key["Type"]]: Value["Type"]
+      } :
+    {
+      readonly [P in Key["Type"]]: Value["Type"]
+    }
   /**
    * Computes the iso object type for a record schema from the key schema's `Iso`
    * keys and the value schema's `Iso` values.
@@ -3829,13 +3653,24 @@ export declare namespace Record {
    * @category utility types
    * @since 4.0.0
    */
-  export type Iso<Key extends Record.Key, Value extends Constraint> = Value extends
-    { readonly "~type.optionality": "optional" } ?
-    Value extends { readonly "~type.mutability": "mutable" } ? { [P in Key["Iso"]]?: Value["Iso"] }
-    : { readonly [P in Key["Iso"]]?: Value["Iso"] }
-    : Value extends { readonly "~type.mutability": "mutable" } ? { [P in Key["Iso"]]: Value["Iso"] }
-    : { readonly [P in Key["Iso"]]: Value["Iso"] }
-
+  type Iso<Key extends Record.Key, Value extends Constraint> = Value extends {
+    readonly "~type.optionality": "optional"
+  } ? Value extends {
+      readonly "~type.mutability": "mutable"
+    } ? {
+        [P in Key["Iso"]]?: Value["Iso"]
+      } :
+    {
+      readonly [P in Key["Iso"]]?: Value["Iso"]
+    } :
+    Value extends {
+      readonly "~type.mutability": "mutable"
+    } ? {
+        [P in Key["Iso"]]: Value["Iso"]
+      } :
+    {
+      readonly [P in Key["Iso"]]: Value["Iso"]
+    }
   /**
    * Computes the encoded object type for a record schema from the key and value
    * schemas' encoded types.
@@ -3848,13 +3683,24 @@ export declare namespace Record {
    * @category utility types
    * @since 3.10.0
    */
-  export type Encoded<Key extends Record.Key, Value extends Constraint> = Value extends
-    { readonly "~encoded.optionality": "optional" } ?
-    Value extends { readonly "~encoded.mutability": "mutable" } ? { [P in Key["Encoded"]]?: Value["Encoded"] }
-    : { readonly [P in Key["Encoded"]]?: Value["Encoded"] }
-    : Value extends { readonly "~encoded.mutability": "mutable" } ? { [P in Key["Encoded"]]: Value["Encoded"] }
-    : { readonly [P in Key["Encoded"]]: Value["Encoded"] }
-
+  type Encoded<Key extends Record.Key, Value extends Constraint> = Value extends {
+    readonly "~encoded.optionality": "optional"
+  } ? Value extends {
+      readonly "~encoded.mutability": "mutable"
+    } ? {
+        [P in Key["Encoded"]]?: Value["Encoded"]
+      } :
+    {
+      readonly [P in Key["Encoded"]]?: Value["Encoded"]
+    } :
+    Value extends {
+      readonly "~encoded.mutability": "mutable"
+    } ? {
+        [P in Key["Encoded"]]: Value["Encoded"]
+      } :
+    {
+      readonly [P in Key["Encoded"]]: Value["Encoded"]
+    }
   /**
    * Union of the decoding service requirements of a record's key schema and value
    * schema.
@@ -3862,10 +3708,9 @@ export declare namespace Record {
    * @category utility types
    * @since 4.0.0
    */
-  export type DecodingServices<Key extends Record.Key, Value extends Constraint> =
+  type DecodingServices<Key extends Record.Key, Value extends Constraint> =
     | Key["DecodingServices"]
     | Value["DecodingServices"]
-
   /**
    * Union of the encoding service requirements of a record's key schema and value
    * schema.
@@ -3873,10 +3718,9 @@ export declare namespace Record {
    * @category utility types
    * @since 4.0.0
    */
-  export type EncodingServices<Key extends Record.Key, Value extends Constraint> =
+  type EncodingServices<Key extends Record.Key, Value extends Constraint> =
     | Key["EncodingServices"]
     | Value["EncodingServices"]
-
   /**
    * Computes the input object type accepted when constructing a record value.
    *
@@ -3889,14 +3733,25 @@ export declare namespace Record {
    * @category utility types
    * @since 4.0.0
    */
-  export type MakeIn<Key extends Record.Key, Value extends Constraint> = Value extends
-    { readonly "~encoded.optionality": "optional" } ?
-    Value extends { readonly "~encoded.mutability": "mutable" } ? { [P in Key["~type.make"]]?: Value["~type.make"] }
-    : { readonly [P in Key["~type.make"]]?: Value["~type.make"] }
-    : Value extends { readonly "~encoded.mutability": "mutable" } ? { [P in Key["~type.make"]]: Value["~type.make"] }
-    : { readonly [P in Key["~type.make"]]: Value["~type.make"] }
+  type MakeIn<Key extends Record.Key, Value extends Constraint> = Value extends {
+    readonly "~encoded.optionality": "optional"
+  } ? Value extends {
+      readonly "~encoded.mutability": "mutable"
+    } ? {
+        [P in Key["~type.make"]]?: Value["~type.make"]
+      } :
+    {
+      readonly [P in Key["~type.make"]]?: Value["~type.make"]
+    } :
+    Value extends {
+      readonly "~encoded.mutability": "mutable"
+    } ? {
+        [P in Key["~type.make"]]: Value["~type.make"]
+      } :
+    {
+      readonly [P in Key["~type.make"]]: Value["~type.make"]
+    }
 }
-
 /**
  * Type-level representation returned by {@link Record}.
  *
@@ -3919,7 +3774,6 @@ export interface $Record<Key extends Record.Key, Value extends Constraint> exten
   readonly key: Key
   readonly value: Value
 }
-
 /**
  * Defines a record schema whose dynamic properties are selected by a key schema
  * and decoded with a value schema.
@@ -3938,8 +3792,9 @@ export interface $Record<Key extends Record.Key, Value extends Constraint> exten
  *
  * When decoded or encoded key transformations produce the same property key,
  * sequential parsing applies selected own properties in selection order, so
- * the later selected property overwrites the earlier value. With concurrency
- * greater than `1`, completion order determines which value is retained.
+ * the later selected property overwrites the earlier value. Dynamic key
+ * selection always examines own properties. Finite literal keys are declared
+ * fields and may therefore be inherited. Output key order is not guaranteed.
  *
  * **Example** (Defining a string-keyed record of numbers)
  *
@@ -3963,7 +3818,6 @@ export function Record<Key extends Record.Key, Value extends Constraint>(
 ): $Record<Key, Value> {
   return make(SchemaAST.record(key.ast, value.ast), { key, value })
 }
-
 /**
  * Namespace for `StructWithRest` type utilities.
  *
@@ -3982,8 +3836,9 @@ export declare namespace StructWithRest {
    * @category utility types
    * @since 4.0.0
    */
-  export type Objects = Constraint & { readonly ast: SchemaAST.Objects }
-
+  type Objects = Constraint & {
+    readonly ast: SchemaAST.Objects
+  }
   /**
    * Readonly list of record schemas that provide the additional index signatures
    * for a `StructWithRest` schema.
@@ -3991,12 +3846,10 @@ export declare namespace StructWithRest {
    * @category utility types
    * @since 3.10.0
    */
-  export type Records = ReadonlyArray<$Record<Record.Key, Constraint>>
-
+  type Records = ReadonlyArray<$Record<Record.Key, Constraint>>
   type MergeTuple<T extends ReadonlyArray<unknown>> = T extends readonly [infer Head, ...infer Tail] ?
     Head & MergeTuple<Tail>
     : {}
-
   type Intersect<
     S extends Objects,
     Records extends StructWithRest.Records,
@@ -4004,7 +3857,6 @@ export declare namespace StructWithRest {
   > =
     & S[Side]
     & MergeTuple<{ readonly [K in keyof Records]: Records[K][Side] }>
-
   /**
    * Computes the decoded type for `StructWithRest` by intersecting the base object
    * schema's decoded `Type` with the decoded types of all rest record schemas.
@@ -4012,8 +3864,7 @@ export declare namespace StructWithRest {
    * @category utility types
    * @since 3.10.0
    */
-  export type Type<S extends Objects, Records extends StructWithRest.Records> = Intersect<S, Records, "Type">
-
+  type Type<S extends Objects, Records extends StructWithRest.Records> = Intersect<S, Records, "Type">
   /**
    * Computes the iso type for `StructWithRest` by intersecting the base object
    * schema's `Iso` type with the `Iso` types of all rest record schemas.
@@ -4021,8 +3872,7 @@ export declare namespace StructWithRest {
    * @category utility types
    * @since 4.0.0
    */
-  export type Iso<S extends Objects, Records extends StructWithRest.Records> = Intersect<S, Records, "Iso">
-
+  type Iso<S extends Objects, Records extends StructWithRest.Records> = Intersect<S, Records, "Iso">
   /**
    * Computes the encoded type for `StructWithRest` by intersecting the base object
    * schema's encoded type with the encoded types of all rest record schemas.
@@ -4030,8 +3880,7 @@ export declare namespace StructWithRest {
    * @category utility types
    * @since 3.10.0
    */
-  export type Encoded<S extends Objects, Records extends StructWithRest.Records> = Intersect<S, Records, "Encoded">
-
+  type Encoded<S extends Objects, Records extends StructWithRest.Records> = Intersect<S, Records, "Encoded">
   /**
    * Computes the input type accepted when constructing a `StructWithRest` value by
    * intersecting the base object's make input with the make inputs of all rest
@@ -4040,8 +3889,7 @@ export declare namespace StructWithRest {
    * @category utility types
    * @since 4.0.0
    */
-  export type MakeIn<S extends Objects, Records extends StructWithRest.Records> = Intersect<S, Records, "~type.make">
-
+  type MakeIn<S extends Objects, Records extends StructWithRest.Records> = Intersect<S, Records, "~type.make">
   type Services<
     S extends Objects,
     Records extends StructWithRest.Records,
@@ -4049,7 +3897,6 @@ export declare namespace StructWithRest {
   > =
     | S[Side]
     | { [K in keyof Records]: Records[K][Side] }[number]
-
   /**
    * Union of the decoding service requirements of the base object schema and all
    * rest record schemas.
@@ -4057,12 +3904,11 @@ export declare namespace StructWithRest {
    * @category utility types
    * @since 4.0.0
    */
-  export type DecodingServices<S extends Objects, Records extends StructWithRest.Records> = Services<
+  type DecodingServices<S extends Objects, Records extends StructWithRest.Records> = Services<
     S,
     Records,
     "DecodingServices"
   >
-
   /**
    * Union of the encoding service requirements of the base object schema and all
    * rest record schemas.
@@ -4070,16 +3916,14 @@ export declare namespace StructWithRest {
    * @category utility types
    * @since 4.0.0
    */
-  export type EncodingServices<S extends Objects, Records extends StructWithRest.Records> = Services<
+  type EncodingServices<S extends Objects, Records extends StructWithRest.Records> = Services<
     S,
     Records,
     "EncodingServices"
   >
-
   type IncompatibleKeys<A, B, OK extends (keyof A & keyof B) = Extract<keyof A, keyof B>> = {
     [K in OK]: Required<Pick<A, K>>[K] extends B[K] ? never : K
   }[OK]
-
   type IncompatibleSideKeys<
     S extends Objects,
     Records extends StructWithRest.Records,
@@ -4087,13 +3931,11 @@ export declare namespace StructWithRest {
   > = {
     [I in keyof Records]: Records[I][Side] extends object ? IncompatibleKeys<S[Side], Records[I][Side]> : never
   }[number]
-
   type IncompatibleRecords<S extends Objects, Records extends StructWithRest.Records> =
     | IncompatibleSideKeys<S, Records, "Type">
     | IncompatibleSideKeys<S, Records, "Encoded">
     | IncompatibleSideKeys<S, Records, "Iso">
     | IncompatibleSideKeys<S, Records, "~type.make">
-
   /**
    * Checks whether fixed fields are compatible with the rest record schemas.
    *
@@ -4128,15 +3970,11 @@ export declare namespace StructWithRest {
    * @category utility types
    * @since 4.0.0
    */
-  export type ValidateRecords<
-    S extends Objects,
-    Records extends StructWithRest.Records
-  > = [IncompatibleRecords<S, Records>] extends [never] ? true
-    : {
+  type ValidateRecords<S extends Objects, Records extends StructWithRest.Records> =
+    [IncompatibleRecords<S, Records>] extends [never] ? true : {
       "incompatible index signatures": IncompatibleRecords<S, Records>
     }
 }
-
 /**
  * Type-level representation returned by {@link StructWithRest}.
  *
@@ -4162,7 +4000,6 @@ export interface StructWithRest<
   readonly schema: S
   readonly records: Records
 }
-
 /**
  * Extends a struct schema with one or more record (index-signature) schemas,
  * producing a schema whose decoded type intersects the struct and all records.
@@ -4200,7 +4037,6 @@ export function StructWithRest<
 ): StructWithRest<S, Records> {
   return make(SchemaAST.structWithRest(schema.ast, records.map(SchemaAST.getAST)), { schema, records })
 }
-
 /**
  * Namespace for `Tuple` type utilities.
  *
@@ -4221,8 +4057,7 @@ export declare namespace Tuple {
    * @category utility types
    * @since 3.10.0
    */
-  export type Elements = ReadonlyArray<Constraint>
-
+  type Elements = ReadonlyArray<Constraint>
   type Type_<
     Elements,
     Out extends ReadonlyArray<any> = readonly []
@@ -4232,7 +4067,6 @@ export declare namespace Tuple {
       : Type_<Tail, readonly [...Out, T]>
     : Out
     : Out
-
   /**
    * Computes the decoded tuple type for a tuple element schema array.
    *
@@ -4244,8 +4078,7 @@ export declare namespace Tuple {
    * @category utility types
    * @since 3.10.0
    */
-  export type Type<E extends Elements> = Type_<E>
-
+  type Type<E extends Elements> = Type_<E>
   type Iso_<
     Elements,
     Out extends ReadonlyArray<any> = readonly []
@@ -4255,7 +4088,6 @@ export declare namespace Tuple {
       : Iso_<Tail, readonly [...Out, T]>
     : Out
     : Out
-
   /**
    * Computes the iso tuple type for a tuple element schema array from each
    * element schema's `Iso` type.
@@ -4263,8 +4095,7 @@ export declare namespace Tuple {
    * @category utility types
    * @since 4.0.0
    */
-  export type Iso<E extends Elements> = Iso_<E>
-
+  type Iso<E extends Elements> = Iso_<E>
   type Encoded_<
     Elements,
     Out extends ReadonlyArray<any> = readonly []
@@ -4274,7 +4105,6 @@ export declare namespace Tuple {
       : Encoded_<Tail, readonly [...Out, T]>
     : Out
     : Out
-
   /**
    * Computes the encoded tuple type for a tuple element schema array.
    *
@@ -4286,8 +4116,7 @@ export declare namespace Tuple {
    * @category utility types
    * @since 3.10.0
    */
-  export type Encoded<E extends Elements> = Encoded_<E>
-
+  type Encoded<E extends Elements> = Encoded_<E>
   /**
    * Union of all decoding service requirements needed by the tuple element
    * schemas.
@@ -4295,8 +4124,7 @@ export declare namespace Tuple {
    * @category utility types
    * @since 4.0.0
    */
-  export type DecodingServices<E extends Elements> = E[number]["DecodingServices"]
-
+  type DecodingServices<E extends Elements> = E[number]["DecodingServices"]
   /**
    * Union of all encoding service requirements needed by the tuple element
    * schemas.
@@ -4304,8 +4132,7 @@ export declare namespace Tuple {
    * @category utility types
    * @since 4.0.0
    */
-  export type EncodingServices<E extends Elements> = E[number]["EncodingServices"]
-
+  type EncodingServices<E extends Elements> = E[number]["EncodingServices"]
   type MakeIn_<
     E,
     Out extends ReadonlyArray<any> = readonly []
@@ -4317,7 +4144,6 @@ export declare namespace Tuple {
       MakeIn_<Tail, readonly [...Out, T]>
     : Out :
     Out
-
   /**
    * Computes the input tuple type accepted when constructing a tuple value.
    *
@@ -4329,9 +4155,8 @@ export declare namespace Tuple {
    * @category utility types
    * @since 4.0.0
    */
-  export type MakeIn<E extends Elements> = MakeIn_<E>
+  type MakeIn<E extends Elements> = MakeIn_<E>
 }
-
 /**
  * Type-level representation returned by {@link Tuple}.
  *
@@ -4391,7 +4216,6 @@ function makeTuple<Elements extends Tuple.Elements>(ast: SchemaAST.Arrays, eleme
     }
   })
 }
-
 /**
  * Defines a fixed-length tuple schema from an array of element schemas.
  *
@@ -4411,7 +4235,6 @@ function makeTuple<Elements extends Tuple.Elements>(ast: SchemaAST.Arrays, eleme
 export function Tuple<const Elements extends ReadonlyArray<Constraint>>(elements: Elements): Tuple<Elements> {
   return makeTuple(SchemaAST.tuple(elements), elements)
 }
-
 /**
  * Namespace for `TupleWithRest` type utilities.
  *
@@ -4432,14 +4255,13 @@ export declare namespace TupleWithRest {
    * @category utility types
    * @since 3.10.0
    */
-  export type TupleType = Constraint & {
+  type TupleType = Constraint & {
     readonly Type: ReadonlyArray<unknown>
     readonly Encoded: ReadonlyArray<unknown>
     readonly ast: SchemaAST.Arrays
     readonly "~type.make": ReadonlyArray<unknown>
     readonly "Iso": ReadonlyArray<unknown>
   }
-
   /**
    * Non-empty list of schemas used for the rest portion of a `TupleWithRest`.
    *
@@ -4451,8 +4273,7 @@ export declare namespace TupleWithRest {
    * @category utility types
    * @since 3.10.0
    */
-  export type Rest = readonly [Constraint, ...Array<Constraint>]
-
+  type Rest = readonly [Constraint, ...Array<Constraint>]
   /**
    * Computes the decoded tuple type for a `TupleWithRest`.
    *
@@ -4465,14 +4286,15 @@ export declare namespace TupleWithRest {
    * @category utility types
    * @since 3.10.0
    */
-  export type Type<T extends ReadonlyArray<unknown>, Rest extends TupleWithRest.Rest> = Rest extends
+  type Type<T extends ReadonlyArray<unknown>, Rest extends TupleWithRest.Rest> = Rest extends
     readonly [infer Head extends Constraint, ...infer Tail extends ReadonlyArray<Constraint>] ? Readonly<[
       ...T,
       ...Array<Head["Type"]>,
-      ...{ readonly [K in keyof Tail]: Tail[K]["Type"] }
+      ...{
+        readonly [K in keyof Tail]: Tail[K]["Type"]
+      }
     ]> :
     T
-
   /**
    * Computes the iso tuple type for a `TupleWithRest`.
    *
@@ -4485,14 +4307,15 @@ export declare namespace TupleWithRest {
    * @category utility types
    * @since 4.0.0
    */
-  export type Iso<T extends ReadonlyArray<unknown>, Rest extends TupleWithRest.Rest> = Rest extends
+  type Iso<T extends ReadonlyArray<unknown>, Rest extends TupleWithRest.Rest> = Rest extends
     readonly [infer Head extends Constraint, ...infer Tail extends ReadonlyArray<Constraint>] ? Readonly<[
       ...T,
       ...Array<Head["Iso"]>,
-      ...{ readonly [K in keyof Tail]: Tail[K]["Iso"] }
+      ...{
+        readonly [K in keyof Tail]: Tail[K]["Iso"]
+      }
     ]> :
     T
-
   /**
    * Computes the encoded tuple type for `TupleWithRest`.
    *
@@ -4505,14 +4328,15 @@ export declare namespace TupleWithRest {
    * @category utility types
    * @since 3.10.0
    */
-  export type Encoded<E extends ReadonlyArray<unknown>, Rest extends TupleWithRest.Rest> = Rest extends
+  type Encoded<E extends ReadonlyArray<unknown>, Rest extends TupleWithRest.Rest> = Rest extends
     readonly [infer Head extends Constraint, ...infer Tail extends ReadonlyArray<Constraint>] ? readonly [
       ...E,
       ...Array<Head["Encoded"]>,
-      ...{ readonly [K in keyof Tail]: Tail[K]["Encoded"] }
+      ...{
+        readonly [K in keyof Tail]: Tail[K]["Encoded"]
+      }
     ] :
     E
-
   /**
    * Computes the constructor input tuple type for `TupleWithRest`.
    *
@@ -4525,15 +4349,16 @@ export declare namespace TupleWithRest {
    * @category utility types
    * @since 4.0.0
    */
-  export type MakeIn<M extends ReadonlyArray<unknown>, Rest extends TupleWithRest.Rest> = Rest extends
+  type MakeIn<M extends ReadonlyArray<unknown>, Rest extends TupleWithRest.Rest> = Rest extends
     readonly [infer Head extends Constraint, ...infer Tail extends ReadonlyArray<Constraint>] ? readonly [
       ...M,
       ...Array<Head["~type.make"]>,
-      ...{ readonly [K in keyof Tail]: Tail[K]["~type.make"] }
+      ...{
+        readonly [K in keyof Tail]: Tail[K]["~type.make"]
+      }
     ] :
     M
 }
-
 /**
  * Type-level representation returned by {@link TupleWithRest}.
  *
@@ -4559,7 +4384,6 @@ export interface TupleWithRest<
   readonly schema: S
   readonly rest: Rest
 }
-
 /**
  * Extends a fixed-length tuple schema with a variadic rest segment.
  *
@@ -4594,7 +4418,6 @@ export function TupleWithRest<S extends Tuple<Tuple.Elements>, const Rest extend
 ): TupleWithRest<S, Rest> {
   return make(SchemaAST.tupleWithRest(schema.ast, rest.map(SchemaAST.getAST)), { schema, rest })
 }
-
 /**
  * Type-level representation returned by {@link Array}.
  *
@@ -4616,20 +4439,17 @@ export interface $Array<S extends Constraint> extends
   readonly "Iso": ReadonlyArray<S["Iso"]>
   readonly value: S
 }
-
 interface ArrayLambda extends Lambda {
   <S extends Constraint>(self: S): $Array<S>
   readonly "~lambda.out": this["~lambda.in"] extends Constraint ? $Array<this["~lambda.in"]> : never
 }
-
 /**
  * @category constructors
  * @since 4.0.0
  */
-const ArraySchema = Struct_.lambda<ArrayLambda>((schema) =>
+const ArraySchema: ArrayLambda = Struct_.lambda<ArrayLambda>((schema) =>
   make(new SchemaAST.Arrays(false, [], [schema.ast]), { value: schema })
 )
-
 export {
   /**
    * Defines a `ReadonlyArray` schema for a given element schema.
@@ -4650,6 +4470,19 @@ export {
   ArraySchema as Array
 }
 
+/** @internal */
+export function withArrayLengthConstraints<Item extends Constraint>(
+  self: $Array<Item>,
+  minimum: number | undefined,
+  maximum: number | undefined
+): $Array<Item> {
+  if (minimum !== undefined && maximum !== undefined) {
+    return self.check(isLengthBetween(minimum, maximum))
+  }
+  if (minimum !== undefined) return self.check(isMinLength(minimum))
+  if (maximum !== undefined) return self.check(isMaxLength(maximum))
+  return self
+}
 /**
  * Type-level representation returned by {@link NonEmptyArray}.
  *
@@ -4671,12 +4504,10 @@ export interface NonEmptyArray<S extends Constraint> extends
   readonly "Iso": readonly [S["Iso"], ...Array<S["Iso"]>]
   readonly value: S
 }
-
 interface NonEmptyArrayLambda extends Lambda {
   <S extends Constraint>(self: S): NonEmptyArray<S>
   readonly "~lambda.out": this["~lambda.in"] extends Constraint ? NonEmptyArray<this["~lambda.in"]> : never
 }
-
 /**
  * Defines a non-empty `ReadonlyArray` schema — at least one element required.
  * Type is `readonly [T, ...T[]]`.
@@ -4694,10 +4525,9 @@ interface NonEmptyArrayLambda extends Lambda {
  * @category constructors
  * @since 3.10.0
  */
-export const NonEmptyArray = Struct_.lambda<NonEmptyArrayLambda>((schema) =>
+export const NonEmptyArray: NonEmptyArrayLambda = Struct_.lambda<NonEmptyArrayLambda>((schema) =>
   make(new SchemaAST.Arrays(false, [schema.ast], [schema.ast]), { value: schema })
 )
-
 /**
  * Type-level representation returned by {@link ArrayEnsure}.
  *
@@ -4707,7 +4537,6 @@ export const NonEmptyArray = Struct_.lambda<NonEmptyArrayLambda>((schema) =>
 export interface ArrayEnsure<S extends Constraint> extends decodeTo<$Array<toType<S>>, Union<readonly [S, $Array<S>]>> {
   readonly "Rebuild": ArrayEnsure<S>
 }
-
 /**
  * Creates a schema that accepts either a value decoded by `schema` or an array
  * decoded by `Schema.Array(schema)`, then returns an array.
@@ -4735,15 +4564,17 @@ export interface ArrayEnsure<S extends Constraint> extends decodeTo<$Array<toTyp
  * @since 3.10.0
  */
 export function ArrayEnsure<S extends Constraint>(schema: S): ArrayEnsure<S> {
-  return Union([schema, ArraySchema(schema)]).pipe(decodeTo(
-    ArraySchema(toType(schema)),
+  const many = ArraySchema(schema)
+  const to = ArraySchema(toType(schema))
+  const one = decodeTo(
+    Tuple([Unknown]),
     SchemaTransformation.transform({
-      decode: Arr.ensure,
-      encode: (array) => array.length === 1 ? array[0] : array
+      decode: (value) => [value] as const,
+      encode: ([value]) => value
     })
-  ))
+  )(schema)
+  return make(Union([one, many]).pipe(decodeTo(to)).ast, { from: Union([schema, many]), to })
 }
-
 /**
  * Type-level representation returned by {@link UniqueArray}.
  *
@@ -4753,7 +4584,6 @@ export function ArrayEnsure<S extends Constraint>(schema: S): ArrayEnsure<S> {
 export interface UniqueArray<S extends Constraint> extends $Array<S> {
   readonly "Rebuild": UniqueArray<S>
 }
-
 /**
  * Returns a new array schema that ensures all elements are unique.
  *
@@ -4768,14 +4598,17 @@ export interface UniqueArray<S extends Constraint> extends $Array<S> {
 export function UniqueArray<S extends Constraint>(item: S): UniqueArray<S> {
   return ArraySchema(item).check(isUnique())
 }
-
 /**
  * Type-level representation returned by {@link mutable}.
  *
  * @category transforming
  * @since 3.10.0
  */
-export interface mutable<S extends Constraint & { readonly "ast": SchemaAST.Arrays }> extends
+export interface mutable<
+  S extends Constraint & {
+    readonly "ast": SchemaAST.Arrays
+  }
+> extends
   BottomLazy<
     S["ast"],
     mutable<S>,
@@ -4791,20 +4624,17 @@ export interface mutable<S extends Constraint & { readonly "ast": SchemaAST.Arra
   readonly "Encoded": Mutable<S["Encoded"]>
   readonly "DecodingServices": S["DecodingServices"]
   readonly "EncodingServices": S["EncodingServices"]
-  // "~type.make" and "~type.make.in" as they are because they are contravariant
   readonly "~type.make.in": S["~type.make.in"]
   readonly "~type.make": S["~type.make"]
   readonly "Iso": S["Iso"]
   readonly schema: S
 }
-
 interface mutableLambda extends Lambda {
   <S extends Constraint & { readonly "ast": SchemaAST.Arrays }>(self: S): mutable<S>
   readonly "~lambda.out": this["~lambda.in"] extends Constraint & { readonly "ast": SchemaAST.Arrays } ?
     mutable<this["~lambda.in"]>
     : "Error: schema not eligible for mutable"
 }
-
 /**
  * Makes an array or tuple schema mutable, removing the `readonly` modifier.
  *
@@ -4831,8 +4661,9 @@ interface mutableLambda extends Lambda {
  * @category transforming
  * @since 3.10.0
  */
-export const mutable = Struct_.lambda<mutableLambda>((schema) => make(SchemaAST.mutable(schema.ast), { schema }))
-
+export const mutable: mutableLambda = Struct_.lambda<mutableLambda>((schema) =>
+  make(SchemaAST.mutable(schema.ast), { schema })
+)
 /**
  * Type-level representation returned by {@link Union}.
  *
@@ -4892,13 +4723,12 @@ function makeUnion<Members extends ReadonlyArray<Constraint>>(
     ): Union<Simplify<Readonly<To>>> {
       const members = f(this.members)
       return makeUnion(
-        SchemaAST.union(members, this.ast.mode, options?.unsafePreserveChecks ? this.ast.checks : undefined),
+        SchemaAST.union(members, this.ast.options, options?.unsafePreserveChecks ? this.ast.checks : undefined),
         members
       )
     }
   })
 }
-
 /**
  * Creates a union schema from an array of member schemas. Members are tested in
  * order; the first match is returned.
@@ -4925,11 +4755,10 @@ function makeUnion<Members extends ReadonlyArray<Constraint>>(
  */
 export function Union<const Members extends ReadonlyArray<Constraint>>(
   members: Members,
-  options?: { mode?: "anyOf" | "oneOf" }
+  options?: SchemaAST.UnionOptions
 ): Union<Members> {
-  return makeUnion(SchemaAST.union(members, options?.mode ?? "anyOf", undefined), members)
+  return makeUnion(SchemaAST.union(members, options, undefined), members)
 }
-
 /**
  * Type-level representation returned by {@link Literals}.
  *
@@ -4952,7 +4781,6 @@ export interface Literals<L extends ReadonlyArray<SchemaAST.LiteralValue>>
     to: L2
   ): Union<{ [I in keyof L]: decodeTo<Literal<L2[I]>, Literal<L[I]>> }>
 }
-
 /**
  * Creates a union schema from an array of literal values.
  *
@@ -4971,7 +4799,7 @@ export interface Literals<L extends ReadonlyArray<SchemaAST.LiteralValue>>
  */
 export function Literals<const L extends ReadonlyArray<SchemaAST.LiteralValue>>(literals: L): Literals<L> {
   const members = literals.map(Literal) as { readonly [K in keyof L]: Literal<L[K]> }
-  return make(SchemaAST.union(members, "anyOf", undefined), {
+  return make(SchemaAST.union(members, undefined, undefined), {
     literals,
     members,
     mapMembers<To extends ReadonlyArray<Constraint>>(
@@ -4990,7 +4818,6 @@ export function Literals<const L extends ReadonlyArray<SchemaAST.LiteralValue>>(
     }
   })
 }
-
 /**
  * Type-level representation returned by {@link NullOr}.
  *
@@ -5000,20 +4827,17 @@ export function Literals<const L extends ReadonlyArray<SchemaAST.LiteralValue>>(
 export interface NullOr<S extends Constraint> extends Union<readonly [S, Null]> {
   readonly "Rebuild": NullOr<S>
 }
-
 interface NullOrLambda extends Lambda {
   <S extends Constraint>(self: S): NullOr<S>
   readonly "~lambda.out": this["~lambda.in"] extends Constraint ? NullOr<this["~lambda.in"]> : never
 }
-
 /**
  * Creates a union schema of `S | null`.
  *
  * @category constructors
  * @since 3.10.0
  */
-export const NullOr = Struct_.lambda<NullOrLambda>((self) => Union([self, Null]))
-
+export const NullOr: NullOrLambda = Struct_.lambda<NullOrLambda>((self) => Union([self, Null]))
 /**
  * Type-level representation returned by {@link UndefinedOr}.
  *
@@ -5023,20 +4847,17 @@ export const NullOr = Struct_.lambda<NullOrLambda>((self) => Union([self, Null])
 export interface UndefinedOr<S extends Constraint> extends Union<readonly [S, Undefined]> {
   readonly "Rebuild": UndefinedOr<S>
 }
-
 interface UndefinedOrLambda extends Lambda {
   <S extends Constraint>(self: S): UndefinedOr<S>
   readonly "~lambda.out": this["~lambda.in"] extends Constraint ? UndefinedOr<this["~lambda.in"]> : never
 }
-
 /**
  * Creates a union schema of `S | undefined`.
  *
  * @category constructors
  * @since 3.10.0
  */
-export const UndefinedOr = Struct_.lambda<UndefinedOrLambda>((self) => Union([self, Undefined]))
-
+export const UndefinedOr: UndefinedOrLambda = Struct_.lambda<UndefinedOrLambda>((self) => Union([self, Undefined]))
 /**
  * Type-level representation returned by {@link NullishOr}.
  *
@@ -5046,20 +4867,17 @@ export const UndefinedOr = Struct_.lambda<UndefinedOrLambda>((self) => Union([se
 export interface NullishOr<S extends Constraint> extends Union<readonly [S, Null, Undefined]> {
   readonly "Rebuild": NullishOr<S>
 }
-
 interface NullishOrLambda extends Lambda {
   <S extends Constraint>(self: S): NullishOr<S>
   readonly "~lambda.out": this["~lambda.in"] extends Constraint ? NullishOr<this["~lambda.in"]> : never
 }
-
 /**
  * Creates a union schema of `S | null | undefined`.
  *
  * @category constructors
  * @since 3.10.0
  */
-export const NullishOr = Struct_.lambda<NullishOrLambda>((self) => Union([self, Null, Undefined]))
-
+export const NullishOr: NullishOrLambda = Struct_.lambda<NullishOrLambda>((self) => Union([self, Null, Undefined]))
 /**
  * Type-level representation returned by {@link suspend}.
  *
@@ -5086,7 +4904,6 @@ export interface suspend<S extends Constraint> extends
   readonly "~type.make": S["~type.make"]
   readonly "Iso": S["Iso"]
 }
-
 /**
  * Creates a suspended schema that defers evaluation until needed. This is
  * essential for creating recursive schemas where a schema references itself,
@@ -5115,7 +4932,6 @@ export interface suspend<S extends Constraint> extends
 export function suspend<S extends Constraint>(f: () => S): suspend<S> {
   return make(new SchemaAST.Suspend(() => f().ast))
 }
-
 /**
  * Attaches one or more filter checks to a schema without changing the
  * TypeScript type.
@@ -5140,7 +4956,6 @@ export function check<S extends Top>(
 ) {
   return (self: S): S["Rebuild"] => self.check(...checks)
 }
-
 /**
  * Type-level representation returned by {@link refine}.
  *
@@ -5168,7 +4983,6 @@ export interface refine<T extends S["Type"], S extends Constraint> extends
   readonly "Iso": T
   readonly schema: S
 }
-
 /**
  * Narrows the TypeScript type of a schema's output via a type guard predicate,
  * attaching the guard as a runtime filter check.
@@ -5187,13 +5001,11 @@ export interface refine<T extends S["Type"], S extends Constraint> extends
 export function refine<S extends Constraint, T extends S["Type"]>(
   refinement: (value: S["Type"]) => value is T,
   annotations?: Annotations.Filter
-) {
+): (schema: S) => refine<T, S> {
   return (schema: S): refine<T, S> =>
     make(SchemaAST.appendChecks(schema.ast, [SchemaAST.makeFilterByGuard(refinement, annotations)]), { schema })
 }
-
 type DistributeBrands<B> = UnionToIntersection<B extends infer U extends string ? Brand.Brand<U> : never>
-
 /**
  * Type-level representation returned by {@link brand}.
  *
@@ -5222,7 +5034,6 @@ export interface brand<S extends Constraint, B> extends
   readonly schema: S
   readonly identifier: string
 }
-
 /**
  * Adds a nominal brand to a schema, intersecting the output type with
  * `Brand.Brand<B>` to prevent accidental mixing of structurally identical types.
@@ -5246,7 +5057,6 @@ export function brand<B extends string>(identifier: B) {
   return <S extends ConstraintRebuildable>(schema: S): brand<S["Rebuild"], B> =>
     make(SchemaAST.brand(schema.ast, identifier), { schema, identifier })
 }
-
 /**
  * Creates a branded schema from a {@link Brand.Constructor}, applying the
  * constructor's checks and brand tag to the underlying schema.
@@ -5261,7 +5071,6 @@ export function fromBrand<A extends Brand.Brand<any>>(identifier: string, ctor:
     return (ctor.checks ? self.check(...ctor.checks) : self).pipe(brand(identifier))
   }
 }
-
 /**
  * Type-level representation returned by {@link middlewareDecoding}.
  *
@@ -5289,7 +5098,6 @@ export interface middlewareDecoding<S extends Constraint, RD> extends
   readonly "Iso": S["Iso"]
   readonly schema: S
 }
-
 /**
  * Intercepts the decoding pipeline of a schema.
  *
@@ -5330,7 +5138,6 @@ export function middlewareDecoding<S extends Constraint, RD>(
       { schema }
     )
 }
-
 /**
  * Type-level representation returned by {@link middlewareEncoding}.
  *
@@ -5358,7 +5165,6 @@ export interface middlewareEncoding<S extends Constraint, RE> extends
   readonly "Iso": S["Iso"]
   readonly schema: S
 }
-
 /**
  * Intercepts the encoding pipeline of a schema.
  *
@@ -5399,7 +5205,6 @@ export function middlewareEncoding<S extends Constraint, RE>(
       { schema }
     )
 }
-
 /**
  * Recovers from a decoding error by providing a fallback value.
  *
@@ -5428,7 +5233,6 @@ export function catchDecoding<S extends Constraint>(
 ): (self: S) => middlewareDecoding<S, S["DecodingServices"]> {
   return catchDecodingWithContext(f)
 }
-
 /**
  * Recovers from a decoding error with a handler that may require Effect services.
  *
@@ -5455,7 +5259,6 @@ export function catchDecodingWithContext<S extends Constraint, R = never>(
   return (self: S): middlewareDecoding<S, S["DecodingServices"] | R> =>
     middlewareDecoding<S, S["DecodingServices"] | R>(Effect.catchEager(f))(self)
 }
-
 /**
  * Recovers from an encoding error by providing a fallback value.
  *
@@ -5473,7 +5276,6 @@ export function catchEncoding<S extends Constraint>(
 ): (self: S) => middlewareEncoding<S, S["EncodingServices"]> {
   return catchEncodingWithContext(f)
 }
-
 /**
  * Recovers from an encoding error with a handler that may require Effect services.
  *
@@ -5500,7 +5302,6 @@ export function catchEncodingWithContext<S extends Constraint, R = never>(
   return (self: S): middlewareEncoding<S, S["EncodingServices"] | R> =>
     middlewareEncoding<S, S["EncodingServices"] | R>(Effect.catchEager(f))(self)
 }
-
 /**
  * Type-level representation returned by {@link decodeTo}.
  *
@@ -5529,7 +5330,6 @@ export interface decodeTo<To extends Constraint, From extends Constraint, RD = n
   readonly from: From
   readonly to: To
 }
-
 /**
  * Type-level representation returned by {@link decodeTo} without a custom transformation.
  *
@@ -5537,7 +5337,6 @@ export interface decodeTo<To extends Constraint, From extends Constraint, RD = n
  * @since 3.10.0
  */
 export interface compose<To extends Constraint, From extends Constraint> extends decodeTo<To, From> {}
-
 /**
  * Creates a schema that transforms from a source schema to a target schema.
  *
@@ -5605,7 +5404,7 @@ export function decodeTo<To extends Constraint, From extends Constraint, RD = ne
       SchemaAST.decodeTo(
         from.ast,
         to.ast,
-        transformation ? SchemaTransformation.make(transformation) : SchemaTransformation.passthrough()
+        transformation ? SchemaTransformation.makeTransformation(transformation) : SchemaTransformation.passthrough()
       ),
       {
         from,
@@ -5615,6 +5414,37 @@ export function decodeTo<To extends Constraint, From extends Constraint, RD = ne
   }
 }
 
+/**
+ * Constructs a decode-only `SchemaAST.Link`.
+ *
+ * @internal
+ */
+export function linkDecoding<T>(): <To extends Constraint>(
+  to: To,
+  decode: SchemaGetter.Getter<T, NoInfer<To["Type"]>>
+) => SchemaAST.Link {
+  return <To extends Constraint>(
+    to: To,
+    decode: SchemaGetter.Getter<T, NoInfer<To["Type"]>>
+  ): SchemaAST.Link => link<T>()(to, { decode, encode: SchemaGetter.forbiddenEncoding })
+}
+
+/** @internal */
+export const TrueLiterals = Literals(["true", "yes", "on", "1", "y"])
+
+/** @internal */
+export const FalseLiterals = Literals(["false", "no", "off", "0", "n"])
+
+/** @internal */
+export const BooleanLiterals = Literals([...TrueLiterals.literals, ...FalseLiterals.literals]).pipe(
+  decodeTo(
+    Boolean,
+    SchemaTransformation.transform({
+      decode: (value) => value === "true" || value === "yes" || value === "on" || value === "1" || value === "y",
+      encode: (value) => value ? "true" : "false"
+    })
+  )
+)
 /**
  * Applies a transformation to a schema, creating a new schema with the same type but transformed encoding/decoding.
  *
@@ -5665,7 +5495,6 @@ export function decode<S extends Constraint, RD = never, RE = never>(transformat
     return decodeTo<toType<S>, S, RD, RE>(toType(self), transformation)(self)
   }
 }
-
 /**
  * Reverses a schema transformation so the encoded schema is supplied first.
  *
@@ -5698,7 +5527,7 @@ export function decode<S extends Constraint, RD = never, RE = never>(transformat
  */
 export function encodeTo<To extends Constraint>(
   to: To
-): <From extends Constraint>(from: From) => decodeTo<From, To>
+): <From extends Constraint>(from: From) => compose<From, To>
 export function encodeTo<To extends Constraint, From extends Constraint, RD = never, RE = never>(
   to: To,
   transformation: {
@@ -5719,7 +5548,6 @@ export function encodeTo<To extends Constraint, From extends Constraint, RD = ne
       decodeTo<From>(from)(to)
   }
 }
-
 /**
  * Applies a transformation to a schema's encoded type, creating a new schema where encoding/decoding
  * operate on `S["Encoded"]` rather than `S["Type"]`.
@@ -5754,7 +5582,6 @@ export function encode<S extends Constraint, RD = never, RE = never>(transformat
     return decodeTo<S, toEncoded<S>, RD, RE>(self, transformation)(toEncoded(self))
   }
 }
-
 /**
  * Constraint used to ensure a schema field does not already have a constructor default.
  *
@@ -5768,7 +5595,6 @@ export function encode<S extends Constraint, RD = never, RE = never>(transformat
 export interface WithoutConstructorDefault {
   readonly "~type.constructor.default": "no-default"
 }
-
 /**
  * Type-level representation returned by {@link withConstructorDefault}.
  *
@@ -5796,7 +5622,6 @@ export interface withConstructorDefault<S extends Constraint & WithoutConstructo
   readonly "Iso": S["Iso"]
   readonly schema: S
 }
-
 /**
  * Attaches a constructor default value to a schema field.
  *
@@ -5831,13 +5656,6 @@ export function withConstructorDefault<S extends Constraint & WithoutConstructor
   return (schema: S): withConstructorDefault<S> =>
     make(SchemaAST.withConstructorDefault(schema.ast, defaultValue), { schema })
 }
-
-function toIssueEffect<A, R>(
-  self: Effect.Effect<A, SchemaError, R>
-): Effect.Effect<A, SchemaIssue.Issue, R> {
-  return Effect.catchCause(self, (cause) => Effect.failCauseSync(() => Cause_.map(cause, (error) => error.issue)))
-}
-
 /**
  * Type-level representation returned by {@link withDecodingDefaultKey}.
  *
@@ -5849,7 +5667,6 @@ export interface withDecodingDefaultKey<S extends Constraint, R = never>
 {
   readonly "Rebuild": withDecodingDefaultKey<S, R>
 }
-
 /**
  * Options for {@link withDecodingDefaultKey} and {@link withDecodingDefault}.
  *
@@ -5866,6 +5683,11 @@ export type DecodingDefaultOptions = {
   readonly encodingStrategy?: "omit" | "passthrough" | undefined
 }
 
+function toIssueEffect<A, R>(
+  self: Effect.Effect<A, SchemaError, R>
+): Effect.Effect<A, SchemaIssue.Issue, R> {
+  return Effect.catchCause(self, (cause) => Effect.failCauseSync(() => Cause_.map(cause, (error) => error.issue)))
+}
 /**
  * Makes a struct key optional on the `Encoded` side and provides a default
  * `Encoded` value when the key is missing during decoding.
@@ -5902,7 +5724,7 @@ export type DecodingDefaultOptions = {
 export function withDecodingDefaultKey<S extends Constraint, R = never>(
   defaultValue: Effect.Effect<S["Encoded"], SchemaError, R>,
   options?: DecodingDefaultOptions
-) {
+): (self: S) => withDecodingDefaultKey<S, R> {
   const encode = options?.encodingStrategy === "omit" ? SchemaGetter.omit() : SchemaGetter.passthrough()
   return (self: S): withDecodingDefaultKey<S, R> => {
     return optionalKey(toEncoded(self)).pipe(decodeTo(self, {
@@ -5911,7 +5733,6 @@ export function withDecodingDefaultKey<S extends Constraint, R = never>(
     }))
   }
 }
-
 /**
  * Type-level representation returned by {@link withDecodingDefaultTypeKey}.
  *
@@ -5923,7 +5744,6 @@ export interface withDecodingDefaultTypeKey<S extends Constraint, R = never>
 {
   readonly "Rebuild": withDecodingDefaultTypeKey<S, R>
 }
-
 /**
  * Makes a struct key optional on the `Encoded` side (`optionalKey`, so the
  * key may be absent but **not** `undefined`) and provides a default `Type`
@@ -5949,7 +5769,7 @@ export interface withDecodingDefaultTypeKey<S extends Constraint, R = never>
 export function withDecodingDefaultTypeKey<S extends Constraint, R = never>(
   defaultValue: Effect.Effect<S["Type"], SchemaError, R>,
   options?: DecodingDefaultOptions
-) {
+): (self: S) => withDecodingDefaultTypeKey<S, R> {
   return (self: S): withDecodingDefaultTypeKey<S, R> => {
     return toType(self).pipe(
       withDecodingDefaultKey<toType<S>, R>(defaultValue, options),
@@ -5957,7 +5777,6 @@ export function withDecodingDefaultTypeKey<S extends Constraint, R = never>(
     )
   }
 }
-
 /**
  * Type-level representation returned by {@link withDecodingDefault}.
  *
@@ -5967,7 +5786,6 @@ export function withDecodingDefaultTypeKey<S extends Constraint, R = never>(
 export interface withDecodingDefault<S extends Constraint, R = never> extends decodeTo<S, optional<toEncoded<S>>, R> {
   readonly "Rebuild": withDecodingDefault<S, R>
 }
-
 /**
  * Wraps the `Encoded` side with `optional` (key absent **or** `undefined`)
  * and provides a default `Encoded` value when the field is missing or
@@ -6009,7 +5827,7 @@ export interface withDecodingDefault<S extends Constraint, R = never> extends de
 export function withDecodingDefault<S extends Constraint, R = never>(
   defaultValue: Effect.Effect<S["Encoded"], SchemaError, R>,
   options?: DecodingDefaultOptions
-) {
+): (self: S) => withDecodingDefault<S, R> {
   const encode = options?.encodingStrategy === "omit" ? SchemaGetter.omit() : SchemaGetter.passthrough()
   return (self: S): withDecodingDefault<S, R> => {
     return optional(toEncoded(self)).pipe(decodeTo(self, {
@@ -6018,7 +5836,6 @@ export function withDecodingDefault<S extends Constraint, R = never>(
     }))
   }
 }
-
 /**
  * Type-level representation returned by {@link withDecodingDefaultType}.
  *
@@ -6030,7 +5847,6 @@ export interface withDecodingDefaultType<S extends Constraint, R = never>
 {
   readonly "Rebuild": withDecodingDefaultType<S, R>
 }
-
 /**
  * Wraps the `Encoded` side with `optional` (key absent **or** `undefined`)
  * and provides a default `Type` value when the field is missing or
@@ -6061,7 +5877,7 @@ export interface withDecodingDefaultType<S extends Constraint, R = never>
 export function withDecodingDefaultType<S extends Constraint, R = never>(
   defaultValue: Effect.Effect<S["Type"], SchemaError, R>,
   options?: DecodingDefaultOptions
-) {
+): (self: S) => withDecodingDefaultType<S, R> {
   return (self: S): withDecodingDefaultType<S, R> => {
     return toType(self).pipe(
       withDecodingDefault<toType<S>, R>(defaultValue, options),
@@ -6069,7 +5885,6 @@ export function withDecodingDefaultType<S extends Constraint, R = never>(
     )
   }
 }
-
 /**
  * Type-level representation returned by {@link tag}.
  *
@@ -6077,7 +5892,6 @@ export function withDecodingDefaultType<S extends Constraint, R = never>(
  * @since 3.10.0
  */
 export interface tag<Tag extends SchemaAST.LiteralValue> extends withConstructorDefault<Literal<Tag>> {}
-
 /**
  * Combines a {@link Literal} schema with {@link withConstructorDefault}, making it ideal
  * for discriminator fields in tagged unions. When constructing via `make`, the
@@ -6103,7 +5917,6 @@ export interface tag<Tag extends SchemaAST.LiteralValue> extends withConstructor
 export function tag<Tag extends SchemaAST.LiteralValue>(literal: Tag): tag<Tag> {
   return Literal(literal).pipe(withConstructorDefault(Effect.succeed(literal)))
 }
-
 /**
  * Creates a literal `_tag` schema that is omitted from encoded output.
  *
@@ -6138,7 +5951,6 @@ export function tag<Tag extends SchemaAST.LiteralValue>(literal: Tag): tag<Tag>
 export function tagDefaultOmit<Tag extends SchemaAST.LiteralValue>(literal: Tag) {
   return tag(literal).pipe(withDecodingDefaultKey(Effect.succeed(literal), { encodingStrategy: "omit" }))
 }
-
 /**
  * Type-level representation returned by {@link TaggedStruct}.
  *
@@ -6148,7 +5960,6 @@ export function tagDefaultOmit<Tag extends SchemaAST.LiteralValue>(literal: Tag)
 export type TaggedStruct<Tag extends SchemaAST.LiteralValue, Fields extends Struct.Fields> = Struct<
   Simplify<{ readonly _tag: tag<Tag> } & Fields>
 >
-
 /**
  * Creates a struct schema with an automatically populated `_tag` field.
  *
@@ -6200,9 +6011,8 @@ export function TaggedStruct<const Tag extends SchemaAST.LiteralValue, const Fie
   value: Tag,
   fields: Fields
 ): TaggedStruct<Tag, Fields> {
-  return Struct({ _tag: tag(value), ...fields })
+  return Struct({ _tag: tag(value), ...fields }) as any
 }
-
 /**
  * Recursively flatten any nested Schema.Union members into a single tuple of leaf schemas.
  */
@@ -6210,15 +6020,12 @@ type Flatten<Schemas> = Schemas extends readonly [infer Head, ...infer Tail]
   ? Head extends Union<infer Inner> ? [...Flatten<Inner>, ...Flatten<Tail>]
   : [Head, ...Flatten<Tail>]
   : []
-
 type MatchCasesResult<Cases> = {
   [K in keyof Cases]-?: NonNullable<Cases[K]> extends (...args: Array<any>) => infer R ? R : never
 }[keyof Cases]
-
 type MatchOrElseResult<Cases, OrElse extends (...args: Array<any>) => any> = Unify<
   MatchCasesResult<Cases> | ReturnType<OrElse>
 >
-
 type TaggedUnionUtils<
   Tag extends PropertyKey,
   Members extends ReadonlyArray<Constraint & { readonly Type: { readonly [K in Tag]: PropertyKey } }>,
@@ -6276,7 +6083,6 @@ type TaggedUnionUtils<
     ): (value: Members[number]["Type"]) => MatchOrElseResult<Cases, OrElse>
   }
 }
-
 /**
  * Type-level representation returned by {@link toTaggedUnion}.
  *
@@ -6287,7 +6093,6 @@ export type toTaggedUnion<
   Tag extends PropertyKey,
   Members extends ReadonlyArray<Constraint & { readonly Type: { readonly [K in Tag]: PropertyKey } }>
 > = Union<Members> & TaggedUnionUtils<Tag, Members>
-
 /**
  * Augments an existing {@link Union} of tagged structs with utility methods and an ordered tuple of discriminant
  * values.
@@ -6353,7 +6158,7 @@ export function toTaggedUnion<const Tag extends PropertyKey>(tag: Tag) {
           discriminantKeys.add(key)
           discriminants.push(literal)
           InternalRecord.assignProperty(cases, literal, schema)
-          InternalRecord.assignProperty(guards, literal, is(toType(schema)))
+          InternalRecord.assignProperty(guards, literal, SchemaParser.is(toType(schema)))
           return
         }
       }
@@ -6396,7 +6201,6 @@ export function toTaggedUnion<const Tag extends PropertyKey>(tag: Tag) {
     }
   }
 }
-
 /**
  * Type-level representation returned by {@link TaggedUnion}.
  *
@@ -6442,7 +6246,6 @@ export interface TaggedUnion<Cases extends Record<string, Constraint>> extends
     ): (value: Cases[keyof Cases]["Type"]) => Output
   }
 }
-
 /**
  * Builds a discriminated union from a record of field sets, one per variant.
  * Each key becomes the `_tag` literal and the value is passed to {@link TaggedStruct}.
@@ -6484,7 +6287,6 @@ export function TaggedUnion<const CasesByTag extends Record<string, Struct.Field
   const { guards, isAnyOf, match, matchOrElse } = toTaggedUnion("_tag")(union)
   return make(union.ast, { cases, isAnyOf, guards, match, matchOrElse })
 }
-
 /**
  * Type-level representation returned by {@link Opaque}.
  *
@@ -6512,7 +6314,6 @@ export interface Opaque<Self, S extends Top, Brand> extends
   readonly "Iso": S["Iso"]
   new(_: never): S["Type"] & Brand
 }
-
 /**
  * Wraps a struct schema so that its decoded `Type` becomes a nominally distinct type `Self`.
  * Useful for creating opaque types that are structurally identical to a base struct
@@ -6538,11 +6339,10 @@ export interface Opaque<Self, S extends Top, Brand> extends
  * @since 4.0.0
  */
 export function Opaque<Self, Brand = {}>() {
-  return <S extends Top>(schema: S): Opaque<Self, S, Brand> & Omit<S, keyof Top> => {
-    return schema as any
-  }
+  return <S extends Top>(
+    schema: S
+  ): Opaque<Self, S, Brand> & Omit<S, keyof Top> => schema as any
 }
-
 /**
  * Type-level representation returned by {@link instanceOf}.
  *
@@ -6552,7 +6352,6 @@ export function Opaque<Self, Brand = {}>() {
 export interface instanceOf<T, Iso = T> extends declare<T, Iso> {
   readonly "Rebuild": instanceOf<T, Iso>
 }
-
 /**
  * Creates a schema that validates values using `instanceof`.
  * Decoding and encoding pass the value through unchanged.
@@ -6577,7 +6376,6 @@ export function instanceOf<C extends abstract new(...args: any) => any, Iso = In
 ): instanceOf<InstanceType<C>, Iso> {
   return declare((u): u is InstanceType<C> => u instanceof constructor, annotations)
 }
-
 /**
  * Constructs an `SchemaAST.Link` that describes how a value of type `T` encodes to and decodes from a `To` schema.
  * Used when building low-level AST transformations that bridge two schema types.
@@ -6593,26 +6391,9 @@ export function link<T>() {
       readonly encode: SchemaGetter.Getter<NoInfer<To["Type"]>, T>
     }
   ): SchemaAST.Link => {
-    return new SchemaAST.Link(encodeTo.ast, SchemaTransformation.make(transformation))
+    return new SchemaAST.Link(encodeTo.ast, SchemaTransformation.makeTransformation(transformation))
   }
 }
-
-/**
- * Constructs a decode-only `SchemaAST.Link`.
- *
- * @internal
- */
-export function linkDecoding<T>() {
-  return <To extends Constraint>(
-    to: To,
-    decode: SchemaGetter.Getter<T, NoInfer<To["Type"]>>
-  ): SchemaAST.Link => link<T>()(to, { decode, encode: SchemaGetter.forbiddenEncoding })
-}
-
-// -----------------------------------------------------------------------------
-// Checks
-// -----------------------------------------------------------------------------
-
 /**
  * Creates a custom validation filter from a predicate function.
  *
@@ -6676,7 +6457,6 @@ export const makeFilter: <T>(
   annotations?: Annotations.Filter | undefined,
   abort?: boolean
 ) => SchemaAST.Filter<T> = SchemaAST.makeFilter
-
 /**
  * A single failure reported by a filter predicate. Used as the element type
  * of the array arm of {@link FilterOutput}, and also accepted on its own.
@@ -6700,7 +6480,6 @@ export type FilterIssue = string | SchemaIssue.Issue | {
   readonly path: ReadonlyArray<PropertyKey>
   readonly issue: string | SchemaIssue.Issue
 }
-
 /**
  * The value a filter predicate (see {@link makeFilter}) may return.
  *
@@ -6724,12 +6503,7 @@ export type FilterIssue = string | SchemaIssue.Issue | {
  * @category models
  * @since 3.10.0
  */
-export type FilterOutput =
-  | undefined
-  | boolean
-  | FilterIssue
-  | ReadonlyArray<FilterIssue>
-
+export type FilterOutput = undefined | boolean | FilterIssue | ReadonlyArray<FilterIssue>
 /**
  * Groups multiple checks into a single {@link SchemaAST.FilterGroup}, applying
  * optional shared annotations to the group as a whole.
@@ -6744,19 +6518,7 @@ export function makeFilterGroup<T>(
   return new SchemaAST.FilterGroup(checks, annotations)
 }
 
-function makeFixedDeclarationReviver(
-  id: string,
-  schema: Top
-): SchemaRepresentation.DeclarationReviver<null> {
-  return InternalSchema.makeDeclarationReviver(
-    id,
-    Null,
-    ({ annotations }) => annotations === undefined ? schema : schema.annotate(annotations)
-  )
-}
-
 const TRIMMED_PATTERN = "^\\S[\\s\\S]*\\S$|^\\S$|^$"
-
 /**
  * Validates that a string has no leading or trailing whitespace.
  *
@@ -6794,25 +6556,6 @@ export function isTrimmed(annotations?: Annotations.Filter) {
     }
   )
 }
-
-/**
- * Reviver for persisted `isTrimmed` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isTrimmed}.
- *
- * @see {@link isTrimmed} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isTrimmedReviver: SchemaRepresentation.FilterReviver<null> = InternalSchema.makeFilterReviver(
-  "effect/schema/isTrimmed",
-  Null,
-  ({ annotations }) => isTrimmed(annotations)
-)
-
 /**
  * Validates that a string matches the specified regular expression pattern.
  *
@@ -6820,7 +6563,9 @@ export const isTrimmedReviver: SchemaRepresentation.FilterReviver<null> = Intern
  *
  * JSON Schema:
  *
- * This check corresponds to the `pattern` constraint in JSON Schema.
+ * JSON Schema receives the RegExp source as a `pattern`. JavaScript flags are
+ * not represented, so validation can differ when the RegExp uses flags or
+ * relies on JavaScript's non-Unicode behavior.
  *
  * Arbitrary:
  *
@@ -6844,38 +6589,6 @@ export function isPattern(
     ...annotations
   })
 }
-
-const IsPatternPayload = Struct({
-  source: String,
-  flags: String
-}).check(makeFilter((payload: { readonly source: string; readonly flags: string }) => {
-  const result = Result_.try(() => new globalThis.RegExp(payload.source, payload.flags))
-  return Result_.isSuccess(result) &&
-    result.success.source === payload.source &&
-    result.success.flags === payload.flags
-}))
-
-/**
- * Reviver for persisted `isPattern` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isPattern}.
- *
- * @see {@link isPattern} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isPatternReviver: SchemaRepresentation.FilterReviver<{
-  readonly source: string
-  readonly flags: string
-}> = {
-  id: "effect/schema/isPattern",
-  payloadSchema: IsPatternPayload,
-  revive: ({ annotations, payload }) => isPattern(new globalThis.RegExp(payload.source, payload.flags), annotations)
-}
-
 /**
  * Validates that a string represents a finite number.
  *
@@ -6900,25 +6613,6 @@ export function isStringFinite(annotations?: Annotations.Filter): SchemaAST.Filt
     ...annotations
   })
 }
-
-/**
- * Reviver for persisted `isStringFinite` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isStringFinite}.
- *
- * @see {@link isStringFinite} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isStringFiniteReviver: SchemaRepresentation.FilterReviver<null> = InternalSchema.makeFilterReviver(
-  "effect/schema/isStringFinite",
-  Null,
-  ({ annotations }) => isStringFinite(annotations)
-)
-
 /**
  * Validates that a string is a signed base-10 integer literal for Effect's
  * BigInt string encoding.
@@ -6942,25 +6636,6 @@ export function isStringBigInt(annotations?: Annotations.Filter): SchemaAST.Filt
     ...annotations
   })
 }
-
-/**
- * Reviver for persisted `isStringBigInt` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isStringBigInt}.
- *
- * @see {@link isStringBigInt} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isStringBigIntReviver: SchemaRepresentation.FilterReviver<null> = InternalSchema.makeFilterReviver(
-  "effect/schema/isStringBigInt",
-  Null,
-  ({ annotations }) => isStringBigInt(annotations)
-)
-
 /**
  * Validates that a string has the `Symbol(description)` format used by Effect's
  * symbol string encoding.
@@ -6980,29 +6655,6 @@ export function isStringSymbol(annotations?: Annotations.Filter): SchemaAST.Filt
   })
 }
 
-/**
- * Reviver for persisted `isStringSymbol` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isStringSymbol}.
- *
- * @see {@link isStringSymbol} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isStringSymbolReviver: SchemaRepresentation.FilterReviver<null> = InternalSchema.makeFilterReviver(
-  "effect/schema/isStringSymbol",
-  Null,
-  ({ annotations }) => isStringSymbol(annotations)
-)
-
-/**
- * Returns a RegExp for validating an RFC 9562 / RFC 4122 UUID.
- *
- * Optionally specify a version 1-8. If no version is specified (`undefined`), all versions are supported.
- */
 const getUUIDRegExp = (version?: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8): globalThis.RegExp => {
   if (version) {
     return new globalThis.RegExp(
@@ -7011,7 +6663,6 @@ const getUUIDRegExp = (version?: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8): globalThis.RegE
   }
   return /^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-8][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}|00000000-0000-0000-0000-000000000000|[fF]{8}-[fF]{4}-[fF]{4}-[fF]{4}-[fF]{12})$/
 }
-
 /**
  * Validates that a string is a strict Universally Unique Identifier (UUID).
  *
@@ -7059,28 +6710,7 @@ export function isUUID(version?: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8, annotations?: An
   )
 }
 
-/**
- * Reviver for persisted `isUUID` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isUUID}.
- *
- * @see {@link isUUID} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isUUIDReviver: SchemaRepresentation.FilterReviver<{
-  readonly version: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | null
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isUUID",
-  Struct({ version: Union([Literals([1, 2, 3, 4, 5, 6, 7, 8]), Null]) }),
-  ({ annotations, payload }) => isUUID(payload.version ?? undefined, annotations)
-)
-
 const GUID_REGEXP = /^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})$/
-
 /**
  * Validates that a string has the GUID / UUID textual shape.
  *
@@ -7120,25 +6750,6 @@ export function isGUID(annotations?: Annotations.Filter) {
     }
   )
 }
-
-/**
- * Reviver for persisted `isGUID` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isGUID}.
- *
- * @see {@link isGUID} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isGUIDReviver: SchemaRepresentation.FilterReviver<null> = InternalSchema.makeFilterReviver(
-  "effect/schema/isGUID",
-  Null,
-  ({ annotations }) => isGUID(annotations)
-)
-
 /**
  * Validates that a string is a valid ULID (Universally Unique Lexicographically
  * Sortable Identifier).
@@ -7173,25 +6784,6 @@ export function isULID(annotations?: Annotations.Filter) {
     }
   )
 }
-
-/**
- * Reviver for persisted `isULID` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isULID}.
- *
- * @see {@link isULID} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isULIDReviver: SchemaRepresentation.FilterReviver<null> = InternalSchema.makeFilterReviver(
-  "effect/schema/isULID",
-  Null,
-  ({ annotations }) => isULID(annotations)
-)
-
 /**
  * Validates that a string is valid Base64 encoded data.
  *
@@ -7226,25 +6818,6 @@ export function isBase64(annotations?: Annotations.Filter) {
     }
   )
 }
-
-/**
- * Reviver for persisted `isBase64` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isBase64}.
- *
- * @see {@link isBase64} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isBase64Reviver: SchemaRepresentation.FilterReviver<null> = InternalSchema.makeFilterReviver(
-  "effect/schema/isBase64",
-  Null,
-  ({ annotations }) => isBase64(annotations)
-)
-
 /**
  * Validates that a string is valid Base64URL encoded data (Base64 with URL-safe
  * characters).
@@ -7280,25 +6853,6 @@ export function isBase64Url(annotations?: Annotations.Filter) {
     }
   )
 }
-
-/**
- * Reviver for persisted `isBase64Url` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isBase64Url}.
- *
- * @see {@link isBase64Url} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isBase64UrlReviver: SchemaRepresentation.FilterReviver<null> = InternalSchema.makeFilterReviver(
-  "effect/schema/isBase64Url",
-  Null,
-  ({ annotations }) => isBase64Url(annotations)
-)
-
 /**
  * Validates at runtime that a string starts with the specified literal prefix.
  *
@@ -7330,27 +6884,6 @@ export function isStartsWith(startsWith: string, annotations?: Annotations.Filte
     }
   )
 }
-
-/**
- * Reviver for persisted `isStartsWith` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isStartsWith}.
- *
- * @see {@link isStartsWith} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isStartsWithReviver: SchemaRepresentation.FilterReviver<{
-  readonly startsWith: string
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isStartsWith",
-  Struct({ startsWith: String }),
-  ({ annotations, payload }) => isStartsWith(payload.startsWith, annotations)
-)
-
 /**
  * Validates at runtime that a string ends with the specified literal suffix.
  *
@@ -7382,27 +6915,6 @@ export function isEndsWith(endsWith: string, annotations?: Annotations.Filter) {
     }
   )
 }
-
-/**
- * Reviver for persisted `isEndsWith` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isEndsWith}.
- *
- * @see {@link isEndsWith} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isEndsWithReviver: SchemaRepresentation.FilterReviver<{
-  readonly endsWith: string
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isEndsWith",
-  Struct({ endsWith: String }),
-  ({ annotations, payload }) => isEndsWith(payload.endsWith, annotations)
-)
-
 /**
  * Validates at runtime that a string contains the specified literal substring.
  *
@@ -7436,28 +6948,7 @@ export function isIncludes(includes: string, annotations?: Annotations.Filter) {
   )
 }
 
-/**
- * Reviver for persisted `isIncludes` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isIncludes}.
- *
- * @see {@link isIncludes} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isIncludesReviver: SchemaRepresentation.FilterReviver<{
-  readonly includes: string
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isIncludes",
-  Struct({ includes: String }),
-  ({ annotations, payload }) => isIncludes(payload.includes, annotations)
-)
-
 const UPPERCASED_PATTERN = "^[^a-z]*$"
-
 /**
  * Validates that a string is unchanged by JavaScript's `toUpperCase()`.
  *
@@ -7490,26 +6981,7 @@ export function isUppercased(annotations?: Annotations.Filter) {
   )
 }
 
-/**
- * Reviver for persisted `isUppercased` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isUppercased}.
- *
- * @see {@link isUppercased} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isUppercasedReviver: SchemaRepresentation.FilterReviver<null> = InternalSchema.makeFilterReviver(
-  "effect/schema/isUppercased",
-  Null,
-  ({ annotations }) => isUppercased(annotations)
-)
-
 const LOWERCASED_PATTERN = "^[^A-Z]*$"
-
 /**
  * Validates that a string is unchanged by JavaScript's `toLowerCase()`.
  *
@@ -7542,26 +7014,7 @@ export function isLowercased(annotations?: Annotations.Filter) {
   )
 }
 
-/**
- * Reviver for persisted `isLowercased` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isLowercased}.
- *
- * @see {@link isLowercased} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isLowercasedReviver: SchemaRepresentation.FilterReviver<null> = InternalSchema.makeFilterReviver(
-  "effect/schema/isLowercased",
-  Null,
-  ({ annotations }) => isLowercased(annotations)
-)
-
-const CAPITALIZED_PATTERN = "^[^a-z]?.*$"
-
+const CAPITALIZED_PATTERN = "^(?:[^a-z][\\s\\S]*)?$"
 /**
  * Validates that the first character of a string is unchanged by
  * `toUpperCase()`.
@@ -7594,26 +7047,7 @@ export function isCapitalized(annotations?: Annotations.Filter) {
   )
 }
 
-/**
- * Reviver for persisted `isCapitalized` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isCapitalized}.
- *
- * @see {@link isCapitalized} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isCapitalizedReviver: SchemaRepresentation.FilterReviver<null> = InternalSchema.makeFilterReviver(
-  "effect/schema/isCapitalized",
-  Null,
-  ({ annotations }) => isCapitalized(annotations)
-)
-
-const UNCAPITALIZED_PATTERN = "^[^A-Z]?.*$"
-
+const UNCAPITALIZED_PATTERN = "^(?:[^A-Z][\\s\\S]*)?$"
 /**
  * Validates that the first character of a string is unchanged by
  * `toLowerCase()`.
@@ -7645,25 +7079,6 @@ export function isUncapitalized(annotations?: Annotations.Filter) {
     }
   )
 }
-
-/**
- * Reviver for persisted `isUncapitalized` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isUncapitalized}.
- *
- * @see {@link isUncapitalized} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isUncapitalizedReviver: SchemaRepresentation.FilterReviver<null> = InternalSchema.makeFilterReviver(
-  "effect/schema/isUncapitalized",
-  Null,
-  ({ annotations }) => isUncapitalized(annotations)
-)
-
 /**
  * Type-level representation of {@link Finite}.
  *
@@ -7673,7 +7088,6 @@ export const isUncapitalizedReviver: SchemaRepresentation.FilterReviver<null> =
 export interface Finite extends Number {
   readonly "Rebuild": Finite
 }
-
 /**
  * Schema for finite numbers, rejecting `NaN`, `Infinity`, and `-Infinity`.
  *
@@ -7681,7 +7095,6 @@ export interface Finite extends Number {
  * @since 3.10.0
  */
 export const Finite: Finite = make(SchemaAST.finite)
-
 /**
  * Validates that a number is finite (not `Infinity`, `-Infinity`, or `NaN`).
  *
@@ -7700,25 +7113,6 @@ export const Finite: Finite = make(SchemaAST.finite)
  * @since 4.0.0
  */
 export const isFinite: (annotations?: Annotations.Filter) => SchemaAST.Filter<number> = SchemaAST.isFinite
-
-/**
- * Reviver for persisted `isFinite` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isFinite}.
- *
- * @see {@link isFinite} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isFiniteReviver: SchemaRepresentation.FilterReviver<null> = InternalSchema.makeFilterReviver(
-  "effect/schema/isFinite",
-  Null,
-  ({ annotations }) => isFinite(annotations)
-)
-
 /**
  * Creates a greater-than (`>`) check for any ordered type from an
  * `Order.Order` instance.
@@ -7749,7 +7143,6 @@ export function makeIsGreaterThan<T>(options: {
     )
   }
 }
-
 /**
  * Creates a greater-than-or-equal-to (`>=`) check for any ordered type from an
  * `Order.Order` instance.
@@ -7779,7 +7172,6 @@ export function makeIsGreaterThanOrEqualTo<T>(options: {
     )
   }
 }
-
 /**
  * Creates a less-than (`<`) check for any ordered type from an `Order.Order`
  * instance.
@@ -7810,7 +7202,6 @@ export function makeIsLessThan<T>(options: {
     )
   }
 }
-
 /**
  * Creates a less-than-or-equal-to (`<=`) check for any ordered type from an
  * `Order.Order` instance.
@@ -7840,7 +7231,6 @@ export function makeIsLessThanOrEqualTo<T>(options: {
     )
   }
 }
-
 /**
  * Creates an inclusive or exclusive range check for any ordered type from an
  * `Order.Order` instance.
@@ -7892,7 +7282,6 @@ export function makeIsBetween<T>(deriveOptions: {
     )
   }
 }
-
 /**
  * Creates a divisibility check for any numeric type from a remainder function
  * and a zero value.
@@ -7925,7 +7314,6 @@ function encodeNumberPayload(number: number): number {
   }
   return number
 }
-
 /**
  * Validates that a number is greater than the specified value (exclusive).
  *
@@ -7944,38 +7332,18 @@ function encodeNumberPayload(number: number): number {
  * @category validation
  * @since 4.0.0
  */
-export const isGreaterThan = makeIsGreaterThan({
-  order: Order.Number,
-  annotate: (exclusiveMinimum) => ({
-    representation: {
-      id: "effect/schema/isGreaterThan",
-      payload: { exclusiveMinimum: encodeNumberPayload(exclusiveMinimum) }
-    },
-    toJsonSchema: () => ({ exclusiveMinimum }),
-    toCode: () => ({ runtime: `Schema.isGreaterThan(${format(exclusiveMinimum)})` })
-  })
-})
-
-/**
- * Reviver for persisted `isGreaterThan` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isGreaterThan}.
- *
- * @see {@link isGreaterThan} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isGreaterThanReviver: SchemaRepresentation.FilterReviver<{
-  readonly exclusiveMinimum: number
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isGreaterThan",
-  Struct({ exclusiveMinimum: Finite }),
-  ({ annotations, payload }) => isGreaterThan(payload.exclusiveMinimum, annotations)
-)
-
+export const isGreaterThan: (exclusiveMinimum: number, annotations?: Annotations.Filter) => SchemaAST.Filter<number> =
+  makeIsGreaterThan({
+    order: Order.Number,
+    annotate: (exclusiveMinimum) => ({
+      representation: {
+        id: "effect/schema/isGreaterThan",
+        payload: { exclusiveMinimum: encodeNumberPayload(exclusiveMinimum) }
+      },
+      toJsonSchema: () => ({ exclusiveMinimum }),
+      toCode: () => ({ runtime: `Schema.isGreaterThan(${format(exclusiveMinimum)})` })
+    })
+  })
 /**
  * Validates that a number is greater than or equal to the specified value
  * (inclusive).
@@ -7994,38 +7362,18 @@ export const isGreaterThanReviver: SchemaRepresentation.FilterReviver<{
  * @category validation
  * @since 4.0.0
  */
-export const isGreaterThanOrEqualTo = makeIsGreaterThanOrEqualTo({
-  order: Order.Number,
-  annotate: (minimum) => ({
-    representation: {
-      id: "effect/schema/isGreaterThanOrEqualTo",
-      payload: { minimum: encodeNumberPayload(minimum) }
-    },
-    toJsonSchema: () => ({ minimum }),
-    toCode: () => ({ runtime: `Schema.isGreaterThanOrEqualTo(${format(minimum)})` })
+export const isGreaterThanOrEqualTo: (minimum: number, annotations?: Annotations.Filter) => SchemaAST.Filter<number> =
+  makeIsGreaterThanOrEqualTo({
+    order: Order.Number,
+    annotate: (minimum) => ({
+      representation: {
+        id: "effect/schema/isGreaterThanOrEqualTo",
+        payload: { minimum: encodeNumberPayload(minimum) }
+      },
+      toJsonSchema: () => ({ minimum }),
+      toCode: () => ({ runtime: `Schema.isGreaterThanOrEqualTo(${format(minimum)})` })
+    })
   })
-})
-
-/**
- * Reviver for persisted `isGreaterThanOrEqualTo` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isGreaterThanOrEqualTo}.
- *
- * @see {@link isGreaterThanOrEqualTo} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isGreaterThanOrEqualToReviver: SchemaRepresentation.FilterReviver<{
-  readonly minimum: number
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isGreaterThanOrEqualTo",
-  Struct({ minimum: Finite }),
-  ({ annotations, payload }) => isGreaterThanOrEqualTo(payload.minimum, annotations)
-)
-
 /**
  * Validates that a number is less than the specified value (exclusive).
  *
@@ -8044,38 +7392,18 @@ export const isGreaterThanOrEqualToReviver: SchemaRepresentation.FilterReviver<{
  * @category validation
  * @since 4.0.0
  */
-export const isLessThan = makeIsLessThan({
-  order: Order.Number,
-  annotate: (exclusiveMaximum) => ({
-    representation: {
-      id: "effect/schema/isLessThan",
-      payload: { exclusiveMaximum: encodeNumberPayload(exclusiveMaximum) }
-    },
-    toJsonSchema: () => ({ exclusiveMaximum }),
-    toCode: () => ({ runtime: `Schema.isLessThan(${format(exclusiveMaximum)})` })
+export const isLessThan: (exclusiveMaximum: number, annotations?: Annotations.Filter) => SchemaAST.Filter<number> =
+  makeIsLessThan({
+    order: Order.Number,
+    annotate: (exclusiveMaximum) => ({
+      representation: {
+        id: "effect/schema/isLessThan",
+        payload: { exclusiveMaximum: encodeNumberPayload(exclusiveMaximum) }
+      },
+      toJsonSchema: () => ({ exclusiveMaximum }),
+      toCode: () => ({ runtime: `Schema.isLessThan(${format(exclusiveMaximum)})` })
+    })
   })
-})
-
-/**
- * Reviver for persisted `isLessThan` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isLessThan}.
- *
- * @see {@link isLessThan} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isLessThanReviver: SchemaRepresentation.FilterReviver<{
-  readonly exclusiveMaximum: number
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isLessThan",
-  Struct({ exclusiveMaximum: Finite }),
-  ({ annotations, payload }) => isLessThan(payload.exclusiveMaximum, annotations)
-)
-
 /**
  * Validates that a number is less than or equal to the specified value
  * (inclusive).
@@ -8094,38 +7422,18 @@ export const isLessThanReviver: SchemaRepresentation.FilterReviver<{
  * @category validation
  * @since 4.0.0
  */
-export const isLessThanOrEqualTo = makeIsLessThanOrEqualTo({
-  order: Order.Number,
-  annotate: (maximum) => ({
-    representation: {
-      id: "effect/schema/isLessThanOrEqualTo",
-      payload: { maximum: encodeNumberPayload(maximum) }
-    },
-    toJsonSchema: () => ({ maximum }),
-    toCode: () => ({ runtime: `Schema.isLessThanOrEqualTo(${format(maximum)})` })
+export const isLessThanOrEqualTo: (maximum: number, annotations?: Annotations.Filter) => SchemaAST.Filter<number> =
+  makeIsLessThanOrEqualTo({
+    order: Order.Number,
+    annotate: (maximum) => ({
+      representation: {
+        id: "effect/schema/isLessThanOrEqualTo",
+        payload: { maximum: encodeNumberPayload(maximum) }
+      },
+      toJsonSchema: () => ({ maximum }),
+      toCode: () => ({ runtime: `Schema.isLessThanOrEqualTo(${format(maximum)})` })
+    })
   })
-})
-
-/**
- * Reviver for persisted `isLessThanOrEqualTo` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isLessThanOrEqualTo}.
- *
- * @see {@link isLessThanOrEqualTo} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isLessThanOrEqualToReviver: SchemaRepresentation.FilterReviver<{
-  readonly maximum: number
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isLessThanOrEqualTo",
-  Struct({ maximum: Finite }),
-  ({ annotations, payload }) => isLessThanOrEqualTo(payload.maximum, annotations)
-)
-
 /**
  * Validates that a number is within a specified range. The range boundaries can
  * be inclusive or exclusive based on the provided options.
@@ -8147,7 +7455,12 @@ export const isLessThanOrEqualToReviver: SchemaRepresentation.FilterReviver<{
  * @category validation
  * @since 4.0.0
  */
-export const isBetween = makeIsBetween({
+export const isBetween: (options: {
+  readonly minimum: number
+  readonly maximum: number
+  readonly exclusiveMinimum?: boolean | undefined
+  readonly exclusiveMaximum?: boolean | undefined
+}, annotations?: Annotations.Filter) => SchemaAST.Filter<number> = makeIsBetween({
   order: Order.Number,
   annotate: (options) => {
     const exclusiveMinimum = options.exclusiveMinimum ? true : undefined
@@ -8175,35 +7488,6 @@ export const isBetween = makeIsBetween({
     }
   }
 })
-
-/**
- * Reviver for persisted `isBetween` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isBetween}.
- *
- * @see {@link isBetween} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isBetweenReviver: SchemaRepresentation.FilterReviver<{
-  readonly minimum: number
-  readonly maximum: number
-  readonly exclusiveMinimum?: true | undefined
-  readonly exclusiveMaximum?: true | undefined
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isBetween",
-  Struct({
-    minimum: Finite,
-    maximum: Finite,
-    exclusiveMinimum: optional(Literal(true)),
-    exclusiveMaximum: optional(Literal(true))
-  }),
-  ({ annotations, payload }) => isBetween(payload, annotations)
-)
-
 /**
  * Validates that a number is a multiple of the specified divisor.
  *
@@ -8212,44 +7496,38 @@ export const isBetweenReviver: SchemaRepresentation.FilterReviver<{
  * JSON Schema:
  *
  * This check corresponds to the `multipleOf` constraint in JSON Schema.
+ * Negative divisors are normalized to their absolute value because JSON
+ * Schema requires `multipleOf` to be positive.
  *
- * @category validation
- * @since 4.0.0
- */
-export const isMultipleOf = makeIsMultipleOf({
-  remainder,
-  zero: 0,
-  annotate: (divisor) => ({
-    expected: `a value that is a multiple of ${divisor}`,
-    representation: {
-      id: "effect/schema/isMultipleOf",
-      payload: { divisor }
-    },
-    toJsonSchema: () => ({ multipleOf: divisor }),
-    toCode: () => ({ runtime: `Schema.isMultipleOf(${format(divisor)})` })
-  })
-})
-
-/**
- * Reviver for persisted `isMultipleOf` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isMultipleOf}.
+ * **Gotchas**
  *
- * @see {@link isMultipleOf} for creating the corresponding check
+ * Throws a `RangeError` when `divisor` is zero or is not finite.
  *
  * @category validation
  * @since 4.0.0
  */
-export const isMultipleOfReviver: SchemaRepresentation.FilterReviver<{
-  readonly divisor: number
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isMultipleOf",
-  Struct({ divisor: Finite }),
-  ({ annotations, payload }) => isMultipleOf(payload.divisor, annotations)
-)
-
+export function isMultipleOf(
+  divisor: number,
+  annotations?: Annotations.Filter
+): SchemaAST.Filter<number> {
+  if (!globalThis.Number.isFinite(divisor) || divisor === 0) {
+    throw new globalThis.RangeError(`Expected a finite non-zero number, got ${globalThis.String(divisor)}`)
+  }
+  divisor = globalThis.Math.abs(divisor)
+  return makeFilter(
+    (input: number) => remainder(input, divisor) === 0,
+    {
+      expected: `a value that is a multiple of ${divisor}`,
+      representation: {
+        id: "effect/schema/isMultipleOf",
+        payload: { divisor }
+      },
+      toJsonSchema: () => ({ multipleOf: divisor }),
+      toCode: () => ({ runtime: `Schema.isMultipleOf(${format(divisor)})` }),
+      ...annotations
+    }
+  )
+}
 /**
  * Validates that a number is a safe integer (within the safe integer range
  * that can be exactly represented in JavaScript).
@@ -8285,25 +7563,6 @@ export function isInt(annotations?: Annotations.Filter) {
     }
   )
 }
-
-/**
- * Reviver for persisted `isInt` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isInt}.
- *
- * @see {@link isInt} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isIntReviver: SchemaRepresentation.FilterReviver<null> = InternalSchema.makeFilterReviver(
-  "effect/schema/isInt",
-  Null,
-  ({ annotations }) => isInt(annotations)
-)
-
 /**
  * Type-level representation of {@link Int}.
  *
@@ -8313,7 +7572,6 @@ export const isIntReviver: SchemaRepresentation.FilterReviver<null> = InternalSc
 export interface Int extends Number {
   readonly "Rebuild": Int
 }
-
 /**
  * Schema for integers, rejecting `NaN`, `Infinity`, and `-Infinity`.
  *
@@ -8321,7 +7579,6 @@ export interface Int extends Number {
  * @since 3.10.0
  */
 export const Int: Int = Number.check(isInt())
-
 /**
  * Type-level representation of {@link Natural}.
  *
@@ -8331,7 +7588,6 @@ export const Int: Int = Number.check(isInt())
 export interface Natural extends Int {
   readonly "Rebuild": Natural
 }
-
 /**
  * Schema for non-negative safe integers, including zero.
  *
@@ -8345,7 +7601,6 @@ export interface Natural extends Int {
  * @since 4.0.0
  */
 export const Natural: Natural = Int.check(isGreaterThanOrEqualTo(0))
-
 /**
  * Validates that a number is a 32-bit signed integer (range: -2,147,483,648 to
  * 2,147,483,647).
@@ -8377,7 +7632,6 @@ export function isInt32(annotations?: Annotations.Filter) {
     }
   )
 }
-
 /**
  * Validates that a number is a 32-bit unsigned integer (range: 0 to
  * 4,294,967,295).
@@ -8420,7 +7674,6 @@ function encodeDatePayload(date: globalThis.Date): string {
 function formatDateRuntime(date: globalThis.Date): string {
   return `new Date(${format(date.getTime())})`
 }
-
 /**
  * Validates that a Date is greater than the specified value (exclusive).
  *
@@ -8433,7 +7686,10 @@ function formatDateRuntime(date: globalThis.Date): string {
  * @category validation
  * @since 4.0.0
  */
-export const isGreaterThanDate = makeIsGreaterThan({
+export const isGreaterThanDate: (
+  exclusiveMinimum: globalThis.Date,
+  annotations?: Annotations.Filter
+) => SchemaAST.Filter<globalThis.Date> = makeIsGreaterThan({
   order: Order.Date,
   annotate: (exclusiveMinimum) => {
     const encoded = encodeDatePayload(exclusiveMinimum)
@@ -8447,7 +7703,6 @@ export const isGreaterThanDate = makeIsGreaterThan({
     }
   }
 })
-
 /**
  * Validates that a Date is greater than or equal to the specified date
  * (inclusive).
@@ -8466,7 +7721,10 @@ export const isGreaterThanDate = makeIsGreaterThan({
  * @category validation
  * @since 4.0.0
  */
-export const isGreaterThanOrEqualToDate = makeIsGreaterThanOrEqualTo({
+export const isGreaterThanOrEqualToDate: (
+  minimum: globalThis.Date,
+  annotations?: Annotations.Filter
+) => SchemaAST.Filter<globalThis.Date> = makeIsGreaterThanOrEqualTo({
   order: Order.Date,
   annotate: (minimum) => {
     const encoded = encodeDatePayload(minimum)
@@ -8480,7 +7738,6 @@ export const isGreaterThanOrEqualToDate = makeIsGreaterThanOrEqualTo({
     }
   }
 })
-
 /**
  * Validates that a Date is less than the specified value (exclusive).
  *
@@ -8493,7 +7750,10 @@ export const isGreaterThanOrEqualToDate = makeIsGreaterThanOrEqualTo({
  * @category validation
  * @since 4.0.0
  */
-export const isLessThanDate = makeIsLessThan({
+export const isLessThanDate: (
+  exclusiveMaximum: globalThis.Date,
+  annotations?: Annotations.Filter
+) => SchemaAST.Filter<globalThis.Date> = makeIsLessThan({
   order: Order.Date,
   annotate: (exclusiveMaximum) => {
     const encoded = encodeDatePayload(exclusiveMaximum)
@@ -8507,7 +7767,6 @@ export const isLessThanDate = makeIsLessThan({
     }
   }
 })
-
 /**
  * Validates that a Date is less than or equal to the specified date
  * (inclusive).
@@ -8526,7 +7785,10 @@ export const isLessThanDate = makeIsLessThan({
  * @category validation
  * @since 4.0.0
  */
-export const isLessThanOrEqualToDate = makeIsLessThanOrEqualTo({
+export const isLessThanOrEqualToDate: (
+  maximum: globalThis.Date,
+  annotations?: Annotations.Filter
+) => SchemaAST.Filter<globalThis.Date> = makeIsLessThanOrEqualTo({
   order: Order.Date,
   annotate: (maximum) => {
     const encoded = encodeDatePayload(maximum)
@@ -8540,7 +7802,6 @@ export const isLessThanOrEqualToDate = makeIsLessThanOrEqualTo({
     }
   }
 })
-
 /**
  * Validates that a Date is within a specified range. The range boundaries can
  * be inclusive or exclusive based on the provided options.
@@ -8559,7 +7820,12 @@ export const isLessThanOrEqualToDate = makeIsLessThanOrEqualTo({
  * @category validation
  * @since 4.0.0
  */
-export const isBetweenDate = makeIsBetween({
+export const isBetweenDate: (options: {
+  readonly minimum: globalThis.Date
+  readonly maximum: globalThis.Date
+  readonly exclusiveMinimum?: boolean | undefined
+  readonly exclusiveMaximum?: boolean | undefined
+}, annotations?: Annotations.Filter) => SchemaAST.Filter<globalThis.Date> = makeIsBetween({
   order: Order.Date,
   annotate: (options) => {
     const exclusiveMinimum = options.exclusiveMinimum ? true : undefined
@@ -8584,7 +7850,6 @@ export const isBetweenDate = makeIsBetween({
     }
   }
 })
-
 /**
  * Validates that a BigInt is greater than the specified value (exclusive).
  *
@@ -8597,7 +7862,10 @@ export const isBetweenDate = makeIsBetween({
  * @category validation
  * @since 4.0.0
  */
-export const isGreaterThanBigInt = makeIsGreaterThan({
+export const isGreaterThanBigInt: (
+  exclusiveMinimum: bigint,
+  annotations?: Annotations.Filter
+) => SchemaAST.Filter<bigint> = makeIsGreaterThan({
   order: Order.BigInt,
   annotate: (exclusiveMinimum) => {
     const encoded = exclusiveMinimum.toString(10)
@@ -8611,7 +7879,6 @@ export const isGreaterThanBigInt = makeIsGreaterThan({
     }
   }
 })
-
 /**
  * Validates that a BigInt is greater than or equal to the specified value
  * (inclusive).
@@ -8625,7 +7892,10 @@ export const isGreaterThanBigInt = makeIsGreaterThan({
  * @category validation
  * @since 4.0.0
  */
-export const isGreaterThanOrEqualToBigInt = makeIsGreaterThanOrEqualTo({
+export const isGreaterThanOrEqualToBigInt: (
+  minimum: bigint,
+  annotations?: Annotations.Filter
+) => SchemaAST.Filter<bigint> = makeIsGreaterThanOrEqualTo({
   order: Order.BigInt,
   annotate: (minimum) => {
     const encoded = minimum.toString(10)
@@ -8639,7 +7909,6 @@ export const isGreaterThanOrEqualToBigInt = makeIsGreaterThanOrEqualTo({
     }
   }
 })
-
 /**
  * Validates that a BigInt is less than the specified value (exclusive).
  *
@@ -8652,7 +7921,10 @@ export const isGreaterThanOrEqualToBigInt = makeIsGreaterThanOrEqualTo({
  * @category validation
  * @since 4.0.0
  */
-export const isLessThanBigInt = makeIsLessThan({
+export const isLessThanBigInt: (
+  exclusiveMaximum: bigint,
+  annotations?: Annotations.Filter
+) => SchemaAST.Filter<bigint> = makeIsLessThan({
   order: Order.BigInt,
   annotate: (exclusiveMaximum) => {
     const encoded = exclusiveMaximum.toString(10)
@@ -8666,7 +7938,6 @@ export const isLessThanBigInt = makeIsLessThan({
     }
   }
 })
-
 /**
  * Validates that a BigInt is less than or equal to the specified value
  * (inclusive).
@@ -8680,7 +7951,10 @@ export const isLessThanBigInt = makeIsLessThan({
  * @category validation
  * @since 4.0.0
  */
-export const isLessThanOrEqualToBigInt = makeIsLessThanOrEqualTo({
+export const isLessThanOrEqualToBigInt: (
+  maximum: bigint,
+  annotations?: Annotations.Filter
+) => SchemaAST.Filter<bigint> = makeIsLessThanOrEqualTo({
   order: Order.BigInt,
   annotate: (maximum) => {
     const encoded = maximum.toString(10)
@@ -8694,7 +7968,6 @@ export const isLessThanOrEqualToBigInt = makeIsLessThanOrEqualTo({
     }
   }
 })
-
 /**
  * Validates that a BigInt is within a specified range. The range boundaries can
  * be inclusive or exclusive based on the provided options.
@@ -8708,7 +7981,12 @@ export const isLessThanOrEqualToBigInt = makeIsLessThanOrEqualTo({
  * @category validation
  * @since 4.0.0
  */
-export const isBetweenBigInt = makeIsBetween({
+export const isBetweenBigInt: (options: {
+  readonly minimum: bigint
+  readonly maximum: bigint
+  readonly exclusiveMinimum?: boolean | undefined
+  readonly exclusiveMaximum?: boolean | undefined
+}, annotations?: Annotations.Filter) => SchemaAST.Filter<bigint> = makeIsBetween({
   order: Order.BigInt,
   annotate: (options) => {
     const exclusiveMinimum = options.exclusiveMinimum ? true : undefined
@@ -8733,69 +8011,6 @@ export const isBetweenBigInt = makeIsBetween({
     }
   }
 })
-
-/**
- * Validates that a BigDecimal is greater than the specified value (exclusive).
- *
- * @category validation
- * @since 4.0.0
- */
-export const isGreaterThanBigDecimal = makeIsGreaterThan({
-  order: BigDecimal_.Order,
-  formatter: (bd) => BigDecimal_.format(bd)
-})
-
-/**
- * Validates that a BigDecimal is greater than or equal to the specified value
- * (inclusive).
- *
- * @category validation
- * @since 4.0.0
- */
-export const isGreaterThanOrEqualToBigDecimal = makeIsGreaterThanOrEqualTo({
-  order: BigDecimal_.Order,
-  formatter: (bd) => BigDecimal_.format(bd)
-})
-
-/**
- * Validates that a BigDecimal is less than the specified value (exclusive).
- *
- * @category validation
- * @since 4.0.0
- */
-export const isLessThanBigDecimal = makeIsLessThan({
-  order: BigDecimal_.Order,
-  formatter: (bd) => BigDecimal_.format(bd)
-})
-
-/**
- * Validates that a BigDecimal is less than or equal to the specified value
- * (inclusive).
- *
- * @category validation
- * @since 4.0.0
- */
-export const isLessThanOrEqualToBigDecimal = makeIsLessThanOrEqualTo({
-  order: BigDecimal_.Order,
-  formatter: (bd) => BigDecimal_.format(bd)
-})
-
-/**
- * Validates that a `BigDecimal` is within a specified range.
- *
- * **Details**
- *
- * The minimum and maximum boundaries are inclusive by default. Pass
- * `exclusiveMinimum` or `exclusiveMaximum` to exclude either boundary.
- *
- * @category validation
- * @since 4.0.0
- */
-export const isBetweenBigDecimal = makeIsBetween({
-  order: BigDecimal_.Order,
-  formatter: (bd) => BigDecimal_.format(bd)
-})
-
 /**
  * Validates that a value has at least the specified length. Works with strings
  * and arrays.
@@ -8804,8 +8019,9 @@ export const isBetweenBigDecimal = makeIsBetween({
  *
  * JSON Schema:
  *
- * This check corresponds to the `minLength` constraint for strings or the
- * `minItems` constraint for arrays in JSON Schema.
+ * For arrays, this check corresponds to `minItems`. For strings, it corresponds
+ * to `minLength`. JavaScript counts UTF-16 code units while JSON Schema counts
+ * Unicode code points, so the two validations can differ for some strings.
  *
  * Arbitrary:
  *
@@ -8847,27 +8063,6 @@ export function isMinLength(minLength: number, annotations?: Annotations.Filter)
     }
   )
 }
-
-/**
- * Reviver for persisted `isMinLength` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isMinLength}.
- *
- * @see {@link isMinLength} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isMinLengthReviver: SchemaRepresentation.FilterReviver<{
-  readonly minLength: number
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isMinLength",
-  Struct({ minLength: Natural }),
-  ({ annotations, payload }) => isMinLength(payload.minLength, annotations)
-)
-
 /**
  * Validates that a value has at least one element. Works with strings and arrays.
  * This is equivalent to `isMinLength(1)`.
@@ -8890,7 +8085,6 @@ export const isMinLengthReviver: SchemaRepresentation.FilterReviver<{
 export function isNonEmpty(annotations?: Annotations.Filter) {
   return isMinLength(1, annotations)
 }
-
 /**
  * Validates that a value has at most the specified length. Works with strings
  * and arrays.
@@ -8931,27 +8125,6 @@ export function isMaxLength(maxLength: number, annotations?: Annotations.Filter)
     }
   )
 }
-
-/**
- * Reviver for persisted `isMaxLength` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isMaxLength}.
- *
- * @see {@link isMaxLength} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isMaxLengthReviver: SchemaRepresentation.FilterReviver<{
-  readonly maxLength: number
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isMaxLength",
-  Struct({ maxLength: Natural }),
-  ({ annotations, payload }) => isMaxLength(payload.maxLength, annotations)
-)
-
 /**
  * Validates that a value's length is within the specified range. Works with
  * strings and arrays.
@@ -8960,8 +8133,10 @@ export const isMaxLengthReviver: SchemaRepresentation.FilterReviver<{
  *
  * JSON Schema:
  *
- * This check corresponds to `minLength`/`maxLength` constraints for strings
- * or `minItems`/`maxItems` constraints for arrays in JSON Schema.
+ * For arrays, this check corresponds to `minItems` and `maxItems`. For strings,
+ * it corresponds to `minLength` and `maxLength`. JavaScript counts UTF-16 code
+ * units while JSON Schema counts Unicode code points, so the two validations
+ * can differ for some strings.
  *
  * Arbitrary:
  *
@@ -9000,28 +8175,6 @@ export function isLengthBetween(minimum: number, maximum: number, annotations?:
     }
   )
 }
-
-/**
- * Reviver for persisted `isLengthBetween` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isLengthBetween}.
- *
- * @see {@link isLengthBetween} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isLengthBetweenReviver: SchemaRepresentation.FilterReviver<{
-  readonly minimum: number
-  readonly maximum: number
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isLengthBetween",
-  Struct({ minimum: Natural, maximum: Natural }),
-  ({ annotations, payload }) => isLengthBetween(payload.minimum, payload.maximum, annotations)
-)
-
 /**
  * Validates that a value has at least the specified size. Works with values
  * that have a `size` property, such as `Set` or `Map`.
@@ -9060,30 +8213,9 @@ export function isMinSize(minSize: number, annotations?: Annotations.Filter) {
     }
   )
 }
-
 /**
- * Reviver for persisted `isMinSize` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isMinSize}.
- *
- * @see {@link isMinSize} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isMinSizeReviver: SchemaRepresentation.FilterReviver<{
-  readonly minSize: number
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isMinSize",
-  Struct({ minSize: Natural }),
-  ({ annotations, payload }) => isMinSize(payload.minSize, annotations)
-)
-
-/**
- * Validates that a value has at most the specified size. Works with values
- * that have a `size` property, such as `Set` or `Map`.
+ * Validates that a value has at most the specified size. Works with values
+ * that have a `size` property, such as `Set` or `Map`.
  *
  * **Details**
  *
@@ -9119,27 +8251,6 @@ export function isMaxSize(maxSize: number, annotations?: Annotations.Filter) {
     }
   )
 }
-
-/**
- * Reviver for persisted `isMaxSize` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isMaxSize}.
- *
- * @see {@link isMaxSize} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isMaxSizeReviver: SchemaRepresentation.FilterReviver<{
-  readonly maxSize: number
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isMaxSize",
-  Struct({ maxSize: Natural }),
-  ({ annotations, payload }) => isMaxSize(payload.maxSize, annotations)
-)
-
 /**
  * Validates that a value's size is within the specified range. Works with
  * values that have a `size` property, such as `Set` or `Map`.
@@ -9183,28 +8294,6 @@ export function isSizeBetween(minimum: number, maximum: number, annotations?: An
     }
   )
 }
-
-/**
- * Reviver for persisted `isSizeBetween` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isSizeBetween}.
- *
- * @see {@link isSizeBetween} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isSizeBetweenReviver: SchemaRepresentation.FilterReviver<{
-  readonly minimum: number
-  readonly maximum: number
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isSizeBetween",
-  Struct({ minimum: Natural, maximum: Natural }),
-  ({ annotations, payload }) => isSizeBetween(payload.minimum, payload.maximum, annotations)
-)
-
 /**
  * Validates that an object contains at least the specified number of
  * properties. This includes both string and symbol keys when counting
@@ -9214,7 +8303,10 @@ export const isSizeBetweenReviver: SchemaRepresentation.FilterReviver<{
  *
  * JSON Schema:
  *
- * This check corresponds to the `minProperties` constraint in JSON Schema.
+ * This check corresponds to `minProperties` in JSON Schema. Effect applies the
+ * check to the decoded object, while JSON Schema applies it to the original
+ * input. Defaults and property transformations can therefore produce different
+ * results.
  *
  * Arbitrary:
  *
@@ -9243,27 +8335,6 @@ export function isMinProperties(minProperties: number, annotations?: Annotations
     }
   )
 }
-
-/**
- * Reviver for persisted `isMinProperties` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isMinProperties}.
- *
- * @see {@link isMinProperties} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isMinPropertiesReviver: SchemaRepresentation.FilterReviver<{
-  readonly minProperties: number
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isMinProperties",
-  Struct({ minProperties: Natural }),
-  ({ annotations, payload }) => isMinProperties(payload.minProperties, annotations)
-)
-
 /**
  * Validates that an object contains at most the specified number of properties.
  * This includes both string and symbol keys when counting properties.
@@ -9272,7 +8343,10 @@ export const isMinPropertiesReviver: SchemaRepresentation.FilterReviver<{
  *
  * JSON Schema:
  *
- * This check corresponds to the `maxProperties` constraint in JSON Schema.
+ * This check corresponds to `maxProperties` in JSON Schema. Effect applies the
+ * check to the decoded object, while JSON Schema applies it to the original
+ * input. Excess-property handling and property transformations can therefore
+ * produce different results.
  *
  * Arbitrary:
  *
@@ -9301,27 +8375,6 @@ export function isMaxProperties(maxProperties: number, annotations?: Annotations
     }
   )
 }
-
-/**
- * Reviver for persisted `isMaxProperties` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isMaxProperties}.
- *
- * @see {@link isMaxProperties} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isMaxPropertiesReviver: SchemaRepresentation.FilterReviver<{
-  readonly maxProperties: number
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isMaxProperties",
-  Struct({ maxProperties: Natural }),
-  ({ annotations, payload }) => isMaxProperties(payload.maxProperties, annotations)
-)
-
 /**
  * Validates that an object contains between `minimum` and `maximum` properties (inclusive).
  * This includes both string and symbol keys when counting properties.
@@ -9330,8 +8383,10 @@ export const isMaxPropertiesReviver: SchemaRepresentation.FilterReviver<{
  *
  * JSON Schema:
  *
- * This check corresponds to `minProperties` and `maxProperties`
- * constraints in JSON Schema.
+ * This check corresponds to `minProperties` and `maxProperties` in JSON
+ * Schema. Effect applies the check to the decoded object, while JSON Schema
+ * applies it to the original input. Defaults, excess-property handling, and
+ * property transformations can therefore produce different results.
  *
  * Arbitrary:
  *
@@ -9365,28 +8420,6 @@ export function isPropertiesLengthBetween(minimum: number, maximum: number, anno
     }
   )
 }
-
-/**
- * Reviver for persisted `isPropertiesLengthBetween` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isPropertiesLengthBetween}.
- *
- * @see {@link isPropertiesLengthBetween} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isPropertiesLengthBetweenReviver: SchemaRepresentation.FilterReviver<{
-  readonly minimum: number
-  readonly maximum: number
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isPropertiesLengthBetween",
-  Struct({ minimum: Natural, maximum: Natural }),
-  ({ annotations, payload }) => isPropertiesLengthBetween(payload.minimum, payload.maximum, annotations)
-)
-
 /**
  * Validates that every own property key of an object satisfies the encoded side
  * of the provided key schema.
@@ -9397,8 +8430,10 @@ export const isPropertiesLengthBetweenReviver: SchemaRepresentation.FilterRevive
  * string property names.
  *
  * JSON Schema:
- * For string property names, this corresponds to the `propertyNames` constraint
- * in JSON Schema.
+ * This check corresponds to `propertyNames` in JSON Schema. Effect checks the
+ * decoded object's keys, including symbols, while JSON Schema checks the string
+ * names in the original input. Property transformations and excess-property
+ * handling can therefore produce different results.
  *
  * @category validation
  * @since 4.0.0
@@ -9436,25 +8471,6 @@ export function isPropertyNames(keySchema: Constraint, annotations?: Annotations
     }
   )
 }
-
-/**
- * Reviver for persisted `isPropertyNames` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isPropertyNames}.
- *
- * @see {@link isPropertyNames} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isPropertyNamesReviver: SchemaRepresentation.FilterReviver<null> = InternalSchema.makeFilterReviver(
-  "effect/schema/isPropertyNames",
-  Null,
-  ({ annotations, schemas }) => isPropertyNames(schemas[0], annotations)
-)
-
 /**
  * Validates that all items in an array are unique according to Effect equality.
  *
@@ -9488,25 +8504,6 @@ export function isUnique<T>(annotations?: Annotations.Filter) {
     }
   )
 }
-
-/**
- * Reviver for persisted `isUnique` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isUnique}.
- *
- * @see {@link isUnique} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isUniqueReviver: SchemaRepresentation.FilterReviver<null> = InternalSchema.makeFilterReviver(
-  "effect/schema/isUnique",
-  Null,
-  ({ annotations }) => isUnique(annotations)
-)
-
 /**
  * Validates that all first elements in an array of key-value tuples are unique according to Effect equality.
  *
@@ -9539,28 +8536,6 @@ export function isUniqueKey<Key, Value>(annotations?: Annotations.Filter) {
     }
   )
 }
-
-/**
- * Reviver for persisted `isUniqueKey` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isUniqueKey}.
- *
- * @see {@link isUniqueKey} for creating the corresponding check
- * @category validation
- * @since 4.0.0
- */
-export const isUniqueKeyReviver: SchemaRepresentation.FilterReviver<null> = InternalSchema.makeFilterReviver(
-  "effect/schema/isUniqueKey",
-  Null,
-  ({ annotations }) => isUniqueKey(annotations)
-)
-
-// -----------------------------------------------------------------------------
-// Built-in Schemas
-// -----------------------------------------------------------------------------
-
 /**
  * Type-level representation of {@link NonEmptyString}.
  *
@@ -9570,7 +8545,6 @@ export const isUniqueKeyReviver: SchemaRepresentation.FilterReviver<null> = Inte
 export interface NonEmptyString extends String {
   readonly "Rebuild": NonEmptyString
 }
-
 /**
  * Schema for non-empty strings. Validates that a string has at least one
  * character.
@@ -9579,7 +8553,6 @@ export interface NonEmptyString extends String {
  * @since 3.10.0
  */
 export const NonEmptyString: NonEmptyString = String.check(isNonEmpty())
-
 /**
  * Type-level representation of {@link Char}.
  *
@@ -9589,7 +8562,6 @@ export const NonEmptyString: NonEmptyString = String.check(isNonEmpty())
 export interface Char extends String {
   readonly "Rebuild": Char
 }
-
 /**
  * Schema for strings whose JavaScript `length` is exactly `1`.
  *
@@ -9610,4553 +8582,5761 @@ export interface Char extends String {
  * @since 3.10.0
  */
 export const Char: Char = String.check(isLengthBetween(1, 1))
-
 /**
- * Type-level representation returned by {@link Option}.
+ * Type-level representation of {@link ErrorInstance}.
  *
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
-export interface Option<A extends Constraint> extends
-  declareConstructor<
-    Option_.Option<A["Type"]>,
-    Option_.Option<A["Encoded"]>,
-    readonly [A],
-    OptionIso<A>
-  >
-{
-  readonly "Rebuild": Option<A>
-  readonly value: A
+export interface ErrorInstance extends instanceOf<globalThis.Error> {
+  readonly "Rebuild": ErrorInstance
 }
-
 /**
- * Iso representation used for `Option` schemas.
- *
- * **Details**
- *
- * `None` is represented as `{ _tag: "None" }`, while `Some` is represented as
- * `{ _tag: "Some", value }` using the wrapped schema's `Iso` type.
+ * Options for {@link ErrorInstance} and {@link Defect}.
  *
- * @category utility types
+ * @category options
  * @since 4.0.0
  */
-export type OptionIso<A extends Constraint> =
-  | { readonly _tag: "None" }
-  | { readonly _tag: "Some"; readonly value: A["Iso"] }
+export interface ErrorOptions {
+  /**
+   * Includes string stack traces in encoded `Error` values when set to `true`.
+   *
+   * @default false
+   */
+  readonly includeStack?: boolean | undefined
+  /**
+   * Excludes `Error.cause` values from encoded `Error` values when set to
+   * `true`.
+   *
+   * @default false
+   */
+  readonly excludeCause?: boolean | undefined
+}
 
-/**
- * Schema for `Option<A>` values.
- *
- * @category schemas
- * @since 3.10.0
- */
-export function Option<A extends Constraint>(value: A): Option<A> {
-  const schema = declareConstructor<
-    Option_.Option<A["Type"]>,
-    Option_.Option<A["Encoded"]>,
-    OptionIso<A>
-  >()(
-    [value],
-    ([value]) => (input, ast, options) => {
-      if (Option_.isOption(input)) {
-        if (Option_.isNone(input)) {
-          return Effect.succeedNone
-        }
-        return Effect.mapBothEager(
-          SchemaParser.decodeUnknownEffect(value)(input.value, options),
-          {
-            onSuccess: Option_.some,
-            onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "value", issue, input, options)
-          }
-        )
-      }
-      return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
-    },
-    {
-      representation: {
-        id: "effect/schema/Option",
-        payload: null
-      },
-      toCode: ({ typeParameters }) => ({
-        runtime: `Schema.Option(${typeParameters[0].runtime})`,
-        Type: `Option.Option<${typeParameters[0].Type}>`,
-        importDeclarations: [`import * as Option from "effect/Option"`]
-      }),
-      expected: "Option",
-      toCodec: ([value]) =>
-        link<Option_.Option<A["Encoded"]>>()(
-          Union([
-            Struct({ _tag: Literal("Some"), value }),
-            Struct({ _tag: Literal("None") })
-          ]),
-          SchemaTransformation.transform({
-            decode: (e) => e._tag === "None" ? Option_.none() : Option_.some(e.value),
-            encode: (o) => (Option_.isSome(o) ? { _tag: "Some", value: o.value } as const : { _tag: "None" } as const)
-          })
-        )
-    }
-  )
-  return make(schema.ast, { value })
+type NormalizedErrorOptions =
+  | { readonly includeStack: true }
+  | { readonly excludeCause: true }
+  | { readonly includeStack: true; readonly excludeCause: true }
+
+type ErrorOptionsKey = 0 | 1 | 2 | 3
+
+const getErrorOptionsKey = (options?: ErrorOptions): ErrorOptionsKey =>
+  ((options?.includeStack === true ? 1 : 0) |
+    (options?.excludeCause === true ? 2 : 0)) as ErrorOptionsKey
+
+const getErrorOptions = (key: ErrorOptionsKey): NormalizedErrorOptions | undefined => {
+  switch (key) {
+    case 0:
+      return undefined
+    case 1:
+      return { includeStack: true }
+    case 2:
+      return { excludeCause: true }
+    case 3:
+      return { includeStack: true, excludeCause: true }
+  }
 }
 
+const errorSchemaCache: Array<ErrorInstance | undefined> = []
 /**
- * Reviver for persisted `Option` declarations.
+ * Schema for JavaScript `Error` objects.
  *
- * **When to use**
+ * **Details**
  *
- * Use when reconstructing documents that may contain schemas created by {@link Option}.
+ * Default JSON serializer:
  *
- * @see {@link Option} for creating the corresponding schema
+ * Encodes an `Error` as an object with `message`, optional `name`, and optional
+ * `cause` properties, and decodes that object back into an `Error`. Stack
+ * traces are omitted by default for security. Pass `{ includeStack: true }` to
+ * include stack traces, or `{ excludeCause: true }` to omit causes.
  *
  * @category schemas
  * @since 4.0.0
  */
-export const OptionReviver = InternalSchema.makeDeclarationReviver(
-  "effect/schema/Option",
-  Null,
-  ({ annotations, typeParameters }) => {
-    const schema = Option(typeParameters[0])
-    return annotations === undefined ? schema : schema.annotate(annotations)
+export function ErrorInstance(options?: ErrorOptions): ErrorInstance {
+  const key = getErrorOptionsKey(options)
+  const cached = errorSchemaCache[key]
+  if (cached !== undefined) {
+    return cached
   }
-)
-
-/**
- * Type-level representation returned by {@link OptionFromNullOr}.
- *
- * @category models
- * @since 3.10.0
- */
-export interface OptionFromNullOr<S extends Constraint> extends decodeTo<Option<toType<S>>, NullOr<S>> {
-  readonly "Rebuild": OptionFromNullOr<S>
-}
-
-/**
- * Decodes a nullable, required value `T` to a required `Option<T>` value.
- *
- * **Details**
- *
- * Decoding maps `null` to `None` and all other values to `Some`. Encoding maps
- * `None` to `null` and maps `Some` to its value.
- *
- * @category schemas
- * @since 3.10.0
- */
-export function OptionFromNullOr<S extends Constraint>(schema: S): OptionFromNullOr<S> {
-  return NullOr(schema).pipe(decodeTo(
-    Option(toType(schema)),
-    SchemaTransformation.optionFromNullOr()
-  ))
+  const normalizedOptions = getErrorOptions(key)
+  const schema = instanceOf(globalThis.Error, {
+    representation: {
+      id: "effect/schema/Error",
+      payload: normalizedOptions ?? null
+    },
+    toCode: () => ({
+      runtime: normalizedOptions !== undefined
+        ? `Schema.ErrorInstance(${format(normalizedOptions)})`
+        : `Schema.ErrorInstance()`,
+      Type: `globalThis.Error`
+    }),
+    expected: "Error",
+    toCodecJson: () => link<globalThis.Error>()(JsonError, SchemaTransformation.errorFromJsonError(normalizedOptions))
+  })
+  errorSchemaCache[key] = schema
+  return schema
 }
-
 /**
- * Type-level representation returned by {@link OptionFromUndefinedOr}.
+ * Type-level representation of {@link Defect}.
  *
  * @category models
  * @since 3.10.0
  */
-export interface OptionFromUndefinedOr<S extends Constraint> extends decodeTo<Option<toType<S>>, UndefinedOr<S>> {
-  readonly "Rebuild": OptionFromUndefinedOr<S>
+export interface Defect extends decodeTo<Unknown, typeof Json> {
+  readonly "Rebuild": Defect
 }
 
+const defectSchemaCache: Array<Defect | undefined> = []
 /**
- * Decodes a required value that may be `undefined` to a required `Option<T>`
- * value.
+ * Schema for unexpected defect values represented as `unknown` with a JSON
+ * encoded form.
+ *
+ * **When to use**
+ *
+ * Use when you need a schema for `Cause` defects or other unexpected failures
+ * whose runtime value may be any value.
  *
  * **Details**
  *
- * Decoding maps `undefined` to `None` and all other values to `Some`. Encoding
- * maps `None` to `undefined` and maps `Some` to its value.
+ * The encoded side is {@link Json}. During decoding, JSON objects with a string
+ * `message` property are decoded into JavaScript `Error` values, preserving a
+ * non-default `name` and any string `stack`. Other JSON values decode
+ * unchanged.
  *
- * @category schemas
- * @since 3.10.0
- */
-export function OptionFromUndefinedOr<S extends Constraint>(schema: S): OptionFromUndefinedOr<S> {
-  return UndefinedOr(schema).pipe(decodeTo(
-    Option(toType(schema)),
-    SchemaTransformation.optionFromUndefinedOr()
-  ))
-}
-
-/**
- * Type-level representation returned by {@link OptionFromNullishOr}.
+ * During encoding, JavaScript `Error` values encode to JSON objects with
+ * `name`, `message`, and optional `cause` properties. Pass
+ * `{ includeStack: true }` to include string stack traces in encoded `Error`
+ * defects, or `{ excludeCause: true }` to omit causes. Other values are
+ * serialized through Effect's JSON formatter and then parsed back into JSON
+ * when possible.
  *
- * @category models
- * @since 3.10.0
- */
-export interface OptionFromNullishOr<S extends Constraint> extends decodeTo<Option<toType<S>>, NullishOr<S>> {
-  readonly "Rebuild": OptionFromNullishOr<S>
-}
-
-/**
- * Decodes a nullish value `T` to a required `Option<T>` value.
+ * **Gotchas**
  *
- * **Details**
+ * This schema is for carrying defects across JSON boundaries, not for
+ * preserving every JavaScript value exactly. Some values cannot round-trip
+ * unchanged:
  *
- * Decoding maps `null` and `undefined` to `None` and all other values to
- * `Some`. Encoding maps `None` to `null` or `undefined` depending on
- * `options.onNoneEncoding`, which defaults to `undefined`, and maps `Some` to
- * its value.
+ * - A non-`Error` object such as `{ message: "boom" }` encodes as an
+ *   error-shaped JSON object and decodes back as an `Error`.
+ * - JSON serialization normalizes unsupported values. For example,
+ *   `undefined` array elements encode as `null`, unsupported object properties
+ *   are omitted, and circular references are dropped.
+ * - Values that cannot be represented as JSON fall back to Effect's formatted
+ *   string representation.
  *
+ * @see {@link ErrorInstance} for a schema that only accepts JavaScript `Error` values.
  * @category schemas
- * @since 3.10.0
+ * @since 4.0.0
  */
-export function OptionFromNullishOr<S extends Constraint>(
-  schema: S,
-  options?: {
-    onNoneEncoding: null | undefined
+export function Defect(options?: ErrorOptions): Defect {
+  const key = getErrorOptionsKey(options)
+  const cached = defectSchemaCache[key]
+  if (cached !== undefined) {
+    return cached
   }
-): OptionFromNullishOr<S> {
-  return NullishOr(schema).pipe(decodeTo(
-    Option(toType(schema)),
-    SchemaTransformation.optionFromNullishOr(options)
-  ))
+  const schema = Json.pipe(decodeTo(Unknown, SchemaTransformation.defectFromJson(getErrorOptions(key))))
+  defectSchemaCache[key] = schema
+  return schema
 }
-
 /**
- * Type-level representation returned by {@link OptionFromOptionalKey}.
+ * Type-level representation returned by {@link ReadonlyMap}.
  *
  * @category models
  * @since 4.0.0
  */
-export interface OptionFromOptionalKey<S extends Constraint> extends decodeTo<Option<toType<S>>, optionalKey<S>> {
-  readonly "Rebuild": OptionFromOptionalKey<S>
+export interface $ReadonlyMap<Key extends Constraint, Value extends Constraint> extends
+  declareConstructor<
+    globalThis.ReadonlyMap<Key["Type"], Value["Type"]>,
+    globalThis.ReadonlyMap<Key["Encoded"], Value["Encoded"]>,
+    readonly [Key, Value],
+    ReadonlyMapIso<Key, Value>
+  >
+{
+  readonly "Rebuild": $ReadonlyMap<Key, Value>
+  readonly key: Key
+  readonly value: Value
 }
-
 /**
- * Decodes an optional value `A` to a required `Option<A>` value.
- *
- * **Details**
+ * Iso representation used for `ReadonlyMap` schemas: an array of readonly
+ * `[key, value]` tuples using each entry schema's `Iso` type.
  *
- * Decoding maps a missing key to `None` and a present value to `Some`.
- * Encoding maps `None` to a missing key and maps `Some` to its value.
+ * @category utility types
+ * @since 4.0.0
+ */
+export type ReadonlyMapIso<Key extends Constraint, Value extends Constraint> = ReadonlyArray<
+  readonly [Key["Iso"], Value["Iso"]]
+>
+/**
+ * Schema for readonly maps whose keys and values conform to the provided
+ * schemas.
  *
  * @category schemas
- * @since 4.0.0
+ * @since 3.10.0
  */
-export function OptionFromOptionalKey<S extends Constraint>(schema: S): OptionFromOptionalKey<S> {
-  return optionalKey(schema).pipe(decodeTo(
-    Option(toType(schema)),
-    SchemaTransformation.optionFromOptionalKey()
-  ))
+export function ReadonlyMap<Key extends Constraint, Value extends Constraint>(
+  key: Key,
+  value: Value
+): $ReadonlyMap<Key, Value> {
+  const schema = declareConstructor<
+    globalThis.ReadonlyMap<Key["Type"], Value["Type"]>,
+    globalThis.ReadonlyMap<Key["Encoded"], Value["Encoded"]>,
+    ReadonlyMapIso<Key, Value>
+  >()(
+    [key, value],
+    ([key, value]) => {
+      const array = ArraySchema(Tuple([key, value]))
+      return (input, ast, options) => {
+        if (input instanceof globalThis.Map) {
+          return Effect.mapBothEager(
+            SchemaParser.decodeUnknownEffect(array)([...input], options),
+            {
+              onSuccess: (array: ReadonlyArray<readonly [Key["Type"], Value["Type"]]>) => new globalThis.Map(array),
+              onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "entries", issue, input, options)
+            }
+          )
+        }
+        return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
+      }
+    },
+    {
+      representation: {
+        id: "effect/schema/ReadonlyMap",
+        payload: null
+      },
+      toCode: ({ typeParameters }) => ({
+        runtime: `Schema.ReadonlyMap(${typeParameters[0].runtime}, ${typeParameters[1].runtime})`,
+        Type: `globalThis.ReadonlyMap<${typeParameters[0].Type}, ${typeParameters[1].Type}>`
+      }),
+      expected: "ReadonlyMap",
+      toCodec: ([key, value]) =>
+        link<globalThis.Map<Key["Encoded"], Value["Encoded"]>>()(
+          ArraySchema(Tuple([key, value])),
+          SchemaTransformation.transform({
+            decode: (entries) => new globalThis.Map(entries),
+            encode: (map) => [...map.entries()]
+          })
+        )
+    }
+  )
+  return make(schema.ast, { key, value })
 }
-
 /**
- * Type-level representation returned by {@link OptionFromOptional}.
+ * Type-level representation returned by {@link ReadonlySet}.
  *
  * @category models
  * @since 4.0.0
  */
-export interface OptionFromOptional<S extends Constraint> extends decodeTo<Option<toType<S>>, optional<S>> {
-  readonly "Rebuild": OptionFromOptional<S>
+export interface $ReadonlySet<Value extends Constraint> extends
+  declareConstructor<
+    globalThis.ReadonlySet<Value["Type"]>,
+    globalThis.ReadonlySet<Value["Encoded"]>,
+    readonly [Value],
+    ReadonlySetIso<Value>
+  >
+{
+  readonly "Rebuild": $ReadonlySet<Value>
+  readonly value: Value
 }
-
 /**
- * Decodes an optional or `undefined` value `A` to a required `Option<A>`
- * value.
- *
- * **Details**
- *
- * Decoding maps a missing key or a present `undefined` value to `None`, and
- * maps all other values to `Some`. Encoding maps `None` to a missing key and
- * maps `Some` to its value.
+ * Iso representation used for `ReadonlySet` schemas: an array of element values
+ * using the element schema's `Iso` type.
  *
- * @category schemas
+ * @category utility types
  * @since 4.0.0
  */
-export function OptionFromOptional<S extends Constraint>(schema: S): OptionFromOptional<S> {
-  return optional(schema).pipe(decodeTo(
-    Option(toType(schema)),
-    SchemaTransformation.optionFromOptional<any>()
-  ))
-}
-
+export type ReadonlySetIso<Value extends Constraint> = ReadonlyArray<Value["Iso"]>
 /**
- * Type-level representation returned by {@link OptionFromOptionalNullOr}.
+ * Schema for readonly sets whose values conform to the provided element schema.
  *
- * @category models
- * @since 4.0.0
+ * @category schemas
+ * @since 3.10.0
  */
-export interface OptionFromOptionalNullOr<S extends Constraint>
-  extends decodeTo<Option<toType<S>>, optional<NullOr<S>>>
-{
-  readonly "Rebuild": OptionFromOptionalNullOr<S>
+export function ReadonlySet<Value extends Constraint>(value: Value): $ReadonlySet<Value> {
+  const schema = declareConstructor<
+    globalThis.ReadonlySet<Value["Type"]>,
+    globalThis.ReadonlySet<Value["Encoded"]>,
+    ReadonlySetIso<Value>
+  >()(
+    [value],
+    ([value]) => {
+      const array = ArraySchema(value)
+      return (input, ast, options) => {
+        if (input instanceof globalThis.Set) {
+          return Effect.mapBothEager(
+            SchemaParser.decodeUnknownEffect(array)([...input], options),
+            {
+              onSuccess: (array: ReadonlyArray<Value["Type"]>) => new globalThis.Set(array),
+              onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "values", issue, input, options)
+            }
+          )
+        }
+        return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
+      }
+    },
+    {
+      representation: {
+        id: "effect/schema/ReadonlySet",
+        payload: null
+      },
+      toCode: ({ typeParameters }) => ({
+        runtime: `Schema.ReadonlySet(${typeParameters[0].runtime})`,
+        Type: `globalThis.ReadonlySet<${typeParameters[0].Type}>`
+      }),
+      expected: "ReadonlySet",
+      toCodec: ([value]) =>
+        link<globalThis.Set<Value["Encoded"]>>()(
+          ArraySchema(value),
+          SchemaTransformation.transform({
+            decode: (values) => new globalThis.Set(values),
+            encode: (set) => [...set.values()]
+          })
+        )
+    }
+  )
+  return make(schema.ast, { value })
 }
-
 /**
- * Decodes an optional or `null` or `undefined` value `A` to a required `Option<A>`
- * value.
+ * Type-level representation of {@link RegExp}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface RegExp extends instanceOf<globalThis.RegExp> {
+  readonly "Rebuild": RegExp
+}
+/**
+ * Schema for JavaScript `RegExp` objects.
  *
  * **Details**
  *
- * Decoding maps a missing key, `undefined`, or `null` to `None`, and maps all
- * other values to `Some`. Encoding maps `Some` to its value. `None` is encoded
- * according to `options.onNoneEncoding`: `"omit"` encodes a missing key,
- * `null` encodes `null`, and `undefined` encodes `undefined`.
+ * The default JSON serializer encodes a `RegExp` as `{ source, flags }`.
  *
  * @category schemas
  * @since 4.0.0
  */
-export function OptionFromOptionalNullOr<S extends Constraint>(
-  schema: S,
-  options?: {
-    readonly onNoneEncoding: "omit" | null | undefined
+export const RegExp: RegExp = instanceOf(
+  globalThis.RegExp,
+  {
+    representation: {
+      id: "effect/schema/RegExp",
+      payload: null
+    },
+    toCode: () => ({
+      runtime: `Schema.RegExp`,
+      Type: `globalThis.RegExp`
+    }),
+    expected: "RegExp",
+    toCodecJson: () =>
+      link<globalThis.RegExp>()(
+        Struct({
+          source: String,
+          flags: String
+        }),
+        SchemaTransformation.transformEffect({
+          decode: (e, options) =>
+            Effect.try({
+              try: () => new globalThis.RegExp(e.source, e.flags),
+              catch: () =>
+                new SchemaIssue.InvalidValue(
+                  { expected: "valid RegExp source and flags" },
+                  e,
+                  options
+                )
+            }),
+          encode: (regExp) =>
+            Effect.succeed({
+              source: regExp.source,
+              flags: regExp.flags
+            })
+        })
+      )
   }
-): OptionFromOptionalNullOr<S> {
-  const onNoneEncoding = options === undefined ? "omit" : options.onNoneEncoding
-  const noneValue = onNoneEncoding === null
-    ? null as S["Type"] | null | undefined
-    : undefined as S["Type"] | null | undefined
-  return optional(NullOr(schema)).pipe(decodeTo(
-    Option(toType(schema)),
-    SchemaTransformation.transformOptional<Option_.Option<S["Type"]>, S["Type"] | null | undefined>({
-      decode: (oe) => oe.pipe(Option_.filter(Predicate.isNotNullish), Option_.some),
-      encode: onNoneEncoding === "omit"
-        ? Option_.flatten
-        : (ot) => Option_.some(Option_.getOrElse(Option_.flatten(ot), () => noneValue))
-    })
-  ))
-}
-
+)
 /**
- * Type-level representation returned by {@link Result}.
+ * Type-level representation of {@link URL}.
  *
  * @category models
  * @since 4.0.0
  */
-export interface Result<A extends Constraint, E extends Constraint> extends
-  declareConstructor<
-    Result_.Result<A["Type"], E["Type"]>,
-    Result_.Result<A["Encoded"], E["Encoded"]>,
-    readonly [A, E],
-    ResultIso<A, E>
-  >
-{
-  readonly "Rebuild": Result<A, E>
-  readonly success: A
-  readonly failure: E
+export interface URL extends instanceOf<globalThis.URL> {
+  readonly "Rebuild": URL
 }
 
+const URLString = String.annotate({ expected: "a string that will be decoded as a URL" })
 /**
- * Iso representation used for `Result` schemas.
+ * Schema for JavaScript `URL` objects.
  *
  * **Details**
  *
- * Successful results are represented as `{ _tag: "Success", success }`, while
- * failed results are represented as `{ _tag: "Failure", failure }`.
+ * Default JSON serializer:
  *
- * @category utility types
+ * - encodes `URL` as a `string`
+ *
+ * @category schemas
  * @since 4.0.0
  */
-export type ResultIso<A extends Constraint, E extends Constraint> =
-  | { readonly _tag: "Success"; readonly success: A["Iso"] }
-  | { readonly _tag: "Failure"; readonly failure: E["Iso"] }
-
+export const URL: URL = instanceOf(
+  globalThis.URL,
+  {
+    representation: {
+      id: "effect/schema/URL",
+      payload: null
+    },
+    toCode: () => ({
+      runtime: `Schema.URL`,
+      Type: `globalThis.URL`
+    }),
+    expected: "URL",
+    toCodecJson: () =>
+      link<globalThis.URL>()(
+        URLString,
+        SchemaTransformation.urlFromString
+      )
+  }
+)
 /**
- * Schema for `Result<A, E>` values.
+ * Type-level representation of {@link URLFromString}.
  *
- * @category schemas
+ * @category models
  * @since 4.0.0
  */
-export function Result<A extends Constraint, E extends Constraint>(
-  success: A,
-  failure: E
-): Result<A, E> {
-  const schema = declareConstructor<
-    Result_.Result<A["Type"], E["Type"]>,
-    Result_.Result<A["Encoded"], E["Encoded"]>,
-    ResultIso<A, E>
-  >()(
-    [success, failure],
-    ([success, failure]) => (input, ast, options) => {
-      if (!Result_.isResult(input)) {
-        return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
-      }
-      switch (input._tag) {
-        case "Success":
-          return Effect.mapBothEager(SchemaParser.decodeEffect(success)(input.success, options), {
-            onSuccess: Result_.succeed,
-            onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "success", issue, input, options)
-          })
-        case "Failure":
-          return Effect.mapBothEager(SchemaParser.decodeEffect(failure)(input.failure, options), {
-            onSuccess: Result_.fail,
-            onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "failure", issue, input, options)
-          })
-      }
-    },
-    {
-      representation: {
-        id: "effect/schema/Result",
-        payload: null
-      },
-      toCode: ({ typeParameters }) => ({
-        runtime: `Schema.Result(${typeParameters[0].runtime}, ${typeParameters[1].runtime})`,
-        Type: `Result.Result<${typeParameters[0].Type}, ${typeParameters[1].Type}>`,
-        importDeclarations: [`import * as Result from "effect/Result"`]
-      }),
-      expected: "Result",
-      toCodec: ([success, failure]) =>
-        link<Result_.Result<A["Encoded"], E["Encoded"]>>()(
-          Union([
-            Struct({ _tag: Literal("Success"), success }),
-            Struct({ _tag: Literal("Failure"), failure })
-          ]),
-          SchemaTransformation.transform({
-            decode: (e): Result_.Result<A["Encoded"], E["Encoded"]> =>
-              e._tag === "Success" ? Result_.succeed(e.success) : Result_.fail(e.failure),
-            encode: (r) =>
-              Result_.isSuccess(r)
-                ? { _tag: "Success", success: r.success } as const
-                : { _tag: "Failure", failure: r.failure } as const
-          })
-        )
-    }
-  )
-  return make(schema.ast, { success, failure })
+export interface URLFromString extends decodeTo<URL, String> {
+  readonly "Rebuild": URLFromString
 }
-
 /**
- * Reviver for persisted {@link Result} declarations.
+ * Schema that decodes a `string` into a `URL`.
  *
- * **When to use**
+ * **Details**
  *
- * Use when reconstructing documents that may contain schemas created by {@link Result}.
+ * Decoding:
+ * - A **valid** URL `string` is decoded as a `URL`
  *
- * @see {@link Result} for creating the corresponding schema
+ * Encoding:
+ * - A `URL` is encoded as a `string`
  *
  * @category schemas
  * @since 4.0.0
  */
-export const ResultReviver = InternalSchema.makeDeclarationReviver(
-  "effect/schema/Result",
-  Null,
-  ({ annotations, typeParameters }) => {
-    const schema = Result(typeParameters[0], typeParameters[1])
-    return annotations === undefined ? schema : schema.annotate(annotations)
-  }
-)
-
+export const URLFromString: URLFromString = URLString.pipe(decodeTo(URL, SchemaTransformation.urlFromString))
 /**
- * Type-level representation returned by {@link Redacted}.
+ * Type-level representation of {@link Date}.
  *
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
-export interface Redacted<S extends Constraint> extends
-  declareConstructor<
-    Redacted_.Redacted<S["Type"]>,
-    Redacted_.Redacted<S["Encoded"]>,
-    readonly [S]
-  >
-{
-  readonly "Rebuild": Redacted<S>
-  readonly value: S
-}
-
-type RedactedRepresentationOptions = {
-  readonly label?: string | undefined
-  readonly disallowJsonEncode?: true | undefined
+export interface Date extends declare<globalThis.Date> {
+  readonly "Rebuild": Date
 }
 
-type NormalizedRedactedOptions =
-  | { readonly label: string }
-  | { readonly disallowJsonEncode: true }
-  | { readonly label: string; readonly disallowJsonEncode: true }
-
-type RedactedRepresentationPayload = RedactedRepresentationOptions | null
-
-const RedactedOptionsPayload = declare((input): input is RedactedRepresentationOptions => {
-  if (!Predicate.isObject(input)) {
-    return false
-  }
-  const keys = globalThis.Object.keys(input)
-  return keys.length > 0 && keys.every((key) => {
-    switch (key) {
-      case "label":
-        return typeof input[key] === "string"
-      case "disallowJsonEncode":
-        return input[key] === true
-      default:
-        return false
-    }
-  })
-})
-
-const RedactedRepresentationPayload: Decoder<RedactedRepresentationPayload> = Union([Null, RedactedOptionsPayload])
-
+const DateString = String.annotate({ expected: "a string that will be decoded as a Date" })
 /**
- * Schema for `Redacted` values, which hide their contents from inspection.
+ * Schema for valid JavaScript `Date` objects.
+ *
+ * **When to use**
+ *
+ * Use to validate in-memory values that must already be valid JavaScript date
+ * objects.
  *
  * **Details**
  *
- * Options:
+ * This schema accepts `Date` instances whose timestamp is not `NaN`. The
+ * default JSON serializer encodes dates as ISO 8601 strings.
  *
- * - `label`: When provided, the schema will behave as follows:
- *   - Values will be validated against the label in addition to the wrapped schema
- *   - The default JSON serializer will deserialize into a `Redacted` instance with the label
- *   - The arbitrary generator will produce a `Redacted` instance with the label
- *   - The formatter will return the label
- * - `disallowJsonEncode`: When set to `true`, when attempting to encode a `Redacted` instance
- *   into JSON, it will fail with an error. This is useful when the wrapped schema is
- *   sensitive and should not be exposed in JSON.
+ * **Example** (Defining a Date schema)
+ *
+ * ```ts import.meta.vitest
+ * import { Schema } from "effect"
+ *
+ * const date = Schema.decodeUnknownSync(Schema.Date)(new Date("2024-01-01"))
+ * date.toISOString() // => "2024-01-01T00:00:00.000Z"
+ * ```
+ *
+ * @see {@link DateFromString} for decoding strings into Date instances
+ * @see {@link DateFromMillis} for decoding epoch milliseconds into Date instances
  *
- * @see {@link RedactedFromValue} for decoding raw values and wrapping them in `Redacted`.
  * @category schemas
- * @since 3.10.0
+ * @since 4.0.0
  */
-export function Redacted<S extends Constraint>(value: S, options?: {
-  readonly label?: string | undefined
-  readonly disallowJsonEncode?: boolean | undefined
-}): Redacted<S> {
-  const label = typeof options?.label === "string" ? options.label : undefined
-  const disallowJsonEncode = options?.disallowJsonEncode === true
-  const normalizedOptions: NormalizedRedactedOptions | undefined = label !== undefined
-    ? disallowJsonEncode ? { label, disallowJsonEncode: true } : { label }
-    : disallowJsonEncode
-    ? { disallowJsonEncode: true }
-    : undefined
-  const decodeLabel = label !== undefined
-    ? SchemaParser.decodeUnknownEffect(Literal(label))
-    : undefined
-  const schema = declareConstructor<Redacted_.Redacted<S["Type"]>, Redacted_.Redacted<S["Encoded"]>>()(
-    [value],
-    ([value]) => (input, ast, poptions) => {
-      if (Redacted_.isRedacted(input)) {
-        const label: Effect.Effect<void, SchemaIssue.Issue, never> = decodeLabel !== undefined
-          ? Effect.mapErrorEager(
-            decodeLabel(input.label, poptions),
-            (issue) => new SchemaIssue.Pointer(["label"], issue)
-          )
-          : Effect.void
-        return Effect.flatMapEager(
-          label,
-          () =>
-            Effect.mapBothEager(
-              SchemaParser.decodeUnknownEffect(value)(Redacted_.value(input), poptions),
-              {
-                onSuccess: () => input,
-                onFailure: (/** ignore the issue because of security reasons */) => {
-                  return new SchemaIssue.Composite(
-                    ast,
-                    [
-                      new SchemaIssue.Pointer(
-                        ["value"],
-                        new SchemaIssue.InvalidValue(undefined, input, poptions)
-                      )
-                    ],
-                    input,
-                    poptions
-                  )
-                }
-              }
-            )
-        )
-      }
-      return Effect.fail(new SchemaIssue.InvalidType(ast, input, poptions))
+export const Date: Date = declare(
+  (input): input is globalThis.Date => input instanceof globalThis.Date && !globalThis.Number.isNaN(input.getTime()),
+  {
+    representation: {
+      id: "effect/schema/Date",
+      payload: null
     },
-    {
-      representation: {
-        id: "effect/schema/Redacted",
-        payload: normalizedOptions ?? null
-      },
-      toCode: ({ typeParameters }) => ({
-        runtime: normalizedOptions !== undefined
-          ? `Schema.Redacted(${typeParameters[0].runtime}, ${format(normalizedOptions)})`
-          : `Schema.Redacted(${typeParameters[0].runtime})`,
-        Type: `Redacted.Redacted<${typeParameters[0].Type}>`,
-        importDeclarations: [`import * as Redacted from "effect/Redacted"`]
-      }),
-      expected: "Redacted",
-      toCodecJson: ([value]) =>
-        link<Redacted_.Redacted<S["Encoded"]>>()(
-          value,
-          {
-            decode: SchemaGetter.transform((e) => Redacted_.make(e, { label })),
-            encode: disallowJsonEncode ?
-              SchemaGetter.forbidden((oe) =>
-                "Cannot serialize Redacted" +
-                (Option_.isSome(oe) && typeof oe.value.label === "string" ? ` with label: "${oe.value.label}"` : "")
-              ) :
-              SchemaGetter.transform(Redacted_.value)
-          }
-        ),
-      toEquivalence: ([value]) => Redacted_.makeEquivalence(value)
-    }
-  )
-  return make(schema.ast, { value })
+    toCode: () => ({
+      runtime: `Schema.Date`,
+      Type: `globalThis.Date`
+    }),
+    expected: "a valid Date",
+    toCodecJson: () =>
+      link<globalThis.Date>()(
+        DateString,
+        SchemaTransformation.dateFromString
+      )
+  }
+)
+/**
+ * Type-level representation of {@link DateFromString}.
+ *
+ * @category models
+ * @since 3.10.0
+ */
+export interface DateFromString extends decodeTo<Date, String> {
+  readonly "Rebuild": DateFromString
 }
-
 /**
- * Reviver for persisted {@link Redacted} declarations.
+ * Schema that decodes a string into a JavaScript `Date`.
  *
  * **When to use**
  *
- * Use when reconstructing documents that may contain schemas created by {@link Redacted}.
+ * Use to model string-encoded dates that decode to JavaScript `Date` objects
+ * and encode back to strings.
+ *
+ * **Details**
+ *
+ * Decoding:
+ * The string is passed to JavaScript `Date` construction.
+ *
+ * Encoding:
+ * A `Date` is encoded as an ISO string.
+ *
+ * Invalid date strings fail decoding.
  *
- * @see {@link Redacted} for creating the corresponding schema
+ * @see {@link DateFromMillis} for decoding epoch milliseconds into Date instances
+ * @see {@link DateTimeUtcFromString} for decoding date-time strings into UTC values
+ * @see {@link Date} for accepting Date instances directly
  *
  * @category schemas
- * @since 4.0.0
+ * @since 3.10.0
  */
-export const RedactedReviver = InternalSchema.makeDeclarationReviver(
-  "effect/schema/Redacted",
-  RedactedRepresentationPayload,
-  ({ annotations, payload, typeParameters }) => {
-    const schema = Redacted(typeParameters[0], payload ?? undefined)
-    return annotations === undefined ? schema : schema.annotate(annotations)
-  }
-)
-
+export const DateFromString: DateFromString = DateString.pipe(decodeTo(Date, SchemaTransformation.dateFromString))
 /**
- * Type-level representation returned by {@link RedactedFromValue}.
+ * Type-level representation of {@link DateFromMillis}.
  *
  * @category models
  * @since 4.0.0
  */
-export interface RedactedFromValue<S extends Constraint> extends decodeTo<Redacted<toType<S>>, S> {
-  readonly "Rebuild": RedactedFromValue<S>
+export interface DateFromMillis extends decodeTo<Date, Int> {
+  readonly "Rebuild": DateFromMillis
 }
-
 /**
- * Decodes a value and wraps it in `Redacted<A>`. Unlike {@link Redacted} which
- * expects the input to already be a `Redacted` instance, this schema decodes
- * the raw value and wraps it.
+ * Schema that decodes epoch milliseconds into a JavaScript `Date`.
+ *
+ * **When to use**
+ *
+ * Use to model numeric millisecond timestamps that decode to JavaScript `Date`
+ * objects and encode back to numbers.
+ *
+ * **Details**
+ *
+ * Decoding:
+ * A safe integer number of milliseconds since the Unix epoch is decoded as a
+ * `Date`.
+ *
+ * Encoding:
+ * A `Date` is encoded as its millisecond timestamp.
+ *
+ * **Gotchas**
+ *
+ * JavaScript `Date` supports a narrower range than safe integers, so integers
+ * outside the supported `Date` range fail decoding.
+ *
+ * @see {@link DateFromString} for decoding string-encoded dates
+ * @see {@link DateTimeUtcFromMillis} for decoding epoch milliseconds into UTC values
  *
- * @see {@link Redacted} for schemas whose input is already a `Redacted` value.
  * @category schemas
  * @since 4.0.0
  */
-export function RedactedFromValue<S extends Constraint>(value: S, options?: {
-  readonly label?: string | undefined
-  readonly disallowEncode?: boolean | undefined
-}): RedactedFromValue<S> {
-  return decodeTo<Redacted<toType<S>>, S>(
-    Redacted(toType(value), {
-      label: options?.label,
-      disallowJsonEncode: options?.disallowEncode
-    }),
-    {
-      decode: SchemaGetter.transform((t) => Redacted_.make(t, { label: options?.label })),
-      encode: options?.disallowEncode ?
-        SchemaGetter.forbidden((oe) =>
-          "Cannot encode Redacted" +
-          (Option_.isSome(oe) && typeof oe.value.label === "string" ? ` with label: "${oe.value.label}"` : "")
-        ) :
-        SchemaGetter.transform(Redacted_.value)
-    }
-  )(value)
-}
-
+export const DateFromMillis: DateFromMillis = Int.pipe(
+  decodeTo(Date, SchemaTransformation.dateFromMillis)
+)
 /**
- * Type-level representation returned by {@link CauseReason}.
+ * Type-level representation returned by {@link fromJsonString}.
  *
  * @category models
  * @since 4.0.0
  */
-export interface CauseReason<E extends Constraint, D extends Constraint> extends
-  declareConstructor<
-    Cause_.Reason<E["Type"]>,
-    Cause_.Reason<E["Encoded"]>,
-    readonly [E, D],
-    CauseReasonIso<E, D>
-  >
-{
-  readonly "Rebuild": CauseReason<E, D>
-  readonly error: E
-  readonly defect: D
+export interface fromJsonString<S extends Constraint> extends decodeTo<S, String> {
+  readonly "Rebuild": fromJsonString<S>
 }
 
+const JsonString = String.annotate({
+  expected: "a string that will be decoded as JSON",
+  contentMediaType: "application/json"
+})
 /**
- * Iso representation used for `CauseReason` schemas.
+ * Returns a schema that decodes a JSON string and then decodes the parsed value
+ * using the given schema.
  *
  * **Details**
  *
- * Failures are represented with a `Fail` tag and encoded error, defects with a
- * `Die` tag and encoded defect, and interrupts with an optional `fiberId`.
+ * This is useful when working with JSON-encoded strings where the actual
+ * structure of the value is known and described by an existing schema.
  *
- * @category utility types
- * @since 4.0.0
- */
-export type CauseReasonIso<E extends Constraint, D extends Constraint> = {
-  readonly _tag: "Fail"
-  readonly error: E["Iso"]
-} | {
-  readonly _tag: "Die"
-  readonly error: D["Iso"]
-} | {
-  readonly _tag: "Interrupt"
-  readonly fiberId: number | undefined
+ * During decoding, the resulting schema first parses the input string as JSON,
+ * using `reviver` when provided, and then runs the provided schema on the
+ * parsed result. During encoding, it first encodes with the provided schema and
+ * then passes the result to `JSON.stringify` with the optional `replacer` and
+ * `space`.
+ *
+ * **Example** (Formatting encoded JSON)
+ *
+ * ```ts import.meta.vitest
+ * import { Schema } from "effect"
+ *
+ * const schema = Schema.Struct({ a: Schema.Number })
+ * const schemaFromJsonString = Schema.fromJsonString(schema, { space: 2 })
+ *
+ * Schema.encodeSync(schemaFromJsonString)({ a: 1 }) // => "{\n  \"a\": 1\n}"
+ * ```
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export function fromJsonString<S extends Constraint>(
+  schema: S,
+  options?: {
+    readonly reviver?: Parameters<typeof JSON.parse>[1] | undefined
+    readonly replacer?: SchemaGetter.JsonReplacer | undefined
+    readonly space?: Parameters<typeof JSON.stringify>[2] | undefined
+  }
+): fromJsonString<S> {
+  return JsonString.pipe(decodeTo(schema, SchemaTransformation.fromJsonString(options)))
 }
-
+/** @internal */
+export const UnknownFromJsonString: fromJsonString<Unknown> = fromJsonString(Unknown)
 /**
- * Creates a schema for `Cause.Reason` values using separate schemas for typed
- * failures and unexpected defects.
- *
- * **When to use**
+ * Type-level representation of {@link File}.
  *
- * Use when serializing or decoding individual cause reasons separately from a
- * full failure cause, with distinct schemas for typed errors and defects.
+ * @category models
+ * @since 4.0.0
+ */
+export interface File extends instanceOf<globalThis.File> {
+  readonly "Rebuild": File
+}
+/**
+ * Schema for JavaScript `File` objects.
  *
  * **Details**
  *
- * `Fail` reasons use the `error` schema, `Die` reasons use the `defect` schema,
- * and `Interrupt` reasons carry only an optional fiber id.
- *
- * @see {@link Cause} for constructing schemas for full Cause values
- * @see {@link CauseReasonIso} for the ISO shape of each cause reason
+ * The default JSON serializer encodes a `File` as `{ data, type, name, lastModified }`
+ * where `data` is base64-encoded.
  *
  * @category schemas
  * @since 4.0.0
  */
-export function CauseReason<E extends Constraint, D extends Constraint>(error: E, defect: D): CauseReason<E, D> {
-  const schema = declareConstructor<Cause_.Reason<E["Type"]>, Cause_.Reason<E["Encoded"]>, CauseReasonIso<E, D>>()(
-    [error, defect],
-    ([error, defect]) => (input, ast, options) => {
-      if (!Cause_.isReason(input)) {
-        return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
-      }
-      switch (input._tag) {
-        case "Fail":
-          return Effect.mapBothEager(
-            SchemaParser.decodeUnknownEffect(error)(input.error, options),
-            {
-              onSuccess: Cause_.makeFailReason,
-              onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "error", issue, input, options)
-            }
-          )
-        case "Die":
-          return Effect.mapBothEager(
-            SchemaParser.decodeUnknownEffect(defect)(input.defect, options),
-            {
-              onSuccess: Cause_.makeDieReason,
-              onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "defect", issue, input, options)
-            }
-          )
-        case "Interrupt":
-          return Effect.succeed(input)
-      }
-    },
-    {
-      representation: {
-        id: "effect/schema/CauseReason",
-        payload: null
-      },
-      toCode: ({ typeParameters }) => ({
-        runtime: `Schema.CauseReason(${typeParameters[0].runtime}, ${typeParameters[1].runtime})`,
-        Type: `Cause.Failure<${typeParameters[0].Type}, ${typeParameters[1].Type}>`,
-        importDeclarations: [`import * as Cause from "effect/Cause"`]
+export const File: File = instanceOf(globalThis.File, {
+  representation: {
+    id: "effect/schema/File",
+    payload: null
+  },
+  toCode: () => ({
+    runtime: `Schema.File`,
+    Type: `globalThis.File`
+  }),
+  expected: "File",
+  toCodecJson: () =>
+    link<globalThis.File>()(
+      Struct({
+        data: String.check(isBase64()),
+        type: String,
+        name: String,
+        lastModified: Int
       }),
-      expected: "Cause.Failure",
-      toCodec: ([error, defect]) =>
-        link<Cause_.Reason<E["Encoded"]>>()(
-          Union([
-            Struct({ _tag: Literal("Fail"), error }),
-            Struct({ _tag: Literal("Die"), defect }),
-            Struct({ _tag: Literal("Interrupt"), fiberId: UndefinedOr(Finite) })
-          ]),
-          SchemaTransformation.transform({
-            decode: (e) => {
-              switch (e._tag) {
-                case "Fail":
-                  return Cause_.makeFailReason(e.error)
-                case "Die":
-                  return Cause_.makeDieReason(e.defect)
-                case "Interrupt":
-                  return Cause_.makeInterruptReason(e.fiberId)
+      SchemaTransformation.transformEffect({
+        decode: (e, options) =>
+          Result_.match(Encoding.decodeBase64(e.data), {
+            onFailure: () =>
+              Effect.fail(
+                new SchemaIssue.InvalidValue(
+                  { expected: "a valid Base64 string" },
+                  e.data,
+                  options
+                )
+              ),
+            onSuccess: (bytes) => {
+              const buffer = new globalThis.Uint8Array(bytes)
+              return Effect.succeed(
+                new globalThis.File([buffer], e.name, { type: e.type, lastModified: e.lastModified })
+              )
+            }
+          }),
+        encode: (file, options) =>
+          Effect.tryPromise({
+            try: async () => {
+              const bytes = new globalThis.Uint8Array(await file.arrayBuffer())
+              return {
+                data: Encoding.encodeBase64(bytes),
+                type: file.type,
+                name: file.name,
+                lastModified: file.lastModified
               }
             },
-            encode: identity
+            catch: () =>
+              new SchemaIssue.InvalidValue(
+                { expected: "a readable File" },
+                file,
+                options
+              )
           })
-        )
-    }
-  )
-  return make(schema.ast, { error, defect })
-}
-
+      })
+    )
+})
 /**
- * Reviver for persisted `CauseReason` declarations.
+ * Type-level representation of {@link FormData}.
  *
- * **When to use**
+ * @category models
+ * @since 4.0.0
+ */
+export interface FormData extends instanceOf<globalThis.FormData> {
+  readonly "Rebuild": FormData
+}
+/**
+ * Schema for JavaScript `FormData` objects.
  *
- * Use when reconstructing documents that may contain schemas created by {@link CauseReason}.
+ * **Details**
  *
- * @see {@link CauseReason} for creating the corresponding schema
+ * The default JSON serializer encodes a `FormData` as an array of `[key, entry]`
+ * pairs where each entry is tagged as `"String"` or `"File"`.
  *
  * @category schemas
  * @since 4.0.0
  */
-export const CauseReasonReviver = InternalSchema.makeDeclarationReviver(
-  "effect/schema/CauseReason",
-  Null,
-  ({ annotations, typeParameters }) => {
-    const schema = CauseReason(typeParameters[0], typeParameters[1])
-    return annotations === undefined ? schema : schema.annotate(annotations)
-  }
-)
-
-function causeReasonToFormatter<E>(error: Formatter<E>, defect: Formatter<unknown>) {
-  return (t: Cause_.Reason<E>) => {
-    switch (t._tag) {
-      case "Fail":
-        return `Fail(${error(t.error)})`
-      case "Die":
-        return `Die(${defect(t.defect)})`
-      case "Interrupt":
-        return "Interrupt"
-    }
-  }
-}
-
+export const FormData: FormData = instanceOf(globalThis.FormData, {
+  representation: {
+    id: "effect/schema/FormData",
+    payload: null
+  },
+  toCode: () => ({
+    runtime: `Schema.FormData`,
+    Type: `globalThis.FormData`
+  }),
+  expected: "FormData",
+  toCodecJson: () =>
+    link<globalThis.FormData>()(
+      ArraySchema(
+        Tuple([
+          String,
+          Union([
+            Struct({ _tag: tag("String"), value: String }),
+            Struct({ _tag: tag("File"), value: File })
+          ])
+        ])
+      ),
+      SchemaTransformation.transformEffect({
+        decode: (e) => {
+          const out = new globalThis.FormData()
+          for (const [key, entry] of e) {
+            out.append(key, entry.value)
+          }
+          return Effect.succeed(out)
+        },
+        encode: (formData) => {
+          return Effect.succeed(
+            globalThis.Array.from(formData.entries()).map(([key, value]) => {
+              if (typeof value === "string") {
+                return [key, { _tag: "String", value }] as const
+              } else {
+                return [key, { _tag: "File", value }] as const
+              }
+            })
+          )
+        }
+      })
+    )
+})
 /**
- * Type-level representation returned by {@link Cause}.
+ * Type-level representation returned by {@link fromFormData}.
  *
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
-export interface Cause<E extends Constraint, D extends Constraint> extends
-  declareConstructor<
-    Cause_.Cause<E["Type"]>,
-    Cause_.Cause<E["Encoded"]>,
-    readonly [E, D],
-    CauseIso<E, D>
-  >
-{
-  readonly "Rebuild": Cause<E, D>
-  readonly error: E
-  readonly defect: D
+export interface fromFormData<S extends Constraint> extends decodeTo<S, FormData> {
+  readonly "Rebuild": fromFormData<S>
 }
-
 /**
- * Iso representation used for `Cause` schemas: an ordered array of
- * `CauseReasonIso` values.
+ * Schema for decoding `FormData` through a bracket-notation tree.
  *
  * **When to use**
  *
- * Use when working with the ISO shape of a `Cause` schema, such as `toIso`
- * optics or codecs that expose a cause as its ordered array of encoded reasons.
+ * Use to decode browser or multipart form data into a structured schema value.
  *
- * @see {@link Cause} for constructing schemas for full Cause values
- * @see {@link CauseReasonIso} for the ISO shape of each array element
+ * **Details**
  *
- * @category utility types
- * @since 4.0.0
- */
-export type CauseIso<E extends Constraint, D extends Constraint> = ReadonlyArray<CauseReasonIso<E, D>>
-
-/**
- * Creates a schema for `Cause` values using separate schemas for typed failures
- * and unexpected defects.
+ * The decoding process has two steps:
  *
- * **When to use**
+ * 1. Parse `FormData` into a nested tree record.
+ * 2. Decode the parsed value with the given schema.
  *
- * Use to validate, transform, or serialize Effect failure causes when typed
- * failures and unexpected defects need separate schemas.
+ * You can express nested values using bracket notation.
  *
- * **Details**
+ * If you want to decode string fields into non-string primitive values, use
+ * `Schema.toCodecStringTree`.
  *
- * The `error` schema is applied to `Fail` reasons and the `defect` schema is
- * applied to `Die` reasons. Interrupt reasons do not use either schema and
- * carry only an optional fiber id.
+ * **Example** (Decoding a flat structure)
  *
- * @see {@link CauseReason} for the schema used by each individual cause reason
- * @see {@link CauseIso} for the ordered array representation used by the schema ISO
+ * ```ts import.meta.vitest
+ * import { Schema } from "effect"
  *
- * @category schemas
- * @since 3.10.0
- */
-export function Cause<E extends Constraint, D extends Constraint>(error: E, defect: D): Cause<E, D> {
-  const schema = declareConstructor<Cause_.Cause<E["Type"]>, Cause_.Cause<E["Encoded"]>, CauseIso<E, D>>()(
-    [error, defect],
-    ([error, defect]) => {
-      const failures = ArraySchema(CauseReason(error, defect))
-      return (input, ast, options) => {
-        if (!Cause_.isCause(input)) {
-          return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
-        }
-        return Effect.mapBothEager(SchemaParser.decodeUnknownEffect(failures)(input.reasons, options), {
-          onSuccess: Cause_.fromReasons,
-          onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "failures", issue, input, options)
-        })
-      }
-    },
-    {
-      representation: {
-        id: "effect/schema/Cause",
-        payload: null
-      },
-      toCode: ({ typeParameters }) => ({
-        runtime: `Schema.Cause(${typeParameters[0].runtime}, ${typeParameters[1].runtime})`,
-        Type: `Cause.Cause<${typeParameters[0].Type}, ${typeParameters[1].Type}>`,
-        importDeclarations: [`import * as Cause from "effect/Cause"`]
-      }),
-      expected: "Cause",
-      toCodec: ([error, defect]) =>
-        link<Cause_.Cause<E["Encoded"]>>()(
-          ArraySchema(CauseReason(error, defect)),
-          SchemaTransformation.transform({
-            decode: Cause_.fromReasons,
-            encode: ({ reasons: failures }) => failures
-          })
-        )
-    }
-  )
-  return make(schema.ast, { error, defect })
-}
-
-/**
- * Reviver for persisted `Cause` declarations.
+ * const schema = Schema.fromFormData(
+ *   Schema.Struct({
+ *     a: Schema.String
+ *   })
+ * )
  *
- * **When to use**
+ * const formData = new FormData()
+ * formData.append("a", "1")
+ * formData.append("b", "2")
  *
- * Use when reconstructing documents that may contain schemas created by {@link Cause}.
+ * Schema.decodeUnknownSync(schema)(formData) // => { a: "1" }
+ * ```
  *
- * @see {@link Cause} for creating the corresponding schema
+ * **Example** (Decoding nested fields)
  *
- * @category schemas
+ * ```ts import.meta.vitest
+ * import { Schema } from "effect"
+ *
+ * const schema = Schema.fromFormData(
+ *   Schema.Struct({
+ *     a: Schema.String,
+ *     b: Schema.Struct({
+ *       c: Schema.String,
+ *       d: Schema.String
+ *     })
+ *   })
+ * )
+ *
+ * const formData = new FormData()
+ * formData.append("a", "1")
+ * formData.append("b[c]", "2")
+ * formData.append("b[d]", "3")
+ *
+ * Schema.decodeUnknownSync(schema)(formData) // => { a: "1", b: { c: "2", d: "3" } }
+ * ```
+ *
+ * **Example** (Parsing non-string values)
+ *
+ * ```ts import.meta.vitest
+ * import { Schema } from "effect"
+ *
+ * const schema = Schema.fromFormData(
+ *   Schema.toCodecStringTree(
+ *     Schema.Struct({
+ *       a: Schema.Int
+ *     })
+ *   )
+ * )
+ *
+ * const formData = new FormData()
+ * formData.append("a", "1")
+ *
+ * Schema.decodeUnknownSync(schema)(formData) // => { a: 1 }
+ * ```
+ *
+ * @category decoding
  * @since 4.0.0
  */
-export const CauseReviver = InternalSchema.makeDeclarationReviver(
-  "effect/schema/Cause",
-  Null,
-  ({ annotations, typeParameters }) => {
-    const schema = Cause(typeParameters[0], typeParameters[1])
-    return annotations === undefined ? schema : schema.annotate(annotations)
-  }
-)
-
-function causeToFormatter<E>(error: Formatter<E>, defect: Formatter<unknown>) {
-  const causeReason = causeReasonToFormatter(error, defect)
-  return (t: Cause_.Cause<E>) => `Cause([${t.reasons.map(causeReason).join(", ")}])`
+export function fromFormData<S extends Constraint>(schema: S): fromFormData<S> {
+  return FormData.pipe(decodeTo(schema, SchemaTransformation.fromFormData))
 }
-
 /**
- * Type-level representation of {@link ErrorInstance}.
+ * Type-level representation of {@link URLSearchParams}.
  *
  * @category models
  * @since 4.0.0
  */
-export interface ErrorInstance extends instanceOf<globalThis.Error> {
-  readonly "Rebuild": ErrorInstance
+export interface URLSearchParams extends instanceOf<globalThis.URLSearchParams> {
+  readonly "Rebuild": URLSearchParams
 }
-
 /**
- * Options for {@link ErrorInstance} and {@link Defect}.
+ * Schema for JavaScript `URLSearchParams` objects.
  *
- * @category options
+ * **Details**
+ *
+ * The default JSON serializer encodes a `URLSearchParams` as a query string.
+ *
+ * @category schemas
  * @since 4.0.0
  */
-export interface ErrorOptions {
-  /**
-   * Includes string stack traces in encoded `Error` values when set to `true`.
-   *
-   * @default false
-   */
-  readonly includeStack?: boolean | undefined
-  /**
-   * Excludes `Error.cause` values from encoded `Error` values when set to
-   * `true`.
-   *
-   * @default false
-   */
-  readonly excludeCause?: boolean | undefined
-}
-
-type ErrorRepresentationOptions = {
-  readonly includeStack?: true | undefined
-  readonly excludeCause?: true | undefined
-}
-
-type NormalizedErrorOptions =
-  | { readonly includeStack: true }
-  | { readonly excludeCause: true }
-  | { readonly includeStack: true; readonly excludeCause: true }
-
-type ErrorRepresentationPayload = ErrorRepresentationOptions | null
-
-const ErrorOptionsPayload = declare((input): input is ErrorRepresentationOptions => {
-  if (!Predicate.isObject(input)) {
-    return false
-  }
-  const keys = globalThis.Object.keys(input)
-  return keys.length > 0 &&
-    keys.every((key) => (key === "includeStack" || key === "excludeCause") && input[key] === true)
+export const URLSearchParams: URLSearchParams = instanceOf(globalThis.URLSearchParams, {
+  representation: {
+    id: "effect/schema/URLSearchParams",
+    payload: null
+  },
+  toCode: () => ({
+    runtime: `Schema.URLSearchParams`,
+    Type: `globalThis.URLSearchParams`
+  }),
+  expected: "URLSearchParams",
+  toCodecJson: () =>
+    link<globalThis.URLSearchParams>()(
+      String.annotate({ expected: "a query string that will be decoded as URLSearchParams" }),
+      SchemaTransformation.transform({
+        decode: (e) => new globalThis.URLSearchParams(e),
+        encode: (params) => params.toString()
+      })
+    )
 })
-
-const ErrorRepresentationPayload: Decoder<ErrorRepresentationPayload> = Union([Null, ErrorOptionsPayload])
-
-type ErrorOptionsKey = 0 | 1 | 2 | 3
-
-const getErrorOptionsKey = (options?: ErrorOptions): ErrorOptionsKey =>
-  ((options?.includeStack === true ? 1 : 0) |
-    (options?.excludeCause === true ? 2 : 0)) as ErrorOptionsKey
-
-const getErrorOptions = (key: ErrorOptionsKey): NormalizedErrorOptions | undefined => {
-  switch (key) {
-    case 0:
-      return undefined
-    case 1:
-      return { includeStack: true }
-    case 2:
-      return { excludeCause: true }
-    case 3:
-      return { includeStack: true, excludeCause: true }
-  }
-}
-
-const errorSchemaCache: Array<ErrorInstance | undefined> = []
-
 /**
- * Schema for JavaScript `Error` objects.
- *
- * **Details**
- *
- * Default JSON serializer:
- *
- * Encodes an `Error` as an object with `message`, optional `name`, and optional
- * `cause` properties, and decodes that object back into an `Error`. Stack
- * traces are omitted by default for security. Pass `{ includeStack: true }` to
- * include stack traces, or `{ excludeCause: true }` to omit causes.
+ * Type-level representation returned by {@link fromURLSearchParams}.
  *
- * @category schemas
+ * @category models
  * @since 4.0.0
  */
-export function ErrorInstance(options?: ErrorOptions): ErrorInstance {
-  const key = getErrorOptionsKey(options)
-  const cached = errorSchemaCache[key]
-  if (cached !== undefined) {
-    return cached
-  }
-  const normalizedOptions = getErrorOptions(key)
-  const schema = instanceOf(globalThis.Error, {
-    representation: {
-      id: "effect/schema/Error",
-      payload: normalizedOptions ?? null
-    },
-    toCode: () => ({
-      runtime: normalizedOptions !== undefined
-        ? `Schema.ErrorInstance(${format(normalizedOptions)})`
-        : `Schema.ErrorInstance()`,
-      Type: `globalThis.Error`
-    }),
-    expected: "Error",
-    toCodecJson: () => link<globalThis.Error>()(JsonError, SchemaTransformation.errorFromJsonError(normalizedOptions))
-  })
-  errorSchemaCache[key] = schema
-  return schema
+export interface fromURLSearchParams<S extends Constraint> extends decodeTo<S, URLSearchParams> {
+  readonly "Rebuild": fromURLSearchParams<S>
 }
-
 /**
- * Reviver for persisted {@link ErrorInstance} declarations.
+ * Schema for decoding `URLSearchParams` through a bracket-notation tree.
  *
  * **When to use**
  *
- * Use when reconstructing documents that may contain schemas created by {@link ErrorInstance}.
+ * Use to decode query parameters into a structured schema value.
  *
- * @see {@link ErrorInstance} for creating the corresponding schema
+ * **Details**
  *
- * @category schemas
+ * The decoding process has two steps:
+ *
+ * 1. Parse `URLSearchParams` into a nested tree record.
+ * 2. Decode the parsed value with the given schema.
+ *
+ * You can express nested values using bracket notation.
+ *
+ * If you want to decode values that are not strings, use
+ * `Schema.toCodecStringTree`. This serializer preserves values such as
+ * numbers when compatible with the schema.
+ *
+ * **Example** (Decoding a flat structure)
+ *
+ * ```ts import.meta.vitest
+ * import { Schema } from "effect"
+ *
+ * const schema = Schema.fromURLSearchParams(
+ *   Schema.Struct({
+ *     a: Schema.String
+ *   })
+ * )
+ *
+ * const urlSearchParams = new URLSearchParams("a=1&b=2")
+ *
+ * Schema.decodeUnknownSync(schema)(urlSearchParams) // => { a: "1" }
+ * ```
+ *
+ * **Example** (Decoding nested fields)
+ *
+ * ```ts import.meta.vitest
+ * import { Schema } from "effect"
+ *
+ * const schema = Schema.fromURLSearchParams(
+ *   Schema.Struct({
+ *     a: Schema.String,
+ *     b: Schema.Struct({
+ *       c: Schema.String,
+ *       d: Schema.String
+ *     })
+ *   })
+ * )
+ *
+ * const urlSearchParams = new URLSearchParams("a=1&b[c]=2&b[d]=3")
+ *
+ * Schema.decodeUnknownSync(schema)(urlSearchParams) // => { a: "1", b: { c: "2", d: "3" } }
+ * ```
+ *
+ * **Example** (Parsing non-string values)
+ *
+ * ```ts import.meta.vitest
+ * import { Schema } from "effect"
+ *
+ * const schema = Schema.fromURLSearchParams(
+ *   Schema.toCodecStringTree(
+ *     Schema.Struct({
+ *       a: Schema.Int
+ *     })
+ *   )
+ * )
+ *
+ * const urlSearchParams = new URLSearchParams("a=1&b=2")
+ *
+ * Schema.decodeUnknownSync(schema)(urlSearchParams) // => { a: 1 }
+ * ```
+ *
+ * @category decoding
  * @since 4.0.0
  */
-export const ErrorInstanceReviver = InternalSchema.makeDeclarationReviver(
-  "effect/schema/Error",
-  ErrorRepresentationPayload,
-  ({ annotations, payload }) => {
-    const schema = ErrorInstance(payload ?? undefined)
-    return annotations === undefined ? schema : schema.annotate(annotations)
-  }
-)
-
+export function fromURLSearchParams<S extends Constraint>(schema: S): fromURLSearchParams<S> {
+  return URLSearchParams.pipe(decodeTo(schema, SchemaTransformation.fromURLSearchParams))
+}
 /**
- * Type-level representation of {@link Defect}.
+ * Type-level representation of {@link NumberFromString}.
  *
  * @category models
  * @since 3.10.0
  */
-export interface Defect extends decodeTo<Unknown, typeof Json> {
-  readonly "Rebuild": Defect
+export interface NumberFromString extends decodeTo<Number, String> {
+  readonly "Rebuild": NumberFromString
 }
-
-const defectSchemaCache: Array<Defect | undefined> = []
-
 /**
- * Schema for unexpected defect values represented as `unknown` with a JSON
- * encoded form.
+ * Schema that parses a string into a `number` using JavaScript
+ * number coercion.
+ *
+ * **Details**
+ *
+ * Decoding:
+ * A `string` is decoded as a number, including possible non-finite values such as
+ * `NaN`, `Infinity`, and `-Infinity`. Use `FiniteFromString` to reject non-finite
+ * numbers.
+ *
+ * Encoding:
+ * A number is encoded as a `string`.
+ *
+ * @category schemas
+ * @since 3.10.0
+ */
+export const NumberFromString: NumberFromString = String.annotate({
+  expected: "a string that will be decoded as a number"
+}).pipe(decodeTo(Number, SchemaTransformation.numberFromString))
+/**
+ * Type-level representation of {@link FiniteFromString}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface FiniteFromString extends decodeTo<Finite, String> {
+  readonly "Rebuild": FiniteFromString
+}
+/**
+ * Schema that parses a string into a finite number.
+ *
+ * **Details**
+ *
+ * Decoding:
+ * - A `string` is decoded as a finite number, rejecting `NaN`, `Infinity`, and
+ *   `-Infinity` values.
+ *
+ * Encoding:
+ * - A finite number is encoded as a `string`.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const FiniteFromString: FiniteFromString = String.annotate({
+  expected: "a string that will be decoded as a finite number"
+}).pipe(decodeTo(Finite, SchemaTransformation.numberFromString))
+/**
+ * Type-level representation of {@link BigIntFromString}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface BigIntFromString extends decodeTo<BigInt, String> {
+  readonly "Rebuild": BigIntFromString
+}
+/**
+ * Schema that parses a string into a `bigint`.
  *
  * **When to use**
  *
- * Use when you need a schema for `Cause` defects or other unexpected failures
- * whose runtime value may be any value.
+ * Use to parse signed base-10 integer strings into bigint values while encoding
+ * bigint values back to decimal strings.
  *
  * **Details**
  *
- * The encoded side is {@link Json}. During decoding, JSON objects with a string
- * `message` property are decoded into JavaScript `Error` values, preserving a
- * non-default `name` and any string `stack`. Other JSON values decode
- * unchanged.
+ * Decoding:
+ * - A `string` is decoded as a `bigint`.
  *
- * During encoding, JavaScript `Error` values encode to JSON objects with
- * `name`, `message`, and optional `cause` properties. Pass
- * `{ includeStack: true }` to include string stack traces in encoded `Error`
- * defects, or `{ excludeCause: true }` to omit causes. Other values are
- * serialized through Effect's JSON formatter and then parsed back into JSON
- * when possible.
+ * Encoding:
+ * - A `bigint` is encoded as a `string`.
  *
  * **Gotchas**
  *
- * This schema is for carrying defects across JSON boundaries, not for
- * preserving every JavaScript value exactly. Some values cannot round-trip
- * unchanged:
+ * Decoding accepts only strings matching `^-?\d+$`.
  *
- * - A non-`Error` object such as `{ message: "boom" }` encodes as an
- *   error-shaped JSON object and decodes back as an `Error`.
- * - JSON serialization normalizes unsupported values. For example,
- *   `undefined` array elements encode as `null`, unsupported object properties
- *   are omitted, and circular references are dropped.
- * - Values that cannot be represented as JSON fall back to Effect's formatted
- *   string representation.
+ * @see {@link isStringBigInt} for the string predicate used by this schema
+ * @see {@link BigInt} for validating values that are already bigint values
+ * @see {@link NumberFromString} for parsing JavaScript number strings, including non-finite values
+ * @see {@link BigDecimalFromString} for parsing decimal number strings
  *
- * @see {@link ErrorInstance} for a schema that only accepts JavaScript `Error` values.
  * @category schemas
  * @since 4.0.0
  */
-export function Defect(options?: ErrorOptions): Defect {
-  const key = getErrorOptionsKey(options)
-  const cached = defectSchemaCache[key]
-  if (cached !== undefined) {
-    return cached
-  }
-  const schema = Json.pipe(decodeTo(Unknown, SchemaTransformation.defectFromJson(getErrorOptions(key))))
-  defectSchemaCache[key] = schema
-  return schema
-}
-
+export const BigIntFromString: BigIntFromString = make<String>(SchemaAST.bigIntString).pipe(
+  decodeTo(BigInt, SchemaTransformation.bigintFromString)
+)
 /**
- * Type-level representation returned by {@link Exit}.
+ * Type-level representation of {@link Trimmed}.
  *
  * @category models
  * @since 3.10.0
  */
-export interface Exit<A extends Constraint, E extends Constraint, D extends Constraint> extends
-  declareConstructor<
-    Exit_.Exit<A["Type"], E["Type"]>,
-    Exit_.Exit<A["Encoded"], E["Encoded"]>,
-    readonly [A, E, D],
-    ExitIso<A, E, D>
-  >
-{
-  readonly "Rebuild": Exit<A, E, D>
-  readonly value: A
-  readonly error: E
-  readonly defect: D
+export interface Trimmed extends String {
+  readonly "Rebuild": Trimmed
 }
-
 /**
- * Iso representation used for `Exit` schemas.
- *
- * **Details**
+ * Schema for strings that contains no leading or trailing whitespaces.
  *
- * Successful exits are represented as `{ _tag: "Success", value }`, while failed
- * exits are represented as `{ _tag: "Failure", cause }`.
+ * @category schemas
+ * @since 3.10.0
+ */
+export const Trimmed: Trimmed = String.check(isTrimmed())
+/**
+ * Type-level representation of {@link Trim}.
  *
- * @category utility types
- * @since 4.0.0
+ * @category models
+ * @since 3.10.0
  */
-export type ExitIso<A extends Constraint, E extends Constraint, D extends Constraint> = {
-  readonly _tag: "Success"
-  readonly value: A["Iso"]
-} | {
-  readonly _tag: "Failure"
-  readonly cause: CauseIso<E, D>
+export interface Trim extends decodeTo<Trimmed, String> {
+  readonly "Rebuild": Trim
 }
-
 /**
- * Creates a schema for `Exit` values using schemas for the success value, typed
- * failure, and unexpected defect channels.
+ * Schema that trims whitespace from a string.
  *
- * **When to use**
+ * **Details**
  *
- * Use when serializing or validating an effect outcome where success, typed
- * failure, and defects each need their own schema.
+ * Decoding:
+ * - A `string` is decoded as a string with no leading or trailing whitespaces.
+ *
+ * Encoding:
+ * - The trimmed string is encoded as is.
  *
  * @category schemas
  * @since 3.10.0
  */
-export function Exit<A extends Constraint, E extends Constraint, D extends Constraint>(
-  value: A,
-  error: E,
-  defect: D
-): Exit<A, E, D> {
-  const schema = declareConstructor<
-    Exit_.Exit<A["Type"], E["Type"]>,
-    Exit_.Exit<A["Encoded"], E["Encoded"]>,
-    ExitIso<A, E, D>
-  >()(
-    [value, error, defect],
-    ([value, error, defect]) => {
-      const cause = Cause(error, defect)
-      return (input, ast, options) => {
-        if (!Exit_.isExit(input)) {
-          return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
-        }
-        switch (input._tag) {
-          case "Success":
-            return Effect.mapBothEager(
-              SchemaParser.decodeUnknownEffect(value)(input.value, options),
-              {
-                onSuccess: Exit_.succeed,
-                onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "value", issue, input, options)
-              }
-            )
-          case "Failure":
-            return Effect.mapBothEager(
-              SchemaParser.decodeUnknownEffect(cause)(input.cause, options),
-              {
-                onSuccess: Exit_.failCause,
-                onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "cause", issue, input, options)
-              }
-            )
-        }
-      }
-    },
-    {
-      representation: {
-        id: "effect/schema/Exit",
-        payload: null
-      },
-      toCode: ({ typeParameters }) => ({
-        runtime: `Schema.Exit(${typeParameters[0].runtime}, ${typeParameters[1].runtime}, ${
-          typeParameters[2].runtime
-        })`,
-        Type: `Exit.Exit<${typeParameters[0].Type}, ${typeParameters[1].Type}, ${typeParameters[2].Type}>`,
-        importDeclarations: [`import * as Exit from "effect/Exit"`]
-      }),
-      expected: "Exit",
-      toCodec: ([value, error, defect]) =>
-        link<Exit_.Exit<A["Encoded"], E["Encoded"]>>()(
-          Union([
-            Struct({ _tag: Literal("Success"), value }),
-            Struct({ _tag: Literal("Failure"), cause: Cause(error, defect) })
-          ]),
-          SchemaTransformation.transform({
-            decode: (e): Exit_.Exit<A["Encoded"], E["Encoded"]> =>
-              e._tag === "Success" ? Exit_.succeed(e.value) : Exit_.failCause(e.cause),
-            encode: (exit) =>
-              Exit_.isSuccess(exit)
-                ? { _tag: "Success", value: exit.value } as const
-                : { _tag: "Failure", cause: exit.cause } as const
-          })
-        )
-    }
-  )
-  return make(schema.ast, { value, error, defect })
+export const Trim: Trim = String.annotate({
+  expected: "a string that will be decoded as a trimmed string"
+}).pipe(decodeTo(Trimmed, SchemaTransformation.trim()))
+/**
+ * Type-level representation of {@link StringFromBase64}.
+ *
+ * @category models
+ * @since 3.10.0
+ */
+export interface StringFromBase64 extends decodeTo<String, String> {
+  readonly "Rebuild": StringFromBase64
 }
-
 /**
- * Reviver for persisted `Exit` declarations.
+ * Decodes a base64 (RFC4648) encoded string into a UTF-8 string.
  *
- * **When to use**
+ * **Details**
  *
- * Use when reconstructing documents that may contain schemas created by {@link Exit}.
+ * Decoding:
+ * - A **valid** base64 encoded string is decoded as a UTF-8 `string`.
  *
- * @see {@link Exit} for creating the corresponding schema
+ * Encoding:
+ * - A `string` is encoded as a base64-encoded string.
  *
  * @category schemas
- * @since 4.0.0
+ * @since 3.10.0
  */
-export const ExitReviver = InternalSchema.makeDeclarationReviver(
-  "effect/schema/Exit",
-  Null,
-  ({ annotations, typeParameters }) => {
-    const schema = Exit(typeParameters[0], typeParameters[1], typeParameters[2])
-    return annotations === undefined ? schema : schema.annotate(annotations)
-  }
+export const StringFromBase64: StringFromBase64 = String.annotate({
+  expected: "a base64 encoded string that will be decoded as a UTF-8 string"
+}).pipe(
+  decodeTo(String, SchemaTransformation.stringFromBase64String)
 )
-
-/** @internal */
-export function withArrayLengthConstraints<Item extends Constraint>(
-  self: $Array<Item>,
-  minimum: number | undefined,
-  maximum: number | undefined
-): $Array<Item> {
-  if (minimum !== undefined && maximum !== undefined) {
-    return self.check(isLengthBetween(minimum, maximum))
-  }
-  if (minimum !== undefined) return self.check(isMinLength(minimum))
-  if (maximum !== undefined) return self.check(isMaxLength(maximum))
-  return self
-}
-
-function hashMapLink<Key, Value>(entries: Schema<ReadonlyArray<readonly [Key, Value]>>) {
-  return link<HashMap_.HashMap<Key, Value>>()(
-    entries,
-    SchemaTransformation.transform({
-      decode: HashMap_.fromIterable,
-      encode: HashMap_.toEntries
-    })
-  )
-}
-
-function hashSetLink<Value>(values: Schema<ReadonlyArray<Value>>) {
-  return link<HashSet_.HashSet<Value>>()(
-    values,
-    SchemaTransformation.transform({
-      decode: HashSet_.fromIterable,
-      encode: Arr.fromIterable
-    })
-  )
-}
-
-function chunkLink<Value>(values: Schema<ReadonlyArray<Value>>) {
-  return link<Chunk_.Chunk<Value>>()(
-    values,
-    SchemaTransformation.transform({
-      decode: Chunk_.fromIterable,
-      encode: Arr.fromIterable
-    })
-  )
-}
-
 /**
- * Type-level representation returned by {@link ReadonlyMap}.
+ * Type-level representation of {@link StringFromBase64Url}.
  *
  * @category models
- * @since 4.0.0
+ * @since 3.10.0
  */
-export interface $ReadonlyMap<Key extends Constraint, Value extends Constraint> extends
-  declareConstructor<
-    globalThis.ReadonlyMap<Key["Type"], Value["Type"]>,
-    globalThis.ReadonlyMap<Key["Encoded"], Value["Encoded"]>,
-    readonly [Key, Value],
-    ReadonlyMapIso<Key, Value>
-  >
-{
-  readonly "Rebuild": $ReadonlyMap<Key, Value>
-  readonly key: Key
-  readonly value: Value
+export interface StringFromBase64Url extends decodeTo<String, String> {
+  readonly "Rebuild": StringFromBase64Url
 }
-
 /**
- * Iso representation used for `ReadonlyMap` schemas: an array of readonly
- * `[key, value]` tuples using each entry schema's `Iso` type.
+ * Decodes a base64 (URL) encoded string into a UTF-8 string.
  *
- * @category utility types
- * @since 4.0.0
+ * **Details**
+ *
+ * Decoding:
+ * - A **valid** base64 (URL) encoded string is decoded as a UTF-8 `string`.
+ *
+ * Encoding:
+ * - A `string` is encoded as a base64 (URL) encoded string.
+ *
+ * @category schemas
+ * @since 3.10.0
  */
-export type ReadonlyMapIso<Key extends Constraint, Value extends Constraint> = ReadonlyArray<
-  readonly [Key["Iso"], Value["Iso"]]
->
-
+export const StringFromBase64Url: StringFromBase64Url = String.annotate({
+  expected: "a base64 (URL) encoded string that will be decoded as a UTF-8 string"
+}).pipe(
+  decodeTo(String, SchemaTransformation.stringFromBase64UrlString)
+)
 /**
- * Schema for readonly maps whose keys and values conform to the provided
- * schemas.
+ * Type-level representation of {@link StringFromHex}.
  *
- * @category schemas
+ * @category models
  * @since 3.10.0
  */
-export function ReadonlyMap<Key extends Constraint, Value extends Constraint>(
-  key: Key,
-  value: Value
-): $ReadonlyMap<Key, Value> {
-  const schema = declareConstructor<
-    globalThis.ReadonlyMap<Key["Type"], Value["Type"]>,
-    globalThis.ReadonlyMap<Key["Encoded"], Value["Encoded"]>,
-    ReadonlyMapIso<Key, Value>
-  >()(
-    [key, value],
-    ([key, value]) => {
-      const array = ArraySchema(Tuple([key, value]))
-      return (input, ast, options) => {
-        if (input instanceof globalThis.Map) {
-          return Effect.mapBothEager(
-            SchemaParser.decodeUnknownEffect(array)([...input], options),
-            {
-              onSuccess: (array: ReadonlyArray<readonly [Key["Type"], Value["Type"]]>) => new globalThis.Map(array),
-              onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "entries", issue, input, options)
-            }
-          )
-        }
-        return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
-      }
-    },
-    {
-      representation: {
-        id: "effect/schema/ReadonlyMap",
-        payload: null
-      },
-      toCode: ({ typeParameters }) => ({
-        runtime: `Schema.ReadonlyMap(${typeParameters[0].runtime}, ${typeParameters[1].runtime})`,
-        Type: `globalThis.ReadonlyMap<${typeParameters[0].Type}, ${typeParameters[1].Type}>`
-      }),
-      expected: "ReadonlyMap",
-      toCodec: ([key, value]) =>
-        link<globalThis.Map<Key["Encoded"], Value["Encoded"]>>()(
-          ArraySchema(Tuple([key, value])),
-          SchemaTransformation.transform({
-            decode: (entries) => new globalThis.Map(entries),
-            encode: (map) => [...map.entries()]
-          })
-        )
-    }
-  )
-  return make(schema.ast, { key, value })
+export interface StringFromHex extends decodeTo<String, String> {
+  readonly "Rebuild": StringFromHex
 }
-
 /**
- * Reviver for persisted {@link ReadonlyMap} declarations.
+ * Decodes a hex encoded string into a UTF-8 string.
  *
- * **When to use**
+ * **Details**
  *
- * Use when reconstructing documents that may contain schemas created by {@link ReadonlyMap}.
+ * Decoding:
+ * - A **valid** hex encoded string is decoded as a UTF-8 `string`.
  *
- * @see {@link ReadonlyMap} for creating the corresponding schema
+ * Encoding:
+ * - A `string` is encoded as a hex string.
  *
  * @category schemas
- * @since 4.0.0
+ * @since 3.10.0
  */
-export const ReadonlyMapReviver = InternalSchema.makeDeclarationReviver(
-  "effect/schema/ReadonlyMap",
-  Null,
-  ({ annotations, typeParameters }) => {
-    const schema = ReadonlyMap(typeParameters[0], typeParameters[1])
-    return annotations === undefined ? schema : schema.annotate(annotations)
-  }
+export const StringFromHex: StringFromHex = String.annotate({
+  expected: "a hex encoded string that will be decoded as a UTF-8 string"
+}).pipe(
+  decodeTo(String, SchemaTransformation.stringFromHexString)
 )
-
 /**
- * Encoded representation of an immutable Effect graph.
+ * Type-level representation of {@link StringFromUriComponent}.
  *
  * @category models
- * @since 4.0.0
+ * @since 3.12.0
  */
-export type EncodedGraph<N, E, T extends Graph_.Kind> = Graph_.Snapshot<N, E, T>
-
+export interface StringFromUriComponent extends decodeTo<String, String> {
+  readonly "Rebuild": StringFromUriComponent
+}
 /**
- * Iso representation used for {@link Graph} schemas.
+ * Decodes a URI component encoded string into a UTF-8 string.
+ * Can be used to store data in a URL.
  *
- * @category utility types
- * @since 4.0.0
- */
-export type GraphIso<T extends Graph_.Kind, Node extends Constraint, Edge extends Constraint> = EncodedGraph<
-  Node["Iso"],
-  Edge["Iso"],
-  T
->
+ * **Details**
+ *
+ * Decoding:
+ * - A **valid** URI component encoded string is decoded as a UTF-8 `string`.
+ *
+ * Encoding:
+ * - A `string` is encoded as a URI component encoded string.
+ *
+ * **Example** (Decoding URI component strings)
+ *
+ * ```ts import.meta.vitest
+ * import { Schema } from "effect"
+ *
+ * const PaginationSchema = Schema.Struct({
+ *   maxItemPerPage: Schema.Number,
+ *   page: Schema.Number
+ * })
+ *
+ * const UrlSchema = Schema.StringFromUriComponent.pipe(
+ *   Schema.decodeTo(Schema.fromJsonString(PaginationSchema))
+ * )
+ *
+ * Schema.encodeSync(UrlSchema)({ maxItemPerPage: 10, page: 1 }) // => "%7B%22maxItemPerPage%22%3A10%2C%22page%22%3A1%7D"
+ * ```
+ *
+ * @category schemas
+ * @since 3.12.0
+ */
+export const StringFromUriComponent: StringFromUriComponent = String.annotate({
+  expected: "a URI component encoded string that will be decoded as a UTF-8 string"
+}).pipe(
+  decodeTo(String, SchemaTransformation.stringFromUriComponent)
+)
+/**
+ * Schema for property keys accepted by Effect schemas: finite `number`,
+ * `symbol`, or `string`.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const PropertyKey: Union<readonly [Finite, Symbol, String]> = Union([Finite, Symbol, String])
+/**
+ * Schema for a Standard Schema v1 failure result.
+ *
+ * **Details**
+ *
+ * The result contains an `issues` array where each issue has a message and an
+ * optional path made of property keys or keyed path segments.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const StandardSchemaV1FailureResult: Struct<{
+  readonly issues: $Array<
+    Struct<{
+      readonly message: String
+      readonly path: optional<
+        $Array<
+          Union<
+            readonly [
+              Union<readonly [Finite, Symbol, String]>,
+              Struct<{
+                readonly key: Union<readonly [Finite, Symbol, String]>
+              }>
+            ]
+          >
+        >
+      >
+    }>
+  >
+}> = Struct({
+  issues: ArraySchema(Struct({
+    message: String,
+    path: optional(ArraySchema(Union([PropertyKey, Struct({ key: PropertyKey })])))
+  }))
+})
+/**
+ * Type-level representation of {@link BooleanFromBit}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface BooleanFromBit extends decodeTo<Boolean, Literals<readonly [0, 1]>> {
+  readonly "Rebuild": BooleanFromBit
+}
+/**
+ * Schema for a boolean parsed from 0 or 1.
+ *
+ * **When to use**
+ *
+ * Use when decoding data sources that represent booleans as `0 | 1` while
+ * keeping boolean values in the decoded model.
+ *
+ * **Details**
+ *
+ * Decoding accepts only `0 | 1`, maps `1` to `true`, and maps `0` to `false`.
+ * Encoding maps `true` to `1` and `false` to `0`.
+ *
+ * @see {@link Boolean} for validating values that are already booleans
+ * @see {@link Literals} for keeping bit literals instead of decoding them
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const BooleanFromBit: BooleanFromBit = Literals([0, 1]).pipe(
+  decodeTo(
+    Boolean,
+    SchemaTransformation.transform({
+      decode: (bit) => bit === 1,
+      encode: (bool) => bool ? 1 : 0
+    })
+  )
+)
+/**
+ * Type-level representation of {@link Uint8Array}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface Uint8Array extends instanceOf<globalThis.Uint8Array<ArrayBufferLike>> {
+  readonly "Rebuild": Uint8Array
+}
+
+const Base64String = String.annotate({
+  expected: "a base64 encoded string that will be decoded as Uint8Array",
+  format: "byte",
+  contentEncoding: "base64"
+})
+/**
+ * Schema for JavaScript `Uint8Array` objects.
+ *
+ * **Details**
+ *
+ * Default JSON serializer:
+ *
+ * The default JSON serializer encodes Uint8Array as a Base64 encoded string.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const Uint8Array: Uint8Array = instanceOf(globalThis.Uint8Array<ArrayBufferLike>, {
+  representation: {
+    id: "effect/schema/Uint8Array",
+    payload: null
+  },
+  toCode: () => ({
+    runtime: `Schema.Uint8Array`,
+    Type: `globalThis.Uint8Array`
+  }),
+  expected: "Uint8Array",
+  toCodecJson: () =>
+    link<globalThis.Uint8Array<ArrayBufferLike>>()(
+      Base64String,
+      SchemaTransformation.uint8ArrayFromBase64String
+    )
+})
+/**
+ * Type-level representation of {@link Uint8ArrayFromBase64}.
+ *
+ * @category models
+ * @since 3.10.0
+ */
+export interface Uint8ArrayFromBase64 extends decodeTo<Uint8Array, String> {
+  readonly "Rebuild": Uint8ArrayFromBase64
+}
+/**
+ * Schema that decodes a base64 encoded string into a
+ * `Uint8Array`.
+ *
+ * **Details**
+ *
+ * Decoding:
+ * - A **valid** base64 encoded string is decoded as a `Uint8Array`.
+ *
+ * Encoding:
+ * - A `Uint8Array` is encoded as a base64-encoded string.
+ *
+ * @category schemas
+ * @since 3.10.0
+ */
+export const Uint8ArrayFromBase64: Uint8ArrayFromBase64 = Base64String.pipe(
+  decodeTo(Uint8Array, SchemaTransformation.uint8ArrayFromBase64String)
+)
+/**
+ * Type-level representation of {@link Uint8ArrayFromBase64Url}.
+ *
+ * @category models
+ * @since 3.10.0
+ */
+export interface Uint8ArrayFromBase64Url extends decodeTo<Uint8Array, String> {
+  readonly "Rebuild": Uint8ArrayFromBase64Url
+}
+/**
+ * Schema that decodes a base64 (URL) encoded string into a
+ * `Uint8Array`.
+ *
+ * **Details**
+ *
+ * Decoding:
+ * - A **valid** base64 (URL) encoded string is decoded as a `Uint8Array`.
+ *
+ * Encoding:
+ * - A `Uint8Array` is encoded as a base64 (URL) encoded string.
+ *
+ * @category schemas
+ * @since 3.10.0
+ */
+export const Uint8ArrayFromBase64Url: Uint8ArrayFromBase64Url = String.annotate({
+  expected: "a base64 (URL) encoded string that will be decoded as a Uint8Array"
+}).pipe(
+  decodeTo(Uint8Array, {
+    decode: SchemaGetter.decodeBase64Url(),
+    encode: SchemaGetter.encodeBase64Url()
+  })
+)
+/**
+ * Type-level representation of {@link Uint8ArrayFromHex}.
+ *
+ * @category models
+ * @since 3.10.0
+ */
+export interface Uint8ArrayFromHex extends decodeTo<Uint8Array, String> {
+  readonly "Rebuild": Uint8ArrayFromHex
+}
+/**
+ * Schema that decodes a hex encoded string into a
+ * `Uint8Array`.
+ *
+ * **Details**
+ *
+ * Decoding:
+ * - A **valid** hex encoded string is decoded as a `Uint8Array`.
+ *
+ * Encoding:
+ * - A `Uint8Array` is encoded as a hex encoded string.
+ *
+ * @category schemas
+ * @since 3.10.0
+ */
+export const Uint8ArrayFromHex: Uint8ArrayFromHex = String.annotate({
+  expected: "a hex encoded string that will be decoded as a Uint8Array"
+}).pipe(
+  decodeTo(Uint8Array, {
+    decode: SchemaGetter.decodeHex(),
+    encode: SchemaGetter.encodeHex()
+  })
+)
+
+// -----------------------------------------------------------------------------
+// BigDecimal schemas
+// -----------------------------------------------------------------------------
 
+const bigDecimalFromString: SchemaTransformation.Transformation<BigDecimal_.BigDecimal, string> = SchemaTransformation
+  .transformEffect<BigDecimal_.BigDecimal, string>({
+    decode: (s, options) => {
+      const result = BigDecimal_.fromString(s)
+      return Option_.isNone(result)
+        ? Effect.fail(
+          new SchemaIssue.InvalidValue(
+            { expected: "a valid BigDecimal string" },
+            s,
+            options
+          )
+        )
+        : Effect.succeed(result.value)
+    },
+    encode: (bd) => Effect.succeed(BigDecimal_.format(bd))
+  })
+/**
+ * Validates that a BigDecimal is greater than the specified value (exclusive).
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isGreaterThanBigDecimal: (
+  exclusiveMinimum: BigDecimal_.BigDecimal,
+  annotations?: Annotations.Filter
+) => SchemaAST.Filter<BigDecimal_.BigDecimal> = makeIsGreaterThan({
+  order: BigDecimal_.Order,
+  formatter: (bd) => BigDecimal_.format(bd)
+})
+/**
+ * Validates that a BigDecimal is greater than or equal to the specified value
+ * (inclusive).
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isGreaterThanOrEqualToBigDecimal: (
+  minimum: BigDecimal_.BigDecimal,
+  annotations?: Annotations.Filter
+) => SchemaAST.Filter<BigDecimal_.BigDecimal> = makeIsGreaterThanOrEqualTo({
+  order: BigDecimal_.Order,
+  formatter: (bd) => BigDecimal_.format(bd)
+})
+/**
+ * Validates that a BigDecimal is less than the specified value (exclusive).
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isLessThanBigDecimal: (
+  exclusiveMaximum: BigDecimal_.BigDecimal,
+  annotations?: Annotations.Filter
+) => SchemaAST.Filter<BigDecimal_.BigDecimal> = makeIsLessThan({
+  order: BigDecimal_.Order,
+  formatter: (bd) => BigDecimal_.format(bd)
+})
+/**
+ * Validates that a BigDecimal is less than or equal to the specified value
+ * (inclusive).
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isLessThanOrEqualToBigDecimal: (
+  maximum: BigDecimal_.BigDecimal,
+  annotations?: Annotations.Filter
+) => SchemaAST.Filter<BigDecimal_.BigDecimal> = makeIsLessThanOrEqualTo({
+  order: BigDecimal_.Order,
+  formatter: (bd) => BigDecimal_.format(bd)
+})
+/**
+ * Validates that a `BigDecimal` is within a specified range.
+ *
+ * **Details**
+ *
+ * The minimum and maximum boundaries are inclusive by default. Pass
+ * `exclusiveMinimum` or `exclusiveMaximum` to exclude either boundary.
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isBetweenBigDecimal: (options: {
+  readonly minimum: BigDecimal_.BigDecimal
+  readonly maximum: BigDecimal_.BigDecimal
+  readonly exclusiveMinimum?: boolean | undefined
+  readonly exclusiveMaximum?: boolean | undefined
+}, annotations?: Annotations.Filter) => SchemaAST.Filter<BigDecimal_.BigDecimal> = makeIsBetween({
+  order: BigDecimal_.Order,
+  formatter: (bd) => BigDecimal_.format(bd)
+})
+/**
+ * Type-level representation of {@link BigDecimal}.
+ *
+ * @category models
+ * @since 3.10.0
+ */
+export interface BigDecimal extends declare<BigDecimal_.BigDecimal> {
+  readonly "Rebuild": BigDecimal
+}
+const BigDecimalString = String.annotate({ expected: "a string that will be decoded as a BigDecimal" })
+/**
+ * Schema for `BigDecimal` values.
+ *
+ * **When to use**
+ *
+ * Use when you already have Effect decimal instances and need schema
+ * validation, formatting, equivalence, and JSON string serialization.
+ *
+ * **Details**
+ *
+ * Default JSON serializer:
+ *
+ * - encodes `BigDecimal` as a `string`
+ *
+ * @see {@link BigDecimalFromString} for parsing string input into a BigDecimal
+ *
+ * @category schemas
+ * @since 3.10.0
+ */
+export const BigDecimal: BigDecimal = declare(
+  BigDecimal_.isBigDecimal,
+  {
+    representation: {
+      id: "effect/schema/BigDecimal",
+      payload: null
+    },
+    toCode: () => ({
+      runtime: `Schema.BigDecimal`,
+      Type: `BigDecimal.BigDecimal`,
+      importDeclarations: [`import * as BigDecimal from "effect/BigDecimal"`]
+    }),
+    expected: "BigDecimal",
+    toCodecJson: () =>
+      link<BigDecimal_.BigDecimal>()(
+        BigDecimalString,
+        bigDecimalFromString
+      ),
+    toFormatter: () => (bd) => BigDecimal_.format(bd)
+  }
+)
+/**
+ * Type-level representation of {@link BigDecimalFromString}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface BigDecimalFromString extends decodeTo<BigDecimal, String> {
+  readonly "Rebuild": BigDecimalFromString
+}
+/**
+ * Schema that parses a string into a `BigDecimal`.
+ *
+ * **When to use**
+ *
+ * Use to parse decimal or exponent-notation strings into arbitrary-precision
+ * BigDecimal values while encoding them back to strings.
+ *
+ * **Details**
+ *
+ * Decoding:
+ * - A `string` is decoded with `BigDecimal.fromString`.
+ *
+ * Encoding:
+ * - A `BigDecimal` is encoded with `BigDecimal.format`.
+ *
+ * **Gotchas**
+ *
+ * An empty string decodes as zero.
+ *
+ * @see {@link BigDecimal} for validating values that are already BigDecimal values
+ * @see {@link BigIntFromString} for parsing base-10 integer strings into bigint values
+ * @see {@link NumberFromString} for parsing JavaScript number strings
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const BigDecimalFromString: BigDecimalFromString = BigDecimalString.pipe(
+  decodeTo(BigDecimal, bigDecimalFromString)
+)
+
+// -----------------------------------------------------------------------------
+// ByteSize schemas
+// -----------------------------------------------------------------------------
+
+/**
+ * Type-level representation of {@link ByteSize}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface ByteSize extends declare<ByteSize_.ByteSize> {
+  readonly "Rebuild": ByteSize
+}
+/**
+ * Schema for exact, non-negative `ByteSize` values.
+ *
+ * **Details**
+ *
+ * The JSON codec encodes the byte count as a bigint string, preserving values
+ * beyond JavaScript's safe-integer range. The StringTree codec uses the
+ * human-readable byte-size syntax exposed by {@link ByteSizeFromString}.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ByteSize: ByteSize = declare(
+  ByteSize_.isByteSize,
+  {
+    representation: {
+      id: "effect/schema/ByteSize",
+      payload: null
+    },
+    toCode: () => ({
+      runtime: `Schema.ByteSize`,
+      Type: `ByteSize.ByteSize`,
+      importDeclarations: [`import * as ByteSize from "effect/ByteSize"`]
+    }),
+    expected: "ByteSize",
+    toCodecJson: () =>
+      link<ByteSize_.ByteSize>()(
+        BigInt.check(isGreaterThanOrEqualToBigInt(globalThis.BigInt(0))),
+        SchemaTransformation.transform({
+          decode: ByteSize_.bytes,
+          encode: ByteSize_.toBigInt
+        })
+      ),
+    toCodecStringTree: () =>
+      link<ByteSize_.ByteSize>()(
+        ByteSizeString,
+        SchemaTransformation.byteSizeFromString
+      )
+  }
+)
+const ByteSizeString = String.annotate({ expected: "a string that will be decoded as a ByteSize" })
+/**
+ * Type-level representation of {@link ByteSizeFromString}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface ByteSizeFromString extends decodeTo<ByteSize, String> {
+  readonly "Rebuild": ByteSizeFromString
+}
+/**
+ * Schema that decodes byte-size strings into exact, non-negative `ByteSize`
+ * values.
+ *
+ * **Details**
+ *
+ * Decoding accepts an unsigned base-10 integer or decimal followed by optional
+ * whitespace and one of these case-sensitive units:
+ *
+ * - bytes: `B`, `byte`, or `bytes`
+ * - decimal SI units (powers of 1,000): `kB`, `MB`, `GB`, `TB`, `PB`, `EB`,
+ *   `ZB`, `YB`, `RB`, or `QB`, plus their lowercase singular and plural names
+ * - binary IEC units (powers of 1,024): `KiB`, `MiB`, `GiB`, `TiB`, `PiB`,
+ *   `EiB`, `ZiB`, or `YiB`, plus their lowercase singular and plural names
+ *
+ * Leading and trailing whitespace is ignored. A decimal quantity must resolve
+ * to an integral number of bytes, so `1.5 kB` is accepted while `0.1 KiB` is
+ * rejected.
+ *
+ * Encoding returns the exact byte count as `<count> byte` or `<count> bytes`.
+ *
+ * **Gotchas**
+ *
+ * A unit is required. Signs, exponent notation, digit separators, and ambiguous
+ * unit spellings such as `KB`, `mb`, `Mb`, or `b` are rejected.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ByteSizeFromString: ByteSizeFromString = ByteSizeString.pipe(
+  decodeTo(ByteSize, SchemaTransformation.byteSizeFromString)
+)
+/**
+ * Type-level representation of {@link ByteSizeFromBigInt}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface ByteSizeFromBigInt extends decodeTo<ByteSize, BigInt> {
+  readonly "Rebuild": ByteSizeFromBigInt
+}
+/**
+ * Schema that decodes non-negative bigint byte counts.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ByteSizeFromBigInt: ByteSizeFromBigInt = BigInt.pipe(
+  decodeTo(ByteSize, SchemaTransformation.byteSizeFromBigInt)
+)
+/**
+ * Type-level representation of {@link ByteSizeFromNumber}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface ByteSizeFromNumber extends decodeTo<ByteSize, Number> {
+  readonly "Rebuild": ByteSizeFromNumber
+}
+/**
+ * Schema that decodes non-negative safe-integer byte counts.
+ *
+ * **Details**
+ *
+ * Encoding fails when the byte count exceeds `Number.MAX_SAFE_INTEGER`.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ByteSizeFromNumber: ByteSizeFromNumber = Number.pipe(
+  decodeTo(ByteSize, SchemaTransformation.byteSizeFromNumber)
+)
+
+// -----------------------------------------------------------------------------
+// Cause schemas
+// -----------------------------------------------------------------------------
+
+/**
+ * Type-level representation returned by {@link CauseReason}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface CauseReason<E extends Constraint, D extends Constraint> extends
+  declareConstructor<
+    Cause_.Reason<E["Type"]>,
+    Cause_.Reason<E["Encoded"]>,
+    readonly [E, D],
+    CauseReasonIso<E, D>
+  >
+{
+  readonly "Rebuild": CauseReason<E, D>
+  readonly error: E
+  readonly defect: D
+}
+/**
+ * Iso representation used for `CauseReason` schemas.
+ *
+ * **Details**
+ *
+ * Failures are represented with a `Fail` tag and encoded error, defects with a
+ * `Die` tag and encoded defect, and interrupts with an optional `fiberId`.
+ *
+ * @category utility types
+ * @since 4.0.0
+ */
+export type CauseReasonIso<E extends Constraint, D extends Constraint> = {
+  readonly _tag: "Fail"
+  readonly error: E["Iso"]
+} | {
+  readonly _tag: "Die"
+  readonly error: D["Iso"]
+} | {
+  readonly _tag: "Interrupt"
+  readonly fiberId: number | undefined
+}
+/**
+ * Creates a schema for `Cause.Reason` values using separate schemas for typed
+ * failures and unexpected defects.
+ *
+ * **When to use**
+ *
+ * Use when serializing or decoding individual cause reasons separately from a
+ * full failure cause, with distinct schemas for typed errors and defects.
+ *
+ * **Details**
+ *
+ * `Fail` reasons use the `error` schema, `Die` reasons use the `defect` schema,
+ * and `Interrupt` reasons carry only an optional fiber id.
+ *
+ * @see {@link Cause} for constructing schemas for full Cause values
+ * @see {@link CauseReasonIso} for the ISO shape of each cause reason
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export function CauseReason<E extends Constraint, D extends Constraint>(
+  error: E,
+  defect: D
+): CauseReason<E, D> {
+  const schema = declareConstructor<
+    Cause_.Reason<E["Type"]>,
+    Cause_.Reason<E["Encoded"]>,
+    CauseReasonIso<E, D>
+  >()(
+    [error, defect],
+    ([error, defect]) => (input, ast, options) => {
+      if (!Cause_.isReason(input)) {
+        return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
+      }
+      switch (input._tag) {
+        case "Fail":
+          return Effect.mapBothEager(
+            SchemaParser.decodeUnknownEffect(error)(input.error, options),
+            {
+              onSuccess: Cause_.makeFailReason,
+              onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "error", issue, input, options)
+            }
+          )
+        case "Die":
+          return Effect.mapBothEager(
+            SchemaParser.decodeUnknownEffect(defect)(input.defect, options),
+            {
+              onSuccess: Cause_.makeDieReason,
+              onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "defect", issue, input, options)
+            }
+          )
+        case "Interrupt":
+          return Effect.succeed(input)
+      }
+    },
+    {
+      representation: {
+        id: "effect/schema/CauseReason",
+        payload: null
+      },
+      toCode: ({ typeParameters }) => ({
+        runtime: `Schema.CauseReason(${typeParameters[0].runtime}, ${typeParameters[1].runtime})`,
+        Type: `Cause.Failure<${typeParameters[0].Type}, ${typeParameters[1].Type}>`,
+        importDeclarations: [`import * as Cause from "effect/Cause"`]
+      }),
+      expected: "Cause.Failure",
+      toCodec: ([error, defect]) =>
+        link<Cause_.Reason<E["Encoded"]>>()(
+          Union([
+            Struct({ _tag: Literal("Fail"), error }),
+            Struct({ _tag: Literal("Die"), defect }),
+            Struct({
+              _tag: Literal("Interrupt"),
+              fiberId: UndefinedOr(Finite)
+            })
+          ]),
+          SchemaTransformation.transform({
+            decode: (e) => {
+              switch (e._tag) {
+                case "Fail":
+                  return Cause_.makeFailReason(e.error)
+                case "Die":
+                  return Cause_.makeDieReason(e.defect)
+                case "Interrupt":
+                  return Cause_.makeInterruptReason(e.fiberId)
+              }
+            },
+            encode: (reason) => {
+              switch (reason._tag) {
+                case "Fail":
+                  return { _tag: "Fail" as const, error: reason.error }
+                case "Die":
+                  return { _tag: "Die" as const, defect: reason.defect }
+                case "Interrupt":
+                  return { _tag: "Interrupt" as const, fiberId: reason.fiberId }
+              }
+            }
+          })
+        )
+    }
+  )
+  return make(schema.ast, { error, defect })
+}
+/**
+ * Type-level representation returned by {@link Cause}.
+ *
+ * @category models
+ * @since 3.10.0
+ */
+export interface Cause<E extends Constraint, D extends Constraint> extends
+  declareConstructor<
+    Cause_.Cause<E["Type"]>,
+    Cause_.Cause<E["Encoded"]>,
+    readonly [E, D],
+    CauseIso<E, D>
+  >
+{
+  readonly "Rebuild": Cause<E, D>
+  readonly error: E
+  readonly defect: D
+}
+/**
+ * Iso representation used for `Cause` schemas: an ordered array of
+ * `CauseReasonIso` values.
+ *
+ * **When to use**
+ *
+ * Use when working with the ISO shape of a `Cause` schema, such as `toIso`
+ * optics or codecs that expose a cause as its ordered array of encoded reasons.
+ *
+ * @see {@link Cause} for constructing schemas for full Cause values
+ * @see {@link CauseReasonIso} for the ISO shape of each array element
+ *
+ * @category utility types
+ * @since 4.0.0
+ */
+export type CauseIso<E extends Constraint, D extends Constraint> = ReadonlyArray<CauseReasonIso<E, D>>
+/**
+ * Creates a schema for `Cause` values using separate schemas for typed failures
+ * and unexpected defects.
+ *
+ * **When to use**
+ *
+ * Use to validate, transform, or serialize Effect failure causes when typed
+ * failures and unexpected defects need separate schemas.
+ *
+ * **Details**
+ *
+ * The `error` schema is applied to `Fail` reasons and the `defect` schema is
+ * applied to `Die` reasons. Interrupt reasons do not use either schema and
+ * carry only an optional fiber id.
+ *
+ * @see {@link CauseReason} for the schema used by each individual cause reason
+ * @see {@link CauseIso} for the ordered array representation used by the schema ISO
+ *
+ * @category schemas
+ * @since 3.10.0
+ */
+export function Cause<E extends Constraint, D extends Constraint>(error: E, defect: D): Cause<E, D> {
+  const schema = declareConstructor<Cause_.Cause<E["Type"]>, Cause_.Cause<E["Encoded"]>, CauseIso<E, D>>()(
+    [error, defect],
+    ([error, defect]) => {
+      const failures = ArraySchema(CauseReason(error, defect))
+      return (input, ast, options) => {
+        if (!Cause_.isCause(input)) {
+          return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
+        }
+        return Effect.mapBothEager(SchemaParser.decodeUnknownEffect(failures)(input.reasons, options), {
+          onSuccess: Cause_.fromReasons,
+          onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "failures", issue, input, options)
+        })
+      }
+    },
+    {
+      representation: {
+        id: "effect/schema/Cause",
+        payload: null
+      },
+      toCode: ({ typeParameters }) => ({
+        runtime: `Schema.Cause(${typeParameters[0].runtime}, ${typeParameters[1].runtime})`,
+        Type: `Cause.Cause<${typeParameters[0].Type}, ${typeParameters[1].Type}>`,
+        importDeclarations: [`import * as Cause from "effect/Cause"`]
+      }),
+      expected: "Cause",
+      toCodec: ([error, defect]) =>
+        link<Cause_.Cause<E["Encoded"]>>()(
+          ArraySchema(CauseReason(error, defect)),
+          SchemaTransformation.transform({
+            decode: Cause_.fromReasons,
+            encode: ({ reasons: failures }) => failures
+          })
+        )
+    }
+  )
+  return make(schema.ast, { error, defect })
+}
+
+// -----------------------------------------------------------------------------
+// Chunk schemas
+// -----------------------------------------------------------------------------
+
+function chunkLink<Value>(values: Schema<ReadonlyArray<Value>>) {
+  return link<Chunk_.Chunk<Value>>()(
+    values,
+    SchemaTransformation.transform({
+      decode: Chunk_.fromIterable,
+      encode: Arr.fromIterable
+    })
+  )
+}
+/**
+ * Type-level representation returned by {@link Chunk}.
+ *
+ * @category models
+ * @since 3.10.0
+ */
+export interface Chunk<Value extends Constraint> extends
+  declareConstructor<
+    Chunk_.Chunk<Value["Type"]>,
+    Chunk_.Chunk<Value["Encoded"]>,
+    readonly [Value],
+    ChunkIso<Value>
+  >
+{
+  readonly "Rebuild": Chunk<Value>
+  readonly value: Value
+}
+/**
+ * Iso representation used for `Chunk` schemas: an array of element values using
+ * the element schema's `Iso` type.
+ *
+ * **When to use**
+ *
+ * Use when annotating type-level helpers that work with the readonly-array ISO
+ * shape of a `Chunk` schema.
+ *
+ * @see {@link Chunk} for the schema interface and constructor that use this ISO representation
+ *
+ * @category utility types
+ * @since 4.0.0
+ */
+export type ChunkIso<Value extends Constraint> = ReadonlyArray<Value["Iso"]>
+/**
+ * Schema for chunks whose values conform to the provided element schema.
+ *
+ * @category schemas
+ * @since 3.10.0
+ */
+export function Chunk<Value extends Constraint>(value: Value): Chunk<Value> {
+  const schema = declareConstructor<
+    Chunk_.Chunk<Value["Type"]>,
+    Chunk_.Chunk<Value["Encoded"]>,
+    ChunkIso<Value>
+  >()(
+    [value],
+    ([value]) => {
+      const values = ArraySchema(value)
+      return (input, ast, options) => {
+        if (Chunk_.isChunk(input)) {
+          return Effect.mapBothEager(
+            SchemaParser.decodeUnknownEffect(values)(Arr.fromIterable(input), options),
+            {
+              onSuccess: Chunk_.fromIterable,
+              onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "values", issue, input, options)
+            }
+          )
+        }
+        return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
+      }
+    },
+    {
+      representation: {
+        id: "effect/schema/Chunk",
+        payload: null
+      },
+      toCode: ({ typeParameters }) => ({
+        runtime: `Schema.Chunk(${typeParameters[0].runtime})`,
+        Type: `Chunk.Chunk<${typeParameters[0].Type}>`
+      }),
+      expected: "Chunk",
+      toCodec: ([value]) => chunkLink(ArraySchema(value)),
+      toCodecArbitrary: ({ constraint, typeParameters: [value] }) =>
+        chunkLink(
+          withArrayLengthConstraints(
+            ArraySchema(value),
+            constraint?.minLength,
+            constraint?.maxLength
+          )
+        ),
+      toEquivalence: ([value]) => Chunk_.makeEquivalence(value)
+    }
+  )
+  return make(schema.ast, { value })
+}
+
+// -----------------------------------------------------------------------------
+// DateTime schemas
+// -----------------------------------------------------------------------------
+
+function dateTimeUtcFromInput<E extends DateTime.DateTime.Input>(): SchemaGetter.Getter<DateTime.Utc, E> {
+  return SchemaGetter.transformEffect((input, options) => {
+    return Option_.match(DateTime.make(input), {
+      onNone: () =>
+        Effect.fail(
+          new SchemaIssue.InvalidValue({ message: "Invalid DateTime input" }, input, options)
+        ),
+      onSome: (dt) => Effect.succeed(DateTime.toUtc(dt))
+    })
+  })
+}
+const timeZoneOffsetFromNumber: SchemaTransformation.Transformation<DateTime.TimeZone.Offset, number> =
+  SchemaTransformation.transform<DateTime.TimeZone.Offset, number>({
+    decode: (n) => DateTime.zoneMakeOffset(n),
+    encode: (tz) => tz.offset
+  })
+const timeZoneNamedFromString: SchemaTransformation.Transformation<DateTime.TimeZone.Named, string> =
+  SchemaTransformation.transformEffect<DateTime.TimeZone.Named, string>({
+    decode: (s, options) => {
+      return Option_.match(DateTime.zoneMakeNamed(s), {
+        onNone: () =>
+          Effect.fail(
+            new SchemaIssue.InvalidValue(
+              { expected: "a valid IANA time zone" },
+              s,
+              options
+            )
+          ),
+        onSome: Effect.succeed
+      })
+    },
+    encode: (tz) => Effect.succeed(tz.id)
+  })
+const timeZoneFromString: SchemaTransformation.Transformation<DateTime.TimeZone, string> = SchemaTransformation
+  .transformEffect<DateTime.TimeZone, string>({
+    decode: (s, options) => {
+      return Option_.match(DateTime.zoneFromString(s), {
+        onNone: () =>
+          Effect.fail(
+            new SchemaIssue.InvalidValue(
+              { expected: "a valid time zone" },
+              s,
+              options
+            )
+          ),
+        onSome: Effect.succeed
+      })
+    },
+    encode: (tz) => Effect.succeed(DateTime.zoneToString(tz))
+  })
+const dateTimeUtcFromString: SchemaTransformation.Transformation<DateTime.Utc, string> = SchemaTransformation
+  .transformEffect<DateTime.Utc, string>({
+    decode: (s, options) => {
+      return Option_.match(DateTime.make(s), {
+        onNone: () =>
+          Effect.fail(
+            new SchemaIssue.InvalidValue(
+              { expected: "a valid UTC DateTime string" },
+              s,
+              options
+            )
+          ),
+        onSome: (result) => Effect.succeed(DateTime.toUtc(result))
+      })
+    },
+    encode: (utc) => Effect.succeed(DateTime.formatIso(utc))
+  })
+const dateTimeZonedFromString: SchemaTransformation.Transformation<DateTime.Zoned, string> = SchemaTransformation
+  .transformEffect<DateTime.Zoned, string>({
+    decode: (s, options) => {
+      return Option_.match(DateTime.makeZonedFromString(s), {
+        onNone: () =>
+          Effect.fail(
+            new SchemaIssue.InvalidValue(
+              { expected: "a valid Zoned DateTime string" },
+              s,
+              options
+            )
+          ),
+        onSome: Effect.succeed
+      })
+    },
+    encode: (zoned) => Effect.succeed(DateTime.formatIsoZoned(zoned))
+  })
+const arbitraryMinimumDateTimestamp = -8_640_000_000_000_000
+const arbitraryMaximumDateTimestamp = 8_640_000_000_000_000
+const arbitraryMinimumZonedDateTimeTimestamp = arbitraryMinimumDateTimestamp + 14 * 60 * 60 * 1000
+const arbitraryMaximumZonedDateTimeTimestamp = arbitraryMaximumDateTimestamp - 14 * 60 * 60 * 1000
+const arbitraryMinimumTimeZoneOffset = -12 * 60 * 60 * 1000
+const arbitraryMaximumTimeZoneOffset = 14 * 60 * 60 * 1000
+const arbitraryNamedTimeZones = [
+  "UTC",
+  "Europe/London",
+  "America/New_York",
+  "Asia/Tokyo",
+  "Australia/Sydney"
+] as const
+function dateTimeArbitraryBounds<T extends { readonly epochMilliseconds: number }>(
+  constraint: Annotations.ToArbitrary.GenerationConstraint<T> | undefined,
+  domainMinimum: number,
+  domainMaximum: number
+): readonly [minimum: number, maximum: number] {
+  const minimum = Math.max(
+    domainMinimum,
+    constraint?.minimum === undefined
+      ? domainMinimum
+      : constraint.minimum.epochMilliseconds + (constraint.exclusiveMinimum === true ? 1 : 0)
+  )
+  const maximum = Math.min(
+    domainMaximum,
+    constraint?.maximum === undefined
+      ? domainMaximum
+      : constraint.maximum.epochMilliseconds - (constraint.exclusiveMaximum === true ? 1 : 0)
+  )
+  return minimum <= maximum ? [minimum, maximum] : [domainMinimum, domainMaximum]
+}
+function dateTimeArbitraryInteger(minimum: number, maximum: number): Codec<number> {
+  return Int.check(isBetween({ minimum, maximum }))
+}
+function timeZoneArbitrarySchema(): Codec<number | string> {
+  return Union([
+    dateTimeArbitraryInteger(arbitraryMinimumTimeZoneOffset, arbitraryMaximumTimeZoneOffset),
+    Literals(arbitraryNamedTimeZones)
+  ])
+}
+/**
+ * Type-level representation of {@link DateTimeUtc}.
+ *
+ * @category models
+ * @since 3.10.0
+ */
+export interface DateTimeUtc extends declare<DateTime.Utc> {
+  readonly "Rebuild": DateTimeUtc
+}
+/**
+ * Schema for `DateTime.Utc` values.
+ *
+ * **When to use**
+ *
+ * Use to validate existing `DateTime.Utc` schema values and use the default JSON
+ * codec that represents them as UTC ISO strings.
+ *
+ * **Details**
+ *
+ * The default JSON codec decodes UTC ISO strings into `DateTime.Utc` values and
+ * encodes `DateTime.Utc` values as UTC ISO strings.
+ *
+ * @see {@link DateTimeUtcFromString} for decoding date-time strings into UTC values
+ * @see {@link DateTimeUtcFromDate} for decoding JavaScript Date values into UTC values
+ * @see {@link DateTimeUtcFromMillis} for decoding epoch milliseconds into UTC values
+ * @see {@link DateTimeZoned} for preserving zoned DateTime values
+ *
+ * @category schemas
+ * @since 3.10.0
+ */
+export const DateTimeUtc: DateTimeUtc = declare(
+  (u) => DateTime.isDateTime(u) && DateTime.isUtc(u),
+  {
+    representation: {
+      id: "effect/schema/DateTimeUtc",
+      payload: null
+    },
+    toCode: () => ({
+      runtime: `Schema.DateTimeUtc`,
+      Type: `DateTime.Utc`,
+      importDeclarations: [`import * as DateTime from "effect/DateTime"`]
+    }),
+    expected: "DateTime.Utc",
+    toCodecArbitrary: ({ constraint }) => {
+      const [minimum, maximum] = dateTimeArbitraryBounds(
+        constraint,
+        arbitraryMinimumDateTimestamp,
+        arbitraryMaximumDateTimestamp
+      )
+      return linkDecoding<DateTime.Utc>()(
+        dateTimeArbitraryInteger(minimum, maximum),
+        SchemaGetter.transform(DateTime.makeUnsafe)
+      )
+    },
+    toCodecJson: () =>
+      link<DateTime.Utc>()(
+        String,
+        dateTimeUtcFromString
+      ),
+    toFormatter: () => (utc) => utc.toString()
+  }
+)
+/**
+ * Type-level representation of {@link DateTimeUtcFromDate}.
+ *
+ * @category models
+ * @since 3.12.0
+ */
+export interface DateTimeUtcFromDate extends decodeTo<DateTimeUtc, Date> {
+  readonly "Rebuild": DateTimeUtcFromDate
+}
+/**
+ * Schema that decodes a `Date` into a `DateTime.Utc`.
+ *
+ * **When to use**
+ *
+ * Use when you need to decode valid JavaScript `Date` objects into
+ * `DateTime.Utc` values.
+ *
+ * **Details**
+ *
+ * Decoding:
+ * - A **valid** `Date` is decoded as a `DateTime.Utc`
+ *
+ * Encoding:
+ * - A `DateTime.Utc` is encoded as a `Date`
+ *
+ * @see {@link DateTimeUtc} for validating values that are already `DateTime.Utc`
+ * @see {@link DateTimeUtcFromString} for decoding date-time strings into UTC values
+ * @see {@link DateTimeUtcFromMillis} for decoding epoch milliseconds into UTC values
+ * @see {@link Date} for validating Date instances without converting them
+ *
+ * @category schemas
+ * @since 3.12.0
+ */
+export const DateTimeUtcFromDate: DateTimeUtcFromDate = Date.pipe(
+  decodeTo(DateTimeUtc, {
+    decode: dateTimeUtcFromInput(),
+    encode: SchemaGetter.transform(DateTime.toDateUtc)
+  })
+)
+/**
+ * Type-level representation of {@link DateTimeUtcFromString}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface DateTimeUtcFromString extends decodeTo<DateTimeUtc, String> {
+  readonly "Rebuild": DateTimeUtcFromString
+}
+/**
+ * Schema that decodes a date-time string into a `DateTime.Utc`.
+ *
+ * **Details**
+ *
+ * Decoding:
+ *
+ * - A string accepted by `DateTime.make` is parsed and normalized to UTC. Strings
+ *   without an explicit zone are interpreted as UTC.
+ *
+ * Encoding:
+ *
+ * - A `DateTime.Utc` is encoded as a UTC ISO 8601 string.
+ *
+ * @see {@link DateTimeUtcFromDate} for decoding JavaScript Date values into UTC values
+ * @see {@link DateTimeUtcFromMillis} for decoding epoch milliseconds into UTC values
+ * @see {@link DateFromString} for decoding strings into JavaScript Date instances
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const DateTimeUtcFromString: DateTimeUtcFromString = String.annotate({
+  expected: "a string that will be decoded as a DateTime.Utc"
+}).pipe(
+  decodeTo(
+    DateTimeUtc,
+    dateTimeUtcFromString
+  )
+)
+/**
+ * Type-level representation of {@link DateTimeUtcFromMillis}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface DateTimeUtcFromMillis extends decodeTo<instanceOf<DateTime.Utc>, Int> {
+  readonly "Rebuild": DateTimeUtcFromMillis
+}
+/**
+ * Schema that decodes a number into a `DateTime.Utc`.
+ *
+ * **Details**
+ *
+ * Decoding:
+ * - A number of milliseconds since the Unix epoch is decoded as a `DateTime.Utc`
+ *
+ * Encoding:
+ * - A `DateTime.Utc` is encoded as a number of milliseconds since the Unix epoch.
+ *
+ * @see {@link DateTimeUtcFromDate} for decoding JavaScript Date values into UTC values
+ * @see {@link DateTimeUtcFromString} for decoding date-time strings into UTC values
+ * @see {@link DateFromMillis} for decoding epoch milliseconds into JavaScript Date instances
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const DateTimeUtcFromMillis: DateTimeUtcFromMillis = Int.pipe(
+  decodeTo(DateTimeUtc, {
+    decode: dateTimeUtcFromInput(),
+    encode: SchemaGetter.transform(DateTime.toEpochMillis)
+  })
+)
+/**
+ * Type-level representation of {@link TimeZoneOffset}.
+ *
+ * @category models
+ * @since 3.10.0
+ */
+export interface TimeZoneOffset extends declare<DateTime.TimeZone.Offset> {
+  readonly "Rebuild": TimeZoneOffset
+}
+/**
+ * Schema for `DateTime.TimeZone.Offset` values.
+ *
+ * **Details**
+ *
+ * Default JSON serializer:
+ *
+ * - encodes `DateTime.TimeZone.Offset` as a number (offset in milliseconds)
+ *
+ * @category schemas
+ * @since 3.10.0
+ */
+export const TimeZoneOffset: TimeZoneOffset = declare(
+  DateTime.isTimeZoneOffset,
+  {
+    representation: {
+      id: "effect/schema/TimeZoneOffset",
+      payload: null
+    },
+    toCode: () => ({
+      runtime: `Schema.TimeZoneOffset`,
+      Type: `DateTime.TimeZone.Offset`,
+      importDeclarations: [`import * as DateTime from "effect/DateTime"`]
+    }),
+    expected: "DateTime.TimeZone.Offset",
+    toCodecJson: () =>
+      link<DateTime.TimeZone.Offset>()(
+        Int,
+        timeZoneOffsetFromNumber
+      ),
+    toFormatter: () => (tz) => DateTime.zoneToString(tz)
+  }
+)
+/**
+ * Type-level representation of {@link TimeZoneNamed}.
+ *
+ * @category models
+ * @since 3.10.0
+ */
+export interface TimeZoneNamed extends declare<DateTime.TimeZone.Named> {
+  readonly "Rebuild": TimeZoneNamed
+}
+const TimeZoneNamedString = String.annotate({ expected: "an IANA time zone identifier" })
+/**
+ * Schema for `DateTime.TimeZone.Named` values.
+ *
+ * **Details**
+ *
+ * Default JSON serializer:
+ *
+ * - encodes `DateTime.TimeZone.Named` as a string (IANA time zone identifier)
+ *
+ * @category schemas
+ * @since 3.10.0
+ */
+export const TimeZoneNamed: TimeZoneNamed = declare(
+  DateTime.isTimeZoneNamed,
+  {
+    representation: {
+      id: "effect/schema/TimeZoneNamed",
+      payload: null
+    },
+    toCode: () => ({
+      runtime: `Schema.TimeZoneNamed`,
+      Type: `DateTime.TimeZone.Named`,
+      importDeclarations: [`import * as DateTime from "effect/DateTime"`]
+    }),
+    expected: "DateTime.TimeZone.Named",
+    toCodecArbitrary: () =>
+      linkDecoding<DateTime.TimeZone.Named>()(
+        Literals(arbitraryNamedTimeZones),
+        SchemaGetter.transform(DateTime.zoneMakeNamedUnsafe)
+      ),
+    toCodecJson: () =>
+      link<DateTime.TimeZone.Named>()(
+        TimeZoneNamedString,
+        timeZoneNamedFromString
+      ),
+    toFormatter: () => (tz) => DateTime.zoneToString(tz)
+  }
+)
+/**
+ * Type-level representation of {@link TimeZoneNamedFromString}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface TimeZoneNamedFromString extends decodeTo<TimeZoneNamed, String> {
+  readonly "Rebuild": TimeZoneNamedFromString
+}
+/**
+ * Schema that parses an IANA time zone identifier string into a `DateTime.TimeZone.Named`.
+ *
+ * **Details**
+ *
+ * Decoding:
+ * - A `string` is decoded as a `DateTime.TimeZone.Named`.
+ *
+ * Encoding:
+ * - A `DateTime.TimeZone.Named` is encoded as a `string`.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const TimeZoneNamedFromString: TimeZoneNamedFromString = TimeZoneNamedString.pipe(
+  decodeTo(TimeZoneNamed, timeZoneNamedFromString)
+)
+/**
+ * Type-level representation of {@link TimeZone}.
+ *
+ * @category models
+ * @since 3.10.0
+ */
+export interface TimeZone extends declare<DateTime.TimeZone> {
+  readonly "Rebuild": TimeZone
+}
+const TimeZoneString = String.annotate({
+  expected: "a time zone string (IANA identifier or offset like +03:00)"
+})
+/**
+ * Schema for `DateTime.TimeZone` values.
+ *
+ * **Details**
+ *
+ * Default JSON serializer:
+ *
+ * - encodes `DateTime.TimeZone` as a string (IANA identifier or offset like
+ *   `+03:00`)
+ *
+ * @category schemas
+ * @since 3.10.0
+ */
+export const TimeZone: TimeZone = declare(
+  DateTime.isTimeZone,
+  {
+    representation: {
+      id: "effect/schema/TimeZone",
+      payload: null
+    },
+    toCode: () => ({
+      runtime: `Schema.TimeZone`,
+      Type: `DateTime.TimeZone`,
+      importDeclarations: [`import * as DateTime from "effect/DateTime"`]
+    }),
+    expected: "DateTime.TimeZone",
+    toCodecArbitrary: () =>
+      linkDecoding<DateTime.TimeZone>()(
+        timeZoneArbitrarySchema(),
+        SchemaGetter.transform((value) =>
+          typeof value === "number" ? DateTime.zoneMakeOffset(value) : DateTime.zoneMakeNamedUnsafe(value)
+        )
+      ),
+    toCodecJson: () =>
+      link<DateTime.TimeZone>()(
+        TimeZoneString,
+        timeZoneFromString
+      ),
+    toFormatter: () => (tz) => DateTime.zoneToString(tz)
+  }
+)
+/**
+ * Type-level representation of {@link TimeZoneFromString}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface TimeZoneFromString extends decodeTo<TimeZone, String> {
+  readonly "Rebuild": TimeZoneFromString
+}
+/**
+ * Schema that parses a time zone string into a `DateTime.TimeZone`.
+ *
+ * **Details**
+ *
+ * Decoding:
+ * - A `string` (IANA identifier or offset like `+03:00`) is decoded as a `DateTime.TimeZone`.
+ *
+ * Encoding:
+ * - A `DateTime.TimeZone` is encoded as a `string`.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const TimeZoneFromString: TimeZoneFromString = TimeZoneString.pipe(
+  decodeTo(TimeZone, timeZoneFromString)
+)
 /**
- * Type-level representation returned by {@link Graph}.
+ * Type-level representation of {@link DateTimeZoned}.
  *
  * @category models
- * @since 4.0.0
+ * @since 3.10.0
  */
-export interface Graph<T extends Graph_.Kind, Node extends Constraint, Edge extends Constraint>
-  extends
-    declareConstructor<
-      Graph_.Graph<Node["Type"], Edge["Type"], T>,
-      Graph_.Graph<Node["Encoded"], Edge["Encoded"], T>,
-      readonly [Node, Edge],
-      GraphIso<T, Node, Edge>
-    >
-{
-  readonly "Rebuild": Graph<T, Node, Edge>
-  readonly type: T
-  readonly node: Node
-  readonly edge: Edge
-}
-
-function graphEncodedSchema<T extends Graph_.Kind, Node extends Constraint, Edge extends Constraint>(
-  type: T,
-  node: Node,
-  edge: Edge
-) {
-  return Struct({
-    type: Literal(type),
-    nodes: ArraySchema(Struct({ index: Natural, data: node })),
-    edges: ArraySchema(Struct({ index: Natural, source: Natural, target: Natural, data: edge }))
-  })
+export interface DateTimeZoned extends declare<DateTime.Zoned> {
+  readonly "Rebuild": DateTimeZoned
 }
-
-function graphDecode<N, E, T extends Graph_.Kind>(
-  input: EncodedGraph<N, E, T>,
-  options: SchemaAST.ParseOptions
-): Effect.Effect<Graph_.Graph<N, E, T>, SchemaIssue.Issue> {
-  let previous = -1
-  const indexes = new Set<Graph_.NodeIndex>()
-  for (let i = 0; i < input.nodes.length; i++) {
-    const index = input.nodes[i].index
-    if (index <= previous) {
-      return Effect.fail(
-        new SchemaIssue.Pointer(
-          ["nodes", i, "index"],
-          new SchemaIssue.InvalidValue({ expected: "a strictly increasing node index" }, index, options)
-        )
-      )
-    }
-    previous = index
-    indexes.add(index)
-  }
-
-  previous = -1
-  for (let i = 0; i < input.edges.length; i++) {
-    const edge = input.edges[i]
-    if (edge.index <= previous) {
-      return Effect.fail(
-        new SchemaIssue.Pointer(
-          ["edges", i, "index"],
-          new SchemaIssue.InvalidValue({ expected: "a strictly increasing edge index" }, edge.index, options)
-        )
-      )
-    }
-    previous = edge.index
-    if (!indexes.has(edge.source)) {
-      return Effect.fail(
-        new SchemaIssue.Pointer(
-          ["edges", i, "source"],
-          new SchemaIssue.InvalidValue({ expected: "an encoded node index" }, edge.source, options)
-        )
+const DateTimeZonedString = String.annotate({
+  expected: "a zoned DateTime string (e.g. 2024-01-01T00:00:00.000+00:00[Europe/London])"
+})
+/**
+ * Schema for `DateTime.Zoned` values.
+ *
+ * **Details**
+ *
+ * Default JSON serializer:
+ *
+ * - encodes offset zones as an ISO date-time with a numeric offset, such as
+ *   `YYYY-MM-DDTHH:mm:ss.sss+HH:MM`
+ * - encodes named zones by appending the IANA identifier in brackets, such as
+ *   `YYYY-MM-DDTHH:mm:ss.sss+HH:MM[Time/Zone]`
+ *
+ * @category schemas
+ * @since 3.10.0
+ */
+export const DateTimeZoned: DateTimeZoned = declare(
+  (u) => DateTime.isDateTime(u) && DateTime.isZoned(u),
+  {
+    representation: {
+      id: "effect/schema/DateTimeZoned",
+      payload: null
+    },
+    toCode: () => ({
+      runtime: `Schema.DateTimeZoned`,
+      Type: `DateTime.Zoned`,
+      importDeclarations: [`import * as DateTime from "effect/DateTime"`]
+    }),
+    expected: "DateTime.Zoned",
+    toCodecArbitrary: ({ constraint }) => {
+      const [minimum, maximum] = dateTimeArbitraryBounds(
+        constraint,
+        arbitraryMinimumZonedDateTimeTimestamp,
+        arbitraryMaximumZonedDateTimeTimestamp
       )
-    }
-    if (!indexes.has(edge.target)) {
-      return Effect.fail(
-        new SchemaIssue.Pointer(
-          ["edges", i, "target"],
-          new SchemaIssue.InvalidValue({ expected: "an encoded node index" }, edge.target, options)
+      return linkDecoding<DateTime.Zoned>()(
+        Struct({
+          epochMilliseconds: dateTimeArbitraryInteger(minimum, maximum),
+          timeZone: timeZoneArbitrarySchema()
+        }),
+        SchemaGetter.transform(({ epochMilliseconds, timeZone }) =>
+          DateTime.makeZonedUnsafe(epochMilliseconds, { timeZone })
         )
       )
-    }
-  }
-
-  return Effect.succeed(InternalGraph.hydrate(input))
-}
-
-function graphEncode<N, E, T extends Graph_.Kind>(
-  input: Graph_.Graph<N, E, T>,
-  type: T,
-  options: SchemaAST.ParseOptions
-): Effect.Effect<EncodedGraph<N, E, T>, SchemaIssue.Issue> {
-  if (!Graph_.isGraph(input) || input.mutable || input.type !== type) {
-    return Effect.fail(new SchemaIssue.InvalidValue({ expected: `an immutable ${type} Graph` }, input, options))
-  }
-  return Effect.succeed(InternalGraph.snapshot(input))
-}
-
-function graphToEquivalence<N, E, T extends Graph_.Kind>(
-  node: Equivalence.Equivalence<N>,
-  edge: Equivalence.Equivalence<E>
-) {
-  return (self: Graph_.Graph<N, E, T>, that: Graph_.Graph<N, E, T>): boolean => {
-    const a = InternalGraph.snapshot(self)
-    const b = InternalGraph.snapshot(that)
-    if (a.type !== b.type || a.nodes.length !== b.nodes.length || a.edges.length !== b.edges.length) return false
-    for (let i = 0; i < a.nodes.length; i++) {
-      if (a.nodes[i].index !== b.nodes[i].index || !node(a.nodes[i].data, b.nodes[i].data)) return false
-    }
-    for (let i = 0; i < a.edges.length; i++) {
-      const ae = a.edges[i]
-      const be = b.edges[i]
-      const sameEndpoints = a.type === "directed"
-        ? ae.source === be.source && ae.target === be.target
-        : (ae.source === be.source && ae.target === be.target) ||
-          (ae.source === be.target && ae.target === be.source)
-      if (
-        ae.index !== be.index || !sameEndpoints || !edge(ae.data, be.data)
-      ) return false
-    }
-    return true
+    },
+    toCodecJson: () =>
+      link<DateTime.Zoned>()(
+        DateTimeZonedString,
+        dateTimeZonedFromString
+      ),
+    toFormatter: () => (zoned) => DateTime.formatIsoZoned(zoned),
+    toEquivalence: () => DateTime.Equivalence
   }
+)
+/**
+ * Type-level representation of {@link DateTimeZonedFromString}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface DateTimeZonedFromString extends decodeTo<DateTimeZoned, String> {
+  readonly "Rebuild": DateTimeZonedFromString
 }
-
-type GraphArbitraryRepresentation<N, E> = null | {
-  readonly nodes: readonly [N, ...Array<N>]
-  readonly edges: ReadonlyArray<readonly [source: number, target: number, data: E]>
-}
-
-function graphToArbitrary<N, E, T extends Graph_.Kind>(
-  type: T,
-  node: Codec<N>,
-  edge: Codec<E>
-) {
-  return linkDecoding<Graph_.Graph<N, E, T>>()(
-    Union([
-      Null,
-      Struct({
-        nodes: NonEmptyArray(node),
-        edges: ArraySchema(Tuple([Natural, Natural, edge]))
-      })
-    ]),
-    SchemaGetter.transform<Graph_.Graph<N, E, T>, GraphArbitraryRepresentation<N, E>>((input) => {
-      if (input === null) return InternalGraph.hydrate({ type, nodes: [], edges: [] })
-      const nodes = input.nodes.map((data, index) => ({ index, data }))
-      return InternalGraph.hydrate({
-        type,
-        nodes,
-        edges: input.edges.map(([source, target, data], index) => ({
-          index,
-          source: source % nodes.length,
-          target: target % nodes.length,
-          data
-        }))
-      })
-    })
-  )
-}
-
 /**
- * Creates a schema for immutable directed or undirected Effect graphs.
+ * Schema that parses a zoned DateTime string into a `DateTime.Zoned`.
  *
  * **Details**
  *
- * Encoding preserves active node and edge indexes, payloads, endpoints,
- * isolated nodes, self-loops, parallel edges, and stored edge orientation. It
- * does not encode removed-ID allocator history; after decoding, future allocation starts
- * after the highest active decoded index. Encoding rejects mutable graphs.
- * `Graph.toJSON()` remains an inspection summary and is not this wire format.
- *
- * **Example** (Encoding a directed graph as JSON)
- *
- * ```ts import.meta.vitest
- * import { Graph, Schema } from "effect"
+ * Decoding:
+ * - A `string` (e.g. `2024-01-01T00:00:00.000+00:00[Europe/London]`) is decoded as a `DateTime.Zoned`.
  *
- * const codec = Schema.toCodecJson(Schema.Graph("directed", Schema.String, Schema.Number))
- * const graph = Graph.directed<string, number>((mutable) => {
- *   const source = Graph.addNode(mutable, "A")
- *   const target = Graph.addNode(mutable, "B")
- *   Graph.addEdge(mutable, source, target, 1)
- * })
+ * Encoding:
+ * - A `DateTime.Zoned` is encoded as a `string`.
  *
- * const encoded = Schema.encodeSync(codec)(graph)
+ * @category schemas
+ * @since 4.0.0
+ */
+export const DateTimeZonedFromString: DateTimeZonedFromString = DateTimeZonedString.pipe(
+  decodeTo(DateTimeZoned, dateTimeZonedFromString)
+)
+
+const netAddressFromString = <S extends declare<any>, E extends { readonly message: string }>(
+  declaration: S,
+  parse: (input: string) => Result_.Result<S["Type"], E>,
+  encode: (value: S["Type"]) => string,
+  identifier: string
+) =>
+  String.pipe(decodeTo(
+    declaration,
+    SchemaTransformation.transformEffect({
+      decode: (input, options) => {
+        const result = parse(input)
+        return Result_.isSuccess(result)
+          ? Effect.succeed(result.success)
+          : Effect.fail(new SchemaIssue.InvalidValue({ message: result.failure.message }, input, options))
+      },
+      encode: (value) => Effect.succeed(encode(value))
+    })
+  )).annotate({ identifier })
+
+/**
+ * Type-level representation of {@link MacAddress}.
  *
- * encoded.type // => "directed"
- * encoded.nodes // => [{ index: 0, data: "A" }, { index: 1, data: "B" }]
- * encoded.edges // => [{ index: 0, source: 0, target: 1, data: 1 }]
- * ```
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface MacAddress extends declare<NetAddress_.MacAddress> {
+  readonly "Rebuild": MacAddress
+}
+
+/**
+ * Schema for already-constructed MAC address values.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export function Graph<Node extends Constraint, Edge extends Constraint>(
-  type: "directed",
-  node: Node,
-  edge: Edge
-): Graph<"directed", Node, Edge>
-export function Graph<Node extends Constraint, Edge extends Constraint>(
-  type: "undirected",
-  node: Node,
-  edge: Edge
-): Graph<"undirected", Node, Edge>
-export function Graph<T extends Graph_.Kind, Node extends Constraint, Edge extends Constraint>(
-  type: T,
-  node: Node,
-  edge: Edge
-): Graph<T, Node, Edge>
-export function Graph<T extends Graph_.Kind, Node extends Constraint, Edge extends Constraint>(
-  type: T,
-  node: Node,
-  edge: Edge
-): Graph<T, Node, Edge> {
-  const schema = declareConstructor<
-    Graph_.Graph<Node["Type"], Edge["Type"], T>,
-    Graph_.Graph<Node["Encoded"], Edge["Encoded"], T>,
-    GraphIso<T, Node, Edge>
-  >()(
-    [node, edge],
-    ([node, edge]) => {
-      const encoded = graphEncodedSchema(type, node, edge)
-      return (input, ast, options) => {
-        if (!Graph_.isGraph(input) || input.mutable || input.type !== type) {
-          return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
-        }
-        return Effect.flatMap(
-          SchemaParser.decodeUnknownEffect(encoded)(InternalGraph.snapshot(input), options),
-          (snapshot) => graphDecode(snapshot, options)
-        )
-      }
-    },
-    {
-      representation: {
-        id: "effect/schema/Graph",
-        payload: type
-      },
-      toCode: ({ typeParameters }) => ({
-        runtime: `Schema.Graph(${format(type)}, ${typeParameters[0].runtime}, ${typeParameters[1].runtime})`,
-        Type: `Graph.Graph<${typeParameters[0].Type}, ${typeParameters[1].Type}, ${format(type)}>`,
-        importDeclarations: [`import * as Graph from "effect/Graph"`]
-      }),
-      expected: `an immutable ${type} Graph`,
-      toCodec: ([node, edge]) =>
-        link<Graph_.Graph<Node["Encoded"], Edge["Encoded"], T>>()(
-          graphEncodedSchema(type, node, edge),
-          SchemaTransformation.transformOrFail({
-            decode: graphDecode,
-            encode: (graph, options) => graphEncode(graph, type, options)
-          })
-        ),
-      toCodecArbitrary: ({ typeParameters: [node, edge] }) => graphToArbitrary(type, node, edge),
-      toEquivalence: ([node, edge]) => graphToEquivalence(node, edge)
-    }
-  )
-  return make(schema.ast, { type, node, edge })
+export const MacAddress: MacAddress = declare(NetAddress_.isMacAddress, {
+  identifier: "MacAddress"
+})
+
+/**
+ * Type-level representation of {@link MacAddressFromString}.
+ *
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface MacAddressFromString extends decodeTo<MacAddress, String> {
+  readonly "Rebuild": MacAddressFromString
 }
 
 /**
- * Reviver for persisted {@link Graph} declarations.
+ * Schema for MAC addresses encoded as canonical colon-separated hexadecimal strings.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const GraphReviver = InternalSchema.makeDeclarationReviver(
-  "effect/schema/Graph",
-  Literals(["directed", "undirected"]),
-  ({ annotations, payload, typeParameters }) => {
-    const schema = Graph(payload, typeParameters[0], typeParameters[1])
-    return annotations === undefined ? schema : schema.annotate(annotations)
-  }
+export const MacAddressFromString: MacAddressFromString = netAddressFromString(
+  MacAddress,
+  NetAddress_.macAddressFromString,
+  NetAddress_.formatMacAddress,
+  "MacAddressFromString"
 )
 
 /**
- * Type-level representation returned by {@link HashMap}.
+ * Type-level representation of {@link Ipv4Address}.
  *
+ * @unstable
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
-export interface HashMap<Key extends Constraint, Value extends Constraint> extends
-  declareConstructor<
-    HashMap_.HashMap<Key["Type"], Value["Type"]>,
-    HashMap_.HashMap<Key["Encoded"], Value["Encoded"]>,
-    readonly [Key, Value],
-    HashMapIso<Key, Value>
-  >
-{
-  readonly "Rebuild": HashMap<Key, Value>
-  readonly key: Key
-  readonly value: Value
+export interface Ipv4Address extends declare<NetAddress_.Ipv4Address> {
+  readonly "Rebuild": Ipv4Address
 }
 
 /**
- * Iso representation used for `HashMap` schemas: an array of readonly
- * `[key, value]` tuples using each entry schema's `Iso` type.
+ * Schema for already-constructed IPv4 address values.
  *
- * @category utility types
+ * @unstable
+ * @category schemas
  * @since 4.0.0
  */
-export type HashMapIso<Key extends Constraint, Value extends Constraint> = ReadonlyArray<
-  readonly [Key["Iso"], Value["Iso"]]
->
+export const Ipv4Address: Ipv4Address = declare(NetAddress_.isIpv4Address, {
+  identifier: "Ipv4Address"
+})
 
 /**
- * Schema for hash maps whose keys and values conform to the provided schemas.
+ * Type-level representation of {@link Ipv4AddressFromString}.
  *
- * @category schemas
- * @since 3.10.0
+ * @unstable
+ * @category models
+ * @since 4.0.0
  */
-export function HashMap<Key extends Constraint, Value extends Constraint>(key: Key, value: Value): HashMap<Key, Value> {
-  const schema = declareConstructor<
-    HashMap_.HashMap<Key["Type"], Value["Type"]>,
-    HashMap_.HashMap<Key["Encoded"], Value["Encoded"]>,
-    HashMapIso<Key, Value>
-  >()(
-    [key, value],
-    ([key, value]) => {
-      const entries = ArraySchema(Tuple([key, value]))
-      return (input, ast, options) => {
-        if (HashMap_.isHashMap(input)) {
-          return Effect.mapBothEager(
-            SchemaParser.decodeUnknownEffect(entries)(HashMap_.toEntries(input), options),
-            {
-              onSuccess: HashMap_.fromIterable,
-              onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "entries", issue, input, options)
-            }
-          )
-        }
-        return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
-      }
-    },
-    {
-      representation: {
-        id: "effect/schema/HashMap",
-        payload: null
-      },
-      toCode: ({ typeParameters }) => ({
-        runtime: `Schema.HashMap(${typeParameters[0].runtime}, ${typeParameters[1].runtime})`,
-        Type: `HashMap.HashMap<${typeParameters[0].Type}, ${typeParameters[1].Type}>`,
-        importDeclarations: [`import * as HashMap from "effect/HashMap"`]
-      }),
-      expected: "HashMap",
-      toCodec: ([key, value]) => hashMapLink(ArraySchema(Tuple([key, value]))),
-      toCodecArbitrary: ({ constraint, typeParameters: [key, value] }) =>
-        hashMapLink(
-          withArrayLengthConstraints(
-            ArraySchema(Tuple([key, value])).check(isUniqueKey()),
-            constraint?.minSize,
-            constraint?.maxSize
-          )
-        ),
-      toEquivalence: ([key, value]) => Equal.makeCompareMap(key, value)
-    }
-  )
-  return make(schema.ast, { key, value })
+export interface Ipv4AddressFromString extends decodeTo<Ipv4Address, String> {
+  readonly "Rebuild": Ipv4AddressFromString
 }
 
 /**
- * Reviver for persisted `HashMap` declarations.
+ * Schema for IPv4 addresses encoded as canonical dotted-decimal strings.
  *
- * **When to use**
+ * @unstable
+ * @category schemas
+ * @since 4.0.0
+ */
+export const Ipv4AddressFromString: Ipv4AddressFromString = netAddressFromString(
+  Ipv4Address,
+  NetAddress_.ipv4FromString,
+  NetAddress_.formatIp,
+  "Ipv4AddressFromString"
+)
+
+/**
+ * Type-level representation of {@link Ipv6Address}.
+ *
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface Ipv6Address extends declare<NetAddress_.Ipv6Address> {
+  readonly "Rebuild": Ipv6Address
+}
+
+/**
+ * Schema for already-constructed IPv6 address values.
  *
- * Use when reconstructing documents that may contain schemas created by {@link HashMap}.
+ * @unstable
+ * @category schemas
+ * @since 4.0.0
+ */
+export const Ipv6Address: Ipv6Address = declare(NetAddress_.isIpv6Address, {
+  identifier: "Ipv6Address"
+})
+
+/**
+ * Type-level representation of {@link Ipv6AddressFromString}.
  *
- * @see {@link HashMap} for creating the corresponding schema
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface Ipv6AddressFromString extends decodeTo<Ipv6Address, String> {
+  readonly "Rebuild": Ipv6AddressFromString
+}
+
+/**
+ * Schema for IPv6 addresses encoded as canonical strings.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const HashMapReviver = InternalSchema.makeDeclarationReviver(
-  "effect/schema/HashMap",
-  Null,
-  ({ annotations, typeParameters }) => {
-    const schema = HashMap(typeParameters[0], typeParameters[1])
-    return annotations === undefined ? schema : schema.annotate(annotations)
-  }
+export const Ipv6AddressFromString: Ipv6AddressFromString = netAddressFromString(
+  Ipv6Address,
+  NetAddress_.ipv6FromString,
+  NetAddress_.formatIp,
+  "Ipv6AddressFromString"
 )
 
 /**
- * Type-level representation returned by {@link ReadonlySet}.
+ * Type-level representation of {@link IpAddress}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface $ReadonlySet<Value extends Constraint> extends
-  declareConstructor<
-    globalThis.ReadonlySet<Value["Type"]>,
-    globalThis.ReadonlySet<Value["Encoded"]>,
-    readonly [Value],
-    ReadonlySetIso<Value>
-  >
-{
-  readonly "Rebuild": $ReadonlySet<Value>
-  readonly value: Value
+export interface IpAddress extends declare<NetAddress_.IpAddress> {
+  readonly "Rebuild": IpAddress
 }
 
 /**
- * Iso representation used for `ReadonlySet` schemas: an array of element values
- * using the element schema's `Iso` type.
+ * Schema for already-constructed IPv4 or IPv6 address values.
  *
- * @category utility types
+ * @unstable
+ * @category schemas
  * @since 4.0.0
  */
-export type ReadonlySetIso<Value extends Constraint> = ReadonlyArray<Value["Iso"]>
+export const IpAddress: IpAddress = declare(NetAddress_.isIpAddress, {
+  identifier: "IpAddress"
+})
 
 /**
- * Schema for readonly sets whose values conform to the provided element schema.
+ * Type-level representation of {@link IpAddressFromString}.
+ *
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface IpAddressFromString extends decodeTo<IpAddress, String> {
+  readonly "Rebuild": IpAddressFromString
+}
+
+/**
+ * Schema for IP addresses encoded as canonical numeric strings.
  *
+ * @unstable
  * @category schemas
- * @since 3.10.0
+ * @since 4.0.0
  */
-export function ReadonlySet<Value extends Constraint>(value: Value): $ReadonlySet<Value> {
-  const schema = declareConstructor<
-    globalThis.ReadonlySet<Value["Type"]>,
-    globalThis.ReadonlySet<Value["Encoded"]>,
-    ReadonlySetIso<Value>
-  >()(
-    [value],
-    ([value]) => {
-      const array = ArraySchema(value)
-      return (input, ast, options) => {
-        if (input instanceof globalThis.Set) {
-          return Effect.mapBothEager(
-            SchemaParser.decodeUnknownEffect(array)([...input], options),
-            {
-              onSuccess: (array: ReadonlyArray<Value["Type"]>) => new globalThis.Set(array),
-              onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "values", issue, input, options)
-            }
-          )
-        }
-        return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
-      }
-    },
-    {
-      representation: {
-        id: "effect/schema/ReadonlySet",
-        payload: null
-      },
-      toCode: ({ typeParameters }) => ({
-        runtime: `Schema.ReadonlySet(${typeParameters[0].runtime})`,
-        Type: `globalThis.ReadonlySet<${typeParameters[0].Type}>`
-      }),
-      expected: "ReadonlySet",
-      toCodec: ([value]) =>
-        link<globalThis.Set<Value["Encoded"]>>()(
-          ArraySchema(value),
-          SchemaTransformation.transform({
-            decode: (values) => new globalThis.Set(values),
-            encode: (set) => [...set.values()]
-          })
-        )
-    }
-  )
-  return make(schema.ast, { value })
+export const IpAddressFromString: IpAddressFromString = netAddressFromString(
+  IpAddress,
+  NetAddress_.ipFromString,
+  NetAddress_.formatIp,
+  "IpAddressFromString"
+)
+
+const netAddressRefinement = <S extends Constraint, T extends S["Type"]>(
+  schema: S,
+  guard: (value: S["Type"]) => value is T,
+  expected: string,
+  identifier: string
+): refine<T, S> => refine(guard, { expected })(schema).annotate({ identifier })
+
+/**
+ * Type-level representation of {@link IpMulticastAddress}.
+ *
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface IpMulticastAddress extends refine<NetAddress_.MulticastAddress<NetAddress_.IpAddress>, IpAddress> {
+  readonly "Rebuild": IpMulticastAddress
+}
+
+/**
+ * Schema for already-constructed multicast IP addresses.
+ *
+ * @unstable
+ * @category schemas
+ * @since 4.0.0
+ */
+export const IpMulticastAddress: IpMulticastAddress = netAddressRefinement(
+  IpAddress,
+  NetAddress_.isMulticast,
+  "a multicast address",
+  "IpMulticastAddress"
+)
+
+/**
+ * Type-level representation of {@link IpMulticastAddressFromString}.
+ *
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface IpMulticastAddressFromString
+  extends refine<NetAddress_.MulticastAddress<NetAddress_.IpAddress>, IpAddressFromString>
+{
+  readonly "Rebuild": IpMulticastAddressFromString
 }
 
 /**
- * Reviver for persisted {@link ReadonlySet} declarations.
+ * Schema for multicast IP addresses encoded as numeric strings.
  *
- * **When to use**
+ * **Example** (Decoding a validated multicast address)
  *
- * Use when reconstructing documents that may contain schemas created by {@link ReadonlySet}.
+ * ```ts import.meta.vitest
+ * import { assert } from "@effect/vitest"
+ * import { Schema } from "effect"
+ * import { NetAddress } from "effect/unstable/net"
  *
- * @see {@link ReadonlySet} for creating the corresponding schema
+ * const address = Schema.decodeUnknownSync(Schema.IpMulticastAddressFromString)("239.255.0.1")
+ * assert.isTrue(NetAddress.isMulticast(address))
+ * ```
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const ReadonlySetReviver = InternalSchema.makeDeclarationReviver(
-  "effect/schema/ReadonlySet",
-  Null,
-  ({ annotations, typeParameters }) => {
-    const schema = ReadonlySet(typeParameters[0])
-    return annotations === undefined ? schema : schema.annotate(annotations)
-  }
+export const IpMulticastAddressFromString: IpMulticastAddressFromString = netAddressRefinement(
+  IpAddressFromString,
+  NetAddress_.isMulticast,
+  "a multicast address",
+  "IpMulticastAddressFromString"
 )
 
 /**
- * Type-level representation returned by {@link HashSet}.
+ * Type-level representation of {@link MacMulticastAddress}.
  *
+ * @unstable
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
-export interface HashSet<Value extends Constraint> extends
-  declareConstructor<
-    HashSet_.HashSet<Value["Type"]>,
-    HashSet_.HashSet<Value["Encoded"]>,
-    readonly [Value],
-    HashSetIso<Value>
-  >
-{
-  readonly "Rebuild": HashSet<Value>
-  readonly value: Value
+export interface MacMulticastAddress extends refine<NetAddress_.MulticastAddress<NetAddress_.MacAddress>, MacAddress> {
+  readonly "Rebuild": MacMulticastAddress
 }
 
 /**
- * Iso representation used for `HashSet` schemas: an array of element values
- * using the element schema's `Iso` type.
+ * Schema for already-constructed multicast MAC addresses.
  *
- * @category utility types
+ * @unstable
+ * @category schemas
  * @since 4.0.0
  */
-export type HashSetIso<Value extends Constraint> = ReadonlyArray<Value["Iso"]>
+export const MacMulticastAddress: MacMulticastAddress = netAddressRefinement(
+  MacAddress,
+  NetAddress_.isMulticast,
+  "a multicast address",
+  "MacMulticastAddress"
+)
 
 /**
- * Schema for hash sets whose values conform to the provided element schema.
+ * Type-level representation of {@link MacMulticastAddressFromString}.
  *
- * @category schemas
- * @since 3.10.0
+ * @unstable
+ * @category models
+ * @since 4.0.0
  */
-export function HashSet<Value extends Constraint>(value: Value): HashSet<Value> {
-  const schema = declareConstructor<
-    HashSet_.HashSet<Value["Type"]>,
-    HashSet_.HashSet<Value["Encoded"]>,
-    HashSetIso<Value>
-  >()(
-    [value],
-    ([value]) => {
-      const values = ArraySchema(value)
-      return (input, ast, options) => {
-        if (HashSet_.isHashSet(input)) {
-          return Effect.mapBothEager(
-            SchemaParser.decodeUnknownEffect(values)(Arr.fromIterable(input), options),
-            {
-              onSuccess: HashSet_.fromIterable,
-              onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "values", issue, input, options)
-            }
-          )
-        }
-        return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
-      }
-    },
-    {
-      representation: {
-        id: "effect/schema/HashSet",
-        payload: null
-      },
-      toCode: ({ typeParameters }) => ({
-        runtime: `Schema.HashSet(${typeParameters[0].runtime})`,
-        Type: `HashSet.HashSet<${typeParameters[0].Type}>`
-      }),
-      expected: "HashSet",
-      toCodec: ([value]) => hashSetLink(ArraySchema(value)),
-      toCodecArbitrary: ({ constraint, typeParameters: [value] }) =>
-        hashSetLink(
-          withArrayLengthConstraints(
-            ArraySchema(value).check(isUnique()),
-            constraint?.minSize,
-            constraint?.maxSize
-          )
-        ),
-      toEquivalence: ([value]) => Equal.makeCompareSet(value)
-    }
-  )
-  return make(schema.ast, { value })
+export interface MacMulticastAddressFromString
+  extends refine<NetAddress_.MulticastAddress<NetAddress_.MacAddress>, MacAddressFromString>
+{
+  readonly "Rebuild": MacMulticastAddressFromString
 }
 
 /**
- * Reviver for persisted `HashSet` declarations.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain schemas created by {@link HashSet}.
- *
- * @see {@link HashSet} for creating the corresponding schema
+ * Schema for multicast MAC addresses encoded as canonical strings.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const HashSetReviver = InternalSchema.makeDeclarationReviver(
-  "effect/schema/HashSet",
-  Null,
-  ({ annotations, typeParameters }) => {
-    const schema = HashSet(typeParameters[0])
-    return annotations === undefined ? schema : schema.annotate(annotations)
-  }
+export const MacMulticastAddressFromString: MacMulticastAddressFromString = netAddressRefinement(
+  MacAddressFromString,
+  NetAddress_.isMulticast,
+  "a multicast address",
+  "MacMulticastAddressFromString"
 )
 
 /**
- * Type-level representation returned by {@link Chunk}.
+ * Type-level representation of {@link IpUnicastAddress}.
  *
+ * @unstable
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
-export interface Chunk<Value extends Constraint> extends
-  declareConstructor<
-    Chunk_.Chunk<Value["Type"]>,
-    Chunk_.Chunk<Value["Encoded"]>,
-    readonly [Value],
-    ChunkIso<Value>
-  >
-{
-  readonly "Rebuild": Chunk<Value>
-  readonly value: Value
+export interface IpUnicastAddress extends refine<NetAddress_.UnicastAddress<NetAddress_.IpAddress>, IpAddress> {
+  readonly "Rebuild": IpUnicastAddress
 }
 
 /**
- * Iso representation used for `Chunk` schemas: an array of element values using
- * the element schema's `Iso` type.
- *
- * **When to use**
- *
- * Use when annotating type-level helpers that work with the readonly-array ISO
- * shape of a `Chunk` schema.
- *
- * @see {@link Chunk} for the schema interface and constructor that use this ISO representation
+ * Schema for already-constructed syntactic unicast IP addresses.
  *
- * @category utility types
+ * @unstable
+ * @category schemas
  * @since 4.0.0
  */
-export type ChunkIso<Value extends Constraint> = ReadonlyArray<Value["Iso"]>
+export const IpUnicastAddress: IpUnicastAddress = netAddressRefinement(
+  IpAddress,
+  NetAddress_.isUnicast,
+  "a unicast address",
+  "IpUnicastAddress"
+)
 
 /**
- * Schema for chunks whose values conform to the provided element schema.
+ * Type-level representation of {@link IpUnicastAddressFromString}.
  *
- * @category schemas
- * @since 3.10.0
+ * @unstable
+ * @category models
+ * @since 4.0.0
  */
-export function Chunk<Value extends Constraint>(value: Value): Chunk<Value> {
-  const schema = declareConstructor<
-    Chunk_.Chunk<Value["Type"]>,
-    Chunk_.Chunk<Value["Encoded"]>,
-    ChunkIso<Value>
-  >()(
-    [value],
-    ([value]) => {
-      const values = ArraySchema(value)
-      return (input, ast, options) => {
-        if (Chunk_.isChunk(input)) {
-          return Effect.mapBothEager(
-            SchemaParser.decodeUnknownEffect(values)(Arr.fromIterable(input), options),
-            {
-              onSuccess: Chunk_.fromIterable,
-              onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "values", issue, input, options)
-            }
-          )
-        }
-        return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
-      }
-    },
-    {
-      representation: {
-        id: "effect/schema/Chunk",
-        payload: null
-      },
-      toCode: ({ typeParameters }) => ({
-        runtime: `Schema.Chunk(${typeParameters[0].runtime})`,
-        Type: `Chunk.Chunk<${typeParameters[0].Type}>`
-      }),
-      expected: "Chunk",
-      toCodec: ([value]) => chunkLink(ArraySchema(value)),
-      toCodecArbitrary: ({ constraint, typeParameters: [value] }) =>
-        chunkLink(
-          withArrayLengthConstraints(
-            ArraySchema(value),
-            constraint?.minLength,
-            constraint?.maxLength
-          )
-        ),
-      toEquivalence: ([value]) => Chunk_.makeEquivalence(value)
-    }
-  )
-  return make(schema.ast, { value })
+export interface IpUnicastAddressFromString
+  extends refine<NetAddress_.UnicastAddress<NetAddress_.IpAddress>, IpAddressFromString>
+{
+  readonly "Rebuild": IpUnicastAddressFromString
 }
 
 /**
- * Reviver for persisted {@link Chunk} declarations.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain schemas created by {@link Chunk}.
- *
- * @see {@link Chunk} for creating the corresponding schema
+ * Schema for syntactic unicast IP addresses encoded as numeric strings.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const ChunkReviver = InternalSchema.makeDeclarationReviver(
-  "effect/schema/Chunk",
-  Null,
-  ({ annotations, typeParameters }) => {
-    const schema = Chunk(typeParameters[0])
-    return annotations === undefined ? schema : schema.annotate(annotations)
-  }
+export const IpUnicastAddressFromString: IpUnicastAddressFromString = netAddressRefinement(
+  IpAddressFromString,
+  NetAddress_.isUnicast,
+  "a unicast address",
+  "IpUnicastAddressFromString"
 )
 
 /**
- * Type-level representation of {@link RegExp}.
+ * Type-level representation of {@link MacUnicastAddress}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface RegExp extends instanceOf<globalThis.RegExp> {
-  readonly "Rebuild": RegExp
+export interface MacUnicastAddress extends refine<NetAddress_.UnicastAddress<NetAddress_.MacAddress>, MacAddress> {
+  readonly "Rebuild": MacUnicastAddress
 }
 
 /**
- * Schema for JavaScript `RegExp` objects.
- *
- * **Details**
- *
- * The default JSON serializer encodes a `RegExp` as `{ source, flags }`.
+ * Schema for already-constructed unicast MAC addresses.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const RegExp: RegExp = instanceOf(
-  globalThis.RegExp,
-  {
-    representation: {
-      id: "effect/schema/RegExp",
-      payload: null
-    },
-    toCode: () => ({
-      runtime: `Schema.RegExp`,
-      Type: `globalThis.RegExp`
-    }),
-    expected: "RegExp",
-    toCodecJson: () =>
-      link<globalThis.RegExp>()(
-        Struct({
-          source: String,
-          flags: String
-        }),
-        SchemaTransformation.transformOrFail({
-          decode: (e, options) =>
-            Effect.try({
-              try: () => new globalThis.RegExp(e.source, e.flags),
-              catch: () =>
-                new SchemaIssue.InvalidValue(
-                  { expected: "valid RegExp source and flags" },
-                  e,
-                  options
-                )
-            }),
-          encode: (regExp) =>
-            Effect.succeed({
-              source: regExp.source,
-              flags: regExp.flags
-            })
-        })
-      )
-  }
+export const MacUnicastAddress: MacUnicastAddress = netAddressRefinement(
+  MacAddress,
+  NetAddress_.isMacUnicast,
+  "a unicast address",
+  "MacUnicastAddress"
 )
 
 /**
- * Reviver for persisted `RegExp` declarations.
+ * Type-level representation of {@link MacUnicastAddressFromString}.
  *
- * **When to use**
- *
- * Use when reconstructing documents that may contain the {@link RegExp} schema.
- *
- * @see {@link RegExp} for the corresponding schema
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface MacUnicastAddressFromString
+  extends refine<NetAddress_.UnicastAddress<NetAddress_.MacAddress>, MacAddressFromString>
+{
+  readonly "Rebuild": MacUnicastAddressFromString
+}
+
+/**
+ * Schema for unicast MAC addresses encoded as canonical strings.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const RegExpReviver = makeFixedDeclarationReviver(
-  "effect/schema/RegExp",
-  RegExp
+export const MacUnicastAddressFromString: MacUnicastAddressFromString = netAddressRefinement(
+  MacAddressFromString,
+  NetAddress_.isMacUnicast,
+  "a unicast address",
+  "MacUnicastAddressFromString"
 )
 
 /**
- * Type-level representation of {@link URL}.
+ * Type-level representation of {@link Ipv4BroadcastAddress}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface URL extends instanceOf<globalThis.URL> {
-  readonly "Rebuild": URL
+export interface Ipv4BroadcastAddress
+  extends refine<NetAddress_.BroadcastAddress<NetAddress_.Ipv4Address>, Ipv4Address>
+{
+  readonly "Rebuild": Ipv4BroadcastAddress
 }
 
-const URLString = String.annotate({ expected: "a string that will be decoded as a URL" })
-
 /**
- * Schema for JavaScript `URL` objects.
- *
- * **Details**
- *
- * Default JSON serializer:
- *
- * - encodes `URL` as a `string`
+ * Schema for the already-constructed IPv4 limited broadcast address.
  *
- * @category schemas
- * @since 4.0.0
- */
-export const URL: URL = instanceOf(
-  globalThis.URL,
-  {
-    representation: {
-      id: "effect/schema/URL",
-      payload: null
-    },
-    toCode: () => ({
-      runtime: `Schema.URL`,
-      Type: `globalThis.URL`
-    }),
-    expected: "URL",
-    toCodecJson: () =>
-      link<globalThis.URL>()(
-        URLString,
-        SchemaTransformation.urlFromString
-      )
-  }
+ * @unstable
+ * @category schemas
+ * @since 4.0.0
+ */
+export const Ipv4BroadcastAddress: Ipv4BroadcastAddress = netAddressRefinement(
+  Ipv4Address,
+  NetAddress_.isBroadcast,
+  "a broadcast address",
+  "Ipv4BroadcastAddress"
 )
 
 /**
- * Reviver for persisted `URL` declarations.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain the {@link URL} schema.
+ * Type-level representation of {@link Ipv4BroadcastAddressFromString}.
  *
- * @see {@link URL} for the corresponding schema
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface Ipv4BroadcastAddressFromString
+  extends refine<NetAddress_.BroadcastAddress<NetAddress_.Ipv4Address>, Ipv4AddressFromString>
+{
+  readonly "Rebuild": Ipv4BroadcastAddressFromString
+}
+
+/**
+ * Schema for the IPv4 limited broadcast address encoded as a string.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const URLReviver = makeFixedDeclarationReviver(
-  "effect/schema/URL",
-  URL
+export const Ipv4BroadcastAddressFromString: Ipv4BroadcastAddressFromString = netAddressRefinement(
+  Ipv4AddressFromString,
+  NetAddress_.isBroadcast,
+  "a broadcast address",
+  "Ipv4BroadcastAddressFromString"
 )
 
 /**
- * Type-level representation of {@link URLFromString}.
+ * Type-level representation of {@link MacBroadcastAddress}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface URLFromString extends decodeTo<URL, String> {
-  readonly "Rebuild": URLFromString
+export interface MacBroadcastAddress extends refine<NetAddress_.BroadcastAddress<NetAddress_.MacAddress>, MacAddress> {
+  readonly "Rebuild": MacBroadcastAddress
 }
 
 /**
- * Schema that decodes a `string` into a `URL`.
- *
- * **Details**
- *
- * Decoding:
- * - A **valid** URL `string` is decoded as a `URL`
- *
- * Encoding:
- * - A `URL` is encoded as a `string`
+ * Schema for the already-constructed MAC all-ones broadcast address.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const URLFromString: URLFromString = URLString.pipe(decodeTo(URL, SchemaTransformation.urlFromString))
+export const MacBroadcastAddress: MacBroadcastAddress = netAddressRefinement(
+  MacAddress,
+  NetAddress_.isMacBroadcast,
+  "a broadcast address",
+  "MacBroadcastAddress"
+)
 
 /**
- * Type-level representation of {@link Date}.
+ * Type-level representation of {@link MacBroadcastAddressFromString}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface Date extends declare<globalThis.Date> {
-  readonly "Rebuild": Date
+export interface MacBroadcastAddressFromString
+  extends refine<NetAddress_.BroadcastAddress<NetAddress_.MacAddress>, MacAddressFromString>
+{
+  readonly "Rebuild": MacBroadcastAddressFromString
 }
 
-const DateString = String.annotate({ expected: "a string that will be decoded as a Date" })
 /**
- * Schema for valid JavaScript `Date` objects.
- *
- * **When to use**
- *
- * Use to validate in-memory values that must already be valid JavaScript date
- * objects.
- *
- * **Details**
- *
- * This schema accepts `Date` instances whose timestamp is not `NaN`. The
- * default JSON serializer encodes dates as ISO 8601 strings.
- *
- * **Example** (Defining a Date schema)
- *
- * ```ts import.meta.vitest
- * import { Schema } from "effect"
- *
- * const date = Schema.decodeUnknownSync(Schema.Date)(new Date("2024-01-01"))
- * date.toISOString() // => "2024-01-01T00:00:00.000Z"
- * ```
- *
- * @see {@link DateFromString} for decoding strings into Date instances
- * @see {@link DateFromMillis} for decoding epoch milliseconds into Date instances
+ * Schema for the MAC all-ones broadcast address encoded as a string.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const Date: Date = declare(
-  (input): input is globalThis.Date => input instanceof globalThis.Date && !globalThis.Number.isNaN(input.getTime()),
-  {
-    representation: {
-      id: "effect/schema/Date",
-      payload: null
-    },
-    toCode: () => ({
-      runtime: `Schema.Date`,
-      Type: `globalThis.Date`
-    }),
-    expected: "a valid Date",
-    toCodecJson: () =>
-      link<globalThis.Date>()(
-        DateString,
-        SchemaTransformation.dateFromString
-      )
-  }
+export const MacBroadcastAddressFromString: MacBroadcastAddressFromString = netAddressRefinement(
+  MacAddressFromString,
+  NetAddress_.isMacBroadcast,
+  "a broadcast address",
+  "MacBroadcastAddressFromString"
 )
 
 /**
- * Reviver for persisted `Date` declarations.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain the {@link Date} schema.
+ * Type-level representation of {@link IpLoopbackAddress}.
  *
- * @see {@link Date} for the corresponding schema
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface IpLoopbackAddress extends refine<NetAddress_.LoopbackAddress<NetAddress_.IpAddress>, IpAddress> {
+  readonly "Rebuild": IpLoopbackAddress
+}
+
+/**
+ * Schema for already-constructed loopback IP addresses.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const DateReviver = makeFixedDeclarationReviver(
-  "effect/schema/Date",
-  Date
+export const IpLoopbackAddress: IpLoopbackAddress = netAddressRefinement(
+  IpAddress,
+  NetAddress_.isLoopback,
+  "a loopback address",
+  "IpLoopbackAddress"
 )
 
 /**
- * Type-level representation of {@link DateFromString}.
+ * Type-level representation of {@link IpLoopbackAddressFromString}.
  *
+ * @unstable
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
-export interface DateFromString extends decodeTo<Date, String> {
-  readonly "Rebuild": DateFromString
+export interface IpLoopbackAddressFromString
+  extends refine<NetAddress_.LoopbackAddress<NetAddress_.IpAddress>, IpAddressFromString>
+{
+  readonly "Rebuild": IpLoopbackAddressFromString
 }
 
 /**
- * Schema that decodes a string into a JavaScript `Date`.
- *
- * **When to use**
- *
- * Use to model string-encoded dates that decode to JavaScript `Date` objects
- * and encode back to strings.
- *
- * **Details**
- *
- * Decoding:
- * The string is passed to JavaScript `Date` construction.
- *
- * Encoding:
- * A `Date` is encoded as an ISO string.
- *
- * Invalid date strings fail decoding.
- *
- * @see {@link DateFromMillis} for decoding epoch milliseconds into Date instances
- * @see {@link DateTimeUtcFromString} for decoding date-time strings into UTC values
- * @see {@link Date} for accepting Date instances directly
+ * Schema for loopback IP addresses encoded as numeric strings.
  *
+ * @unstable
  * @category schemas
- * @since 3.10.0
+ * @since 4.0.0
  */
-export const DateFromString: DateFromString = DateString.pipe(decodeTo(Date, SchemaTransformation.dateFromString))
+export const IpLoopbackAddressFromString: IpLoopbackAddressFromString = netAddressRefinement(
+  IpAddressFromString,
+  NetAddress_.isLoopback,
+  "a loopback address",
+  "IpLoopbackAddressFromString"
+)
 
 /**
- * Type-level representation of {@link DateFromMillis}.
+ * Type-level representation of {@link IpLinkLocalAddress}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface DateFromMillis extends decodeTo<Date, Int> {
-  readonly "Rebuild": DateFromMillis
+export interface IpLinkLocalAddress extends refine<NetAddress_.LinkLocalAddress<NetAddress_.IpAddress>, IpAddress> {
+  readonly "Rebuild": IpLinkLocalAddress
 }
 
 /**
- * Schema that decodes epoch milliseconds into a JavaScript `Date`.
- *
- * **When to use**
- *
- * Use to model numeric millisecond timestamps that decode to JavaScript `Date`
- * objects and encode back to numbers.
- *
- * **Details**
- *
- * Decoding:
- * A safe integer number of milliseconds since the Unix epoch is decoded as a
- * `Date`.
- *
- * Encoding:
- * A `Date` is encoded as its millisecond timestamp.
- *
- * **Gotchas**
- *
- * JavaScript `Date` supports a narrower range than safe integers, so integers
- * outside the supported `Date` range fail decoding.
- *
- * @see {@link DateFromString} for decoding string-encoded dates
- * @see {@link DateTimeUtcFromMillis} for decoding epoch milliseconds into UTC values
+ * Schema for already-constructed link-local IP addresses.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const DateFromMillis: DateFromMillis = Int.pipe(
-  decodeTo(Date, SchemaTransformation.dateFromMillis)
+export const IpLinkLocalAddress: IpLinkLocalAddress = netAddressRefinement(
+  IpAddress,
+  NetAddress_.isLinkLocal,
+  "a link-local address",
+  "IpLinkLocalAddress"
 )
 
 /**
- * Type-level representation of {@link Duration}.
+ * Type-level representation of {@link IpLinkLocalAddressFromString}.
  *
+ * @unstable
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
-export interface Duration extends declare<Duration_.Duration> {
-  readonly "Rebuild": Duration
+export interface IpLinkLocalAddressFromString
+  extends refine<NetAddress_.LinkLocalAddress<NetAddress_.IpAddress>, IpAddressFromString>
+{
+  readonly "Rebuild": IpLinkLocalAddressFromString
 }
 
 /**
- * Schema for `Duration` values.
- *
- * **Details**
- *
- * The default JSON serializer encodes `Duration` as a tagged object with the
- * duration type and value.
- *
- * **Example** (Defining a Duration schema)
- *
- * ```ts import.meta.vitest
- * import { Duration, Schema } from "effect"
- *
- * Schema.decodeUnknownSync(Schema.Duration)(Duration.seconds(5)) // => Duration.seconds(5)
- * ```
+ * Schema for link-local IP addresses encoded as numeric strings.
  *
+ * @unstable
  * @category schemas
- *
- * @since 3.10.0
+ * @since 4.0.0
  */
-export const Duration: Duration = declare(
-  Duration_.isDuration,
-  {
-    representation: {
-      id: "effect/schema/Duration",
-      payload: null
-    },
-    toCode: () => ({
-      runtime: `Schema.Duration`,
-      Type: `Duration.Duration`,
-      importDeclarations: [`import * as Duration from "effect/Duration"`]
-    }),
-    expected: "Duration",
-    toCodecJson: () =>
-      link<Duration_.Duration>()(
-        Union([
-          Struct({ _tag: Literal("Infinity") }),
-          Struct({ _tag: Literal("NegativeInfinity") }),
-          Struct({ _tag: Literal("Nanos"), value: BigInt }),
-          Struct({ _tag: Literal("Millis"), value: Int })
-        ]),
-        SchemaTransformation.transform({
-          decode: (e) => {
-            switch (e._tag) {
-              case "Infinity":
-                return Duration_.infinity
-              case "NegativeInfinity":
-                return Duration_.negativeInfinity
-              case "Nanos":
-                return Duration_.nanos(e.value)
-              case "Millis":
-                return Duration_.millis(e.value)
-            }
-          },
-          encode: (duration) => {
-            switch (duration.value._tag) {
-              case "Infinity":
-                return { _tag: "Infinity" } as const
-              case "NegativeInfinity":
-                return { _tag: "NegativeInfinity" } as const
-              case "Nanos":
-                return { _tag: "Nanos", value: duration.value.nanos } as const
-              case "Millis":
-                return { _tag: "Millis", value: duration.value.millis } as const
-            }
-          }
-        })
-      )
-  }
+export const IpLinkLocalAddressFromString: IpLinkLocalAddressFromString = netAddressRefinement(
+  IpAddressFromString,
+  NetAddress_.isLinkLocal,
+  "a link-local address",
+  "IpLinkLocalAddressFromString"
 )
 
 /**
- * Reviver for persisted {@link Duration} declarations.
+ * Type-level representation of {@link IpUnspecifiedAddress}.
  *
- * **When to use**
- *
- * Use when reconstructing documents that may contain the {@link Duration} schema.
- *
- * @see {@link Duration} for the corresponding schema
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface IpUnspecifiedAddress extends refine<NetAddress_.UnspecifiedAddress<NetAddress_.IpAddress>, IpAddress> {
+  readonly "Rebuild": IpUnspecifiedAddress
+}
+
+/**
+ * Schema for already-constructed unspecified IP addresses.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const DurationReviver = makeFixedDeclarationReviver(
-  "effect/schema/Duration",
-  Duration
+export const IpUnspecifiedAddress: IpUnspecifiedAddress = netAddressRefinement(
+  IpAddress,
+  NetAddress_.isUnspecified,
+  "an unspecified address",
+  "IpUnspecifiedAddress"
 )
 
-const DurationString = String.annotate({ expected: "a string that will be decoded as a Duration" })
-
 /**
- * Type-level representation of {@link DurationFromString}.
+ * Type-level representation of {@link IpUnspecifiedAddressFromString}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface DurationFromString extends decodeTo<Duration, String> {
-  readonly "Rebuild": DurationFromString
+export interface IpUnspecifiedAddressFromString
+  extends refine<NetAddress_.UnspecifiedAddress<NetAddress_.IpAddress>, IpAddressFromString>
+{
+  readonly "Rebuild": IpUnspecifiedAddressFromString
 }
 
 /**
- * Schema that parses a string into a `Duration`.
- *
- * **Details**
- *
- * Decoding:
- * - A `string` is decoded as a `Duration`, accepting any format that
- *   `Duration.fromInput` can parse.
- *
- * Encoding:
- * - A `Duration` is encoded as a parseable `string`.
+ * Schema for unspecified IP addresses encoded as numeric strings.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const DurationFromString: DurationFromString = DurationString.pipe(
-  decodeTo(Duration, SchemaTransformation.durationFromString)
+export const IpUnspecifiedAddressFromString: IpUnspecifiedAddressFromString = netAddressRefinement(
+  IpAddressFromString,
+  NetAddress_.isUnspecified,
+  "an unspecified address",
+  "IpUnspecifiedAddressFromString"
 )
 
 /**
- * Type-level representation of {@link DurationFromNanos}.
+ * Type-level representation of {@link Ipv4PrivateAddress}.
  *
+ * @unstable
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
-export interface DurationFromNanos extends decodeTo<Duration, BigInt> {
-  readonly "Rebuild": DurationFromNanos
+export interface Ipv4PrivateAddress extends refine<NetAddress_.PrivateAddress<NetAddress_.Ipv4Address>, Ipv4Address> {
+  readonly "Rebuild": Ipv4PrivateAddress
 }
 
 /**
- * Schema that decodes a `bigint` into a `Duration`, treating the bigint as
- * nanoseconds.
- *
- * **Details**
- *
- * Decoding:
- * A `bigint` representing nanoseconds is decoded as a `Duration`.
- *
- * Encoding:
- * Finite durations are encoded as a `bigint` number of nanoseconds. Encoding
- * fails when the duration cannot be represented as nanoseconds, such as
- * `Duration.infinity` or `Duration.negativeInfinity`.
+ * Schema for already-constructed RFC 1918 private-use addresses.
  *
+ * @unstable
  * @category schemas
- * @since 3.10.0
+ * @since 4.0.0
  */
-export const DurationFromNanos: DurationFromNanos = BigInt.pipe(
-  decodeTo(Duration, SchemaTransformation.durationFromNanos)
+export const Ipv4PrivateAddress: Ipv4PrivateAddress = netAddressRefinement(
+  Ipv4Address,
+  NetAddress_.isPrivate,
+  "a private address",
+  "Ipv4PrivateAddress"
 )
 
 /**
- * Type-level representation of {@link DurationFromMillis}.
+ * Type-level representation of {@link Ipv4PrivateAddressFromString}.
  *
+ * @unstable
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
-export interface DurationFromMillis extends decodeTo<Duration, Number> {
-  readonly "Rebuild": DurationFromMillis
+export interface Ipv4PrivateAddressFromString
+  extends refine<NetAddress_.PrivateAddress<NetAddress_.Ipv4Address>, Ipv4AddressFromString>
+{
+  readonly "Rebuild": Ipv4PrivateAddressFromString
 }
 
 /**
- * Schema that decodes a number into a `Duration`, treating the number as
- * milliseconds.
- *
- * **Details**
- *
- * Decoding:
- * - A finite or infinite number is decoded as a `Duration`
- *
- * Encoding:
- * - A `Duration` is encoded to a finite or infinite number of milliseconds
- *
- * **Gotchas**
- *
- * `NaN` is decoded as `Duration.zero`, matching `Duration.millis`.
+ * Schema for RFC 1918 private-use addresses encoded as strings.
  *
+ * @unstable
  * @category schemas
- * @since 3.10.0
+ * @since 4.0.0
  */
-export const DurationFromMillis: DurationFromMillis = Number.pipe(
-  decodeTo(Duration, SchemaTransformation.durationFromMillis)
+export const Ipv4PrivateAddressFromString: Ipv4PrivateAddressFromString = netAddressRefinement(
+  Ipv4AddressFromString,
+  NetAddress_.isPrivate,
+  "a private address",
+  "Ipv4PrivateAddressFromString"
 )
 
 /**
- * Type-level representation of {@link ByteSize}.
+ * Type-level representation of {@link Ipv6UniqueLocalAddress}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface ByteSize extends declare<ByteSize_.ByteSize> {
-  readonly "Rebuild": ByteSize
+export interface Ipv6UniqueLocalAddress
+  extends refine<NetAddress_.UniqueLocalAddress<NetAddress_.Ipv6Address>, Ipv6Address>
+{
+  readonly "Rebuild": Ipv6UniqueLocalAddress
 }
 
 /**
- * Schema for exact, non-negative `ByteSize` values.
- *
- * **Details**
- *
- * The JSON codec encodes the byte count as a bigint string, preserving values
- * beyond JavaScript's safe-integer range. The StringTree codec uses the
- * human-readable byte-size syntax exposed by {@link ByteSizeFromString}.
+ * Schema for already-constructed IPv6 unique-local addresses.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const ByteSize: ByteSize = declare(
-  ByteSize_.isByteSize,
-  {
-    representation: {
-      id: "effect/schema/ByteSize",
-      payload: null
-    },
-    toCode: () => ({
-      runtime: `Schema.ByteSize`,
-      Type: `ByteSize.ByteSize`,
-      importDeclarations: [`import * as ByteSize from "effect/ByteSize"`]
-    }),
-    expected: "ByteSize",
-    toCodecJson: () =>
-      link<ByteSize_.ByteSize>()(
-        BigInt.check(isGreaterThanOrEqualToBigInt(globalThis.BigInt(0))),
-        SchemaTransformation.transform({
-          decode: ByteSize_.bytes,
-          encode: ByteSize_.toBigInt
-        })
-      ),
-    toCodecStringTree: () =>
-      link<ByteSize_.ByteSize>()(
-        ByteSizeString,
-        SchemaTransformation.byteSizeFromString
-      )
-  }
+export const Ipv6UniqueLocalAddress: Ipv6UniqueLocalAddress = netAddressRefinement(
+  Ipv6Address,
+  NetAddress_.isUniqueLocal,
+  "a unique-local address",
+  "Ipv6UniqueLocalAddress"
 )
 
 /**
- * Reviver for persisted {@link ByteSize} declarations.
+ * Type-level representation of {@link Ipv6UniqueLocalAddressFromString}.
+ *
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface Ipv6UniqueLocalAddressFromString
+  extends refine<NetAddress_.UniqueLocalAddress<NetAddress_.Ipv6Address>, Ipv6AddressFromString>
+{
+  readonly "Rebuild": Ipv6UniqueLocalAddressFromString
+}
+
+/**
+ * Schema for IPv6 unique-local addresses encoded as strings.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const ByteSizeReviver = makeFixedDeclarationReviver(
-  "effect/schema/ByteSize",
-  ByteSize
+export const Ipv6UniqueLocalAddressFromString: Ipv6UniqueLocalAddressFromString = netAddressRefinement(
+  Ipv6AddressFromString,
+  NetAddress_.isUniqueLocal,
+  "a unique-local address",
+  "Ipv6UniqueLocalAddressFromString"
 )
 
-const ByteSizeString = String.annotate({ expected: "a string that will be decoded as a ByteSize" })
-
 /**
- * Type-level representation of {@link ByteSizeFromString}.
+ * Type-level representation of {@link MacLocallyAdministeredAddress}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface ByteSizeFromString extends decodeTo<ByteSize, String> {
-  readonly "Rebuild": ByteSizeFromString
+export interface MacLocallyAdministeredAddress
+  extends refine<NetAddress_.LocallyAdministeredAddress<NetAddress_.MacAddress>, MacAddress>
+{
+  readonly "Rebuild": MacLocallyAdministeredAddress
 }
 
 /**
- * Schema that decodes byte-size strings into exact, non-negative `ByteSize`
- * values.
- *
- * **Details**
- *
- * Decoding accepts an unsigned base-10 integer or decimal followed by optional
- * whitespace and one of these case-sensitive units:
- *
- * - bytes: `B`, `byte`, or `bytes`
- * - decimal SI units (powers of 1,000): `kB`, `MB`, `GB`, `TB`, `PB`, `EB`,
- *   `ZB`, `YB`, `RB`, or `QB`, plus their lowercase singular and plural names
- * - binary IEC units (powers of 1,024): `KiB`, `MiB`, `GiB`, `TiB`, `PiB`,
- *   `EiB`, `ZiB`, or `YiB`, plus their lowercase singular and plural names
- *
- * Leading and trailing whitespace is ignored. A decimal quantity must resolve
- * to an integral number of bytes, so `1.5 kB` is accepted while `0.1 KiB` is
- * rejected.
- *
- * Encoding returns the exact byte count as `<count> byte` or `<count> bytes`.
- *
- * **Gotchas**
- *
- * A unit is required. Signs, exponent notation, digit separators, and ambiguous
- * unit spellings such as `KB`, `mb`, `Mb`, or `b` are rejected.
+ * Schema for already-constructed locally administered MAC addresses.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const ByteSizeFromString: ByteSizeFromString = ByteSizeString.pipe(
-  decodeTo(ByteSize, SchemaTransformation.byteSizeFromString)
+export const MacLocallyAdministeredAddress: MacLocallyAdministeredAddress = netAddressRefinement(
+  MacAddress,
+  NetAddress_.isMacLocallyAdministered,
+  "a locally administered address",
+  "MacLocallyAdministeredAddress"
 )
 
 /**
- * Type-level representation of {@link ByteSizeFromBigInt}.
+ * Type-level representation of {@link MacLocallyAdministeredAddressFromString}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface ByteSizeFromBigInt extends decodeTo<ByteSize, BigInt> {
-  readonly "Rebuild": ByteSizeFromBigInt
+export interface MacLocallyAdministeredAddressFromString
+  extends refine<NetAddress_.LocallyAdministeredAddress<NetAddress_.MacAddress>, MacAddressFromString>
+{
+  readonly "Rebuild": MacLocallyAdministeredAddressFromString
 }
 
 /**
- * Schema that decodes non-negative bigint byte counts.
+ * Schema for locally administered MAC addresses encoded as strings.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const ByteSizeFromBigInt: ByteSizeFromBigInt = BigInt.pipe(
-  decodeTo(ByteSize, SchemaTransformation.byteSizeFromBigInt)
+export const MacLocallyAdministeredAddressFromString: MacLocallyAdministeredAddressFromString = netAddressRefinement(
+  MacAddressFromString,
+  NetAddress_.isMacLocallyAdministered,
+  "a locally administered address",
+  "MacLocallyAdministeredAddressFromString"
 )
 
 /**
- * Type-level representation of {@link ByteSizeFromNumber}.
+ * Type-level representation of {@link MacUniversallyAdministeredAddress}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface ByteSizeFromNumber extends decodeTo<ByteSize, Number> {
-  readonly "Rebuild": ByteSizeFromNumber
+export interface MacUniversallyAdministeredAddress
+  extends refine<NetAddress_.UniversallyAdministeredAddress<NetAddress_.MacAddress>, MacAddress>
+{
+  readonly "Rebuild": MacUniversallyAdministeredAddress
 }
 
 /**
- * Schema that decodes non-negative safe-integer byte counts.
- *
- * **Details**
- *
- * Encoding fails when the byte count exceeds `Number.MAX_SAFE_INTEGER`.
+ * Schema for already-constructed universally administered MAC addresses.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const ByteSizeFromNumber: ByteSizeFromNumber = Number.pipe(
-  decodeTo(ByteSize, SchemaTransformation.byteSizeFromNumber)
+export const MacUniversallyAdministeredAddress: MacUniversallyAdministeredAddress = netAddressRefinement(
+  MacAddress,
+  NetAddress_.isMacUniversallyAdministered,
+  "a universally administered address",
+  "MacUniversallyAdministeredAddress"
 )
 
 /**
- * Type-level representation of {@link BigDecimal}.
+ * Type-level representation of {@link MacUniversallyAdministeredAddressFromString}.
  *
+ * @unstable
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
-export interface BigDecimal extends declare<BigDecimal_.BigDecimal> {
-  readonly "Rebuild": BigDecimal
-}
-
-const BigDecimalString = String.annotate({ expected: "a string that will be decoded as a BigDecimal" })
-const arbitraryBigDecimalMaxScale = 20
-
-function bigIntArbitrarySchema(minimum: bigint | undefined, maximum: bigint | undefined): Codec<bigint> {
-  if (minimum !== undefined && maximum !== undefined) {
-    return BigInt.check(isBetweenBigInt({ minimum, maximum }))
-  }
-  if (minimum !== undefined) return BigInt.check(isGreaterThanOrEqualToBigInt(minimum))
-  if (maximum !== undefined) return BigInt.check(isLessThanOrEqualToBigInt(maximum))
-  return BigInt
-}
-
-function bigDecimalValueAtScale(value: BigDecimal_.BigDecimal, scale: number): bigint {
-  return value.value * globalThis.BigInt(10) ** globalThis.BigInt(scale - value.scale)
+export interface MacUniversallyAdministeredAddressFromString
+  extends refine<NetAddress_.UniversallyAdministeredAddress<NetAddress_.MacAddress>, MacAddressFromString>
+{
+  readonly "Rebuild": MacUniversallyAdministeredAddressFromString
 }
 
-function bigDecimalArbitrarySchema(
-  constraint: Annotations.ToArbitrary.GenerationConstraint<BigDecimal_.BigDecimal> | undefined
-): Codec<{ readonly value: bigint; readonly scale: number }> {
-  if (constraint?.minimum === undefined && constraint?.maximum === undefined) {
-    return Struct({
-      value: BigInt,
-      scale: Int.check(isBetween({ minimum: 0, maximum: arbitraryBigDecimalMaxScale }))
-    })
-  }
-  const scale = Math.max(
-    arbitraryBigDecimalMaxScale,
-    constraint.minimum?.scale ?? 0,
-    constraint.maximum?.scale ?? 0,
-    constraint.exclusiveMinimum === true && constraint.minimum !== undefined ? constraint.minimum.scale + 1 : 0,
-    constraint.exclusiveMaximum === true && constraint.maximum !== undefined ? constraint.maximum.scale + 1 : 0
+/**
+ * Schema for universally administered MAC addresses encoded as strings.
+ *
+ * @unstable
+ * @category schemas
+ * @since 4.0.0
+ */
+export const MacUniversallyAdministeredAddressFromString: MacUniversallyAdministeredAddressFromString =
+  netAddressRefinement(
+    MacAddressFromString,
+    NetAddress_.isMacUniversallyAdministered,
+    "a universally administered address",
+    "MacUniversallyAdministeredAddressFromString"
   )
-  const minimum = constraint.minimum === undefined
-    ? undefined
-    : bigDecimalValueAtScale(constraint.minimum, scale) +
-      (constraint.exclusiveMinimum === true ? globalThis.BigInt(1) : globalThis.BigInt(0))
-  const maximum = constraint.maximum === undefined
-    ? undefined
-    : bigDecimalValueAtScale(constraint.maximum, scale) -
-      (constraint.exclusiveMaximum === true ? globalThis.BigInt(1) : globalThis.BigInt(0))
-  if (minimum !== undefined && maximum !== undefined && minimum > maximum) {
-    return Struct({
-      value: BigInt,
-      scale: Int.check(isBetween({ minimum: 0, maximum: arbitraryBigDecimalMaxScale }))
-    })
-  }
-  return Struct({ value: bigIntArbitrarySchema(minimum, maximum), scale: Literal(scale) })
-}
 
 /**
- * Schema for `BigDecimal` values.
- *
- * **When to use**
- *
- * Use when you already have Effect decimal instances and need schema
- * validation, formatting, equivalence, and JSON string serialization.
- *
- * **Details**
- *
- * Default JSON serializer:
- *
- * - encodes `BigDecimal` as a `string`
+ * Type-level representation of {@link Ipv4Interface}.
  *
- * @see {@link BigDecimalFromString} for parsing string input into a BigDecimal
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface Ipv4Interface extends declare<IpInterface_.Ipv4Interface> {
+  readonly "Rebuild": Ipv4Interface
+}
+
+/**
+ * Schema for already-constructed IPv4 interface address values.
  *
+ * @unstable
  * @category schemas
- * @since 3.10.0
+ * @since 4.0.0
  */
-export const BigDecimal: BigDecimal = declare(
-  BigDecimal_.isBigDecimal,
-  {
-    representation: {
-      id: "effect/schema/BigDecimal",
-      payload: null
-    },
-    toCode: () => ({
-      runtime: `Schema.BigDecimal`,
-      Type: `BigDecimal.BigDecimal`,
-      importDeclarations: [`import * as BigDecimal from "effect/BigDecimal"`]
-    }),
-    expected: "BigDecimal",
-    toCodecArbitrary: ({ constraint }) =>
-      linkDecoding<BigDecimal_.BigDecimal>()(
-        bigDecimalArbitrarySchema(constraint),
-        SchemaGetter.transform(({ scale, value }) => BigDecimal_.make(value, scale))
-      ),
-    toCodecJson: () =>
-      link<BigDecimal_.BigDecimal>()(
-        BigDecimalString,
-        SchemaTransformation.bigDecimalFromString
-      ),
-    toFormatter: () => (bd) => BigDecimal_.format(bd)
-  }
-)
+export const Ipv4Interface: Ipv4Interface = declare(IpInterface_.isIpv4Interface, {
+  identifier: "Ipv4Interface"
+})
 
 /**
- * Reviver for persisted {@link BigDecimal} declarations.
+ * Type-level representation of {@link Ipv4InterfaceFromString}.
  *
- * **When to use**
- *
- * Use when reconstructing documents that may contain the {@link BigDecimal} schema.
- *
- * @see {@link BigDecimal} for the corresponding schema
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface Ipv4InterfaceFromString extends decodeTo<Ipv4Interface, String> {
+  readonly "Rebuild": Ipv4InterfaceFromString
+}
+
+/**
+ * Schema for IPv4 interface addresses encoded as an address and prefix length.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const BigDecimalReviver = makeFixedDeclarationReviver(
-  "effect/schema/BigDecimal",
-  BigDecimal
+export const Ipv4InterfaceFromString: Ipv4InterfaceFromString = netAddressFromString(
+  Ipv4Interface,
+  IpInterface_.ipv4FromString,
+  IpInterface_.format,
+  "Ipv4InterfaceFromString"
 )
 
 /**
- * Type-level representation of {@link BigDecimalFromString}.
+ * Type-level representation of {@link Ipv6Interface}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface BigDecimalFromString extends decodeTo<BigDecimal, String> {
-  readonly "Rebuild": BigDecimalFromString
+export interface Ipv6Interface extends declare<IpInterface_.Ipv6Interface> {
+  readonly "Rebuild": Ipv6Interface
 }
 
 /**
- * Schema that parses a string into a `BigDecimal`.
- *
- * **When to use**
- *
- * Use to parse decimal or exponent-notation strings into arbitrary-precision
- * BigDecimal values while encoding them back to strings.
- *
- * **Details**
- *
- * Decoding:
- * - A `string` is decoded with `BigDecimal.fromString`.
- *
- * Encoding:
- * - A `BigDecimal` is encoded with `BigDecimal.format`.
- *
- * **Gotchas**
- *
- * An empty string decodes as zero.
- *
- * @see {@link BigDecimal} for validating values that are already BigDecimal values
- * @see {@link BigIntFromString} for parsing base-10 integer strings into bigint values
- * @see {@link NumberFromString} for parsing JavaScript number strings
+ * Schema for already-constructed IPv6 interface address values.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const BigDecimalFromString: BigDecimalFromString = BigDecimalString.pipe(
-  decodeTo(BigDecimal, SchemaTransformation.bigDecimalFromString)
-)
-
-const JsonString = String.annotate({
-  expected: "a string that will be decoded as JSON",
-  contentMediaType: "application/json"
+export const Ipv6Interface: Ipv6Interface = declare(IpInterface_.isIpv6Interface, {
+  identifier: "Ipv6Interface"
 })
 
 /**
- * Type-level representation returned by {@link fromJsonString}.
+ * Type-level representation of {@link Ipv6InterfaceFromString}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface fromJsonString<S extends Constraint> extends decodeTo<S, String> {
-  readonly "Rebuild": fromJsonString<S>
+export interface Ipv6InterfaceFromString extends decodeTo<Ipv6Interface, String> {
+  readonly "Rebuild": Ipv6InterfaceFromString
 }
 
-/**
- * Returns a schema that decodes a JSON string and then decodes the parsed value
- * using the given schema.
- *
- * **Details**
- *
- * This is useful when working with JSON-encoded strings where the actual
- * structure of the value is known and described by an existing schema.
- *
- * During decoding, the resulting schema first parses the input string as JSON,
- * using `reviver` when provided, and then runs the provided schema on the
- * parsed result. During encoding, it first encodes with the provided schema and
- * then passes the result to `JSON.stringify` with the optional `replacer` and
- * `space`.
- *
- * **Example** (Formatting encoded JSON)
- *
- * ```ts import.meta.vitest
- * import { Schema } from "effect"
- *
- * const schema = Schema.Struct({ a: Schema.Number })
- * const schemaFromJsonString = Schema.fromJsonString(schema, { space: 2 })
- *
- * Schema.encodeSync(schemaFromJsonString)({ a: 1 }) // => "{\n  \"a\": 1\n}"
- * ```
+/**
+ * Schema for IPv6 interface addresses encoded as an address and prefix length.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export function fromJsonString<S extends Constraint>(
-  schema: S,
-  options?: {
-    readonly reviver?: Parameters<typeof JSON.parse>[1] | undefined
-    readonly replacer?: SchemaGetter.JsonReplacer | undefined
-    readonly space?: Parameters<typeof JSON.stringify>[2] | undefined
-  }
-): fromJsonString<S> {
-  return JsonString.pipe(decodeTo(schema, SchemaTransformation.fromJsonString(options)))
-}
-
-/** @internal */
-export const UnknownFromJsonString: fromJsonString<Unknown> = fromJsonString(Unknown)
+export const Ipv6InterfaceFromString: Ipv6InterfaceFromString = netAddressFromString(
+  Ipv6Interface,
+  IpInterface_.ipv6FromString,
+  IpInterface_.format,
+  "Ipv6InterfaceFromString"
+)
 
 /**
- * Type-level representation of {@link File}.
+ * Type-level representation of {@link IpInterface}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface File extends instanceOf<globalThis.File> {
-  readonly "Rebuild": File
+export interface IpInterface extends declare<IpInterface_.IpInterface> {
+  readonly "Rebuild": IpInterface
 }
 
 /**
- * Schema for JavaScript `File` objects.
- *
- * **Details**
- *
- * The default JSON serializer encodes a `File` as `{ data, type, name, lastModified }`
- * where `data` is base64-encoded.
+ * Schema for already-constructed IPv4 or IPv6 interface address values.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const File: File = instanceOf(globalThis.File, {
-  representation: {
-    id: "effect/schema/File",
-    payload: null
-  },
-  toCode: () => ({
-    runtime: `Schema.File`,
-    Type: `globalThis.File`
-  }),
-  expected: "File",
-  toCodecJson: () =>
-    link<globalThis.File>()(
-      Struct({
-        data: String.check(isBase64()),
-        type: String,
-        name: String,
-        lastModified: Int
-      }),
-      SchemaTransformation.transformOrFail({
-        decode: (e, options) =>
-          Result_.match(Encoding.decodeBase64(e.data), {
-            onFailure: () =>
-              Effect.fail(
-                new SchemaIssue.InvalidValue(
-                  { expected: "a valid Base64 string" },
-                  e.data,
-                  options
-                )
-              ),
-            onSuccess: (bytes) => {
-              const buffer = new globalThis.Uint8Array(bytes)
-              return Effect.succeed(
-                new globalThis.File([buffer], e.name, { type: e.type, lastModified: e.lastModified })
-              )
-            }
-          }),
-        encode: (file, options) =>
-          Effect.tryPromise({
-            try: async () => {
-              const bytes = new globalThis.Uint8Array(await file.arrayBuffer())
-              return {
-                data: Encoding.encodeBase64(bytes),
-                type: file.type,
-                name: file.name,
-                lastModified: file.lastModified
-              }
-            },
-            catch: () =>
-              new SchemaIssue.InvalidValue(
-                { expected: "a readable File" },
-                file,
-                options
-              )
-          })
-      })
-    )
+export const IpInterface: IpInterface = declare(IpInterface_.isIpInterface, {
+  identifier: "IpInterface"
 })
 
 /**
- * Reviver for persisted `File` declarations.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain the {@link File} schema.
+ * Type-level representation of {@link IpInterfaceFromString}.
  *
- * @see {@link File} for the corresponding schema
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface IpInterfaceFromString extends decodeTo<IpInterface, String> {
+  readonly "Rebuild": IpInterfaceFromString
+}
+
+/**
+ * Schema for IPv4 or IPv6 interface addresses encoded as an address and prefix length.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const FileReviver = makeFixedDeclarationReviver(
-  "effect/schema/File",
-  File
+export const IpInterfaceFromString: IpInterfaceFromString = netAddressFromString(
+  IpInterface,
+  IpInterface_.fromString,
+  IpInterface_.format,
+  "IpInterfaceFromString"
 )
 
 /**
- * Type-level representation of {@link FormData}.
+ * Type-level representation of {@link Ipv4Network}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface FormData extends instanceOf<globalThis.FormData> {
-  readonly "Rebuild": FormData
+export interface Ipv4Network extends declare<IpNetwork_.Ipv4Network> {
+  readonly "Rebuild": Ipv4Network
 }
 
 /**
- * Schema for JavaScript `FormData` objects.
- *
- * **Details**
- *
- * The default JSON serializer encodes a `FormData` as an array of `[key, entry]`
- * pairs where each entry is tagged as `"String"` or `"File"`.
+ * Schema for already-constructed canonical IPv4 network prefixes.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const FormData: FormData = instanceOf(globalThis.FormData, {
-  representation: {
-    id: "effect/schema/FormData",
-    payload: null
-  },
-  toCode: () => ({
-    runtime: `Schema.FormData`,
-    Type: `globalThis.FormData`
-  }),
-  expected: "FormData",
-  toCodecJson: () =>
-    link<globalThis.FormData>()(
-      ArraySchema(
-        Tuple([
-          String,
-          Union([
-            Struct({ _tag: tag("String"), value: String }),
-            Struct({ _tag: tag("File"), value: File })
-          ])
-        ])
-      ),
-      SchemaTransformation.transformOrFail({
-        decode: (e) => {
-          const out = new globalThis.FormData()
-          for (const [key, entry] of e) {
-            out.append(key, entry.value)
-          }
-          return Effect.succeed(out)
-        },
-        encode: (formData) => {
-          return Effect.succeed(
-            globalThis.Array.from(formData.entries()).map(([key, value]) => {
-              if (typeof value === "string") {
-                return [key, { _tag: "String", value }] as const
-              } else {
-                return [key, { _tag: "File", value }] as const
-              }
-            })
-          )
-        }
-      })
-    )
+export const Ipv4Network: Ipv4Network = declare(IpNetwork_.isIpv4Network, {
+  identifier: "Ipv4Network"
 })
 
 /**
- * Reviver for persisted `FormData` declarations.
- *
- * **When to use**
+ * Type-level representation of {@link Ipv4NetworkFromString}.
  *
- * Use when reconstructing documents that may contain the {@link FormData} schema.
- *
- * @see {@link FormData} for the corresponding schema
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface Ipv4NetworkFromString extends decodeTo<Ipv4Network, String> {
+  readonly "Rebuild": Ipv4NetworkFromString
+}
+
+/**
+ * Schema for canonical IPv4 network prefixes encoded in CIDR notation.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const FormDataReviver = makeFixedDeclarationReviver(
-  "effect/schema/FormData",
-  FormData
+export const Ipv4NetworkFromString: Ipv4NetworkFromString = netAddressFromString(
+  Ipv4Network,
+  IpNetwork_.ipv4FromString,
+  IpNetwork_.format,
+  "Ipv4NetworkFromString"
 )
 
 /**
- * Type-level representation returned by {@link fromFormData}.
+ * Type-level representation of {@link Ipv6Network}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface fromFormData<S extends Constraint> extends decodeTo<S, FormData> {
-  readonly "Rebuild": fromFormData<S>
+export interface Ipv6Network extends declare<IpNetwork_.Ipv6Network> {
+  readonly "Rebuild": Ipv6Network
 }
 
 /**
- * Schema for decoding `FormData` through a bracket-notation tree.
- *
- * **When to use**
- *
- * Use to decode browser or multipart form data into a structured schema value.
- *
- * **Details**
- *
- * The decoding process has two steps:
- *
- * 1. Parse `FormData` into a nested tree record.
- * 2. Decode the parsed value with the given schema.
- *
- * You can express nested values using bracket notation.
- *
- * If you want to decode string fields into non-string primitive values, use
- * `Schema.toCodecStringTree`.
- *
- * **Example** (Decoding a flat structure)
- *
- * ```ts import.meta.vitest
- * import { Schema } from "effect"
- *
- * const schema = Schema.fromFormData(
- *   Schema.Struct({
- *     a: Schema.String
- *   })
- * )
- *
- * const formData = new FormData()
- * formData.append("a", "1")
- * formData.append("b", "2")
- *
- * Schema.decodeUnknownSync(schema)(formData) // => { a: "1" }
- * ```
- *
- * **Example** (Decoding nested fields)
- *
- * ```ts import.meta.vitest
- * import { Schema } from "effect"
- *
- * const schema = Schema.fromFormData(
- *   Schema.Struct({
- *     a: Schema.String,
- *     b: Schema.Struct({
- *       c: Schema.String,
- *       d: Schema.String
- *     })
- *   })
- * )
+ * Schema for already-constructed canonical IPv6 network prefixes.
  *
- * const formData = new FormData()
- * formData.append("a", "1")
- * formData.append("b[c]", "2")
- * formData.append("b[d]", "3")
- *
- * Schema.decodeUnknownSync(schema)(formData) // => { a: "1", b: { c: "2", d: "3" } }
- * ```
+ * @unstable
+ * @category schemas
+ * @since 4.0.0
+ */
+export const Ipv6Network: Ipv6Network = declare(IpNetwork_.isIpv6Network, {
+  identifier: "Ipv6Network"
+})
+
+/**
+ * Type-level representation of {@link Ipv6NetworkFromString}.
  *
- * **Example** (Parsing non-string values)
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface Ipv6NetworkFromString extends decodeTo<Ipv6Network, String> {
+  readonly "Rebuild": Ipv6NetworkFromString
+}
+
+/**
+ * Schema for canonical IPv6 network prefixes encoded in CIDR notation.
  *
- * ```ts import.meta.vitest
- * import { Schema } from "effect"
+ * @unstable
+ * @category schemas
+ * @since 4.0.0
+ */
+export const Ipv6NetworkFromString: Ipv6NetworkFromString = netAddressFromString(
+  Ipv6Network,
+  IpNetwork_.ipv6FromString,
+  IpNetwork_.format,
+  "Ipv6NetworkFromString"
+)
+
+/**
+ * Type-level representation of {@link IpNetwork}.
  *
- * const schema = Schema.fromFormData(
- *   Schema.toCodecStringTree(
- *     Schema.Struct({
- *       a: Schema.Int
- *     })
- *   )
- * )
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface IpNetwork extends declare<IpNetwork_.IpNetwork> {
+  readonly "Rebuild": IpNetwork
+}
+
+/**
+ * Schema for already-constructed canonical IPv4 or IPv6 network prefixes.
  *
- * const formData = new FormData()
- * formData.append("a", "1")
+ * @unstable
+ * @category schemas
+ * @since 4.0.0
+ */
+export const IpNetwork: IpNetwork = declare(IpNetwork_.isIpNetwork, {
+  identifier: "IpNetwork"
+})
+
+/**
+ * Type-level representation of {@link IpNetworkFromString}.
  *
- * Schema.decodeUnknownSync(schema)(formData) // => { a: 1 }
- * ```
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface IpNetworkFromString extends decodeTo<IpNetwork, String> {
+  readonly "Rebuild": IpNetworkFromString
+}
+
+/**
+ * Schema for canonical IPv4 or IPv6 network prefixes encoded in CIDR notation.
  *
- * @category decoding
+ * @unstable
+ * @category schemas
  * @since 4.0.0
  */
-export function fromFormData<S extends Constraint>(schema: S): fromFormData<S> {
-  return FormData.pipe(decodeTo(schema, SchemaTransformation.fromFormData))
-}
+export const IpNetworkFromString: IpNetworkFromString = netAddressFromString(
+  IpNetwork,
+  IpNetwork_.fromString,
+  IpNetwork_.format,
+  "IpNetworkFromString"
+)
 
 /**
- * Type-level representation of {@link URLSearchParams}.
+ * Type-level representation of {@link InetAddressV4}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface URLSearchParams extends instanceOf<globalThis.URLSearchParams> {
-  readonly "Rebuild": URLSearchParams
+export interface InetAddressV4 extends declare<NetAddress_.InetAddressV4> {
+  readonly "Rebuild": InetAddressV4
 }
 
 /**
- * Schema for JavaScript `URLSearchParams` objects.
+ * Schema for already-constructed resolved IPv4 internet addresses.
  *
- * **Details**
+ * @unstable
+ * @category schemas
+ * @since 4.0.0
+ */
+export const InetAddressV4: InetAddressV4 = declare(NetAddress_.isInetAddressV4, {
+  identifier: "InetAddressV4"
+})
+
+/**
+ * Type-level representation of {@link InetAddressV6}.
  *
- * The default JSON serializer encodes a `URLSearchParams` as a query string.
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface InetAddressV6 extends declare<NetAddress_.InetAddressV6> {
+  readonly "Rebuild": InetAddressV6
+}
+
+/**
+ * Schema for already-constructed resolved IPv6 internet addresses.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const URLSearchParams: URLSearchParams = instanceOf(globalThis.URLSearchParams, {
-  representation: {
-    id: "effect/schema/URLSearchParams",
-    payload: null
-  },
-  toCode: () => ({
-    runtime: `Schema.URLSearchParams`,
-    Type: `globalThis.URLSearchParams`
-  }),
-  expected: "URLSearchParams",
-  toCodecJson: () =>
-    link<globalThis.URLSearchParams>()(
-      String.annotate({ expected: "a query string that will be decoded as URLSearchParams" }),
-      SchemaTransformation.transform({
-        decode: (e) => new globalThis.URLSearchParams(e),
-        encode: (params) => params.toString()
-      })
-    )
+export const InetAddressV6: InetAddressV6 = declare(NetAddress_.isInetAddressV6, {
+  identifier: "InetAddressV6"
 })
 
 /**
- * Reviver for persisted `URLSearchParams` declarations.
+ * Type-level representation of {@link InetAddress}.
  *
- * **When to use**
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface InetAddress extends declare<NetAddress_.InetAddress> {
+  readonly "Rebuild": InetAddress
+}
+
+/**
+ * Schema for already-constructed resolved internet addresses.
  *
- * Use when reconstructing documents that may contain the {@link URLSearchParams} schema.
+ * @unstable
+ * @category schemas
+ * @since 4.0.0
+ */
+export const InetAddress: InetAddress = declare(NetAddress_.isInetAddress, {
+  identifier: "InetAddress"
+})
+
+/**
+ * Type-level representation of {@link InetAddressFromString}.
  *
- * @see {@link URLSearchParams} for the corresponding schema
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface InetAddressFromString extends decodeTo<InetAddress, String> {
+  readonly "Rebuild": InetAddressFromString
+}
+
+/**
+ * Schema for resolved internet addresses encoded as numeric socket strings.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const URLSearchParamsReviver = makeFixedDeclarationReviver(
-  "effect/schema/URLSearchParams",
-  URLSearchParams
+export const InetAddressFromString: InetAddressFromString = netAddressFromString(
+  InetAddress,
+  NetAddress_.inetAddressFromString,
+  NetAddress_.formatInet,
+  "InetAddressFromString"
 )
 
 /**
- * Type-level representation returned by {@link fromURLSearchParams}.
+ * Type-level representation of {@link UnixPathAddress}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface fromURLSearchParams<S extends Constraint> extends decodeTo<S, URLSearchParams> {
-  readonly "Rebuild": fromURLSearchParams<S>
+export interface UnixPathAddress extends declare<NetAddress_.UnixPathAddress> {
+  readonly "Rebuild": UnixPathAddress
 }
 
 /**
- * Schema for decoding `URLSearchParams` through a bracket-notation tree.
- *
- * **When to use**
- *
- * Use to decode query parameters into a structured schema value.
- *
- * **Details**
- *
- * The decoding process has two steps:
- *
- * 1. Parse `URLSearchParams` into a nested tree record.
- * 2. Decode the parsed value with the given schema.
- *
- * You can express nested values using bracket notation.
- *
- * If you want to decode values that are not strings, use
- * `Schema.toCodecStringTree`. This serializer preserves values such as
- * numbers when compatible with the schema.
- *
- * **Example** (Decoding a flat structure)
- *
- * ```ts import.meta.vitest
- * import { Schema } from "effect"
- *
- * const schema = Schema.fromURLSearchParams(
- *   Schema.Struct({
- *     a: Schema.String
- *   })
- * )
- *
- * const urlSearchParams = new URLSearchParams("a=1&b=2")
+ * Schema for already-constructed Unix-domain filesystem addresses.
  *
- * Schema.decodeUnknownSync(schema)(urlSearchParams) // => { a: "1" }
- * ```
- *
- * **Example** (Decoding nested fields)
- *
- * ```ts import.meta.vitest
- * import { Schema } from "effect"
- *
- * const schema = Schema.fromURLSearchParams(
- *   Schema.Struct({
- *     a: Schema.String,
- *     b: Schema.Struct({
- *       c: Schema.String,
- *       d: Schema.String
- *     })
- *   })
- * )
- *
- * const urlSearchParams = new URLSearchParams("a=1&b[c]=2&b[d]=3")
- *
- * Schema.decodeUnknownSync(schema)(urlSearchParams) // => { a: "1", b: { c: "2", d: "3" } }
- * ```
- *
- * **Example** (Parsing non-string values)
- *
- * ```ts import.meta.vitest
- * import { Schema } from "effect"
- *
- * const schema = Schema.fromURLSearchParams(
- *   Schema.toCodecStringTree(
- *     Schema.Struct({
- *       a: Schema.Int
- *     })
- *   )
- * )
+ * @unstable
+ * @category schemas
+ * @since 4.0.0
+ */
+export const UnixPathAddress: UnixPathAddress = declare(
+  NetAddress_.isUnixPathAddress,
+  { identifier: "UnixPathAddress" }
+)
+
+/**
+ * Type-level representation of {@link UnixPathAddressFromString}.
  *
- * const urlSearchParams = new URLSearchParams("a=1&b=2")
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface UnixPathAddressFromString extends decodeTo<UnixPathAddress, String> {
+  readonly "Rebuild": UnixPathAddressFromString
+}
+
+/**
+ * Schema for Unix-domain filesystem addresses encoded as opaque path strings.
  *
- * Schema.decodeUnknownSync(schema)(urlSearchParams) // => { a: 1 }
- * ```
+ * @unstable
+ * @category schemas
+ * @since 4.0.0
+ */
+export const UnixPathAddressFromString: UnixPathAddressFromString = String.pipe(decodeTo(
+  UnixPathAddress,
+  SchemaTransformation.transform({
+    decode: NetAddress_.unixPathAddress,
+    encode: (address) => address.path
+  })
+)).annotate({ identifier: "UnixPathAddressFromString" })
+
+/**
+ * Type-level representation of {@link SocketAddress}.
  *
- * @category decoding
+ * @unstable
+ * @category models
  * @since 4.0.0
  */
-export function fromURLSearchParams<S extends Constraint>(schema: S): fromURLSearchParams<S> {
-  return URLSearchParams.pipe(decodeTo(schema, SchemaTransformation.fromURLSearchParams))
+export interface SocketAddress extends declare<NetAddress_.SocketAddress> {
+  readonly "Rebuild": SocketAddress
 }
 
 /**
- * Type-level representation of {@link NumberFromString}.
+ * Schema for already-constructed portable concrete socket addresses.
+ *
+ * @unstable
+ * @category schemas
+ * @since 4.0.0
+ */
+export const SocketAddress: SocketAddress = declare(NetAddress_.isSocketAddress, {
+  identifier: "SocketAddress"
+})
+
+// -----------------------------------------------------------------------------
+// Duration schemas
+// -----------------------------------------------------------------------------
+
+const durationFromString: SchemaTransformation.Transformation<Duration_.Duration, string> = SchemaTransformation
+  .transformEffect<Duration_.Duration, string>({
+    decode: (s, options) =>
+      Option_.match(Duration_.fromInput(s as Duration_.Input), {
+        onNone: () =>
+          Effect.fail(
+            new SchemaIssue.InvalidValue(
+              { expected: "a valid Duration string" },
+              s,
+              options
+            )
+          ),
+        onSome: Effect.succeed
+      }),
+    encode: (duration) => Effect.succeed(globalThis.String(duration))
+  })
+const durationFromNanos: SchemaTransformation.Transformation<Duration_.Duration, bigint> = SchemaTransformation
+  .transformEffect({
+    decode: (i) => Effect.succeed(Duration_.nanos(i)),
+    encode: (a, options) =>
+      Option_.match(Duration_.toNanos(a), {
+        onNone: () =>
+          Effect.fail(
+            new SchemaIssue.InvalidValue(
+              { expected: "a Duration representable as a bigint" },
+              a,
+              options
+            )
+          ),
+        onSome: (nanos) => Effect.succeed(nanos)
+      })
+  })
+const durationFromMillis: SchemaTransformation.Transformation<Duration_.Duration, number> = SchemaTransformation
+  .transform({
+    decode: (i) => Duration_.millis(i),
+    encode: (a) => Duration_.toMillis(a)
+  })
+/**
+ * Type-level representation of {@link Duration}.
  *
  * @category models
  * @since 3.10.0
  */
-export interface NumberFromString extends decodeTo<Number, String> {
-  readonly "Rebuild": NumberFromString
+export interface Duration extends declare<Duration_.Duration> {
+  readonly "Rebuild": Duration
 }
-
 /**
- * Schema that parses a string into a `number` using JavaScript
- * number coercion.
+ * Schema for `Duration` values.
  *
  * **Details**
  *
- * Decoding:
- * A `string` is decoded as a number, including possible non-finite values such as
- * `NaN`, `Infinity`, and `-Infinity`. Use `FiniteFromString` to reject non-finite
- * numbers.
+ * The default JSON serializer encodes `Duration` as a tagged object with the
+ * duration type and value.
  *
- * Encoding:
- * A number is encoded as a `string`.
+ * **Example** (Defining a Duration schema)
+ *
+ * ```ts import.meta.vitest
+ * import { Duration, Schema } from "effect"
+ *
+ * Schema.decodeUnknownSync(Schema.Duration)(Duration.seconds(5)) // => Duration.seconds(5)
+ * ```
  *
  * @category schemas
+ *
  * @since 3.10.0
  */
-export const NumberFromString: NumberFromString = String.annotate({
-  expected: "a string that will be decoded as a number"
-}).pipe(decodeTo(Number, SchemaTransformation.numberFromString))
-
+export const Duration: Duration = declare(
+  Duration_.isDuration,
+  {
+    representation: {
+      id: "effect/schema/Duration",
+      payload: null
+    },
+    toCode: () => ({
+      runtime: `Schema.Duration`,
+      Type: `Duration.Duration`,
+      importDeclarations: [`import * as Duration from "effect/Duration"`]
+    }),
+    expected: "Duration",
+    toCodecJson: () =>
+      link<Duration_.Duration>()(
+        Union([
+          Struct({ _tag: Literal("Infinity") }),
+          Struct({ _tag: Literal("NegativeInfinity") }),
+          Struct({ _tag: Literal("Nanos"), value: BigInt }),
+          Struct({ _tag: Literal("Millis"), value: Int })
+        ]),
+        SchemaTransformation.transform({
+          decode: (e) => {
+            switch (e._tag) {
+              case "Infinity":
+                return Duration_.infinity
+              case "NegativeInfinity":
+                return Duration_.negativeInfinity
+              case "Nanos":
+                return Duration_.nanos(e.value)
+              case "Millis":
+                return Duration_.millis(e.value)
+            }
+          },
+          encode: (duration) => {
+            switch (duration.value._tag) {
+              case "Infinity":
+                return { _tag: "Infinity" } as const
+              case "NegativeInfinity":
+                return { _tag: "NegativeInfinity" } as const
+              case "Nanos":
+                return { _tag: "Nanos", value: duration.value.nanos } as const
+              case "Millis":
+                return { _tag: "Millis", value: duration.value.millis } as const
+            }
+          }
+        })
+      )
+  }
+)
+const DurationString = String.annotate({ expected: "a string that will be decoded as a Duration" })
 /**
- * Type-level representation of {@link FiniteFromString}.
+ * Type-level representation of {@link DurationFromString}.
  *
  * @category models
  * @since 4.0.0
  */
-export interface FiniteFromString extends decodeTo<Finite, String> {
-  readonly "Rebuild": FiniteFromString
+export interface DurationFromString extends decodeTo<Duration, String> {
+  readonly "Rebuild": DurationFromString
 }
-
 /**
- * Schema that parses a string into a finite number.
+ * Schema that parses a string into a `Duration`.
  *
  * **Details**
  *
  * Decoding:
- * - A `string` is decoded as a finite number, rejecting `NaN`, `Infinity`, and
- *   `-Infinity` values.
+ * - A `string` is decoded as a `Duration`, accepting any format that
+ *   `Duration.fromInput` can parse.
  *
  * Encoding:
- * - A finite number is encoded as a `string`.
+ * - A `Duration` is encoded as a parseable `string`.
  *
  * @category schemas
  * @since 4.0.0
  */
-export const FiniteFromString: FiniteFromString = String.annotate({
-  expected: "a string that will be decoded as a finite number"
-}).pipe(decodeTo(Finite, SchemaTransformation.numberFromString))
-
+export const DurationFromString: DurationFromString = DurationString.pipe(
+  decodeTo(Duration, durationFromString)
+)
 /**
- * Type-level representation of {@link BigIntFromString}.
+ * Type-level representation of {@link DurationFromNanos}.
  *
  * @category models
- * @since 4.0.0
+ * @since 3.10.0
  */
-export interface BigIntFromString extends decodeTo<BigInt, String> {
-  readonly "Rebuild": BigIntFromString
+export interface DurationFromNanos extends decodeTo<Duration, BigInt> {
+  readonly "Rebuild": DurationFromNanos
 }
-
 /**
- * Schema that parses a string into a `bigint`.
- *
- * **When to use**
- *
- * Use to parse signed base-10 integer strings into bigint values while encoding
- * bigint values back to decimal strings.
+ * Schema that decodes a `bigint` into a `Duration`, treating the bigint as
+ * nanoseconds.
  *
  * **Details**
  *
  * Decoding:
- * - A `string` is decoded as a `bigint`.
+ * A `bigint` representing nanoseconds is decoded as a `Duration`.
  *
  * Encoding:
- * - A `bigint` is encoded as a `string`.
- *
- * **Gotchas**
- *
- * Decoding accepts only strings matching `^-?\d+$`.
- *
- * @see {@link isStringBigInt} for the string predicate used by this schema
- * @see {@link BigInt} for validating values that are already bigint values
- * @see {@link NumberFromString} for parsing JavaScript number strings, including non-finite values
- * @see {@link BigDecimalFromString} for parsing decimal number strings
- *
- * @category schemas
- * @since 4.0.0
- */
-export const BigIntFromString: BigIntFromString = make<String>(SchemaAST.bigIntString).pipe(
-  decodeTo(BigInt, SchemaTransformation.bigintFromString)
-)
-
-/**
- * Type-level representation of {@link Trimmed}.
- *
- * @category models
- * @since 3.10.0
- */
-export interface Trimmed extends String {
-  readonly "Rebuild": Trimmed
-}
-
-/**
- * Schema for strings that contains no leading or trailing whitespaces.
+ * Finite durations are encoded as a `bigint` number of nanoseconds. Encoding
+ * fails when the duration cannot be represented as nanoseconds, such as
+ * `Duration.infinity` or `Duration.negativeInfinity`.
  *
  * @category schemas
  * @since 3.10.0
  */
-export const Trimmed: Trimmed = String.check(isTrimmed())
-
+export const DurationFromNanos: DurationFromNanos = BigInt.pipe(
+  decodeTo(Duration, durationFromNanos)
+)
 /**
- * Type-level representation of {@link Trim}.
+ * Type-level representation of {@link DurationFromMillis}.
  *
  * @category models
  * @since 3.10.0
  */
-export interface Trim extends decodeTo<Trimmed, String> {
-  readonly "Rebuild": Trim
+export interface DurationFromMillis extends decodeTo<Duration, Number> {
+  readonly "Rebuild": DurationFromMillis
 }
-
 /**
- * Schema that trims whitespace from a string.
+ * Schema that decodes a number into a `Duration`, treating the number as
+ * milliseconds.
  *
  * **Details**
  *
  * Decoding:
- * - A `string` is decoded as a string with no leading or trailing whitespaces.
+ * - A finite or infinite number is decoded as a `Duration`
  *
  * Encoding:
- * - The trimmed string is encoded as is.
+ * - A `Duration` is encoded to a finite or infinite number of milliseconds
+ *
+ * **Gotchas**
+ *
+ * `NaN` is decoded as `Duration.zero`, matching `Duration.millis`.
  *
  * @category schemas
  * @since 3.10.0
  */
-export const Trim: Trim = String.annotate({
-  expected: "a string that will be decoded as a trimmed string"
-}).pipe(decodeTo(Trimmed, SchemaTransformation.trim()))
+export const DurationFromMillis: DurationFromMillis = Number.pipe(
+  decodeTo(Duration, durationFromMillis)
+)
+
+// -----------------------------------------------------------------------------
+// Exit schemas
+// -----------------------------------------------------------------------------
 
 /**
- * Type-level representation of {@link StringFromBase64}.
+ * Type-level representation returned by {@link Exit}.
  *
  * @category models
  * @since 3.10.0
  */
-export interface StringFromBase64 extends decodeTo<String, String> {
-  readonly "Rebuild": StringFromBase64
+export interface Exit<A extends Constraint, E extends Constraint, D extends Constraint> extends
+  declareConstructor<
+    Exit_.Exit<A["Type"], E["Type"]>,
+    Exit_.Exit<A["Encoded"], E["Encoded"]>,
+    readonly [A, E, D],
+    ExitIso<A, E, D>
+  >
+{
+  readonly "Rebuild": Exit<A, E, D>
+  readonly value: A
+  readonly error: E
+  readonly defect: D
 }
-
 /**
- * Decodes a base64 (RFC4648) encoded string into a UTF-8 string.
+ * Iso representation used for `Exit` schemas.
  *
  * **Details**
  *
- * Decoding:
- * - A **valid** base64 encoded string is decoded as a UTF-8 `string`.
- *
- * Encoding:
- * - A `string` is encoded as a base64-encoded string.
- *
- * @category schemas
- * @since 3.10.0
- */
-export const StringFromBase64: StringFromBase64 = String.annotate({
-  expected: "a base64 encoded string that will be decoded as a UTF-8 string"
-}).pipe(
-  decodeTo(String, SchemaTransformation.stringFromBase64String)
-)
-
-/**
- * Type-level representation of {@link StringFromBase64Url}.
+ * Successful exits are represented as `{ _tag: "Success", value }`, while failed
+ * exits are represented as `{ _tag: "Failure", cause }`.
  *
- * @category models
- * @since 3.10.0
+ * @category utility types
+ * @since 4.0.0
  */
-export interface StringFromBase64Url extends decodeTo<String, String> {
-  readonly "Rebuild": StringFromBase64Url
+export type ExitIso<A extends Constraint, E extends Constraint, D extends Constraint> = {
+  readonly _tag: "Success"
+  readonly value: A["Iso"]
+} | {
+  readonly _tag: "Failure"
+  readonly cause: CauseIso<E, D>
 }
-
 /**
- * Decodes a base64 (URL) encoded string into a UTF-8 string.
- *
- * **Details**
+ * Creates a schema for `Exit` values using schemas for the success value, typed
+ * failure, and unexpected defect channels.
  *
- * Decoding:
- * - A **valid** base64 (URL) encoded string is decoded as a UTF-8 `string`.
+ * **When to use**
  *
- * Encoding:
- * - A `string` is encoded as a base64 (URL) encoded string.
+ * Use when serializing or validating an effect outcome where success, typed
+ * failure, and defects each need their own schema.
  *
  * @category schemas
  * @since 3.10.0
  */
-export const StringFromBase64Url: StringFromBase64Url = String.annotate({
-  expected: "a base64 (URL) encoded string that will be decoded as a UTF-8 string"
-}).pipe(
-  decodeTo(String, SchemaTransformation.stringFromBase64UrlString)
-)
-
-/**
- * Type-level representation of {@link StringFromHex}.
- *
- * @category models
- * @since 3.10.0
- */
-export interface StringFromHex extends decodeTo<String, String> {
-  readonly "Rebuild": StringFromHex
+export function Exit<
+  A extends Constraint,
+  E extends Constraint,
+  D extends Constraint
+>(
+  value: A,
+  error: E,
+  defect: D
+): Exit<A, E, D> {
+  const schema = declareConstructor<
+    Exit_.Exit<A["Type"], E["Type"]>,
+    Exit_.Exit<A["Encoded"], E["Encoded"]>,
+    ExitIso<A, E, D>
+  >()(
+    [value, error, defect],
+    ([value, error, defect]) => {
+      const cause = Cause(error, defect)
+      return (input, ast, options) => {
+        if (!Exit_.isExit(input)) {
+          return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
+        }
+        switch (input._tag) {
+          case "Success":
+            return Effect.mapBothEager(
+              SchemaParser.decodeUnknownEffect(value)(input.value, options),
+              {
+                onSuccess: Exit_.succeed,
+                onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "value", issue, input, options)
+              }
+            )
+          case "Failure":
+            return Effect.mapBothEager(
+              SchemaParser.decodeUnknownEffect(cause)(input.cause, options),
+              {
+                onSuccess: Exit_.failCause,
+                onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "cause", issue, input, options)
+              }
+            )
+        }
+      }
+    },
+    {
+      representation: {
+        id: "effect/schema/Exit",
+        payload: null
+      },
+      toCode: ({ typeParameters }) => ({
+        runtime: `Schema.Exit(${typeParameters[0].runtime}, ${typeParameters[1].runtime}, ${
+          typeParameters[2].runtime
+        })`,
+        Type: `Exit.Exit<${typeParameters[0].Type}, ${typeParameters[1].Type}, ${typeParameters[2].Type}>`,
+        importDeclarations: [`import * as Exit from "effect/Exit"`]
+      }),
+      expected: "Exit",
+      toCodec: ([value, error, defect]) =>
+        link<Exit_.Exit<A["Encoded"], E["Encoded"]>>()(
+          Union([
+            Struct({ _tag: Literal("Success"), value }),
+            Struct({
+              _tag: Literal("Failure"),
+              cause: Cause(error, defect)
+            })
+          ]),
+          SchemaTransformation.transform({
+            decode: (e): Exit_.Exit<A["Encoded"], E["Encoded"]> =>
+              e._tag === "Success" ? Exit_.succeed(e.value) : Exit_.failCause(e.cause),
+            encode: (exit) =>
+              Exit_.isSuccess(exit)
+                ? { _tag: "Success", value: exit.value } as const
+                : { _tag: "Failure", cause: exit.cause } as const
+          })
+        )
+    }
+  )
+  return make(schema.ast, { value, error, defect })
 }
 
-/**
- * Decodes a hex encoded string into a UTF-8 string.
- *
- * **Details**
- *
- * Decoding:
- * - A **valid** hex encoded string is decoded as a UTF-8 `string`.
+// -----------------------------------------------------------------------------
+// Graph schemas
+// -----------------------------------------------------------------------------
+
+/**
+ * Encoded representation of an immutable Effect graph.
  *
- * Encoding:
- * - A `string` is encoded as a hex string.
+ * @category models
+ * @since 4.0.0
+ */
+export type EncodedGraph<N, E, T extends Graph_.Kind> = Graph_.Snapshot<N, E, T>
+/**
+ * Iso representation used for {@link Graph} schemas.
  *
- * @category schemas
- * @since 3.10.0
+ * @category utility types
+ * @since 4.0.0
  */
-export const StringFromHex: StringFromHex = String.annotate({
-  expected: "a hex encoded string that will be decoded as a UTF-8 string"
-}).pipe(
-  decodeTo(String, SchemaTransformation.stringFromHexString)
-)
-
+export type GraphIso<T extends Graph_.Kind, Node extends Constraint, Edge extends Constraint> = EncodedGraph<
+  Node["Iso"],
+  Edge["Iso"],
+  T
+>
 /**
- * Type-level representation of {@link StringFromUriComponent}.
+ * Type-level representation returned by {@link Graph}.
  *
  * @category models
- * @since 3.12.0
+ * @since 4.0.0
  */
-export interface StringFromUriComponent extends decodeTo<String, String> {
-  readonly "Rebuild": StringFromUriComponent
+export interface Graph<T extends Graph_.Kind, Node extends Constraint, Edge extends Constraint>
+  extends
+    declareConstructor<
+      Graph_.Graph<Node["Type"], Edge["Type"], T>,
+      Graph_.Graph<Node["Encoded"], Edge["Encoded"], T>,
+      readonly [Node, Edge],
+      GraphIso<T, Node, Edge>
+    >
+{
+  readonly "Rebuild": Graph<T, Node, Edge>
+  readonly type: T
+  readonly node: Node
+  readonly edge: Edge
+}
+function graphEncodedSchema<T extends Graph_.Kind, Node extends Constraint, Edge extends Constraint>(
+  type: T,
+  node: Node,
+  edge: Edge
+) {
+  return Struct({
+    type: Literal(type),
+    nodes: ArraySchema(Struct({ index: Natural, data: node })),
+    edges: ArraySchema(Struct({ index: Natural, source: Natural, target: Natural, data: edge }))
+  })
 }
+function graphDecode<N, E, T extends Graph_.Kind>(
+  input: EncodedGraph<N, E, T>,
+  options: SchemaAST.ParseOptions
+): Effect.Effect<Graph_.Graph<N, E, T>, SchemaIssue.Issue> {
+  let previous = -1
+  const indexes = new Set<Graph_.NodeIndex>()
+  for (let i = 0; i < input.nodes.length; i++) {
+    const index = input.nodes[i].index
+    if (index <= previous) {
+      return Effect.fail(
+        new SchemaIssue.Pointer(
+          ["nodes", i, "index"],
+          new SchemaIssue.InvalidValue({ expected: "a strictly increasing node index" }, index, options)
+        )
+      )
+    }
+    previous = index
+    indexes.add(index)
+  }
+
+  previous = -1
+  for (let i = 0; i < input.edges.length; i++) {
+    const edge = input.edges[i]
+    if (edge.index <= previous) {
+      return Effect.fail(
+        new SchemaIssue.Pointer(
+          ["edges", i, "index"],
+          new SchemaIssue.InvalidValue({ expected: "a strictly increasing edge index" }, edge.index, options)
+        )
+      )
+    }
+    previous = edge.index
+    if (!indexes.has(edge.source)) {
+      return Effect.fail(
+        new SchemaIssue.Pointer(
+          ["edges", i, "source"],
+          new SchemaIssue.InvalidValue({ expected: "an encoded node index" }, edge.source, options)
+        )
+      )
+    }
+    if (!indexes.has(edge.target)) {
+      return Effect.fail(
+        new SchemaIssue.Pointer(
+          ["edges", i, "target"],
+          new SchemaIssue.InvalidValue({ expected: "an encoded node index" }, edge.target, options)
+        )
+      )
+    }
+  }
 
+  return Effect.succeed(InternalGraph.hydrate(input))
+}
+function graphEncode<N, E, T extends Graph_.Kind>(
+  input: Graph_.Graph<N, E, T>,
+  type: T,
+  options: SchemaAST.ParseOptions
+): Effect.Effect<EncodedGraph<N, E, T>, SchemaIssue.Issue> {
+  if (!InternalGraph.isGraph(input) || input.mutable || input.type !== type) {
+    return Effect.fail(new SchemaIssue.InvalidValue({ expected: `an immutable ${type} Graph` }, input, options))
+  }
+  return Effect.succeed(InternalGraph.snapshot(input))
+}
+function graphToEquivalence<N, E, T extends Graph_.Kind>(
+  node: Equivalence.Equivalence<N>,
+  edge: Equivalence.Equivalence<E>
+) {
+  return (self: Graph_.Graph<N, E, T>, that: Graph_.Graph<N, E, T>): boolean => {
+    const a = InternalGraph.snapshot(self)
+    const b = InternalGraph.snapshot(that)
+    if (a.type !== b.type || a.nodes.length !== b.nodes.length || a.edges.length !== b.edges.length) return false
+    for (let i = 0; i < a.nodes.length; i++) {
+      if (a.nodes[i].index !== b.nodes[i].index || !node(a.nodes[i].data, b.nodes[i].data)) return false
+    }
+    for (let i = 0; i < a.edges.length; i++) {
+      const ae = a.edges[i]
+      const be = b.edges[i]
+      const sameEndpoints = a.type === "directed"
+        ? ae.source === be.source && ae.target === be.target
+        : (ae.source === be.source && ae.target === be.target) ||
+          (ae.source === be.target && ae.target === be.source)
+      if (
+        ae.index !== be.index || !sameEndpoints || !edge(ae.data, be.data)
+      ) return false
+    }
+    return true
+  }
+}
+type GraphArbitraryRepresentation<N, E> = null | {
+  readonly nodes: readonly [N, ...Array<N>]
+  readonly edges: ReadonlyArray<readonly [source: number, target: number, data: E]>
+}
+function graphToArbitrary<N, E, T extends Graph_.Kind>(
+  type: T,
+  node: Codec<N>,
+  edge: Codec<E>
+) {
+  return linkDecoding<Graph_.Graph<N, E, T>>()(
+    Union([
+      Null,
+      Struct({
+        nodes: NonEmptyArray(node),
+        edges: ArraySchema(Tuple([Natural, Natural, edge]))
+      })
+    ]),
+    SchemaGetter.transform<Graph_.Graph<N, E, T>, GraphArbitraryRepresentation<N, E>>((input) => {
+      if (input === null) return InternalGraph.hydrate({ type, nodes: [], edges: [] })
+      const nodes = input.nodes.map((data, index) => ({ index, data }))
+      return InternalGraph.hydrate({
+        type,
+        nodes,
+        edges: input.edges.map(([source, target, data], index) => ({
+          index,
+          source: source % nodes.length,
+          target: target % nodes.length,
+          data
+        }))
+      })
+    })
+  )
+}
 /**
- * Decodes a URI component encoded string into a UTF-8 string.
- * Can be used to store data in a URL.
+ * Creates a schema for immutable directed or undirected Effect graphs.
  *
  * **Details**
  *
- * Decoding:
- * - A **valid** URI component encoded string is decoded as a UTF-8 `string`.
- *
- * Encoding:
- * - A `string` is encoded as a URI component encoded string.
+ * Encoding preserves active node and edge indexes, payloads, endpoints,
+ * isolated nodes, self-loops, parallel edges, and stored edge orientation. It
+ * does not encode removed-ID allocator history; after decoding, future allocation starts
+ * after the highest active decoded index. Encoding rejects mutable graphs.
+ * `Graph.toJSON()` remains an inspection summary and is not this wire format.
  *
- * **Example** (Decoding URI component strings)
+ * **Example** (Encoding a directed graph as JSON)
  *
  * ```ts import.meta.vitest
- * import { Schema } from "effect"
+ * import { Graph, Schema } from "effect"
  *
- * const PaginationSchema = Schema.Struct({
- *   maxItemPerPage: Schema.Number,
- *   page: Schema.Number
+ * const codec = Schema.toCodecJson(Schema.Graph("directed", Schema.String, Schema.Number))
+ * const graph = Graph.directed<string, number>((mutable) => {
+ *   const source = Graph.addNode(mutable, "A")
+ *   const target = Graph.addNode(mutable, "B")
+ *   Graph.addEdge(mutable, source, target, 1)
  * })
  *
- * const UrlSchema = Schema.StringFromUriComponent.pipe(
- *   Schema.decodeTo(Schema.fromJsonString(PaginationSchema))
- * )
+ * const encoded = Schema.encodeSync(codec)(graph)
  *
- * Schema.encodeSync(UrlSchema)({ maxItemPerPage: 10, page: 1 }) // => "%7B%22maxItemPerPage%22%3A10%2C%22page%22%3A1%7D"
+ * encoded.type // => "directed"
+ * encoded.nodes // => [{ index: 0, data: "A" }, { index: 1, data: "B" }]
+ * encoded.edges // => [{ index: 0, source: 0, target: 1, data: 1 }]
  * ```
  *
  * @category schemas
- * @since 3.12.0
+ * @since 4.0.0
  */
-export const StringFromUriComponent: StringFromUriComponent = String.annotate({
-  expected: "a URI component encoded string that will be decoded as a UTF-8 string"
-}).pipe(
-  decodeTo(String, SchemaTransformation.stringFromUriComponent)
-)
+export function Graph<Node extends Constraint, Edge extends Constraint>(
+  type: "directed",
+  node: Node,
+  edge: Edge
+): Graph<"directed", Node, Edge>
+export function Graph<Node extends Constraint, Edge extends Constraint>(
+  type: "undirected",
+  node: Node,
+  edge: Edge
+): Graph<"undirected", Node, Edge>
+export function Graph<T extends Graph_.Kind, Node extends Constraint, Edge extends Constraint>(
+  type: T,
+  node: Node,
+  edge: Edge
+): Graph<T, Node, Edge>
+export function Graph<T extends Graph_.Kind, Node extends Constraint, Edge extends Constraint>(
+  type: T,
+  node: Node,
+  edge: Edge
+): Graph<T, Node, Edge> {
+  const schema = declareConstructor<
+    Graph_.Graph<Node["Type"], Edge["Type"], T>,
+    Graph_.Graph<Node["Encoded"], Edge["Encoded"], T>,
+    GraphIso<T, Node, Edge>
+  >()(
+    [node, edge],
+    ([node, edge]) => {
+      const encoded = graphEncodedSchema(type, node, edge)
+      return (input, ast, options) => {
+        if (!InternalGraph.isGraph(input) || input.mutable || input.type !== type) {
+          return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
+        }
+        return Effect.flatMap(
+          SchemaParser.decodeUnknownEffect(encoded)(InternalGraph.snapshot(input), options),
+          (snapshot) => graphDecode(snapshot, options)
+        )
+      }
+    },
+    {
+      representation: {
+        id: "effect/schema/Graph",
+        payload: type
+      },
+      toCode: ({ typeParameters }) => ({
+        runtime: `Schema.Graph(${format(type)}, ${typeParameters[0].runtime}, ${typeParameters[1].runtime})`,
+        Type: `Graph.Graph<${typeParameters[0].Type}, ${typeParameters[1].Type}, ${format(type)}>`,
+        importDeclarations: [`import * as Graph from "effect/Graph"`]
+      }),
+      expected: `an immutable ${type} Graph`,
+      toCodec: ([node, edge]) =>
+        link<Graph_.Graph<Node["Encoded"], Edge["Encoded"], T>>()(
+          graphEncodedSchema(type, node, edge),
+          SchemaTransformation.transformEffect({
+            decode: graphDecode,
+            encode: (graph, options) => graphEncode(graph, type, options)
+          })
+        ),
+      toCodecArbitrary: ({ typeParameters: [node, edge] }) => graphToArbitrary(type, node, edge),
+      toEquivalence: ([node, edge]) => graphToEquivalence(node, edge)
+    }
+  )
+  return make(schema.ast, { type, node, edge })
+}
 
-/**
- * Schema for property keys accepted by Effect schemas: finite `number`,
- * `symbol`, or `string`.
- *
- * @category schemas
- * @since 4.0.0
- */
-export const PropertyKey = Union([Finite, Symbol, String])
+// -----------------------------------------------------------------------------
+// HashMap schemas
+// -----------------------------------------------------------------------------
 
+function hashMapLink<Key, Value>(entries: Schema<ReadonlyArray<readonly [Key, Value]>>) {
+  return link<HashMap_.HashMap<Key, Value>>()(
+    entries,
+    SchemaTransformation.transform({
+      decode: HashMap_.fromIterable,
+      encode: HashMap_.toEntries
+    })
+  )
+}
 /**
- * Schema for a Standard Schema v1 failure result.
- *
- * **Details**
- *
- * The result contains an `issues` array where each issue has a message and an
- * optional path made of property keys or keyed path segments.
+ * Type-level representation returned by {@link HashMap}.
  *
- * @category schemas
- * @since 4.0.0
+ * @category models
+ * @since 3.10.0
  */
-export const StandardSchemaV1FailureResult = Struct({
-  issues: ArraySchema(Struct({
-    message: String,
-    path: optional(ArraySchema(Union([PropertyKey, Struct({ key: PropertyKey })])))
-  }))
-})
-
+export interface HashMap<Key extends Constraint, Value extends Constraint> extends
+  declareConstructor<
+    HashMap_.HashMap<Key["Type"], Value["Type"]>,
+    HashMap_.HashMap<Key["Encoded"], Value["Encoded"]>,
+    readonly [Key, Value],
+    HashMapIso<Key, Value>
+  >
+{
+  readonly "Rebuild": HashMap<Key, Value>
+  readonly key: Key
+  readonly value: Value
+}
 /**
- * Type-level representation of {@link BooleanFromBit}.
+ * Iso representation used for `HashMap` schemas: an array of readonly
+ * `[key, value]` tuples using each entry schema's `Iso` type.
  *
- * @category models
+ * @category utility types
  * @since 4.0.0
  */
-export interface BooleanFromBit extends decodeTo<Boolean, Literals<readonly [0, 1]>> {
-  readonly "Rebuild": BooleanFromBit
-}
-
+export type HashMapIso<Key extends Constraint, Value extends Constraint> = ReadonlyArray<
+  readonly [Key["Iso"], Value["Iso"]]
+>
 /**
- * Schema for a boolean parsed from 0 or 1.
- *
- * **When to use**
- *
- * Use when decoding data sources that represent booleans as `0 | 1` while
- * keeping boolean values in the decoded model.
- *
- * **Details**
- *
- * Decoding accepts only `0 | 1`, maps `1` to `true`, and maps `0` to `false`.
- * Encoding maps `true` to `1` and `false` to `0`.
- *
- * @see {@link Boolean} for validating values that are already booleans
- * @see {@link Literals} for keeping bit literals instead of decoding them
+ * Schema for hash maps whose keys and values conform to the provided schemas.
  *
  * @category schemas
- * @since 4.0.0
+ * @since 3.10.0
  */
-export const BooleanFromBit: BooleanFromBit = Literals([0, 1]).pipe(
-  decodeTo(
-    Boolean,
+export function HashMap<Key extends Constraint, Value extends Constraint>(key: Key, value: Value): HashMap<Key, Value> {
+  const schema = declareConstructor<
+    HashMap_.HashMap<Key["Type"], Value["Type"]>,
+    HashMap_.HashMap<Key["Encoded"], Value["Encoded"]>,
+    HashMapIso<Key, Value>
+  >()(
+    [key, value],
+    ([key, value]) => {
+      const entries = ArraySchema(Tuple([key, value]))
+      return (input, ast, options) => {
+        if (HashMap_.isHashMap(input)) {
+          return Effect.mapBothEager(
+            SchemaParser.decodeUnknownEffect(entries)(HashMap_.toEntries(input), options),
+            {
+              onSuccess: HashMap_.fromIterable,
+              onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "entries", issue, input, options)
+            }
+          )
+        }
+        return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
+      }
+    },
+    {
+      representation: {
+        id: "effect/schema/HashMap",
+        payload: null
+      },
+      toCode: ({ typeParameters }) => ({
+        runtime: `Schema.HashMap(${typeParameters[0].runtime}, ${typeParameters[1].runtime})`,
+        Type: `HashMap.HashMap<${typeParameters[0].Type}, ${typeParameters[1].Type}>`,
+        importDeclarations: [`import * as HashMap from "effect/HashMap"`]
+      }),
+      expected: "HashMap",
+      toCodec: ([key, value]) => hashMapLink(ArraySchema(Tuple([key, value]))),
+      toCodecArbitrary: ({ constraint, typeParameters: [key, value] }) =>
+        hashMapLink(
+          withArrayLengthConstraints(
+            ArraySchema(Tuple([key, value])).check(isUniqueKey()),
+            constraint?.minSize,
+            constraint?.maxSize
+          )
+        ),
+      toEquivalence: ([key, value]) => Equal.makeCompareMap(key, value)
+    }
+  )
+  return make(schema.ast, { key, value })
+}
+
+// -----------------------------------------------------------------------------
+// HashSet schemas
+// -----------------------------------------------------------------------------
+
+function hashSetLink<Value>(values: Schema<ReadonlyArray<Value>>) {
+  return link<HashSet_.HashSet<Value>>()(
+    values,
     SchemaTransformation.transform({
-      decode: (bit) => bit === 1,
-      encode: (bool) => bool ? 1 : 0
+      decode: HashSet_.fromIterable,
+      encode: Arr.fromIterable
     })
   )
-)
-
+}
 /**
- * Type-level representation of {@link Uint8Array}.
+ * Type-level representation returned by {@link HashSet}.
  *
  * @category models
- * @since 4.0.0
+ * @since 3.10.0
  */
-export interface Uint8Array extends instanceOf<globalThis.Uint8Array<ArrayBufferLike>> {
-  readonly "Rebuild": Uint8Array
+export interface HashSet<Value extends Constraint> extends
+  declareConstructor<
+    HashSet_.HashSet<Value["Type"]>,
+    HashSet_.HashSet<Value["Encoded"]>,
+    readonly [Value],
+    HashSetIso<Value>
+  >
+{
+  readonly "Rebuild": HashSet<Value>
+  readonly value: Value
 }
-
-const Base64String = String.annotate({
-  expected: "a base64 encoded string that will be decoded as Uint8Array",
-  format: "byte",
-  contentEncoding: "base64"
-})
-
 /**
- * Schema for JavaScript `Uint8Array` objects.
- *
- * **Details**
- *
- * Default JSON serializer:
- *
- * The default JSON serializer encodes Uint8Array as a Base64 encoded string.
+ * Iso representation used for `HashSet` schemas: an array of element values
+ * using the element schema's `Iso` type.
  *
- * @category schemas
+ * @category utility types
  * @since 4.0.0
  */
-export const Uint8Array: Uint8Array = instanceOf(globalThis.Uint8Array<ArrayBufferLike>, {
-  representation: {
-    id: "effect/schema/Uint8Array",
-    payload: null
-  },
-  toCode: () => ({
-    runtime: `Schema.Uint8Array`,
-    Type: `globalThis.Uint8Array`
-  }),
-  expected: "Uint8Array",
-  toCodecJson: () =>
-    link<globalThis.Uint8Array<ArrayBufferLike>>()(
-      Base64String,
-      SchemaTransformation.uint8ArrayFromBase64String
-    )
-})
-
+export type HashSetIso<Value extends Constraint> = ReadonlyArray<Value["Iso"]>
 /**
- * Reviver for persisted `Uint8Array` declarations.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain the {@link Uint8Array} schema.
- *
- * @see {@link Uint8Array} for the corresponding schema
+ * Schema for hash sets whose values conform to the provided element schema.
  *
  * @category schemas
- * @since 4.0.0
- */
-export const Uint8ArrayReviver = makeFixedDeclarationReviver(
-  "effect/schema/Uint8Array",
-  Uint8Array
-)
-
-/**
- * Type-level representation of {@link Uint8ArrayFromBase64}.
- *
- * @category models
  * @since 3.10.0
  */
-export interface Uint8ArrayFromBase64 extends decodeTo<Uint8Array, String> {
-  readonly "Rebuild": Uint8ArrayFromBase64
+export function HashSet<Value extends Constraint>(value: Value): HashSet<Value> {
+  const schema = declareConstructor<
+    HashSet_.HashSet<Value["Type"]>,
+    HashSet_.HashSet<Value["Encoded"]>,
+    HashSetIso<Value>
+  >()(
+    [value],
+    ([value]) => {
+      const values = ArraySchema(value)
+      return (input, ast, options) => {
+        if (HashSet_.isHashSet(input)) {
+          return Effect.mapBothEager(
+            SchemaParser.decodeUnknownEffect(values)(Arr.fromIterable(input), options),
+            {
+              onSuccess: HashSet_.fromIterable,
+              onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "values", issue, input, options)
+            }
+          )
+        }
+        return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
+      }
+    },
+    {
+      representation: {
+        id: "effect/schema/HashSet",
+        payload: null
+      },
+      toCode: ({ typeParameters }) => ({
+        runtime: `Schema.HashSet(${typeParameters[0].runtime})`,
+        Type: `HashSet.HashSet<${typeParameters[0].Type}>`
+      }),
+      expected: "HashSet",
+      toCodec: ([value]) => hashSetLink(ArraySchema(value)),
+      toCodecArbitrary: ({ constraint, typeParameters: [value] }) =>
+        hashSetLink(
+          withArrayLengthConstraints(
+            ArraySchema(value).check(isUnique()),
+            constraint?.minSize,
+            constraint?.maxSize
+          )
+        ),
+      toEquivalence: ([value]) => Equal.makeCompareSet(value)
+    }
+  )
+  return make(schema.ast, { value })
 }
 
-/**
- * Schema that decodes a base64 encoded string into a
- * `Uint8Array`.
- *
- * **Details**
- *
- * Decoding:
- * - A **valid** base64 encoded string is decoded as a `Uint8Array`.
- *
- * Encoding:
- * - A `Uint8Array` is encoded as a base64-encoded string.
- *
- * @category schemas
- * @since 3.10.0
- */
-export const Uint8ArrayFromBase64: Uint8ArrayFromBase64 = Base64String.pipe(
-  decodeTo(Uint8Array, SchemaTransformation.uint8ArrayFromBase64String)
-)
+// -----------------------------------------------------------------------------
+// Option schemas
+// -----------------------------------------------------------------------------
 
 /**
- * Type-level representation of {@link Uint8ArrayFromBase64Url}.
+ * Type-level representation returned by {@link Option}.
  *
  * @category models
  * @since 3.10.0
  */
-export interface Uint8ArrayFromBase64Url extends decodeTo<Uint8Array, String> {
-  readonly "Rebuild": Uint8ArrayFromBase64Url
+export interface Option<A extends Constraint> extends
+  declareConstructor<
+    Option_.Option<A["Type"]>,
+    Option_.Option<A["Encoded"]>,
+    readonly [A],
+    OptionIso<A>
+  >
+{
+  readonly "Rebuild": Option<A>
+  readonly value: A
 }
-
 /**
- * Schema that decodes a base64 (URL) encoded string into a
- * `Uint8Array`.
+ * Iso representation used for `Option` schemas.
  *
  * **Details**
  *
- * Decoding:
- * - A **valid** base64 (URL) encoded string is decoded as a `Uint8Array`.
- *
- * Encoding:
- * - A `Uint8Array` is encoded as a base64 (URL) encoded string.
- *
- * @category schemas
- * @since 3.10.0
- */
-export const Uint8ArrayFromBase64Url: Uint8ArrayFromBase64Url = String.annotate({
-  expected: "a base64 (URL) encoded string that will be decoded as a Uint8Array"
-}).pipe(
-  decodeTo(Uint8Array, {
-    decode: SchemaGetter.decodeBase64Url(),
-    encode: SchemaGetter.encodeBase64Url()
-  })
-)
-
-/**
- * Type-level representation of {@link Uint8ArrayFromHex}.
+ * `None` is represented as `{ _tag: "None" }`, while `Some` is represented as
+ * `{ _tag: "Some", value }` using the wrapped schema's `Iso` type.
  *
- * @category models
- * @since 3.10.0
+ * @category utility types
+ * @since 4.0.0
  */
-export interface Uint8ArrayFromHex extends decodeTo<Uint8Array, String> {
-  readonly "Rebuild": Uint8ArrayFromHex
+export type OptionIso<A extends Constraint> = {
+  readonly _tag: "None"
+} | {
+  readonly _tag: "Some"
+  readonly value: A["Iso"]
 }
-
 /**
- * Schema that decodes a hex encoded string into a
- * `Uint8Array`.
- *
- * **Details**
- *
- * Decoding:
- * - A **valid** hex encoded string is decoded as a `Uint8Array`.
- *
- * Encoding:
- * - A `Uint8Array` is encoded as a hex encoded string.
+ * Schema for `Option<A>` values.
  *
  * @category schemas
  * @since 3.10.0
  */
-export const Uint8ArrayFromHex: Uint8ArrayFromHex = String.annotate({
-  expected: "a hex encoded string that will be decoded as a Uint8Array"
-}).pipe(
-  decodeTo(Uint8Array, {
-    decode: SchemaGetter.decodeHex(),
-    encode: SchemaGetter.encodeHex()
-  })
-)
-
-const arbitraryMinimumDateTimestamp = -8_640_000_000_000_000
-const arbitraryMaximumDateTimestamp = 8_640_000_000_000_000
-const arbitraryMinimumZonedDateTimeTimestamp = arbitraryMinimumDateTimestamp + 14 * 60 * 60 * 1000
-const arbitraryMaximumZonedDateTimeTimestamp = arbitraryMaximumDateTimestamp - 14 * 60 * 60 * 1000
-const arbitraryMinimumTimeZoneOffset = -12 * 60 * 60 * 1000
-const arbitraryMaximumTimeZoneOffset = 14 * 60 * 60 * 1000
-const arbitraryNamedTimeZones = [
-  "UTC",
-  "Europe/London",
-  "America/New_York",
-  "Asia/Tokyo",
-  "Australia/Sydney"
-] as const
-
-function dateTimeArbitraryBounds<T extends { readonly epochMilliseconds: number }>(
-  constraint: Annotations.ToArbitrary.GenerationConstraint<T> | undefined,
-  domainMinimum: number,
-  domainMaximum: number
-): readonly [minimum: number, maximum: number] {
-  const minimum = Math.max(
-    domainMinimum,
-    constraint?.minimum === undefined
-      ? domainMinimum
-      : constraint.minimum.epochMilliseconds + (constraint.exclusiveMinimum === true ? 1 : 0)
-  )
-  const maximum = Math.min(
-    domainMaximum,
-    constraint?.maximum === undefined
-      ? domainMaximum
-      : constraint.maximum.epochMilliseconds - (constraint.exclusiveMaximum === true ? 1 : 0)
+export function Option<A extends Constraint>(value: A): Option<A> {
+  const schema = declareConstructor<
+    Option_.Option<A["Type"]>,
+    Option_.Option<A["Encoded"]>,
+    OptionIso<A>
+  >()(
+    [value],
+    ([value]) => (input, ast, options) => {
+      if (Option_.isOption(input)) {
+        if (Option_.isNone(input)) {
+          return Effect.succeedNone
+        }
+        return Effect.mapBothEager(
+          SchemaParser.decodeUnknownEffect(value)(input.value, options),
+          {
+            onSuccess: Option_.some,
+            onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "value", issue, input, options)
+          }
+        )
+      }
+      return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
+    },
+    {
+      representation: {
+        id: "effect/schema/Option",
+        payload: null
+      },
+      toCode: ({ typeParameters }) => ({
+        runtime: `Schema.Option(${typeParameters[0].runtime})`,
+        Type: `Option.Option<${typeParameters[0].Type}>`,
+        importDeclarations: [`import * as Option from "effect/Option"`]
+      }),
+      expected: "Option",
+      toCodec: ([value]) =>
+        link<Option_.Option<A["Encoded"]>>()(
+          Union([
+            Struct({ _tag: Literal("Some"), value }),
+            Struct({ _tag: Literal("None") })
+          ]),
+          SchemaTransformation.transform({
+            decode: (e) => e._tag === "None" ? Option_.none() : Option_.some(e.value),
+            encode: (o) => (Option_.isSome(o) ? { _tag: "Some", value: o.value } as const : { _tag: "None" } as const)
+          })
+        )
+    }
   )
-  return minimum <= maximum ? [minimum, maximum] : [domainMinimum, domainMaximum]
-}
-
-function dateTimeArbitraryInteger(minimum: number, maximum: number): Codec<number> {
-  return Int.check(isBetween({ minimum, maximum }))
-}
-
-function timeZoneArbitrarySchema(): Codec<number | string> {
-  return Union([
-    dateTimeArbitraryInteger(arbitraryMinimumTimeZoneOffset, arbitraryMaximumTimeZoneOffset),
-    Literals(arbitraryNamedTimeZones)
-  ])
+  return make(schema.ast, { value })
 }
-
 /**
- * Type-level representation of {@link DateTimeUtc}.
+ * Type-level representation returned by {@link OptionFromNullOr}.
  *
  * @category models
  * @since 3.10.0
  */
-export interface DateTimeUtc extends declare<DateTime.Utc> {
-  readonly "Rebuild": DateTimeUtc
+export interface OptionFromNullOr<S extends Constraint> extends decodeTo<Option<toType<S>>, NullOr<S>> {
+  readonly "Rebuild": OptionFromNullOr<S>
 }
-
 /**
- * Schema for `DateTime.Utc` values.
- *
- * **When to use**
- *
- * Use to validate existing `DateTime.Utc` schema values and use the default JSON
- * codec that represents them as UTC ISO strings.
+ * Decodes a nullable, required value `T` to a required `Option<T>` value.
  *
  * **Details**
  *
- * The default JSON codec decodes UTC ISO strings into `DateTime.Utc` values and
- * encodes `DateTime.Utc` values as UTC ISO strings.
- *
- * @see {@link DateTimeUtcFromString} for decoding date-time strings into UTC values
- * @see {@link DateTimeUtcFromDate} for decoding JavaScript Date values into UTC values
- * @see {@link DateTimeUtcFromMillis} for decoding epoch milliseconds into UTC values
- * @see {@link DateTimeZoned} for preserving zoned DateTime values
+ * Decoding maps `null` to `None` and all other values to `Some`. Encoding maps
+ * `None` to `null` and maps `Some` to its value.
  *
  * @category schemas
  * @since 3.10.0
  */
-export const DateTimeUtc: DateTimeUtc = declare(
-  (u) => DateTime.isDateTime(u) && DateTime.isUtc(u),
-  {
-    representation: {
-      id: "effect/schema/DateTimeUtc",
-      payload: null
-    },
-    toCode: () => ({
-      runtime: `Schema.DateTimeUtc`,
-      Type: `DateTime.Utc`,
-      importDeclarations: [`import * as DateTime from "effect/DateTime"`]
-    }),
-    expected: "DateTime.Utc",
-    toCodecArbitrary: ({ constraint }) => {
-      const [minimum, maximum] = dateTimeArbitraryBounds(
-        constraint,
-        arbitraryMinimumDateTimestamp,
-        arbitraryMaximumDateTimestamp
-      )
-      return linkDecoding<DateTime.Utc>()(
-        dateTimeArbitraryInteger(minimum, maximum),
-        SchemaGetter.transform(DateTime.makeUnsafe)
-      )
-    },
-    toCodecJson: () =>
-      link<DateTime.Utc>()(
-        String,
-        SchemaTransformation.dateTimeUtcFromString
-      ),
-    toFormatter: () => (utc) => utc.toString()
-  }
-)
-
+export function OptionFromNullOr<S extends Constraint>(schema: S): OptionFromNullOr<S> {
+  return NullOr(schema).pipe(decodeTo(
+    Option(toType(schema)),
+    SchemaTransformation.optionFromNullOr()
+  ))
+}
 /**
- * Reviver for persisted {@link DateTimeUtc} declarations.
+ * Type-level representation returned by {@link OptionFromUndefinedOr}.
  *
- * **When to use**
+ * @category models
+ * @since 3.10.0
+ */
+export interface OptionFromUndefinedOr<S extends Constraint> extends decodeTo<Option<toType<S>>, UndefinedOr<S>> {
+  readonly "Rebuild": OptionFromUndefinedOr<S>
+}
+/**
+ * Decodes a required value that may be `undefined` to a required `Option<T>`
+ * value.
  *
- * Use when reconstructing documents that may contain the {@link DateTimeUtc} schema.
+ * **Details**
  *
- * @see {@link DateTimeUtc} for the corresponding schema
+ * Decoding maps `undefined` to `None` and all other values to `Some`. Encoding
+ * maps `None` to `undefined` and maps `Some` to its value.
  *
  * @category schemas
- * @since 4.0.0
+ * @since 3.10.0
  */
-export const DateTimeUtcReviver = makeFixedDeclarationReviver(
-  "effect/schema/DateTimeUtc",
-  DateTimeUtc
-)
-
+export function OptionFromUndefinedOr<S extends Constraint>(schema: S): OptionFromUndefinedOr<S> {
+  return UndefinedOr(schema).pipe(decodeTo(
+    Option(toType(schema)),
+    SchemaTransformation.optionFromUndefinedOr()
+  ))
+}
 /**
- * Type-level representation of {@link DateTimeUtcFromDate}.
+ * Type-level representation returned by {@link OptionFromNullishOr}.
  *
  * @category models
- * @since 3.12.0
+ * @since 3.10.0
  */
-export interface DateTimeUtcFromDate extends decodeTo<DateTimeUtc, Date> {
-  readonly "Rebuild": DateTimeUtcFromDate
+export interface OptionFromNullishOr<S extends Constraint> extends decodeTo<Option<toType<S>>, NullishOr<S>> {
+  readonly "Rebuild": OptionFromNullishOr<S>
 }
-
 /**
- * Schema that decodes a `Date` into a `DateTime.Utc`.
- *
- * **When to use**
- *
- * Use when you need to decode valid JavaScript `Date` objects into
- * `DateTime.Utc` values.
+ * Decodes a nullish value `T` to a required `Option<T>` value.
  *
  * **Details**
  *
- * Decoding:
- * - A **valid** `Date` is decoded as a `DateTime.Utc`
+ * Decoding maps `null` and `undefined` to `None` and all other values to
+ * `Some`. Encoding maps `None` to `null` or `undefined` depending on
+ * `options.onNoneEncoding`, which defaults to `undefined`, and maps `Some` to
+ * its value.
  *
- * Encoding:
- * - A `DateTime.Utc` is encoded as a `Date`
+ * @category schemas
+ * @since 3.10.0
+ */
+export function OptionFromNullishOr<S extends Constraint>(
+  schema: S,
+  options?: {
+    onNoneEncoding: null | undefined
+  }
+): OptionFromNullishOr<S> {
+  return NullishOr(schema).pipe(decodeTo(
+    Option(toType(schema)),
+    SchemaTransformation.optionFromNullishOr(options)
+  ))
+}
+
+/**
+ * Type-level representation of {@link Cookie}.
  *
- * @see {@link DateTimeUtc} for validating values that are already `DateTime.Utc`
- * @see {@link DateTimeUtcFromString} for decoding date-time strings into UTC values
- * @see {@link DateTimeUtcFromMillis} for decoding epoch milliseconds into UTC values
- * @see {@link Date} for validating Date instances without converting them
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface Cookie extends declare<Cookies_.Cookie> {
+  readonly "Rebuild": Cookie
+}
+
+/**
+ * Schema for HTTP cookie values.
  *
+ * @unstable
  * @category schemas
- * @since 3.12.0
+ * @since 4.0.0
  */
-export const DateTimeUtcFromDate: DateTimeUtcFromDate = Date.pipe(
-  decodeTo(DateTimeUtc, {
-    decode: SchemaGetter.dateTimeUtcFromInput(),
-    encode: SchemaGetter.transform(DateTime.toDateUtc)
-  })
+export const Cookie: Cookie = declare(
+  Cookies_.isCookie,
+  {
+    representation: {
+      id: "effect/http/Cookie",
+      payload: null
+    },
+    toCode: () => ({
+      runtime: "Schema.Cookie",
+      Type: "Cookies.Cookie",
+      importDeclarations: [`import * as Cookies from "effect/unstable/http/Cookies"`]
+    }),
+    expected: "Cookie"
+  }
 )
 
 /**
- * Type-level representation of {@link DateTimeUtcFromString}.
+ * Type-level representation of {@link Cookies}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface DateTimeUtcFromString extends decodeTo<DateTimeUtc, String> {
-  readonly "Rebuild": DateTimeUtcFromString
+export interface Cookies extends
+  declare<
+    Cookies_.Cookies,
+    Record_.ReadonlyRecord<string, Cookies_.Cookie>
+  >
+{
+  readonly "Rebuild": Cookies
 }
 
 /**
- * Schema that decodes a date-time string into a `DateTime.Utc`.
+ * Schema for HTTP cookie collections.
  *
  * **Details**
  *
- * Decoding:
- *
- * - A string accepted by `DateTime.make` is parsed and normalized to UTC. Strings
- *   without an explicit zone are interpreted as UTC.
- *
- * Encoding:
- *
- * - A `DateTime.Utc` is encoded as a UTC ISO 8601 string.
- *
- * @see {@link DateTimeUtcFromDate} for decoding JavaScript Date values into UTC values
- * @see {@link DateTimeUtcFromMillis} for decoding epoch milliseconds into UTC values
- * @see {@link DateFromString} for decoding strings into JavaScript Date instances
+ * JSON encoding uses `Set-Cookie` header strings, while isomorphic encoding uses
+ * a readonly record of cookie values.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const DateTimeUtcFromString: DateTimeUtcFromString = String.annotate({
-  expected: "a string that will be decoded as a DateTime.Utc"
-}).pipe(
-  decodeTo(
-    DateTimeUtc,
-    SchemaTransformation.dateTimeUtcFromString
-  )
+export const Cookies: Cookies = declare(
+  Cookies_.isCookies,
+  {
+    representation: {
+      id: "effect/http/Cookies",
+      payload: null
+    },
+    toCode: () => ({
+      runtime: "Schema.Cookies",
+      Type: "Cookies.Cookies",
+      importDeclarations: [`import * as Cookies from "effect/unstable/http/Cookies"`]
+    }),
+    expected: "Cookies",
+    toCodecJson: () =>
+      link<Cookies_.Cookies>()(
+        ArraySchema(String),
+        SchemaTransformation.transform<Cookies_.Cookies, ReadonlyArray<string>>({
+          decode: Cookies_.fromSetCookie,
+          encode: Cookies_.toSetCookieHeaders
+        })
+      ),
+    toCodecIso: () =>
+      link<Cookies_.Cookies>()(
+        Record(String, Cookie),
+        SchemaTransformation.transform({
+          decode: Cookies_.fromReadonlyRecord,
+          encode: (cookies) => cookies.cookies
+        })
+      )
+  }
 )
 
 /**
- * Type-level representation of {@link DateTimeUtcFromMillis}.
+ * Type-level representation of {@link RecordFromCookies}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface DateTimeUtcFromMillis extends decodeTo<instanceOf<DateTime.Utc>, Int> {
-  readonly "Rebuild": DateTimeUtcFromMillis
+export interface RecordFromCookies extends decodeTo<$Record<String, String>, Cookies> {
+  readonly "Rebuild": RecordFromCookies
 }
 
 /**
- * Schema that decodes a number into a `DateTime.Utc`.
- *
- * **Details**
- *
- * Decoding:
- * - A number of milliseconds since the Unix epoch is decoded as a `DateTime.Utc`
- *
- * Encoding:
- * - A `DateTime.Utc` is encoded as a number of milliseconds since the Unix epoch.
- *
- * @see {@link DateTimeUtcFromDate} for decoding JavaScript Date values into UTC values
- * @see {@link DateTimeUtcFromString} for decoding date-time strings into UTC values
- * @see {@link DateFromMillis} for decoding epoch milliseconds into JavaScript Date instances
+ * Schema that decodes HTTP cookies into a record of decoded string values keyed
+ * by cookie name.
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const DateTimeUtcFromMillis: DateTimeUtcFromMillis = Int.pipe(
-  decodeTo(DateTimeUtc, {
-    decode: SchemaGetter.dateTimeUtcFromInput(),
-    encode: SchemaGetter.transform(DateTime.toEpochMillis)
-  })
+export const RecordFromCookies: RecordFromCookies = Cookies.pipe(
+  decodeTo(
+    Record(String, String),
+    SchemaTransformation.transform({
+      decode: Cookies_.toRecord,
+      encode: (self) =>
+        Cookies_.fromIterable(
+          globalThis.Object.entries(self).map(([name, value]) => Cookies_.makeCookieUnsafe(name, value))
+        )
+    })
+  )
 )
 
 /**
- * Type-level representation of {@link TimeZoneOffset}.
+ * Type-level representation of {@link Headers}.
  *
+ * @unstable
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
-export interface TimeZoneOffset extends declare<DateTime.TimeZone.Offset> {
-  readonly "Rebuild": TimeZoneOffset
+export interface Headers extends declare<Headers_.Headers, { readonly [x: string]: string }> {
+  readonly "Rebuild": Headers
 }
 
 /**
- * Schema for `DateTime.TimeZone.Offset` values.
+ * Schema for HTTP headers encoded as records of string values.
  *
  * **Details**
  *
- * Default JSON serializer:
- *
- * - encodes `DateTime.TimeZone.Offset` as a number (offset in milliseconds)
+ * Decoding normalizes header names; encoding returns a plain record.
  *
+ * @unstable
  * @category schemas
- * @since 3.10.0
+ * @since 4.0.0
  */
-export const TimeZoneOffset: TimeZoneOffset = declare(
-  DateTime.isTimeZoneOffset,
+export const Headers: Headers = declare(
+  Headers_.isHeaders,
   {
     representation: {
-      id: "effect/schema/TimeZoneOffset",
+      id: "effect/http/Headers",
       payload: null
     },
     toCode: () => ({
-      runtime: `Schema.TimeZoneOffset`,
-      Type: `DateTime.TimeZone.Offset`,
-      importDeclarations: [`import * as DateTime from "effect/DateTime"`]
+      runtime: "Schema.Headers",
+      Type: "Headers.Headers",
+      importDeclarations: [`import * as Headers from "effect/unstable/http/Headers"`]
     }),
-    expected: "DateTime.TimeZone.Offset",
-    toCodecJson: () =>
-      link<DateTime.TimeZone.Offset>()(
-        Int,
-        SchemaTransformation.timeZoneOffsetFromNumber
-      ),
-    toFormatter: () => (tz) => DateTime.zoneToString(tz)
+    expected: "Headers",
+    toEquivalence: () => Headers_.Equivalence,
+    toCodec: () =>
+      link<Headers_.Headers>()(
+        Record(String, String),
+        SchemaTransformation.transform<Headers_.Headers, { readonly [x: string]: string }>({
+          decode: Headers_.fromInput,
+          encode: (headers) => ({ ...headers })
+        })
+      )
   }
 )
 
 /**
- * Reviver for persisted {@link TimeZoneOffset} declarations.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain the {@link TimeZoneOffset} schema.
- *
- * @see {@link TimeZoneOffset} for the corresponding schema
- *
- * @category schemas
- * @since 4.0.0
- */
-export const TimeZoneOffsetReviver = makeFixedDeclarationReviver(
-  "effect/schema/TimeZoneOffset",
-  TimeZoneOffset
-)
-
-/**
- * Type-level representation of {@link TimeZoneNamed}.
+ * Type-level representation of {@link UrlParams}.
  *
+ * @unstable
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
-export interface TimeZoneNamed extends declare<DateTime.TimeZone.Named> {
-  readonly "Rebuild": TimeZoneNamed
+export interface UrlParams extends
+  declare<
+    UrlParams_.UrlParams,
+    ReadonlyArray<readonly [string, string]>
+  >
+{
+  readonly "Rebuild": UrlParams
 }
 
-const TimeZoneNamedString = String.annotate({ expected: "an IANA time zone identifier" })
-
 /**
- * Schema for `DateTime.TimeZone.Named` values.
+ * Schema for HTTP URL parameters.
  *
  * **Details**
  *
- * Default JSON serializer:
- *
- * - encodes `DateTime.TimeZone.Named` as a string (IANA time zone identifier)
+ * The encoded representation is an array of string key-value tuples.
  *
+ * @unstable
  * @category schemas
- * @since 3.10.0
+ * @since 4.0.0
  */
-export const TimeZoneNamed: TimeZoneNamed = declare(
-  DateTime.isTimeZoneNamed,
+export const UrlParams: UrlParams = declare(
+  UrlParams_.isUrlParams,
   {
     representation: {
-      id: "effect/schema/TimeZoneNamed",
+      id: "effect/http/UrlParams",
       payload: null
     },
     toCode: () => ({
-      runtime: `Schema.TimeZoneNamed`,
-      Type: `DateTime.TimeZone.Named`,
-      importDeclarations: [`import * as DateTime from "effect/DateTime"`]
+      runtime: "Schema.UrlParams",
+      Type: "UrlParams.UrlParams",
+      importDeclarations: [`import * as UrlParams from "effect/unstable/http/UrlParams"`]
     }),
-    expected: "DateTime.TimeZone.Named",
-    toCodecArbitrary: () =>
-      linkDecoding<DateTime.TimeZone.Named>()(
-        Literals(arbitraryNamedTimeZones),
-        SchemaGetter.transform(DateTime.zoneMakeNamedUnsafe)
-      ),
-    toCodecJson: () =>
-      link<DateTime.TimeZone.Named>()(
-        TimeZoneNamedString,
-        SchemaTransformation.timeZoneNamedFromString
-      ),
-    toFormatter: () => (tz) => DateTime.zoneToString(tz)
+    expected: "UrlParams",
+    toEquivalence: () => UrlParams_.Equivalence,
+    toCodec: () =>
+      link<UrlParams_.UrlParams>()(
+        ArraySchema(Tuple([String, String])),
+        SchemaTransformation.transform({
+          decode: UrlParams_.make,
+          encode: (self) => self.params
+        })
+      )
   }
 )
 
 /**
- * Reviver for persisted {@link TimeZoneNamed} declarations.
+ * Type-level representation of {@link JsonFromUrlParamsField}.
  *
- * **When to use**
+ * @unstable
+ * @category models
+ * @since 4.0.0
+ */
+export interface JsonFromUrlParamsField extends decodeTo<fromJsonString<Unknown>, UrlParams> {
+  readonly "Rebuild": JsonFromUrlParamsField
+}
+
+/**
+ * Extracts a JSON value from the first occurrence of the given `field` in URL
+ * parameters.
+ *
+ * **Example** (Decoding a JSON parameter field)
+ *
+ * ```ts import.meta.vitest
+ * import { Schema } from "effect"
+ * import { UrlParams } from "effect/unstable/http"
  *
- * Use when reconstructing documents that may contain the {@link TimeZoneNamed} schema.
+ * const extractFoo = Schema.JsonFromUrlParamsField("foo").pipe(
+ *   Schema.decodeTo(Schema.Struct({
+ *     some: Schema.String,
+ *     number: Schema.Number
+ *   }))
+ * )
  *
- * @see {@link TimeZoneNamed} for the corresponding schema
+ * const decoded = Schema.decodeSync(extractFoo)(UrlParams.fromInput({
+ *   foo: `{"some":"bar","number":42}`,
+ *   baz: "qux"
+ * }))
+ * const result = [decoded.some, decoded.number] // => ["bar", 42]
+ * ```
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const TimeZoneNamedReviver = makeFixedDeclarationReviver(
-  "effect/schema/TimeZoneNamed",
-  TimeZoneNamed
-)
+export const JsonFromUrlParamsField = (
+  field: string,
+  options?: { readonly reviver?: Parameters<typeof JSON.parse>[1] | undefined } | undefined
+): JsonFromUrlParamsField =>
+  UrlParams.pipe(
+    decodeTo(
+      fromJsonString(Unknown, options),
+      SchemaTransformation.transformEffect({
+        decode: (params) =>
+          Option_.match(UrlParams_.getFirst(params, field), {
+            onNone: () => Effect.fail(new SchemaIssue.Pointer([field], new SchemaIssue.MissingKey(undefined))),
+            onSome: Effect.succeed
+          }),
+        encode: (value) => Effect.succeed(UrlParams_.make([[field, value]]))
+      })
+    )
+  )
 
 /**
- * Type-level representation of {@link TimeZoneNamedFromString}.
+ * Type-level representation of {@link RecordFromUrlParams}.
  *
+ * @unstable
  * @category models
  * @since 4.0.0
  */
-export interface TimeZoneNamedFromString extends decodeTo<TimeZoneNamed, String> {
-  readonly "Rebuild": TimeZoneNamedFromString
+export interface RecordFromUrlParams extends
+  decodeTo<
+    $Record<String, Union<readonly [String, NonEmptyArray<String>]>>,
+    UrlParams,
+    never,
+    never
+  >
+{
+  readonly "Rebuild": RecordFromUrlParams
 }
 
 /**
- * Schema that parses an IANA time zone identifier string into a `DateTime.TimeZone.Named`.
+ * Schema that decodes URL parameters into a record of string values.
  *
  * **Details**
  *
- * Decoding:
- * - A `string` is decoded as a `DateTime.TimeZone.Named`.
+ * Keys with one value decode to a string, and keys with multiple values decode to
+ * a non-empty readonly array of strings.
  *
- * Encoding:
- * - A `DateTime.TimeZone.Named` is encoded as a `string`.
+ * **Example** (Decoding URL parameters to a record)
+ *
+ * ```ts import.meta.vitest
+ * import { Schema } from "effect"
+ * import { UrlParams } from "effect/unstable/http"
+ *
+ * const toStruct = Schema.RecordFromUrlParams.pipe(
+ *   Schema.decodeTo(Schema.Struct({
+ *     some: Schema.String,
+ *     number: Schema.FiniteFromString
+ *   }))
+ * )
+ *
+ * const decoded = Schema.decodeSync(toStruct)(UrlParams.fromInput({
+ *   some: "value",
+ *   number: 42
+ * }))
+ * const result = [decoded.some, decoded.number] // => ["value", 42]
+ * ```
  *
+ * @unstable
  * @category schemas
  * @since 4.0.0
  */
-export const TimeZoneNamedFromString: TimeZoneNamedFromString = TimeZoneNamedString.pipe(
-  decodeTo(TimeZoneNamed, SchemaTransformation.timeZoneNamedFromString)
+export const RecordFromUrlParams: RecordFromUrlParams = UrlParams.pipe(
+  decodeTo(
+    Record(
+      String,
+      Union([String, NonEmptyArray(String)])
+    ),
+    SchemaTransformation.transform({
+      decode: UrlParams_.toReadonlyRecord,
+      encode: UrlParams_.fromInput
+    })
+  )
 )
 
 /**
- * Type-level representation of {@link TimeZone}.
+ * Type-level representation returned by {@link OptionFromOptionalKey}.
  *
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
-export interface TimeZone extends declare<DateTime.TimeZone> {
-  readonly "Rebuild": TimeZone
+export interface OptionFromOptionalKey<S extends Constraint> extends decodeTo<Option<toType<S>>, optionalKey<S>> {
+  readonly "Rebuild": OptionFromOptionalKey<S>
 }
-
-const TimeZoneString = String.annotate({
-  expected: "a time zone string (IANA identifier or offset like +03:00)"
-})
-
 /**
- * Schema for `DateTime.TimeZone` values.
+ * Decodes an optional value `A` to a required `Option<A>` value.
  *
  * **Details**
  *
- * Default JSON serializer:
- *
- * - encodes `DateTime.TimeZone` as a string (IANA identifier or offset like
- *   `+03:00`)
+ * Decoding maps a missing key to `None` and a present value to `Some`.
+ * Encoding maps `None` to a missing key and maps `Some` to its value.
  *
  * @category schemas
- * @since 3.10.0
+ * @since 4.0.0
  */
-export const TimeZone: TimeZone = declare(
-  DateTime.isTimeZone,
-  {
-    representation: {
-      id: "effect/schema/TimeZone",
-      payload: null
-    },
-    toCode: () => ({
-      runtime: `Schema.TimeZone`,
-      Type: `DateTime.TimeZone`,
-      importDeclarations: [`import * as DateTime from "effect/DateTime"`]
-    }),
-    expected: "DateTime.TimeZone",
-    toCodecArbitrary: () =>
-      linkDecoding<DateTime.TimeZone>()(
-        timeZoneArbitrarySchema(),
-        SchemaGetter.transform((value) =>
-          typeof value === "number" ? DateTime.zoneMakeOffset(value) : DateTime.zoneMakeNamedUnsafe(value)
-        )
-      ),
-    toCodecJson: () =>
-      link<DateTime.TimeZone>()(
-        TimeZoneString,
-        SchemaTransformation.timeZoneFromString
-      ),
-    toFormatter: () => (tz) => DateTime.zoneToString(tz)
-  }
-)
-
+export function OptionFromOptionalKey<S extends Constraint>(schema: S): OptionFromOptionalKey<S> {
+  return optionalKey(schema).pipe(decodeTo(
+    Option(toType(schema)),
+    SchemaTransformation.optionFromOptionalKey()
+  ))
+}
 /**
- * Reviver for persisted {@link TimeZone} declarations.
+ * Type-level representation returned by {@link OptionFromOptional}.
  *
- * **When to use**
+ * @category models
+ * @since 4.0.0
+ */
+export interface OptionFromOptional<S extends Constraint> extends decodeTo<Option<toType<S>>, optional<S>> {
+  readonly "Rebuild": OptionFromOptional<S>
+}
+/**
+ * Decodes an optional or `undefined` value `A` to a required `Option<A>`
+ * value.
  *
- * Use when reconstructing documents that may contain the {@link TimeZone} schema.
+ * **Details**
  *
- * @see {@link TimeZone} for the corresponding schema
+ * Decoding maps a missing key or a present `undefined` value to `None`, and
+ * maps all other values to `Some`. Encoding maps `None` to a missing key and
+ * maps `Some` to its value.
  *
  * @category schemas
  * @since 4.0.0
  */
-export const TimeZoneReviver = makeFixedDeclarationReviver(
-  "effect/schema/TimeZone",
-  TimeZone
-)
-
+export function OptionFromOptional<S extends Constraint>(schema: S): OptionFromOptional<S> {
+  return optional(schema).pipe(decodeTo(
+    Option(toType(schema)),
+    SchemaTransformation.optionFromOptional<any>()
+  ))
+}
 /**
- * Type-level representation of {@link TimeZoneFromString}.
+ * Type-level representation returned by {@link OptionFromOptionalNullOr}.
  *
  * @category models
  * @since 4.0.0
  */
-export interface TimeZoneFromString extends decodeTo<TimeZone, String> {
-  readonly "Rebuild": TimeZoneFromString
+export interface OptionFromOptionalNullOr<S extends Constraint>
+  extends decodeTo<Option<toType<S>>, optional<NullOr<S>>>
+{
+  readonly "Rebuild": OptionFromOptionalNullOr<S>
 }
-
 /**
- * Schema that parses a time zone string into a `DateTime.TimeZone`.
+ * Decodes an optional or `null` or `undefined` value `A` to a required `Option<A>`
+ * value.
  *
  * **Details**
  *
- * Decoding:
- * - A `string` (IANA identifier or offset like `+03:00`) is decoded as a `DateTime.TimeZone`.
- *
- * Encoding:
- * - A `DateTime.TimeZone` is encoded as a `string`.
+ * Decoding maps a missing key, `undefined`, or `null` to `None`, and maps all
+ * other values to `Some`. Encoding maps `Some` to its value. `None` is encoded
+ * according to `options.onNoneEncoding`: `"omit"` encodes a missing key,
+ * `null` encodes `null`, and `undefined` encodes `undefined`.
  *
  * @category schemas
  * @since 4.0.0
  */
-export const TimeZoneFromString: TimeZoneFromString = TimeZoneString.pipe(
-  decodeTo(TimeZone, SchemaTransformation.timeZoneFromString)
-)
+export function OptionFromOptionalNullOr<S extends Constraint>(
+  schema: S,
+  options?: {
+    readonly onNoneEncoding: "omit" | null | undefined
+  }
+): OptionFromOptionalNullOr<S> {
+  const onNoneEncoding = options === undefined ? "omit" : options.onNoneEncoding
+  const noneValue = onNoneEncoding === null
+    ? null as S["Type"] | null | undefined
+    : undefined as S["Type"] | null | undefined
+  return optional(NullOr(schema)).pipe(decodeTo(
+    Option(toType(schema)),
+    SchemaTransformation.transformOptional<Option_.Option<S["Type"]>, S["Type"] | null | undefined>({
+      decode: (oe) => oe.pipe(Option_.filter(Predicate.isNotNullish), Option_.some),
+      encode: onNoneEncoding === "omit"
+        ? Option_.flatten
+        : (ot) => Option_.some(Option_.getOrElse(Option_.flatten(ot), () => noneValue))
+    })
+  ))
+}
+
+// -----------------------------------------------------------------------------
+// Redacted schemas
+// -----------------------------------------------------------------------------
 
 /**
- * Type-level representation of {@link DateTimeZoned}.
+ * Type-level representation returned by {@link Redacted}.
  *
  * @category models
  * @since 3.10.0
  */
-export interface DateTimeZoned extends declare<DateTime.Zoned> {
-  readonly "Rebuild": DateTimeZoned
+export interface Redacted<S extends Constraint> extends
+  declareConstructor<
+    Redacted_.Redacted<S["Type"]>,
+    Redacted_.Redacted<S["Encoded"]>,
+    readonly [S]
+  >
+{
+  readonly "Rebuild": Redacted<S>
+  readonly value: S
 }
-
-const DateTimeZonedString = String.annotate({
-  expected: "a zoned DateTime string (e.g. 2024-01-01T00:00:00.000+00:00[Europe/London])"
-})
-
+type NormalizedRedactedOptions =
+  | { readonly label: string }
+  | { readonly disallowJsonEncode: true }
+  | { readonly label: string; readonly disallowJsonEncode: true }
 /**
- * Schema for `DateTime.Zoned` values.
+ * Schema for `Redacted` values, which hide their contents from inspection.
  *
  * **Details**
  *
- * Default JSON serializer:
+ * Options:
  *
- * - encodes offset zones as an ISO date-time with a numeric offset, such as
- *   `YYYY-MM-DDTHH:mm:ss.sss+HH:MM`
- * - encodes named zones by appending the IANA identifier in brackets, such as
- *   `YYYY-MM-DDTHH:mm:ss.sss+HH:MM[Time/Zone]`
+ * - `label`: When provided, the schema will behave as follows:
+ *   - Values will be validated against the label in addition to the wrapped schema
+ *   - The default JSON serializer will deserialize into a `Redacted` instance with the label
+ *   - The arbitrary generator will produce a `Redacted` instance with the label
+ *   - The formatter will return the label
+ * - `disallowJsonEncode`: When set to `true`, when attempting to encode a `Redacted` instance
+ *   into JSON, it will fail with an error. This is useful when the wrapped schema is
+ *   sensitive and should not be exposed in JSON.
  *
+ * @see {@link RedactedFromValue} for decoding raw values and wrapping them in `Redacted`.
  * @category schemas
  * @since 3.10.0
  */
-export const DateTimeZoned: DateTimeZoned = declare(
-  (u) => DateTime.isDateTime(u) && DateTime.isZoned(u),
-  {
-    representation: {
-      id: "effect/schema/DateTimeZoned",
-      payload: null
-    },
-    toCode: () => ({
-      runtime: `Schema.DateTimeZoned`,
-      Type: `DateTime.Zoned`,
-      importDeclarations: [`import * as DateTime from "effect/DateTime"`]
-    }),
-    expected: "DateTime.Zoned",
-    toCodecArbitrary: ({ constraint }) => {
-      const [minimum, maximum] = dateTimeArbitraryBounds(
-        constraint,
-        arbitraryMinimumZonedDateTimeTimestamp,
-        arbitraryMaximumZonedDateTimeTimestamp
-      )
-      return linkDecoding<DateTime.Zoned>()(
-        Struct({
-          epochMilliseconds: dateTimeArbitraryInteger(minimum, maximum),
-          timeZone: timeZoneArbitrarySchema()
-        }),
-        SchemaGetter.transform(({ epochMilliseconds, timeZone }) =>
-          DateTime.makeZonedUnsafe(epochMilliseconds, { timeZone })
+export function Redacted<S extends Constraint>(value: S, options?: {
+  readonly label?: string | undefined
+  readonly disallowJsonEncode?: boolean | undefined
+}): Redacted<S> {
+  const label = typeof options?.label === "string" ? options.label : undefined
+  const disallowJsonEncode = options?.disallowJsonEncode === true
+  const normalizedOptions: NormalizedRedactedOptions | undefined = label !== undefined
+    ? disallowJsonEncode ? { label, disallowJsonEncode: true } : { label }
+    : disallowJsonEncode
+    ? { disallowJsonEncode: true }
+    : undefined
+  const decodeLabel = label !== undefined
+    ? SchemaParser.decodeUnknownEffect(Literal(label))
+    : undefined
+  const schema = declareConstructor<Redacted_.Redacted<S["Type"]>, Redacted_.Redacted<S["Encoded"]>>()(
+    [value],
+    ([value]) => (input, ast, poptions) => {
+      if (Redacted_.isRedacted(input)) {
+        const label: Effect.Effect<void, SchemaIssue.Issue, never> = decodeLabel !== undefined
+          ? Effect.mapErrorEager(
+            decodeLabel(input.label, poptions),
+            (issue) => new SchemaIssue.Pointer(["label"], issue)
+          )
+          : Effect.void
+        return Effect.flatMapEager(
+          label,
+          () =>
+            Effect.mapBothEager(
+              SchemaParser.decodeUnknownEffect(value)(Redacted_.value(input), poptions),
+              {
+                onSuccess: (value) => Redacted_.make(value, { label: input.label }),
+                onFailure: () => {
+                  return new SchemaIssue.Composite(
+                    ast,
+                    [
+                      new SchemaIssue.Pointer(
+                        ["value"],
+                        new SchemaIssue.InvalidValue(undefined, input, poptions)
+                      )
+                    ],
+                    input,
+                    poptions
+                  )
+                }
+              }
+            )
         )
-      )
+      }
+      return Effect.fail(new SchemaIssue.InvalidType(ast, input, poptions))
     },
-    toCodecJson: () =>
-      link<DateTime.Zoned>()(
-        DateTimeZonedString,
-        SchemaTransformation.dateTimeZonedFromString
-      ),
-    toFormatter: () => (zoned) => DateTime.formatIsoZoned(zoned),
-    toEquivalence: () => DateTime.Equivalence
-  }
-)
-
+    {
+      representation: {
+        id: "effect/schema/Redacted",
+        payload: normalizedOptions ?? null
+      },
+      toCode: ({ typeParameters }) => ({
+        runtime: normalizedOptions !== undefined
+          ? `Schema.Redacted(${typeParameters[0].runtime}, ${format(normalizedOptions)})`
+          : `Schema.Redacted(${typeParameters[0].runtime})`,
+        Type: `Redacted.Redacted<${typeParameters[0].Type}>`,
+        importDeclarations: [`import * as Redacted from "effect/Redacted"`]
+      }),
+      expected: "Redacted",
+      toCodecJson: ([value]) =>
+        link<Redacted_.Redacted<S["Encoded"]>>()(
+          value,
+          {
+            decode: SchemaGetter.transform((e) => Redacted_.make(e, { label })),
+            encode: disallowJsonEncode ?
+              SchemaGetter.forbidden((oe) =>
+                "Cannot serialize Redacted" +
+                (Option_.isSome(oe) && typeof oe.value.label === "string" ? ` with label: "${oe.value.label}"` : "")
+              ) :
+              SchemaGetter.transform(Redacted_.value)
+          }
+        ),
+      toEquivalence: ([value]) => Redacted_.makeEquivalence(value)
+    }
+  )
+  return make(schema.ast, { value })
+}
 /**
- * Reviver for persisted {@link DateTimeZoned} declarations.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain the {@link DateTimeZoned} schema.
+ * Type-level representation returned by {@link RedactedFromValue}.
  *
- * @see {@link DateTimeZoned} for the corresponding schema
+ * @category models
+ * @since 4.0.0
+ */
+export interface RedactedFromValue<S extends Constraint> extends decodeTo<Redacted<toType<S>>, S> {
+  readonly "Rebuild": RedactedFromValue<S>
+}
+/**
+ * Decodes a value and wraps it in `Redacted<A>`. Unlike {@link Redacted} which
+ * expects the input to already be a `Redacted` instance, this schema decodes
+ * the raw value and wraps it.
  *
+ * @see {@link Redacted} for schemas whose input is already a `Redacted` value.
  * @category schemas
  * @since 4.0.0
  */
-export const DateTimeZonedReviver = makeFixedDeclarationReviver(
-  "effect/schema/DateTimeZoned",
-  DateTimeZoned
-)
+export function RedactedFromValue<S extends Constraint>(value: S, options?: {
+  readonly label?: string | undefined
+  readonly disallowEncode?: boolean | undefined
+}): RedactedFromValue<S> {
+  return decodeTo<Redacted<toType<S>>, S>(
+    Redacted(toType(value), {
+      label: options?.label,
+      disallowJsonEncode: options?.disallowEncode
+    }),
+    {
+      decode: SchemaGetter.transform((t) => Redacted_.make(t, { label: options?.label })),
+      encode: options?.disallowEncode ?
+        SchemaGetter.forbidden((oe) =>
+          "Cannot encode Redacted" +
+          (Option_.isSome(oe) && typeof oe.value.label === "string" ? ` with label: "${oe.value.label}"` : "")
+        ) :
+        SchemaGetter.transform(Redacted_.value)
+    }
+  )(value)
+}
+
+// -----------------------------------------------------------------------------
+// Result schemas
+// -----------------------------------------------------------------------------
 
 /**
- * Type-level representation of {@link DateTimeZonedFromString}.
+ * Type-level representation returned by {@link Result}.
  *
  * @category models
  * @since 4.0.0
  */
-export interface DateTimeZonedFromString extends decodeTo<DateTimeZoned, String> {
-  readonly "Rebuild": DateTimeZonedFromString
+export interface Result<A extends Constraint, E extends Constraint> extends
+  declareConstructor<
+    Result_.Result<A["Type"], E["Type"]>,
+    Result_.Result<A["Encoded"], E["Encoded"]>,
+    readonly [A, E],
+    ResultIso<A, E>
+  >
+{
+  readonly "Rebuild": Result<A, E>
+  readonly success: A
+  readonly failure: E
 }
-
 /**
- * Schema that parses a zoned DateTime string into a `DateTime.Zoned`.
+ * Iso representation used for `Result` schemas.
  *
  * **Details**
  *
- * Decoding:
- * - A `string` (e.g. `2024-01-01T00:00:00.000+00:00[Europe/London]`) is decoded as a `DateTime.Zoned`.
+ * Successful results are represented as `{ _tag: "Success", success }`, while
+ * failed results are represented as `{ _tag: "Failure", failure }`.
  *
- * Encoding:
- * - A `DateTime.Zoned` is encoded as a `string`.
+ * @category utility types
+ * @since 4.0.0
+ */
+export type ResultIso<A extends Constraint, E extends Constraint> = {
+  readonly _tag: "Success"
+  readonly success: A["Iso"]
+} | {
+  readonly _tag: "Failure"
+  readonly failure: E["Iso"]
+}
+/**
+ * Schema for `Result<A, E>` values.
  *
  * @category schemas
  * @since 4.0.0
  */
-export const DateTimeZonedFromString: DateTimeZonedFromString = DateTimeZonedString.pipe(
-  decodeTo(DateTimeZoned, SchemaTransformation.dateTimeZonedFromString)
-)
-
-// -----------------------------------------------------------------------------
-// Class
-// -----------------------------------------------------------------------------
+export function Result<A extends Constraint, E extends Constraint>(
+  success: A,
+  failure: E
+): Result<A, E> {
+  const schema = declareConstructor<
+    Result_.Result<A["Type"], E["Type"]>,
+    Result_.Result<A["Encoded"], E["Encoded"]>,
+    ResultIso<A, E>
+  >()(
+    [success, failure],
+    ([success, failure]) => (input, ast, options) => {
+      if (!Result_.isResult(input)) {
+        return Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
+      }
+      switch (input._tag) {
+        case "Success":
+          return Effect.mapBothEager(SchemaParser.decodeEffect(success)(input.success, options), {
+            onSuccess: Result_.succeed,
+            onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "success", issue, input, options)
+          })
+        case "Failure":
+          return Effect.mapBothEager(SchemaParser.decodeEffect(failure)(input.failure, options), {
+            onSuccess: Result_.fail,
+            onFailure: (issue) => SchemaIssue.makeCompositeAtKey(ast, "failure", issue, input, options)
+          })
+      }
+    },
+    {
+      representation: {
+        id: "effect/schema/Result",
+        payload: null
+      },
+      toCode: ({ typeParameters }) => ({
+        runtime: `Schema.Result(${typeParameters[0].runtime}, ${typeParameters[1].runtime})`,
+        Type: `Result.Result<${typeParameters[0].Type}, ${typeParameters[1].Type}>`,
+        importDeclarations: [`import * as Result from "effect/Result"`]
+      }),
+      expected: "Result",
+      toCodec: ([success, failure]) =>
+        link<Result_.Result<A["Encoded"], E["Encoded"]>>()(
+          Union([
+            Struct({ _tag: Literal("Success"), success }),
+            Struct({ _tag: Literal("Failure"), failure })
+          ]),
+          SchemaTransformation.transform({
+            decode: (e): Result_.Result<A["Encoded"], E["Encoded"]> =>
+              e._tag === "Success" ? Result_.succeed(e.success) : Result_.fail(e.failure),
+            encode: (r) =>
+              Result_.isSuccess(r)
+                ? { _tag: "Success", success: r.success } as const
+                : { _tag: "Failure", failure: r.failure } as const
+          })
+        )
+    }
+  )
+  return make(schema.ast, { success, failure })
+}
 
 /**
  * Type-level representation returned by {@link Class}.
@@ -14177,6 +14357,10 @@ export interface Class<Self, S extends Constraint & { readonly fields: Struct.Fi
       S["~encoded.optionality"]
     >
 {
+  /**
+   * `make`, `makeOption`, and `makeEffect` preserve an existing instance of
+   * this class. Use `new` when a distinct instance is required.
+   */
   readonly "Type": Self
   readonly "Encoded": S["Encoded"]
   readonly "DecodingServices": S["DecodingServices"]
@@ -14258,10 +14442,9 @@ export interface Class<Self, S extends Constraint & { readonly fields: Struct.Fi
     >
   }
 }
-
-// Merges custom static members from a parent class onto the extended class,
-// giving priority to the extended class's own members (e.g. schema-generated statics).
 type InheritStaticMembers<C, Static> = C & Pick<Static, Exclude<keyof Static, keyof C>>
+type MissingSelfGeneric<Usage extends string> =
+  `Missing \`Self\` generic - use \`class Self extends ${Usage}<Self>(...)\``
 
 const immerable: unique symbol = globalThis.Symbol.for("immer-draftable") as any
 
@@ -14312,7 +14495,7 @@ function makeClass<
       return getClassSchema(this).rebuild(ast)
     }
     static make(input: S["~type.make.in"], options?: MakeOptions): Self {
-      return new this(input, options)
+      return SchemaParser.make(getClassSchema(this) as any)(input ?? {}, options) as Self
     }
     static makeOption(input: S["~type.make.in"], options?: MakeOptions): Option_.Option<Self> {
       return SchemaParser.makeOption(getClassSchema(this) as any)(input ?? {}, options) as any
@@ -14431,10 +14614,6 @@ function getClassSchemaFactory<S extends Constraint>(
 function isStruct(schema: Struct.Fields | Struct<Struct.Fields>): schema is Struct<Struct.Fields> {
   return isSchema(schema)
 }
-
-type MissingSelfGeneric<Usage extends string> =
-  `Missing \`Self\` generic - use \`class Self extends ${Usage}<Self>(...)\``
-
 /**
  * Creates a schema-backed class whose constructor validates input against a
  * {@link Struct} schema. Construction throws an `Error` with a
@@ -14533,7 +14712,6 @@ export const Class: {
     })
   )
 }
-
 /**
  * Defines a schema-backed class with an automatically populated `_tag` field.
  *
@@ -14598,7 +14776,6 @@ export const TaggedClass: {
     )
   }
 }
-
 /**
  * Creates a schema-backed error class that can be used as a typed,
  * yieldable error in Effect programs. Combines {@link Class} validation with
@@ -14655,7 +14832,6 @@ export const Error: {
   )
   return self
 }
-
 /**
  * Defines a schema-backed yieldable error class with an automatically populated
  * `_tag` field.
@@ -14720,11 +14896,6 @@ export const TaggedError: {
     )
   }
 }
-
-// -----------------------------------------------------------------------------
-// Formatter
-// -----------------------------------------------------------------------------
-
 /**
  * Attaches a custom formatter used by `toFormatter`.
  *
@@ -14733,255 +14904,33 @@ export const TaggedError: {
  * Use this when the formatter derived from the schema structure is not suitable.
  * The annotation is applied through this helper because adding it directly to
  * `Annotations.Bottom` would make schemas invariant.
- *
- * @category formatting
- * @since 4.0.0
- */
-export function overrideToFormatter<S extends Top>(toFormatter: () => Formatter<S["Type"]>) {
-  return (self: S): S["Rebuild"] => {
-    return self.annotate({ toFormatter })
-  }
-}
-
-/**
- * Derives a string formatter function from a schema. The formatter converts
- * a value to its human-readable string representation, recursing into structs,
- * arrays, and unions.
- *
- * **Details**
- *
- * The optional `onBefore` hook lets you intercept specific AST nodes before
- * the default formatting logic runs.
- *
- * @category formatting
- * @since 4.0.0
- */
-export function toFormatter<S extends Constraint>(schema: S, options?: {
-  readonly onBefore?:
-    | ((ast: SchemaAST.AST, recur: (ast: SchemaAST.AST) => Formatter<any>) => Formatter<any> | undefined)
-    | undefined
-}): Formatter<S["Type"]> {
-  return recur(schema.ast)
-
-  function recur(ast: SchemaAST.AST): Formatter<S["Type"]> {
-    // ---------------------------------------------
-    // handle annotation
-    // ---------------------------------------------
-    const annotation = InternalAnnotations.resolve(ast)?.["toFormatter"]
-    if (typeof annotation === "function") {
-      return annotation(SchemaAST.isDeclaration(ast) ? ast.typeParameters.map(recur) : [])
-    }
-    // ---------------------------------------------
-    // handle onBefore
-    // ---------------------------------------------
-    if (options?.onBefore) {
-      const onBefore = options.onBefore(ast, recur)
-      if (onBefore !== undefined) {
-        return onBefore
-      }
-    }
-    // ---------------------------------------------
-    // handle base case
-    // ---------------------------------------------
-    return on(ast)
-  }
-
-  function on(ast: SchemaAST.AST): Formatter<any> {
-    switch (ast._tag) {
-      default:
-        return format
-      case "Never":
-        return () => "never"
-      case "Void":
-        return () => "void"
-      case "Declaration": {
-        const representation = (ast.annotations as Annotations.Declaration<any> | undefined)?.representation
-        if (representation === undefined) return format
-        const typeParameters = ast.typeParameters.map(recur)
-        switch (representation.id) {
-          case "effect/schema/Option": {
-            const [value] = typeParameters
-            return Option_.match({
-              onNone: () => "none()",
-              onSome: (t) => `some(${value(t)})`
-            })
-          }
-          case "effect/schema/Result": {
-            const [success, failure] = typeParameters
-            return Result_.match({
-              onSuccess: (t) => `success(${success(t)})`,
-              onFailure: (t) => `failure(${failure(t)})`
-            })
-          }
-          case "effect/schema/CauseReason":
-            return causeReasonToFormatter(typeParameters[0], typeParameters[1])
-          case "effect/schema/Cause":
-            return causeToFormatter(typeParameters[0], typeParameters[1])
-          case "effect/schema/Exit": {
-            const [value, error, defect] = typeParameters
-            const cause = causeToFormatter(error, defect)
-            return (exit: Exit_.Exit<unknown, unknown>) => {
-              switch (exit._tag) {
-                case "Success":
-                  return `Exit.Success(${value(exit.value)})`
-                case "Failure":
-                  return `Exit.Failure(${cause(exit.cause)})`
-              }
-            }
-          }
-          case "effect/schema/ReadonlyMap": {
-            const [key, value] = typeParameters
-            return (map: globalThis.ReadonlyMap<unknown, unknown>) => {
-              const size = map.size
-              if (size === 0) return "ReadonlyMap(0) {}"
-              const entries = globalThis.Array.from(map.entries()).sort().map(([k, v]) => `${key(k)} => ${value(v)}`)
-              return `ReadonlyMap(${size}) { ${entries.join(", ")} }`
-            }
-          }
-          case "effect/schema/HashMap": {
-            const [key, value] = typeParameters
-            return (map: HashMap_.HashMap<unknown, unknown>) => {
-              const size = HashMap_.size(map)
-              if (size === 0) return "HashMap(0) {}"
-              const entries = HashMap_.toEntries(map).sort().map(([k, v]) => `${key(k)} => ${value(v)}`)
-              return `HashMap(${size}) { ${entries.join(", ")} }`
-            }
-          }
-          case "effect/schema/ReadonlySet": {
-            const [value] = typeParameters
-            return (set: globalThis.ReadonlySet<unknown>) => {
-              const size = set.size
-              if (size === 0) return "ReadonlySet(0) {}"
-              const values = globalThis.Array.from(set.values()).sort().map((item) => `${value(item)}`)
-              return `ReadonlySet(${size}) { ${values.join(", ")} }`
-            }
-          }
-          case "effect/schema/HashSet": {
-            const [value] = typeParameters
-            return (set: HashSet_.HashSet<unknown>) => {
-              const size = HashSet_.size(set)
-              if (size === 0) return "HashSet(0) {}"
-              const values = globalThis.Array.from(set).sort().map((item) => `${value(item)}`)
-              return `HashSet(${size}) { ${values.join(", ")} }`
-            }
-          }
-          case "effect/schema/Chunk": {
-            const [value] = typeParameters
-            return (chunk: Chunk_.Chunk<unknown>) => {
-              const size = Chunk_.size(chunk)
-              if (size === 0) return "Chunk(0) {}"
-              const values = globalThis.Array.from(chunk).sort().map((item) => `${value(item)}`)
-              return `Chunk(${size}) { ${values.join(", ")} }`
-            }
-          }
-          default:
-            return format
-        }
-      }
-      case "Arrays": {
-        const elements = ast.elements.map(recur)
-        const rest = ast.rest.map(recur)
-        return (t) => {
-          const out: Array<string> = []
-          let i = 0
-          // ---------------------------------------------
-          // handle elements
-          // ---------------------------------------------
-          for (; i < elements.length; i++) {
-            if (t.length < i + 1) {
-              if (SchemaAST.isOptional(ast.elements[i])) {
-                continue
-              }
-            } else {
-              out.push(elements[i](t[i]))
-            }
-          }
-          // ---------------------------------------------
-          // handle rest element
-          // ---------------------------------------------
-          if (rest.length > 0) {
-            const [head, ...tail] = rest
-            for (; i < t.length - tail.length; i++) {
-              out.push(head(t[i]))
-            }
-            // ---------------------------------------------
-            // handle post rest elements
-            // ---------------------------------------------
-            for (let j = 0; j < tail.length; j++) {
-              out.push(tail[j](t[i + j]))
-            }
-          }
-
-          return "[" + out.join(", ") + "]"
-        }
-      }
-      case "Objects": {
-        const propertySignatures = ast.propertySignatures.map((ps) => recur(ps.type))
-        const indexSignatures = ast.indexSignatures.map((is) => recur(is.type))
-        if (ast.propertySignatures.length === 0 && ast.indexSignatures.length === 0) {
-          return format
-        }
-        return (t) => {
-          const out: Array<string> = []
-          const visited = new Set<PropertyKey>()
-          // ---------------------------------------------
-          // handle property signatures
-          // ---------------------------------------------
-          for (let i = 0; i < propertySignatures.length; i++) {
-            const ps = ast.propertySignatures[i]
-            const name = ps.name
-            visited.add(name)
-            if (SchemaAST.isOptional(ps.type) && !Object.hasOwn(t, name)) {
-              continue
-            }
-            out.push(`${formatPropertyKey(name)}: ${propertySignatures[i](t[name])}`)
-          }
-          // ---------------------------------------------
-          // handle index signatures
-          // ---------------------------------------------
-          for (let i = 0; i < indexSignatures.length; i++) {
-            const keys = SchemaAST.getIndexSignatureKeys(t, ast.indexSignatures[i].parameter)
-            for (const key of keys) {
-              if (visited.has(key)) {
-                continue
-              }
-              visited.add(key)
-              out.push(`${formatPropertyKey(key)}: ${indexSignatures[i](t[key])}`)
-            }
-          }
-
-          return out.length > 0 ? "{ " + out.join(", ") + " }" : "{}"
-        }
-      }
-      case "Union": {
-        const types = SchemaAST.toType(ast).types
-        const getCandidates = (t: any) => SchemaAST.getCandidates(t, types)
-        const compiled = new Map(
-          types.map((candidate, i) => [candidate, [SchemaParser._is(candidate), recur(ast.types[i])] as const] as const)
-        )
-        return (t) => {
-          const candidates = getCandidates(t)
-          for (let i = 0; i < candidates.length; i++) {
-            const [is, formatter] = compiled.get(candidates[i])!
-            if (is(t)) {
-              return formatter(t)
-            }
-          }
-          return format(t)
-        }
-      }
-      case "Suspend": {
-        const get = SchemaAST.memoizeThunk(() => recur(ast.thunk()))
-        return (t) => get()(t)
-      }
-    }
-  }
+ *
+ * @category formatting
+ * @since 4.0.0
+ */
+export function overrideToFormatter<S extends Top>(toFormatter: () => Formatter<S["Type"]>) {
+  return (self: S): S["Rebuild"] => self.annotate({ toFormatter })
+}
+/**
+ * Derives a string formatter function from a schema. The formatter converts
+ * a value to its human-readable string representation, recursing into structs,
+ * arrays, and unions.
+ *
+ * **Details**
+ *
+ * The optional `onBefore` hook lets you intercept specific AST nodes before
+ * the default formatting logic runs.
+ *
+ * @category formatting
+ * @since 4.0.0
+ */
+export function toFormatter<S extends Constraint>(schema: S, options?: {
+  readonly onBefore?:
+    | ((ast: SchemaAST.AST, recur: (ast: SchemaAST.AST) => Formatter<any>) => Formatter<any> | undefined)
+    | undefined
+}): Formatter<S["Type"]> {
+  return InternalToFormatter.toFormatter(schema.ast, options)
 }
-
-// -----------------------------------------------------------------------------
-// Equivalence
-// -----------------------------------------------------------------------------
-
 /**
  * Overrides the equivalence derivation for a schema by supplying a custom
  * `Equivalence`.
@@ -14997,7 +14946,6 @@ export function toFormatter<S extends Constraint>(schema: S, options?: {
 export function overrideToEquivalence<S extends Top>(toEquivalence: () => Equivalence.Equivalence<S["Type"]>) {
   return (self: S): S["Rebuild"] => self.annotate({ toEquivalence })
 }
-
 /**
  * Derives an `Equivalence` from a schema. Two values are considered equal when
  * every field (and nested field) compares equal according to the schema
@@ -15020,11 +14968,6 @@ export function overrideToEquivalence<S extends Top>(toEquivalence: () => Equiva
 export function toEquivalence<T>(schema: Schema<T>): Equivalence.Equivalence<T> {
   return InternalEquivalence.toEquivalence(schema.ast)
 }
-
-// -----------------------------------------------------------------------------
-// Representation
-// -----------------------------------------------------------------------------
-
 /**
  * Derives an intermediate `SchemaRepresentation.Document` from the encoded
  * side of a schema.
@@ -15050,427 +14993,156 @@ export function toRepresentation(
 ): SchemaRepresentation.Document {
   return InternalToRepresentation.toRepresentation(schema.ast, options)
 }
-
-// -----------------------------------------------------------------------------
-// JsonSchema
-// -----------------------------------------------------------------------------
-
 /**
  * Options for reference allocation and JSON Schema generation in {@link toJsonSchemaDocument}.
  *
  * **Details**
  *
- * The inherited `referencePolicy` runs after the input schema is converted to its canonical JSON codec, so it receives
- * canonical JSON-encoded ASTs. The remaining options control compilation of the resulting live representation.
- *
- * **Gotchas**
- *
- * When these options are passed directly to `SchemaRepresentation.toJsonSchemaDocument` or
- * `SchemaRepresentation.toJsonSchemaMultiDocument`, reference allocation has already happened and `referencePolicy`
- * has no effect.
- *
- * @category options
- * @since 4.0.0
- */
-export interface ToJsonSchemaOptions extends SchemaRepresentation.ToRepresentationOptions {
-  /**
-   * Controls how additional properties are handled while resolving the JSON
-   * schema.
-   *
-   * **Details**
-   *
-   * Possible values include:
-   * - `false`: Disallow additional properties (default)
-   * - `true`: Allow additional properties
-   * - `JsonSchema`: Use the provided JSON Schema for additional properties
-   */
-  readonly additionalProperties?: boolean | JsonSchema.JsonSchema | undefined
-  /**
-   * Controls whether to generate descriptions for checks (if the user has not
-   * provided them) based on the `expected` annotation of the check.
-   */
-  readonly generateDescriptions?: boolean | undefined
-  /**
-   * A predicate that controls which additional annotation keys (beyond the
-   * standard JSON Schema keys) are included in the generated output.
-   *
-   * **When to use**
-   *
-   * Use when you need to include non-standard annotation keys in the generated
-   * JSON Schema, such as Monaco Editor properties (`markdownDescription`,
-   * `defaultSnippets`) or vendor extensions (`x-*`).
-   *
-   * **Details**
-   *
-   * Standard JSON Schema keys (`title`, `description`, `default`, `examples`,
-   * `readOnly`, `writeOnly`, `format`, `contentEncoding`, `contentMediaType`,
-   * `contentSchema`) are always included. This predicate is checked for any
-   * *other* annotation key.
-   *
-   * **Gotchas**
-   *
-   * Prefer whitelisting the custom annotation keys you want to emit instead of
-   * using a broad predicate such as `() => true`, because broad predicates can
-   * include Effect-specific annotations that are preserved for internal schema
-   * generation.
-   *
-   * **Example** (Including custom annotations)
-   *
-   * ```ts import.meta.vitest
-   * import { Schema } from "effect"
-   *
-   * const schema = Schema.String.annotate({
-   *   description: "A name",
-   *   markdownDescription: "The **name** field"
-   * })
-   *
-   * const doc = Schema.toJsonSchemaDocument(schema, {
-   *   includeAnnotationKey: (key) =>
-   *     key === "markdownDescription" || key.startsWith("x-")
-   * })
-   *
-   * doc.schema // => { type: "string", description: "A name", markdownDescription: "The **name** field" }
-   * ```
-   */
-  readonly includeAnnotationKey?: ((key: string) => boolean) | undefined
-}
-
-/**
- * Returns a JSON Schema document using draft 2020-12.
- *
- * **When to use**
- *
- * Use when you need a draft-2020-12 description of the canonical JSON form of a runtime schema.
- *
- * **Details**
- *
- * The `options` parameter controls reference extraction and generation details
- * such as additional properties and synthesized check descriptions; it does
- * not change the draft target. The reference policy receives canonical JSON
- * encoded ASTs. By default, anonymous non-recursive candidates remain inline, while candidates with resolved identifiers
- * become definitions. Declarations are lowered through their `toCodecJson` or `toCodec`
- * annotation when available before the representation document is compiled.
- * For schemas whose codec JSON AST can be represented exactly in JSON Schema,
- * importing the emitted document reconstructs a schema that accepts the same
- * JSON values. This is a semantic round-trip guarantee; the reconstructed AST
- * may have a different shape.
- *
- * **Gotchas**
- *
- * JSON Schema generation is best-effort. Some Effect schema semantics cannot
- * be represented exactly in JSON Schema, and importing an emitted JSON Schema
- * may produce an equivalent approximation rather than the original schema
- * shape. Such schemas are outside the exact round-trip subset. When canonical
- * JSON derivation adds an artificial transformation, checks and annotations on
- * its source node are not copied to the JSON target, so they do not appear in
- * the emitted document. Opaque declarations without a structural codec are
- * represented by an unconstrained JSON Schema. Effect decoding may discard
- * excess object properties by default; use `onExcessProperty: "error"` when
- * comparing validation semantics with an emitted JSON Schema.
- *
- * @see {@link SchemaRepresentation.toJsonSchemaDocument} for compiling an existing live representation document
- *
- * @category converting
- * @since 4.0.0
- */
-export function toJsonSchemaDocument(
-  schema: Constraint,
-  options?: ToJsonSchemaOptions
-): JsonSchema.Document<"draft-2020-12"> {
-  const document = InternalToRepresentation.toRepresentation(
-    toCodecJsonAST(schema.ast),
-    options
-  )
-  return InternalToJsonSchemaDocument.toJsonSchemaDocument(document, options)
-}
-
-// -----------------------------------------------------------------------------
-// Canonical Codecs
-// -----------------------------------------------------------------------------
-
-/**
- * Type-level representation returned by {@link toCodecJson}.
- *
- * @category converting
- * @since 4.0.0
- */
-export interface toCodecJson<S extends Constraint> extends
-  BottomLazy<
-    S["ast"],
-    toCodecJson<S>,
-    S["~type.parameters"],
-    S["~type.mutability"],
-    S["~type.optionality"],
-    S["~type.constructor.default"],
-    S["~encoded.mutability"],
-    S["~encoded.optionality"]
-  >
-{
-  readonly "Type": S["Type"]
-  readonly "Encoded": Json
-  readonly "DecodingServices": S["DecodingServices"]
-  readonly "EncodingServices": S["EncodingServices"]
-  readonly "~type.make.in": S["~type.make.in"]
-  readonly "~type.make": S["~type.make"]
-  readonly "Iso": S["Iso"]
-  readonly schema: S
-}
-
-/**
- * Derives a canonical JSON codec from a schema. The encoded form is `Json`, and
- * decoding produces the schema's `Type`.
- *
- * **Details**
- *
- * Derivation does not run transformations. Annotation links may be asynchronous,
- * may fail, and may use optional services; the consuming parser chooses the
- * execution and failure handling. Because hooks do not widen the returned
- * service types, links cannot require services not declared by the input schema.
- *
- * **Gotchas**
- *
- * Declarations without a `toCodecJson` or `toCodec` annotation use `Json` as
- * their encoded schema. This keeps codec construction total, but encoding or
- * decoding can still fail when declaration values are not JSON values. A
- * `toCodecJson` callback can return `undefined` when the declaration is already
- * in canonical JSON form. When derivation adds an artificial transformation,
- * checks and annotations remain on its source node rather than being copied to
- * the JSON target. Source checks still run after the transformation.
- *
- * @category converting
- * @since 4.0.0
- */
-export function toCodecJson<S extends Constraint>(schema: S): toCodecJson<S> {
-  return make(toCodecJsonAST(schema.ast), { schema })
-}
-
-/** @internal */
-export const toCodecJsonAST = SchemaAST.applyToSelfOrLastLinkEncodingIdempotent((ast) => {
-  const out = toCodecJsonASTStep(ast, toCodecJsonAST)
-  const context = ast.context
-  if (out === ast || context === undefined) return out
-  return SchemaAST.replaceContextLastLink(out, withoutConstructorDefault(context))
-})
-
-function withoutConstructorDefault(context: SchemaAST.Context): SchemaAST.Context {
-  return context.constructorDefault === undefined ?
-    context :
-    new SchemaAST.Context(context.isOptional, context.isMutable, undefined, context.annotations)
-}
-
-function validateCanonicalObjectPropertyNames(ast: SchemaAST.Objects): void {
-  if (ast.propertySignatures.some((ps) => typeof ps.name !== "string")) {
-    throw new globalThis.Error("Objects property names must be strings", { cause: ast })
-  }
-}
-
-function makeReorder(getPriority: (ast: SchemaAST.AST) => number) {
-  return (types: ReadonlyArray<SchemaAST.AST>): ReadonlyArray<SchemaAST.AST> => {
-    // Create a map of original indices for O(1) lookup
-    const indexMap = new Map<SchemaAST.AST, number>()
-    for (let i = 0; i < types.length; i++) {
-      indexMap.set(SchemaAST.toEncoded(types[i]), i)
-    }
-
-    // Create a sorted copy of the types array
-    const sortedTypes = [...types].sort((a, b) => {
-      a = SchemaAST.toEncoded(a)
-      b = SchemaAST.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
-  }
-}
-
-const toCodecJsonReorder = makeReorder((ast: SchemaAST.AST) => {
-  switch (ast._tag) {
-    case "BigInt":
-    case "Symbol":
-    case "UniqueSymbol":
-      return 0
-    default:
-      return 1
-  }
-})
-
-function toCodecJsonASTStep(ast: SchemaAST.AST, recur: (ast: SchemaAST.AST) => SchemaAST.AST): SchemaAST.AST {
-  switch (ast._tag) {
-    case "Declaration": {
-      const getLink = ast.annotations?.toCodecJson ?? ast.annotations?.toCodec
-      if (!Predicate.isFunction(getLink)) {
-        return SchemaAST.replaceEncoding(ast, [SchemaAST.unknownToJson])
-      }
-      const typeParameters = ast.typeParameters.map((tp) => InternalSchema.make(SchemaAST.toEncoded(tp)))
-      const link = getLink(typeParameters)
-      return link === undefined ? ast : SchemaAST.replaceEncoding(ast, [SchemaAST.mapLink(link, recur)])
-    }
-    case "Unknown":
-      return SchemaAST.replaceEncoding(ast, [SchemaAST.unknownToJson])
-    case "ObjectKeyword":
-      return SchemaAST.replaceEncoding(ast, [SchemaAST.objectKeywordToJson])
-    case "Undefined":
-    case "Void":
-    case "Literal":
-    case "Number":
-      return ast.toCodecJson()
-    case "UniqueSymbol":
-    case "Symbol":
-    case "BigInt":
-      return ast.toCodecStringTree()
-    case "Objects": {
-      validateCanonicalObjectPropertyNames(ast)
-      return ast.recur(recur, SchemaAST.parameterFromString)
-    }
-    case "Union": {
-      const sortedTypes = toCodecJsonReorder(ast.types)
-      if (sortedTypes !== ast.types) {
-        return new SchemaAST.Union(
-          sortedTypes,
-          ast.mode,
-          ast.annotations,
-          ast.checks,
-          ast.encoding,
-          ast.context,
-          ast.encodingChecks
-        ).recur(recur)
-      }
-      return ast.recur(recur)
-    }
-    case "Arrays":
-    case "Suspend":
-      return ast.recur(recur)
-  }
-  // `Schema.Any` is used as an escape hatch
-  return ast
-}
-
-/**
- * Derives an isomorphism codec from a schema. The encoded form is the schema's
- * `Iso` type — the intermediate representation used for round-tripping.
- *
- * **Details**
- *
- * Annotation links may be asynchronous, may fail, and may use optional services;
- * the consuming parser chooses the execution and failure handling.
- *
- * **Gotchas**
- *
- * Links cannot require services because the returned `Codec` does not expose
- * service requirements.
- *
- * @category converting
- * @since 4.0.0
- */
-export function toCodecIso<S extends Constraint>(schema: S): Codec<S["Type"], S["Iso"]> {
-  return make(toCodecIsoAST(SchemaAST.toType(schema.ast)))
-}
-
-const toCodecIsoAST = memoize((ast: SchemaAST.AST): SchemaAST.AST => {
-  const out = toCodecIsoASTStep(ast, toCodecIsoAST)
-  return out !== ast && ast.context !== undefined ?
-    SchemaAST.replaceContextLastLink(out, withoutConstructorDefault(ast.context)) :
-    out
-})
-
-function toCodecIsoASTStep(ast: SchemaAST.AST, recur: (ast: SchemaAST.AST) => SchemaAST.AST): SchemaAST.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)))
-        return SchemaAST.replaceEncoding(ast, [SchemaAST.mapLink(link, recur)])
-      }
-      return ast
-    }
-    case "Arrays":
-    case "Objects":
-    case "Union":
-    case "Suspend":
-      return ast.recur(recur)
-  }
-  return ast
-}
-
-/**
- * A {@link Tree} of `string | undefined` nodes. Leaf values are either a
- * string representation or `undefined` for opaque/declaration types.
- *
- * @category models
- * @since 4.0.0
- */
-export type StringTree = Tree<string | undefined>
-
-/**
- * Type-level representation returned by {@link toCodecStringTree}.
+ * The inherited `referencePolicy` runs after the input schema is converted to its canonical JSON codec, so it receives
+ * canonical JSON-encoded ASTs. The remaining options control compilation of the resulting live representation.
  *
- * @category converting
+ * **Gotchas**
+ *
+ * When these options are passed directly to `SchemaRepresentation.toJsonSchemaDocument` or
+ * `SchemaRepresentation.toJsonSchemaMultiDocument`, reference allocation has already happened and `referencePolicy`
+ * has no effect.
+ *
+ * @category options
  * @since 4.0.0
  */
-export interface toCodecStringTree<S extends Constraint> extends
-  BottomLazy<
-    S["ast"],
-    toCodecStringTree<S>,
-    ReadonlyArray<Constraint>,
-    S["~type.mutability"],
-    S["~type.optionality"],
-    S["~type.constructor.default"],
-    S["~encoded.mutability"],
-    S["~encoded.optionality"]
-  >
-{
-  readonly "Type": S["Type"]
-  readonly "Encoded": StringTree
-  readonly "DecodingServices": S["DecodingServices"]
-  readonly "EncodingServices": S["EncodingServices"]
-  readonly "~type.make.in": S["~type.make.in"]
-  readonly "~type.make": S["~type.make"]
-  readonly "Iso": S["Iso"]
-  readonly schema: S
+export interface ToJsonSchemaOptions extends SchemaRepresentation.ToRepresentationOptions {
+  /**
+   * Controls whether generated object schemas accept properties that are not
+   * modeled by the Effect schema.
+   *
+   * **Details**
+   *
+   * The default, `"ignore"`, matches the decoder's default excess-property
+   * behavior and leaves unmodeled properties open. Use `"error"` together
+   * with the decoder option of the same name to reject unmodeled properties
+   * whenever the key space can be represented.
+   *
+   * Index signatures still determine the schema for properties they model.
+   * When an index-signature key cannot be used as a `patternProperties`
+   * selector, `"ignore"` leaves unmatched properties open. `"error"` instead
+   * constrains their names with `propertyNames` and uses the candidate index
+   * value schemas for `additionalProperties`.
+   */
+  readonly onExcessProperty?: "ignore" | "error" | undefined
+  /**
+   * Controls whether to generate descriptions for checks (if the user has not
+   * provided them) based on the `expected` annotation of the check.
+   */
+  readonly generateDescriptions?: boolean | undefined
+  /**
+   * A predicate that controls which additional annotation keys (beyond the
+   * standard JSON Schema keys) are included in the generated output.
+   *
+   * **When to use**
+   *
+   * Use when you need to include non-standard annotation keys in the generated
+   * JSON Schema, such as Monaco Editor properties (`markdownDescription`,
+   * `defaultSnippets`) or vendor extensions (`x-*`).
+   *
+   * **Details**
+   *
+   * Standard JSON Schema keys (`title`, `description`, `default`, `examples`,
+   * `readOnly`, `writeOnly`, `format`, `contentEncoding`, `contentMediaType`,
+   * `contentSchema`) are always included. This predicate is checked for any
+   * *other* annotation key.
+   *
+   * **Gotchas**
+   *
+   * Prefer whitelisting the custom annotation keys you want to emit instead of
+   * using a broad predicate such as `() => true`, because broad predicates can
+   * include Effect-specific annotations that are preserved for internal schema
+   * generation.
+   *
+   * **Example** (Including custom annotations)
+   *
+   * ```ts import.meta.vitest
+   * import { Schema } from "effect"
+   *
+   * const schema = Schema.String.annotate({
+   *   description: "A name",
+   *   markdownDescription: "The **name** field"
+   * })
+   *
+   * const doc = Schema.toJsonSchemaDocument(schema, {
+   *   includeAnnotationKey: (key) =>
+   *     key === "markdownDescription" || key.startsWith("x-")
+   * })
+   *
+   * doc.schema // => { type: "string", description: "A name", markdownDescription: "The **name** field" }
+   * ```
+   */
+  readonly includeAnnotationKey?: ((key: string) => boolean) | undefined
 }
-
 /**
- * Converts a schema to the StringTree canonical codec, where every leaf value
- * becomes a string while preserving the original structure.
+ * Returns a JSON Schema document using draft 2020-12.
+ *
+ * **When to use**
+ *
+ * Use when you need a draft-2020-12 description of the canonical JSON form of a runtime schema.
  *
  * **Details**
  *
- * Derivation does not run transformations. Annotation links may be asynchronous,
- * may fail, and may use optional services; the consuming parser chooses the
- * execution and failure handling. Links cannot require services not declared by
- * the input schema because hooks do not widen the returned service types.
+ * The `options` parameter controls reference extraction and generation details
+ * such as excess properties and synthesized check descriptions; it does not
+ * change the draft target. The reference policy receives canonical JSON
+ * encoded ASTs. By default, anonymous non-recursive candidates remain inline,
+ * while candidates with resolved identifiers become definitions. Declarations
+ * are lowered through their `toCodecJson` or `toCodec` annotation when
+ * available before the representation document is compiled.
+ *
+ * The generated document is intended for preliminary validation. JSON Schema
+ * and Effect checks do not always have identical semantics, so the Effect
+ * decoder remains the final authority. Passing JSON Schema validation does not
+ * guarantee that Effect decoding will succeed.
  *
  * **Gotchas**
  *
- * Declarations must provide a structural `toCodecStringTree`, `toCodecJson`, or
- * `toCodec` encoding. A callback can return `undefined` when the declaration is
- * already in canonical StringTree form.
+ * JSON Schema generation is best-effort. String length uses Unicode code points
+ * in JSON Schema and UTF-16 code units in Effect. A generated `pattern` cannot
+ * retain JavaScript RegExp flags. Object property checks apply to the original
+ * input in JSON Schema but to the decoded object in Effect. `oneOf` can also
+ * reject values accepted by overlapping Effect union members. Custom
+ * `toJsonSchema` annotations are the annotation author's responsibility. When
+ * canonical JSON derivation adds an artificial transformation, checks and
+ * annotations on its source node are not copied to the JSON target, so they do
+ * not appear in the emitted document. Opaque declarations without a structural
+ * codec are represented by an unconstrained JSON Schema. The default
+ * `onExcessProperty: "ignore"` matches the decoder default and leaves
+ * unrepresentable index-signature keys open. In `"error"` mode, the compiler
+ * constrains those keys with `propertyNames` and applies a permissive choice of
+ * candidate index value schemas. The Effect decoder enforces the exact
+ * key-value association.
+ *
+ * @see {@link SchemaRepresentation.toJsonSchemaDocument} for compiling an existing live representation document
  *
  * @category converting
  * @since 4.0.0
  */
-export function toCodecStringTree<S extends Constraint>(schema: S): toCodecStringTree<S> {
-  return make(toCodecStringTreeAST(schema.ast), { schema })
+export function toJsonSchemaDocument(
+  schema: Constraint,
+  options?: ToJsonSchemaOptions
+): JsonSchema.Document<"draft-2020-12"> {
+  const document = InternalToRepresentation.toRepresentation(
+    InternalToCodec.toCodecJsonAST(schema.ast),
+    options
+  )
+  return InternalToJsonSchemaDocument.toJsonSchemaDocument(document, options)
 }
-
 /**
- * Type-level representation returned by {@link toCodecArrayFromSingle}.
+ * Type-level representation returned by {@link toCodecJson}.
  *
  * @category converting
  * @since 4.0.0
  */
-export interface toCodecArrayFromSingle<S extends Constraint> extends
+export interface toCodecJson<S extends Constraint> extends
   BottomLazy<
     S["ast"],
-    toCodecArrayFromSingle<S>,
+    toCodecJson<S>,
     S["~type.parameters"],
     S["~type.mutability"],
     S["~type.optionality"],
@@ -15480,520 +15152,196 @@ export interface toCodecArrayFromSingle<S extends Constraint> extends
   >
 {
   readonly "Type": S["Type"]
-  readonly "Encoded": S["Encoded"]
+  readonly "Encoded": Json
   readonly "DecodingServices": S["DecodingServices"]
   readonly "EncodingServices": S["EncodingServices"]
   readonly "~type.make.in": S["~type.make.in"]
   readonly "~type.make": S["~type.make"]
   readonly "Iso": S["Iso"]
+  readonly schema: S
 }
-
-/**
- * Allows array schemas to decode from either an array input or a single value
- * input.
- *
- * **When to use**
- *
- * Use when you need to accept transport formats that may represent a
- * single-item array as a bare value, such as query-string or form-data adapters.
- *
- * **Gotchas**
- *
- * This combinator is intentionally not part of `toCodecStringTree`; it adds a
- * decoding convenience rather than a canonical StringTree representation. It
- * does not parse comma-separated strings.
- *
- * @category converting
- * @since 4.0.0
- */
-export function toCodecArrayFromSingle<S extends Constraint>(schema: S): toCodecArrayFromSingle<S> {
-  return make(toCodecArrayFromSingleAST(schema.ast))
-}
-
-type XmlEncoderOptions = {
-  /** Root element name for the returned XML string. Default: "root" */
-  readonly rootName?: string | undefined
-  /** When an array doesn't have a natural item name, use this. Default: "item" */
-  readonly arrayItemName?: string | undefined
-  /** Pretty-print output. Default: true */
-  readonly pretty?: boolean | undefined
-  /** Indentation used when pretty-printing. Default: "  " (two spaces) */
-  readonly indent?: string | undefined
-  /** Sort object keys for stable output. Default: true */
-  readonly sortKeys?: boolean | undefined
-}
-
-/**
- * Derives an XML encoder from a codec.
- *
- * **Details**
- *
- * The returned function encodes a value through `toCodecStringTree` and returns
- * an `Effect` that succeeds with the XML string or fails with `SchemaError` if
- * codec encoding fails.
- *
- * @category encoding
- * @since 4.0.0
- */
-export function toEncoderXml<T, RE>(
-  codec: ConstraintCodec<T, unknown, unknown, RE>,
-  options?: XmlEncoderOptions
-) {
-  const rootName = InternalAnnotations.resolveIdentifier(codec.ast) ?? InternalAnnotations.resolveTitle(codec.ast)
-  const serialize = encodeEffect(toCodecStringTree(codec))
-  return (t: T): Effect.Effect<string, SchemaError, RE> =>
-    serialize(t).pipe(Effect.map((stringTree) => stringTreeToXml(stringTree, { rootName, ...options })))
-}
-
-function stringTreeToXml(value: StringTree, options: XmlEncoderOptions): string {
-  const rootName = options.rootName ?? "root"
-  const arrayItemName = options.arrayItemName ?? "item"
-  const pretty = options.pretty ?? true
-  const indent = options.indent ?? "  "
-  const sortKeys = options.sortKeys ?? true
-
-  const seen = new Set<object>()
-  const lines: Array<string> = []
-
-  recur(rootName, value, 0)
-  return lines.join(pretty ? "\n" : "")
-
-  function push(depth: number, text: string): void {
-    lines.push(pretty ? indent.repeat(depth) + text : text)
-  }
-
-  function recur(tagName: string, node: StringTree, depth: number, originalNameForMeta?: string): void {
-    const { attrs, safe } = xml.tagInfo(tagName, originalNameForMeta)
-
-    if (node === undefined) {
-      push(depth, `<${safe}${attrs}/>`)
-    } else if (typeof node === "string") {
-      push(depth, `<${safe}${attrs}>${xml.escapeText(node)}</${safe}>`)
-    } else if (typeof node !== "object" || node === null) {
-      push(depth, `<${safe}${attrs}>${xml.escapeText(format(node))}</${safe}>`)
-    } else {
-      if (seen.has(node)) throw new globalThis.Error("Cycle detected while serializing to XML.", { cause: node })
-      seen.add(node)
-      try {
-        if (globalThis.globalThis.Array.isArray(node)) {
-          if (node.length === 0) {
-            push(depth, `<${safe}${attrs}/>`)
-            return
-          }
-          push(depth, `<${safe}${attrs}>`)
-          for (const item of node) recur(arrayItemName, item, depth + 1)
-          push(depth, `</${safe}>`)
-          return
-        }
-
-        const obj = node as Record<string, StringTree>
-        const keys = Object.keys(obj)
-        if (sortKeys) keys.sort()
-
-        if (keys.length === 0) {
-          push(depth, `<${safe}${attrs}/>`)
-          return
-        }
-
-        push(depth, `<${safe}${attrs}>`)
-        for (const k of keys) {
-          recur(xml.parseTagName(k).safe, obj[k], depth + 1, k)
-        }
-        push(depth, `</${safe}>`)
-      } finally {
-        seen.delete(node)
-      }
-    }
-  }
-}
-
-const xml = {
-  escapeText(s: string): string {
-    return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")
-  },
-  escapeAttribute(s: string): string {
-    return s.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;")
-  },
-  parseTagName(name: string): { safe: string; changed: boolean } {
-    const original = name
-    let safe = name
-    if (!/^[A-Za-z_]/.test(safe)) safe = "_" + safe
-    safe = safe.replace(/[^A-Za-z0-9._-]/g, "_")
-    if (/^xml/i.test(safe)) safe = "_" + safe
-    return { safe, changed: safe !== original }
-  },
-  tagInfo(name: string, original?: string): { safe: string; attrs: string } {
-    const { changed, safe } = xml.parseTagName(name)
-    const needsMeta = changed || (original && original !== name)
-    const attrs = needsMeta ? ` data-name="${xml.escapeAttribute(original ?? name)}"` : ""
-    return { safe, attrs }
-  }
-}
-
-const toStringTreeReorder = makeReorder((ast: SchemaAST.AST) => {
-  switch (ast._tag) {
-    case "Null":
-    case "Boolean":
-    case "Number":
-    case "BigInt":
-    case "Symbol":
-    case "UniqueSymbol":
-      return 0
-    default:
-      return 1
-  }
-})
-
-function toCodecStringTreeASTStep(
-  ast: SchemaAST.AST,
-  recur: (ast: SchemaAST.AST) => SchemaAST.AST,
-  onMissingAnnotation: (ast: SchemaAST.AST) => SchemaAST.AST
-): SchemaAST.AST {
-  switch (ast._tag) {
-    case "Declaration": {
-      const typeParameters = ast.typeParameters.map((tp) => make(recur(SchemaAST.toEncoded(tp))))
-      const getStringTreeLink = ast.annotations?.toCodecStringTree
-      if (Predicate.isFunction(getStringTreeLink)) {
-        const link = getStringTreeLink(typeParameters)
-        if (link === undefined) return ast
-        return SchemaAST.replaceEncoding(ast, [SchemaAST.mapLink(link, recur)])
-      }
-      const getJsonLink = ast.annotations?.toCodecJson
-      const jsonLink = Predicate.isFunction(getJsonLink) ? getJsonLink(typeParameters) : undefined
-      const getLink = jsonLink === undefined ? ast.annotations?.toCodec : undefined
-      const link = jsonLink ?? (Predicate.isFunction(getLink) ? getLink(typeParameters) : undefined)
-      return link === undefined
-        ? onMissingAnnotation(ast)
-        : SchemaAST.replaceEncoding(ast, [SchemaAST.mapLink(link, recur)])
-    }
-    case "Null":
-      return SchemaAST.replaceEncoding(ast, [nullToString])
-    case "Boolean":
-      return SchemaAST.replaceEncoding(ast, [booleanToString])
-    case "Unknown":
-    case "ObjectKeyword":
-      return SchemaAST.replaceEncoding(ast, [SchemaAST.unknownToStringTree])
-    case "Enum":
-    case "Number":
-    case "Literal":
-    case "UniqueSymbol":
-    case "Symbol":
-    case "BigInt":
-      return ast.toCodecStringTree()
-    case "Objects": {
-      validateCanonicalObjectPropertyNames(ast)
-      return ast.recur(recur, SchemaAST.parameterFromString)
-    }
-    case "Union": {
-      const sortedTypes = toStringTreeReorder(ast.types)
-      if (sortedTypes !== ast.types) {
-        return new SchemaAST.Union(
-          sortedTypes,
-          ast.mode,
-          ast.annotations,
-          ast.checks,
-          ast.encoding,
-          ast.context,
-          ast.encodingChecks
-        ).recur(recur)
-      }
-      return ast.recur(recur)
-    }
-    case "Arrays":
-    case "Suspend":
-      return ast.recur(recur)
-  }
-  // `Schema.Any` is used as an escape hatch
-  return ast
-}
-
-const nullToString = new SchemaAST.Link(
-  new SchemaAST.Literal("null"),
-  new SchemaTransformation.Transformation(
-    SchemaGetter.transform(() => null),
-    SchemaGetter.transform(() => "null")
-  )
-)
-
-const booleanToString = new SchemaAST.Link(
-  new SchemaAST.Union([new SchemaAST.Literal("true"), new SchemaAST.Literal("false")], "anyOf"),
-  new SchemaTransformation.Transformation(
-    SchemaGetter.transform((s) => s === "true"),
-    SchemaGetter.String()
-  )
-)
-
-const arrayFromSingleTransformation = new SchemaTransformation.Transformation(
-  SchemaGetter.transform((input: ReadonlyArray<unknown> | string) => typeof input === "string" ? [input] : input),
-  SchemaGetter.passthrough()
-)
-
-const isCodecArrayFromSingleLink = (link: SchemaAST.Link): boolean =>
-  link.transformation === arrayFromSingleTransformation
-
-const toCodecStringTreeAST = SchemaAST.applyToSelfOrLastLinkEncodingIdempotent((ast) => {
-  const out = toCodecStringTreeASTStep(ast, toCodecStringTreeAST, (ast) => {
-    throw new globalThis.Error("Missing structural codec for StringTree", { cause: ast })
-  })
-  if (out !== ast && ast.context !== undefined) {
-    return SchemaAST.replaceContextLastLink(out, withoutConstructorDefault(ast.context))
-  }
-  return out
-}, { stopAt: isCodecArrayFromSingleLink })
-
-const toArrayFromSingleInputElement = (ast: SchemaAST.AST): SchemaAST.AST =>
-  SchemaAST.isOptional(ast) ? SchemaAST.optionalKey(SchemaAST.unknown) : SchemaAST.unknown
-
-const toCodecArrayFromSingleAST = SchemaAST.applyToSelfOrLastLinkEncodingIdempotent((ast) => {
-  const out = toCodecArrayFromSingleASTStep(ast)
-  if (SchemaAST.isArrays(out)) {
-    const ensure = SchemaAST.decodeTo(
-      new SchemaAST.Union(
-        [
-          new SchemaAST.Arrays(
-            out.isMutable,
-            out.elements.map(toArrayFromSingleInputElement),
-            out.rest.map(toArrayFromSingleInputElement)
-          ),
-          SchemaAST.string
-        ],
-        "anyOf"
-      ),
-      out,
-      arrayFromSingleTransformation
-    )
-    return SchemaAST.isOptional(ast) ? SchemaAST.optionalKey(ensure) : ensure
-  }
-  return out
-}, { stopAt: isCodecArrayFromSingleLink })
-
-function toCodecArrayFromSingleASTStep(ast: SchemaAST.AST): SchemaAST.AST {
-  return ast._tag === "Declaration" || ast._tag === "Arrays" || ast._tag === "Objects" || ast._tag === "Union" ||
-      ast._tag === "Suspend"
-    ? ast.recur(toCodecArrayFromSingleAST)
-    : ast
-}
-
-/**
- * Reviver for persisted `isGreaterThanDate` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isGreaterThanDate}.
- *
- * @see {@link isGreaterThanDate} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isGreaterThanDateReviver: SchemaRepresentation.FilterReviver<{
-  readonly exclusiveMinimum: globalThis.Date
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isGreaterThanDate",
-  Struct({ exclusiveMinimum: Date }),
-  ({ annotations, payload }) => isGreaterThanDate(payload.exclusiveMinimum, annotations)
-)
-
-/**
- * Reviver for persisted `isGreaterThanOrEqualToDate` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isGreaterThanOrEqualToDate}.
- *
- * @see {@link isGreaterThanOrEqualToDate} for creating the corresponding check
- *
- * @category validation
- * @since 4.0.0
- */
-export const isGreaterThanOrEqualToDateReviver: SchemaRepresentation.FilterReviver<{
-  readonly minimum: globalThis.Date
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isGreaterThanOrEqualToDate",
-  Struct({ minimum: Date }),
-  ({ annotations, payload }) => isGreaterThanOrEqualToDate(payload.minimum, annotations)
-)
-
 /**
- * Reviver for persisted `isLessThanDate` checks.
+ * Derives a canonical JSON codec from a schema. The encoded form is `Json`, and
+ * decoding produces the schema's `Type`.
  *
- * **When to use**
+ * **Details**
  *
- * Use when reconstructing documents that may contain checks created by {@link isLessThanDate}.
+ * Derivation does not run transformations. Annotation links may be asynchronous,
+ * may fail, and may use optional services; the consuming parser chooses the
+ * execution and failure handling. Because hooks do not widen the returned
+ * service types, links cannot require services not declared by the input schema.
  *
- * @see {@link isLessThanDate} for creating the corresponding check
+ * **Gotchas**
  *
- * @category validation
+ * Declarations without a `toCodecJson` or `toCodec` annotation use `Json` as
+ * their encoded schema. This keeps codec construction total, but encoding or
+ * decoding can still fail when declaration values are not JSON values. A
+ * `toCodecJson` callback can return `undefined` when the declaration is already
+ * in canonical JSON form. When derivation adds an artificial transformation,
+ * checks and annotations remain on its source node rather than being copied to
+ * the JSON target. Source checks still run after the transformation.
+ *
+ * @category converting
  * @since 4.0.0
  */
-export const isLessThanDateReviver: SchemaRepresentation.FilterReviver<{
-  readonly exclusiveMaximum: globalThis.Date
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isLessThanDate",
-  Struct({ exclusiveMaximum: Date }),
-  ({ annotations, payload }) => isLessThanDate(payload.exclusiveMaximum, annotations)
-)
-
+export const toCodecJson: {
+  <S extends Constraint>(schema: S): toCodecJson<S>
+} = InternalToCodec.toCodecJson
 /**
- * Reviver for persisted `isLessThanOrEqualToDate` checks.
+ * Derives an isomorphism codec from a schema. The encoded form is the schema's
+ * `Iso` type — the intermediate representation used for round-tripping.
  *
- * **When to use**
+ * **Details**
+ *
+ * Annotation links may be asynchronous, may fail, and may use optional services;
+ * the consuming parser chooses the execution and failure handling.
  *
- * Use when reconstructing documents that may contain checks created by {@link isLessThanOrEqualToDate}.
+ * **Gotchas**
  *
- * @see {@link isLessThanOrEqualToDate} for creating the corresponding check
+ * Links cannot require services because the returned `Codec` does not expose
+ * service requirements.
  *
- * @category validation
+ * @category converting
  * @since 4.0.0
  */
-export const isLessThanOrEqualToDateReviver: SchemaRepresentation.FilterReviver<{
-  readonly maximum: globalThis.Date
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isLessThanOrEqualToDate",
-  Struct({ maximum: Date }),
-  ({ annotations, payload }) => isLessThanOrEqualToDate(payload.maximum, annotations)
-)
-
+export const toCodecIso: {
+  <S extends Constraint>(schema: S): Codec<S["Type"], S["Iso"]>
+} = InternalToCodec.toCodecIso
 /**
- * Reviver for persisted `isBetweenDate` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isBetweenDate}.
- *
- * @see {@link isBetweenDate} for creating the corresponding check
+ * A {@link Tree} of `string | undefined` nodes. Leaf values are either a
+ * string representation or `undefined` for opaque/declaration types.
  *
- * @category validation
+ * @category models
  * @since 4.0.0
  */
-export const isBetweenDateReviver: SchemaRepresentation.FilterReviver<{
-  readonly minimum: globalThis.Date
-  readonly maximum: globalThis.Date
-  readonly exclusiveMinimum?: true | undefined
-  readonly exclusiveMaximum?: true | undefined
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isBetweenDate",
-  Struct({
-    minimum: Date,
-    maximum: Date,
-    exclusiveMinimum: optional(Literal(true)),
-    exclusiveMaximum: optional(Literal(true))
-  }),
-  ({ annotations, payload }) => isBetweenDate(payload, annotations)
-)
-
+export type StringTree = Tree<string | undefined>
 /**
- * Reviver for persisted `isGreaterThanBigInt` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isGreaterThanBigInt}.
- *
- * @see {@link isGreaterThanBigInt} for creating the corresponding check
+ * Type-level representation returned by {@link toCodecStringTree}.
  *
- * @category validation
+ * @category converting
  * @since 4.0.0
  */
-export const isGreaterThanBigIntReviver: SchemaRepresentation.FilterReviver<{
-  readonly exclusiveMinimum: bigint
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isGreaterThanBigInt",
-  Struct({ exclusiveMinimum: BigInt }),
-  ({ annotations, payload }) => isGreaterThanBigInt(payload.exclusiveMinimum, annotations)
-)
-
+export interface toCodecStringTree<S extends Constraint> extends
+  BottomLazy<
+    S["ast"],
+    toCodecStringTree<S>,
+    ReadonlyArray<Constraint>,
+    S["~type.mutability"],
+    S["~type.optionality"],
+    S["~type.constructor.default"],
+    S["~encoded.mutability"],
+    S["~encoded.optionality"]
+  >
+{
+  readonly "Type": S["Type"]
+  readonly "Encoded": StringTree
+  readonly "DecodingServices": S["DecodingServices"]
+  readonly "EncodingServices": S["EncodingServices"]
+  readonly "~type.make.in": S["~type.make.in"]
+  readonly "~type.make": S["~type.make"]
+  readonly "Iso": S["Iso"]
+  readonly schema: S
+}
 /**
- * Reviver for persisted `isGreaterThanOrEqualToBigInt` checks.
+ * Converts a schema to the StringTree canonical codec, where every leaf value
+ * becomes a string while preserving the original structure.
  *
- * **When to use**
+ * **Details**
  *
- * Use when reconstructing documents that may contain checks created by {@link isGreaterThanOrEqualToBigInt}.
+ * Derivation does not run transformations. Annotation links may be asynchronous,
+ * may fail, and may use optional services; the consuming parser chooses the
+ * execution and failure handling. Links cannot require services not declared by
+ * the input schema because hooks do not widen the returned service types.
  *
- * @see {@link isGreaterThanOrEqualToBigInt} for creating the corresponding check
+ * **Gotchas**
  *
- * @category validation
+ * Declarations must provide a structural `toCodecStringTree`, `toCodecJson`, or
+ * `toCodec` encoding. A callback can return `undefined` when the declaration is
+ * already in canonical StringTree form.
+ *
+ * @category converting
  * @since 4.0.0
  */
-export const isGreaterThanOrEqualToBigIntReviver: SchemaRepresentation.FilterReviver<{
-  readonly minimum: bigint
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isGreaterThanOrEqualToBigInt",
-  Struct({ minimum: BigInt }),
-  ({ annotations, payload }) => isGreaterThanOrEqualToBigInt(payload.minimum, annotations)
-)
-
+export const toCodecStringTree: {
+  <S extends Constraint>(schema: S): toCodecStringTree<S>
+} = InternalToCodec.toCodecStringTree
 /**
- * Reviver for persisted `isLessThanBigInt` checks.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain checks created by {@link isLessThanBigInt}.
- *
- * @see {@link isLessThanBigInt} for creating the corresponding check
+ * Type-level representation returned by {@link toCodecArrayFromSingle}.
  *
- * @category validation
+ * @category converting
  * @since 4.0.0
  */
-export const isLessThanBigIntReviver: SchemaRepresentation.FilterReviver<{
-  readonly exclusiveMaximum: bigint
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isLessThanBigInt",
-  Struct({ exclusiveMaximum: BigInt }),
-  ({ annotations, payload }) => isLessThanBigInt(payload.exclusiveMaximum, annotations)
-)
-
+export interface toCodecArrayFromSingle<S extends Constraint> extends
+  BottomLazy<
+    S["ast"],
+    toCodecArrayFromSingle<S>,
+    S["~type.parameters"],
+    S["~type.mutability"],
+    S["~type.optionality"],
+    S["~type.constructor.default"],
+    S["~encoded.mutability"],
+    S["~encoded.optionality"]
+  >
+{
+  readonly "Type": S["Type"]
+  readonly "Encoded": S["Encoded"]
+  readonly "DecodingServices": S["DecodingServices"]
+  readonly "EncodingServices": S["EncodingServices"]
+  readonly "~type.make.in": S["~type.make.in"]
+  readonly "~type.make": S["~type.make"]
+  readonly "Iso": S["Iso"]
+}
 /**
- * Reviver for persisted `isLessThanOrEqualToBigInt` checks.
+ * Allows array schemas to decode from either an array input or a single value
+ * input.
  *
  * **When to use**
  *
- * Use when reconstructing documents that may contain checks created by {@link isLessThanOrEqualToBigInt}.
+ * Use when you need to accept transport formats that may represent a
+ * single-item array as a bare value, such as query-string or form-data adapters.
+ *
+ * **Gotchas**
  *
- * @see {@link isLessThanOrEqualToBigInt} for creating the corresponding check
+ * This combinator is intentionally not part of `toCodecStringTree`; it adds a
+ * decoding convenience rather than a canonical StringTree representation. It
+ * does not parse comma-separated strings.
  *
- * @category validation
+ * @category converting
  * @since 4.0.0
  */
-export const isLessThanOrEqualToBigIntReviver: SchemaRepresentation.FilterReviver<{
-  readonly maximum: bigint
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isLessThanOrEqualToBigInt",
-  Struct({ maximum: BigInt }),
-  ({ annotations, payload }) => isLessThanOrEqualToBigInt(payload.maximum, annotations)
-)
-
+export const toCodecArrayFromSingle: {
+  <S extends Constraint>(schema: S): toCodecArrayFromSingle<S>
+} = InternalToCodec.toCodecArrayFromSingle
+type XmlEncoderOptions = {
+  /** Root element name for the returned XML string. Default: "root" */
+  readonly rootName?: string | undefined
+  /** When an array doesn't have a natural item name, use this. Default: "item" */
+  readonly arrayItemName?: string | undefined
+  /** Pretty-print output. Default: true */
+  readonly pretty?: boolean | undefined
+  /** Indentation used when pretty-printing. Default: "  " (two spaces) */
+  readonly indent?: string | undefined
+  /** Sort object keys for stable output. Default: true */
+  readonly sortKeys?: boolean | undefined
+}
 /**
- * Reviver for persisted `isBetweenBigInt` checks.
- *
- * **When to use**
+ * Derives an XML encoder from a codec.
  *
- * Use when reconstructing documents that may contain checks created by {@link isBetweenBigInt}.
+ * **Details**
  *
- * @see {@link isBetweenBigInt} for creating the corresponding check
+ * The returned function encodes a value through `toCodecStringTree` and returns
+ * an `Effect` that succeeds with the XML string or fails with a
+ * {@link SchemaIssue.Issue} if codec encoding fails.
  *
- * @category validation
+ * @category encoding
  * @since 4.0.0
  */
-export const isBetweenBigIntReviver: SchemaRepresentation.FilterReviver<{
-  readonly minimum: bigint
-  readonly maximum: bigint
-  readonly exclusiveMinimum?: true | undefined
-  readonly exclusiveMaximum?: true | undefined
-}> = InternalSchema.makeFilterReviver(
-  "effect/schema/isBetweenBigInt",
-  Struct({
-    minimum: BigInt,
-    maximum: BigInt,
-    exclusiveMinimum: optional(Literal(true)),
-    exclusiveMaximum: optional(Literal(true))
-  }),
-  ({ annotations, payload }) => isBetweenBigInt(payload, annotations)
-)
-
-// -----------------------------------------------------------------------------
-// Optic APIs
-// -----------------------------------------------------------------------------
-
+export function toEncoderXml<T, RE>(
+  codec: ConstraintCodec<T, unknown, unknown, RE>,
+  options?: XmlEncoderOptions
+): (t: T) => Effect.Effect<string, SchemaIssue.Issue, RE> {
+  return InternalToEncoderXml.toEncoderXml(codec, options)
+}
 /**
  * Derives an `Iso` optic from a schema that isomorphically converts between
  * the schema's `Type` and its `Iso` (intermediate / serialized form).
@@ -16015,30 +15363,26 @@ export const isBetweenBigIntReviver: SchemaRepresentation.FilterReviver<{
  * @since 4.0.0
  */
 export function toIso<S extends Constraint>(schema: S): Optic_.Iso<S["Type"], S["Iso"]> {
-  const serializer = toCodecIso(schema)
-  return Optic_.makeIso(SchemaParser.encodeSync(serializer), SchemaParser.decodeSync(serializer))
+  return InternalToIso.toIso(schema)
 }
-
 /**
  * Returns an identity `Iso` over the schema's source (`Type`) side.
  *
  * @category constructors
  * @since 4.0.0
  */
-export function toIsoSource<S extends Constraint>(_: S): Optic_.Iso<S["Type"], S["Type"]> {
-  return Optic_.id()
+export function toIsoSource<S extends Constraint>(schema: S): Optic_.Iso<S["Type"], S["Type"]> {
+  return InternalToIso.toIsoSource(schema)
 }
-
 /**
  * Returns an identity `Iso` over the schema's focus (`Iso`) side.
  *
  * @category constructors
  * @since 4.0.0
  */
-export function toIsoFocus<S extends Constraint>(_: S): Optic_.Iso<S["Iso"], S["Iso"]> {
-  return Optic_.id()
+export function toIsoFocus<S extends Constraint>(schema: S): Optic_.Iso<S["Iso"], S["Iso"]> {
+  return InternalToIso.toIsoFocus(schema)
 }
-
 /**
  * Type-level representation returned by {@link overrideToCodecIso}.
  *
@@ -16066,7 +15410,6 @@ export interface overrideToCodecIso<S extends Constraint, Iso> extends
   readonly "Iso": Iso
   readonly schema: S
 }
-
 /**
  * Overrides a schema's derived ISO codec with an explicit target codec.
  *
@@ -16094,17 +15437,12 @@ export function overrideToCodecIso<S extends Constraint, Iso>(
   return (schema: S): overrideToCodecIso<S, Iso> => {
     return make(
       SchemaAST.annotate(schema.ast, {
-        toCodecIso: () => new SchemaAST.Link(to.ast, SchemaTransformation.make(transformation))
+        toCodecIso: () => new SchemaAST.Link(to.ast, SchemaTransformation.makeTransformation(transformation))
       }),
       { schema }
     )
   }
 }
-
-// -----------------------------------------------------------------------------
-// Differ APIs
-// -----------------------------------------------------------------------------
-
 /**
  * Derives a JSON Patch differ from a codec. Serializes values to JSON (via
  * {@link toCodecJson}), computes RFC 6902 JSON Patch operations between old
@@ -16127,21 +15465,8 @@ export function overrideToCodecIso<S extends Constraint, Iso>(
  * @since 4.0.0
  */
 export function toDifferJsonPatch<T>(schema: ConstraintCodec<T, unknown>): Differ<T, JsonPatch.JsonPatch> {
-  const serializer = toCodecJson(schema)
-  const get = SchemaParser.encodeSync(serializer)
-  const set = SchemaParser.decodeSync(serializer)
-  return {
-    empty: [],
-    diff: (oldValue, newValue) => JsonPatch.get(get(oldValue), get(newValue)),
-    combine: (first, second) => [...first, ...second],
-    patch: (oldValue, patch) => {
-      const value = get(oldValue)
-      const patched = JsonPatch.apply(patch, value)
-      return Object.is(patched, value) ? oldValue : set(patched)
-    }
-  }
+  return InternalToDifferJsonPatch.toDifferJsonPatch(schema)
 }
-
 /**
  * Recursive tree type whose leaves are `Node` values and whose branches are
  * readonly arrays or string-keyed records of child trees.
@@ -16150,7 +15475,6 @@ export function toDifferJsonPatch<T>(schema: ConstraintCodec<T, unknown>): Diffe
  * @since 4.0.0
  */
 export type Tree<Node> = Node | TreeRecord<Node> | ReadonlyArray<Tree<Node>>
-
 /**
  * A record node in a {@link Tree}: an object mapping string keys to child
  * `Tree` nodes.
@@ -16161,7 +15485,6 @@ export type Tree<Node> = Node | TreeRecord<Node> | ReadonlyArray<Tree<Node>>
 export interface TreeRecord<A> {
   readonly [x: string]: Tree<A>
 }
-
 /**
  * Creates a recursive schema for a {@link Tree} of values described by `node`.
  * The resulting schema accepts a single node value, an array of trees, or an
@@ -16184,7 +15507,6 @@ export function Tree<S extends Constraint>(node: S) {
   ])
   return Tree
 }
-
 /**
  * Recursive TypeScript type for any valid immutable JSON value: `null`,
  * `number`, `boolean`, `string`, a readonly array of `Json` values, or a
@@ -16195,7 +15517,6 @@ export function Tree<S extends Constraint>(node: S) {
  * @since 4.0.0
  */
 export type Json = null | number | boolean | string | JsonArray | JsonObject
-
 /**
  * A readonly array of {@link Json} values.
  *
@@ -16203,7 +15524,6 @@ export type Json = null | number | boolean | string | JsonArray | JsonObject
  * @since 4.0.0
  */
 export interface JsonArray extends ReadonlyArray<Json> {}
-
 /**
  * A readonly record whose values are {@link Json} values.
  *
@@ -16213,7 +15533,6 @@ export interface JsonArray extends ReadonlyArray<Json> {}
 export interface JsonObject {
   readonly [x: string]: Json
 }
-
 /**
  * Schema that accepts and validates any immutable JSON-compatible value.
  *
@@ -16234,7 +15553,6 @@ export const Json: Codec<Json> = make(SchemaAST.annotate(SchemaAST.Json, {
     Type: "Schema.Json"
   })
 }))
-
 /**
  * Schema for readonly string-keyed records whose values are JSON-compatible.
  *
@@ -16255,32 +15573,7 @@ export const Json: Codec<Json> = make(SchemaAST.annotate(SchemaAST.Json, {
  * @category schemas
  * @since 4.0.0
  */
-export const JsonObject = Record(String, Json)
-
-/**
- * Reviver for persisted `Json` declarations.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain the {@link Json} schema.
- *
- * @see {@link Json} for the corresponding immutable JSON schema
- *
- * @category schemas
- * @since 4.0.0
- */
-export const JsonReviver = makeFixedDeclarationReviver(
-  "effect/schema/Json",
-  Json
-)
-
-const JsonError = Struct({
-  message: String,
-  name: optionalKey(String),
-  stack: optionalKey(String),
-  cause: optionalKey(Json)
-})
-
+export const JsonObject: $Record<String, Codec<Json, Json, never, never>> = Record(String, Json)
 /**
  * Recursive TypeScript type for mutable JSON values: `null`, `number`,
  * `boolean`, `string`, mutable arrays, or mutable string-keyed records.
@@ -16289,7 +15582,6 @@ const JsonError = Struct({
  * @since 4.0.0
  */
 export type MutableJson = null | number | boolean | string | MutableJsonArray | MutableJsonObject
-
 /**
  * A mutable array of {@link MutableJson} values.
  *
@@ -16297,7 +15589,6 @@ export type MutableJson = null | number | boolean | string | MutableJsonArray |
  * @since 4.0.0
  */
 export interface MutableJsonArray extends Array<MutableJson> {}
-
 /**
  * A mutable record whose values are {@link MutableJson} values.
  *
@@ -16308,6 +15599,12 @@ export interface MutableJsonObject {
   [x: string]: MutableJson
 }
 
+const JsonError = Struct({
+  message: String,
+  name: optionalKey(String),
+  stack: optionalKey(String),
+  cause: optionalKey(Json)
+})
 /**
  * Schema that accepts any mutable JSON-compatible value. See {@link Json} for
  * the immutable variant.
@@ -16321,28 +15618,6 @@ export const MutableJson: Codec<MutableJson> = make(SchemaAST.annotate(SchemaAST
     Type: "Schema.MutableJson"
   })
 }))
-
-/**
- * Reviver for persisted `MutableJson` declarations.
- *
- * **When to use**
- *
- * Use when reconstructing documents that may contain the {@link MutableJson} schema.
- *
- * @see {@link MutableJson} for the corresponding mutable JSON schema
- *
- * @category schemas
- * @since 4.0.0
- */
-export const MutableJsonReviver = makeFixedDeclarationReviver(
-  "effect/schema/MutableJson",
-  MutableJson
-)
-
-// -----------------------------------------------------------------------------
-// Annotations
-// -----------------------------------------------------------------------------
-
 /**
  * Resolves the typed annotations from a schema. The term "resolve" (rather
  * than "get") reflects the lookup strategy: if the schema has checks, the
@@ -16357,7 +15632,6 @@ export function resolveAnnotations<S extends Constraint>(
 ): Annotations.Bottom<S["Type"], S["~type.parameters"]> | undefined {
   return InternalAnnotations.resolve(schema.ast)
 }
-
 /**
  * Resolves the context (key-level) annotations from a schema. Context
  * annotations are those attached via `annotateKey` and live on the AST's
@@ -16369,10 +15643,6 @@ export function resolveAnnotations<S extends Constraint>(
 export function resolveAnnotationsKey<S extends Constraint>(schema: S): Annotations.Key<S["Type"]> | undefined {
   return schema.ast.context?.annotations
 }
-
-/** @internal */
-type AnnotationSchemaConstraint = Constraint
-
 /**
  * The `Annotations` namespace groups all annotation interfaces used to attach
  * metadata to schemas. Annotations control documentation, validation messages,
@@ -16429,10 +15699,9 @@ export declare namespace Annotations {
    * @category models
    * @since 4.0.0
    */
-  export interface Annotations {
+  interface Annotations {
     readonly [x: string]: unknown
   }
-
   /**
    * Annotations shared by all schema nodes. These map to common JSON Schema /
    * OpenAPI fields: `title`, `description`, `format`, etc.
@@ -16440,7 +15709,7 @@ export declare namespace Annotations {
    * @category models
    * @since 4.0.0
    */
-  export interface Augment extends Annotations {
+  interface Augment extends Annotations {
     /**
      * Human-readable description of what a value is expected to satisfy.
      *
@@ -16463,18 +15732,16 @@ export declare namespace Annotations {
     readonly contentMediaType?: string | undefined
     readonly contentSchema?: Json | undefined
   }
-
   /**
    * Extends {@link Augment} with type-parametric `default` and `examples` fields.
    *
    * @category models
    * @since 4.0.0
    */
-  export interface Documentation<T> extends Augment {
+  interface Documentation<T> extends Augment {
     readonly default?: T | undefined
     readonly examples?: ReadonlyArray<T> | undefined
   }
-
   /**
    * Annotations for struct property schemas. Extends {@link Documentation}
    * with an optional `messageMissingKey` to override the error message when
@@ -16483,23 +15750,22 @@ export declare namespace Annotations {
    * @category models
    * @since 4.0.0
    */
-  export interface Key<T> extends Documentation<T> {
+  interface Key<T> extends Documentation<T> {
     /**
      * The message to use when a key is missing.
      */
     readonly messageMissingKey?: string | undefined
   }
-
   /**
    * Base annotations shared by all composite schema nodes. Extends
-   * {@link Documentation} with error messages, branding, parse options, and
-   * arbitrary generation hooks. {@link Declaration} and other annotation
+   * {@link Documentation} with error messages, branding, and arbitrary
+   * generation hooks. {@link Declaration} and other annotation
    * interfaces build on top of this.
    *
    * @category models
    * @since 4.0.0
    */
-  export interface Bottom<T, TypeParameters extends ReadonlyArray<Constraint>> extends Documentation<T> {
+  interface Bottom<T, TypeParameters extends ReadonlyArray<Constraint>> extends Documentation<T> {
     /**
      * Complete message to use when this schema node reports an issue.
      *
@@ -16531,20 +15797,18 @@ export declare namespace Annotations {
      * filter/refinement instead.
      */
     readonly identifier?: string | undefined
-    readonly parseOptions?: SchemaAST.ParseOptions | undefined
     /**
      * Accumulated brands when multiple brands are added with `Schema.brand`.
      */
     readonly brands?: ReadonlyArray<string> | undefined
   }
-
   /**
    * Helpers for projecting declaration type-parameter schemas into decoded or
    * encoded codec arrays used by annotation hooks.
    *
    * @since 4.0.0
    */
-  export namespace TypeParameters {
+  namespace TypeParameters {
     /**
      * Maps declaration type-parameter schemas to codecs for their decoded `Type`
      * values.
@@ -16552,7 +15816,7 @@ export declare namespace Annotations {
      * @category utility types
      * @since 4.0.0
      */
-    export type Type<TypeParameters extends ReadonlyArray<Constraint>> = {
+    type Type<TypeParameters extends ReadonlyArray<Constraint>> = {
       readonly [K in keyof TypeParameters]: Codec<TypeParameters[K]["Type"]>
     }
     /**
@@ -16561,11 +15825,10 @@ export declare namespace Annotations {
      * @category utility types
      * @since 4.0.0
      */
-    export type Encoded<TypeParameters extends ReadonlyArray<Constraint>> = {
+    type Encoded<TypeParameters extends ReadonlyArray<Constraint>> = {
       readonly [K in keyof TypeParameters]: Codec<TypeParameters[K]["Encoded"]>
     }
   }
-
   /**
    * Full annotation set for `Declaration` schema nodes — used when defining
    * custom, opaque schema types via `Schema.declare`. Extends {@link Bottom}
@@ -16576,12 +15839,10 @@ export declare namespace Annotations {
    * @category models
    * @since 4.0.0
    */
-  export interface Declaration<T, TypeParameters extends ReadonlyArray<Constraint> = readonly []>
+  interface Declaration<T, TypeParameters extends ReadonlyArray<Constraint> = readonly []>
     extends Bottom<T, TypeParameters>
   {
-    readonly representation?:
-      | SchemaRepresentation.RepresentationAnnotation
-      | undefined
+    readonly representation?: SchemaRepresentation.RepresentationAnnotation | undefined
     /**
      * Returns the fallback link used by canonical codec derivations.
      *
@@ -16590,9 +15851,7 @@ export declare namespace Annotations {
      * Transformations may be asynchronous, may fail, and may use optional
      * services, but cannot require services absent from the derived codec type.
      */
-    readonly toCodec?:
-      | ((typeParameters: TypeParameters.Encoded<TypeParameters>) => SchemaAST.Link)
-      | undefined
+    readonly toCodec?: ((typeParameters: TypeParameters.Encoded<TypeParameters>) => SchemaAST.Link) | undefined
     /**
      * Returns the link used to derive the declaration's JSON representation, or
      * `undefined` when the declaration is already in canonical JSON form.
@@ -16625,9 +15884,7 @@ export declare namespace Annotations {
      * services, but cannot require services because the derived `Codec` exposes
      * none.
      */
-    readonly toCodecIso?:
-      | ((typeParameters: TypeParameters.Type<TypeParameters>) => SchemaAST.Link)
-      | undefined
+    readonly toCodecIso?: ((typeParameters: TypeParameters.Type<TypeParameters>) => SchemaAST.Link) | undefined
     /**
      * Provides a generatable representation for native arbitrary derivation.
      *
@@ -16653,7 +15910,6 @@ export declare namespace Annotations {
      */
     readonly "~sentinels"?: ReadonlyArray<SchemaAST.Sentinel> | undefined
   }
-
   /**
    * Annotations for filter schema nodes (created via `Schema.filter`). Extends
    * {@link Augment} with an optional error message, identifier, and metadata.
@@ -16662,10 +15918,8 @@ export declare namespace Annotations {
    * @category models
    * @since 4.0.0
    */
-  export interface Filter extends Augment {
-    readonly representation?:
-      | SchemaRepresentation.CheckRepresentationAnnotation<SchemaAST.AST>
-      | undefined
+  interface Filter extends Augment {
+    readonly representation?: SchemaRepresentation.CheckRepresentationAnnotation<SchemaAST.AST> | undefined
     /**
      * Compiles this filter to a JSON Schema fragment.
      *
@@ -16707,7 +15961,7 @@ export declare namespace Annotations {
      *
      * @since 4.0.0
      */
-    readonly arbitraryConstraint?: ToArbitrary.Constraint<any> | undefined
+    readonly arbitraryConstraint?: ToArbitrary.FilterConstraint<any> | undefined
     /**
      * Marks the filter as *structural*, meaning it applies to the shape or
      * structure of the container (e.g., array length, object keys) rather than
@@ -16721,24 +15975,22 @@ export declare namespace Annotations {
      */
     readonly "~structural"?: boolean | undefined
   }
-
   /**
    * Types used to guide native arbitrary derivation through constraints and declaration representations.
    *
    * @since 4.0.0
    */
-  export namespace ToArbitrary {
+  namespace ToArbitrary {
     /**
      * Regular-expression source and flags used for constructive string generation.
      *
      * @category models
      * @since 4.0.0
      */
-    export interface Pattern {
+    interface Pattern {
       readonly source: string
       readonly flags: string
     }
-
     /**
      * Normalized generation constraints for a declaration or schema node.
      *
@@ -16749,7 +16001,7 @@ export declare namespace Annotations {
      * @category models
      * @since 4.0.0
      */
-    export interface GenerationConstraint<T = unknown> {
+    interface GenerationConstraint<T = unknown> {
       readonly minimum?: T | undefined
       readonly exclusiveMinimum?: true | undefined
       readonly maximum?: T | undefined
@@ -16764,7 +16016,6 @@ export declare namespace Annotations {
       readonly number?: "finite" | "integer" | undefined
       readonly uniqueBy?: ((value: any) => unknown) | undefined
     }
-
     /**
      * Raw constraint contribution attached to a Schema filter.
      *
@@ -16776,45 +16027,36 @@ export declare namespace Annotations {
      * @category models
      * @since 4.0.0
      */
-    export interface Constraint<T = unknown> extends GenerationConstraint<T> {
+    interface FilterConstraint<T = unknown> extends GenerationConstraint<T> {
       readonly order?: Order.Order<T> | undefined
     }
-
     /**
      * Input provided to a declaration's native arbitrary callback.
      *
      * @category models
      * @since 4.0.0
      */
-    export interface DeclarationInput<
-      T,
-      Parameters extends ReadonlyArray<AnnotationSchemaConstraint>
-    > {
+    interface DeclarationInput<T, Parameters extends ReadonlyArray<Constraint>> {
       readonly typeParameters: TypeParameters.Type<Parameters>
       readonly constraint: GenerationConstraint<T> | undefined
     }
-
     /**
      * Selects a Schema Link whose source representation is optimized for native arbitrary generation.
      *
      * @category models
      * @since 4.0.0
      */
-    export interface Declaration<
-      T,
-      Parameters extends ReadonlyArray<AnnotationSchemaConstraint>
-    > {
+    interface Declaration<T, Parameters extends ReadonlyArray<Constraint>> {
       (input: DeclarationInput<T, Parameters>): SchemaAST.Link
     }
   }
-
   /**
    * Types used by formatter annotations to customize formatter derivation for
    * declaration schemas.
    *
    * @since 4.0.0
    */
-  export namespace ToFormatter {
+  namespace ToFormatter {
     /**
      * Hook signature for declaration schema formatter annotations.
      *
@@ -16825,21 +16067,21 @@ export declare namespace Annotations {
      * @category models
      * @since 4.0.0
      */
-    export interface Declaration<T, TypeParameters extends ReadonlyArray<Constraint>> {
+    interface Declaration<T, TypeParameters extends ReadonlyArray<Constraint>> {
       (
-        /* Formatters for any type parameters of the schema (if present) */
-        typeParameters: { readonly [K in keyof TypeParameters]: Formatter<TypeParameters[K]["Type"]> }
+        typeParameters: {
+          readonly [K in keyof TypeParameters]: Formatter<TypeParameters[K]["Type"]>
+        }
       ): Formatter<T>
     }
   }
-
   /**
    * Types used by equivalence annotations to customize equivalence derivation for
    * declaration schemas.
    *
    * @since 4.0.0
    */
-  export namespace ToEquivalence {
+  namespace ToEquivalence {
     /**
      * Hook signature for declaration schema equivalence annotations.
      *
@@ -16850,14 +16092,14 @@ export declare namespace Annotations {
      * @category models
      * @since 4.0.0
      */
-    export interface Declaration<T, TypeParameters extends ReadonlyArray<Constraint>> {
+    interface Declaration<T, TypeParameters extends ReadonlyArray<Constraint>> {
       (
-        /* Equivalences for any type parameters of the schema (if present) */
-        typeParameters: { readonly [K in keyof TypeParameters]: Equivalence.Equivalence<TypeParameters[K]["Type"]> }
+        typeParameters: {
+          readonly [K in keyof TypeParameters]: Equivalence.Equivalence<TypeParameters[K]["Type"]>
+        }
       ): Equivalence.Equivalence<T>
     }
   }
-
   /**
    * Annotations that can be attached to schema issues.
    *
@@ -16871,7 +16113,7 @@ export declare namespace Annotations {
    * @category models
    * @since 4.0.0
    */
-  export interface Issue extends Annotations {
+  interface Issue extends Annotations {
     /**
      * The expected value description for an `InvalidValue` issue.
      */
diff --git a/repos/effect/packages/effect/src/SchemaAST.ts b/repos/effect/packages/effect/src/SchemaAST.ts
index 67263e18e..97f13b807 100644
--- a/repos/effect/packages/effect/src/SchemaAST.ts
+++ b/repos/effect/packages/effect/src/SchemaAST.ts
@@ -17,7 +17,7 @@ import * as Effect from "./Effect.ts"
 import * as Exit from "./Exit.ts"
 import { format, formatPropertyKey } from "./Formatter.ts"
 import { identity, memoize, memoizeIdempotent } from "./Function.ts"
-import { effectIsExit, iterateEager } from "./internal/effect.ts"
+import { effectIsExit, iterateConcurrent, iterateEager, resolveConcurrency } from "./internal/effect.ts"
 import * as InternalRecord from "./internal/record.ts"
 import * as InternalAnnotations from "./internal/schema/annotations.ts"
 import * as InternalSchemaCause from "./internal/schema/cause.ts"
@@ -30,6 +30,7 @@ import * as SchemaGetter from "./SchemaGetter.ts"
 import * as SchemaIssue from "./SchemaIssue.ts"
 import type * as SchemaParser from "./SchemaParser.ts"
 import * as SchemaTransformation from "./SchemaTransformation.ts"
+import type * as Types from "./Types.ts"
 
 /**
  * Discriminated union of all AST node types.
@@ -40,14 +41,13 @@ import * as SchemaTransformation from "./SchemaTransformation.ts"
  * ({@link isString}, {@link isObjects}, etc.) to narrow to a specific variant,
  * then access variant-specific fields.
  *
- * - All variants share the {@link Base} fields: `annotations`, `checks`,
- *   `encoding`, `context`.
+ * - All variants share the `annotations`, `checks`, `encoding`, and `context`
+ *   fields.
  * - Discriminate on the `_tag` field (e.g. `"String"`, `"Objects"`, `"Union"`).
  *
- * @see {@link Base}
  * @see {@link isAST}
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
 export type AST =
   | Declaration
@@ -397,7 +397,25 @@ export const isSuspend = makeGuard("Suspend")
  * @category models
  * @since 4.0.0
  */
-export class Link {
+export interface Link {
+  readonly to: AST
+  readonly transformation:
+    | SchemaTransformation.Transformation<any, any, any, any>
+    | SchemaTransformation.Middleware<any, any, any, any, any, any>
+}
+
+/**
+ * Constructs a {@link Link}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Link: new(
+  to: AST,
+  transformation:
+    | SchemaTransformation.Transformation<any, any, any, any>
+    | SchemaTransformation.Middleware<any, any, any, any, any, any>
+) => Link = class {
   readonly to: AST
   readonly transformation:
     | SchemaTransformation.Transformation<any, any, any, any>
@@ -420,7 +438,7 @@ export class Link {
  *
  * **Details**
  *
- * Stored on {@link Base.encoding}. When `undefined`, the node has no
+ * Stored on an AST node's `encoding` field. When `undefined`, the node has no
  * encoding transformation (type and encoded forms are identical).
  *
  * @see {@link Link}
@@ -436,22 +454,25 @@ export type Encoding = readonly [Link, ...Array<Link>]
  * **Details**
  *
  * Pass to `Schema.decodeUnknown`, `Schema.encode`, and related APIs to customize
- * error reporting, excess property handling, output key ordering, check
- * execution, and asynchronous parser concurrency.
+ * error reporting, excess property handling, check execution, and product
+ * concurrency. Options apply throughout the parse; schema annotations do not
+ * override them.
  *
  * - `errors` — `"first"` (default) stops at the first error; `"all"` collects
  *   every error.
  * - `onExcessProperty` — `"ignore"` (default) strips unknown object keys;
- *   `"error"` fails; `"preserve"` keeps them.
- * - `propertyOrder` — `"none"` (default) lets the system choose key order;
- *   `"original"` preserves input key order.
+ *   `"error"` fails.
  * - `disableChecks` — skips validation checks while still applying defaults and
  *   transformations.
- * - `concurrency` — maximum number of async parse effects to run concurrently;
- *   defaults to `1`, or use `"unbounded"`.
+ * - `concurrency` — controls concurrent parsing of tuple elements, array
+ *   elements, struct fields, and record entries using the same semantics as
+ *   `Effect.forEach`; the default is sequential.
  * - `reportInput` — includes rejected input values in value-bearing schema
  *   issues.
  *
+ * Object property order is unspecified, including in values passed to checks.
+ * Decoding and encoding do not guarantee preservation of input key order.
+ *
  * @category options
  * @since 3.10.0
  */
@@ -475,48 +496,45 @@ export interface ParseOptions {
    * **Details**
    *
    * The default, `"ignore"`, strips unspecified properties from the output. Use
-   * `"error"` to fail when an excess property is present, or `"preserve"` to
-   * keep excess properties in the output.
+   * `"error"` to fail when an excess property is present. A key is covered by a
+   * declared property or any index signature selecting that key. This applies
+   * to structs, records, and structs with rest. Values must satisfy every
+   * applicable index signature. Empty structs keep their non-nullish behavior.
    *
    * @default "ignore"
    */
-  readonly onExcessProperty?: "ignore" | "error" | "preserve" | undefined
+  readonly onExcessProperty?: "ignore" | "error" | undefined
+
+  /**
+   * Whether to disable checks while still applying defaults and
+   * transformations.
+   */
+  readonly disableChecks?: boolean | undefined
 
   /**
-   * The `propertyOrder` option provides control over the order of object fields
-   * in the output. This feature is useful when the sequence of keys is
-   * important for the consuming processes or when maintaining the input order
-   * enhances readability and usability.
+   * Controls how many children of a product schema may parse concurrently.
    *
    * **Details**
    *
-   * By default, the `propertyOrder` option is set to `"none"`. This means that
-   * the internal system decides the order of keys to optimize parsing speed.
+   * This option has the same concurrency semantics as {@link Effect.forEach}.
+   * It applies to tuples, arrays, structs, records, and structs with rest. Each
+   * nested product applies the limit independently. Union members remain
+   * sequential, though products inside the current union member still receive
+   * the option.
    *
-   * Setting `propertyOrder` to `"original"` ensures that the keys are ordered
-   * as they appear in the input during the decoding/encoding process.
+   * Array and tuple outputs retain their element order. Other observable work,
+   * including issue accumulation and colliding transformed record keys, follows
+   * effect completion order when concurrency is greater than `1`.
    *
    * **Gotchas**
    *
-   * The key order for `"none"` should not be considered stable and may change
-   * in future updates without notice.
-   *
-   * @default "none"
-   */
-  readonly propertyOrder?: "none" | "original" | undefined
-
-  /**
-   * Whether to disable checks while still applying defaults and
-   * transformations.
-   */
-  readonly disableChecks?: boolean | undefined
-
-  /**
-   * The maximum number of async effects to run concurrently.
+   * With `errors: "first"`, the first observed child failure interrupts the
+   * remaining children and may not belong to the earliest product position.
+   * Concurrent children may perform effects before another child fails.
    *
-   * @default 1
+   * @default undefined
    */
-  readonly concurrency?: number | "unbounded" | undefined
+  readonly concurrency?: Types.Concurrency | undefined
 
   /**
    * Whether schema issues should retain and report rejected input values.
@@ -532,13 +550,12 @@ export interface ParseOptions {
    * Enabling this option can retain or disclose secrets, personally
    * identifiable information, and large object graphs. The `input` field is
    * enumerable and may be included by object enumeration, spread, or
-   * serialization. Disabling it on a nested schema does not redact that value
-   * from an ancestor issue whose input reporting remains enabled. Issues
-   * returned directly by user-defined declarations, checks, transformations,
-   * and middleware are not modified; their authors decide whether to retain an
-   * input. To respect this option, pass the callback's input and parse options
-   * directly to a value-bearing issue constructor. Custom messages and
-   * annotations remain the caller's responsibility regardless of this option.
+   * serialization. Issues returned directly by user-defined declarations,
+   * checks, transformations, and middleware are not modified; their authors
+   * decide whether to retain an input. To respect this option, pass the
+   * callback's input and parse options directly to a value-bearing issue
+   * constructor. Custom messages and annotations remain the caller's
+   * responsibility regardless of this option.
    * Formatting an issue with `SchemaIssue.makeFormatterDefault()`, reading
    * `SchemaError.message`, or formatting a Standard Schema failure can disclose
    * retained input.
@@ -552,7 +569,7 @@ export interface ParseOptions {
 export const defaultParseOptions: ParseOptions = {}
 
 /**
- * Represents per-property metadata attached to AST nodes via {@link Base.context}.
+ * Represents per-property metadata attached to an AST node's `context` field.
  *
  * **Details**
  *
@@ -562,8 +579,8 @@ export const defaultParseOptions: ParseOptions = {}
  *
  * - `isOptional` — the property key may be absent from the input.
  * - `isMutable` — the property is `readonly` when `false`.
- * - `constructorDefault` — a {@link Link} applied during construction to
- *   supply missing values.
+ * - `constructorDefault` — an effect evaluated during construction to supply
+ *   missing values.
  * - `annotations` — key-level annotations (e.g. description of the key
  *   itself).
  *
@@ -572,18 +589,37 @@ export const defaultParseOptions: ParseOptions = {}
  * @category models
  * @since 4.0.0
  */
-export class Context {
+export interface Context {
+  readonly isOptional: boolean
+  readonly isMutable: boolean
+  /** Used for constructor default values (e.g. `withConstructorDefault` API) */
+  readonly constructorDefault: Effect.Effect<unknown, SchemaIssue.Issue> | undefined
+  readonly annotations: Schema.Annotations.Key<unknown> | undefined
+}
+
+/**
+ * Constructs a {@link Context}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Context: new(
+  isOptional: boolean,
+  isMutable: boolean, /** Used for constructor default values (e.g. `withConstructorDefault` API) */
+  constructorDefault?: Effect.Effect<unknown, SchemaIssue.Issue> | undefined,
+  annotations?: Schema.Annotations.Key<unknown> | undefined
+) => Context = class {
   readonly isOptional: boolean
   readonly isMutable: boolean
   /** Used for constructor default values (e.g. `withConstructorDefault` API) */
-  readonly constructorDefault: Link | undefined
+  readonly constructorDefault: Effect.Effect<unknown, SchemaIssue.Issue> | undefined
   readonly annotations: Schema.Annotations.Key<unknown> | undefined
 
   constructor(
     isOptional: boolean,
     isMutable: boolean,
     /** Used for constructor default values (e.g. `withConstructorDefault` API) */
-    constructorDefault: Link | undefined = undefined,
+    constructorDefault: Effect.Effect<unknown, SchemaIssue.Issue> | undefined = undefined,
     annotations: Schema.Annotations.Key<unknown> | undefined = undefined
   ) {
     this.isOptional = isOptional
@@ -594,8 +630,8 @@ export class Context {
 }
 
 /**
- * Non-empty array of validation {@link Check} values attached to an AST node
- * via {@link Base.checks}.
+ * Non-empty array of validation {@link Check} values attached to an AST node's
+ * `checks` field.
  *
  * **Details**
  *
@@ -611,28 +647,17 @@ export class Context {
 export type Checks = readonly [Check<any>, ...Array<Check<any>>]
 
 const TypeId = "~effect/Schema"
+interface ASTNode {
+  readonly [TypeId]: typeof TypeId
+  readonly _tag: string
+  readonly annotations: Schema.Annotations.Annotations | undefined
+  readonly checks: Checks | undefined
+  readonly encoding: Encoding | undefined
+  readonly context: Context | undefined
+  toString(): string
+}
 
-/**
- * Represents the abstract base class for all {@link AST} node variants.
- *
- * **Details**
- *
- * Every AST node extends `Base` and inherits these fields:
- *
- * - `annotations` — user-supplied metadata (identifier, title, description,
- *   arbitrary keys).
- * - `checks` — optional {@link Checks} for post-type-match validation.
- * - `encoding` — optional {@link Encoding} chain for type ↔ wire
- *   transformations.
- * - `context` — optional {@link Context} for per-property metadata.
- *
- * Subclasses add a `_tag` discriminant and variant-specific data.
- *
- * @see {@link AST}
- * @category models
- * @since 4.0.0
- */
-export abstract class Base {
+abstract class ASTNodeImpl implements ASTNode {
   readonly [TypeId] = TypeId
   abstract readonly _tag: string
   readonly annotations: Schema.Annotations.Annotations | undefined
@@ -656,15 +681,9 @@ export abstract class Base {
   }
 }
 
-/**
- * Parser factory carried by a {@link Declaration}.
- *
- * @category models
- * @since 4.0.0
- */
-export type DeclarationRun = (
+type DeclarationRun = (
   typeParameters: ReadonlyArray<AST>
-) => (input: unknown, self: Declaration, options: ParseOptions) => Effect.Effect<any, SchemaIssue.Issue, any>
+) => (input: unknown, self: Declaration, options: ParseOptions) => Effect.Effect<any, SchemaIssue.Issue>
 
 /**
  * AST node for user-defined opaque types with custom parsing logic.
@@ -679,20 +698,60 @@ export type DeclarationRun = (
  * - `typeParameters` — inner schemas this declaration is parameterized over
  *   (e.g. the element type for a custom collection).
  * - `run` — factory that receives `typeParameters` and returns a parser that
- *   validates or transforms raw input.
+ *   validates or transforms raw input. The `Effect` returned by the parser must
+ *   complete synchronously.
  *
  * @see {@link isDeclaration}
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
-export class Declaration extends Base {
+export interface Declaration extends ASTNode {
+  readonly _tag: "Declaration"
+  readonly typeParameters: ReadonlyArray<AST>
+  readonly run: DeclarationRun
+  readonly encodingChecks: Checks | undefined
+  /**
+   * Parser factory {@link flip} swaps in, so a declaration can behave
+   * differently when encoding. `undefined` reuses `run`.
+   */
+  readonly encodingRun: DeclarationRun | undefined
+  /** @internal */
+
+  getParser(): SchemaParser.Parser
+  /** @internal */
+
+  recur(recur: (ast: AST) => AST): Declaration
+  /** @internal */
+
+  flip(recur: (ast: AST) => AST): Declaration
+  /** @internal */
+
+  getExpected(): string
+}
+
+/**
+ * Constructs a {@link Declaration}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Declaration: new(
+  typeParameters: ReadonlyArray<AST>,
+  run: DeclarationRun,
+  annotations?: Schema.Annotations.Annotations,
+  checks?: Checks,
+  encoding?: Encoding,
+  context?: Context,
+  encodingChecks?: Checks,
+  encodingRun?: DeclarationRun
+) => Declaration = class extends ASTNodeImpl {
   readonly _tag = "Declaration"
   readonly typeParameters: ReadonlyArray<AST>
   readonly run: DeclarationRun
   readonly encodingChecks: Checks | undefined
   /**
    * Parser factory {@link flip} swaps in, so a declaration can behave
-   * differently when encoding. `undefined` reuses {@link run}.
+   * differently when encoding. `undefined` reuses `run`.
    */
   readonly encodingRun: DeclarationRun | undefined
 
@@ -761,7 +820,28 @@ export class Declaration extends Base {
  * @category models
  * @since 4.0.0
  */
-export class Null extends Base {
+export interface Null extends ASTNode {
+  readonly _tag: "Null"
+  /** @internal */
+
+  getParser(): SchemaParser.Parser
+  /** @internal */
+
+  getExpected(): string
+}
+
+/**
+ * Constructs a {@link Null}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Null: new(
+  annotations?: Schema.Annotations.Annotations | undefined,
+  checks?: Checks | undefined,
+  encoding?: Encoding | undefined,
+  context?: Context | undefined
+) => Null = class extends ASTNodeImpl {
   readonly _tag = "Null"
   /** @internal */
   getParser() {
@@ -801,7 +881,31 @@ export {
  * @category models
  * @since 4.0.0
  */
-export class Undefined extends Base {
+export interface Undefined extends ASTNode {
+  readonly _tag: "Undefined"
+  /** @internal */
+
+  getParser(): SchemaParser.Parser
+  /** @internal */
+
+  toCodecJson(): AST
+  /** @internal */
+
+  getExpected(): string
+}
+
+/**
+ * Constructs a {@link Undefined}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Undefined: new(
+  annotations?: Schema.Annotations.Annotations | undefined,
+  checks?: Checks | undefined,
+  encoding?: Encoding | undefined,
+  context?: Context | undefined
+) => Undefined = class extends ASTNodeImpl {
   readonly _tag = "Undefined"
   /** @internal */
   getParser() {
@@ -861,7 +965,33 @@ export {
  * @category models
  * @since 4.0.0
  */
-export class Void extends Base {
+export interface Void extends ASTNode {
+  readonly _tag: "Void"
+  /** @internal */
+
+  getParser(): (
+    input: unknown
+  ) => InternalParser.Success<undefined, never> | InternalParser.Success<typeof InternalParser.missing, never>
+  /** @internal */
+
+  toCodecJson(): AST
+  /** @internal */
+
+  getExpected(): string
+}
+
+/**
+ * Constructs a {@link Void}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Void: new(
+  annotations?: Schema.Annotations.Annotations | undefined,
+  checks?: Checks | undefined,
+  encoding?: Encoding | undefined,
+  context?: Context | undefined
+) => Void = class extends ASTNodeImpl {
   readonly _tag = "Void"
   /** @internal */
   getParser() {
@@ -916,7 +1046,28 @@ export {
  * @category models
  * @since 4.0.0
  */
-export class Never extends Base {
+export interface Never extends ASTNode {
+  readonly _tag: "Never"
+  /** @internal */
+
+  getParser(): SchemaParser.Parser
+  /** @internal */
+
+  getExpected(): string
+}
+
+/**
+ * Constructs a {@link Never}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Never: new(
+  annotations?: Schema.Annotations.Annotations | undefined,
+  checks?: Checks | undefined,
+  encoding?: Encoding | undefined,
+  context?: Context | undefined
+) => Never = class extends ASTNodeImpl {
   readonly _tag = "Never"
   /** @internal */
   getParser() {
@@ -953,7 +1104,28 @@ export const never = new Never()
  * @category models
  * @since 4.0.0
  */
-export class Any extends Base {
+export interface Any extends ASTNode {
+  readonly _tag: "Any"
+  /** @internal */
+
+  getParser(): SchemaParser.Parser
+  /** @internal */
+
+  getExpected(): string
+}
+
+/**
+ * Constructs a {@link Any}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Any: new(
+  annotations?: Schema.Annotations.Annotations | undefined,
+  checks?: Checks | undefined,
+  encoding?: Encoding | undefined,
+  context?: Context | undefined
+) => Any = class extends ASTNodeImpl {
   readonly _tag = "Any"
   /** @internal */
   getParser() {
@@ -993,7 +1165,28 @@ export const any = new Any()
  * @category models
  * @since 4.0.0
  */
-export class Unknown extends Base {
+export interface Unknown extends ASTNode {
+  readonly _tag: "Unknown"
+  /** @internal */
+
+  getParser(): SchemaParser.Parser
+  /** @internal */
+
+  getExpected(): string
+}
+
+/**
+ * Constructs a {@link Unknown}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Unknown: new(
+  annotations?: Schema.Annotations.Annotations | undefined,
+  checks?: Checks | undefined,
+  encoding?: Encoding | undefined,
+  context?: Context | undefined
+) => Unknown = class extends ASTNodeImpl {
   readonly _tag = "Unknown"
   /** @internal */
   getParser() {
@@ -1028,9 +1221,30 @@ export const unknown = new Unknown()
  * @see {@link isObjectKeyword}
  *
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
+ */
+export interface ObjectKeyword extends ASTNode {
+  readonly _tag: "ObjectKeyword"
+  /** @internal */
+
+  getParser(): SchemaParser.Parser
+  /** @internal */
+
+  getExpected(): string
+}
+
+/**
+ * Constructs a {@link ObjectKeyword}.
+ *
+ * @category constructors
+ * @since 4.0.0
  */
-export class ObjectKeyword extends Base {
+export const ObjectKeyword: new(
+  annotations?: Schema.Annotations.Annotations | undefined,
+  checks?: Checks | undefined,
+  encoding?: Encoding | undefined,
+  context?: Context | undefined
+) => ObjectKeyword = class extends ASTNodeImpl {
   readonly _tag = "ObjectKeyword"
   /** @internal */
   getParser() {
@@ -1070,7 +1284,43 @@ export const objectKeyword = new ObjectKeyword()
  * @category models
  * @since 4.0.0
  */
-export class Enum extends Base {
+export interface Enum extends ASTNode {
+  readonly _tag: "Enum"
+  readonly enums: ReadonlyArray<
+    readonly [
+      string,
+      string | number
+    ]
+  >
+  /** @internal */
+
+  getParser(): SchemaParser.Parser
+  /** @internal */
+
+  toCodecStringTree(): AST
+  /** @internal */
+
+  getExpected(): string
+}
+
+/**
+ * Constructs a {@link Enum}. Numeric values must be finite.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Enum: new(
+  enums: ReadonlyArray<
+    readonly [
+      string,
+      string | number
+    ]
+  >,
+  annotations?: Schema.Annotations.Annotations,
+  checks?: Checks,
+  encoding?: Encoding,
+  context?: Context
+) => Enum = class extends ASTNodeImpl {
   readonly _tag = "Enum"
   readonly enums: ReadonlyArray<readonly [string, string | number]>
 
@@ -1082,6 +1332,11 @@ export class Enum extends Base {
     context?: Context
   ) {
     super(annotations, checks, encoding, context)
+    for (const [, value] of enums) {
+      if (typeof value === "number" && !globalThis.Number.isFinite(value)) {
+        throw new Error(`A numeric enum value must be finite, got ${format(value)}`)
+      }
+    }
     this.enums = enums
   }
   /** @internal */
@@ -1098,7 +1353,7 @@ export class Enum extends Base {
       const coercions = Object.fromEntries(this.enums.map(([_, v]) => [globalThis.String(v), v]))
       return replaceEncoding(this, [
         new Link(
-          new Union(Object.keys(coercions).map((k) => new Literal(k)), "anyOf"),
+          new Union(Object.keys(coercions).map((k) => new Literal(k))),
           new SchemaTransformation.Transformation(
             SchemaGetter.transform((s) => coercions[s]),
             SchemaGetter.String()
@@ -1122,20 +1377,46 @@ type TemplateLiteralPart =
   | TemplateLiteral
   | Union<TemplateLiteralPart>
 
-function isTemplateLiteralPart(ast: AST): ast is TemplateLiteralPart {
+function formatTemplateLiteralPath(path: string | number): string {
+  return typeof path === "number" ? `parts[${path}]` : path
+}
+
+function isTemplateLiteralPart(
+  ast: AST,
+  path: string | number,
+  validated: Set<AST>
+): ast is TemplateLiteralPart {
+  if (validated.has(ast)) return true
+  if (ast.encoding) {
+    throw new Error(`TemplateLiteral parts cannot have an encoding at ${formatTemplateLiteralPath(path)}`)
+  }
+  let valid: boolean
   switch (ast._tag) {
     case "String":
     case "Number":
     case "BigInt":
-      return true
+      valid = true
+      break
     case "Literal":
-    case "TemplateLiteral":
-      return !ast.checks
-    case "Union":
-      return !ast.checks && ast.types.every(isTemplateLiteralPart)
+      valid = !ast.checks
+      break
+    case "TemplateLiteral": {
+      const currentPath = formatTemplateLiteralPath(path)
+      valid = !ast.checks &&
+        ast.parts.every((part, index) => isTemplateLiteralPart(part, `${currentPath}.parts[${index}]`, validated))
+      break
+    }
+    case "Union": {
+      const currentPath = formatTemplateLiteralPath(path)
+      valid = !ast.checks &&
+        ast.types.every((part, index) => isTemplateLiteralPart(part, `${currentPath}.types[${index}]`, validated))
+      break
+    }
     default:
       return false
   }
+  if (valid) validated.add(ast)
+  return valid
 }
 
 /**
@@ -1149,9 +1430,46 @@ function isTemplateLiteralPart(ast: AST): ast is TemplateLiteralPart {
  *
  * @see {@link isTemplateLiteral}
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
-export class TemplateLiteral extends Base {
+export interface TemplateLiteral extends ASTNode {
+  readonly _tag: "TemplateLiteral"
+  readonly parts: ReadonlyArray<AST>
+  /** @internal */
+  readonly encodedParts: ReadonlyArray<TemplateLiteralPart>
+  /** @internal */
+  readonly literals: ReadonlyArray<string | undefined>
+  /** @internal */
+  readonly suffixLengths: ReadonlyArray<number>
+  /** @internal */
+
+  getParser(compile: SchemaParser.Compiler): SchemaParser.Parser
+  /** @internal */
+
+  getExpected(): string
+  /** @internal */
+
+  matchPart(s: string, options: ParseOptions): string | undefined
+}
+
+/**
+ * Constructs a {@link TemplateLiteral}.
+ *
+ * **Gotchas**
+ *
+ * Throws if a part contains an encoding, including inside unions or nested
+ * template literals. Parts must describe their values without transformations.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const TemplateLiteral: new(
+  parts: ReadonlyArray<AST>,
+  annotations?: Schema.Annotations.Annotations,
+  checks?: Checks,
+  encoding?: Encoding,
+  context?: Context
+) => TemplateLiteral = class extends ASTNodeImpl {
   readonly _tag = "TemplateLiteral"
   readonly parts: ReadonlyArray<AST>
   /** @internal */
@@ -1171,14 +1489,14 @@ export class TemplateLiteral extends Base {
     super(annotations, checks, encoding, context)
     const encodedParts: Array<TemplateLiteralPart> = []
     const literals: Array<string | undefined> = []
-    for (const part of parts) {
-      const encoded = toEncoded(part)
-      if (isTemplateLiteralPart(encoded)) {
-        encodedParts.push(encoded)
-        literals.push(encoded._tag === "Literal" ? globalThis.String(encoded.literal) : undefined)
-      } else {
-        throw new Error(`Invalid TemplateLiteral part ${encoded._tag}`)
+    const validated = new Set<AST>()
+    for (let index = 0; index < parts.length; index++) {
+      const part = parts[index]
+      if (!isTemplateLiteralPart(part, index, validated)) {
+        throw new Error(`Invalid TemplateLiteral part ${part._tag}`)
       }
+      encodedParts.push(part)
+      literals.push(part._tag === "Literal" ? globalThis.String(part.literal) : undefined)
     }
     const suffixLengths = new Array<number>(encodedParts.length + 1)
     suffixLengths[encodedParts.length] = 0
@@ -1192,7 +1510,8 @@ export class TemplateLiteral extends Base {
   }
   /** @internal */
   getParser(compile: SchemaParser.Compiler): SchemaParser.Parser {
-    const parser = compile(this.asTemplateLiteralParser())
+    const tuple = new Arrays(false, this.parts.map(partFromString), [])
+    const parser = compile(decodeTo(string, tuple, templateLiteralTransformation(this)))
     return (input, options) => {
       if (input === InternalParser.missing) return InternalParser.missingExit
       const result = parser(input, options)
@@ -1213,28 +1532,46 @@ export class TemplateLiteral extends Base {
   matchPart(s: string, options: ParseOptions): string | undefined {
     return segmentTemplateLiteralParts(this, s, options) === undefined ? undefined : s
   }
-  /** @internal */
-  asTemplateLiteralParser(): Arrays {
-    const tuple = new Arrays(false, this.parts.map(partFromString), [])
-    return decodeTo(
-      string,
-      tuple,
-      new SchemaTransformation.Transformation(
-        SchemaGetter.transformOrFail((s: string, options) => {
-          const segments = segmentTemplateLiteralParts(this, s, options)
-          if (segments) return Effect.succeed(segments)
-          return Effect.fail(
-            new SchemaIssue.InvalidValue(
-              { expected: "a string matching template literal parts" },
-              s,
-              options
-            )
-          )
-        }),
-        SchemaGetter.transform((parts) => parts.join(""))
+}
+
+/** @internal */
+export function templateLiteralParser(parts: ReadonlyArray<AST>): Arrays {
+  // Encoded members can overlap even when decoding selects exactly one member.
+  // Match their spellings here; the original tuple enforces the union's mode.
+  const normalize = memoize((encoded: AST): AST => {
+    if (encoded._tag !== "Union") return encoded
+    const types = mapOrSame(encoded.types, normalize)
+    return (encoded.options?.mode ?? "anyOf") === "anyOf" && types === encoded.types
+      ? encoded
+      : new Union(
+        types,
+        encoded.options === undefined ? undefined : { ...encoded.options, mode: "anyOf" },
+        encoded.annotations,
+        encoded.checks,
+        undefined,
+        encoded.context
       )
-    )
-  }
+  })
+  const template = new TemplateLiteral(parts.map((part) => normalize(toEncoded(part))))
+  const tuple = new Arrays(false, parts.map(partFromString), [])
+  return decodeTo(template, tuple, templateLiteralTransformation(template))
+}
+
+function templateLiteralTransformation(template: TemplateLiteral) {
+  return new SchemaTransformation.Transformation(
+    SchemaGetter.transformEffect((s: string, options) => {
+      const segments = segmentTemplateLiteralParts(template, s, options)
+      if (segments) return Effect.succeed(segments)
+      return Effect.fail(
+        new SchemaIssue.InvalidValue(
+          { expected: "a string matching template literal parts" },
+          s,
+          options
+        )
+      )
+    }),
+    SchemaGetter.transform((parts: ReadonlyArray<string>) => parts.join(""))
+  )
 }
 
 /**
@@ -1247,9 +1584,35 @@ export class TemplateLiteral extends Base {
  *
  * @see {@link isUniqueSymbol}
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
+ */
+export interface UniqueSymbol extends ASTNode {
+  readonly _tag: "UniqueSymbol"
+  readonly symbol: symbol
+  /** @internal */
+
+  getParser(): SchemaParser.Parser
+  /** @internal */
+
+  toCodecStringTree(): AST
+  /** @internal */
+
+  getExpected(): string
+}
+
+/**
+ * Constructs a {@link UniqueSymbol}.
+ *
+ * @category constructors
+ * @since 4.0.0
  */
-export class UniqueSymbol extends Base {
+export const UniqueSymbol: new(
+  symbol: symbol,
+  annotations?: Schema.Annotations.Annotations,
+  checks?: Checks,
+  encoding?: Encoding,
+  context?: Context
+) => UniqueSymbol = class extends ASTNodeImpl {
   readonly _tag = "UniqueSymbol"
   readonly symbol: symbol
 
@@ -1269,7 +1632,13 @@ export class UniqueSymbol extends Base {
   }
   /** @internal */
   toCodecStringTree(): AST {
-    return replaceEncoding(this, [symbolToString])
+    const key = globalThis.Symbol.keyFor(this.symbol)
+    return replaceEncoding(this, [
+      new Link(
+        key === undefined ? never : new Literal(globalThis.String(this.symbol)),
+        symbolToString.transformation
+      )
+    ])
   }
   /** @internal */
   getExpected(): string {
@@ -1294,8 +1663,10 @@ export type LiteralValue = string | number | boolean | bigint
  * **Details**
  *
  * Parsing succeeds only when the input is strictly equal (`===`) to the
- * stored `literal`. Numeric literals must be finite — `Infinity`, `-Infinity`,
- * and `NaN` are rejected at construction time.
+ * stored `literal`, preserving the input value. Both `0` and `-0` are accepted
+ * by either zero literal, and parsing preserves the input's sign. Numeric
+ * literals must be finite. `Infinity`, `-Infinity`, and `NaN` are rejected at
+ * construction time.
  *
  * **Example** (Creating a literal AST)
  *
@@ -1309,9 +1680,41 @@ export type LiteralValue = string | number | boolean | bigint
  * @see {@link LiteralValue}
  * @see {@link isLiteral}
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
-export class Literal extends Base {
+export interface Literal extends ASTNode {
+  readonly _tag: "Literal"
+  readonly literal: LiteralValue
+  /** @internal */
+
+  getParser(): SchemaParser.Parser
+  /** @internal */
+
+  matchPart(s: string, _options: ParseOptions): LiteralValue | undefined
+  /** @internal */
+
+  toCodecJson(): AST
+  /** @internal */
+
+  toCodecStringTree(): AST
+  /** @internal */
+
+  getExpected(): string
+}
+
+/**
+ * Constructs a {@link Literal}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Literal: new(
+  literal: LiteralValue,
+  annotations?: Schema.Annotations.Annotations,
+  checks?: Checks,
+  encoding?: Encoding,
+  context?: Context
+) => Literal = class extends ASTNodeImpl {
   readonly _tag = "Literal"
   readonly literal: LiteralValue
 
@@ -1372,7 +1775,31 @@ function literalToString(ast: Literal): Literal {
  * @category models
  * @since 4.0.0
  */
-export class String extends Base {
+export interface String extends ASTNode {
+  readonly _tag: "String"
+  /** @internal */
+
+  getParser(): SchemaParser.Parser
+  /** @internal */
+
+  matchPart(s: string, options: ParseOptions): string | undefined
+  /** @internal */
+
+  getExpected(): string
+}
+
+/**
+ * Constructs a {@link String}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const String: new(
+  annotations?: Schema.Annotations.Annotations | undefined,
+  checks?: Checks | undefined,
+  encoding?: Encoding | undefined,
+  context?: Context | undefined
+) => String = class extends ASTNodeImpl {
   readonly _tag = "String"
   /** @internal */
   getParser() {
@@ -1423,7 +1850,40 @@ export const string = new String()
  * @category models
  * @since 4.0.0
  */
-export class Number extends Base {
+export interface Number extends ASTNode {
+  readonly _tag: "Number"
+  /** @internal */
+
+  getParser(): SchemaParser.Parser
+  /** @internal */
+
+  matchKey(s: string, options: ParseOptions): number | undefined
+  /** @internal */
+
+  matchPart(s: string, options: ParseOptions): number | undefined
+  /** @internal */
+
+  toCodecJson(): AST
+  /** @internal */
+
+  toCodecStringTree(): AST
+  /** @internal */
+
+  getExpected(): string
+}
+
+/**
+ * Constructs a {@link Number}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Number: new(
+  annotations?: Schema.Annotations.Annotations | undefined,
+  checks?: Checks | undefined,
+  encoding?: Encoding | undefined,
+  context?: Context | undefined
+) => Number = class extends ASTNodeImpl {
   readonly _tag = "Number"
   /** @internal */
   getParser() {
@@ -1498,7 +1958,28 @@ export const number = new Number()
  * @category models
  * @since 4.0.0
  */
-export class Boolean extends Base {
+export interface Boolean extends ASTNode {
+  readonly _tag: "Boolean"
+  /** @internal */
+
+  getParser(): SchemaParser.Parser
+  /** @internal */
+
+  getExpected(): string
+}
+
+/**
+ * Constructs a {@link Boolean}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Boolean: new(
+  annotations?: Schema.Annotations.Annotations | undefined,
+  checks?: Checks | undefined,
+  encoding?: Encoding | undefined,
+  context?: Context | undefined
+) => Boolean = class extends ASTNodeImpl {
   readonly _tag = "Boolean"
   /** @internal */
   getParser() {
@@ -1544,7 +2025,34 @@ export const boolean = new Boolean()
  * @category models
  * @since 4.0.0
  */
-export class Symbol extends Base {
+export interface Symbol extends ASTNode {
+  readonly _tag: "Symbol"
+  /** @internal */
+
+  getParser(): SchemaParser.Parser
+  /** @internal */
+
+  matchKey(s: symbol, options: ParseOptions): symbol | undefined
+  /** @internal */
+
+  toCodecStringTree(): AST
+  /** @internal */
+
+  getExpected(): string
+}
+
+/**
+ * Constructs a {@link Symbol}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Symbol: new(
+  annotations?: Schema.Annotations.Annotations | undefined,
+  checks?: Checks | undefined,
+  encoding?: Encoding | undefined,
+  context?: Context | undefined
+) => Symbol = class extends ASTNodeImpl {
   readonly _tag = "Symbol"
   /** @internal */
   getParser() {
@@ -1598,7 +2106,34 @@ export const symbol = new Symbol()
  * @category models
  * @since 4.0.0
  */
-export class BigInt extends Base {
+export interface BigInt extends ASTNode {
+  readonly _tag: "BigInt"
+  /** @internal */
+
+  getParser(): SchemaParser.Parser
+  /** @internal */
+
+  matchPart(s: string, options: ParseOptions): bigint | undefined
+  /** @internal */
+
+  toCodecStringTree(): AST
+  /** @internal */
+
+  getExpected(): string
+}
+
+/**
+ * Constructs a {@link BigInt}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const BigInt: new(
+  annotations?: Schema.Annotations.Annotations | undefined,
+  checks?: Checks | undefined,
+  encoding?: Encoding | undefined,
+  context?: Context | undefined
+) => BigInt = class extends ASTNodeImpl {
   readonly _tag = "BigInt"
   /** @internal */
   getParser() {
@@ -1648,7 +2183,7 @@ export const bigInt = new BigInt()
  * **Details**
  *
  * - `elements` — positional element types (tuple elements). An element is
- *   optional if its {@link Context.isOptional} is `true`.
+ *   optional if its context's `isOptional` field is `true`.
  * - `rest` — the rest/variadic element types. When non-empty, the first
  *   entry is the "spread" type (e.g. `...Array<string>`), and subsequent
  *   entries are trailing positional elements after the spread.
@@ -1679,7 +2214,45 @@ export const bigInt = new BigInt()
  * @category models
  * @since 4.0.0
  */
-export class Arrays extends Base {
+export interface Arrays extends ASTNode {
+  readonly _tag: "Arrays"
+  readonly isMutable: boolean
+  readonly elements: ReadonlyArray<AST>
+  readonly rest: ReadonlyArray<AST>
+  readonly encodingChecks: Checks | undefined
+  /** @internal */
+
+  getParser(
+    compile: SchemaParser.Compiler,
+    compileField?: SchemaParser.Compiler
+  ): SchemaParser.Parser
+  /** @internal */
+
+  recur(recur: (ast: AST) => AST): Arrays
+  /** @internal */
+
+  flip(recur: (ast: AST) => AST): Arrays
+  /** @internal */
+
+  getExpected(): string
+}
+
+/**
+ * Constructs a {@link Arrays}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Arrays: new(
+  isMutable: boolean,
+  elements: ReadonlyArray<AST>,
+  rest: ReadonlyArray<AST>,
+  annotations?: Schema.Annotations.Annotations,
+  checks?: Checks,
+  encoding?: Encoding,
+  context?: Context,
+  encodingChecks?: Checks
+) => Arrays = class extends ASTNodeImpl {
   readonly _tag = "Arrays"
   readonly isMutable: boolean
   readonly elements: ReadonlyArray<AST>
@@ -1724,7 +2297,7 @@ export class Arrays extends Base {
   /** @internal */
   getParser(
     compile: SchemaParser.Compiler,
-    compileConstructorDefault: SchemaParser.Compiler = compile
+    compileField: SchemaParser.Compiler = compile
   ): SchemaParser.Parser {
     // oxlint-disable-next-line @typescript-eslint/no-this-alias
     const ast = this
@@ -1756,8 +2329,8 @@ export class Arrays extends Base {
         return yield* Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
       }
       if (!elements) {
-        elements = ast.elements.map((ast) => ({ ast, parser: compileConstructorDefault(ast) }))
-        rest = ast.rest.map((ast) => ({ ast, parser: compileConstructorDefault(ast) }))
+        elements = ast.elements.map((ast) => ({ ast, parser: compileField(ast) }))
+        rest = ast.rest.map((ast) => ({ ast, parser: compileField(ast) }))
       }
 
       const len = input.length
@@ -1771,11 +2344,11 @@ export class Arrays extends Base {
         issues: undefined as Arr.NonEmptyArray<SchemaIssue.Issue> | undefined,
         options
       }
-      const concurrency = resolveConcurrency(options?.concurrency)
-      const eff = parseArray(state, input, {
-        concurrency: concurrency?.concurrency,
-        end: ast.rest.length === 0 ? elementLen : Math.max(len, elementLen + tailLen)
-      })
+      const end = ast.rest.length === 0 ? elementLen : Math.max(len, elementLen + tailLen)
+      const concurrency = options.concurrency === undefined ? 1 : resolveConcurrency(options.concurrency)
+      const eff = concurrency === 1
+        ? parseArray(state, input, 0, end)
+        : parseArrayConcurrent(state, input, { concurrency, end })
       if (eff) yield* eff
 
       // ---------------------------------------------
@@ -1833,9 +2406,10 @@ export class Arrays extends Base {
     return "array"
   }
 }
-const parseArray = iterateEager<{
+
+type ArrayParserState = {
   readonly ast: AST
-  readonly input: unknown
+  readonly input: ReadonlyArray<unknown>
   readonly len: number
   readonly getParser: (
     tailThreshold: number,
@@ -1844,42 +2418,51 @@ const parseArray = iterateEager<{
   readonly tailThreshold: number
   readonly options: ParseOptions
   readonly output: Array<unknown>
-  issues: Array<SchemaIssue.Issue> | undefined
-}, unknown>()({
-  onItem(s, item, i) {
-    const value = i < s.len ? item : InternalParser.missing
-    return s.getParser(s.tailThreshold, i).parser(value, s.options)
-  },
-  step(s, item, exit, i) {
-    if (exit._tag === "Failure") {
-      return wrapPropertyKeyIssue(s, s.ast, i, exit)
-    }
-    const value = exit === InternalParser.sameExit
-      ? item
-      : (exit as InternalParser.Success<unknown, SchemaIssue.Issue>)[InternalParser.args]
-    if (value !== InternalParser.missing) {
-      s.output[i] = value
+  issues: Arr.NonEmptyArray<SchemaIssue.Issue> | undefined
+}
+
+/** @internal */
+export function stepArray(
+  s: ArrayParserState,
+  item: unknown,
+  exit: Exit.Exit<unknown, SchemaIssue.Issue>,
+  i: number
+) {
+  if (exit._tag === "Failure") {
+    return wrapPropertyKeyIssue(s, s.ast, i, exit)
+  }
+  const value = exit === InternalParser.sameExit
+    ? item
+    : (exit as InternalParser.Success<unknown, SchemaIssue.Issue>)[InternalParser.args]
+  if (value !== InternalParser.missing) {
+    s.output[i] = value
+  } else {
+    const p = s.getParser(s.tailThreshold, i)
+    if (isOptional(p.ast)) return
+    const issue = new SchemaIssue.Pointer([i], new SchemaIssue.MissingKey(p.ast.context?.annotations))
+    if (s.options.errors === "all") {
+      if (s.issues) s.issues.push(issue)
+      else s.issues = [issue]
     } else {
-      const p = s.getParser(s.tailThreshold, i)
-      if (isOptional(p.ast)) return
-      const issue = new SchemaIssue.Pointer([i], new SchemaIssue.MissingKey(p.ast.context?.annotations))
-      if (s.options.errors === "all") {
-        if (s.issues) s.issues.push(issue)
-        else s.issues = [issue]
-      } else {
-        return Exit.fail(
-          new SchemaIssue.Composite(s.ast, [issue], s.input, s.options)
-        )
-      }
+      return Exit.fail(
+        new SchemaIssue.Composite(s.ast, [issue], s.input, s.options)
+      )
     }
   }
-})
+}
 
-const resolveConcurrency = (value: number | "unbounded" | undefined) => {
-  value = value === "unbounded" ? Infinity : value ?? 1
-  return value > 1 ? { concurrency: value } : undefined
+const parseArrayOptions = {
+  onItem(s: ArrayParserState, item: unknown, i: number) {
+    const value = i < s.len ? item : InternalParser.missing
+    return s.getParser(s.tailThreshold, i).parser(value, s.options)
+  },
+  step: stepArray
 }
 
+/** @internal */
+export const parseArray = iterateEager<ArrayParserState, unknown>()(parseArrayOptions)
+const parseArrayConcurrent = iterateConcurrent<ArrayParserState, unknown>()(parseArrayOptions)
+
 const wrapPropertyKeyIssue = (
   s: {
     readonly input: unknown
@@ -1968,9 +2551,20 @@ export function getIndexSignatureKeys(
  *
  * @see {@link Objects}
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
+ */
+export interface PropertySignature {
+  readonly name: PropertyKey
+  readonly type: AST
+}
+
+/**
+ * Constructs a {@link PropertySignature}.
+ *
+ * @category constructors
+ * @since 4.0.0
  */
-export class PropertySignature {
+export const PropertySignature: new(name: PropertyKey, type: AST) => PropertySignature = class {
   readonly name: PropertyKey
   readonly type: AST
 
@@ -2004,8 +2598,23 @@ function isIndexSignatureParameterSide(ast: AST): ast is IndexSignatureParameter
   }
 }
 
+function isIndexSignatureParameterEncodedSide(ast: AST): boolean {
+  const encoded = getLastEncoding(ast)
+  switch (encoded._tag) {
+    case "String":
+    case "Number":
+    case "Symbol":
+    case "TemplateLiteral":
+      return true
+    case "Union":
+      return encoded.types.every(isIndexSignatureParameterEncodedSide)
+    default:
+      return false
+  }
+}
+
 function isIndexSignatureParameter(ast: AST): ast is IndexSignatureParameter {
-  return isIndexSignatureParameterSide(ast) && isIndexSignatureParameterSide(toEncoded(ast))
+  return isIndexSignatureParameterSide(ast) && isIndexSignatureParameterEncodedSide(ast)
 }
 
 /**
@@ -2030,9 +2639,20 @@ function isIndexSignatureParameter(ast: AST): ast is IndexSignatureParameter {
  * @see {@link Objects}
  * @see {@link PropertySignature}
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
+ */
+export interface IndexSignature {
+  readonly parameter: IndexSignatureParameter
+  readonly type: AST
+}
+
+/**
+ * Constructs a {@link IndexSignature}.
+ *
+ * @category constructors
+ * @since 4.0.0
  */
-export class IndexSignature {
+export const IndexSignature: new(parameter: AST, type: AST) => IndexSignature = class {
   readonly parameter: IndexSignatureParameter
   readonly type: AST
 
@@ -2093,7 +2713,43 @@ export class IndexSignature {
  * @category models
  * @since 4.0.0
  */
-export class Objects extends Base {
+export interface Objects extends ASTNode {
+  readonly _tag: "Objects"
+  readonly propertySignatures: ReadonlyArray<PropertySignature>
+  readonly indexSignatures: ReadonlyArray<IndexSignature>
+  readonly encodingChecks: Checks | undefined
+  /** @internal */
+
+  getParser(
+    compile: SchemaParser.Compiler,
+    compileField?: SchemaParser.Compiler
+  ): SchemaParser.Parser
+  /** @internal */
+
+  flip(recur: (ast: AST) => AST): AST
+  /** @internal */
+
+  recur(recur: (ast: AST) => AST, recurParameter?: (ast: AST) => AST): AST
+  /** @internal */
+
+  getExpected(): string
+}
+
+/**
+ * Constructs a {@link Objects}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Objects: new(
+  propertySignatures: ReadonlyArray<PropertySignature>,
+  indexSignatures: ReadonlyArray<IndexSignature>,
+  annotations?: Schema.Annotations.Annotations,
+  checks?: Checks,
+  encoding?: Encoding,
+  context?: Context,
+  encodingChecks?: Checks
+) => Objects = class extends ASTNodeImpl {
   readonly _tag = "Objects"
   readonly propertySignatures: ReadonlyArray<PropertySignature>
   readonly indexSignatures: ReadonlyArray<IndexSignature>
@@ -2114,7 +2770,16 @@ export class Objects extends Base {
     this.encodingChecks = encodingChecks
 
     // Duplicate property signatures
-    const duplicates = propertySignatures.map((ps) => ps.name).filter((name, i, arr) => arr.indexOf(name) !== i)
+    const seen = new Set<PropertyKey>()
+    const duplicates: Array<PropertyKey> = []
+    for (const propertySignature of propertySignatures) {
+      const name = propertySignature.name
+      if (seen.has(name)) {
+        duplicates.push(name)
+      } else {
+        seen.add(name)
+      }
+    }
     if (duplicates.length > 0) {
       throw new Error(`Duplicate identifiers: ${JSON.stringify(duplicates)}. ts(2300)`)
     }
@@ -2122,13 +2787,13 @@ export class Objects extends Base {
   /** @internal */
   getParser(
     compile: SchemaParser.Compiler,
-    compileConstructorDefault: SchemaParser.Compiler = compile
+    compileField: SchemaParser.Compiler = compile
   ): SchemaParser.Parser {
     // oxlint-disable-next-line @typescript-eslint/no-this-alias
     const ast = this
     const expectedKeys: Array<PropertyKey> = []
     for (const ps of ast.propertySignatures) {
-      expectedKeys.push(ps.name)
+      expectedKeys.push(typeof ps.name === "number" ? globalThis.String(ps.name) : ps.name)
     }
     const hasProperties = expectedKeys.length
     const indexCount = ast.indexSignatures.length
@@ -2163,7 +2828,10 @@ export class Objects extends Base {
         ? inputValue
         : (exitValue as InternalParser.Success<unknown, SchemaIssue.Issue>)[InternalParser.args]
       if (k2 !== InternalParser.missing && value !== InternalParser.missing) {
-        if (hasProperties && (expectedKeysSet!.has(key) || expectedKeysSet!.has(k2))) return Exit.void
+        if (
+          hasProperties &&
+          (expectedKeysSet!.has(key) || expectedKeysSet!.has(typeof k2 === "number" ? globalThis.String(k2) : k2))
+        ) return Exit.void
         InternalRecord.assignProperty(s.out, k2, value)
       }
       return Exit.void
@@ -2204,17 +2872,17 @@ export class Objects extends Base {
         ? finishIndex(s, key, key, inputValue, result)
         : Effect.flatMap(Effect.exit(result), (exit) => finishIndex(s, key, key, inputValue, exit))
     }
-    const parseIndexes = indexCount ?
-      iterateEager<ObjectParserState, [key: PropertyKey, index: Index]>()({
-        onItem: (s, [key, index]) => parseIndex(s, key, index),
-        step: (_s, _, exit: Exit.Exit<void, SchemaIssue.Issue>) => exit._tag === "Failure" ? exit : undefined
-      }) :
-      undefined
-
+    const parseIndexes = indexCount
+      ? iterateConcurrent<ObjectParserState, readonly [key: PropertyKey, index: Index]>()({
+        onItem: (s, [key, index]) =>
+          index.is.parameter === string ? parseStringIndex(s, key, index) : parseIndex(s, key, index),
+        step: (_s, _item, exit) => exit._tag === "Failure" ? exit : undefined
+      })
+      : undefined
     const compileMembers = (): Array<ParsedProperty> => {
       if (!properties) {
         properties = ast.propertySignatures.map((ps) => ({
-          parser: compileConstructorDefault(ps.type),
+          parser: compileField(ps.type),
           name: ps.name,
           type: ps.type
         }))
@@ -2222,7 +2890,7 @@ export class Objects extends Base {
           ? ast.indexSignatures.map((is) => ({
             is,
             parserKey: compile(parameterFromPropertyKey(is.parameter)),
-            parserValue: compileConstructorDefault(is.type)
+            parserValue: compileField(is.type)
           }))
           : undefined
       }
@@ -2251,62 +2919,65 @@ export class Objects extends Base {
       }
       const errorsAllOption = options.errors === "all"
       const onExcessPropertyError = options.onExcessProperty === "error"
-      const onExcessPropertyPreserve = options.onExcessProperty === "preserve"
+      const concurrency = options.concurrency === undefined ? 1 : resolveConcurrency(options.concurrency)
 
       // ---------------------------------------------
       // handle excess properties
       // ---------------------------------------------
-      let inputKeys: Array<PropertyKey> | undefined
-      if (!indexCount && (onExcessPropertyError || onExcessPropertyPreserve)) {
+      const indexKeys = indexCount && onExcessPropertyError
+        ? ast.indexSignatures.map((index) => getIndexSignatureKeys(record, index.parameter, options))
+        : undefined
+      if (onExcessPropertyError) {
         expectedKeysSet ??= new Set(expectedKeys)
-        inputKeys = Reflect.ownKeys(record)
+        const coveredKeys = indexKeys ? new Set(expectedKeysSet) : expectedKeysSet
+        if (indexKeys) {
+          for (const keys of indexKeys) {
+            for (const key of keys) coveredKeys.add(key)
+          }
+        }
+        const inputKeys = Reflect.ownKeys(record)
         for (let i = 0; i < inputKeys.length; i++) {
           const key = inputKeys[i]
-          if (!expectedKeysSet.has(key)) {
+          if (!coveredKeys.has(key)) {
             // key is unexpected
-            if (onExcessPropertyError) {
-              const unexpected = new SchemaIssue.UnexpectedKey(ast, record[key], options)
-              const issue = new SchemaIssue.Pointer([key], unexpected)
-              if (errorsAllOption) {
-                if (state.issues) {
-                  state.issues.push(issue)
-                } else {
-                  state.issues = [issue]
-                }
-                continue
+            const unexpected = new SchemaIssue.UnexpectedKey(ast, record[key], options)
+            const issue = new SchemaIssue.Pointer([key], unexpected)
+            if (errorsAllOption) {
+              if (state.issues) {
+                state.issues.push(issue)
               } else {
-                return yield* Effect.fail(
-                  new SchemaIssue.Composite(ast, [issue], input, options)
-                )
+                state.issues = [issue]
               }
+              continue
             } else {
-              // preserve key
-              InternalRecord.assignProperty(out, key, record[key])
+              return yield* Effect.fail(
+                new SchemaIssue.Composite(ast, [issue], input, options)
+              )
             }
           }
         }
       }
 
-      const concurrency = resolveConcurrency(options?.concurrency)
-
       // ---------------------------------------------
       // handle property signatures
       // ---------------------------------------------
       if (hasProperties) {
-        const eff = parseProperties(state, properties!, concurrency)
+        const eff = concurrency === 1
+          ? parseProperties(state, properties!)
+          : parsePropertiesConcurrent(state, properties!, { concurrency })
         if (eff) yield* eff
       }
 
       // ---------------------------------------------
       // handle index signatures
       // ---------------------------------------------
-      if (indexCount && !concurrency) {
+      if (indexCount && concurrency === 1) {
         for (let i = 0; i < indexCount; i++) {
           const index = indexes![i]
           const parse = index.is.parameter === string ? parseStringIndex : parseIndex
-          const keys = index.is.parameter === string
+          const keys = indexKeys?.[i] ?? (index.is.parameter === string
             ? Object.keys(record)
-            : getIndexSignatureKeys(record, index.is.parameter, options)
+            : getIndexSignatureKeys(record, index.is.parameter, options))
           for (let j = 0; j < keys.length; j++) {
             const eff = parse(state, keys[j], index)
             if (!effectIsExit(eff)) yield* eff
@@ -2314,15 +2985,17 @@ export class Objects extends Base {
           }
         }
       } else if (parseIndexes) {
-        const keyPairs = Arr.empty<[PropertyKey, Index]>()
+        const keyPairs = Arr.empty<readonly [PropertyKey, Index]>()
         for (let i = 0; i < indexCount; i++) {
           const index = indexes![i]
-          const keys = getIndexSignatureKeys(record, index.is.parameter, options)
+          const keys = indexKeys?.[i] ?? (index.is.parameter === string
+            ? Object.keys(record)
+            : getIndexSignatureKeys(record, index.is.parameter, options))
           for (let j = 0; j < keys.length; j++) {
             keyPairs.push([keys[j], index])
           }
         }
-        const eff = parseIndexes(state, keyPairs, concurrency)
+        const eff = parseIndexes(state, keyPairs, { concurrency })
         if (eff) yield* eff
       }
 
@@ -2331,17 +3004,6 @@ export class Objects extends Base {
           new SchemaIssue.Composite(ast, state.issues, input, options)
         )
       }
-      if (options.propertyOrder === "original") {
-        // preserve input keys order
-        const keys = (inputKeys ?? Reflect.ownKeys(record)).concat(expectedKeys)
-        const preserved: Record<PropertyKey, unknown> = {}
-        for (const key of keys) {
-          if (Object.hasOwn(out, key)) {
-            InternalRecord.assignProperty(preserved, key, out[key])
-          }
-        }
-        return preserved
-      }
       return out
     })
 
@@ -2371,8 +3033,7 @@ export class Objects extends Base {
       if (
         options.errors === "all" ||
         options.onExcessProperty !== undefined ||
-        options.propertyOrder === "original" ||
-        options.concurrency !== undefined
+        (options.concurrency !== undefined && resolveConcurrency(options.concurrency) !== 1)
       ) {
         return fallback(input, options)
       }
@@ -2387,7 +3048,7 @@ export class Objects extends Base {
         for (let index = 0; index < props.length; index++) {
           const property = props[index]
           const name = property.name
-          const hasKey = Object.hasOwn(record, name)
+          const hasKey = hasPropertySignature(record, name)
           const value = hasKey ? record[name] : InternalParser.missing
           const exit = property.parser(value, options)
           if (!effectIsExit(exit)) {
@@ -2459,7 +3120,7 @@ type ObjectParserState = {
   readonly input: Record<PropertyKey, unknown>
   readonly options: ParseOptions
   readonly out: Record<PropertyKey, unknown>
-  issues: Array<SchemaIssue.Issue> | undefined
+  issues: Arr.NonEmptyArray<SchemaIssue.Issue> | undefined
 }
 
 type ParsedProperty = {
@@ -2468,7 +3129,8 @@ type ParsedProperty = {
   readonly type: AST
 }
 
-function stepProperty(
+/** @internal */
+export function stepProperty(
   s: ObjectParserState,
   p: ParsedProperty,
   exit: Exit.Exit<unknown, SchemaIssue.Issue>
@@ -2497,9 +3159,9 @@ function stepProperty(
   }
 }
 
-const parseProperties = iterateEager<ObjectParserState, ParsedProperty>()({
-  onItem(s, p) {
-    if (!Object.hasOwn(s.input, p.name)) {
+const parsePropertiesOptions = {
+  onItem(s: ObjectParserState, p: ParsedProperty) {
+    if (!hasPropertySignature(s.input, p.name)) {
       return p.parser(InternalParser.missing, s.options)
     }
     const value = s.input[p.name]
@@ -2507,7 +3169,11 @@ const parseProperties = iterateEager<ObjectParserState, ParsedProperty>()({
     return p.parser(value, s.options)
   },
   step: stepProperty
-})
+}
+
+/** @internal */
+export const parseProperties = iterateEager<ObjectParserState, ParsedProperty>()(parsePropertiesOptions)
+const parsePropertiesConcurrent = iterateConcurrent<ObjectParserState, ParsedProperty>()(parsePropertiesOptions)
 
 function combineChecks(a: Checks | undefined, b: Checks | undefined): Checks | undefined {
   if (!a) return b
@@ -2547,10 +3213,10 @@ export function tuple<Elements extends Schema.Tuple.Elements>(
 /** @internal */
 export function union<Members extends ReadonlyArray<{ readonly ast: AST }>>(
   members: Members,
-  mode: "anyOf" | "oneOf",
+  options: UnionOptions | undefined,
   checks: Checks | undefined
 ): Union<Members[number]["ast"]> {
-  return new Union(members.map(getAST), mode, undefined, checks)
+  return new Union(members.map(getAST), options, undefined, checks)
 }
 
 /** @internal */
@@ -2731,6 +3397,9 @@ type SentinelIndex = Map<PropertyKey, SentinelEntry>
 const candidateIndexCache = new WeakMap<ReadonlyArray<AST>, CandidateIndex>()
 const emptyCandidates: ReadonlyArray<never> = Object.freeze([])
 
+const hasPropertySignature = (input: object, key: PropertyKey): boolean =>
+  key === "__proto__" ? Object.hasOwn(input, key) : key in input
+
 function getIndex(types: ReadonlyArray<AST>): CandidateIndex {
   let index = candidateIndexCache.get(types)
   if (index) return index
@@ -2788,7 +3457,7 @@ function getIndex(types: ReadonlyArray<AST>): CandidateIndex {
     }
     index = (input, isConstructor) => {
       if (Predicate.isObjectKeyword(input)) {
-        const value = Object.hasOwn(input, key) ? (input as any)[key] : undefined
+        const value = hasPropertySignature(input, key) ? (input as any)[key] : undefined
         if (value !== undefined) return candidates.get(value) ?? emptyCandidates
         if (isConstructor) return types
       }
@@ -2820,7 +3489,7 @@ function getIndex(types: ReadonlyArray<AST>): CandidateIndex {
       // discriminated candidate.
       if (commonSentinel) {
         const [key, [byValue]] = commonSentinel
-        const hasKey = Object.hasOwn(input, key)
+        const hasKey = hasPropertySignature(input, key)
         const value = hasKey ? (input as any)[key] : undefined
         if (hasKey && (!isConstructor || value !== undefined)) {
           const match = byValue.get(value)
@@ -2834,7 +3503,7 @@ function getIndex(types: ReadonlyArray<AST>): CandidateIndex {
       // absent and undefined keys as unconstrained and therefore selects every candidate that owns the key.
       if (directKey === undefined) {
         for (const [key, [byValue, all]] of bySentinel) {
-          const hasKey = Object.hasOwn(input, key)
+          const hasKey = hasPropertySignature(input, key)
           const value = hasKey ? (input as any)[key] : undefined
           if (hasKey && (!isConstructor || value !== undefined)) {
             const match = byValue.get(value)
@@ -2849,7 +3518,7 @@ function getIndex(types: ReadonlyArray<AST>): CandidateIndex {
       // Missing keys are neutral. An observed key rejects only selected candidates that own it and do not match.
       for (const [key, [byValue, all]] of bySentinel) {
         if (key === directKey) continue
-        const hasKey = Object.hasOwn(input, key)
+        const hasKey = hasPropertySignature(input, key)
         const value = hasKey ? (input as any)[key] : undefined
         if (hasKey && (!isConstructor || value !== undefined)) {
           const match = byValue.get(value)
@@ -2902,7 +3571,7 @@ export function getCandidates(
  * **Details**
  *
  * - `types` — the member AST nodes.
- * - `mode` — `"anyOf"` succeeds on the first match (like TypeScript unions);
+ * - `options.mode` selects matching behavior. `"anyOf"` succeeds on the first match;
  *   `"oneOf"` requires exactly one member to match (fails if multiple do).
  *
  * During parsing, members are tried in order. An internal candidate index
@@ -2918,23 +3587,70 @@ export function getCandidates(
  * const ast = schema.ast
  *
  * if (SchemaAST.isUnion(ast)) {
- *   [ast.types.length, ast.mode] // => [2, "anyOf"]
+ *   [ast.types.length, ast.options?.mode ?? "anyOf"] // => [2, "anyOf"]
  * }
  * ```
  *
  * @see {@link isUnion}
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
+ */
+export interface Union<A extends AST = AST> extends ASTNode {
+  readonly _tag: "Union"
+  readonly types: ReadonlyArray<A>
+  readonly options: UnionOptions | undefined
+  readonly encodingChecks: Checks | undefined
+  /** @internal */
+
+  getParser(compile: SchemaParser.Compiler, compileField?: SchemaParser.Compiler): SchemaParser.Parser
+  /** @internal */
+
+  recur(recur: (ast: AST) => AST): Union<AST>
+  /** @internal */
+
+  flip(recur: (ast: AST) => AST): Union<AST>
+  /** @internal */
+
+  matchPart(s: string, options: ParseOptions): LiteralValue | undefined
+  /** @internal */
+
+  getExpected(getExpected: (ast: AST) => string): string
+}
+
+/**
+ * Local matching options stored on {@link Union} nodes.
+ *
+ * @category options
+ * @since 4.0.0
  */
-export class Union<A extends AST = AST> extends Base {
+export interface UnionOptions {
+  /** Defaults to `"anyOf"`; `"oneOf"` requires exactly one matching member. */
+  readonly mode?: "anyOf" | "oneOf" | undefined
+}
+
+/**
+ * Constructs a {@link Union}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Union: new<A extends AST = AST>(
+  types: ReadonlyArray<A>,
+  options?: UnionOptions,
+  annotations?: Schema.Annotations.Annotations,
+  checks?: Checks,
+  encoding?: Encoding,
+  context?: Context,
+  encodingChecks?: Checks
+) => Union<A> = class<A extends AST = AST> extends ASTNodeImpl {
   readonly _tag = "Union"
   readonly types: ReadonlyArray<A>
-  readonly mode: "anyOf" | "oneOf"
+  readonly options: UnionOptions | undefined
   readonly encodingChecks: Checks | undefined
 
   constructor(
     types: ReadonlyArray<A>,
-    mode: "anyOf" | "oneOf",
+    options?: UnionOptions,
     annotations?: Schema.Annotations.Annotations,
     checks?: Checks,
     encoding?: Encoding,
@@ -2943,13 +3659,13 @@ export class Union<A extends AST = AST> extends Base {
   ) {
     super(annotations, checks, encoding, context)
     this.types = types
-    this.mode = mode
+    this.options = options
     this.encodingChecks = encodingChecks
   }
   /** @internal */
   getParser(
     compile: SchemaParser.Compiler,
-    compileConstructorDefault?: SchemaParser.Compiler
+    compileField?: SchemaParser.Compiler
   ): SchemaParser.Parser {
     // oxlint-disable-next-line @typescript-eslint/no-this-alias
     const ast = this
@@ -2958,8 +3674,11 @@ export class Union<A extends AST = AST> extends Base {
       if (input === InternalParser.missing) {
         return InternalParser.missingExit
       }
-      const candidates = getCandidates(input, ast.types, compileConstructorDefault !== undefined)
+      const candidates = getCandidates(input, ast.types, compileField !== undefined)
 
+      if (candidates.length === 0) {
+        return Effect.fail(new SchemaIssue.AnyOf(ast, [], input, options))
+      }
       if (candidates.length === 1) {
         const result = compile(candidates[0])(input, options)
         if ((result as Exit.Exit<unknown, SchemaIssue.Issue>)._tag === "Success") return result
@@ -2973,12 +3692,11 @@ export class Union<A extends AST = AST> extends Base {
         compile,
         input,
         out: undefined,
-        successes: ast.mode === "oneOf" ? [] : undefined,
+        successes: ast.options?.mode === "oneOf" ? [] : undefined,
         issues: undefined as Arr.NonEmptyArray<SchemaIssue.Issue> | undefined,
         options
       }
-      const concurrency = resolveConcurrency(options?.concurrency)
-      const eff = parseUnion(state, candidates, concurrency ? { ...concurrency, orderedStep: true } : undefined)
+      const eff = parseUnion(state, candidates)
       if (!eff) {
         if (state.out) return state.out
         return Effect.fail(new SchemaIssue.AnyOf(ast, state.issues ?? [], input, options))
@@ -2990,18 +3708,22 @@ export class Union<A extends AST = AST> extends Base {
       })
     }
   }
-  private _rebuild(recur: (ast: AST) => AST, checks: Checks | undefined, encodingChecks: Checks | undefined) {
+  private _rebuild(
+    recur: (ast: AST) => AST,
+    checks: Checks | undefined,
+    encodingChecks: Checks | undefined
+  ): Union<AST> {
     const types = mapOrSame(this.types, recur)
     return types === this.types && checks === this.checks && encodingChecks === this.encodingChecks ?
       this :
-      new Union(types, this.mode, this.annotations, checks, undefined, this.context, encodingChecks)
+      new Union(types, this.options, this.annotations, checks, undefined, this.context, encodingChecks)
   }
   /** @internal */
-  recur(recur: (ast: AST) => AST) {
+  recur(recur: (ast: AST) => AST): Union<AST> {
     return this._rebuild(recur, this.checks, this.encodingChecks)
   }
   /** @internal */
-  flip(recur: (ast: AST) => AST) {
+  flip(recur: (ast: AST) => AST): Union<AST> {
     return this._rebuild(recur, this.encodingChecks, this.checks)
   }
   /** @internal */
@@ -3102,7 +3824,7 @@ const nonFiniteLiterals = new Union([
   new Literal("Infinity"),
   new Literal("-Infinity"),
   new Literal("NaN")
-], "anyOf")
+])
 
 function formatIsMutable(isMutable: boolean | undefined): string {
   return isMutable ? "" : "readonly "
@@ -3112,20 +3834,6 @@ function formatIsOptional(isOptional: boolean | undefined): string {
   return isOptional ? "?" : ""
 }
 
-/** @internal */
-export function memoizeThunk<A>(f: () => A): () => A {
-  let done = false
-  let a: A
-  return () => {
-    if (done) {
-      return a
-    }
-    a = f()
-    done = true
-    return a
-  }
-}
-
 /**
  * AST node for lazy/recursive schemas.
  *
@@ -3155,9 +3863,35 @@ export function memoizeThunk<A>(f: () => A): () => A {
  *
  * @see {@link isSuspend}
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
+ */
+export interface Suspend extends ASTNode {
+  readonly _tag: "Suspend"
+  readonly thunk: () => AST
+  /** @internal */
+
+  getParser(compile: SchemaParser.Compiler): SchemaParser.Parser
+  /** @internal */
+
+  recur(recur: (ast: AST) => AST): Suspend
+  /** @internal */
+
+  getExpected(getExpected: (ast: AST) => string): string
+}
+
+/**
+ * Constructs a {@link Suspend}.
+ *
+ * @category constructors
+ * @since 4.0.0
  */
-export class Suspend extends Base {
+export const Suspend: new(
+  thunk: () => AST,
+  annotations?: Schema.Annotations.Annotations,
+  checks?: Checks,
+  encoding?: Encoding,
+  context?: Context
+) => Suspend = class extends ASTNodeImpl {
   readonly _tag = "Suspend"
   readonly thunk: () => AST
 
@@ -3172,7 +3906,8 @@ export class Suspend extends Base {
       throw new Error("Cannot add checks to Suspend")
     }
     super(annotations, undefined, encoding, context)
-    this.thunk = memoizeThunk(thunk)
+    let ast: AST
+    this.thunk = () => ast ??= thunk()
   }
   /** @internal */
   getParser(compile: SchemaParser.Compiler): SchemaParser.Parser {
@@ -3220,7 +3955,32 @@ export class Suspend extends Base {
  * @category models
  * @since 4.0.0
  */
-export class Filter<in E> extends Pipeable.Class {
+export interface Filter<in E> extends Pipeable.Pipeable {
+  readonly _tag: "Filter"
+  readonly run: (input: E, self: AST, options: ParseOptions) => SchemaIssue.Issue | undefined
+  readonly annotations: Schema.Annotations.Filter | undefined
+  /**
+   * Whether the parsing process should be aborted after this check has failed.
+   */
+  readonly aborted: boolean
+  annotate(annotations: Schema.Annotations.Filter): Filter<E>
+  abort(): Filter<E>
+  and(other: Check<E>, annotations?: Schema.Annotations.Filter): FilterGroup<E>
+}
+
+/**
+ * Constructs a {@link Filter}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Filter: new<E>(
+  run: (input: E, self: AST, options: ParseOptions) => SchemaIssue.Issue | undefined,
+  annotations?: Schema.Annotations.Filter | undefined, /**
+   * Whether the parsing process should be aborted after this check has failed.
+   */
+  aborted?: boolean
+) => Filter<E> = class<in E> extends Pipeable.Class {
   readonly _tag = "Filter"
   readonly run: (input: E, self: AST, options: ParseOptions) => SchemaIssue.Issue | undefined
   readonly annotations: Schema.Annotations.Filter | undefined
@@ -3268,7 +4028,30 @@ export class Filter<in E> extends Pipeable.Class {
  * @category models
  * @since 4.0.0
  */
-export class FilterGroup<in E> extends Pipeable.Class {
+export interface FilterGroup<in E> extends Pipeable.Pipeable {
+  readonly _tag: "FilterGroup"
+  readonly checks: readonly [
+    Check<E>,
+    ...Array<Check<E>>
+  ]
+  readonly annotations: Schema.Annotations.Filter | undefined
+  annotate(annotations: Schema.Annotations.Filter): FilterGroup<E>
+  and(other: Check<E>, annotations?: Schema.Annotations.Filter): FilterGroup<E>
+}
+
+/**
+ * Constructs a {@link FilterGroup}.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const FilterGroup: new<E>(
+  checks: readonly [
+    Check<E>,
+    ...Array<Check<E>>
+  ],
+  annotations?: Schema.Annotations.Filter | undefined
+) => FilterGroup<E> = class<in E> extends Pipeable.Class {
   readonly _tag = "FilterGroup"
   readonly checks: readonly [Check<E>, ...Array<Check<E>>]
   readonly annotations: Schema.Annotations.Filter | undefined
@@ -3296,7 +4079,7 @@ export class FilterGroup<in E> extends Pipeable.Class {
  *
  * **Details**
  *
- * Stored in the {@link Checks} array on {@link Base.checks}.
+ * Stored in an AST node's {@link Checks} array.
  *
  * @see {@link Filter}
  * @see {@link FilterGroup}
@@ -3354,7 +4137,7 @@ export function isFinite(annotations?: Schema.Annotations.Filter) {
 export const finite = appendChecks(number, [isFinite()])
 
 const numberToJson = new Link(
-  new Union([finite, nonFiniteLiterals], "anyOf"),
+  new Union([finite, nonFiniteLiterals]),
   new SchemaTransformation.Transformation(
     SchemaGetter.Number(),
     SchemaGetter.transform((n) => globalThis.Number.isFinite(n) ? n : globalThis.String(n))
@@ -3383,6 +4166,9 @@ const numberToJson = new Link(
  * Arbitrary metadata preserves both `regExp.source` and `regExp.flags`.
  * Implementations that cannot consume all flags may still use the source as a
  * generation hint because the Schema filter validates every generated value.
+ * JSON Schema has no way to carry JavaScript regular-expression flags. The
+ * generated `pattern` contains the source only, so validation can differ when
+ * the RegExp uses flags or relies on JavaScript's non-Unicode behavior.
  *
  * **Example** (Validating an email pattern)
  *
@@ -3626,7 +4412,7 @@ const optionalKeyLastLink = applyToLastLink(optionalKey)
 
 /** @internal */
 export const optional = memoize(<A extends AST>(ast: A): Union<A | Undefined> =>
-  optionalKey(new Union([ast, undefined_], "anyOf"))
+  optionalKey(new Union([ast, undefined_]))
 )
 
 /** @internal */
@@ -3646,14 +4432,9 @@ export function withConstructorDefault<A extends AST>(
   ast: A,
   defaultValue: Effect.Effect<unknown, SchemaIssue.Issue>
 ): A {
-  const transformation = new SchemaTransformation.Transformation(
-    SchemaGetter.withDefault(defaultValue),
-    SchemaGetter.passthrough()
-  )
-  const constructorDefault = new Link(unknown, transformation)
   const context = ast.context ?
-    new Context(ast.context.isOptional, ast.context.isMutable, constructorDefault, ast.context.annotations) :
-    new Context(false, false, constructorDefault)
+    new Context(ast.context.isOptional, ast.context.isMutable, defaultValue, ast.context.annotations) :
+    new Context(false, false, defaultValue)
   return replaceContext(ast, context)
 }
 
@@ -3663,9 +4444,8 @@ export function withConstructorDefault<A extends AST>(
  *
  * **Details**
  *
- * This is the low-level primitive behind `Schema.transform` and
- * `Schema.transformOrFail`. It appends a {@link Link} to the `to` node's
- * encoding chain.
+ * This is the low-level primitive behind `Schema.decodeTo`. It appends a
+ * {@link Link} to the `to` node's encoding chain.
  *
  * - Returns a new AST with the same type as `to`.
  *
@@ -3898,7 +4678,7 @@ function fromConst<const T>(
   ast: AST,
   value: T
 ): SchemaParser.Parser {
-  const succeed = InternalParser.succeed(value)
+  const succeed = value === 0 ? InternalParser.sameExit : InternalParser.succeed(value)
   return (input, options) => {
     if (input === InternalParser.missing) return InternalParser.missingExit
     if (input === value) return succeed
@@ -3971,7 +4751,8 @@ function segmentTemplateLiteralParts(
   return go(0, 0) ? out : undefined
 }
 
-const parameterFromPropertyKey = applyToSelfOrLastLinkEncodingIdempotent((ast) => {
+/** @internal */
+export const parameterFromPropertyKey = applyToSelfOrLastLinkEncodingIdempotent((ast) => {
   switch (ast._tag) {
     default:
       return ast
@@ -4042,7 +4823,7 @@ const finiteToString = new Link(
 )
 
 const numberToString = new Link(
-  new Union([finiteString, nonFiniteLiterals], "anyOf"),
+  new Union([finiteString, nonFiniteLiterals]),
   SchemaTransformation.numberFromString
 )
 
@@ -4079,7 +4860,7 @@ const bigIntToString = new Link(
   SchemaTransformation.bigintFromString
 )
 
-const REGEXP_PATTERN = "Symbol\\((.*)\\)"
+const REGEXP_PATTERN = "Symbol\\(([\\s\\S]*)\\)"
 
 const isStringSymbolRegExp = new globalThis.RegExp(`^${REGEXP_PATTERN}$`)
 
@@ -4093,7 +4874,7 @@ const symbolToString = new Link(
   symbolString,
   new SchemaTransformation.Transformation(
     SchemaGetter.transform((description) => globalThis.Symbol.for(isStringSymbolRegExp.exec(description)![1])),
-    SchemaGetter.transformOrFail((sym: symbol, options) => {
+    SchemaGetter.transformEffect((sym: symbol, options) => {
       const key = globalThis.Symbol.keyFor(sym)
       if (key !== undefined) {
         return Effect.succeed(globalThis.String(sym))
@@ -4191,7 +4972,7 @@ export function getConstructorDescriptor(ast: AST): ConstructorDescriptor | unde
  *
  * If the node has {@link Checks}, returns annotations from the last check
  * (which is where user-supplied annotations end up after `.pipe(Schema.annotations(...))`).
- * Otherwise returns `Base.annotations` directly.
+ * Otherwise returns the node's `annotations` directly.
  *
  * **Example** (Reading annotations)
  *
@@ -4389,7 +5170,7 @@ export const objectKeywordToJson = new Link(
   new Union([
     new Arrays(false, [], [Json]),
     new Objects([], [new IndexSignature(string, Json)])
-  ], "anyOf"),
+  ]),
   SchemaTransformation.passthrough()
 )
 
diff --git a/repos/effect/packages/effect/src/SchemaGetter.ts b/repos/effect/packages/effect/src/SchemaGetter.ts
index 8b772257b..4cc3750ca 100644
--- a/repos/effect/packages/effect/src/SchemaGetter.ts
+++ b/repos/effect/packages/effect/src/SchemaGetter.ts
@@ -11,9 +11,11 @@
  *
  * @since 4.0.0
  */
+import * as Arr from "./Array.ts"
 import * as DateTime from "./DateTime.ts"
 import * as Effect from "./Effect.ts"
 import * as Encoding from "./Encoding.ts"
+import { dual } from "./Function.ts"
 import * as InternalRecord from "./internal/record.ts"
 import * as Option from "./Option.ts"
 import * as Pipeable from "./Pipeable.ts"
@@ -24,6 +26,66 @@ import type * as SchemaAST from "./SchemaAST.ts"
 import * as SchemaIssue from "./SchemaIssue.ts"
 import * as Str from "./String.ts"
 
+/**
+ * A transformation that returns its input unchanged.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface Passthrough extends Pipeable.Pipeable {
+  readonly _tag: "Passthrough"
+}
+
+/**
+ * A synchronous transformation of present values.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface Transform<out T, in E> extends Pipeable.Pipeable {
+  readonly _tag: "Transform"
+  readonly transform: (input: E) => T
+}
+
+/**
+ * A synchronous transformation of optional values.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface TransformOptional<out T, in E> extends Pipeable.Pipeable {
+  readonly _tag: "TransformOptional"
+  readonly transform: (input: Option.Option<E>) => Option.Option<T>
+}
+
+/**
+ * An effectful transformation of present values.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface TransformEffect<out T, in E, R> extends Pipeable.Pipeable {
+  readonly _tag: "TransformEffect"
+  readonly transform: (
+    input: E,
+    options: SchemaAST.ParseOptions
+  ) => Effect.Effect<T, SchemaIssue.Issue, R>
+}
+
+/**
+ * An effectful transformation of optional values.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface TransformOptionalEffect<out T, in E, R> extends Pipeable.Pipeable {
+  readonly _tag: "TransformOptionalEffect"
+  readonly transform: (
+    input: Option.Option<E>,
+    options: SchemaAST.ParseOptions
+  ) => Effect.Effect<Option.Option<T>, SchemaIssue.Issue, R>
+}
+
 /**
  * Represents a composable transformation from an encoded type `E` to a decoded type `T`.
  *
@@ -34,14 +96,14 @@ import * as Str from "./String.ts"
  *
  * **Details**
  *
- * A getter wraps a function `Option<E> -> Effect<Option<T>, Issue, R>`. It
- * receives `Option.None` when the encoded key is absent, such as a missing
- * struct field, and returns `Option.None` to omit the value from the decoded
- * output. It fails with `Issue` on invalid input and may require Effect
- * services via `R`. `.map(f)` applies `f` to the decoded value inside `Some`
- * while leaving `None` unchanged. `.compose(other)` chains two getters by
- * feeding the output of `this` into `other`; passthrough getters on either side
- * are optimized away.
+ * A getter receives an `Option<E>` and produces an `Option<T>`. `Option.none()`
+ * represents a missing struct field and can also omit a field from the output.
+ * A getter may fail with a schema issue or require services through `R`. The
+ * tagged representation distinguishes synchronous transformations from
+ * transformations that return an `Effect`, allowing schema parsers to select
+ * the corresponding execution path when they are built. Getter values expose
+ * `pipe`; use the standalone {@link map}, {@link compose}, and {@link run}
+ * functions to operate on them.
  *
  * **Example** (Creating and composing getters)
  *
@@ -50,45 +112,207 @@ import * as Str from "./String.ts"
  *
  * const parseNumber = SchemaGetter.transform<number, string>((s) => Number(s))
  * const double = SchemaGetter.transform<number, number>((n) => n * 2)
- * const composed = parseNumber.compose(double)
- * await Effect.runPromise(composed.run(Option.some("21"), {})) // => Option.some(42)
+ * const composed = SchemaGetter.compose(parseNumber, double)
+ * Effect.runSync(SchemaGetter.run(composed, Option.some("21"), {})) // => Option.some(42)
  * ```
  *
- * @see {@link transform} to create a getter from a pure function
  * @see {@link passthrough} for the identity getter
- * @see {@link transformOrFail} for fallible transformation
+ * @see {@link transform} to create a getter from a pure function
+ * @see {@link transformEffect} for effectful transformation
  *
  * @category models
  * @since 4.0.0
  */
-export class Getter<out T, in E, R = never> extends Pipeable.Class {
-  readonly run: (
+export type Getter<T, E, R = never> =
+  | Passthrough
+  | Transform<T, E>
+  | TransformOptional<T, E>
+  | TransformEffect<T, E, R>
+  | TransformOptionalEffect<T, E, R>
+
+const runGetter = <T, E, R>(
+  self: Getter<T, E, R>,
+  input: Option.Option<E>,
+  options: SchemaAST.ParseOptions
+): Effect.Effect<Option.Option<T>, SchemaIssue.Issue, R> => {
+  switch (self._tag) {
+    case "Passthrough":
+      return Effect.succeed(input as unknown as Option.Option<T>)
+    case "Transform":
+      return Effect.succeed(Option.map(input, self.transform))
+    case "TransformOptional":
+      return Effect.succeed(self.transform(input))
+    case "TransformEffect":
+      return Option.isNone(input)
+        ? Effect.succeedNone
+        : Effect.mapEager(self.transform(input.value, options), Option.some)
+    case "TransformOptionalEffect":
+      return self.transform(input, options)
+  }
+}
+
+/**
+ * Runs a getter directly.
+ *
+ * **Details**
+ *
+ * This is a convenience API for executing a getter outside a schema. When the
+ * getter belongs to a schema, use the corresponding `SchemaParser` API. The
+ * result is an `Effect` for every getter variant, including synchronous ones.
+ *
+ * **Example** (Running a getter)
+ *
+ * ```ts import.meta.vitest
+ * import { Effect, Option, SchemaGetter } from "effect"
+ *
+ * const getter = SchemaGetter.transform<number, string>(Number)
+ *
+ * const result = Effect.runSync(
+ *   SchemaGetter.run(getter, Option.some("42"), {})
+ * )
+ * result // => Option.some(42)
+ * ```
+ *
+ * @category converting
+ * @since 4.0.0
+ */
+export const run: {
+  <E>(
     input: Option.Option<E>,
     options: SchemaAST.ParseOptions
-  ) => Effect.Effect<Option.Option<T>, SchemaIssue.Issue, R>
+  ): <T, R>(self: Getter<T, E, R>) => Effect.Effect<Option.Option<T>, SchemaIssue.Issue, R>
+  <T, E, R>(
+    self: Getter<T, E, R>,
+    input: Option.Option<E>,
+    options: SchemaAST.ParseOptions
+  ): Effect.Effect<Option.Option<T>, SchemaIssue.Issue, R>
+} = dual(3, runGetter)
+
+const makeGetter = <const A extends object>(fields: A): A & Pipeable.Pipeable =>
+  Object.assign(Object.create(Pipeable.Prototype), fields)
+
+const composeOptionalEffect = <T, E, R, T2, R2>(
+  first: Getter<T, E, R>,
+  second: Getter<T2, T, R2>
+): Getter<T2, E, R | R2> =>
+  transformOptionalEffect((input, options) =>
+    Effect.flatMapEager(runGetter(first, input, options), (output) => runGetter(second, output, options))
+  )
 
-  constructor(
-    run: (
-      input: Option.Option<E>,
-      options: SchemaAST.ParseOptions
-    ) => Effect.Effect<Option.Option<T>, SchemaIssue.Issue, R>
-  ) {
-    super()
-    this.run = run
-  }
-  map<T2>(f: (t: T) => T2): Getter<T2, E, R> {
-    return new Getter((oe, options) => this.run(oe, options).pipe(Effect.mapEager(Option.map(f))))
-  }
-  compose<T2, R2>(other: Getter<T2, T, R2>): Getter<T2, E, R | R2> {
-    if (isPassthrough(this)) {
-      return other as any
+/**
+ * Composes two getters by passing the output of the first to the second.
+ *
+ * **When to use**
+ *
+ * Use when a schema conversion requires multiple transformation steps.
+ *
+ * **Details**
+ *
+ * Composition forwards `Option.none()` to getters that handle optional values
+ * and skips getters that operate only on present values. Composing with
+ * {@link passthrough} returns the other getter unchanged. The function supports
+ * both `compose(first, second)` and `first.pipe(compose(second))`.
+ *
+ * **Example** (Parsing and normalizing a number)
+ *
+ * ```ts import.meta.vitest
+ * import { Effect, Option, SchemaGetter } from "effect"
+ *
+ * const getter = SchemaGetter.compose(
+ *   SchemaGetter.transform<number, string>(Number),
+ *   SchemaGetter.transform((n) => Math.max(0, n))
+ * )
+ *
+ * Effect.runSync(SchemaGetter.run(getter, Option.some("-1"), {})) // => Option.some(0)
+ * ```
+ *
+ * @category combining
+ * @since 4.0.0
+ */
+export const compose: {
+  <T, T2, R2>(other: Getter<T2, T, R2>): <E, R>(self: Getter<T, E, R>) => Getter<T2, E, R | R2>
+  <T, E, R, T2, R2>(self: Getter<T, E, R>, other: Getter<T2, T, R2>): Getter<T2, E, R | R2>
+} = dual(2, <T, E, R, T2, R2>(
+  self: Getter<T, E, R>,
+  other: Getter<T2, T, R2>
+): Getter<T2, E, R | R2> => {
+  if (self._tag === "Passthrough") return other as Getter<T2, E, R | R2>
+  if (other._tag === "Passthrough") return self as unknown as Getter<T2, E, R | R2>
+  switch (self._tag) {
+    case "Transform": {
+      switch (other._tag) {
+        case "Transform":
+          return transform((input: E) => other.transform(self.transform(input)))
+        case "TransformOptional":
+          return transformOptional((input) => other.transform(Option.map(input, self.transform)))
+        case "TransformEffect":
+          return transformEffect((input: E, options) => other.transform(self.transform(input), options))
+        case "TransformOptionalEffect":
+          return composeOptionalEffect(self, other)
+      }
     }
-    if (isPassthrough(other)) {
-      return this as any
+    case "TransformOptional": {
+      switch (other._tag) {
+        case "Transform":
+          return transformOptional((input) => Option.map(self.transform(input), other.transform))
+        case "TransformOptional":
+          return transformOptional((input) => other.transform(self.transform(input)))
+        case "TransformEffect":
+        case "TransformOptionalEffect":
+          return composeOptionalEffect(self, other)
+      }
+    }
+    case "TransformEffect": {
+      switch (other._tag) {
+        case "Transform":
+          return transformEffect((input: E, options) =>
+            Effect.mapEager(self.transform(input, options), other.transform)
+          )
+        case "TransformOptional":
+        case "TransformOptionalEffect":
+          return composeOptionalEffect(self, other)
+        case "TransformEffect":
+          return transformEffect((input: E, options) =>
+            Effect.flatMapEager(self.transform(input, options), (output) => other.transform(output, options))
+          )
+      }
     }
-    return new Getter((oe, options) => this.run(oe, options).pipe(Effect.flatMapEager((ot) => other.run(ot, options))))
+    case "TransformOptionalEffect":
+      return composeOptionalEffect(self, other)
   }
-}
+})
+
+/**
+ * Maps the output of a getter while preserving missing values.
+ *
+ * **When to use**
+ *
+ * Use to add a synchronous transformation after an existing getter.
+ *
+ * **Details**
+ *
+ * The mapping function runs only for `Option.some`. The function supports both
+ * `map(self, f)` and `self.pipe(map(f))`.
+ *
+ * **Example** (Mapping a getter result)
+ *
+ * ```ts import.meta.vitest
+ * import { Effect, Option, SchemaGetter } from "effect"
+ *
+ * const getter = SchemaGetter.transform<number, string>(Number).pipe(
+ *   SchemaGetter.map((n) => n * 2)
+ * )
+ *
+ * Effect.runSync(SchemaGetter.run(getter, Option.some("21"), {})) // => Option.some(42)
+ * ```
+ *
+ * @category mapping
+ * @since 4.0.0
+ */
+export const map: {
+  <T, T2>(f: (value: T) => T2): <E, R>(self: Getter<T, E, R>) => Getter<T2, E, R>
+  <T, E, R, T2>(self: Getter<T, E, R>, f: (value: T) => T2): Getter<T2, E, R>
+} = dual(2, <T, E, R, T2>(self: Getter<T, E, R>, f: (value: T) => T2): Getter<T2, E, R> => compose(self, transform(f)))
 
 /**
  * Creates a getter that always produces the given constant value, ignoring the input.
@@ -109,7 +333,7 @@ export class Getter<out T, in E, R = never> extends Pipeable.Class {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const alwaysZero = SchemaGetter.succeed(0)
- * await Effect.runPromise(alwaysZero.run(Option.none(), {})) // => Option.some(0)
+ * Effect.runSync(SchemaGetter.run(alwaysZero, Option.none(), {})) // => Option.some(0)
  * ```
  *
  * @see {@link transform} when you need to use the input value
@@ -119,7 +343,7 @@ export class Getter<out T, in E, R = never> extends Pipeable.Class {
  * @since 4.0.0
  */
 export function succeed<const T, E>(t: T): Getter<T, E> {
-  return new Getter(() => Effect.succeedSome(t))
+  return transformOptional(() => Option.some(t))
 }
 
 /**
@@ -144,7 +368,9 @@ export function succeed<const T, E>(t: T): Getter<T, E> {
  * const rejectAll = SchemaGetter.fail<string, string>(
  *   () => new SchemaIssue.InvalidValue({ message: "not allowed" })
  * )
- * const issue = await Effect.runPromise(Effect.flip(rejectAll.run(Option.some("x"), {})))
+ * const issue = await Effect.runPromise(
+ *   Effect.flip(SchemaGetter.run(rejectAll, Option.some("x"), {}))
+ * )
  * issue._tag // => "InvalidValue"
  * ```
  *
@@ -157,7 +383,7 @@ export function succeed<const T, E>(t: T): Getter<T, E> {
 export function fail<T, E>(
   f: (oe: Option.Option<E>, options: SchemaAST.ParseOptions) => SchemaIssue.Issue
 ): Getter<T, E> {
-  return new Getter((oe, options) => Effect.fail(f(oe, options)))
+  return transformOptionalEffect((oe, options) => Effect.fail(f(oe, options)))
 }
 
 /**
@@ -182,7 +408,9 @@ export function fail<T, E>(
  * const noEncode = SchemaGetter.forbidden<string, number>(
  *   () => "encoding is not supported"
  * )
- * const issue = await Effect.runPromise(Effect.flip(noEncode.run(Option.some(1), {})))
+ * const issue = await Effect.runPromise(
+ *   Effect.flip(SchemaGetter.run(noEncode, Option.some(1), {}))
+ * )
  * issue._tag // => "Forbidden"
  * ```
  *
@@ -218,7 +446,7 @@ export function forbidden<T, E>(message: (oe: Option.Option<E>) => string): Gett
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const issue = await Effect.runPromise(
- *   Effect.flip(SchemaGetter.forbiddenEncoding.run(Option.some("value"), {}))
+ *   Effect.flip(SchemaGetter.run(SchemaGetter.forbiddenEncoding, Option.some("value"), {}))
  * )
  * issue._tag // => "Forbidden"
  * ```
@@ -230,11 +458,7 @@ export function forbidden<T, E>(message: (oe: Option.Option<E>) => string): Gett
  */
 export const forbiddenEncoding: Getter<never, unknown> = forbidden(() => "Encoding is not supported")
 
-const passthrough_ = new Getter<any, any>(Effect.succeed)
-
-function isPassthrough<T, E, R>(getter: Getter<T, E, R>): getter is typeof passthrough_ {
-  return getter.run === passthrough_.run
-}
+const passthrough_: Passthrough = makeGetter({ _tag: "Passthrough" })
 
 /**
  * Returns the identity getter — passes the value through unchanged.
@@ -247,7 +471,7 @@ function isPassthrough<T, E, R>(getter: Getter<T, E, R>): getter is typeof passt
  * **Details**
  *
  * - Pure, no allocation (singleton instance).
- * - Optimized away during `.compose()` — composing with a passthrough is free.
+ * - Optimized away by {@link compose} — composing with a passthrough is free.
  * - The default overload requires `T === E`. Pass `{ strict: false }` to opt
  *   out of the type constraint.
  *
@@ -298,7 +522,7 @@ export function passthrough<T>(): Getter<T, T> {
  *
  * // string extends string, so this is valid
  * const g = SchemaGetter.passthroughSupertype<string, string>()
- * await Effect.runPromise(g.run(Option.some("hello"), {})) // => Option.some("hello")
+ * Effect.runSync(SchemaGetter.run(g, Option.some("hello"), {})) // => Option.some("hello")
  * ```
  *
  * @see {@link passthrough} when types are identical
@@ -331,7 +555,7 @@ export function passthroughSupertype<T>(): Getter<T, T> {
  *
  * // "hello" extends string, so E extends T
  * const g = SchemaGetter.passthroughSubtype<string, "hello">()
- * await Effect.runPromise(g.run(Option.some("hello"), {})) // => Option.some("hello")
+ * Effect.runSync(SchemaGetter.run(g, Option.some("hello"), {})) // => Option.some("hello")
  * ```
  *
  * @see {@link passthrough} when types are identical
@@ -345,45 +569,6 @@ export function passthroughSubtype<T>(): Getter<T, T> {
   return passthrough_
 }
 
-/**
- * Creates a getter that handles the case when the input is absent (`Option.None`).
- *
- * **When to use**
- *
- * Use when you need a schema getter to provide a fallback or computed value for
- * missing struct keys.
- * - Building custom "default value" logic more complex than {@link withDefault}.
- *
- * **Details**
- *
- * - When input is `None`, calls `f` to produce the result.
- * - When input is `Some`, passes it through unchanged.
- * - `f` receives the parse options and may return `None` to keep the value absent.
- *
- * **Example** (Providing a default timestamp for a missing field)
- *
- * ```ts import.meta.vitest
- * import { Effect, Option, SchemaGetter } from "effect"
- *
- * const withTimestamp = SchemaGetter.onNone<number>(() =>
- *   Effect.succeed(Option.some(0))
- * )
- * await Effect.runPromise(withTimestamp.run(Option.none(), {})) // => Option.some(0)
- * ```
- *
- * @see {@link required} when absent input should fail
- * @see {@link withDefault} for a simpler default value for undefined inputs
- * @see {@link onSome} to handle only present values
- *
- * @category transforming
- * @since 4.0.0
- */
-export function onNone<T, E extends T = T, R = never>(
-  f: (options: SchemaAST.ParseOptions) => Effect.Effect<Option.Option<T>, SchemaIssue.Issue, R>
-): Getter<T, E, R> {
-  return new Getter((ot, options) => Option.isNone(ot) ? f(options) : Effect.succeed(ot))
-}
-
 /**
  * Creates a getter that fails with `MissingKey` if the input is absent (`Option.None`).
  *
@@ -404,57 +589,21 @@ export function onNone<T, E extends T = T, R = never>(
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const mustExist = SchemaGetter.required<string>()
- * const issue = await Effect.runPromise(Effect.flip(mustExist.run(Option.none(), {})))
+ * const issue = await Effect.runPromise(
+ *   Effect.flip(SchemaGetter.run(mustExist, Option.none(), {}))
+ * )
  * issue._tag // => "MissingKey"
  * ```
  *
- * @see {@link onNone} to provide a fallback instead of failing
  * @see {@link withDefault} to substitute a default for undefined values
  *
  * @category validation
  * @since 4.0.0
  */
 export function required<T, E extends T = T>(annotations?: Schema.Annotations.Key<T>): Getter<T, E> {
-  return onNone(() => Effect.fail(new SchemaIssue.MissingKey(annotations)))
-}
-
-/**
- * Creates a getter that handles present values (`Option.Some`), passing `None` through.
- *
- * **When to use**
- *
- * Use when you need a schema getter to transform or validate only when a field
- * value is present.
- * - Missing keys should remain absent in the output.
- *
- * **Details**
- *
- * - When input is `None`, returns `None` (no-op).
- * - When input is `Some(e)`, calls `f(e, options)` to produce the result.
- * - `f` may return `None` to omit the value, or fail with an `Issue`.
- *
- * **Example** (Transforming only present values)
- *
- * ```ts import.meta.vitest
- * import { Effect, Option, SchemaGetter } from "effect"
- *
- * const parseIfPresent = SchemaGetter.onSome<number, string>(
- *   (s) => Effect.succeed(Option.some(Number(s)))
- * )
- * await Effect.runPromise(parseIfPresent.run(Option.some("42"), {})) // => Option.some(42)
- * ```
- *
- * @see {@link onNone} to handle only absent values
- * @see {@link transform} for a simpler pure transformation of present values
- * @see {@link transformOrFail} for fallible transformation of present values
- *
- * @category transforming
- * @since 4.0.0
- */
-export function onSome<T, E, R = never>(
-  f: (e: E, options: SchemaAST.ParseOptions) => Effect.Effect<Option.Option<T>, SchemaIssue.Issue, R>
-): Getter<T, E, R> {
-  return new Getter((oe, options) => Option.isNone(oe) ? Effect.succeedNone : f(oe.value, options))
+  return transformOptionalEffect((input) =>
+    Option.isNone(input) ? Effect.fail(new SchemaIssue.MissingKey(annotations)) : Effect.succeed(input)
+  )
 }
 
 /**
@@ -485,7 +634,7 @@ export function onSome<T, E, R = never>(
  * const nonNegative = SchemaGetter.checkEffect<number>((n) =>
  *   Effect.succeed(n >= 0 ? undefined : "must be non-negative")
  * )
- * await Effect.runPromise(nonNegative.run(Option.some(1), {})) // => Option.some(1)
+ * await Effect.runPromise(SchemaGetter.run(nonNegative, Option.some(1), {})) // => Option.some(1)
  * ```
  *
  * @see {@link transform} when you need to change the value, not just validate
@@ -501,12 +650,12 @@ export function checkEffect<T, R = never>(
     R
   >
 ): Getter<T, T, R> {
-  return onSome((t, options) => {
+  return transformEffect((t, options) => {
     return f(t, options).pipe(Effect.flatMapEager((out) => {
       const issue = SchemaIssue.makeSingle(out, t, options)
       return issue ?
         Effect.fail(issue) :
-        Effect.succeed(Option.some(t))
+        Effect.succeed(t)
     }))
   })
 }
@@ -541,7 +690,7 @@ export function checkEffect<T, R = never>(
  * Schema.decodeSync(NumberFromString)("42") // => 42
  * ```
  *
- * @see {@link transformOrFail} when the transformation can fail
+ * @see {@link transformEffect} when the transformation returns an `Effect`
  * @see {@link transformOptional} when you need to handle `None` inputs
  * @see {@link passthrough} when no transformation is needed
  *
@@ -549,11 +698,11 @@ export function checkEffect<T, R = never>(
  * @since 4.0.0
  */
 export function transform<T, E>(f: (e: E) => T): Getter<T, E> {
-  return transformOptional(Option.map(f))
+  return makeGetter({ _tag: "Transform", transform: f })
 }
 
 /**
- * Creates a getter that applies a fallible, effectful transformation to present values.
+ * Creates a getter that applies an effectful transformation to present values.
  *
  * **When to use**
  *
@@ -571,7 +720,7 @@ export function transform<T, E>(f: (e: E) => T): Getter<T, E> {
  * ```ts import.meta.vitest
  * import { Effect, Option, SchemaGetter, SchemaIssue } from "effect"
  *
- * const safeParseInt = SchemaGetter.transformOrFail<number, string>(
+ * const safeParseInt = SchemaGetter.transformEffect<number, string>(
  *   (s, options) => {
  *     const n = parseInt(s, 10)
  *     return isNaN(n)
@@ -579,19 +728,19 @@ export function transform<T, E>(f: (e: E) => T): Getter<T, E> {
  *       : Effect.succeed(n)
  *   }
  * )
- * await Effect.runPromise(safeParseInt.run(Option.some("42"), {})) // => Option.some(42)
+ * await Effect.runPromise(SchemaGetter.run(safeParseInt, Option.some("42"), {})) // => Option.some(42)
  * ```
  *
  * @see {@link transform} when transformation cannot fail
- * @see {@link onSome} when you need full `Option` control over the output
+ * @see {@link transformOptionalEffect} when you need full `Option` control over the output
  *
  * @category transforming
  * @since 4.0.0
  */
-export function transformOrFail<T, E, R = never>(
+export function transformEffect<T, E, R = never>(
   f: (e: E, options: SchemaAST.ParseOptions) => Effect.Effect<T, SchemaIssue.Issue, R>
 ): Getter<T, E, R> {
-  return onSome((e, options) => f(e, options).pipe(Effect.mapEager(Option.some)))
+  return makeGetter({ _tag: "TransformEffect", transform: f })
 }
 
 /**
@@ -615,7 +764,7 @@ export function transformOrFail<T, E, R = never>(
  * const skipEmpty = SchemaGetter.transformOptional<string, string>((o) =>
  *   Option.filter(o, (s) => s.length > 0)
  * )
- * await Effect.runPromise(skipEmpty.run(Option.some(""), {})) // => Option.none()
+ * Effect.runSync(SchemaGetter.run(skipEmpty, Option.some(""), {})) // => Option.none()
  * ```
  *
  * @see {@link transform} when you only need to transform present values
@@ -625,7 +774,22 @@ export function transformOrFail<T, E, R = never>(
  * @since 4.0.0
  */
 export function transformOptional<T, E>(f: (oe: Option.Option<E>) => Option.Option<T>): Getter<T, E> {
-  return new Getter((oe) => Effect.succeed(f(oe)))
+  return makeGetter({ _tag: "TransformOptional", transform: f })
+}
+
+/**
+ * Creates a getter that effectfully transforms the full `Option`.
+ *
+ * @category transforming
+ * @since 4.0.0
+ */
+export function transformOptionalEffect<T, E, R = never>(
+  f: (
+    input: Option.Option<E>,
+    options: SchemaAST.ParseOptions
+  ) => Effect.Effect<Option.Option<T>, SchemaIssue.Issue, R>
+): Getter<T, E, R> {
+  return makeGetter({ _tag: "TransformOptionalEffect", transform: f })
 }
 
 /**
@@ -647,7 +811,7 @@ export function transformOptional<T, E>(f: (oe: Option.Option<E>) => Option.Opti
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const omitField = SchemaGetter.omit<string>()
- * await Effect.runPromise(omitField.run(Option.some("hidden"), {})) // => Option.none()
+ * Effect.runSync(SchemaGetter.run(omitField, Option.some("hidden"), {})) // => Option.none()
  * ```
  *
  * @see {@link transformOptional} when you want conditional omission
@@ -657,7 +821,7 @@ export function transformOptional<T, E>(f: (oe: Option.Option<E>) => Option.Opti
  * @since 4.0.0
  */
 export function omit<T>(): Getter<never, T> {
-  return new Getter(() => Effect.succeedNone)
+  return transformOptional(() => Option.none())
 }
 
 /**
@@ -680,10 +844,10 @@ export function omit<T>(): Getter<never, T> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const withZero = SchemaGetter.withDefault(Effect.succeed(0))
- * await Effect.runPromise(withZero.run(Option.some(undefined), {})) // => Option.some(0)
+ * await Effect.runPromise(SchemaGetter.run(withZero, Option.some(undefined), {})) // => Option.some(0)
  * ```
  *
- * @see {@link onNone} to handle only absent keys (not `undefined` values)
+ * @see {@link transformOptionalEffect} for custom effectful missing-key handling
  * @see {@link required} when absent input should fail instead of using a default
  *
  * @category transforming
@@ -692,7 +856,7 @@ export function omit<T>(): Getter<never, T> {
 export function withDefault<T, R = never>(
   defaultValue: Effect.Effect<T, SchemaIssue.Issue, R>
 ): Getter<T, T | undefined, R> {
-  return new Getter((o) => {
+  return transformOptionalEffect((o) => {
     const filtered = Option.filter(o, Predicate.isNotUndefined)
     return Option.isSome(filtered) ? Effect.succeed(filtered) : Effect.mapEager(defaultValue, Option.some)
   })
@@ -716,7 +880,7 @@ export function withDefault<T, R = never>(
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const toString = SchemaGetter.String<number>()
- * await Effect.runPromise(toString.run(Option.some(42), {})) // => Option.some("42")
+ * Effect.runSync(SchemaGetter.run(toString, Option.some(42), {})) // => Option.some("42")
  * ```
  *
  * @see {@link transform} for custom string conversions
@@ -747,10 +911,10 @@ export function String<E>(): Getter<string, E> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const toNumber = SchemaGetter.Number<string>()
- * await Effect.runPromise(toNumber.run(Option.some("42"), {})) // => Option.some(42)
+ * Effect.runSync(SchemaGetter.run(toNumber, Option.some("42"), {})) // => Option.some(42)
  * ```
  *
- * @see {@link transformOrFail} for validated number parsing
+ * @see {@link transformEffect} for effectful or validated number parsing
  *
  * @category converting
  * @since 4.0.0
@@ -777,7 +941,7 @@ export function Number<E>(): Getter<number, E> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const toBool = SchemaGetter.Boolean<string>()
- * await Effect.runPromise(toBool.run(Option.some("true"), {})) // => Option.some(true)
+ * Effect.runSync(SchemaGetter.run(toBool, Option.some("true"), {})) // => Option.some(true)
  * ```
  *
  * @category converting
@@ -806,7 +970,7 @@ export function Boolean<E>(): Getter<boolean, E> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const toBigInt = SchemaGetter.BigInt<string>()
- * await Effect.runPromise(toBigInt.run(Option.some("42"), {})) // => Option.some(42n)
+ * Effect.runSync(SchemaGetter.run(toBigInt, Option.some("42"), {})) // => Option.some(42n)
  * ```
  *
  * @category converting
@@ -835,7 +999,7 @@ export function BigInt<E extends string | number | bigint | boolean>(): Getter<b
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const toDate = SchemaGetter.Date<string>()
- * const result = await Effect.runPromise(toDate.run(Option.some("1970-01-01"), {}))
+ * const result = Effect.runSync(SchemaGetter.run(toDate, Option.some("1970-01-01"), {}))
  * Option.map(result, (date) => date.toISOString()) // => Option.some("1970-01-01T00:00:00.000Z")
  * ```
  *
@@ -861,7 +1025,7 @@ export function Date<E extends string | number | Date>(): Getter<Date, E> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const trimmed = SchemaGetter.trim<string>()
- * await Effect.runPromise(trimmed.run(Option.some("  hello  "), {})) // => Option.some("hello")
+ * Effect.runSync(SchemaGetter.run(trimmed, Option.some("  hello  "), {})) // => Option.some("hello")
  * ```
  *
  * @category transforming
@@ -884,7 +1048,7 @@ export function trim<E extends string>(): Getter<string, E> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const cap = SchemaGetter.capitalize<string>()
- * await Effect.runPromise(cap.run(Option.some("hello"), {})) // => Option.some("Hello")
+ * Effect.runSync(SchemaGetter.run(cap, Option.some("hello"), {})) // => Option.some("Hello")
  * ```
  *
  * @category transforming
@@ -907,7 +1071,7 @@ export function capitalize<E extends string>(): Getter<string, E> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const uncap = SchemaGetter.uncapitalize<string>()
- * await Effect.runPromise(uncap.run(Option.some("Hello"), {})) // => Option.some("hello")
+ * Effect.runSync(SchemaGetter.run(uncap, Option.some("Hello"), {})) // => Option.some("hello")
  * ```
  *
  * @category transforming
@@ -930,7 +1094,7 @@ export function uncapitalize<E extends string>(): Getter<string, E> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const toCamel = SchemaGetter.snakeToCamel<string>()
- * await Effect.runPromise(toCamel.run(Option.some("user_name"), {})) // => Option.some("userName")
+ * Effect.runSync(SchemaGetter.run(toCamel, Option.some("user_name"), {})) // => Option.some("userName")
  * ```
  *
  * @see {@link camelToSnake} for the inverse operation
@@ -955,7 +1119,7 @@ export function snakeToCamel<E extends string>(): Getter<string, E> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const toSnake = SchemaGetter.camelToSnake<string>()
- * await Effect.runPromise(toSnake.run(Option.some("userName"), {})) // => Option.some("user_name")
+ * Effect.runSync(SchemaGetter.run(toSnake, Option.some("userName"), {})) // => Option.some("user_name")
  * ```
  *
  * @see {@link snakeToCamel} for the inverse operation
@@ -980,7 +1144,7 @@ export function camelToSnake<E extends string>(): Getter<string, E> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const lower = SchemaGetter.toLowerCase<string>()
- * await Effect.runPromise(lower.run(Option.some("HELLO"), {})) // => Option.some("hello")
+ * Effect.runSync(SchemaGetter.run(lower, Option.some("HELLO"), {})) // => Option.some("hello")
  * ```
  *
  * @see {@link toUpperCase} for the inverse operation
@@ -1005,7 +1169,7 @@ export function toLowerCase<E extends string>(): Getter<string, E> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const upper = SchemaGetter.toUpperCase<string>()
- * await Effect.runPromise(upper.run(Option.some("hello"), {})) // => Option.some("HELLO")
+ * Effect.runSync(SchemaGetter.run(upper, Option.some("hello"), {})) // => Option.some("HELLO")
  * ```
  *
  * @see {@link toLowerCase} for the inverse operation
@@ -1044,7 +1208,8 @@ type ParseJsonOptions = {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const parse = SchemaGetter.parseJson<string>()
- * await Effect.runPromise(parse.run(Option.some("{\"a\":1}"), {})) // => Option.some({ a: 1 })
+ * const result = await Effect.runPromise(SchemaGetter.run(parse, Option.some("{\"a\":1}"), {}))
+ * result // => Option.some({ a: 1 })
  * ```
  *
  * @see {@link stringifyJson} for the inverse operation
@@ -1055,9 +1220,9 @@ type ParseJsonOptions = {
 export function parseJson<E extends string>(): Getter<Schema.MutableJson, E>
 export function parseJson<E extends string>(options: ParseJsonOptions): Getter<unknown, E>
 export function parseJson<E extends string>(options?: ParseJsonOptions | undefined): Getter<unknown, E> {
-  return onSome((input, parseOptions) =>
+  return transformEffect((input, parseOptions) =>
     Effect.try({
-      try: () => Option.some(JSON.parse(input, options?.reviver)),
+      try: () => JSON.parse(input, options?.reviver),
       catch: () =>
         new SchemaIssue.InvalidValue(
           { expected: "a valid JSON string" },
@@ -1106,7 +1271,8 @@ type StringifyJsonOptions = {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const stringify = SchemaGetter.stringifyJson()
- * await Effect.runPromise(stringify.run(Option.some({ a: 1 }), {})) // => Option.some("{\"a\":1}")
+ * const result = await Effect.runPromise(SchemaGetter.run(stringify, Option.some({ a: 1 }), {}))
+ * result // => Option.some("{\"a\":1}")
  * ```
  *
  * @see {@link parseJson} for the inverse operation
@@ -1115,14 +1281,14 @@ type StringifyJsonOptions = {
  * @since 4.0.0
  */
 export function stringifyJson(options?: StringifyJsonOptions): Getter<string, unknown> {
-  return onSome((input, parseOptions) =>
+  return transformEffect((input, parseOptions) =>
     Effect.try({
       try: () => {
         const output = JSON.stringify(input, options?.replacer as any, options?.space)
         if (output === undefined) {
           throw new TypeError("Value cannot be represented as JSON")
         }
-        return Option.some(output)
+        return output
       },
       catch: () =>
         new SchemaIssue.InvalidValue(
@@ -1154,7 +1320,8 @@ export function stringifyJson(options?: StringifyJsonOptions): Getter<string, un
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const parse = SchemaGetter.splitKeyValue<string>()
- * await Effect.runPromise(parse.run(Option.some("a=1,b=2"), {})) // => Option.some({ a: "1", b: "2" })
+ * const result = Effect.runSync(SchemaGetter.run(parse, Option.some("a=1,b=2"), {}))
+ * result // => Option.some({ a: "1", b: "2" })
  * ```
  *
  * @see {@link joinKeyValue} for the inverse operation
@@ -1200,7 +1367,8 @@ export function splitKeyValue<E extends string>(options?: {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const join = SchemaGetter.joinKeyValue()
- * await Effect.runPromise(join.run(Option.some({ a: "1", b: "2" }), {})) // => Option.some("a=1,b=2")
+ * const result = Effect.runSync(SchemaGetter.run(join, Option.some({ a: "1", b: "2" }), {}))
+ * result // => Option.some("a=1,b=2")
  * ```
  *
  * @see {@link splitKeyValue} for the inverse operation
@@ -1238,7 +1406,8 @@ export function joinKeyValue<E extends Record<PropertyKey, string>>(options?: {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const splitComma = SchemaGetter.split<string>()
- * await Effect.runPromise(splitComma.run(Option.some("a,b,c"), {})) // => Option.some(["a", "b", "c"])
+ * const result = Effect.runSync(SchemaGetter.run(splitComma, Option.some("a,b,c"), {}))
+ * result // => Option.some(["a", "b", "c"])
  * ```
  *
  * @see {@link splitKeyValue} when values are key-value pairs
@@ -1266,7 +1435,8 @@ export function split<E extends string>(options?: {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const encode = SchemaGetter.encodeBase64<Uint8Array>()
- * await Effect.runPromise(encode.run(Option.some(new Uint8Array([1, 2, 3])), {})) // => Option.some("AQID")
+ * const result = Effect.runSync(SchemaGetter.run(encode, Option.some(new Uint8Array([1, 2, 3])), {}))
+ * result // => Option.some("AQID")
  * ```
  *
  * @see {@link decodeBase64} for the inverse operation to `Uint8Array`
@@ -1293,7 +1463,8 @@ export function encodeBase64<E extends Uint8Array | string>(): Getter<string, E>
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const encode = SchemaGetter.encodeBase64Url<Uint8Array>()
- * await Effect.runPromise(encode.run(Option.some(new Uint8Array([251, 255])), {})) // => Option.some("-_8")
+ * const result = Effect.runSync(SchemaGetter.run(encode, Option.some(new Uint8Array([251, 255])), {}))
+ * result // => Option.some("-_8")
  * ```
  *
  * @see {@link decodeBase64Url} for the inverse operation to `Uint8Array`
@@ -1320,7 +1491,8 @@ export function encodeBase64Url<E extends Uint8Array | string>(): Getter<string,
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const encode = SchemaGetter.encodeHex<Uint8Array>()
- * await Effect.runPromise(encode.run(Option.some(new Uint8Array([1, 2, 3])), {})) // => Option.some("010203")
+ * const result = Effect.runSync(SchemaGetter.run(encode, Option.some(new Uint8Array([1, 2, 3])), {}))
+ * result // => Option.some("010203")
  * ```
  *
  * @see {@link decodeHex} for the inverse operation to `Uint8Array`
@@ -1346,7 +1518,7 @@ export function encodeHex<E extends Uint8Array | string>(): Getter<string, E> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const decode = SchemaGetter.decodeBase64<string>()
- * const result = await Effect.runPromise(decode.run(Option.some("AQID"), {}))
+ * const result = await Effect.runPromise(SchemaGetter.run(decode, Option.some("AQID"), {}))
  * Option.map(result, Array.from) // => Option.some([1, 2, 3])
  * ```
  *
@@ -1357,7 +1529,7 @@ export function encodeHex<E extends Uint8Array | string>(): Getter<string, E> {
  * @since 4.0.0
  */
 export function decodeBase64<E extends string>(): Getter<Uint8Array, E> {
-  return transformOrFail((input, options) =>
+  return transformEffect((input, options) =>
     Effect.mapErrorEager(
       Effect.fromResult(Encoding.decodeBase64(input)),
       () =>
@@ -1383,7 +1555,8 @@ export function decodeBase64<E extends string>(): Getter<Uint8Array, E> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const decode = SchemaGetter.decodeBase64String<string>()
- * await Effect.runPromise(decode.run(Option.some("aGVsbG8="), {})) // => Option.some("hello")
+ * const result = await Effect.runPromise(SchemaGetter.run(decode, Option.some("aGVsbG8="), {}))
+ * result // => Option.some("hello")
  * ```
  *
  * @see {@link decodeBase64} to decode to `Uint8Array` instead
@@ -1393,7 +1566,7 @@ export function decodeBase64<E extends string>(): Getter<Uint8Array, E> {
  * @since 4.0.0
  */
 export function decodeBase64String<E extends string>(): Getter<string, E> {
-  return transformOrFail((input, options) =>
+  return transformEffect((input, options) =>
     Result.match(Encoding.decodeBase64String(input), {
       onFailure: () =>
         Effect.fail(
@@ -1421,7 +1594,7 @@ export function decodeBase64String<E extends string>(): Getter<string, E> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const decode = SchemaGetter.decodeBase64Url<string>()
- * const result = await Effect.runPromise(decode.run(Option.some("-_8="), {}))
+ * const result = await Effect.runPromise(SchemaGetter.run(decode, Option.some("-_8="), {}))
  * Option.map(result, Array.from) // => Option.some([251, 255])
  * ```
  *
@@ -1432,7 +1605,7 @@ export function decodeBase64String<E extends string>(): Getter<string, E> {
  * @since 4.0.0
  */
 export function decodeBase64Url<E extends string>(): Getter<Uint8Array, E> {
-  return transformOrFail((input, options) =>
+  return transformEffect((input, options) =>
     Result.match(Encoding.decodeBase64Url(input), {
       onFailure: () =>
         Effect.fail(
@@ -1460,7 +1633,8 @@ export function decodeBase64Url<E extends string>(): Getter<Uint8Array, E> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const decode = SchemaGetter.decodeBase64UrlString<string>()
- * await Effect.runPromise(decode.run(Option.some("aGVsbG8"), {})) // => Option.some("hello")
+ * const result = await Effect.runPromise(SchemaGetter.run(decode, Option.some("aGVsbG8"), {}))
+ * result // => Option.some("hello")
  * ```
  *
  * @see {@link decodeBase64Url} to decode to `Uint8Array` instead
@@ -1470,7 +1644,7 @@ export function decodeBase64Url<E extends string>(): Getter<Uint8Array, E> {
  * @since 4.0.0
  */
 export function decodeBase64UrlString<E extends string>(): Getter<string, E> {
-  return transformOrFail((input, options) =>
+  return transformEffect((input, options) =>
     Result.match(Encoding.decodeBase64UrlString(input), {
       onFailure: () =>
         Effect.fail(
@@ -1498,7 +1672,7 @@ export function decodeBase64UrlString<E extends string>(): Getter<string, E> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const decode = SchemaGetter.decodeHex<string>()
- * const result = await Effect.runPromise(decode.run(Option.some("010203"), {}))
+ * const result = await Effect.runPromise(SchemaGetter.run(decode, Option.some("010203"), {}))
  * Option.map(result, Array.from) // => Option.some([1, 2, 3])
  * ```
  *
@@ -1509,7 +1683,7 @@ export function decodeBase64UrlString<E extends string>(): Getter<string, E> {
  * @since 4.0.0
  */
 export function decodeHex<E extends string>(): Getter<Uint8Array, E> {
-  return transformOrFail((input, options) =>
+  return transformEffect((input, options) =>
     Result.match(Encoding.decodeHex(input), {
       onFailure: () =>
         Effect.fail(
@@ -1537,7 +1711,8 @@ export function decodeHex<E extends string>(): Getter<Uint8Array, E> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const decode = SchemaGetter.decodeHexString<string>()
- * await Effect.runPromise(decode.run(Option.some("68656c6c6f"), {})) // => Option.some("hello")
+ * const result = await Effect.runPromise(SchemaGetter.run(decode, Option.some("68656c6c6f"), {}))
+ * result // => Option.some("hello")
  * ```
  *
  * @see {@link decodeHex} to decode to `Uint8Array` instead
@@ -1547,7 +1722,7 @@ export function decodeHex<E extends string>(): Getter<Uint8Array, E> {
  * @since 4.0.0
  */
 export function decodeHexString<E extends string>(): Getter<string, E> {
-  return transformOrFail((input, options) =>
+  return transformEffect((input, options) =>
     Result.match(Encoding.decodeHexString(input), {
       onFailure: () =>
         Effect.fail(
@@ -1577,7 +1752,8 @@ export function decodeHexString<E extends string>(): Getter<string, E> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const encode = SchemaGetter.encodeUriComponent<string>()
- * await Effect.runPromise(encode.run(Option.some("hello world"), {})) // => Option.some("hello%20world")
+ * const result = Effect.runSync(SchemaGetter.run(encode, Option.some("hello world"), {}))
+ * result // => Option.some("hello%20world")
  * ```
  *
  * @see {@link decodeUriComponent} for the inverse operation
@@ -1602,7 +1778,8 @@ export function encodeUriComponent<E extends string>(): Getter<string, E> {
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const decode = SchemaGetter.decodeUriComponent<string>()
- * await Effect.runPromise(decode.run(Option.some("hello%20world"), {})) // => Option.some("hello world")
+ * const result = await Effect.runPromise(SchemaGetter.run(decode, Option.some("hello%20world"), {}))
+ * result // => Option.some("hello world")
  * ```
  *
  * @see {@link encodeUriComponent} for the inverse operation
@@ -1611,7 +1788,7 @@ export function encodeUriComponent<E extends string>(): Getter<string, E> {
  * @since 4.0.0
  */
 export function decodeUriComponent<E extends string>(): Getter<string, E> {
-  return transformOrFail((input, options) => {
+  return transformEffect((input, options) => {
     try {
       return Effect.succeed(globalThis.decodeURIComponent(input))
     } catch {
@@ -1649,7 +1826,9 @@ export function decodeUriComponent<E extends string>(): Getter<string, E> {
  * import { DateTime, Effect, Option, SchemaGetter } from "effect"
  *
  * const parseDate = SchemaGetter.dateTimeUtcFromInput<string>()
- * const result = await Effect.runPromise(parseDate.run(Option.some("2024-01-01T00:00:00Z"), {}))
+ * const result = await Effect.runPromise(
+ *   SchemaGetter.run(parseDate, Option.some("2024-01-01T00:00:00Z"), {})
+ * )
  * Option.map(result, DateTime.toEpochMillis) // => Option.some(1704067200000)
  * ```
  *
@@ -1659,7 +1838,7 @@ export function decodeUriComponent<E extends string>(): Getter<string, E> {
  * @since 4.0.0
  */
 export function dateTimeUtcFromInput<E extends DateTime.DateTime.Input>(): Getter<DateTime.Utc, E> {
-  return transformOrFail((input, options) => {
+  return transformEffect((input, options) => {
     return Option.match(DateTime.make(input), {
       onNone: () =>
         Effect.fail(
@@ -1692,7 +1871,8 @@ export function dateTimeUtcFromInput<E extends DateTime.DateTime.Input>(): Gette
  * const decode = SchemaGetter.decodeFormData()
  * const formData = new FormData()
  * formData.append("user[name]", "Alice")
- * await Effect.runPromise(decode.run(Option.some(formData), {})) // => Option.some({ user: { name: "Alice" } })
+ * const result = Effect.runSync(SchemaGetter.run(decode, Option.some(formData), {}))
+ * result // => Option.some({ user: { name: "Alice" } })
  * ```
  *
  * @see {@link encodeFormData} for the corresponding encoder
@@ -1730,7 +1910,7 @@ const collectFormDataEntries = collectBracketPathEntries((value): value is strin
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const encode = SchemaGetter.encodeFormData()
- * const result = await Effect.runPromise(encode.run(Option.some({ name: "Alice" }), {}))
+ * const result = Effect.runSync(SchemaGetter.run(encode, Option.some({ name: "Alice" }), {}))
  * Option.map(result, (formData) => formData.get("name")) // => Option.some("Alice")
  * ```
  *
@@ -1775,7 +1955,8 @@ export function encodeFormData(): Getter<FormData, unknown> {
  *
  * const decode = SchemaGetter.decodeURLSearchParams()
  * const params = new URLSearchParams("user[name]=Alice")
- * await Effect.runPromise(decode.run(Option.some(params), {})) // => Option.some({ user: { name: "Alice" } })
+ * const result = Effect.runSync(SchemaGetter.run(decode, Option.some(params), {}))
+ * result // => Option.some({ user: { name: "Alice" } })
  * ```
  *
  * @see {@link encodeURLSearchParams} for the corresponding encoder
@@ -1810,7 +1991,7 @@ const collectURLSearchParamsEntries = collectBracketPathEntries(Predicate.isStri
  * import { Effect, Option, SchemaGetter } from "effect"
  *
  * const encode = SchemaGetter.encodeURLSearchParams()
- * const result = await Effect.runPromise(encode.run(Option.some({ name: "Alice" }), {}))
+ * const result = Effect.runSync(SchemaGetter.run(encode, Option.some({ name: "Alice" }), {}))
  * Option.map(result, (params) => params.toString()) // => Option.some("name=Alice")
  * ```
  *
@@ -1830,8 +2011,6 @@ export function encodeURLSearchParams(): Getter<URLSearchParams, unknown> {
   })
 }
 
-const INDEX_REGEXP = /^\d+$/
-
 function bracketPathToTokens(bracketPath: string): Array<string | number> {
   // real empty path (from append("", value))
   if (bracketPath === "") {
@@ -1845,7 +2024,7 @@ function bracketPathToTokens(bracketPath: string): Array<string | number> {
 
   return parts
     .slice(start)
-    .map((part) => (INDEX_REGEXP.test(part) ? globalThis.Number(part) : part))
+    .map((part) => (Arr.isCanonicalArrayIndex(part) ? globalThis.Number(part) : part))
 }
 
 /**
@@ -1869,6 +2048,8 @@ function bracketPathToTokens(bracketPath: string): Array<string | number> {
  *   - `"foo[0]"` → array index `{ foo: [value] }`
  *   - `"foo[]"` → append to array `foo`
  *   - `""` → real empty key
+ * - Numeric bracket segments become array indices only when they are valid
+ *   JavaScript array-index strings; otherwise they remain object keys.
  * - Duplicate keys for the same path are merged into arrays.
  * - If a structural path conflicts with a previous leaf or a different container
  *   type, the later structural path replaces the conflicting value.
@@ -1899,6 +2080,7 @@ export function makeTreeRecord<A>(
 ): Schema.TreeRecord<A> {
   const out: any = {}
   const containers = new WeakSet<object>()
+  const duplicates = new WeakSet<object>()
 
   function getOrCreateContainer(self: any, key: PropertyKey, shouldBeArray: boolean): any {
     const current = Object.hasOwn(self, key) ? self[key] : undefined
@@ -1932,10 +2114,12 @@ export function makeTreeRecord<A>(
         // If we're setting a value at a path that already exists
         // convert it to an array to support multiple values for the same key
         const hasOwn = Object.hasOwn(cur, token)
-        if (hasOwn && Array.isArray(cur[token])) {
+        if (hasOwn && Array.isArray(cur[token]) && (containers.has(cur[token]) || duplicates.has(cur[token]))) {
           cur[token].push(value)
         } else if (hasOwn) {
-          InternalRecord.assignProperty(cur, token, [cur[token], value])
+          const values = [cur[token], value]
+          duplicates.add(values)
+          InternalRecord.assignProperty(cur, token, values)
         } else {
           InternalRecord.assignProperty(cur, token, value)
         }
diff --git a/repos/effect/packages/effect/src/SchemaIssue.ts b/repos/effect/packages/effect/src/SchemaIssue.ts
index 0ccf3a4a2..07e95a426 100644
--- a/repos/effect/packages/effect/src/SchemaIssue.ts
+++ b/repos/effect/packages/effect/src/SchemaIssue.ts
@@ -148,7 +148,16 @@ export type Issue =
   | Composite
   | AnyOf
 
-class Base {
+interface IssueNode {
+  readonly [TypeId]: typeof TypeId
+  /**
+   * The input reported by the schema parser, when input reporting is enabled
+   * and the issue is associated with a present value.
+   */
+  readonly input?: unknown
+}
+
+class IssueNodeImpl implements IssueNode {
   readonly [TypeId] = TypeId
   /**
    * The input reported by the schema parser, when input reporting is enabled
@@ -202,7 +211,43 @@ class Base {
  * @category models
  * @since 4.0.0
  */
-export class Filter extends Base {
+export interface Filter extends IssueNode {
+  readonly _tag: "Filter"
+  /**
+   * The filter that failed.
+   */
+  readonly filter: SchemaAST.Filter<unknown>
+  /**
+   * The issue that occurred.
+   */
+  readonly issue: Issue
+}
+
+/**
+ * Constructs a schema issue for a failed refinement check.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Filter: new(
+  /**
+   * The filter that failed.
+   */
+  filter: SchemaAST.Filter<any>,
+  /**
+   * The issue that occurred.
+   */
+  issue: Issue,
+  /**
+   * The present input associated with the issue. It is retained only when
+   * `options.reportInput` is `true`.
+   */
+  input?: unknown,
+  /**
+   * The effective parse options controlling input retention.
+   */
+  options?: SchemaAST.ParseOptions
+) => Filter = class extends IssueNodeImpl {
   readonly _tag = "Filter"
   /**
    * The filter that failed.
@@ -257,7 +302,30 @@ export class Filter extends Base {
  * @category models
  * @since 4.0.0
  */
-export class Encoding extends Base {
+export interface Encoding extends IssueNode {
+  readonly _tag: "Encoding"
+  /**
+   * The schema that caused the issue.
+   */
+  readonly ast: SchemaAST.AST
+  /**
+   * The issue that occurred.
+   */
+  readonly issue: Issue
+}
+
+/**
+ * Constructs a schema issue for a failed transformation.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Encoding: new(
+  ast: SchemaAST.AST,
+  issue: Issue,
+  input?: unknown,
+  options?: SchemaAST.ParseOptions
+) => Encoding = class extends IssueNodeImpl {
   readonly _tag = "Encoding"
   /**
    * The schema that caused the issue.
@@ -311,9 +379,27 @@ export class Encoding extends Base {
  * @see {@link Composite} — groups multiple issues under one schema node
  *
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
+ */
+export interface Pointer extends IssueNode {
+  readonly _tag: "Pointer"
+  /**
+   * The path to the location in the input that caused the issue.
+   */
+  readonly path: ReadonlyArray<PropertyKey>
+  /**
+   * The issue that occurred.
+   */
+  readonly issue: Issue
+}
+
+/**
+ * Constructs a schema issue that points to a nested location.
+ *
+ * @category constructors
+ * @since 4.0.0
  */
-export class Pointer extends Base {
+export const Pointer: new(path: ReadonlyArray<PropertyKey>, issue: Issue) => Pointer = class extends IssueNodeImpl {
   readonly _tag = "Pointer"
   /**
    * The path to the location in the input that caused the issue.
@@ -357,7 +443,23 @@ export class Pointer extends Base {
  * @category models
  * @since 4.0.0
  */
-export class MissingKey extends Base {
+export interface MissingKey extends IssueNode {
+  readonly _tag: "MissingKey"
+  /**
+   * The metadata for the issue.
+   */
+  readonly annotations: Schema.Annotations.Key<unknown> | undefined
+}
+
+/**
+ * Constructs a schema issue for a missing key or tuple index.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const MissingKey: new(annotations: Schema.Annotations.Key<unknown> | undefined) => MissingKey = class
+  extends IssueNodeImpl
+{
   readonly _tag = "MissingKey"
   /**
    * The metadata for the issue.
@@ -397,7 +499,25 @@ export class MissingKey extends Base {
  * @category models
  * @since 4.0.0
  */
-export class UnexpectedKey extends Base {
+export interface UnexpectedKey extends IssueNode {
+  readonly _tag: "UnexpectedKey"
+  /**
+   * The schema that caused the issue.
+   */
+  readonly ast: SchemaAST.AST
+}
+
+/**
+ * Constructs a schema issue for an unexpected key or tuple index.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const UnexpectedKey: new(
+  ast: SchemaAST.AST,
+  input?: unknown,
+  options?: SchemaAST.ParseOptions
+) => UnexpectedKey = class extends IssueNodeImpl {
   readonly _tag = "UnexpectedKey"
   /**
    * The schema that caused the issue.
@@ -440,9 +560,32 @@ export class UnexpectedKey extends Base {
  * @see {@link Pointer} — adds path context to individual issues
  *
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
+ */
+export interface Composite extends IssueNode {
+  readonly _tag: "Composite"
+  /**
+   * The schema that caused the issue.
+   */
+  readonly ast: SchemaAST.AST
+  /**
+   * The issues that occurred.
+   */
+  readonly issues: readonly [Issue, ...Array<Issue>]
+}
+
+/**
+ * Constructs a schema issue that groups multiple child issues.
+ *
+ * @category constructors
+ * @since 4.0.0
  */
-export class Composite extends Base {
+export const Composite: new(
+  ast: SchemaAST.AST,
+  issues: readonly [Issue, ...Array<Issue>],
+  input?: unknown,
+  options?: SchemaAST.ParseOptions
+) => Composite = class extends IssueNodeImpl {
   readonly _tag = "Composite"
   /**
    * The schema that caused the issue.
@@ -508,7 +651,25 @@ export class Composite extends Base {
  * @category models
  * @since 4.0.0
  */
-export class InvalidType extends Base {
+export interface InvalidType extends IssueNode {
+  readonly _tag: "InvalidType"
+  /**
+   * The schema that caused the issue.
+   */
+  readonly ast: SchemaAST.AST
+}
+
+/**
+ * Constructs a schema issue for an input with an invalid runtime type.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const InvalidType: new(
+  ast: SchemaAST.AST,
+  input?: unknown,
+  options?: SchemaAST.ParseOptions
+) => InvalidType = class extends IssueNodeImpl {
   readonly _tag = "InvalidType"
   /**
    * The schema that caused the issue.
@@ -569,7 +730,25 @@ export class InvalidType extends Base {
  * @category models
  * @since 4.0.0
  */
-export class InvalidValue extends Base {
+export interface InvalidValue extends IssueNode {
+  readonly _tag: "InvalidValue"
+  /**
+   * The metadata for the issue.
+   */
+  readonly annotations: Schema.Annotations.Issue | undefined
+}
+
+/**
+ * Constructs a schema issue for a value that violates a constraint.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const InvalidValue: new(
+  annotations?: Schema.Annotations.Issue | undefined,
+  input?: unknown,
+  options?: SchemaAST.ParseOptions
+) => InvalidValue = class extends IssueNodeImpl {
   readonly _tag = "InvalidValue"
   /**
    * The metadata for the issue.
@@ -641,9 +820,27 @@ export function makeCompositeAtKey(
  * @see {@link InvalidValue} — for value-constraint failures (not operation failures)
  *
  * @category models
- * @since 3.10.0
+ * @since 4.0.0
  */
-export class Forbidden extends Base {
+export interface Forbidden extends IssueNode {
+  readonly _tag: "Forbidden"
+  /**
+   * The metadata for the issue.
+   */
+  readonly annotations: Schema.Annotations.Issue | undefined
+}
+
+/**
+ * Constructs a schema issue for a forbidden parsing operation.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Forbidden: new(
+  annotations: Schema.Annotations.Issue | undefined,
+  input?: unknown,
+  options?: SchemaAST.ParseOptions
+) => Forbidden = class extends IssueNodeImpl {
   readonly _tag = "Forbidden"
   /**
    * The metadata for the issue.
@@ -695,7 +892,30 @@ export class Forbidden extends Base {
  * @category models
  * @since 4.0.0
  */
-export class AnyOf extends Base {
+export interface AnyOf extends IssueNode {
+  readonly _tag: "AnyOf"
+  /**
+   * The schema that caused the issue.
+   */
+  readonly ast: SchemaAST.Union
+  /**
+   * The issues that occurred.
+   */
+  readonly issues: ReadonlyArray<Issue>
+}
+
+/**
+ * Constructs a schema issue for a value that matches no union member.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const AnyOf: new(
+  ast: SchemaAST.Union,
+  issues: ReadonlyArray<Issue>,
+  input?: unknown,
+  options?: SchemaAST.ParseOptions
+) => AnyOf = class extends IssueNodeImpl {
   readonly _tag = "AnyOf"
   /**
    * The schema that caused the issue.
@@ -754,7 +974,30 @@ export class AnyOf extends Base {
  * @category models
  * @since 4.0.0
  */
-export class OneOf extends Base {
+export interface OneOf extends IssueNode {
+  readonly _tag: "OneOf"
+  /**
+   * The schema that caused the issue.
+   */
+  readonly ast: SchemaAST.Union
+  /**
+   * The schemas that were successful.
+   */
+  readonly successes: ReadonlyArray<SchemaAST.AST>
+}
+
+/**
+ * Constructs a schema issue for a value that matches multiple union members.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const OneOf: new(
+  ast: SchemaAST.Union,
+  successes: ReadonlyArray<SchemaAST.AST>,
+  input?: unknown,
+  options?: SchemaAST.ParseOptions
+) => OneOf = class extends IssueNodeImpl {
   readonly _tag = "OneOf"
   /**
    * The schema that caused the issue.
diff --git a/repos/effect/packages/effect/src/SchemaParser.ts b/repos/effect/packages/effect/src/SchemaParser.ts
index 7cc35ebff..2c955e9d7 100644
--- a/repos/effect/packages/effect/src/SchemaParser.ts
+++ b/repos/effect/packages/effect/src/SchemaParser.ts
@@ -13,9 +13,9 @@
 import * as Cause from "./Cause.ts"
 import * as Effect from "./Effect.ts"
 import * as Exit from "./Exit.ts"
-import { memoize } from "./Function.ts"
 import { effectIsExit } from "./internal/effect.ts"
 import * as InternalSchemaCause from "./internal/schema/cause.ts"
+import * as CompilerRegistry from "./internal/schema/compilerRegistry.ts"
 import * as InternalParser from "./internal/schema/parser.ts"
 import * as Option from "./Option.ts"
 import * as Result from "./Result.ts"
@@ -41,9 +41,10 @@ import * as SchemaIssue from "./SchemaIssue.ts"
  * @since 4.0.0
  */
 export function makeEffect<S extends Schema.Constraint>(schema: S) {
-  const parser = runWithCompiler<S["Type"], never>(constructorCompiler, SchemaAST.toType(schema.ast))
+  const ast = schema.ast
+  let parser: ReturnType<typeof runWithCompiler<S["Type"], never>>
   return (input: S["~type.make.in"], options?: Schema.MakeOptions): Effect.Effect<S["Type"], SchemaIssue.Issue> => {
-    return parser(
+    return (parser ??= runWithCompiler<S["Type"], never>(constructorCompiler, SchemaAST.toType(ast)))(
       input,
       options?.disableChecks
         ? options?.parseOptions ? { ...options.parseOptions, disableChecks: true } : { disableChecks: true }
@@ -108,18 +109,7 @@ export function makeOption<S extends Schema.Constraint>(schema: S) {
  * @since 4.0.0
  */
 export function make<S extends Schema.Constraint>(schema: S) {
-  const parser = makeEffect(schema)
-  return (input: S["~type.make.in"], options?: Schema.MakeOptions): S["Type"] => {
-    const exit = Effect.runSyncExit(parser(input, options))
-    if (Exit.isSuccess(exit)) {
-      return exit.value
-    }
-    const issue = InternalSchemaCause.getSchemaIssueOrThrow(
-      exit.cause,
-      "Constructor adapter can only throw schema issues"
-    )
-    throw new Error("Schema validation failed", { cause: issue })
-  }
+  return makeConstructorSync<S["Type"], S["~type.make.in"]>(SchemaAST.toType(schema.ast))
 }
 
 /**
@@ -149,19 +139,55 @@ export function is<S extends Schema.Constraint>(schema: S): <I>(input: I) => inp
   return _is<S["Type"]>(schema.ast)
 }
 
-/** @internal */
-export function _is<T>(ast: SchemaAST.AST) {
-  const parser = asExit(run<T, never>(SchemaAST.toType(ast)))
-  return <I>(input: I): input is I & T => {
-    const exit = parser(input, SchemaAST.defaultParseOptions)
-    if (Exit.isSuccess(exit)) {
-      return true
+function makeIs<T>(ast: SchemaAST.AST): <I>(input: I) => input is I & T {
+  if (!CompilerRegistry.compilerAdaptersEnabled) {
+    const parser = asExit(run<T, never>(ast))
+    return <I>(input: I): input is I & T => {
+      const exit = parser(input, SchemaAST.defaultParseOptions)
+      if (Exit.isSuccess(exit)) return true
+      InternalSchemaCause.getSchemaIssueOrThrow(
+        exit.cause,
+        "Type guard adapter can only return false for schema issues"
+      )
+      return false
+    }
+  }
+  const entry = CompilerRegistry.resolve(ast)
+  const guard = entry.is
+  if (guard !== undefined) {
+    return <I>(input: I): input is I & T => {
+      try {
+        return guard(input, SchemaAST.defaultParseOptions)
+      } catch (error) {
+        InternalSchemaCause.getSchemaIssueOrThrow(
+          Cause.die(error),
+          "Type guard adapter can only return false for schema issues"
+        )
+        return false
+      }
     }
+  }
+  const parser = entry.parser
+  return <I>(input: I): input is I & T => {
+    const exit = Effect.runSyncExit(parserResult<T, never>(parser(input, SchemaAST.defaultParseOptions), input))
+    if (Exit.isSuccess(exit)) return true
     InternalSchemaCause.getSchemaIssueOrThrow(exit.cause, "Type guard adapter can only return false for schema issues")
     return false
   }
 }
 
+/** @internal */
+export function _is<T>(ast: SchemaAST.AST) {
+  const typeAST = SchemaAST.toType(ast)
+  let guard: <I>(input: I) => input is I & T = <I>(input: I): input is I & T => {
+    guard = makeIs<T>(typeAST)
+    return guard(input)
+  }
+  return <I>(input: I): input is I & T => {
+    return guard(input)
+  }
+}
+
 /** @internal */
 export function _issue<T>(ast: SchemaAST.AST) {
   const parser = run<T, never>(ast)
@@ -525,7 +551,9 @@ export function decodeUnknownSync<S extends Schema.ConstraintDecoder<unknown>>(
   schema: S,
   options?: SchemaAST.ParseOptions
 ): (input: unknown, options?: SchemaAST.ParseOptions) => S["Type"] {
-  return asSync(decodeUnknownEffect(schema, options))
+  return CompilerRegistry.compilerAdaptersEnabled
+    ? makeSync(schema.ast, options)
+    : asSync(decodeUnknownEffect(schema, options))
 }
 
 /**
@@ -870,7 +898,9 @@ export function encodeUnknownSync<S extends Schema.ConstraintEncoder<unknown>>(
   schema: S,
   options?: SchemaAST.ParseOptions
 ): (input: unknown, options?: SchemaAST.ParseOptions) => S["Encoded"] {
-  return asSync(encodeUnknownEffect(schema, options))
+  return CompilerRegistry.compilerAdaptersEnabled
+    ? makeSync(SchemaAST.flip(schema.ast), options)
+    : asSync(encodeUnknownEffect(schema, options))
 }
 
 /**
@@ -925,6 +955,22 @@ export function run<T, R>(ast: SchemaAST.AST) {
   return runWithCompiler<T, R>(normalCompiler, ast)
 }
 
+function parserResult<T, R>(
+  result: Effect.Effect<unknown, SchemaIssue.Issue, any>,
+  input: unknown
+): Effect.Effect<T, SchemaIssue.Issue, R> {
+  if (result === InternalParser.sameExit) {
+    return Effect.succeed(input) as Effect.Effect<T, SchemaIssue.Issue, R>
+  }
+  if (!effectIsExit(result)) {
+    return Effect.flatMapEager(result, getValue)
+  }
+  return (result as InternalParser.Success<unknown, SchemaIssue.Issue>)[InternalParser.args] ===
+      InternalParser.missing
+    ? getValue(InternalParser.missing)
+    : result as Effect.Effect<T, SchemaIssue.Issue, R>
+}
+
 function runWithCompiler<T, R>(compiler: Compiler, ast: SchemaAST.AST) {
   let parser: Parser
   return (input: unknown, options?: SchemaAST.ParseOptions): Effect.Effect<T, SchemaIssue.Issue, R> => {
@@ -997,6 +1043,49 @@ function asResult<T, E, R>(
   }
 }
 
+function makeSync<T>(
+  ast: SchemaAST.AST,
+  options?: SchemaAST.ParseOptions
+): (input: unknown, options?: SchemaAST.ParseOptions) => T {
+  let run: ((input: unknown, options?: SchemaAST.ParseOptions) => T) | undefined
+  return (input, overrideOptions) =>
+    (run ??= makeSyncEntry<T>(CompilerRegistry.resolve(ast), options))(input, overrideOptions)
+}
+
+function makeSyncEntry<T>(
+  entry: CompilerRegistry.Entry,
+  options?: SchemaAST.ParseOptions
+): (input: unknown, options?: SchemaAST.ParseOptions) => T {
+  const decode = entry.decode
+  let detailed: ((input: unknown, options?: SchemaAST.ParseOptions) => T) | undefined
+  const run = decode === undefined
+    ? (input: unknown, parseOptions = SchemaAST.defaultParseOptions): T =>
+      (detailed ??= makeDetailedSync<T>(entry))(input, parseOptions)
+    : (input: unknown, parseOptions = SchemaAST.defaultParseOptions): T => {
+      if (input === InternalParser.missing) {
+        return (detailed ??= makeDetailedSync<T>(entry))(input, parseOptions)
+      }
+      let output: unknown
+      try {
+        output = decode(input, parseOptions)
+      } catch (error) {
+        InternalSchemaCause.getSchemaIssueOrThrow(Cause.die(error), "Sync adapter can only throw schema issues")
+        throw error
+      }
+      if (output !== CompilerRegistry.invalid) return output as T
+      return (detailed ??= makeDetailedSync<T>(entry))(input, parseOptions)
+    }
+  return options === undefined
+    ? run
+    : (input, overrideOptions) => run(input, mergeParseOptions(options, overrideOptions))
+}
+
+function makeDetailedSync<T>(
+  entry: CompilerRegistry.Entry
+): (input: unknown, options?: SchemaAST.ParseOptions) => T {
+  return asSync(runWithCompiler<T, never>(() => entry.decodeEffect, entry.ast))
+}
+
 function asSync<T, E>(
   parser: (input: E, options?: SchemaAST.ParseOptions) => Effect.Effect<T, SchemaIssue.Issue>
 ): (input: E, options?: SchemaAST.ParseOptions) => T {
@@ -1011,6 +1100,41 @@ function asSync<T, E>(
   }
 }
 
+function runSync<T>(effect: Effect.Effect<T, SchemaIssue.Issue>, message: string): T {
+  const exit = Effect.runSyncExit(effect)
+  if (Exit.isSuccess(exit)) {
+    return exit.value
+  }
+  const issue = InternalSchemaCause.getSchemaIssueOrThrow(exit.cause, message)
+  throw new Error("Schema validation failed", { cause: issue })
+}
+
+function makeConstructorSync<T, E>(
+  ast: SchemaAST.AST
+): (input: E, options?: Schema.MakeOptions) => T {
+  let entry: CompilerRegistry.Entry | undefined
+  let parser: Parser | undefined
+  return (input, options) => {
+    entry ??= CompilerRegistry.resolve(ast)
+    const parseOptions = options?.disableChecks
+      ? options.parseOptions ? { ...options.parseOptions, disableChecks: true } : { disableChecks: true }
+      : options?.parseOptions ?? SchemaAST.defaultParseOptions
+    const make = entry.make
+    if (make !== undefined && input !== InternalParser.missing) {
+      let output: unknown
+      try {
+        output = make(input, parseOptions)
+      } catch (error) {
+        InternalSchemaCause.getSchemaIssueOrThrow(Cause.die(error), "Constructor adapter can only throw schema issues")
+        throw error
+      }
+      if (output !== CompilerRegistry.invalid && output !== InternalParser.missing) return output as T
+    }
+    const result = (parser ??= entry.makeEffect)(input, parseOptions)
+    return runSync(parserResult<T, never>(result, input), "Constructor adapter can only throw schema issues")
+  }
+}
+
 /** @internal */
 export interface Parser {
   (
@@ -1024,196 +1148,5 @@ export interface Compiler {
   (ast: SchemaAST.AST): Parser
 }
 
-const normalCompiler: Compiler = memoize((ast) => makeParser(ast, normalCompiler))
-const constructorCompiler: Compiler = memoize((ast) => makeParser(ast, constructorCompiler, compileConstructorDefault))
-const compileDefaulted = memoize((ast: SchemaAST.AST) =>
-  makeParser(ast, constructorCompiler, compileConstructorDefault, ast.context?.constructorDefault)
-)
-
-function compileConstructorDefault(ast: SchemaAST.AST): Parser {
-  return ast.context?.constructorDefault ? compileDefaulted(ast) : constructorCompiler(ast)
-}
-
-function applyTransformation(
-  result: Effect.Effect<unknown, SchemaIssue.Issue, unknown>,
-  current: unknown,
-  transformation: SchemaAST.Link["transformation"],
-  options: SchemaAST.ParseOptions
-): Effect.Effect<unknown, SchemaIssue.Issue, unknown> {
-  let transformed: Effect.Effect<Option.Option<unknown>, SchemaIssue.Issue, unknown>
-  if (effectIsExit(result) && result._tag === "Success") {
-    const optional = InternalParser.toOption(
-      result === InternalParser.sameExit
-        ? current
-        : (result as InternalParser.Success<unknown, SchemaIssue.Issue>)[InternalParser.args]
-    )
-    transformed = transformation._tag === "Transformation"
-      ? transformation.decode.run(optional, options)
-      : transformation.decode(InternalParser.succeed(optional), options)
-  } else if (transformation._tag === "Transformation") {
-    transformed = Effect.flatMapEager(
-      result,
-      (value) => transformation.decode.run(InternalParser.toOption(value), options)
-    )
-  } else {
-    transformed = transformation.decode(
-      Effect.mapEager(result, InternalParser.toOption),
-      options
-    )
-  }
-  return effectIsExit(transformed) && transformed._tag === "Success"
-    ? InternalParser.fromOptionExit(
-      (transformed as InternalParser.Success<Option.Option<unknown>, SchemaIssue.Issue>)[InternalParser.args]
-    )
-    : Effect.flatMapEager(transformed, InternalParser.fromOptionExit)
-}
-
-function makeConstructorParser(descriptor: SchemaAST.ConstructorDescriptor, compile: Compiler): Parser {
-  let sourceParser: Parser
-  return (input, options) => {
-    if (input === InternalParser.missing) return InternalParser.missingExit
-    if (descriptor.isConstructed(input)) return InternalParser.sameExit
-    const result = (sourceParser ??= compile(descriptor.link.to))(input, options)
-    return applyTransformation(result, input, descriptor.link.transformation, options)
-  }
-}
-
-function makeParser(
-  ast: SchemaAST.AST,
-  compile: Compiler,
-  compileConstructorDefault?: Compiler,
-  constructorDefault?: SchemaAST.Link
-): Parser {
-  const descriptor = compileConstructorDefault ? SchemaAST.getConstructorDescriptor(ast) : undefined
-  const parser = descriptor
-    ? makeConstructorParser(descriptor, compile)
-    : ast.getParser(compile, compileConstructorDefault)
-  const checks = ast.checks
-  const links = constructorDefault
-    ? ast.encoding ? [...ast.encoding, constructorDefault] : [constructorDefault]
-    : ast.encoding
-  const encodingChecks = (ast as any).encodingChecks
-  const astOptions = (checks ? checks[checks.length - 1].annotations : ast.annotations)
-    ?.["parseOptions"]
-  if (!links && !checks && !encodingChecks) {
-    if (!astOptions) {
-      return parser
-    }
-    return (input, options) => parser(input, mergeParseOptions(options, astOptions))
-  }
-  let encodingParsers: ReadonlyArray<Parser> | undefined
-  const parseLocal = (
-    input: unknown,
-    options: SchemaAST.ParseOptions
-  ) => {
-    let result = parser(input, options)
-    if (encodingChecks && !options.disableChecks) {
-      if (effectIsExit(result)) {
-        if (result._tag === "Success") {
-          const output = result === InternalParser.sameExit
-            ? input
-            : (result as InternalParser.Success<unknown, SchemaIssue.Issue>)[InternalParser.args]
-          if (input !== InternalParser.missing && output !== InternalParser.missing) {
-            const issues = SchemaAST.collectIssues(encodingChecks, input, undefined, ast, options)
-            if (issues) {
-              result = Effect.fail(new SchemaIssue.Composite(ast, issues, input, options))
-            }
-          }
-        }
-      } else {
-        result = Effect.flatMap(result, (value) => {
-          if (input !== InternalParser.missing && value !== InternalParser.missing) {
-            const issues = SchemaAST.collectIssues(encodingChecks, input, undefined, ast, options)
-            if (issues) {
-              return Effect.fail(new SchemaIssue.Composite(ast, issues, input, options))
-            }
-          }
-          return Effect.succeed(value)
-        })
-      }
-    }
-
-    if (checks && !options.disableChecks) {
-      if (effectIsExit(result)) {
-        if (result._tag === "Success") {
-          const value = result === InternalParser.sameExit
-            ? input
-            : (result as InternalParser.Success<unknown, SchemaIssue.Issue>)[InternalParser.args]
-          if (value === InternalParser.missing) return result
-          const issues = SchemaAST.collectIssues(checks, value, undefined, ast, options)
-          if (issues) {
-            result = Effect.fail(new SchemaIssue.Composite(ast, issues, value, options))
-          }
-        }
-      } else {
-        result = Effect.flatMap(result, (value) => {
-          if (value !== InternalParser.missing) {
-            const issues = SchemaAST.collectIssues(checks, value, undefined, ast, options)
-            if (issues) {
-              return Effect.fail(new SchemaIssue.Composite(ast, issues, value, options))
-            }
-          }
-          return Effect.succeed(value)
-        })
-      }
-    }
-
-    return result
-  }
-  if (!links) {
-    return astOptions
-      ? (input, options) => parseLocal(input, mergeParseOptions(options, astOptions))
-      : parseLocal
-  }
-  return (
-    input: unknown,
-    options: SchemaAST.ParseOptions
-  ) => {
-    if (astOptions) {
-      options = mergeParseOptions(options, astOptions)
-    }
-    const parsers = encodingParsers ??= links.map((link) => compile(link.to))
-    let current = input
-    let result = parsers[parsers.length - 1](input, options)
-    for (let i = links.length - 1; i >= 0; i--) {
-      result = applyTransformation(result, current, links[i].transformation, options)
-      if (i !== 0) {
-        const next = parsers[i - 1]
-        if ((result as Exit.Exit<unknown, unknown>)._tag === "Success") {
-          current = (result as InternalParser.Success<unknown, SchemaIssue.Issue>)[InternalParser.args]
-          result = next(current, options)
-        } else {
-          result = Effect.flatMapEager(result, (value) => {
-            const nextResult = next(value, options)
-            return nextResult === InternalParser.sameExit ? InternalParser.succeed(value) : nextResult
-          })
-        }
-      }
-    }
-    if ((result as Exit.Exit<unknown, unknown>)._tag === "Success") {
-      const value = (result as InternalParser.Success<unknown, SchemaIssue.Issue>)[InternalParser.args]
-      const local = parseLocal(value, options)
-      return local === InternalParser.sameExit ? result : local
-    }
-    result = Effect.catchCause(
-      result,
-      (cause) =>
-        Effect.failCauseSync(() =>
-          Cause.map(
-            cause,
-            (issue) =>
-              new SchemaIssue.Encoding(
-                ast,
-                issue,
-                input,
-                options
-              )
-          )
-        )
-    )
-    return Effect.flatMapEager(result, (value) => {
-      const local = parseLocal(value, options)
-      return local === InternalParser.sameExit ? InternalParser.succeed(value) : local
-    })
-  }
-}
+const normalCompiler: Compiler = (ast) => CompilerRegistry.resolve(ast).parser
+const constructorCompiler: Compiler = (ast) => CompilerRegistry.resolve(ast).makeEffect
diff --git a/repos/effect/packages/effect/src/SchemaRepresentation.ts b/repos/effect/packages/effect/src/SchemaRepresentation.ts
index c554eed14..cfcd31c48 100644
--- a/repos/effect/packages/effect/src/SchemaRepresentation.ts
+++ b/repos/effect/packages/effect/src/SchemaRepresentation.ts
@@ -6,7 +6,6 @@
 import * as InternalRecord from "./internal/record.ts"
 import * as InternalFromJsonSchemaDocument from "./internal/schema/fromJsonSchemaDocument.ts"
 import * as InternalFromRepresentation from "./internal/schema/fromRepresentation.ts"
-import * as InternalSchema from "./internal/schema/schema.ts"
 import * as InternalToCodeDocument from "./internal/schema/toCodeDocument.ts"
 import * as InternalToJsonSchemaDocument from "./internal/schema/toJsonSchemaDocument.ts"
 import * as InternalToRepresentation from "./internal/schema/toRepresentation.ts"
@@ -14,7 +13,7 @@ import type * as JsonSchema from "./JsonSchema.ts"
 import * as Option from "./Option.ts"
 import * as Schema from "./Schema.ts"
 import * as SchemaAST from "./SchemaAST.ts"
-import * as SchemaGetter from "./SchemaGetter.ts"
+import * as InternalGetter from "./SchemaGetter.ts"
 
 /**
  * Open persistence identity carried by declarations and opaque checks.
@@ -60,8 +59,8 @@ export declare namespace ToJsonSchema {
    * **Gotchas**
    *
    * Treat the input schemas as immutable. The returned value must be a valid JSON Schema object graph and must not be
-   * mutated after this function returns. Return a new object graph to produce different output during a later
-   * compilation.
+   * mutated after this function returns. Local `$defs` references must use valid JSON Pointer URI fragments. Return a
+   * new object graph to produce different output during a later compilation.
    *
    * @category models
    * @since 4.0.0
@@ -275,7 +274,12 @@ export interface Literal extends Keyword<"Literal"> {
 }
 
 /**
- * A unique global symbol representation.
+ * A unique symbol representation.
+ *
+ * **Details**
+ *
+ * Globally registered symbols have an exact JSON string representation. Local
+ * symbols have no JSON representation.
  *
  * @category models
  * @since 4.0.0
@@ -297,7 +301,7 @@ export interface ObjectKeyword extends Keyword<"ObjectKeyword"> {}
  *
  * **Details**
  *
- * Enum members are stored as native string or number values. Persistent
+ * Enum members are stored as native string or finite number values. Persistent
  * codecs add an explicit type discriminator when encoding them.
  *
  * @category models
@@ -341,265 +345,1816 @@ export interface Arrays extends Keyword<"Arrays"> {
 }
 
 /**
- * A property signature.
+ * A property signature.
+ *
+ * **Details**
+ *
+ * The live representation stores the native property key. Persistent codecs
+ * add an explicit type discriminator when encoding it.
+ *
+ * **Gotchas**
+ *
+ * Local symbols can be represented while the schema is live, but persistent
+ * codecs reject them because they cannot be reconstructed by identity.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface PropertySignature {
+  readonly name: PropertyKey
+  readonly type: Representation
+  readonly isOptional: boolean
+  readonly isMutable: boolean
+  readonly annotations?: Schema.Annotations.Annotations | undefined
+}
+
+/**
+ * An index signature.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface IndexSignature {
+  readonly parameter: Representation
+  readonly type: Representation
+}
+
+/**
+ * An object representation.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface Objects extends Keyword<"Objects"> {
+  readonly propertySignatures: ReadonlyArray<PropertySignature>
+  readonly indexSignatures: ReadonlyArray<IndexSignature>
+}
+
+/**
+ * A union representation.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface Union extends Keyword<"Union"> {
+  readonly types: ReadonlyArray<Representation>
+  readonly options?: SchemaAST.UnionOptions | undefined
+}
+
+/**
+ * The structural schema representation.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type Representation =
+  | Declaration
+  | Reference
+  | Suspend
+  | Null
+  | Undefined
+  | Void
+  | Never
+  | Unknown
+  | Any
+  | String
+  | Number
+  | Boolean
+  | BigInt
+  | Symbol
+  | Literal
+  | UniqueSymbol
+  | ObjectKeyword
+  | Enum
+  | TemplateLiteral
+  | Arrays
+  | Objects
+  | Union
+
+/**
+ * A structural check.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type Check = Filter | FilterGroup
+
+/**
+ * An opaque leaf check.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface Filter {
+  readonly _tag: "Filter"
+  readonly representation?: CheckRepresentationAnnotation<Representation> | undefined
+  readonly annotations?: Schema.Annotations.Annotations | undefined
+  readonly aborted: boolean
+}
+
+/**
+ * A non-empty group of checks.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface FilterGroup {
+  readonly _tag: "FilterGroup"
+  readonly representation?: CheckRepresentationAnnotation<Representation> | undefined
+  readonly annotations?: Schema.Annotations.Annotations | undefined
+  readonly checks: readonly [Check, ...Array<Check>]
+}
+
+/**
+ * Named representation definitions.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface References {
+  readonly [$ref: string]: Representation
+}
+
+/**
+ * A single representation and its definitions.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface Document {
+  readonly representation: Representation
+  readonly references: References
+}
+
+/**
+ * Multiple representations sharing definitions.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface MultiDocument {
+  readonly representations: readonly [Representation, ...Array<Representation>]
+  readonly references: References
+}
+
+/**
+ * Reviver for a declaration.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface DeclarationReviver<P> {
+  readonly id: string
+  readonly payloadSchema: Schema.Decoder<P>
+  readonly revive: (input: {
+    readonly payload: P
+    readonly typeParameters: ReadonlyArray<Schema.Top>
+    readonly annotations: Schema.Annotations.Annotations | undefined
+  }) => Schema.Top
+}
+
+/**
+ * Reviver for a leaf check.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface FilterReviver<P> {
+  readonly id: string
+  readonly payloadSchema: Schema.Decoder<P>
+  readonly revive: (input: {
+    readonly payload: P
+    readonly schemas: ReadonlyArray<Schema.Top>
+    readonly annotations: Schema.Annotations.Filter | undefined
+  }) => SchemaAST.Filter<any>
+}
+
+/**
+ * Reviver for a check group.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface FilterGroupReviver<P> {
+  readonly id: string
+  readonly payloadSchema: Schema.Decoder<P>
+  readonly revive: (input: {
+    readonly payload: P
+    readonly schemas: ReadonlyArray<Schema.Top>
+    readonly annotations: Schema.Annotations.Filter | undefined
+  }) => SchemaAST.FilterGroup<any>
+}
+
+/**
+ * A check reviver.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type CheckReviver<P> = FilterReviver<P> | FilterGroupReviver<P>
+
+/**
+ * A typed reviver.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type Reviver<P> = DeclarationReviver<P> | CheckReviver<P>
+
+/**
+ * A reviver erased only at collection boundaries.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type AnyReviver = Reviver<any>
+
+/**
+ * Creates a declaration reviver while inferring its payload type from `payloadSchema`.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const makeReviverDeclaration: <P>(
+  id: string,
+  payloadSchema: Schema.Decoder<P>,
+  revive: DeclarationReviver<P>["revive"]
+) => DeclarationReviver<P> = (id, payloadSchema, revive) => ({ id, payloadSchema, revive })
+
+/**
+ * Creates a filter reviver while inferring its payload type from `payloadSchema`.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const makeReviverFilter: <P>(
+  id: string,
+  payloadSchema: Schema.Decoder<P>,
+  revive: FilterReviver<P>["revive"]
+) => FilterReviver<P> = (id, payloadSchema, revive) => ({ id, payloadSchema, revive })
+
+/**
+ * Creates a filter group reviver while inferring its payload type from `payloadSchema`.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const makeReviverFilterGroup: <P>(
+  id: string,
+  payloadSchema: Schema.Decoder<P>,
+  revive: FilterGroupReviver<P>["revive"]
+) => FilterGroupReviver<P> = (id, payloadSchema, revive) => ({ id, payloadSchema, revive })
+
+function makeFixedDeclarationReviver(id: string, schema: Schema.Top): DeclarationReviver<null> {
+  return makeReviverDeclaration(
+    id,
+    Schema.Null,
+    ({ annotations }) => annotations === undefined ? schema : schema.annotate(annotations)
+  )
+}
+
+const IsPatternPayload = Schema.Struct({
+  source: Schema.String,
+  flags: Schema.String
+}).check(Schema.makeFilter((payload: { readonly source: string; readonly flags: string }) => {
+  try {
+    const regExp = new globalThis.RegExp(payload.source, payload.flags)
+    return regExp.source === payload.source && regExp.flags === payload.flags
+  } catch {
+    return false
+  }
+}))
+
+type ErrorRepresentationOptions = {
+  readonly includeStack?: true | undefined
+  readonly excludeCause?: true | undefined
+}
+type ErrorRepresentationPayload = ErrorRepresentationOptions | null
+const ErrorOptionsPayload = Schema.declare((input): input is ErrorRepresentationOptions => {
+  if (typeof input !== "object" || input === null) return false
+  const object = input as Record<string, unknown>
+  const keys = globalThis.Object.keys(input)
+  return keys.length > 0 &&
+    keys.every((key) => (key === "includeStack" || key === "excludeCause") && object[key] === true)
+})
+const ErrorRepresentationPayload: Schema.Decoder<ErrorRepresentationPayload> = Schema.Union([
+  Schema.Null,
+  ErrorOptionsPayload
+])
+
+type RedactedRepresentationOptions = {
+  readonly label?: string | undefined
+  readonly disallowJsonEncode?: true | undefined
+}
+type RedactedRepresentationPayload = RedactedRepresentationOptions | null
+const RedactedOptionsPayload = Schema.declare((input): input is RedactedRepresentationOptions => {
+  if (typeof input !== "object" || input === null) return false
+  const object = input as Record<string, unknown>
+  const keys = globalThis.Object.keys(input)
+  return keys.length > 0 && keys.every((key) => {
+    switch (key) {
+      case "label":
+        return typeof object[key] === "string"
+      case "disallowJsonEncode":
+        return object[key] === true
+      default:
+        return false
+    }
+  })
+})
+const RedactedRepresentationPayload: Schema.Decoder<RedactedRepresentationPayload> = Schema.Union([
+  Schema.Null,
+  RedactedOptionsPayload
+])
+
+/**
+ * Reviver for persisted `isTrimmed` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isTrimmed}.
+ *
+ * @see {@link Schema.isTrimmed} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isTrimmedReviver: FilterReviver<null> = makeReviverFilter(
+  "effect/schema/isTrimmed",
+  Schema.Null,
+  ({ annotations }) => Schema.isTrimmed(annotations)
+)
+
+/**
+ * Reviver for persisted `isPattern` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isPattern}.
+ *
+ * @see {@link Schema.isPattern} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isPatternReviver: FilterReviver<{
+  readonly source: string
+  readonly flags: string
+}> = makeReviverFilter(
+  "effect/schema/isPattern",
+  IsPatternPayload,
+  ({ annotations, payload }) => Schema.isPattern(new globalThis.RegExp(payload.source, payload.flags), annotations)
+)
+
+/**
+ * Reviver for persisted `isStringFinite` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isStringFinite}.
+ *
+ * @see {@link Schema.isStringFinite} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isStringFiniteReviver: FilterReviver<null> = makeReviverFilter(
+  "effect/schema/isStringFinite",
+  Schema.Null,
+  ({ annotations }) => Schema.isStringFinite(annotations)
+)
+
+/**
+ * Reviver for persisted `isStringBigInt` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isStringBigInt}.
+ *
+ * @see {@link Schema.isStringBigInt} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isStringBigIntReviver: FilterReviver<null> = makeReviverFilter(
+  "effect/schema/isStringBigInt",
+  Schema.Null,
+  ({ annotations }) => Schema.isStringBigInt(annotations)
+)
+
+/**
+ * Reviver for persisted `isStringSymbol` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isStringSymbol}.
+ *
+ * @see {@link Schema.isStringSymbol} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isStringSymbolReviver: FilterReviver<null> = makeReviverFilter(
+  "effect/schema/isStringSymbol",
+  Schema.Null,
+  ({ annotations }) => Schema.isStringSymbol(annotations)
+)
+
+/**
+ * Reviver for persisted `isUUID` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isUUID}.
+ *
+ * @see {@link Schema.isUUID} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isUUIDReviver: FilterReviver<{
+  readonly version: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | null
+}> = makeReviverFilter(
+  "effect/schema/isUUID",
+  Schema.Struct({ version: Schema.Union([Schema.Literals([1, 2, 3, 4, 5, 6, 7, 8]), Schema.Null]) }),
+  ({ annotations, payload }) => Schema.isUUID(payload.version ?? undefined, annotations)
+)
+
+/**
+ * Reviver for persisted `isGUID` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isGUID}.
+ *
+ * @see {@link Schema.isGUID} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isGUIDReviver: FilterReviver<null> = makeReviverFilter(
+  "effect/schema/isGUID",
+  Schema.Null,
+  ({ annotations }) => Schema.isGUID(annotations)
+)
+
+/**
+ * Reviver for persisted `isULID` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isULID}.
+ *
+ * @see {@link Schema.isULID} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isULIDReviver: FilterReviver<null> = makeReviverFilter(
+  "effect/schema/isULID",
+  Schema.Null,
+  ({ annotations }) => Schema.isULID(annotations)
+)
+
+/**
+ * Reviver for persisted `isBase64` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isBase64}.
+ *
+ * @see {@link Schema.isBase64} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isBase64Reviver: FilterReviver<null> = makeReviverFilter(
+  "effect/schema/isBase64",
+  Schema.Null,
+  ({ annotations }) => Schema.isBase64(annotations)
+)
+
+/**
+ * Reviver for persisted `isBase64Url` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isBase64Url}.
+ *
+ * @see {@link Schema.isBase64Url} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isBase64UrlReviver: FilterReviver<null> = makeReviverFilter(
+  "effect/schema/isBase64Url",
+  Schema.Null,
+  ({ annotations }) => Schema.isBase64Url(annotations)
+)
+
+/**
+ * Reviver for persisted `isStartsWith` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isStartsWith}.
+ *
+ * @see {@link Schema.isStartsWith} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isStartsWithReviver: FilterReviver<{
+  readonly startsWith: string
+}> = makeReviverFilter(
+  "effect/schema/isStartsWith",
+  Schema.Struct({ startsWith: Schema.String }),
+  ({ annotations, payload }) => Schema.isStartsWith(payload.startsWith, annotations)
+)
+
+/**
+ * Reviver for persisted `isEndsWith` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isEndsWith}.
+ *
+ * @see {@link Schema.isEndsWith} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isEndsWithReviver: FilterReviver<{
+  readonly endsWith: string
+}> = makeReviverFilter(
+  "effect/schema/isEndsWith",
+  Schema.Struct({ endsWith: Schema.String }),
+  ({ annotations, payload }) => Schema.isEndsWith(payload.endsWith, annotations)
+)
+
+/**
+ * Reviver for persisted `isIncludes` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isIncludes}.
+ *
+ * @see {@link Schema.isIncludes} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isIncludesReviver: FilterReviver<{
+  readonly includes: string
+}> = makeReviverFilter(
+  "effect/schema/isIncludes",
+  Schema.Struct({ includes: Schema.String }),
+  ({ annotations, payload }) => Schema.isIncludes(payload.includes, annotations)
+)
+
+/**
+ * Reviver for persisted `isUppercased` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isUppercased}.
+ *
+ * @see {@link Schema.isUppercased} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isUppercasedReviver: FilterReviver<null> = makeReviverFilter(
+  "effect/schema/isUppercased",
+  Schema.Null,
+  ({ annotations }) => Schema.isUppercased(annotations)
+)
+
+/**
+ * Reviver for persisted `isLowercased` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isLowercased}.
+ *
+ * @see {@link Schema.isLowercased} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isLowercasedReviver: FilterReviver<null> = makeReviverFilter(
+  "effect/schema/isLowercased",
+  Schema.Null,
+  ({ annotations }) => Schema.isLowercased(annotations)
+)
+
+/**
+ * Reviver for persisted `isCapitalized` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isCapitalized}.
+ *
+ * @see {@link Schema.isCapitalized} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isCapitalizedReviver: FilterReviver<null> = makeReviverFilter(
+  "effect/schema/isCapitalized",
+  Schema.Null,
+  ({ annotations }) => Schema.isCapitalized(annotations)
+)
+
+/**
+ * Reviver for persisted `isUncapitalized` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isUncapitalized}.
+ *
+ * @see {@link Schema.isUncapitalized} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isUncapitalizedReviver: FilterReviver<null> = makeReviverFilter(
+  "effect/schema/isUncapitalized",
+  Schema.Null,
+  ({ annotations }) => Schema.isUncapitalized(annotations)
+)
+
+/**
+ * Reviver for persisted `isFinite` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isFinite}.
+ *
+ * @see {@link Schema.isFinite} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isFiniteReviver: FilterReviver<null> = makeReviverFilter(
+  "effect/schema/isFinite",
+  Schema.Null,
+  ({ annotations }) => Schema.isFinite(annotations)
+)
+
+/**
+ * Reviver for persisted `isGreaterThan` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isGreaterThan}.
+ *
+ * @see {@link Schema.isGreaterThan} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isGreaterThanReviver: FilterReviver<{
+  readonly exclusiveMinimum: number
+}> = makeReviverFilter(
+  "effect/schema/isGreaterThan",
+  Schema.Struct({ exclusiveMinimum: Schema.Finite }),
+  ({ annotations, payload }) => Schema.isGreaterThan(payload.exclusiveMinimum, annotations)
+)
+
+/**
+ * Reviver for persisted `isGreaterThanOrEqualTo` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isGreaterThanOrEqualTo}.
+ *
+ * @see {@link Schema.isGreaterThanOrEqualTo} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isGreaterThanOrEqualToReviver: FilterReviver<{
+  readonly minimum: number
+}> = makeReviverFilter(
+  "effect/schema/isGreaterThanOrEqualTo",
+  Schema.Struct({ minimum: Schema.Finite }),
+  ({ annotations, payload }) => Schema.isGreaterThanOrEqualTo(payload.minimum, annotations)
+)
+
+/**
+ * Reviver for persisted `isLessThan` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isLessThan}.
+ *
+ * @see {@link Schema.isLessThan} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isLessThanReviver: FilterReviver<{
+  readonly exclusiveMaximum: number
+}> = makeReviverFilter(
+  "effect/schema/isLessThan",
+  Schema.Struct({ exclusiveMaximum: Schema.Finite }),
+  ({ annotations, payload }) => Schema.isLessThan(payload.exclusiveMaximum, annotations)
+)
+
+/**
+ * Reviver for persisted `isLessThanOrEqualTo` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isLessThanOrEqualTo}.
+ *
+ * @see {@link Schema.isLessThanOrEqualTo} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isLessThanOrEqualToReviver: FilterReviver<{
+  readonly maximum: number
+}> = makeReviverFilter(
+  "effect/schema/isLessThanOrEqualTo",
+  Schema.Struct({ maximum: Schema.Finite }),
+  ({ annotations, payload }) => Schema.isLessThanOrEqualTo(payload.maximum, annotations)
+)
+
+/**
+ * Reviver for persisted `isBetween` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isBetween}.
+ *
+ * @see {@link Schema.isBetween} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isBetweenReviver: FilterReviver<{
+  readonly minimum: number
+  readonly maximum: number
+  readonly exclusiveMinimum?: true | undefined
+  readonly exclusiveMaximum?: true | undefined
+}> = makeReviverFilter(
+  "effect/schema/isBetween",
+  Schema.Struct({
+    minimum: Schema.Finite,
+    maximum: Schema.Finite,
+    exclusiveMinimum: Schema.optional(Schema.Literal(true)),
+    exclusiveMaximum: Schema.optional(Schema.Literal(true))
+  }),
+  ({ annotations, payload }) => Schema.isBetween(payload, annotations)
+)
+
+/**
+ * Reviver for persisted `isMultipleOf` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isMultipleOf}.
+ *
+ * @see {@link Schema.isMultipleOf} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isMultipleOfReviver: FilterReviver<{
+  readonly divisor: number
+}> = makeReviverFilter(
+  "effect/schema/isMultipleOf",
+  Schema.Struct({ divisor: Schema.Finite }),
+  ({ annotations, payload }) => Schema.isMultipleOf(payload.divisor, annotations)
+)
+
+/**
+ * Reviver for persisted `isInt` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isInt}.
+ *
+ * @see {@link Schema.isInt} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isIntReviver: FilterReviver<null> = makeReviverFilter(
+  "effect/schema/isInt",
+  Schema.Null,
+  ({ annotations }) => Schema.isInt(annotations)
+)
+
+/**
+ * Reviver for persisted `isMinLength` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isMinLength}.
+ *
+ * @see {@link Schema.isMinLength} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isMinLengthReviver: FilterReviver<{
+  readonly minLength: number
+}> = makeReviverFilter(
+  "effect/schema/isMinLength",
+  Schema.Struct({ minLength: Schema.Natural }),
+  ({ annotations, payload }) => Schema.isMinLength(payload.minLength, annotations)
+)
+
+/**
+ * Reviver for persisted `isMaxLength` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isMaxLength}.
+ *
+ * @see {@link Schema.isMaxLength} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isMaxLengthReviver: FilterReviver<{
+  readonly maxLength: number
+}> = makeReviverFilter(
+  "effect/schema/isMaxLength",
+  Schema.Struct({ maxLength: Schema.Natural }),
+  ({ annotations, payload }) => Schema.isMaxLength(payload.maxLength, annotations)
+)
+
+/**
+ * Reviver for persisted `isLengthBetween` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isLengthBetween}.
+ *
+ * @see {@link Schema.isLengthBetween} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isLengthBetweenReviver: FilterReviver<{
+  readonly minimum: number
+  readonly maximum: number
+}> = makeReviverFilter(
+  "effect/schema/isLengthBetween",
+  Schema.Struct({ minimum: Schema.Natural, maximum: Schema.Natural }),
+  ({ annotations, payload }) => Schema.isLengthBetween(payload.minimum, payload.maximum, annotations)
+)
+
+/**
+ * Reviver for persisted `isMinSize` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isMinSize}.
+ *
+ * @see {@link Schema.isMinSize} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isMinSizeReviver: FilterReviver<{
+  readonly minSize: number
+}> = makeReviverFilter(
+  "effect/schema/isMinSize",
+  Schema.Struct({ minSize: Schema.Natural }),
+  ({ annotations, payload }) => Schema.isMinSize(payload.minSize, annotations)
+)
+
+/**
+ * Reviver for persisted `isMaxSize` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isMaxSize}.
+ *
+ * @see {@link Schema.isMaxSize} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isMaxSizeReviver: FilterReviver<{
+  readonly maxSize: number
+}> = makeReviverFilter(
+  "effect/schema/isMaxSize",
+  Schema.Struct({ maxSize: Schema.Natural }),
+  ({ annotations, payload }) => Schema.isMaxSize(payload.maxSize, annotations)
+)
+
+/**
+ * Reviver for persisted `isSizeBetween` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isSizeBetween}.
+ *
+ * @see {@link Schema.isSizeBetween} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isSizeBetweenReviver: FilterReviver<{
+  readonly minimum: number
+  readonly maximum: number
+}> = makeReviverFilter(
+  "effect/schema/isSizeBetween",
+  Schema.Struct({ minimum: Schema.Natural, maximum: Schema.Natural }),
+  ({ annotations, payload }) => Schema.isSizeBetween(payload.minimum, payload.maximum, annotations)
+)
+
+/**
+ * Reviver for persisted `isMinProperties` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isMinProperties}.
+ *
+ * @see {@link Schema.isMinProperties} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isMinPropertiesReviver: FilterReviver<{
+  readonly minProperties: number
+}> = makeReviverFilter(
+  "effect/schema/isMinProperties",
+  Schema.Struct({ minProperties: Schema.Natural }),
+  ({ annotations, payload }) => Schema.isMinProperties(payload.minProperties, annotations)
+)
+
+/**
+ * Reviver for persisted `isMaxProperties` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isMaxProperties}.
+ *
+ * @see {@link Schema.isMaxProperties} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isMaxPropertiesReviver: FilterReviver<{
+  readonly maxProperties: number
+}> = makeReviverFilter(
+  "effect/schema/isMaxProperties",
+  Schema.Struct({ maxProperties: Schema.Natural }),
+  ({ annotations, payload }) => Schema.isMaxProperties(payload.maxProperties, annotations)
+)
+
+/**
+ * Reviver for persisted `isPropertiesLengthBetween` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isPropertiesLengthBetween}.
+ *
+ * @see {@link Schema.isPropertiesLengthBetween} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isPropertiesLengthBetweenReviver: FilterReviver<{
+  readonly minimum: number
+  readonly maximum: number
+}> = makeReviverFilter(
+  "effect/schema/isPropertiesLengthBetween",
+  Schema.Struct({ minimum: Schema.Natural, maximum: Schema.Natural }),
+  ({ annotations, payload }) => Schema.isPropertiesLengthBetween(payload.minimum, payload.maximum, annotations)
+)
+
+/**
+ * Reviver for persisted `isPropertyNames` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isPropertyNames}.
+ *
+ * @see {@link Schema.isPropertyNames} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isPropertyNamesReviver: FilterReviver<null> = makeReviverFilter(
+  "effect/schema/isPropertyNames",
+  Schema.Null,
+  ({ annotations, schemas }) => Schema.isPropertyNames(schemas[0], annotations)
+)
+
+/**
+ * Reviver for persisted `isUnique` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isUnique}.
+ *
+ * @see {@link Schema.isUnique} for creating the corresponding check
+ *
+ * @category validation
+ * @since 4.0.0
+ */
+export const isUniqueReviver: FilterReviver<null> = makeReviverFilter(
+  "effect/schema/isUnique",
+  Schema.Null,
+  ({ annotations }) => Schema.isUnique(annotations)
+)
+
+/**
+ * Reviver for persisted `isUniqueKey` checks.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isUniqueKey}.
+ *
+ * @see {@link Schema.isUniqueKey} for creating the corresponding check
+ * @category validation
+ * @since 4.0.0
+ */
+export const isUniqueKeyReviver: FilterReviver<null> = makeReviverFilter(
+  "effect/schema/isUniqueKey",
+  Schema.Null,
+  ({ annotations }) => Schema.isUniqueKey(annotations)
+)
+
+/**
+ * Reviver for persisted `Option` declarations.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain schemas created by {@link Schema.Option}.
+ *
+ * @see {@link Schema.Option} for creating the corresponding schema
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const OptionReviver: DeclarationReviver<null> = makeReviverDeclaration(
+  "effect/schema/Option",
+  Schema.Null,
+  ({ annotations, typeParameters }) => {
+    const schema = Schema.Option(typeParameters[0])
+    return annotations === undefined ? schema : schema.annotate(annotations)
+  }
+)
+
+/**
+ * Reviver for persisted {@link Schema.Result} declarations.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain schemas created by {@link Schema.Result}.
+ *
+ * @see {@link Schema.Result} for creating the corresponding schema
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ResultReviver: DeclarationReviver<null> = makeReviverDeclaration(
+  "effect/schema/Result",
+  Schema.Null,
+  ({ annotations, typeParameters }) => {
+    const schema = Schema.Result(typeParameters[0], typeParameters[1])
+    return annotations === undefined ? schema : schema.annotate(annotations)
+  }
+)
+
+/**
+ * Reviver for persisted {@link Schema.Redacted} declarations.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain schemas created by {@link Schema.Redacted}.
+ *
+ * @see {@link Schema.Redacted} for creating the corresponding schema
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const RedactedReviver: DeclarationReviver<RedactedRepresentationPayload> = makeReviverDeclaration(
+  "effect/schema/Redacted",
+  RedactedRepresentationPayload,
+  ({ annotations, payload, typeParameters }) => {
+    const schema = Schema.Redacted(typeParameters[0], payload ?? undefined)
+    return annotations === undefined ? schema : schema.annotate(annotations)
+  }
+)
+
+/**
+ * Reviver for persisted `CauseReason` declarations.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain schemas created by {@link Schema.CauseReason}.
+ *
+ * @see {@link Schema.CauseReason} for creating the corresponding schema
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const CauseReasonReviver: DeclarationReviver<null> = makeReviverDeclaration(
+  "effect/schema/CauseReason",
+  Schema.Null,
+  ({ annotations, typeParameters }) => {
+    const schema = Schema.CauseReason(typeParameters[0], typeParameters[1])
+    return annotations === undefined ? schema : schema.annotate(annotations)
+  }
+)
+
+/**
+ * Reviver for persisted `Cause` declarations.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain schemas created by {@link Schema.Cause}.
+ *
+ * @see {@link Schema.Cause} for creating the corresponding schema
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const CauseReviver: DeclarationReviver<null> = makeReviverDeclaration(
+  "effect/schema/Cause",
+  Schema.Null,
+  ({ annotations, typeParameters }) => {
+    const schema = Schema.Cause(typeParameters[0], typeParameters[1])
+    return annotations === undefined ? schema : schema.annotate(annotations)
+  }
+)
+
+/**
+ * Reviver for persisted {@link Schema.ErrorInstance} declarations.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain schemas created by {@link Schema.ErrorInstance}.
+ *
+ * @see {@link Schema.ErrorInstance} for creating the corresponding schema
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ErrorInstanceReviver: DeclarationReviver<ErrorRepresentationPayload> = makeReviverDeclaration(
+  "effect/schema/Error",
+  ErrorRepresentationPayload,
+  ({ annotations, payload }) => {
+    const schema = Schema.ErrorInstance(payload ?? undefined)
+    return annotations === undefined ? schema : schema.annotate(annotations)
+  }
+)
+
+/**
+ * Reviver for persisted `Exit` declarations.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain schemas created by {@link Schema.Exit}.
+ *
+ * @see {@link Schema.Exit} for creating the corresponding schema
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ExitReviver: DeclarationReviver<null> = makeReviverDeclaration(
+  "effect/schema/Exit",
+  Schema.Null,
+  ({ annotations, typeParameters }) => {
+    const schema = Schema.Exit(typeParameters[0], typeParameters[1], typeParameters[2])
+    return annotations === undefined ? schema : schema.annotate(annotations)
+  }
+)
+
+/**
+ * Reviver for persisted {@link Schema.ReadonlyMap} declarations.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain schemas created by {@link Schema.ReadonlyMap}.
+ *
+ * @see {@link Schema.ReadonlyMap} for creating the corresponding schema
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ReadonlyMapReviver: DeclarationReviver<null> = makeReviverDeclaration(
+  "effect/schema/ReadonlyMap",
+  Schema.Null,
+  ({ annotations, typeParameters }) => {
+    const schema = Schema.ReadonlyMap(typeParameters[0], typeParameters[1])
+    return annotations === undefined ? schema : schema.annotate(annotations)
+  }
+)
+
+/**
+ * Reviver for persisted {@link Schema.Graph} declarations.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const GraphReviver: DeclarationReviver<"directed" | "undirected"> = makeReviverDeclaration(
+  "effect/schema/Graph",
+  Schema.Literals(["directed", "undirected"]),
+  ({ annotations, payload, typeParameters }) => {
+    const schema = Schema.Graph(payload, typeParameters[0], typeParameters[1])
+    return annotations === undefined ? schema : schema.annotate(annotations)
+  }
+)
+
+/**
+ * Reviver for persisted `HashMap` declarations.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain schemas created by {@link Schema.HashMap}.
+ *
+ * @see {@link Schema.HashMap} for creating the corresponding schema
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const HashMapReviver: DeclarationReviver<null> = makeReviverDeclaration(
+  "effect/schema/HashMap",
+  Schema.Null,
+  ({ annotations, typeParameters }) => {
+    const schema = Schema.HashMap(typeParameters[0], typeParameters[1])
+    return annotations === undefined ? schema : schema.annotate(annotations)
+  }
+)
+
+/**
+ * Reviver for persisted {@link Schema.ReadonlySet} declarations.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain schemas created by {@link Schema.ReadonlySet}.
+ *
+ * @see {@link Schema.ReadonlySet} for creating the corresponding schema
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ReadonlySetReviver: DeclarationReviver<null> = makeReviverDeclaration(
+  "effect/schema/ReadonlySet",
+  Schema.Null,
+  ({ annotations, typeParameters }) => {
+    const schema = Schema.ReadonlySet(typeParameters[0])
+    return annotations === undefined ? schema : schema.annotate(annotations)
+  }
+)
+
+/**
+ * Reviver for persisted `HashSet` declarations.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain schemas created by {@link Schema.HashSet}.
+ *
+ * @see {@link Schema.HashSet} for creating the corresponding schema
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const HashSetReviver: DeclarationReviver<null> = makeReviverDeclaration(
+  "effect/schema/HashSet",
+  Schema.Null,
+  ({ annotations, typeParameters }) => {
+    const schema = Schema.HashSet(typeParameters[0])
+    return annotations === undefined ? schema : schema.annotate(annotations)
+  }
+)
+
+/**
+ * Reviver for persisted {@link Schema.Chunk} declarations.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain schemas created by {@link Schema.Chunk}.
+ *
+ * @see {@link Schema.Chunk} for creating the corresponding schema
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ChunkReviver: DeclarationReviver<null> = makeReviverDeclaration(
+  "effect/schema/Chunk",
+  Schema.Null,
+  ({ annotations, typeParameters }) => {
+    const schema = Schema.Chunk(typeParameters[0])
+    return annotations === undefined ? schema : schema.annotate(annotations)
+  }
+)
+
+/**
+ * Reviver for persisted `RegExp` declarations.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain the {@link Schema.RegExp} schema.
+ *
+ * @see {@link Schema.RegExp} for the corresponding schema
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const RegExpReviver: DeclarationReviver<null> = makeFixedDeclarationReviver(
+  "effect/schema/RegExp",
+  Schema.RegExp
+)
+
+/**
+ * Reviver for persisted `URL` declarations.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain the {@link Schema.URL} schema.
+ *
+ * @see {@link Schema.URL} for the corresponding schema
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const URLReviver: DeclarationReviver<null> = makeFixedDeclarationReviver("effect/schema/URL", Schema.URL)
+
+/**
+ * Reviver for persisted `Date` declarations.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain the {@link Schema.Date} schema.
+ *
+ * @see {@link Schema.Date} for the corresponding schema
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const DateReviver: DeclarationReviver<null> = makeFixedDeclarationReviver("effect/schema/Date", Schema.Date)
+
+/**
+ * Reviver for persisted {@link Schema.Duration} declarations.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain the {@link Schema.Duration} schema.
+ *
+ * @see {@link Schema.Duration} for the corresponding schema
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const DurationReviver: DeclarationReviver<null> = makeFixedDeclarationReviver(
+  "effect/schema/Duration",
+  Schema.Duration
+)
+
+/**
+ * Reviver for persisted {@link Schema.ByteSize} declarations.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ByteSizeReviver: DeclarationReviver<null> = makeFixedDeclarationReviver(
+  "effect/schema/ByteSize",
+  Schema.ByteSize
+)
+
+/**
+ * Reviver for persisted {@link Schema.BigDecimal} declarations.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain the {@link Schema.BigDecimal} schema.
+ *
+ * @see {@link Schema.BigDecimal} for the corresponding schema
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const BigDecimalReviver: DeclarationReviver<null> = makeFixedDeclarationReviver(
+  "effect/schema/BigDecimal",
+  Schema.BigDecimal
+)
+
+/**
+ * Reviver for persisted `File` declarations.
+ *
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain the {@link Schema.File} schema.
+ *
+ * @see {@link Schema.File} for the corresponding schema
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const FileReviver: DeclarationReviver<null> = makeFixedDeclarationReviver("effect/schema/File", Schema.File)
+
+/**
+ * Reviver for persisted `FormData` declarations.
  *
- * **Details**
- *
- * The live representation stores the native property key. Persistent codecs
- * add an explicit type discriminator when encoding it.
+ * **When to use**
  *
- * **Gotchas**
+ * Use when reconstructing documents that may contain the {@link Schema.FormData} schema.
  *
- * Local symbols can be represented while the schema is live, but persistent
- * codecs reject them because they cannot be reconstructed by identity.
+ * @see {@link Schema.FormData} for the corresponding schema
  *
- * @category models
+ * @category schemas
  * @since 4.0.0
  */
-export interface PropertySignature {
-  readonly name: PropertyKey
-  readonly type: Representation
-  readonly isOptional: boolean
-  readonly isMutable: boolean
-  readonly annotations?: Schema.Annotations.Annotations | undefined
-}
+export const FormDataReviver: DeclarationReviver<null> = makeFixedDeclarationReviver(
+  "effect/schema/FormData",
+  Schema.FormData
+)
 
 /**
- * An index signature.
+ * Reviver for persisted `URLSearchParams` declarations.
  *
- * @category models
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain the {@link Schema.URLSearchParams} schema.
+ *
+ * @see {@link Schema.URLSearchParams} for the corresponding schema
+ *
+ * @category schemas
  * @since 4.0.0
  */
-export interface IndexSignature {
-  readonly parameter: Representation
-  readonly type: Representation
-}
+export const URLSearchParamsReviver: DeclarationReviver<null> = makeFixedDeclarationReviver(
+  "effect/schema/URLSearchParams",
+  Schema.URLSearchParams
+)
 
 /**
- * An object representation.
+ * Reviver for persisted `Uint8Array` declarations.
  *
- * @category models
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain the {@link Schema.Uint8Array} schema.
+ *
+ * @see {@link Schema.Uint8Array} for the corresponding schema
+ *
+ * @category schemas
  * @since 4.0.0
  */
-export interface Objects extends Keyword<"Objects"> {
-  readonly propertySignatures: ReadonlyArray<PropertySignature>
-  readonly indexSignatures: ReadonlyArray<IndexSignature>
-}
+export const Uint8ArrayReviver: DeclarationReviver<null> = makeFixedDeclarationReviver(
+  "effect/schema/Uint8Array",
+  Schema.Uint8Array
+)
 
 /**
- * A union representation.
+ * Reviver for persisted {@link Schema.DateTimeUtc} declarations.
  *
- * @category models
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain the {@link Schema.DateTimeUtc} schema.
+ *
+ * @see {@link Schema.DateTimeUtc} for the corresponding schema
+ *
+ * @category schemas
  * @since 4.0.0
  */
-export interface Union extends Keyword<"Union"> {
-  readonly types: ReadonlyArray<Representation>
-  readonly mode: "anyOf" | "oneOf"
-}
+export const DateTimeUtcReviver: DeclarationReviver<null> = makeFixedDeclarationReviver(
+  "effect/schema/DateTimeUtc",
+  Schema.DateTimeUtc
+)
 
 /**
- * The structural schema representation.
+ * Reviver for persisted {@link Schema.TimeZoneOffset} declarations.
  *
- * @category models
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain the {@link Schema.TimeZoneOffset} schema.
+ *
+ * @see {@link Schema.TimeZoneOffset} for the corresponding schema
+ *
+ * @category schemas
  * @since 4.0.0
  */
-export type Representation =
-  | Declaration
-  | Reference
-  | Suspend
-  | Null
-  | Undefined
-  | Void
-  | Never
-  | Unknown
-  | Any
-  | String
-  | Number
-  | Boolean
-  | BigInt
-  | Symbol
-  | Literal
-  | UniqueSymbol
-  | ObjectKeyword
-  | Enum
-  | TemplateLiteral
-  | Arrays
-  | Objects
-  | Union
+export const TimeZoneOffsetReviver: DeclarationReviver<null> = makeFixedDeclarationReviver(
+  "effect/schema/TimeZoneOffset",
+  Schema.TimeZoneOffset
+)
 
 /**
- * A structural check.
+ * Reviver for persisted {@link Schema.TimeZoneNamed} declarations.
  *
- * @category models
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain the {@link Schema.TimeZoneNamed} schema.
+ *
+ * @see {@link Schema.TimeZoneNamed} for the corresponding schema
+ *
+ * @category schemas
  * @since 4.0.0
  */
-export type Check = Filter | FilterGroup
+export const TimeZoneNamedReviver: DeclarationReviver<null> = makeFixedDeclarationReviver(
+  "effect/schema/TimeZoneNamed",
+  Schema.TimeZoneNamed
+)
 
 /**
- * An opaque leaf check.
+ * Reviver for persisted {@link Schema.TimeZone} declarations.
  *
- * @category models
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain the {@link Schema.TimeZone} schema.
+ *
+ * @see {@link Schema.TimeZone} for the corresponding schema
+ *
+ * @category schemas
  * @since 4.0.0
  */
-export interface Filter {
-  readonly _tag: "Filter"
-  readonly representation?: CheckRepresentationAnnotation<Representation> | undefined
-  readonly annotations?: Schema.Annotations.Annotations | undefined
-  readonly aborted: boolean
-}
+export const TimeZoneReviver: DeclarationReviver<null> = makeFixedDeclarationReviver(
+  "effect/schema/TimeZone",
+  Schema.TimeZone
+)
 
 /**
- * A non-empty group of checks.
+ * Reviver for persisted {@link Schema.DateTimeZoned} declarations.
  *
- * @category models
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain the {@link Schema.DateTimeZoned} schema.
+ *
+ * @see {@link Schema.DateTimeZoned} for the corresponding schema
+ *
+ * @category schemas
  * @since 4.0.0
  */
-export interface FilterGroup {
-  readonly _tag: "FilterGroup"
-  readonly representation?: CheckRepresentationAnnotation<Representation> | undefined
-  readonly annotations?: Schema.Annotations.Annotations | undefined
-  readonly checks: readonly [Check, ...Array<Check>]
-}
+export const DateTimeZonedReviver: DeclarationReviver<null> = makeFixedDeclarationReviver(
+  "effect/schema/DateTimeZoned",
+  Schema.DateTimeZoned
+)
 
 /**
- * Named representation definitions.
+ * Reviver for persisted `isGreaterThanDate` checks.
  *
- * @category models
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isGreaterThanDate}.
+ *
+ * @see {@link Schema.isGreaterThanDate} for creating the corresponding check
+ *
+ * @category validation
  * @since 4.0.0
  */
-export interface References {
-  readonly [$ref: string]: Representation
-}
+export const isGreaterThanDateReviver: FilterReviver<{
+  readonly exclusiveMinimum: globalThis.Date
+}> = makeReviverFilter(
+  "effect/schema/isGreaterThanDate",
+  Schema.Struct({ exclusiveMinimum: Schema.Date }),
+  ({ annotations, payload }) => Schema.isGreaterThanDate(payload.exclusiveMinimum, annotations)
+)
 
 /**
- * A single representation and its definitions.
+ * Reviver for persisted `isGreaterThanOrEqualToDate` checks.
  *
- * @category models
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isGreaterThanOrEqualToDate}.
+ *
+ * @see {@link Schema.isGreaterThanOrEqualToDate} for creating the corresponding check
+ *
+ * @category validation
  * @since 4.0.0
  */
-export interface Document {
-  readonly representation: Representation
-  readonly references: References
-}
+export const isGreaterThanOrEqualToDateReviver: FilterReviver<{
+  readonly minimum: globalThis.Date
+}> = makeReviverFilter(
+  "effect/schema/isGreaterThanOrEqualToDate",
+  Schema.Struct({ minimum: Schema.Date }),
+  ({ annotations, payload }) => Schema.isGreaterThanOrEqualToDate(payload.minimum, annotations)
+)
 
 /**
- * Multiple representations sharing definitions.
+ * Reviver for persisted `isLessThanDate` checks.
  *
- * @category models
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isLessThanDate}.
+ *
+ * @see {@link Schema.isLessThanDate} for creating the corresponding check
+ *
+ * @category validation
  * @since 4.0.0
  */
-export interface MultiDocument {
-  readonly representations: readonly [Representation, ...Array<Representation>]
-  readonly references: References
-}
+export const isLessThanDateReviver: FilterReviver<{
+  readonly exclusiveMaximum: globalThis.Date
+}> = makeReviverFilter(
+  "effect/schema/isLessThanDate",
+  Schema.Struct({ exclusiveMaximum: Schema.Date }),
+  ({ annotations, payload }) => Schema.isLessThanDate(payload.exclusiveMaximum, annotations)
+)
 
 /**
- * Reviver for a declaration.
+ * Reviver for persisted `isLessThanOrEqualToDate` checks.
  *
- * @category models
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isLessThanOrEqualToDate}.
+ *
+ * @see {@link Schema.isLessThanOrEqualToDate} for creating the corresponding check
+ *
+ * @category validation
  * @since 4.0.0
  */
-export interface DeclarationReviver<P> {
-  readonly id: string
-  readonly payloadSchema: Schema.Decoder<P>
-  readonly revive: (input: {
-    readonly payload: P
-    readonly typeParameters: ReadonlyArray<Schema.Top>
-    readonly annotations: Schema.Annotations.Annotations | undefined
-  }) => Schema.Top
-}
+export const isLessThanOrEqualToDateReviver: FilterReviver<{
+  readonly maximum: globalThis.Date
+}> = makeReviverFilter(
+  "effect/schema/isLessThanOrEqualToDate",
+  Schema.Struct({ maximum: Schema.Date }),
+  ({ annotations, payload }) => Schema.isLessThanOrEqualToDate(payload.maximum, annotations)
+)
 
 /**
- * Reviver for a leaf check.
+ * Reviver for persisted `isBetweenDate` checks.
  *
- * @category models
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isBetweenDate}.
+ *
+ * @see {@link Schema.isBetweenDate} for creating the corresponding check
+ *
+ * @category validation
  * @since 4.0.0
  */
-export interface FilterReviver<P> {
-  readonly id: string
-  readonly payloadSchema: Schema.Decoder<P>
-  readonly revive: (input: {
-    readonly payload: P
-    readonly schemas: ReadonlyArray<Schema.Top>
-    readonly annotations: Schema.Annotations.Filter | undefined
-  }) => SchemaAST.Filter<any>
-}
+export const isBetweenDateReviver: FilterReviver<{
+  readonly minimum: globalThis.Date
+  readonly maximum: globalThis.Date
+  readonly exclusiveMinimum?: true | undefined
+  readonly exclusiveMaximum?: true | undefined
+}> = makeReviverFilter(
+  "effect/schema/isBetweenDate",
+  Schema.Struct({
+    minimum: Schema.Date,
+    maximum: Schema.Date,
+    exclusiveMinimum: Schema.optional(Schema.Literal(true)),
+    exclusiveMaximum: Schema.optional(Schema.Literal(true))
+  }),
+  ({ annotations, payload }) => Schema.isBetweenDate(payload, annotations)
+)
 
 /**
- * Reviver for a check group.
+ * Reviver for persisted `isGreaterThanBigInt` checks.
  *
- * @category models
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isGreaterThanBigInt}.
+ *
+ * @see {@link Schema.isGreaterThanBigInt} for creating the corresponding check
+ *
+ * @category validation
  * @since 4.0.0
  */
-export interface FilterGroupReviver<P> {
-  readonly id: string
-  readonly payloadSchema: Schema.Decoder<P>
-  readonly revive: (input: {
-    readonly payload: P
-    readonly schemas: ReadonlyArray<Schema.Top>
-    readonly annotations: Schema.Annotations.Filter | undefined
-  }) => SchemaAST.FilterGroup<any>
-}
+export const isGreaterThanBigIntReviver: FilterReviver<{
+  readonly exclusiveMinimum: bigint
+}> = makeReviverFilter(
+  "effect/schema/isGreaterThanBigInt",
+  Schema.Struct({ exclusiveMinimum: Schema.BigInt }),
+  ({ annotations, payload }) => Schema.isGreaterThanBigInt(payload.exclusiveMinimum, annotations)
+)
 
 /**
- * A check reviver.
+ * Reviver for persisted `isGreaterThanOrEqualToBigInt` checks.
  *
- * @category models
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isGreaterThanOrEqualToBigInt}.
+ *
+ * @see {@link Schema.isGreaterThanOrEqualToBigInt} for creating the corresponding check
+ *
+ * @category validation
  * @since 4.0.0
  */
-export type CheckReviver<P> = FilterReviver<P> | FilterGroupReviver<P>
+export const isGreaterThanOrEqualToBigIntReviver: FilterReviver<{
+  readonly minimum: bigint
+}> = makeReviverFilter(
+  "effect/schema/isGreaterThanOrEqualToBigInt",
+  Schema.Struct({ minimum: Schema.BigInt }),
+  ({ annotations, payload }) => Schema.isGreaterThanOrEqualToBigInt(payload.minimum, annotations)
+)
 
 /**
- * A typed reviver.
+ * Reviver for persisted `isLessThanBigInt` checks.
  *
- * @category models
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isLessThanBigInt}.
+ *
+ * @see {@link Schema.isLessThanBigInt} for creating the corresponding check
+ *
+ * @category validation
  * @since 4.0.0
  */
-export type Reviver<P> = DeclarationReviver<P> | CheckReviver<P>
+export const isLessThanBigIntReviver: FilterReviver<{
+  readonly exclusiveMaximum: bigint
+}> = makeReviverFilter(
+  "effect/schema/isLessThanBigInt",
+  Schema.Struct({ exclusiveMaximum: Schema.BigInt }),
+  ({ annotations, payload }) => Schema.isLessThanBigInt(payload.exclusiveMaximum, annotations)
+)
 
 /**
- * A reviver erased only at collection boundaries.
+ * Reviver for persisted `isLessThanOrEqualToBigInt` checks.
  *
- * @category models
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isLessThanOrEqualToBigInt}.
+ *
+ * @see {@link Schema.isLessThanOrEqualToBigInt} for creating the corresponding check
+ *
+ * @category validation
  * @since 4.0.0
  */
-export type AnyReviver = Reviver<any>
+export const isLessThanOrEqualToBigIntReviver: FilterReviver<{
+  readonly maximum: bigint
+}> = makeReviverFilter(
+  "effect/schema/isLessThanOrEqualToBigInt",
+  Schema.Struct({ maximum: Schema.BigInt }),
+  ({ annotations, payload }) => Schema.isLessThanOrEqualToBigInt(payload.maximum, annotations)
+)
 
 /**
- * Creates a declaration reviver while inferring its payload type from `payloadSchema`.
+ * Reviver for persisted `isBetweenBigInt` checks.
  *
- * @category constructors
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain checks created by {@link Schema.isBetweenBigInt}.
+ *
+ * @see {@link Schema.isBetweenBigInt} for creating the corresponding check
+ *
+ * @category validation
  * @since 4.0.0
  */
-export const makeDeclarationReviver: <P>(
-  id: string,
-  payloadSchema: Schema.Decoder<P>,
-  revive: DeclarationReviver<P>["revive"]
-) => DeclarationReviver<P> = InternalSchema.makeDeclarationReviver
+export const isBetweenBigIntReviver: FilterReviver<{
+  readonly minimum: bigint
+  readonly maximum: bigint
+  readonly exclusiveMinimum?: true | undefined
+  readonly exclusiveMaximum?: true | undefined
+}> = makeReviverFilter(
+  "effect/schema/isBetweenBigInt",
+  Schema.Struct({
+    minimum: Schema.BigInt,
+    maximum: Schema.BigInt,
+    exclusiveMinimum: Schema.optional(Schema.Literal(true)),
+    exclusiveMaximum: Schema.optional(Schema.Literal(true))
+  }),
+  ({ annotations, payload }) => Schema.isBetweenBigInt(payload, annotations)
+)
 
 /**
- * Creates a filter reviver while inferring its payload type from `payloadSchema`.
+ * Reviver for persisted `Json` declarations.
  *
- * @category constructors
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain the {@link Schema.Json} schema.
+ *
+ * @see {@link Schema.Json} for the corresponding immutable JSON schema
+ *
+ * @category schemas
  * @since 4.0.0
  */
-export const makeFilterReviver: <P>(
-  id: string,
-  payloadSchema: Schema.Decoder<P>,
-  revive: FilterReviver<P>["revive"]
-) => FilterReviver<P> = InternalSchema.makeFilterReviver
+export const JsonReviver: DeclarationReviver<null> = makeFixedDeclarationReviver("effect/schema/Json", Schema.Json)
 
 /**
- * Creates a filter group reviver while inferring its payload type from `payloadSchema`.
+ * Reviver for persisted `MutableJson` declarations.
  *
- * @category constructors
+ * **When to use**
+ *
+ * Use when reconstructing documents that may contain the {@link Schema.MutableJson} schema.
+ *
+ * @see {@link Schema.MutableJson} for the corresponding mutable JSON schema
+ *
+ * @category schemas
  * @since 4.0.0
  */
-export const makeFilterGroupReviver: <P>(
-  id: string,
-  payloadSchema: Schema.Decoder<P>,
-  revive: FilterGroupReviver<P>["revive"]
-) => FilterGroupReviver<P> = InternalSchema.makeFilterGroupReviver
+export const MutableJsonReviver: DeclarationReviver<null> = makeFixedDeclarationReviver(
+  "effect/schema/MutableJson",
+  Schema.MutableJson
+)
+
+const jsonSchemaRevivers: ReadonlyArray<AnyReviver> = [
+  JsonReviver,
+  isPatternReviver,
+  isFiniteReviver,
+  isGreaterThanReviver,
+  isGreaterThanOrEqualToReviver,
+  isLessThanReviver,
+  isLessThanOrEqualToReviver,
+  isMultipleOfReviver,
+  isIntReviver,
+  isMinLengthReviver,
+  isMaxLengthReviver,
+  isMinPropertiesReviver,
+  isMaxPropertiesReviver,
+  isPropertyNamesReviver,
+  isUniqueReviver
+]
 
 /**
  * Options for importing JSON Schema Draft 2020-12 documents.
@@ -620,7 +2175,8 @@ export const makeFilterGroupReviver: <P>(
  * **Gotchas**
  *
  * Use `patterns: "apply"` only for trusted documents because regular expression evaluation may block for an unbounded
- * amount of time. `patterns: "ignore"` weakens validation by accepting values that the source document may reject.
+ * amount of time. `patterns: "ignore"` can admit values the source rejects, but can also reject previously valid
+ * values inside `oneOf` when removing constraints makes multiple branches match.
  * Ignoring `patternProperties` also skips its value constraints and `additionalProperties`, because matching keys cannot
  * be determined without evaluating the patterns.
  * `onEnter` must return a JSON Schema object. Its result is used directly, and exceptions raised by the callback pass
@@ -835,21 +2391,24 @@ export function toMultiDocument(document: Document): MultiDocument {
  *
  * **Details**
  *
- * For representation documents whose validation semantics can be expressed exactly in JSON Schema, importing the
- * emitted document with {@link fromJsonSchemaDocument} reconstructs a schema that accepts the same JSON values. This
- * is a semantic round-trip guarantee; the emitted document and reconstructed representation may have different shapes.
+ * The generated document is intended for preliminary validation. JSON Schema
+ * and Effect checks do not always have identical semantics, so the Effect
+ * decoder remains the final authority. Passing JSON Schema validation does not
+ * guarantee that Effect decoding will succeed.
  *
  * **Gotchas**
  *
  * - Reference allocation is already fixed in the input `Document`. The inherited `referencePolicy` option has no effect
  *   here; pass it to {@link toRepresentation} when creating the document.
- * - Opaque declarations are represented by an unconstrained JSON Schema and are outside the exact round-trip subset.
+ * - String length, RegExp flags, decoded-object property checks, and `oneOf` can differ from Effect validation.
+ * - Opaque declarations are represented by an unconstrained JSON Schema.
  * - Check callback results are used directly, and exceptions raised by a callback pass through unchanged. Callbacks
  *   must treat their input schemas as immutable. Each returned value must be a valid JSON Schema object graph and must
- *   not be mutated after the callback returns.
+ *   not be mutated after the callback returns. The callback author is responsible for the emitted semantics.
  * - Local definition references returned by callbacks are resolved together with compiler-generated references.
- * - Effect decoding may discard excess object properties by default. Use `onExcessProperty: "error"` when comparing
- *   validation semantics with the emitted JSON Schema.
+ *   Invalid JSON Pointer URI fragments throw an `Error`.
+ * - The default `onExcessProperty: "ignore"` matches the decoder default. Use `onExcessProperty: "error"` in both
+ *   places when a closed object contract is required.
  *
  * @see {@link toJsonSchemaMultiDocument} for multiple roots sharing definitions
  *
@@ -877,7 +2436,9 @@ export function toJsonSchemaDocument(
  * - Every definition is compiled, including definitions that are not reachable from a root. Check callbacks must treat
  *   their input schemas as immutable. Each returned value must be a valid JSON Schema object graph and must not be
  *   mutated after the callback returns. Local definition references returned by callbacks are resolved together with
- *   compiler-generated references.
+ *   compiler-generated references. Invalid JSON Pointer URI fragments throw an `Error`.
+ * - String length, RegExp flags, decoded-object property checks, `oneOf`, and custom check callbacks can differ from
+ *   Effect validation, as described by {@link toJsonSchemaDocument}.
  *
  * @see {@link toJsonSchemaDocument} for a single root
  *
@@ -936,10 +2497,12 @@ function pruneAnnotations(
   return Object.keys(out).length === 0 ? Option.none() : Option.some(out)
 }
 
-const AnnotationsSchema = Schema.optional(Schema.Record(Schema.String, Schema.Unknown)).pipe(
+const AnnotationsSchema = Schema.optional(
+  Schema.Record(Schema.String, Schema.Unknown)
+).pipe(
   Schema.encodeTo(Schema.optionalKey(Schema.JsonObject), {
-    decode: SchemaGetter.passthroughSubtype(),
-    encode: SchemaGetter.transformOptional((annotations) =>
+    decode: InternalGetter.passthroughSubtype(),
+    encode: InternalGetter.transformOptional((annotations) =>
       Option.isNone(annotations) || annotations.value === undefined
         ? Option.none()
         : pruneAnnotations(annotations.value)
@@ -990,8 +2553,8 @@ const SuspendSchema = Schema.Struct({
 function makeValueSchema<Type extends string, Value>(type: Type, value: Schema.Codec<Value>) {
   return value.pipe(
     Schema.encodeTo(Schema.Struct({ type: Schema.tag(type), value }), {
-      decode: SchemaGetter.transform((encoded: { readonly type: Type; readonly value: Value }) => encoded.value),
-      encode: SchemaGetter.transform((value: Value) => ({ type, value }))
+      decode: InternalGetter.transform((encoded: { readonly type: Type; readonly value: Value }) => encoded.value),
+      encode: InternalGetter.transform((value: Value) => ({ type, value }))
     })
   )
 }
@@ -1061,7 +2624,9 @@ const UnionSchema = Schema.Struct({
   _tag: Schema.tag("Union"),
   ...KeywordFields,
   types: RepresentationsSchema,
-  mode: Schema.Literals(["anyOf", "oneOf"])
+  options: Schema.optionalKey(Schema.Struct({
+    mode: Schema.optionalKey(Schema.Literals(["anyOf", "oneOf"]))
+  }))
 })
 const ReferenceSchema = Schema.Struct({
   _tag: Schema.tag("Reference"),
@@ -1271,30 +2836,39 @@ export function fromRepresentations(
  *
  * **Details**
  *
- * For the Draft 2020-12 subset translated exactly by this importer, compiling the imported schema through
- * {@link toRepresentation} and {@link toJsonSchemaDocument} produces a document that accepts the same JSON values as
- * the input. This is a semantic round-trip guarantee; keyword layout, definitions, and annotations may be normalized.
+ * Translates a Draft 2020-12 subset using Effect schemas and built-in checks. Validation follows those checks and the
+ * decoder's parse options, so import and re-export do not guarantee identical accepted values or a lossless round trip.
+ * Import errors explain the unsupported constraint or reference and include its source path.
  *
  * **Gotchas**
  *
- * - `$dynamicRef`, `contains`, `dependentRequired`, `dependentSchemas`, `not`, active `if` / `then` / `else`,
- *   `unevaluatedItems`, and `unevaluatedProperties` throw an `Unsupported JSON Schema keyword` error. Inactive
+ * - `{ not: {} }` imports as `Never`. Other uses of `not` are unsupported.
+ * - When `additionalProperties` is `true`, `{}`, or omitted, additional values use `Schema.Json` and are retained.
+ *   Closed objects normally strip excess properties by default; pass `onExcessProperty: "error"` to reject them.
+ *   Closed empty objects instead use `Schema.Record(Schema.String, Schema.Never)` and reject string-keyed entries
+ *   regardless of that option.
+ *   Object keyword scopes still constrain declared properties in intersections. Combinations requiring index
+ *   signatures that exclude explicit properties or patterned keys are rejected with an explanation of the limitation.
+ * - Property count and name checks run on the decoded object, after excess properties have been stripped.
+ * - String length checks count UTF-16 code units. `integer` uses `Schema.isInt`, which requires safe integers.
+ *   Applied patterns use `Schema.isPattern` without adding a Unicode flag.
+ * - `$dynamicRef`, `contains`, `dependentRequired`, `dependentSchemas`, active `if` / `then` / `else`,
+ *   `unevaluatedItems`, and `unevaluatedProperties` are rejected with an error identifying the unsupported keyword. Inactive
  *   conditional keywords and `minContains` / `maxContains` without `contains` have no validation effect and are ignored.
- * - Objects and arrays used as `const` values or `enum` members throw an `Unsupported structured JSON Schema value`
- *   error.
+ * - Objects and arrays used as `const` values or `enum` members are rejected. Only strings, numbers, booleans, and null
+ *   are supported.
  * - Intersections of overlapping unions are limited to disjoint root-type partitions and finite primitive `anyOf`
- *   literal sets. Other union intersections, including cases that would duplicate a nested choice, throw an
- *   `Unsupported intersection of overlapping unions` error.
+ *   literal sets. Other union intersections, including cases that would duplicate a nested choice, are rejected.
  * - Unknown extension keywords are ignored and their semantics are not enforced.
  * - Only direct local references to top-level definitions in the form `#/$defs/<escaped-token>` are supported. Root
- *   references, external references, and pointers below a definition throw an `Unsupported reference` error. A direct
- *   reference to a missing definition throws an `Invalid reference` error.
+ *   references, external references, and pointers below a definition are rejected with the supported reference format.
+ *   Missing definitions are reported by name. References reached inside nested schema
+ *   resources introduced by `$id` are rejected instead of resolved against the top-level definitions.
  * - Built-in declarations and checks are reconstructed with importer-owned revivers.
  * - Pattern constraints reached during translation cause an error by default. Use `patterns: "apply"` only for trusted
- *   documents, or `patterns: "ignore"` to weaken validation explicitly; ignored patterns are outside the round-trip
- *   guarantee.
- * - `onEnter` results replace the corresponding input nodes, so the round-trip guarantee applies to the rewritten
- *   document.
+ *   documents, or `patterns: "ignore"` to skip them. Ignoring patterns can both admit invalid values and reject valid
+ *   values when `oneOf` branches start overlapping.
+ * - `onEnter` results replace the corresponding input nodes before translation.
  * - Callback results are used directly, and exceptions raised by a callback pass through unchanged.
  *
  * @see {@link fromJsonSchemaMultiDocument} for multiple roots sharing definitions
@@ -1307,7 +2881,7 @@ export function fromJsonSchemaDocument(
   document: JsonSchema.Document<"draft-2020-12">,
   options?: FromJsonSchemaOptions
 ): Schema.Top {
-  return InternalFromJsonSchemaDocument.fromJsonSchemaDocument(document, options)
+  return InternalFromJsonSchemaDocument.fromJsonSchemaDocument(document, options, jsonSchemaRevivers)
 }
 
 /**
@@ -1317,21 +2891,26 @@ export function fromJsonSchemaDocument(
  *
  * Use when multiple imported roots share reachable definitions, aliases, or recursion.
  *
+ * **Details**
+ *
+ * Uses the same best-effort translation, built-in checks, and excess-property behavior as {@link fromJsonSchemaDocument}.
+ *
  * **Gotchas**
  *
  * - Only definitions reachable from a root are translated.
- * - Unsupported standard validation and applicator keywords throw an `Unsupported JSON Schema keyword` error. Unknown
+ * - Unsupported standard validation and applicator keywords are rejected with an error identifying the keyword. Unknown
  *   extension keywords are ignored and their semantics are not enforced.
- * - Objects and arrays used as `const` values or `enum` members throw an `Unsupported structured JSON Schema value`
- *   error.
+ * - Objects and arrays used as `const` values or `enum` members are rejected. Only strings, numbers, booleans, and null
+ *   are supported.
  * - Intersections of overlapping unions are limited to disjoint root-type partitions and finite primitive `anyOf`
- *   literal sets. Other union intersections, including cases that would duplicate a nested choice, throw an
- *   `Unsupported intersection of overlapping unions` error.
+ *   literal sets. Other union intersections, including cases that would duplicate a nested choice, are rejected.
  * - Only direct local references to top-level definitions in the form `#/$defs/<escaped-token>` are supported. Root
- *   references, external references, and pointers below a definition throw an `Unsupported reference` error. A direct
- *   reference to a missing definition throws an `Invalid reference` error.
+ *   references, external references, and pointers below a definition are rejected with the supported reference format.
+ *   Missing definitions are reported by name. References reached inside nested schema
+ *   resources introduced by `$id` are rejected instead of resolved against the top-level definitions.
  * - Pattern constraints reached during translation cause an error by default. Use `patterns: "apply"` only for trusted
- *   documents, or `patterns: "ignore"` to weaken validation explicitly.
+ *   documents, or `patterns: "ignore"` to skip them. Ignoring patterns can both admit invalid values and reject valid
+ *   values when `oneOf` branches start overlapping.
  * - Callback results are used directly, and exceptions raised by a callback pass through unchanged.
  *
  * @see {@link fromJsonSchemaDocument} for a single root
@@ -1344,5 +2923,5 @@ export function fromJsonSchemaMultiDocument(
   document: JsonSchema.MultiDocument<"draft-2020-12">,
   options?: FromJsonSchemaOptions
 ): readonly [Schema.Top, ...Array<Schema.Top>] {
-  return InternalFromJsonSchemaDocument.fromJsonSchemaMultiDocument(document, options)
+  return InternalFromJsonSchemaDocument.fromJsonSchemaMultiDocument(document, options, jsonSchemaRevivers)
 }
diff --git a/repos/effect/packages/effect/src/SchemaTransformation.ts b/repos/effect/packages/effect/src/SchemaTransformation.ts
index 19809b973..d02d894a8 100644
--- a/repos/effect/packages/effect/src/SchemaTransformation.ts
+++ b/repos/effect/packages/effect/src/SchemaTransformation.ts
@@ -18,7 +18,9 @@ import * as DateTime from "./DateTime.ts"
 import * as Duration from "./Duration.ts"
 import * as Effect from "./Effect.ts"
 import { format, formatDate, formatJson } from "./Formatter.ts"
+import { dual } from "./Function.ts"
 import * as Option from "./Option.ts"
+import * as Pipeable from "./Pipeable.ts"
 import * as Predicate from "./Predicate.ts"
 import type { ErrorOptions, Json } from "./Schema.ts"
 import type * as SchemaAST from "./SchemaAST.ts"
@@ -47,9 +49,10 @@ import * as SchemaIssue from "./SchemaIssue.ts"
  *   `Effect<Option<E>, Issue, REE>`.
  * - `flip()` swaps the decode and encode functions, producing a
  *   `Middleware<E, T, ...>`.
+ * - Middleware values implement `Pipeable`.
  *
  * Typically constructed indirectly via `Schema.middlewareDecoding` or
- * `Schema.middlewareEncoding` rather than instantiating this class directly.
+ * `Schema.middlewareEncoding` rather than by using `new Middleware` directly.
  *
  * **Example** (Creating a middleware that falls back on decode failure)
  *
@@ -69,7 +72,35 @@ import * as SchemaIssue from "./SchemaIssue.ts"
  * @category models
  * @since 4.0.0
  */
-export class Middleware<in out T, in out E, RDE, RDT, RET, REE> {
+export interface Middleware<in out T, in out E, RDE, RDT, RET, REE> extends Pipeable.Pipeable {
+  readonly _tag: "Middleware"
+  readonly decode: (
+    effect: Effect.Effect<Option.Option<E>, SchemaIssue.Issue, RDE>,
+    options: SchemaAST.ParseOptions
+  ) => Effect.Effect<Option.Option<T>, SchemaIssue.Issue, RDT>
+  readonly encode: (
+    effect: Effect.Effect<Option.Option<T>, SchemaIssue.Issue, RET>,
+    options: SchemaAST.ParseOptions
+  ) => Effect.Effect<Option.Option<E>, SchemaIssue.Issue, REE>
+  flip(): Middleware<E, T, RET, REE, RDE, RDT>
+}
+
+/**
+ * Constructs schema middleware from its decode and encode functions.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Middleware: new<T, E, RDE, RDT, RET, REE>(
+  decode: (
+    effect: Effect.Effect<Option.Option<E>, SchemaIssue.Issue, RDE>,
+    options: SchemaAST.ParseOptions
+  ) => Effect.Effect<Option.Option<T>, SchemaIssue.Issue, RDT>,
+  encode: (
+    effect: Effect.Effect<Option.Option<T>, SchemaIssue.Issue, RET>,
+    options: SchemaAST.ParseOptions
+  ) => Effect.Effect<Option.Option<E>, SchemaIssue.Issue, REE>
+) => Middleware<T, E, RDE, RDT, RET, REE> = class<in out T, in out E, RDE, RDT, RET, REE> extends Pipeable.Class {
   readonly _tag = "Middleware"
   readonly decode: (
     effect: Effect.Effect<Option.Option<E>, SchemaIssue.Issue, RDE>,
@@ -90,6 +121,7 @@ export class Middleware<in out T, in out E, RDE, RDT, RET, REE> {
       options: SchemaAST.ParseOptions
     ) => Effect.Effect<Option.Option<E>, SchemaIssue.Issue, REE>
   ) {
+    super()
     this.decode = decode
     this.encode = encode
   }
@@ -117,31 +149,50 @@ const TypeId = "~effect/SchemaTransformation/Transformation"
  * `Schema.decode`, `Schema.encode`, and `Schema.link`. Each direction is a
  * `SchemaGetter.Getter` that handles optionality, failure, and Effect services.
  *
- * - Immutable — `flip()` and `compose()` return new instances.
+ * - Immutable — `flip()` and {@link composeTransformation} return new instances.
+ * - Transformation values implement `Pipeable`.
  * - `flip()` swaps the decode and encode getters.
- * - `compose(other)` chains: `this.decode` then `other.decode` for decoding,
- *   `other.encode` then `this.encode` for encoding.
+ * - `composeTransformation(self, other)` chains: `self.decode` then `other.decode` for decoding,
+ *   `other.encode` then `self.encode` for encoding.
  *
  * **Example** (Composing two transformations)
  *
  * ```ts import.meta.vitest
  * import { SchemaTransformation } from "effect"
  *
- * const trimAndLower = SchemaTransformation.trim().compose(
+ * const trimAndLower = SchemaTransformation.composeTransformation(
+ *   SchemaTransformation.trim(),
  *   SchemaTransformation.toLowerCase()
  * )
  * trimAndLower._tag // => "Transformation"
  * ```
  *
- * @see {@link make} — construct from `{ decode, encode }` getters
+ * @see {@link makeTransformation} — construct from `{ decode, encode }` getters
  * @see {@link transform} — construct from pure functions
- * @see {@link transformOrFail} — construct from effectful functions
+ * @see {@link transformEffect} — construct from effectful functions
  * @see {@link Middleware} — effect-pipeline-level alternative
  *
  * @category models
  * @since 4.0.0
  */
-export class Transformation<in out T, in out E, RD = never, RE = never> {
+export interface Transformation<in out T, in out E, RD = never, RE = never> extends Pipeable.Pipeable {
+  readonly [TypeId]: typeof TypeId
+  readonly _tag: "Transformation"
+  readonly decode: SchemaGetter.Getter<T, E, RD>
+  readonly encode: SchemaGetter.Getter<E, T, RE>
+  flip(): Transformation<E, T, RE, RD>
+}
+
+/**
+ * Constructs a bidirectional schema transformation from its decode and encode getters.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const Transformation: new<T, E, RD = never, RE = never>(
+  decode: SchemaGetter.Getter<T, E, RD>,
+  encode: SchemaGetter.Getter<E, T, RE>
+) => Transformation<T, E, RD, RE> = class<in out T, in out E, RD = never, RE = never> extends Pipeable.Class {
   readonly [TypeId] = TypeId
   readonly _tag = "Transformation"
   readonly decode: SchemaGetter.Getter<T, E, RD>
@@ -151,20 +202,63 @@ export class Transformation<in out T, in out E, RD = never, RE = never> {
     decode: SchemaGetter.Getter<T, E, RD>,
     encode: SchemaGetter.Getter<E, T, RE>
   ) {
+    super()
     this.decode = decode
     this.encode = encode
   }
   flip(): Transformation<E, T, RE, RD> {
     return new Transformation(this.encode, this.decode)
   }
-  compose<T2, RD2, RE2>(other: Transformation<T2, T, RD2, RE2>): Transformation<T2, E, RD | RD2, RE | RE2> {
-    return new Transformation(
-      this.decode.compose(other.decode),
-      other.encode.compose(this.encode)
-    )
-  }
 }
 
+/**
+ * Composes two schema transformations into a single bidirectional conversion.
+ *
+ * **When to use**
+ *
+ * Use when decoding and encoding require the same sequence of conversion
+ * steps in opposite directions.
+ *
+ * **Details**
+ *
+ * Decoding applies `self.decode` followed by `other.decode`. Encoding applies
+ * `other.encode` followed by `self.encode`. The function supports both
+ * `composeTransformation(self, other)` and `composeTransformation(other)(self)`.
+ *
+ * **Example** (Trimming and lowercasing a string)
+ *
+ * ```ts import.meta.vitest
+ * import { Schema, SchemaTransformation } from "effect"
+ *
+ * const transformation = SchemaTransformation.composeTransformation(
+ *   SchemaTransformation.trim(),
+ *   SchemaTransformation.toLowerCase()
+ * )
+ * const schema = Schema.String.pipe(Schema.decode(transformation))
+ *
+ * Schema.decodeUnknownSync(schema)("  HELLO  ") // => "hello"
+ * ```
+ *
+ * @category combining
+ * @since 4.0.0
+ */
+export const composeTransformation: {
+  <T, T2, RD2, RE2>(
+    other: Transformation<T2, T, RD2, RE2>
+  ): <E, RD, RE>(self: Transformation<T, E, RD, RE>) => Transformation<T2, E, RD | RD2, RE | RE2>
+  <T, E, RD, RE, T2, RD2, RE2>(
+    self: Transformation<T, E, RD, RE>,
+    other: Transformation<T2, T, RD2, RE2>
+  ): Transformation<T2, E, RD | RD2, RE | RE2>
+} = dual(2, <T, E, RD, RE, T2, RD2, RE2>(
+  self: Transformation<T, E, RD, RE>,
+  other: Transformation<T2, T, RD2, RE2>
+): Transformation<T2, E, RD | RD2, RE | RE2> =>
+  new Transformation(
+    SchemaGetter.compose(self.decode, other.decode),
+    SchemaGetter.compose(other.encode, self.encode)
+  ))
+
 /**
  * Returns `true` if `u` is a `Transformation` instance.
  *
@@ -188,7 +282,7 @@ export class Transformation<in out T, in out E, RD = never, RE = never> {
  * ```
  *
  * @see {@link Transformation}
- * @see {@link make}
+ * @see {@link makeTransformation}
  *
  * @category guards
  * @since 4.0.0
@@ -216,7 +310,7 @@ export function isTransformation(u: unknown): u is Transformation<any, any, unkn
  * ```ts import.meta.vitest
  * import { SchemaGetter, SchemaTransformation } from "effect"
  *
- * const t = SchemaTransformation.make({
+ * const t = SchemaTransformation.makeTransformation({
  *   decode: SchemaGetter.transform<number, string>((s) => Number(s)),
  *   encode: SchemaGetter.transform<string, number>((n) => String(n))
  * })
@@ -224,13 +318,13 @@ export function isTransformation(u: unknown): u is Transformation<any, any, unkn
  * ```
  *
  * @see {@link transform} — simpler constructor from pure functions
- * @see {@link transformOrFail} — constructor from effectful functions
+ * @see {@link transformEffect} — constructor from effectful functions
  * @see {@link Transformation}
  *
  * @category constructors
  * @since 3.10.0
  */
-export const make = <T, E, RD = never, RE = never>(options: {
+export const makeTransformation = <T, E, RD = never, RE = never>(options: {
   readonly decode: SchemaGetter.Getter<T, E, RD>
   readonly encode: SchemaGetter.Getter<E, T, RE>
 }): Transformation<T, E, RD, RE> => {
@@ -241,8 +335,7 @@ export const make = <T, E, RD = never, RE = never>(options: {
 }
 
 /**
- * Creates a `Transformation` from effectful decode and encode functions that
- * can fail with `Issue`.
+ * Creates a `Transformation` from effectful decode and encode functions.
  *
  * **When to use**
  *
@@ -263,7 +356,7 @@ export const make = <T, E, RD = never, RE = never>(options: {
  * const DateFromString = Schema.String.pipe(
  *   Schema.decodeTo(
  *     Schema.Date,
- *     SchemaTransformation.transformOrFail({
+ *     SchemaTransformation.transformEffect({
  *       decode: (s, options) => {
  *         const d = new Date(s)
  *         return isNaN(d.getTime())
@@ -279,18 +372,18 @@ export const make = <T, E, RD = never, RE = never>(options: {
  *
  * @see {@link transform} — for infallible, pure transformations
  * @see {@link transformOptional} — for transformations that handle missing keys
- * @see {@link make} — for transformations from existing Getters
+ * @see {@link makeTransformation} — for transformations from existing Getters
  *
  * @category transforming
  * @since 3.10.0
  */
-export function transformOrFail<T, E, RD = never, RE = never>(options: {
+export function transformEffect<T, E, RD = never, RE = never>(options: {
   readonly decode: (e: E, options: SchemaAST.ParseOptions) => Effect.Effect<T, SchemaIssue.Issue, RD>
   readonly encode: (t: T, options: SchemaAST.ParseOptions) => Effect.Effect<E, SchemaIssue.Issue, RE>
 }): Transformation<T, E, RD, RE> {
   return new Transformation(
-    SchemaGetter.transformOrFail(options.decode),
-    SchemaGetter.transformOrFail(options.encode)
+    SchemaGetter.transformEffect(options.decode),
+    SchemaGetter.transformEffect(options.encode)
   )
 }
 
@@ -326,7 +419,7 @@ export function transformOrFail<T, E, RD = never, RE = never>(options: {
  * Schema.decodeSync(CentsFromDollars)(2.5) // => 250
  * ```
  *
- * @see {@link transformOrFail} — for fallible or effectful transformations
+ * @see {@link transformEffect} — for fallible or effectful transformations
  * @see {@link transformOptional} — for transformations that handle missing keys
  * @see {@link passthrough} — when no conversion is needed
  *
@@ -971,7 +1064,7 @@ export const dateFromMillis: Transformation<globalThis.Date, number> = new Trans
  * @category transforming
  * @since 4.0.0
  */
-export const durationFromString: Transformation<Duration.Duration, string> = transformOrFail<
+export const durationFromString: Transformation<Duration.Duration, string> = transformEffect<
   Duration.Duration,
   string
 >({
@@ -987,7 +1080,7 @@ export const durationFromString: Transformation<Duration.Duration, string> = tra
         ),
       onSome: Effect.succeed
     }),
-  encode: (duration) => Effect.succeed(globalThis.String(duration))
+  encode: (duration) => Effect.succeed(String(duration))
 })
 
 /**
@@ -1021,7 +1114,7 @@ export const durationFromString: Transformation<Duration.Duration, string> = tra
  * @category transforming
  * @since 4.0.0
  */
-export const durationFromNanos: Transformation<Duration.Duration, bigint> = transformOrFail({
+export const durationFromNanos: Transformation<Duration.Duration, bigint> = transformEffect({
   decode: (i) => Effect.succeed(Duration.nanos(i)),
   encode: (a, options) =>
     Option.match(Duration.toNanos(a), {
@@ -1078,9 +1171,9 @@ export const durationFromMillis: Transformation<Duration.Duration, number> = tra
  * @category transforming
  * @since 4.0.0
  */
-export const byteSizeFromString: Transformation<ByteSize.ByteSize, string> = transformOrFail({
+export const byteSizeFromString: Transformation<ByteSize.ByteSize, string> = transformEffect({
   decode: (input, options) =>
-    Option.match(ByteSize.fromInput(input), {
+    Option.match(ByteSize.fromString(input), {
       onNone: () =>
         Effect.fail(
           new SchemaIssue.InvalidValue(
@@ -1091,7 +1184,7 @@ export const byteSizeFromString: Transformation<ByteSize.ByteSize, string> = tra
         ),
       onSome: Effect.succeed
     }),
-  encode: (byteSize) => Effect.succeed(globalThis.String(byteSize))
+  encode: (byteSize) => Effect.succeed(`${byteSize} ${byteSize === BigInt(1) ? "byte" : "bytes"}`)
 })
 
 /**
@@ -1100,7 +1193,7 @@ export const byteSizeFromString: Transformation<ByteSize.ByteSize, string> = tra
  * @category transforming
  * @since 4.0.0
  */
-export const byteSizeFromBigInt: Transformation<ByteSize.ByteSize, bigint> = transformOrFail({
+export const byteSizeFromBigInt: Transformation<ByteSize.ByteSize, bigint> = transformEffect({
   decode: (input, options) =>
     Option.match(ByteSize.fromInput(input), {
       onNone: () =>
@@ -1122,7 +1215,7 @@ export const byteSizeFromBigInt: Transformation<ByteSize.ByteSize, bigint> = tra
  * @category transforming
  * @since 4.0.0
  */
-export const byteSizeFromNumber: Transformation<ByteSize.ByteSize, number> = transformOrFail({
+export const byteSizeFromNumber: Transformation<ByteSize.ByteSize, number> = transformEffect({
   decode: (input, options) =>
     Option.match(ByteSize.fromInput(input), {
       onNone: () =>
@@ -1478,12 +1571,12 @@ export function optionFromOptional<T>(): Transformation<Option.Option<T>, T | un
  * ```
  *
  * @see {@link numberFromString}
- * @see {@link transformOrFail}
+ * @see {@link transformEffect}
  *
  * @category transforming
  * @since 4.0.0
  */
-export const urlFromString: Transformation<URL, string> = transformOrFail<URL, string>({
+export const urlFromString: Transformation<URL, string> = transformEffect<URL, string>({
   decode: (s, options) =>
     URL.canParse(s)
       ? Effect.succeed(new URL(s))
@@ -1515,7 +1608,7 @@ export const urlFromString: Transformation<URL, string> = transformOrFail<URL, s
  * @category transforming
  * @since 4.0.0
  */
-export const bigDecimalFromString: Transformation<BigDecimal.BigDecimal, string> = transformOrFail<
+export const bigDecimalFromString: Transformation<BigDecimal.BigDecimal, string> = transformEffect<
   BigDecimal.BigDecimal,
   string
 >({
@@ -1881,7 +1974,7 @@ export const timeZoneOffsetFromNumber: Transformation<DateTime.TimeZone.Offset,
  * @category transforming
  * @since 4.0.0
  */
-export const timeZoneNamedFromString: Transformation<DateTime.TimeZone.Named, string> = transformOrFail<
+export const timeZoneNamedFromString: Transformation<DateTime.TimeZone.Named, string> = transformEffect<
   DateTime.TimeZone.Named,
   string
 >({
@@ -1922,7 +2015,7 @@ export const timeZoneNamedFromString: Transformation<DateTime.TimeZone.Named, st
  * @category transforming
  * @since 4.0.0
  */
-export const timeZoneFromString: Transformation<DateTime.TimeZone, string> = transformOrFail<
+export const timeZoneFromString: Transformation<DateTime.TimeZone, string> = transformEffect<
   DateTime.TimeZone,
   string
 >({
@@ -1963,7 +2056,7 @@ export const timeZoneFromString: Transformation<DateTime.TimeZone, string> = tra
  * @category transforming
  * @since 4.0.0
  */
-export const dateTimeUtcFromString: Transformation<DateTime.Utc, string> = transformOrFail<
+export const dateTimeUtcFromString: Transformation<DateTime.Utc, string> = transformEffect<
   DateTime.Utc,
   string
 >({
@@ -2003,7 +2096,7 @@ export const dateTimeUtcFromString: Transformation<DateTime.Utc, string> = trans
  * @category transforming
  * @since 4.0.0
  */
-export const dateTimeZonedFromString: Transformation<DateTime.Zoned, string> = transformOrFail<
+export const dateTimeZonedFromString: Transformation<DateTime.Zoned, string> = transformEffect<
   DateTime.Zoned,
   string
 >({
diff --git a/repos/effect/packages/effect/src/ScopedCache.ts b/repos/effect/packages/effect/src/ScopedCache.ts
index 664be8138..c5d6abad5 100644
--- a/repos/effect/packages/effect/src/ScopedCache.ts
+++ b/repos/effect/packages/effect/src/ScopedCache.ts
@@ -588,6 +588,10 @@ export const invalidateWhen: {
               if (self.state._tag === "Closed") {
                 return effect.succeed(false)
               } else if (f(value)) {
+                const current = MutableHashMap.get(self.state.map, key)
+                if (Option.isNone(current) || current.value !== entry) {
+                  return effect.succeed(false)
+                }
                 MutableHashMap.remove(self.state.map, key)
                 return effect.as(Scope.close(entry.scope, effect.exitVoid), true)
               }
@@ -640,7 +644,7 @@ export const refresh: {
         MutableHashMap.set(self.state.map, key, entry)
         yield* checkCapacity(fiber, self.state.map, self.capacity)
       }
-      const exit = yield* effect.exit(restore(Scope.provide(self.lookup(key), scope)))
+      const exit = yield* effect.exit(effect.suspend(() => restore(Scope.provide(self.lookup(key), scope))))
       Deferred.doneUnsafe(deferred, exit)
       // @ts-ignore async gap
       if (self.state._tag === "Closed") {
@@ -656,6 +660,7 @@ export const refresh: {
       if (!newEntry) {
         const oentry = MutableHashMap.get(self.state.map, key)
         MutableHashMap.set(self.state.map, key, entry)
+        yield* checkCapacity(fiber, self.state.map, self.capacity)
         if (Option.isSome(oentry)) {
           yield* Scope.close(oentry.value.scope, effect.exitVoid)
         }
@@ -692,11 +697,13 @@ const invalidateAllImpl = <Key, A, E>(
   parent: Fiber.Fiber<unknown, unknown>,
   map: MutableHashMap.MutableHashMap<Key, Entry<A, E>>
 ): Effect.Effect<void> => {
+  // Detach the batch before finalizers can reenter the cache.
+  const entries = Array.from(MutableHashMap.values(map))
+  MutableHashMap.clear(map)
   const fibers = Arr.empty<Fiber.Fiber<unknown, unknown>>()
-  for (const [, entry] of map) {
+  for (const entry of entries) {
     fibers.push(effect.forkUnsafe(parent as any, Scope.close(entry.scope, effect.exitVoid), true, true))
   }
-  MutableHashMap.clear(map)
   return effect.fiberAwaitAll(fibers)
 }
 
diff --git a/repos/effect/packages/effect/src/Sink.ts b/repos/effect/packages/effect/src/Sink.ts
index ce387f365..ddf3fdfe7 100644
--- a/repos/effect/packages/effect/src/Sink.ts
+++ b/repos/effect/packages/effect/src/Sink.ts
@@ -323,7 +323,7 @@ export const fromTransform = <In, A, E, R, L = never>(
  *   Channel.pipeTo(Sink.toChannel(Sink.sum))
  * )
  *
- * await Effect.runPromise(Channel.runDone(channel)) // => [6]
+ * await Effect.runPromise(Channel.runDrain(channel)) // => [6]
  * ```
  *
  * @category constructors
@@ -1247,7 +1247,12 @@ export const flatMap: {
             return upstream
           }),
           scope
-        )
+        ).pipe(Effect.map((end): End<A1, L | L1> => {
+          if (!leftover) {
+            return end
+          }
+          return [end[0], end[1] ? [...end[1], ...leftover] : leftover]
+        }))
     )
   }))
 
diff --git a/repos/effect/packages/effect/src/Stream.ts b/repos/effect/packages/effect/src/Stream.ts
index 99062e165..503a67cb7 100644
--- a/repos/effect/packages/effect/src/Stream.ts
+++ b/repos/effect/packages/effect/src/Stream.ts
@@ -12,6 +12,7 @@
  */
 // @effect-diagnostics returnEffectInGen:off
 import * as Arr from "./Array.ts"
+import * as ByteSize from "./ByteSize.ts"
 import * as Cause from "./Cause.ts"
 import * as Channel from "./Channel.ts"
 import { Clock } from "./Clock.ts"
@@ -22,7 +23,6 @@ import * as Equal from "./Equal.ts"
 import * as ExecutionPlan from "./ExecutionPlan.ts"
 import * as Exit from "./Exit.ts"
 import * as Fiber from "./Fiber.ts"
-import type { SizeInput } from "./FileSystem.ts"
 import type * as Filter from "./Filter.ts"
 import type { LazyArg } from "./Function.ts"
 import { constant, constTrue, constVoid, dual, identity } from "./Function.ts"
@@ -54,6 +54,7 @@ import { isString } from "./String.ts"
 import type * as Take from "./Take.ts"
 import type { ParentSpan, SpanOptions } from "./Tracer.ts"
 import type {
+  Concurrency,
   Covariant,
   ExcludeReason,
   ExcludeTag,
@@ -62,7 +63,9 @@ import type {
   NarrowReason,
   NoInfer,
   OmitReason,
+  ReasonOf,
   ReasonTags,
+  Simplify,
   Tags,
   TupleOf,
   unassigned
@@ -217,7 +220,7 @@ export interface VarianceStruct<out A, out E, out R> {
  * @category utility types
  * @since 3.4.0
  */
-export type Success<T extends Stream<any, any, any>> = [T] extends [Stream<infer _A, infer _E, infer _R>] ? _A : never
+export type Success<T> = T extends Stream<infer _A, infer _E, infer _R> ? _A : never
 
 /**
  * Extract the error type from a Stream type.
@@ -235,7 +238,7 @@ export type Success<T extends Stream<any, any, any>> = [T] extends [Stream<infer
  * @category utility types
  * @since 3.4.0
  */
-export type Error<T extends Stream<any, any, any>> = [T] extends [Stream<infer _A, infer _E, infer _R>] ? _E : never
+export type Error<T> = T extends Stream<infer _A, infer _E, infer _R> ? _E : never
 
 /**
  * Extract the services type from a Stream type.
@@ -257,8 +260,7 @@ export type Error<T extends Stream<any, any, any>> = [T] extends [Stream<infer _
  * @category utility types
  * @since 4.0.0
  */
-export type Services<T extends Stream<any, any, any>> = [T] extends [Stream<infer _A, infer _E, infer _R>] ? _R
-  : never
+export type Services<T> = T extends Stream<infer _A, infer _E, infer _R> ? _R : never
 
 /**
  * Checks whether a value is a Stream.
@@ -651,7 +653,7 @@ export const transformPullBracket = <A, E, R, B, E2, R2, EX, RX>(
  * values.flat() // => [1, 2, 3]
  * ```
  *
- * @category constructors
+ * @category destructors
  * @since 2.0.0
  */
 export const toChannel = <A, E, R>(
@@ -1669,7 +1671,7 @@ export const unwrap = <A, E2, R2, E, R>(
  * events // => ["acquire", "release"]
  * ```
  *
- * @category constructors
+ * @category resource management
  * @since 2.0.0
  */
 export const scoped = <A, E, R>(
@@ -1703,6 +1705,35 @@ export const map: {
     ))
   }))
 
+/**
+ * Replaces every element of the stream with the provided constant value.
+ *
+ * **Example** (Replacing stream elements)
+ *
+ * ```ts import.meta.vitest
+ * import { Effect, Stream } from "effect"
+ *
+ * const program = Effect.gen(function*() {
+ *   const values = yield* Stream.make(1, 2, 3).pipe(
+ *     Stream.as("x"),
+ *     Stream.runCollect
+ *   )
+ *   values // => [ 'x', 'x', 'x' ]
+ * })
+ *
+ * await Effect.runPromise(program)
+ * ```
+ *
+ * @see {@link map} for deriving the replacement value from each element
+ *
+ * @category mapping
+ * @since 4.0.0
+ */
+export const as: {
+  <B>(value: B): <A, E, R>(self: Stream<A, E, R>) => Stream<B, E, R>
+  <A, E, R, B>(self: Stream<A, E, R>, value: B): Stream<B, E, R>
+} = dual(2, <A, E, R, B>(self: Stream<A, E, R>, value: B): Stream<B, E, R> => map(self, () => value))
+
 /**
  * Maps both the failure and success channels of a stream.
  *
@@ -1712,8 +1743,8 @@ export const map: {
  * import { Effect, Stream } from "effect"
  *
  * const mapper = {
- *   onFailure: (error: string) => `error: ${error}`,
- *   onSuccess: (value: number) => value * 2
+ *   onElement: (value: number) => value * 2,
+ *   onError: (error: string) => `error: ${error}`
  * }
  *
  * const program = Effect.gen(function*() {
@@ -1738,20 +1769,20 @@ export const map: {
  * @since 2.0.0
  */
 export const mapBoth: {
-  <E, E2, A, A2>(
-    options: { readonly onFailure: (e: E) => E2; readonly onSuccess: (a: A) => A2 }
+  <A, A2, E, E2>(
+    options: { readonly onElement: (a: A) => A2; readonly onError: (e: E) => E2 }
   ): <R>(self: Stream<A, E, R>) => Stream<A2, E2, R>
-  <A, E, R, E2, A2>(
+  <A, E, R, A2, E2>(
     self: Stream<A, E, R>,
-    options: { readonly onFailure: (e: E) => E2; readonly onSuccess: (a: A) => A2 }
+    options: { readonly onElement: (a: A) => A2; readonly onError: (e: E) => E2 }
   ): Stream<A2, E2, R>
-} = dual(2, <A, E, R, E2, A2>(
+} = dual(2, <A, E, R, A2, E2>(
   self: Stream<A, E, R>,
-  options: { readonly onFailure: (e: E) => E2; readonly onSuccess: (a: A) => A2 }
+  options: { readonly onElement: (a: A) => A2; readonly onError: (e: E) => E2 }
 ): Stream<A2, E2, R> =>
   self.pipe(
-    map(options.onSuccess),
-    mapError(options.onFailure)
+    map(options.onElement),
+    mapError(options.onError)
   ))
 
 /**
@@ -1831,7 +1862,7 @@ export const mapEffect: {
   <A, A2, E2, R2>(
     f: (a: A, i: number) => Effect.Effect<A2, E2, R2>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Concurrency | undefined
       readonly unordered?: boolean | undefined
     } | undefined
   ): <E, R>(self: Stream<A, E, R>) => Stream<A2, E2 | E, R2 | R>
@@ -1839,7 +1870,7 @@ export const mapEffect: {
     self: Stream<A, E, R>,
     f: (a: A, i: number) => Effect.Effect<A2, E2, R2>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Concurrency | undefined
       readonly unordered?: boolean | undefined
     } | undefined
   ): Stream<A2, E | E2, R | R2>
@@ -1847,7 +1878,7 @@ export const mapEffect: {
   self: Stream<A, E, R>,
   f: (a: A, i: number) => Effect.Effect<A2, E2, R2>,
   options?: {
-    readonly concurrency?: number | "unbounded" | undefined
+    readonly concurrency?: Concurrency | undefined
     readonly unordered?: boolean | undefined
   } | undefined
 ): Stream<A2, E | E2, R | R2> =>
@@ -1881,21 +1912,21 @@ export const mapEffect: {
  * await Effect.runPromise(program)
  * ```
  *
- * @category mapping
+ * @category sequencing
  * @since 2.0.0
  */
 export const flattenEffect: <
   Arg extends Stream<Effect.Effect<any, any, any>, any, any> | {
-    readonly concurrency?: number | "unbounded" | undefined
+    readonly concurrency?: Concurrency | undefined
     readonly unordered?: boolean | undefined
   } | undefined = {
-    readonly concurrency?: number | "unbounded" | undefined
+    readonly concurrency?: Concurrency | undefined
     readonly unordered?: boolean | undefined
   }
 >(
   selfOrOptions?: Arg,
   options?: {
-    readonly concurrency?: number | "unbounded" | undefined
+    readonly concurrency?: Concurrency | undefined
     readonly unordered?: boolean | undefined
   } | undefined
 ) => [Arg] extends [Stream<Effect.Effect<infer _A, infer _EX, infer _RX>, infer _E, infer _R>] ?
@@ -1905,7 +1936,7 @@ export const flattenEffect: <
     <A, E, R, EX, RX>(
       self: Stream<Effect.Effect<A, EX, RX>, E, R>,
       options?: {
-        readonly concurrency?: number | "unbounded" | undefined
+        readonly concurrency?: Concurrency | undefined
         readonly unordered?: boolean | undefined
       } | undefined
     ): Stream<A, EX | E, RX | R> => mapEffect(self, identity, options)
@@ -2022,21 +2053,21 @@ export const tap: {
   <A, X, E2, R2>(
     f: (a: NoInfer<A>) => Effect.Effect<X, E2, R2>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Concurrency | undefined
     } | undefined
   ): <E, R>(self: Stream<A, E, R>) => Stream<A, E2 | E, R2 | R>
   <A, E, R, X, E2, R2>(
     self: Stream<A, E, R>,
     f: (a: NoInfer<A>) => Effect.Effect<X, E2, R2>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Concurrency | undefined
     } | undefined
   ): Stream<A, E | E2, R | R2>
 } = dual((args) => isStream(args[0]), <A, E, R, X, E2, R2>(
   self: Stream<A, E, R>,
   f: (a: NoInfer<A>) => Effect.Effect<X, E2, R2>,
   options?: {
-    readonly concurrency?: number | "unbounded" | undefined
+    readonly concurrency?: Concurrency | undefined
   } | undefined
 ): Stream<A, E | E2, R | R2> =>
   mapEffect(
@@ -2079,7 +2110,7 @@ export const tapBoth: {
     options: {
       readonly onElement: (a: NoInfer<A>) => Effect.Effect<X, E2, R2>
       readonly onError: (a: NoInfer<E>) => Effect.Effect<Y, E3, R3>
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Concurrency | undefined
     }
   ): <R>(self: Stream<A, E, R>) => Stream<A, E | E2 | E3, R | R2 | R3>
   <A, E, R, X, E2, R2, Y, E3, R3>(
@@ -2087,7 +2118,7 @@ export const tapBoth: {
     options: {
       readonly onElement: (a: NoInfer<A>) => Effect.Effect<X, E2, R2>
       readonly onError: (a: NoInfer<E>) => Effect.Effect<Y, E3, R3>
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Concurrency | undefined
     }
   ): Stream<A, E | E2 | E3, R | R2 | R3>
 } = dual(2, <A, E, R, X, E2, R2, Y, E3, R3>(
@@ -2095,7 +2126,7 @@ export const tapBoth: {
   options: {
     readonly onElement: (a: NoInfer<A>) => Effect.Effect<X, E2, R2>
     readonly onError: (a: NoInfer<E>) => Effect.Effect<Y, E3, R3>
-    readonly concurrency?: number | "unbounded" | undefined
+    readonly concurrency?: Concurrency | undefined
   }
 ): Stream<A, E | E2 | E3, R | R2 | R3> =>
   self.pipe(
@@ -2225,14 +2256,14 @@ export const tapSink: {
  * await Effect.runPromise(program)
  * ```
  *
- * @category mapping
+ * @category sequencing
  * @since 2.0.0
  */
 export const flatMap: {
   <A, A2, E2, R2>(
     f: (a: A) => Stream<A2, E2, R2>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Concurrency | undefined
       readonly bufferSize?: number | undefined
     } | undefined
   ): <E, R>(self: Stream<A, E, R>) => Stream<A2, E2 | E, R2 | R>
@@ -2240,7 +2271,7 @@ export const flatMap: {
     self: Stream<A, E, R>,
     f: (a: A) => Stream<A2, E2, R2>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Concurrency | undefined
       readonly bufferSize?: number | undefined
     } | undefined
   ): Stream<A2, E | E2, R | R2>
@@ -2248,7 +2279,7 @@ export const flatMap: {
   self: Stream<A, E, R>,
   f: (a: A) => Stream<A2, E2, R2>,
   options?: {
-    readonly concurrency?: number | "unbounded" | undefined
+    readonly concurrency?: Concurrency | undefined
     readonly bufferSize?: number | undefined
   } | undefined
 ): Stream<A2, E | E2, R | R2> =>
@@ -2285,7 +2316,7 @@ export const switchMap: {
   <A, A2, E2, R2>(
     f: (a: A) => Stream<A2, E2, R2>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Concurrency | undefined
       readonly bufferSize?: number | undefined
     } | undefined
   ): <E, R>(self: Stream<A, E, R>) => Stream<A2, E2 | E, R2 | R>
@@ -2293,7 +2324,7 @@ export const switchMap: {
     self: Stream<A, E, R>,
     f: (a: A) => Stream<A2, E2, R2>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Concurrency | undefined
       readonly bufferSize?: number | undefined
     } | undefined
   ): Stream<A2, E | E2, R | R2>
@@ -2301,7 +2332,7 @@ export const switchMap: {
   self: Stream<A, E, R>,
   f: (a: A) => Stream<A2, E2, R2>,
   options?: {
-    readonly concurrency?: number | "unbounded" | undefined
+    readonly concurrency?: Concurrency | undefined
     readonly bufferSize?: number | undefined
   } | undefined
 ): Stream<A2, E | E2, R | R2> =>
@@ -2340,21 +2371,21 @@ export const switchMap: {
  * await Effect.runPromise(program)
  * ```
  *
- * @category mapping
+ * @category sequencing
  * @since 2.0.0
  */
 export const flatten: <
   Arg extends Stream<Stream<any, any, any>, any, any> | {
-    readonly concurrency?: number | "unbounded" | undefined
+    readonly concurrency?: Concurrency | undefined
     readonly bufferSize?: number | undefined
   } | undefined = {
-    readonly concurrency?: number | "unbounded" | undefined
+    readonly concurrency?: Concurrency | undefined
     readonly bufferSize?: number | undefined
   }
 >(
   selfOrOptions?: Arg,
   options?: {
-    readonly concurrency?: number | "unbounded" | undefined
+    readonly concurrency?: Concurrency | undefined
     readonly bufferSize?: number | undefined
   } | undefined
 ) => [Arg] extends [Stream<Stream<infer _A, infer _E, infer _R>, infer _E2, infer _R2>] ? Stream<_A, _E | _E2, _R | _R2>
@@ -2363,7 +2394,7 @@ export const flatten: <
     <A, E, R, E2, R2>(
       self: Stream<Stream<A, E, R>, E2, R2>,
       options?: {
-        readonly concurrency?: number | "unbounded" | undefined
+        readonly concurrency?: Concurrency | undefined
         readonly bufferSize?: number | undefined
       } | undefined
     ): Stream<A, E | E2, R | R2> => flatMap(self, identity, options)
@@ -2471,7 +2502,7 @@ export const drainFork: {
  * await Effect.runPromise(program)
  * ```
  *
- * @category sequencing
+ * @category repetition
  * @since 2.0.0
  */
 export const repeat: {
@@ -2689,7 +2720,7 @@ export const timeoutOrElse: {
  * await Effect.runPromise(program)
  * ```
  *
- * @category sequencing
+ * @category repetition
  * @since 2.0.0
  */
 export const repeatElements: {
@@ -2758,7 +2789,7 @@ export const repeatElements: {
  * await Effect.runPromise(program)
  * ```
  *
- * @category sequencing
+ * @category repetition
  * @since 2.0.0
  */
 export const forever = <A, E, R>(self: Stream<A, E, R>): Stream<A, E, R> => fromChannel(Channel.forever(self.channel))
@@ -2780,7 +2811,7 @@ export const forever = <A, E, R>(self: Stream<A, E, R>): Stream<A, E, R> => from
  * await Effect.runPromise(program)
  * ```
  *
- * @category mapping
+ * @category sequencing
  * @since 4.0.0
  */
 export const flattenIterable = <A, E, R>(self: Stream<Iterable<A>, E, R>): Stream<A, E, R> =>
@@ -3164,21 +3195,21 @@ export const mergeRight: {
 export const mergeAll: {
   (
     options: {
-      readonly concurrency: number | "unbounded"
+      readonly concurrency: Concurrency
       readonly bufferSize?: number | undefined
     }
   ): <A, E, R>(streams: Iterable<Stream<A, E, R>>) => Stream<A, E, R>
   <A, E, R>(
     streams: Iterable<Stream<A, E, R>>,
     options: {
-      readonly concurrency: number | "unbounded"
+      readonly concurrency: Concurrency
       readonly bufferSize?: number | undefined
     }
   ): Stream<A, E, R>
 } = dual(2, <A, E, R>(
   streams: Iterable<Stream<A, E, R>>,
   options: {
-    readonly concurrency: number | "unbounded"
+    readonly concurrency: Concurrency
     readonly bufferSize?: number | undefined
   }
 ): Stream<A, E, R> => flatten(fromIterable(streams), options))
@@ -3211,7 +3242,7 @@ export const mergeAll: {
  */
 export const cross: {
   <AR, ER, RR>(right: Stream<AR, ER, RR>): <AL, EL, RL>(left: Stream<AL, EL, RL>) => Stream<[AL, AR], EL | ER, RL | RR>
-  <AL, ER, RR, AR, EL, RL>(left: Stream<AL, ER, RR>, right: Stream<AR, EL, RL>): Stream<[AL, AR], EL | ER, RL | RR>
+  <AL, EL, RL, AR, ER, RR>(left: Stream<AL, EL, RL>, right: Stream<AR, ER, RR>): Stream<[AL, AR], EL | ER, RL | RR>
 } = dual(2, <AL, EL, RL, AR, ER, RR>(
   left: Stream<AL, EL, RL>,
   right: Stream<AR, ER, RR>
@@ -4315,7 +4346,7 @@ export const partitionQueue: {
  * consumed while that scope remains open. The first stream emits success values
  * from the filter, and the second emits failure values.
  *
- * @see {@link partition} for the pure `Filter` variant, which returns the failing stream before the passing stream
+ * @see {@link partition} for the pure `Filter` variant
  * @see {@link partitionQueue} for the lower-level queue result
  * @see {@link filterMapEffect} for effectful filtering that discards failed filter results
  *
@@ -4325,7 +4356,7 @@ export const partitionQueue: {
 export const partitionEffect: {
   <A, Pass, Fail, EX, RX>(filter: Filter.FilterEffect<NoInfer<A>, Pass, Fail, EX, RX>, options?: {
     readonly capacity?: number | "unbounded" | undefined
-    readonly concurrency?: number | "unbounded" | undefined
+    readonly concurrency?: Concurrency | undefined
   }): <E, R>(self: Stream<A, E, R>) => Effect.Effect<
     [
       passes: Stream<Pass, E | EX>,
@@ -4339,7 +4370,7 @@ export const partitionEffect: {
     filter: Filter.FilterEffect<NoInfer<A>, Pass, Fail, EX, RX>,
     options?: {
       readonly capacity?: number | "unbounded" | undefined
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Concurrency | undefined
     }
   ): Effect.Effect<
     [
@@ -4356,7 +4387,7 @@ export const partitionEffect: {
     filter: Filter.FilterEffect<NoInfer<A>, Pass, Fail, EX, RX>,
     options?: {
       readonly capacity?: number | "unbounded" | undefined
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Concurrency | undefined
     }
   ): Effect.Effect<
     [
@@ -4377,14 +4408,16 @@ export const partitionEffect: {
 )
 
 /**
- * Splits a stream into scoped excluded and satisfying substreams using a
+ * Splits a stream into scoped passing and failing substreams using a
  * `Filter`.
  *
  * **Details**
  *
  * The returned streams are backed by queues in the current scope and should be
  * consumed while that scope remains open. The faster stream may advance up to
- * `bufferSize` elements ahead of the slower one.
+ * `capacity` elements ahead of the slower one. The first stream emits the
+ * filter successes and the second emits the filter failures. The default
+ * capacity is 16.
  *
  * **Example** (Partitioning a stream)
  *
@@ -4392,14 +4425,14 @@ export const partitionEffect: {
  * import { Effect, Result, Stream } from "effect"
  *
  * const program = Effect.gen(function*() {
- *   const [excluded, satisfying] = yield* Stream.partition(
+ *   const [passes, fails] = yield* Stream.partition(
  *     Stream.make(1, 2, 3, 4),
  *     (n) => n % 2 === 0 ? Result.succeed(n) : Result.fail(n)
  *   )
- *   const left = yield* Stream.runCollect(excluded)
- *   const right = yield* Stream.runCollect(satisfying)
- *   left // => [ 1, 3 ]
- *   right // => [ 2, 4 ]
+ *   const evens = yield* Stream.runCollect(passes)
+ *   const odds = yield* Stream.runCollect(fails)
+ *   evens // => [ 2, 4 ]
+ *   odds // => [ 1, 3 ]
  * })
  * await Effect.runPromise(Effect.scoped(program))
  * ```
@@ -4410,20 +4443,24 @@ export const partitionEffect: {
 export const partition: {
   <A, Pass, Fail>(
     filter: Filter.Filter<NoInfer<A>, Pass, Fail>,
-    options?: { readonly bufferSize?: number | undefined }
+    options?: {
+      readonly capacity?: number | "unbounded" | undefined
+    }
   ): <E, R>(
     self: Stream<A, E, R>
   ) => Effect.Effect<
-    [excluded: Stream<Fail, E>, satisfying: Stream<Pass, E>],
+    [passes: Stream<Pass, E>, fails: Stream<Fail, E>],
     never,
     R | Scope.Scope
   >
   <A, E, R, Pass, Fail>(
     self: Stream<A, E, R>,
     filter: Filter.Filter<NoInfer<A>, Pass, Fail>,
-    options?: { readonly bufferSize?: number | undefined }
+    options?: {
+      readonly capacity?: number | "unbounded" | undefined
+    }
   ): Effect.Effect<
-    [excluded: Stream<Fail, E>, satisfying: Stream<Pass, E>],
+    [passes: Stream<Pass, E>, fails: Stream<Fail, E>],
     never,
     R | Scope.Scope
   >
@@ -4432,15 +4469,17 @@ export const partition: {
   <A, E, R, Pass, Fail>(
     self: Stream<A, E, R>,
     filter: Filter.Filter<NoInfer<A>, Pass, Fail>,
-    options?: { readonly bufferSize?: number | undefined }
+    options?: {
+      readonly capacity?: number | "unbounded" | undefined
+    }
   ): Effect.Effect<
-    [excluded: Stream<Fail, E>, satisfying: Stream<Pass, E>],
+    [passes: Stream<Pass, E>, fails: Stream<Fail, E>],
     never,
     R | Scope.Scope
   > =>
     Effect.map(
-      partitionQueue(self, filter, { capacity: options?.bufferSize ?? 16 }),
-      ([passes, fails]) => [fromQueue(fails), fromQueue(passes)] as const
+      partitionQueue(self, filter, { capacity: options?.capacity ?? 16 }),
+      ([passes, fails]) => [fromQueue(passes), fromQueue(fails)] as const
     )
 )
 
@@ -4697,6 +4736,46 @@ export const catchCause: {
     fromChannel
   ))
 
+/**
+ * Recovers from defects using the provided function.
+ *
+ * **Details**
+ *
+ * Typed failures and interruptions are not caught.
+ *
+ * **Example** (Recovering from a defect)
+ *
+ * ```ts import.meta.vitest
+ * import { Effect, Stream } from "effect"
+ *
+ * const stream = Stream.die("boom").pipe(
+ *   Stream.catchDefect((defect) => Stream.succeed(`recovered: ${defect}`))
+ * )
+ *
+ * const result = Effect.runSync(Stream.runCollect(stream))
+ * result // => ["recovered: boom"]
+ * ```
+ *
+ * @category error handling
+ * @since 4.0.0
+ */
+export const catchDefect: {
+  <A2, E2, R2>(
+    f: (defect: unknown) => Stream<A2, E2, R2>
+  ): <A, E, R>(self: Stream<A, E, R>) => Stream<A | A2, E | E2, R | R2>
+  <A, E, R, A2, E2, R2>(
+    self: Stream<A, E, R>,
+    f: (defect: unknown) => Stream<A2, E2, R2>
+  ): Stream<A | A2, E | E2, R | R2>
+} = dual(2, <A, E, R, A2, E2, R2>(
+  self: Stream<A, E, R>,
+  f: (defect: unknown) => Stream<A2, E2, R2>
+): Stream<A | A2, E | E2, R | R2> =>
+  self.channel.pipe(
+    Channel.catchDefect((defect) => f(defect).channel),
+    fromChannel
+  ))
+
 /**
  * Runs an effect when the stream fails without changing its values or error,
  * unless the tap effect itself fails.
@@ -4827,6 +4906,141 @@ export const tapError: {
     fromChannel
   ))
 
+/**
+ * Peeks at errors with a matching `_tag` effectfully without changing the
+ * stream unless the tap fails.
+ *
+ * **Example** (Effectfully peeking at a tagged error)
+ *
+ * ```ts import.meta.vitest
+ * import { Data, Effect, Stream } from "effect"
+ *
+ * class NetworkError extends Data.TaggedError("NetworkError")<{
+ *   statusCode: number
+ * }> {}
+ *
+ * class ValidationError extends Data.TaggedError("ValidationError")<{
+ *   field: string
+ * }> {}
+ *
+ * const seen: Array<number> = []
+ * const stream: Stream.Stream<number, NetworkError | ValidationError> = Stream.fail(
+ *   new NetworkError({ statusCode: 504 })
+ * )
+ *
+ * const program = stream.pipe(
+ *   Stream.tapErrorTag("NetworkError", (error) => Effect.sync(() => seen.push(error.statusCode))),
+ *   Stream.catch(() => Stream.make(0)),
+ *   Stream.runCollect
+ * )
+ *
+ * await Effect.runPromise(program) // => [ 0 ]
+ * seen // => [ 504 ]
+ * ```
+ *
+ * @see {@link tapError} for peeking at every typed error
+ * @see {@link catchTag} for recovering from a tagged error
+ *
+ * @category error handling
+ * @since 4.0.0
+ */
+export const tapErrorTag: {
+  <const K extends Tags<E> | Arr.NonEmptyReadonlyArray<Tags<E>>, E, A1, E1, R1>(
+    k: K,
+    f: (
+      e: ExtractTag<NoInfer<E>, K extends Arr.NonEmptyReadonlyArray<string> ? K[number] : K>
+    ) => Effect.Effect<A1, E1, R1>
+  ): <A, R>(self: Stream<A, E, R>) => Stream<A, E | E1, R1 | R>
+  <
+    A,
+    E,
+    R,
+    const K extends Tags<E> | Arr.NonEmptyReadonlyArray<Tags<E>>,
+    R1,
+    E1,
+    A1
+  >(
+    self: Stream<A, E, R>,
+    k: K,
+    f: (e: ExtractTag<E, K extends Arr.NonEmptyReadonlyArray<string> ? K[number] : K>) => Effect.Effect<A1, E1, R1>
+  ): Stream<A, E | E1, R | R1>
+} = dual(
+  3,
+  <
+    A,
+    E,
+    R,
+    const K extends Tags<E> | Arr.NonEmptyReadonlyArray<Tags<E>>,
+    R1,
+    E1,
+    A1
+  >(
+    self: Stream<A, E, R>,
+    k: K,
+    f: (e: ExtractTag<E, K extends Arr.NonEmptyReadonlyArray<string> ? K[number] : K>) => Effect.Effect<A1, E1, R1>
+  ): Stream<A, E | E1, R | R1> => {
+    const predicate = Array.isArray(k)
+      ? ((e: E): e is ExtractTag<E, K extends Arr.NonEmptyReadonlyArray<string> ? K[number] : K> =>
+        hasProperty(e, "_tag") && k.includes(e._tag))
+      : isTagged(k as string)
+    return tapError(
+      self,
+      (error) =>
+        predicate(error)
+          ? f(error as ExtractTag<E, K extends Arr.NonEmptyReadonlyArray<string> ? K[number] : K>)
+          : Effect.void
+    )
+  }
+)
+
+/**
+ * Peeks at defects effectfully without changing the stream unless the tap
+ * fails.
+ *
+ * **Example** (Effectfully peeking at defects)
+ *
+ * ```ts import.meta.vitest
+ * import { Effect, Stream } from "effect"
+ *
+ * const defects: Array<unknown> = []
+ * const stream = Stream.make(1, 2).pipe(
+ *   Stream.concat(Stream.die("boom")),
+ *   Stream.tapDefect((defect) => Effect.sync(() => defects.push(defect))),
+ *   Stream.catchCause(() => Stream.make(3))
+ * )
+ *
+ * const program = Effect.gen(function*() {
+ *   const values = yield* Stream.runCollect(stream)
+ *   values // => [ 1, 2, 3 ]
+ * })
+ *
+ * await Effect.runPromise(program)
+ * defects // => [ 'boom' ]
+ * ```
+ *
+ * @see {@link tapCause} for peeking at the full failure cause
+ * @see {@link catchDefect} for recovering from defects
+ *
+ * @category error handling
+ * @since 4.0.0
+ */
+export const tapDefect: {
+  <B, E2, R2>(
+    f: (defect: unknown) => Effect.Effect<B, E2, R2>
+  ): <A, E, R>(self: Stream<A, E, R>) => Stream<A, E | E2, R | R2>
+  <A, E, R, B, E2, R2>(
+    self: Stream<A, E, R>,
+    f: (defect: unknown) => Effect.Effect<B, E2, R2>
+  ): Stream<A, E | E2, R | R2>
+} = dual(2, <A, E, R, B, E2, R2>(
+  self: Stream<A, E, R>,
+  f: (defect: unknown) => Effect.Effect<B, E2, R2>
+): Stream<A, E | E2, R | R2> =>
+  tapCause(self, (cause) => {
+    const defect = Cause.findDefect(cause)
+    return Result.isSuccess(defect) ? f(defect.success) : Effect.void
+  }))
+
 /**
  * Recovers from errors that match a predicate by switching to a recovery stream.
  *
@@ -5128,10 +5342,9 @@ export const catchTag: {
 export const catchTags: {
   <
     E,
-    Cases extends (E extends { _tag: string } ? {
-        [K in E["_tag"]]+?: (error: Extract<E, { _tag: K }>) => Stream<any, any, any>
-      } :
-      {}),
+    Cases extends
+      & { [K in Extract<E, { _tag: string }>["_tag"]]+?: ((error: Extract<E, { _tag: K }>) => Stream<any, any, any>) }
+      & (unknown extends E ? {} : { [K in Exclude<keyof Cases, Extract<E, { _tag: string }>["_tag"]>]: never }),
     A2 = unassigned,
     E2 = never,
     R2 = never
@@ -5159,10 +5372,9 @@ export const catchTags: {
     R,
     E,
     A,
-    Cases extends (E extends { _tag: string } ? {
-        [K in E["_tag"]]+?: (error: Extract<E, { _tag: K }>) => Stream<any, any, any>
-      } :
-      {}),
+    Cases extends
+      & { [K in Extract<E, { _tag: string }>["_tag"]]+?: ((error: Extract<E, { _tag: K }>) => Stream<any, any, any>) }
+      & (unknown extends E ? {} : { [K in Exclude<keyof Cases, Extract<E, { _tag: string }>["_tag"]>]: never }),
     A2 = unassigned,
     E2 = never,
     R2 = never
@@ -5489,6 +5701,88 @@ export const catchReasons: {
   ) as any
 })
 
+/**
+ * Promotes nested reason errors into the stream error channel, replacing the
+ * parent error.
+ *
+ * **Example** (Extracting the reason from a tagged error)
+ *
+ * ```ts import.meta.vitest
+ * import { Data, Effect, Stream } from "effect"
+ *
+ * class RateLimitError extends Data.TaggedError("RateLimitError")<{
+ *   retryAfter: number
+ * }> {}
+ *
+ * class QuotaExceededError extends Data.TaggedError("QuotaExceededError")<{
+ *   limit: number
+ * }> {}
+ *
+ * class AiError extends Data.TaggedError("AiError")<{
+ *   reason: RateLimitError | QuotaExceededError
+ * }> {}
+ *
+ * const stream: Stream.Stream<string, AiError> = Stream.fail(
+ *   new AiError({ reason: new RateLimitError({ retryAfter: 30 }) })
+ * )
+ *
+ * // Before: Stream<string, AiError>
+ * // After:  Stream<string, RateLimitError | QuotaExceededError>
+ * const unwrapped = stream.pipe(Stream.unwrapReason("AiError"))
+ *
+ * const program = Effect.gen(function*() {
+ *   const error = yield* Effect.flip(Stream.runCollect(unwrapped))
+ *   error._tag // => "RateLimitError"
+ * })
+ *
+ * await Effect.runPromise(program)
+ * ```
+ *
+ * @see {@link catchReason} for recovering from a specific reason
+ * @see {@link catchReasons} for handling several reasons at once
+ *
+ * @category error handling
+ * @since 4.0.0
+ */
+export const unwrapReason: {
+  <
+    K extends Effect.TagsWithReason<E>,
+    E
+  >(
+    errorTag: K
+  ): <A, R>(self: Stream<A, E, R>) => Stream<A, ExcludeTag<E, K> | ReasonOf<ExtractTag<E, K>>, R>
+  <
+    A,
+    E,
+    R,
+    K extends Effect.TagsWithReason<E>
+  >(
+    self: Stream<A, E, R>,
+    errorTag: K
+  ): Stream<A, ExcludeTag<E, K> | ReasonOf<ExtractTag<E, K>>, R>
+} = dual(
+  2,
+  <
+    A,
+    E,
+    R,
+    K extends Effect.TagsWithReason<E>
+  >(
+    self: Stream<A, E, R>,
+    errorTag: K
+  ): Stream<A, ExcludeTag<E, K> | ReasonOf<ExtractTag<E, K>>, R> =>
+    catchFilter(
+      self,
+      (e: any) => {
+        if (isTagged(e, errorTag) && hasProperty(e, "reason")) {
+          return Result.succeed(e.reason)
+        }
+        return Result.fail(e)
+      },
+      fail as any
+    ) as any
+)
+
 /**
  * Transforms the errors emitted by this stream using `f`.
  *
@@ -6133,13 +6427,13 @@ export const take: {
  * **Example** (Truncating at a byte limit)
  *
  * ```ts import.meta.vitest
- * import { Effect, Stream } from "effect"
+ * import { ByteSize, Effect, Stream } from "effect"
  *
  * const program = Stream.make(
  *   new Uint8Array([1, 2]),
  *   new Uint8Array([3, 4, 5])
  * ).pipe(
- *   Stream.limitBytes(4, () => Stream.empty),
+ *   Stream.limitBytes(ByteSize.bytes(4), () => Stream.empty),
  *   Stream.runCollect,
  *   Effect.map((chunks) => chunks.map((chunk) => [...chunk]))
  * )
@@ -6152,21 +6446,21 @@ export const take: {
  */
 export const limitBytes: {
   <E, R>(
-    bytes: SizeInput,
+    bytes: ByteSize.Input,
     onLimitReached: LazyArg<Stream<Uint8Array, E, R>>
   ): (self: Stream<Uint8Array, E, R>) => Stream<Uint8Array, E, R>
   <E, R>(
     self: Stream<Uint8Array, E, R>,
-    bytes: SizeInput,
+    bytes: ByteSize.Input,
     onLimitReached: LazyArg<Stream<Uint8Array, E, R>>
   ): Stream<Uint8Array, E, R>
 } = dual(3, <E, R>(
   self: Stream<Uint8Array, E, R>,
-  bytes: SizeInput,
+  bytes: ByteSize.Input,
   onLimitReached: LazyArg<Stream<Uint8Array, E, R>>
 ): Stream<Uint8Array, E, R> =>
   suspend(() => {
-    const limit = BigInt(bytes)
+    const limit = ByteSize.fromInputUnsafe(bytes)
     let size = BigInt(0)
     let limitReached = false
     return concat(
@@ -6905,7 +7199,9 @@ export const rechunk: {
             if (chunk.length === 0 && arr.length === target) {
               return Effect.succeed(arr)
             } else if (chunk.length + arr.length < target) {
-              chunk.push(...arr)
+              for (let i = 0; i < arr.length; i++) {
+                chunk.push(arr[i])
+              }
               return loop()
             }
             current = arr
@@ -7223,7 +7519,7 @@ export const combine: {
  * await Effect.runPromise(program)
  * ```
  *
- * @category sequencing
+ * @category merging
  * @since 4.0.0
  */
 export const combineArray: {
@@ -7378,7 +7674,7 @@ export const mapAccumArray: {
     initial: LazyArg<S>,
     f: (s: S, a: Arr.NonEmptyReadonlyArray<A>) => readonly [state: S, values: ReadonlyArray<B>],
     options?: {
-      readonly onHalt?: ((state: S) => Array<B>) | undefined
+      readonly onHalt?: ((state: S) => ReadonlyArray<B>) | undefined
     }
   ): Stream<B, E, R>
 } = dual((args) => isStream(args[0]), <A, E, R, S, B>(
@@ -7590,7 +7886,7 @@ export const mapAccumArrayEffect: {
  *
  * const program = Effect.gen(function*() {
  *   const values = yield* Stream.make(1, 2, 3).pipe(
- *     Stream.scan(0, (acc, n) => acc + n),
+ *     Stream.scan(() => 0, (acc, n) => acc + n),
  *     Stream.runCollect
  *   )
  *   values // => [ 0, 1, 3, 6 ]
@@ -7604,22 +7900,22 @@ export const mapAccumArrayEffect: {
  */
 export const scan: {
   <S, A>(
-    initial: S,
+    initial: LazyArg<S>,
     f: (s: S, a: A) => S
   ): <E, R>(self: Stream<A, E, R>) => Stream<S, E, R>
   <A, E, R, S>(
     self: Stream<A, E, R>,
-    initial: S,
+    initial: LazyArg<S>,
     f: (s: S, a: A) => S
   ): Stream<S, E, R>
 } = dual(3, <A, E, R, S>(
   self: Stream<A, E, R>,
-  initial: S,
+  initial: LazyArg<S>,
   f: (s: S, a: A) => S
 ): Stream<S, E, R> =>
   suspend(() => {
     let isFirst = true
-    return fromChannel(Channel.mapAccum(self.channel, constant(initial), (state, arr) => {
+    return fromChannel(Channel.mapAccum(self.channel, initial, (state, arr) => {
       const states = Arr.empty<S>() as Arr.NonEmptyArray<S>
       if (isFirst) {
         isFirst = false
@@ -7643,7 +7939,7 @@ export const scan: {
  *
  * const program = Effect.gen(function*() {
  *   const states = yield* Stream.make(1, 2, 3).pipe(
- *     Stream.scanEffect(0, (sum, n) => Effect.succeed(sum + n)),
+ *     Stream.scanEffect(() => 0, (sum, n) => Effect.succeed(sum + n)),
  *     Stream.runCollect
  *   )
  *   states // => [ 0, 1, 3, 6 ]
@@ -7656,24 +7952,26 @@ export const scan: {
  */
 export const scanEffect: {
   <S, A, E2, R2>(
-    initial: S,
+    initial: LazyArg<S>,
     f: (s: S, a: A) => Effect.Effect<S, E2, R2>
   ): <E, R>(self: Stream<A, E, R>) => Stream<S, E | E2, R | R2>
   <A, E, R, S, E2, R2>(
     self: Stream<A, E, R>,
-    initial: S,
+    initial: LazyArg<S>,
     f: (s: S, a: A) => Effect.Effect<S, E2, R2>
   ): Stream<S, E | E2, R | R2>
 } = dual(3, <A, E, R, S, E2, R2>(
   self: Stream<A, E, R>,
-  initial: S,
+  initial: LazyArg<S>,
   f: (s: S, a: A) => Effect.Effect<S, E2, R2>
 ): Stream<S, E | E2, R | R2> =>
-  self.channel.pipe(
-    Channel.flattenArray,
-    Channel.scanEffect(initial, f),
-    Channel.map(Arr.of),
-    fromChannel
+  suspend(() =>
+    self.channel.pipe(
+      Channel.flattenArray,
+      Channel.scanEffect(initial(), f),
+      Channel.map(Arr.of),
+      fromChannel
+    )
   ))
 
 /**
@@ -8390,15 +8688,15 @@ export const groupAdjacentBy: {
  * @category aggregation
  * @since 2.0.0
  */
-export const transduce = dual<
+export const transduce: {
   <A2, A, E2, R2>(
     sink: Sink.Sink<A2, A, A, E2, R2>
-  ) => <E, R>(self: Stream<A, E, R>) => Stream<A2, E2 | E, R2 | R>,
+  ): <E, R>(self: Stream<A, E, R>) => Stream<A2, E2 | E, R2 | R>
   <A, E, R, A2, E2, R2>(
     self: Stream<A, E, R>,
     sink: Sink.Sink<A2, A, A, E2, R2>
-  ) => Stream<A2, E2 | E, R2 | R>
->(
+  ): Stream<A2, E2 | E, R2 | R>
+} = dual(
   2,
   <A, E, R, A2, E2, R2>(
     self: Stream<A, E, R>,
@@ -9245,7 +9543,7 @@ export const changesWithEffect: {
  * await Effect.runPromise(program)
  * ```
  *
- * @category decoding
+ * @category text
  * @since 2.0.0
  */
 export const decodeText: <
@@ -9290,7 +9588,7 @@ export const decodeText: <
  * await Effect.runPromise(program)
  * ```
  *
- * @category encoding
+ * @category text
  * @since 2.0.0
  */
 export const encodeText = <E, R>(self: Stream<string, E, R>): Stream<Uint8Array, E, R> =>
@@ -9315,7 +9613,7 @@ export const encodeText = <E, R>(self: Stream<string, E, R>): Stream<Uint8Array,
  * }))
  * ```
  *
- * @category splitting
+ * @category text
  * @since 2.0.0
  */
 export const splitLines = <E, R>(self: Stream<string, E, R>): Stream<string, E, R> =>
@@ -9691,7 +9989,7 @@ export const onExit: {
  * errors // => ["boom"]
  * ```
  *
- * @category error handling
+ * @category resource management
  * @since 2.0.0
  */
 export const onError: {
@@ -10212,27 +10510,26 @@ export const withSpan: {
  * await Effect.runPromise(effect)
  * ```
  *
- * @category constructors
+ * @category do notation
  * @since 2.0.0
  */
 export const Do: Stream<{}> = succeed({})
 
 const let_: {
-  <N extends string, A extends object, B>(
-    name: Exclude<N, keyof A>,
+  <N extends string, A extends Record<string, any>, B>(
+    name: N,
     f: (a: NoInfer<A>) => B
-  ): <E, R>(self: Stream<A, E, R>) => Stream<{ [K in N | keyof A]: K extends keyof A ? A[K] : B }, E, R>
-  <A extends object, E, R, N extends string, B>(
+  ): <E, R>(self: Stream<A, E, R>) => Stream<Simplify<Omit<A, N> & Record<N, B>>, E, R>
+  <A extends Record<string, any>, E, R, B, N extends string>(
     self: Stream<A, E, R>,
-    name: Exclude<N, keyof A>,
+    name: N,
     f: (a: NoInfer<A>) => B
-  ): Stream<{ [K in N | keyof A]: K extends keyof A ? A[K] : B }, E, R>
-} = dual(3, <A extends object, E, R, N extends string, B>(
+  ): Stream<Simplify<Omit<A, N> & Record<N, B>>, E, R>
+} = dual(3, <A extends Record<string, any>, E, R, B, N extends string>(
   self: Stream<A, E, R>,
-  name: Exclude<N, keyof A>,
+  name: N,
   f: (a: NoInfer<A>) => B
-): Stream<{ [K in N | keyof A]: K extends keyof A ? A[K] : B }, E, R> =>
-  map(self, (a) => ({ ...a, [name]: f(a) } as any)))
+): Stream<Simplify<Omit<A, N> & Record<N, B>>, E, R> => map(self, (a) => ({ ...a, [name]: f(a) } as any)))
 export {
   /**
    * Adds a computed field to the current Do-notation record.
@@ -10255,7 +10552,7 @@ export {
    * await Effect.runPromise(program)
    * ```
    *
-   * @category mapping
+   * @category do notation
    * @since 2.0.0
    */
   let_ as let
@@ -10279,37 +10576,37 @@ export {
  * await Effect.runPromise(result) // => [{ a: 1, b: 2 }, { a: 2, b: 3 }]
  * ```
  *
- * @category sequencing
+ * @category do notation
  * @since 2.0.0
  */
 export const bind: {
-  <N extends string, A, B, E2, R2>(
-    tag: Exclude<N, keyof A>,
-    f: (_: NoInfer<A>) => Stream<B, E2, R2>,
+  <N extends string, A extends Record<string, any>, B, E2, R2>(
+    name: N,
+    f: (a: NoInfer<A>) => Stream<B, E2, R2>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Concurrency | undefined
       readonly bufferSize?: number | undefined
     } | undefined
-  ): <E, R>(self: Stream<A, E, R>) => Stream<{ [K in N | keyof A]: K extends keyof A ? A[K] : B }, E2 | E, R2 | R>
-  <A, E, R, N extends string, B, E2, R2>(
+  ): <E, R>(self: Stream<A, E, R>) => Stream<Simplify<Omit<A, N> & Record<N, B>>, E2 | E, R2 | R>
+  <A extends Record<string, any>, E, R, B, E2, R2, N extends string>(
     self: Stream<A, E, R>,
-    tag: Exclude<N, keyof A>,
-    f: (_: NoInfer<A>) => Stream<B, E2, R2>,
+    name: N,
+    f: (a: NoInfer<A>) => Stream<B, E2, R2>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Concurrency | undefined
       readonly bufferSize?: number | undefined
     } | undefined
-  ): Stream<{ [K in N | keyof A]: K extends keyof A ? A[K] : B }, E | E2, R | R2>
-} = dual((args) => isStream(args[0]), <A, E, R, N extends string, B, E2, R2>(
+  ): Stream<Simplify<Omit<A, N> & Record<N, B>>, E | E2, R | R2>
+} = dual((args) => isStream(args[0]), <A extends Record<string, any>, E, R, B, E2, R2, N extends string>(
   self: Stream<A, E, R>,
-  tag: Exclude<N, keyof A>,
-  f: (_: NoInfer<A>) => Stream<B, E2, R2>,
+  name: N,
+  f: (a: NoInfer<A>) => Stream<B, E2, R2>,
   options?: {
-    readonly concurrency?: number | "unbounded" | undefined
+    readonly concurrency?: Concurrency | undefined
     readonly bufferSize?: number | undefined
   } | undefined
-): Stream<{ [K in N | keyof A]: K extends keyof A ? A[K] : B }, E | E2, R | R2> =>
-  flatMap(self, (a) => map(f(a), (b) => ({ ...a, [tag]: b } as any)), options))
+): Stream<Simplify<Omit<A, N> & Record<N, B>>, E | E2, R | R2> =>
+  flatMap(self, (a) => map(f(a), (b) => ({ ...a, [name]: b } as any)), options))
 
 /**
  * Binds an Effect-produced value into the do-notation record for each stream element.
@@ -10332,40 +10629,40 @@ export const bind: {
  * await Effect.runPromise(program)
  * ```
  *
- * @category sequencing
+ * @category do notation
  * @since 2.0.0
  */
 export const bindEffect: {
-  <N extends string, A, B, E2, R2>(
-    tag: Exclude<N, keyof A>,
-    f: (_: NoInfer<A>) => Effect.Effect<B, E2, R2>,
+  <N extends string, A extends Record<string, any>, B, E2, R2>(
+    name: N,
+    f: (a: NoInfer<A>) => Effect.Effect<B, E2, R2>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Concurrency | undefined
       readonly bufferSize?: number | undefined
       readonly unordered?: boolean | undefined
-    }
-  ): <E, R>(self: Stream<A, E, R>) => Stream<{ [K in keyof A | N]: K extends keyof A ? A[K] : B }, E | E2, R | R2>
-  <A, E, R, N extends string, B, E2, R2>(
+    } | undefined
+  ): <E, R>(self: Stream<A, E, R>) => Stream<Simplify<Omit<A, N> & Record<N, B>>, E | E2, R | R2>
+  <A extends Record<string, any>, E, R, B, E2, R2, N extends string>(
     self: Stream<A, E, R>,
-    tag: Exclude<N, keyof A>,
-    f: (_: NoInfer<A>) => Effect.Effect<B, E2, R2>,
+    name: N,
+    f: (a: NoInfer<A>) => Effect.Effect<B, E2, R2>,
     options?: {
-      readonly concurrency?: number | "unbounded" | undefined
+      readonly concurrency?: Concurrency | undefined
       readonly bufferSize?: number | undefined
       readonly unordered?: boolean | undefined
-    }
-  ): Stream<{ [K in keyof A | N]: K extends keyof A ? A[K] : B }, E | E2, R | R2>
-} = dual((args) => isStream(args[0]), <A, E, R, N extends string, B, E2, R2>(
+    } | undefined
+  ): Stream<Simplify<Omit<A, N> & Record<N, B>>, E | E2, R | R2>
+} = dual((args) => isStream(args[0]), <A extends Record<string, any>, E, R, B, E2, R2, N extends string>(
   self: Stream<A, E, R>,
-  tag: Exclude<N, keyof A>,
-  f: (_: NoInfer<A>) => Effect.Effect<B, E2, R2>,
+  name: N,
+  f: (a: NoInfer<A>) => Effect.Effect<B, E2, R2>,
   options?: {
-    readonly concurrency?: number | "unbounded" | undefined
+    readonly concurrency?: Concurrency | undefined
     readonly bufferSize?: number | undefined
     readonly unordered?: boolean | undefined
   } | undefined
-): Stream<{ [K in keyof A | N]: K extends keyof A ? A[K] : B }, E | E2, R | R2> =>
-  mapEffect(self, (a) => Effect.map(f(a), (b) => ({ ...a, [tag]: b } as any)), options))
+): Stream<Simplify<Omit<A, N> & Record<N, B>>, E | E2, R | R2> =>
+  mapEffect(self, (a) => Effect.map(f(a), (b) => ({ ...a, [name]: b } as any)), options))
 
 /**
  * Maps each element into a record keyed by the provided name.
@@ -10380,7 +10677,7 @@ export const bindEffect: {
  * await Effect.runPromise(Stream.runCollect(stream)) // => [{ value: 1 }, { value: 2 }, { value: 3 }]
  * ```
  *
- * @category mapping
+ * @category do notation
  * @since 2.0.0
  */
 export const bindTo: {
@@ -10973,17 +11270,17 @@ export const mkUint8Array = <E, R>(self: Stream<Uint8Array, E, R>): Effect.Effec
  * @category destructors
  * @since 4.0.0
  */
-export const toReadableStreamWith = dual<
+export const toReadableStreamWith: {
   <A, XR>(
     context: Context.Context<XR>,
     options?: { readonly strategy?: QueuingStrategy<A> | undefined }
-  ) => <E, R extends XR>(self: Stream<A, E, R>) => ReadableStream<A>,
+  ): <E, R extends XR>(self: Stream<A, E, R>) => ReadableStream<A>
   <A, E, XR, R extends XR>(
     self: Stream<A, E, R>,
     context: Context.Context<XR>,
     options?: { readonly strategy?: QueuingStrategy<A> | undefined }
-  ) => ReadableStream<A>
->(
+  ): ReadableStream<A>
+} = dual(
   (args) => isStream(args[0]),
   <A, E, XR, R extends XR>(
     self: Stream<A, E, R>,
@@ -11321,7 +11618,7 @@ export const runIntoPubSub: {
     options?: {
       readonly shutdownOnEnd?: boolean | undefined
     } | undefined
-  ): Effect.Effect<void, never, R>
+  ): Effect.Effect<void, E, R>
 } = dual((args) => isStream(args[0]), <A, E, R>(
   self: Stream<A, E, R>,
   pubsub: PubSub.PubSub<A>,
diff --git a/repos/effect/packages/effect/src/Struct.ts b/repos/effect/packages/effect/src/Struct.ts
index 14416763e..b7ada252a 100644
--- a/repos/effect/packages/effect/src/Struct.ts
+++ b/repos/effect/packages/effect/src/Struct.ts
@@ -209,7 +209,7 @@ export const pick: {
 } = dual(
   2,
   <S extends object, const Keys extends ReadonlyArray<keyof S>>(self: S, keys: Keys) => {
-    return buildStruct(self, (k, v) => (keys.includes(k) ? [k, v] : undefined))
+    return buildStruct(self, (k, v) => (hasPropertyKey(keys, k) ? [k, v] : undefined))
   }
 )
 
@@ -245,7 +245,7 @@ export const omit: {
 } = dual(
   2,
   <S extends object, Keys extends ReadonlyArray<keyof S>>(self: S, keys: Keys) => {
-    return buildStruct(self, (k, v) => (!keys.includes(k) ? [k, v] : undefined))
+    return buildStruct(self, (k, v) => (!hasPropertyKey(keys, k) ? [k, v] : undefined))
   }
 )
 
@@ -762,7 +762,7 @@ export const mapPick: {
     keys: Keys,
     lambda: L
   ) => {
-    return buildStruct(self, (k, v) => [k, keys.includes(k) ? lambda(v) : v])
+    return buildStruct(self, (k, v) => [k, hasPropertyKey(keys, k) ? lambda(v) : v])
   }
 )
 
@@ -816,10 +816,14 @@ export const mapOmit: {
     keys: Keys,
     lambda: L
   ) => {
-    return buildStruct(self, (k, v) => [k, !keys.includes(k) ? lambda(v) : v])
+    return buildStruct(self, (k, v) => [k, !hasPropertyKey(keys, k) ? lambda(v) : v])
   }
 )
 
+function hasPropertyKey(keys: ReadonlyArray<PropertyKey>, key: PropertyKey): boolean {
+  return keys.some((candidate) => candidate === key || typeof candidate === "number" && String(candidate) === key)
+}
+
 /**
  * Walk `source`; for each key decide what to emit via the small callback.
  *
diff --git a/repos/effect/packages/effect/src/SynchronizedRef.ts b/repos/effect/packages/effect/src/SynchronizedRef.ts
index 5bbf95662..4db44c41b 100644
--- a/repos/effect/packages/effect/src/SynchronizedRef.ts
+++ b/repos/effect/packages/effect/src/SynchronizedRef.ts
@@ -14,6 +14,7 @@ import * as Effect from "./Effect.ts"
 import { dual } from "./Function.ts"
 import { PipeInspectableProto } from "./internal/core.ts"
 import * as Option from "./Option.ts"
+import type { Pipeable } from "./Pipeable.ts"
 import * as Ref from "./Ref.ts"
 import * as Semaphore from "./Semaphore.ts"
 
@@ -34,7 +35,7 @@ const TypeId = "~effect/SynchronizedRef"
  * @category models
  * @since 2.0.0
  */
-export interface SynchronizedRef<in out A> extends Ref.Ref<A> {
+export interface SynchronizedRef<in out A> extends Pipeable {
   readonly [TypeId]: typeof TypeId
   readonly backing: Ref.Ref<A>
   readonly semaphore: Semaphore.Semaphore
@@ -367,7 +368,6 @@ export const modifySome: {
  */
 export const modifySomeEffect: {
   <A, B, R, E>(
-    fallback: B,
     pf: (a: A) => Effect.Effect<readonly [B, Option.Option<A>], E, R>
   ): (self: SynchronizedRef<A>) => Effect.Effect<B, E, R>
   <A, B, R, E>(
diff --git a/repos/effect/packages/effect/src/Terminal.ts b/repos/effect/packages/effect/src/Terminal.ts
index 8c157e74f..bbd046c52 100644
--- a/repos/effect/packages/effect/src/Terminal.ts
+++ b/repos/effect/packages/effect/src/Terminal.ts
@@ -105,7 +105,7 @@ export interface UserInput {
   readonly key: Key
 }
 
-const QuitErrorTypeId = "effect/platform/Terminal/QuitError"
+const QuitErrorTypeId = "~effect/Terminal/QuitError"
 
 /**
  * Represents an error that occurs when a user attempts to
@@ -163,7 +163,7 @@ export const isQuitError = (u: unknown): u is QuitError => Predicate.hasProperty
  * @category services
  * @since 4.0.0
  */
-export const Terminal: Context.Service<Terminal, Terminal> = Context.Service("effect/platform/Terminal")
+export const Terminal: Context.Service<Terminal, Terminal> = Context.Service("effect/Terminal")
 
 /**
  * Creates a `Terminal` service implementation.
diff --git a/repos/effect/packages/effect/src/Tracer.ts b/repos/effect/packages/effect/src/Tracer.ts
index 3ead5c1fb..08708eeb0 100644
--- a/repos/effect/packages/effect/src/Tracer.ts
+++ b/repos/effect/packages/effect/src/Tracer.ts
@@ -631,10 +631,24 @@ export const TracerKey = "effect/Tracer"
  */
 export const Tracer: Context.Reference<Tracer> = Context.Reference<Tracer>(TracerKey, {
   fiberCached: true,
-  defaultValue: () =>
-    make({
-      span: (options) => new NativeSpan(options)
-    })
+  defaultValue: () => nativeTracer
+})
+
+/**
+ * The default `Tracer` implementation backing the `Tracer` reference. It
+ * creates in-memory `NativeSpan` instances and does not export them anywhere.
+ *
+ * **Details**
+ *
+ * Runtime code can compare the active tracer against `nativeTracer` to detect
+ * that no tracing backend is installed and skip work that only a backend could
+ * observe, such as recording span attributes.
+ *
+ * @category references
+ * @since 4.0.0
+ */
+export const nativeTracer: Tracer = make({
+  span: (options) => new NativeSpan(options)
 })
 
 /**
@@ -644,9 +658,11 @@ export const Tracer: Context.Reference<Tracer> = Context.Reference<Tracer>(Trace
  *
  * **Details**
  *
- * The constructor initializes the span with `Started` status, inherits the
- * parent trace id or generates a new one, and always generates a new span id.
- * Attributes, events, links, and status are then mutated through `Span` methods.
+ * The constructor initializes the span with `Started` status. Trace and span
+ * identifiers, the attribute map, and the event list are created lazily on
+ * first access, so spans that are never inspected allocate as little as
+ * possible. Attributes, events, links, and status are mutated through `Span`
+ * methods.
  *
  * @see {@link Span} for the interface implemented by native spans
  *
@@ -655,8 +671,6 @@ export const Tracer: Context.Reference<Tracer> = Context.Reference<Tracer>(Trace
  */
 export class NativeSpan implements Span {
   readonly _tag = "Span"
-  readonly spanId: string
-  readonly traceId: string = "native"
   readonly sampled: boolean
 
   readonly name: string
@@ -667,8 +681,10 @@ export class NativeSpan implements Span {
   readonly kind: SpanKind
 
   status: SpanStatus
-  attributes: Map<string, unknown>
-  events: Array<[name: string, startTime: bigint, attributes: Record<string, unknown>]> = []
+  _traceId: string | undefined = undefined
+  _spanId: string | undefined = undefined
+  _attributes: Map<string, unknown> | undefined = undefined
+  _events: Array<[name: string, startTime: bigint, attributes: Record<string, unknown>]> | undefined = undefined
 
   constructor(options: {
     readonly name: string
@@ -690,9 +706,22 @@ export class NativeSpan implements Span {
       _tag: "Started",
       startTime: options.startTime
     }
-    this.attributes = new Map()
-    this.traceId = Option.getOrUndefined(options.parent)?.traceId ?? Encoding.randomHex(32)
-    this.spanId = Encoding.randomHex(16)
+  }
+
+  get traceId(): string {
+    return this._traceId ??= Option.getOrUndefined(this.parent)?.traceId ?? Encoding.randomHex(32)
+  }
+
+  get spanId(): string {
+    return this._spanId ??= Encoding.randomHex(16)
+  }
+
+  get attributes(): Map<string, unknown> {
+    return this._attributes ??= new Map()
+  }
+
+  get events(): Array<[name: string, startTime: bigint, attributes: Record<string, unknown>]> {
+    return this._events ??= []
   }
 
   end(endTime: bigint, exit: Exit.Exit<unknown, unknown>): void {
diff --git a/repos/effect/packages/effect/src/Tuple.ts b/repos/effect/packages/effect/src/Tuple.ts
index f929c9f0a..ecaeefbc6 100644
--- a/repos/effect/packages/effect/src/Tuple.ts
+++ b/repos/effect/packages/effect/src/Tuple.ts
@@ -249,7 +249,9 @@ export const appendElements: {
 
 type Evolver<T> = { readonly [I in keyof T]?: ((a: T[I]) => unknown) | undefined }
 
-type Evolved<T, E> = { [I in keyof T]: I extends keyof E ? (E[I] extends (...a: any) => infer R ? R : T[I]) : T[I] }
+type EvolveElement<A, F> = F extends (...a: any) => infer R ? R : A
+
+type Evolved<T, E> = { [I in keyof T]: I extends keyof E ? EvolveElement<T[I], E[I]> : T[I] }
 
 /**
  * Transforms elements of a tuple by providing an array of transform functions.
diff --git a/repos/effect/packages/effect/src/Types.ts b/repos/effect/packages/effect/src/Types.ts
index 8a9c3a43e..f7ef040b9 100644
--- a/repos/effect/packages/effect/src/Types.ts
+++ b/repos/effect/packages/effect/src/Types.ts
@@ -496,31 +496,42 @@ export type Mutable<T> = {
   -readonly [P in keyof T]: T[P]
 }
 
+type DeepMutableIsOpaque<T> = Extract<keyof T, symbol> extends never
+  ? Extract<T[keyof T], Function> extends never ? false : true
+  : true
+
 /**
- * Recursively removes `readonly` from all properties, including nested
- * objects, arrays, `Map`, and `Set`.
+ * Recursively removes `readonly` from plain objects, arrays, tuples, `Map`,
+ * and `Set` while preserving opaque objects.
  *
  * **When to use**
  *
- * Use when you need a fully mutable version of a deeply readonly type.
+ * Use when you need a fully mutable version of deeply readonly structural
+ * data.
  *
  * **Details**
  *
- * Recursion stops at primitives (`string`, `number`, `boolean`, `bigint`,
- * `symbol`) and functions.
+ * Recursion stops at primitives, functions, objects with methods, and objects
+ * with symbol-keyed properties. This preserves built-in objects and Effect
+ * data types while still transforming their surrounding arrays and records.
  *
  * **Example** (Converting deeply to mutable types)
  *
  * ```ts import.meta.vitest
- * import type { Types } from "effect"
+ * import { DateTime, type Types } from "effect"
  *
  * type Deep = Types.DeepMutable<{
  *   readonly a: string
  *   readonly b: ReadonlyArray<{ readonly c: number }>
+ *   readonly createdAt: DateTime.DateTime
  * }>
- * // { a: string; b: Array<{ c: number }> }
+ * // { a: string; b: Array<{ c: number }>; createdAt: DateTime.DateTime }
  *
- * const witness: Deep = { a: "value", b: [{ c: 1 }] }
+ * const witness: Deep = {
+ *   a: "value",
+ *   b: [{ c: 1 }],
+ *   createdAt: DateTime.makeUnsafe(0)
+ * }
  * witness.b[0].c = 2
  * ```
  *
@@ -531,7 +542,9 @@ export type Mutable<T> = {
  */
 export type DeepMutable<T> = T extends ReadonlyMap<infer K, infer V> ? Map<DeepMutable<K>, DeepMutable<V>>
   : T extends ReadonlySet<infer V> ? Set<DeepMutable<V>>
+  : T extends ReadonlyArray<unknown> ? { -readonly [K in keyof T]: DeepMutable<T[K]> }
   : T extends string | number | boolean | bigint | symbol | Function ? T
+  : DeepMutableIsOpaque<T> extends true ? T
   : { -readonly [K in keyof T]: DeepMutable<T[K]> }
 
 /**
@@ -1167,14 +1180,22 @@ export type ExcludeReason<E, K extends string> = E extends { readonly reason: in
   ? Exclude<R, { readonly _tag: K }>
   : never
 
+type RequiredKeysFrom_<T> = { [K in keyof T]-?: {} extends Pick<T, K> ? never : K }[keyof T]
+
+type IsIndexKey_<K> = string extends K ? true : number extends K ? true : symbol extends K ? true : false
+
+type WithoutIndexSignature_<T> = {
+  [K in keyof T as IsIndexKey_<K> extends true ? never : K]: T[K]
+}
+
 /**
- * Extracts the required keys from a type.
- *
- * **When to use**
- *
- * Use to derive the keys whose properties must be present on an object type.
+ * Extracts the keys of required properties from a type.
  *
  * @category utility types
  * @since 4.0.0
  */
-export type RequiredKeys<T> = { [K in keyof T]-?: {} extends Pick<T, K> ? never : K }[keyof T]
+export type RequiredKeys<T> = RequiredKeysFrom_<
+  [T] extends [ReadonlyArray<unknown>] ? T
+    : IsIndexKey_<keyof T> extends true ? WithoutIndexSignature_<T>
+    : T
+>
diff --git a/repos/effect/packages/effect/src/Utils.ts b/repos/effect/packages/effect/src/Utils.ts
index 448c79b16..4bf175990 100644
--- a/repos/effect/packages/effect/src/Utils.ts
+++ b/repos/effect/packages/effect/src/Utils.ts
@@ -11,6 +11,7 @@
  * @since 2.0.0
  */
 import type { Kind, TypeLambda } from "./HKT.ts"
+import { getStackTraceLimit } from "./internal/stackTraceLimit.ts"
 import type * as Types from "./Types.ts"
 
 /**
@@ -219,7 +220,8 @@ const pickInternalCall = (): <A>(body: () => A) => A => {
     }
   }
 
-  const isNotOptimizedAway = standard[InternalTypeId](() => new Error().stack)?.includes(InternalTypeId) === true
+  const isNotOptimizedAway = getStackTraceLimit() !== 0 &&
+    standard[InternalTypeId](() => new Error().stack)?.includes(InternalTypeId) === true
 
   return isNotOptimizedAway ? standard[InternalTypeId] : forced[InternalTypeId]
 }
diff --git a/repos/effect/packages/effect/src/internal/arbitrary/array.ts b/repos/effect/packages/effect/src/internal/arbitrary/array.ts
new file mode 100644
index 000000000..85d3c1d08
--- /dev/null
+++ b/repos/effect/packages/effect/src/internal/arbitrary/array.ts
@@ -0,0 +1,90 @@
+import * as Effect from "../../Effect.ts"
+import * as InternalArray from "../array.ts"
+import { done } from "../core.ts"
+import * as Model from "./model.ts"
+
+/** @internal */
+export interface Shape {
+  readonly fixedCount: number
+  readonly optionalCount: number
+  readonly repeatCount: number
+  readonly tailCount: number
+  readonly minimum: number
+}
+
+function rebuild<A>(
+  children: ReadonlyArray<Model.Retained<A>>,
+  shape: Shape,
+  elementStart = 0
+): Model.Sample<Array<A>> {
+  let index = 0
+  let removable: number | undefined
+  let itemShrinks: Model.ShrinkPull<Model.Retained<A> | Model.Discarded> | undefined
+  let removableOptional = shape.repeatCount === 0 && shape.tailCount === 0
+    ? Math.min(shape.optionalCount, children.length - shape.minimum)
+    : 0
+  const repeatEnd = shape.fixedCount + shape.repeatCount
+  // Adapt fast-check v4.9.0's ArrayArbitrary (MIT): remove progressively smaller prefixes,
+  // shrink the head, then visit the tail. The index loop avoids recursive slice traversal.
+  // Unlike a suffix-local minimum, the whole-array minimum lets us remove interior elements
+  // even when a retained prefix already accounts for part of the required length.
+  // https://github.com/dubzzz/fast-check/blob/v4.9.0/packages/fast-check/src/arbitrary/_internals/ArrayArbitrary.ts
+  const loop = (): Model.ShrinkPull<Model.Attempt<Array<A>>> =>
+    Effect.suspend(() => {
+      if (removableOptional > 0) {
+        const count = removableOptional
+        removableOptional = Math.floor(removableOptional / 2)
+        return Effect.succeed(rebuild(children.slice(0, -count), {
+          ...shape,
+          fixedCount: shape.fixedCount - count,
+          optionalCount: shape.optionalCount - count
+        }))
+      }
+      while (index < children.length) {
+        removable ??= index >= shape.fixedCount && index < repeatEnd
+          ? Math.min(repeatEnd - index, children.length - shape.minimum)
+          : 0
+        if (removable > 0) {
+          const count = removable
+          removable = Math.floor(removable / 2)
+          return Effect.succeed(rebuild(children.slice(0, index).concat(children.slice(index + count)), {
+            ...shape,
+            repeatCount: shape.repeatCount - count
+          }))
+        }
+        if (index >= elementStart) itemShrinks ??= children[index].shrinks?.()
+        if (itemShrinks !== undefined) {
+          return Effect.matchEffect(itemShrinks, {
+            onFailure: () => {
+              itemShrinks = undefined
+              removable = undefined
+              index++
+              return loop()
+            },
+            onSuccess: (item): Effect.Effect<Model.Attempt<Array<A>>> => {
+              if (item._tag === "Discarded") return Effect.succeed(item)
+              return Effect.succeed(rebuild(InternalArray.replaceAt(children, index, item), shape, index))
+            }
+          })
+        }
+        index++
+        removable = undefined
+      }
+      return done()
+    })
+  return Model.makeSample(children.map((child) => child.value), loop())
+}
+
+/** @internal */
+export function sample<A>(
+  children: ReadonlyArray<Model.Sample<A>>,
+  shape: Shape,
+  shrinks = true
+): Model.Sample<Array<A>> {
+  const value = children.map((child) => child.value)
+  if (!shrinks) return Model.makeSample(value)
+  if (children.length <= shape.minimum || shape.repeatCount === 0 && shape.optionalCount === 0) {
+    return Model.productSample(children, (children) => children.map((child) => child.value))
+  }
+  return Model.makeSampleWithLazyShrinks(value, () => rebuild(children.map(Model.retain), shape).shrinks)
+}
diff --git a/repos/effect/packages/effect/src/internal/arbitrary/bigDecimal.ts b/repos/effect/packages/effect/src/internal/arbitrary/bigDecimal.ts
new file mode 100644
index 000000000..fdea60a50
--- /dev/null
+++ b/repos/effect/packages/effect/src/internal/arbitrary/bigDecimal.ts
@@ -0,0 +1,260 @@
+import * as BigDecimal from "../../BigDecimal.ts"
+import * as Effect from "../../Effect.ts"
+import { done } from "../core.ts"
+import * as Model from "./model.ts"
+
+const bigint0 = BigInt(0)
+const bigint1 = BigInt(1)
+const bigint10 = BigInt(10)
+const maximumGeneratedBits = 425
+const maximumExactPower = 4_096
+const shrinkExponents = [-512, -256, -128, -64, -32, -16, -8, -4, -2, -1, 0, 1, 2, 4, 8, 16, 32, 64, 128, 256, 512]
+const compare = BigDecimal.Order
+
+/** @internal */
+export interface Bounds {
+  readonly minimum?: BigDecimal.BigDecimal | undefined
+  readonly exclusiveMinimum?: boolean | undefined
+  readonly maximum?: BigDecimal.BigDecimal | undefined
+  readonly exclusiveMaximum?: boolean | undefined
+}
+
+function isAllowed(value: BigDecimal.BigDecimal, bounds: Bounds): boolean {
+  if (bounds.minimum !== undefined) {
+    const comparison = compare(value, bounds.minimum)
+    if (comparison < 0 || comparison === 0 && bounds.exclusiveMinimum === true) return false
+  }
+  if (bounds.maximum !== undefined) {
+    const comparison = compare(value, bounds.maximum)
+    if (comparison > 0 || comparison === 0 && bounds.exclusiveMaximum === true) return false
+  }
+  return true
+}
+
+// All offsets are nonnegative; clamp before constructing a BigDecimal at the finer scale.
+function addScale(scale: number, offset: number, maximum = Number.MAX_SAFE_INTEGER): number {
+  return Math.min(maximum, scale + offset)
+}
+
+function boundaryCandidate(
+  value: BigDecimal.BigDecimal | undefined,
+  exclusive: boolean | undefined,
+  direction: -1 | 1
+): BigDecimal.BigDecimal | undefined {
+  if (value === undefined || exclusive !== true) return value
+  return value.scale < Number.MAX_SAFE_INTEGER
+    ? BigDecimal.make(value.value * bigint10 + BigInt(direction), value.scale + 1)
+    : BigDecimal.make(value.value + BigInt(direction), value.scale)
+}
+
+function digits(value: bigint): number {
+  return (value < bigint0 ? -value : value).toString().length
+}
+
+function roundAtScale(
+  value: BigDecimal.BigDecimal,
+  scale: number,
+  ceil: boolean,
+  maximumPower = maximumExactPower
+): bigint | undefined {
+  if (value.value === bigint0) return bigint0
+  const difference = BigInt(scale) - BigInt(value.scale)
+  if (difference >= bigint0) {
+    if (difference > BigInt(maximumPower)) return undefined
+    return value.value * bigint10 ** difference
+  }
+  const divisor = -difference >= BigInt(digits(value.value)) ? undefined : bigint10 ** -difference
+  const quotient = divisor === undefined ? bigint0 : value.value / divisor
+  const remainder = divisor === undefined ? value.value : value.value % divisor
+  return quotient + (ceil && remainder > bigint0 ? bigint1 : !ceil && remainder < bigint0 ? -bigint1 : bigint0)
+}
+
+type CoefficientRange = readonly [minimum: bigint | undefined, maximum: bigint | undefined]
+
+function coefficientRange(scale: number, bounds: Bounds): CoefficientRange | undefined {
+  const lower = bounds.minimum
+  const upper = bounds.maximum
+  let minimum = lower === undefined
+    ? undefined
+    : roundAtScale(lower, scale, bounds.exclusiveMinimum !== true)
+  let maximum = upper === undefined
+    ? undefined
+    : roundAtScale(upper, scale, bounds.exclusiveMaximum === true)
+  // A projected bound can already exceed the default precision budget. Resolve the
+  // other bound at that precision before treating its projection as out of reach.
+  if (lower !== undefined && minimum === undefined && maximum !== undefined) {
+    minimum = roundAtScale(
+      lower,
+      scale,
+      bounds.exclusiveMinimum !== true,
+      Math.max(maximumExactPower, digits(maximum))
+    )
+  }
+  if (upper !== undefined && maximum === undefined && minimum !== undefined) {
+    maximum = roundAtScale(
+      upper,
+      scale,
+      bounds.exclusiveMaximum === true,
+      Math.max(maximumExactPower, digits(minimum))
+    )
+  }
+  if (minimum === undefined && lower !== undefined && lower.value > bigint0) return undefined
+  if (maximum === undefined && upper !== undefined && upper.value < bigint0) return undefined
+  if (minimum !== undefined && bounds.exclusiveMinimum === true) minimum += bigint1
+  if (maximum !== undefined && bounds.exclusiveMaximum === true) maximum -= bigint1
+  return minimum !== undefined && maximum !== undefined && minimum > maximum
+    ? undefined
+    : [minimum, maximum]
+}
+
+function randomCoefficient(state: Model.GenerationState, range: CoefficientRange): bigint {
+  const [minimum, maximum] = range
+  if (minimum !== undefined && maximum !== undefined) {
+    return Model.randomBigInt(state, minimum, maximum)
+  }
+  const ordinary = Model.randomInt(state, 0, 3) !== 0
+  const bits = ordinary ? Model.randomInt(state, 0, 20) : Model.randomInt(state, 1, maximumGeneratedBits)
+  const lowest = bits === 0 ? bigint0 : bigint1 << BigInt(bits - 1)
+  const distance = bits === 0 ? bigint0 : Model.randomBigInt(state, lowest, (lowest << bigint1) - bigint1)
+  if (minimum !== undefined) return minimum + distance
+  if (maximum !== undefined) return maximum - distance
+  return Model.randomBoolean(state) ? distance : -distance
+}
+
+function randomScale(state: Model.GenerationState, boundaryScale: number | undefined): number {
+  const mode = Model.randomInt(state, 0, 7)
+  if (mode <= 5 && boundaryScale !== undefined) {
+    return addScale(boundaryScale, Model.randomInt(state, 0, mode === 5 ? 20 : 2))
+  }
+  if (mode === 6) return Model.randomInt(state, -6, 20)
+  const precision = Model.randomInt(state, 1, 128)
+  const exponent = Model.randomInt(state, -512, 512)
+  return precision - 1 - exponent
+}
+
+type ShrinkContext = readonly [passing: BigDecimal.BigDecimal, refinement: number]
+
+function projectExact(value: BigDecimal.BigDecimal, scale: number): bigint | undefined {
+  const difference = BigInt(scale) - BigInt(value.scale)
+  if (difference < bigint0 || difference > BigInt(maximumExactPower)) return undefined
+  return value.value * bigint10 ** difference
+}
+
+function midpoint(
+  passing: BigDecimal.BigDecimal,
+  failing: BigDecimal.BigDecimal,
+  maximumScale: number
+): BigDecimal.BigDecimal | undefined {
+  const scale = addScale(Math.max(passing.scale, failing.scale), 1, maximumScale)
+  const left = projectExact(passing, scale)
+  const right = projectExact(failing, scale)
+  if (left === undefined || right === undefined) return undefined
+  const value = left + (right - left) / BigInt(2)
+  return value === left || value === right ? undefined : BigDecimal.make(value, scale)
+}
+
+function sample(
+  value: BigDecimal.BigDecimal,
+  target: BigDecimal.BigDecimal,
+  context?: ShrinkContext,
+  maximumScale = addScale(Math.max(value.scale, target.scale), 128)
+): Model.Sample<BigDecimal.BigDecimal> {
+  return Model.makeSampleWithLazyShrinks(value, () => {
+    const from = context?.[0] ?? target
+    const direction = compare(value, from)
+    if (direction === 0) return undefined
+    let next: BigDecimal.BigDecimal | undefined
+    if (context !== undefined) {
+      const normalized = BigDecimal.normalize(context[0])
+      const scale = addScale(normalized.scale, Math.min(context[1] + 1, 128), maximumScale)
+      const projected = projectExact(normalized, scale)
+      if (projected !== undefined) next = BigDecimal.make(projected + BigInt(direction), scale)
+    }
+    // Simple candidates are already ordered toward the failing value. Strict
+    // inequalities preserve the bounds and exclude equivalent representations.
+    const candidates = (context === undefined
+      ? shrinkExponents.map((exponent) => BigDecimal.make(BigInt(direction), -exponent))
+      : [next]).filter((candidate): candidate is BigDecimal.BigDecimal =>
+        candidate !== undefined && candidate.scale <= maximumScale &&
+        compare(candidate, from) === direction && compare(candidate, value) === -direction
+      )
+    if (context === undefined) candidates.unshift(target)
+    let previous = context
+    let index = 0
+    return Effect.suspend(() => {
+      // If all simpler candidates pass, keep bisecting toward the failing value.
+      const candidate = index < candidates.length
+        ? candidates[index++]
+        : previous === undefined
+        ? undefined
+        : midpoint(previous[0], value, maximumScale)
+      if (candidate === undefined) return done()
+      const child = sample(candidate, target, previous, maximumScale)
+      previous = [candidate, (previous?.[1] ?? 0) + 1]
+      return Effect.succeed(child)
+    })
+  })
+}
+
+/** @internal */
+export function make(bounds: Bounds): Model.Compiled<BigDecimal.BigDecimal> | undefined {
+  if (bounds.minimum !== undefined && bounds.maximum !== undefined && compare(bounds.minimum, bounds.maximum) === 0) {
+    if (bounds.exclusiveMinimum === true || bounds.exclusiveMaximum === true) return undefined
+    const value = bounds.minimum
+    return Model.makeCompiled([], () => 0, () => Model.makeSample(value))
+  }
+  const zero = BigDecimal.make(bigint0, 0)
+  const lower = boundaryCandidate(bounds.minimum, bounds.exclusiveMinimum, 1)
+  const upper = boundaryCandidate(bounds.maximum, bounds.exclusiveMaximum, -1)
+  // The finer endpoint's inward step fits every nonempty interval. At the maximum
+  // scale there is no finer grid, so adjacent exclusive endpoints have no witness.
+  const witness = [zero, lower, upper].find((value) => value !== undefined && isAllowed(value, bounds))
+  if (witness === undefined) return undefined
+  const target = witness.value < bigint0 && upper !== undefined && isAllowed(upper, bounds) ? upper : witness
+
+  const special = [
+    witness,
+    BigDecimal.make(bigint1, 1),
+    BigDecimal.make(bigint1, 0),
+    BigDecimal.make(bigint10, 0),
+    BigDecimal.make(-bigint1, 1),
+    BigDecimal.make(-bigint1, 0),
+    BigDecimal.make(-bigint10, 0),
+    ...(bounds.minimum !== undefined && bounds.exclusiveMinimum !== true ? [bounds.minimum] : []),
+    ...(bounds.maximum !== undefined && bounds.exclusiveMaximum !== true ? [bounds.maximum] : [])
+  ].filter((value) => isAllowed(value, bounds))
+  const boundaryScale = lower === undefined
+    ? upper?.scale
+    : upper === undefined
+    ? lower.scale
+    : Math.max(lower.scale, upper.scale)
+  const preferred = boundaryScale === undefined ? undefined : coefficientRange(boundaryScale, bounds)
+  const generatePreferred = preferred?.[0] !== undefined && preferred[1] !== undefined
+    ? Model.makeRandomNumericBigInt(preferred[0], preferred[1])
+    : undefined
+
+  return Model.makeCompiled([], () => 0, (state) => {
+    let value: BigDecimal.BigDecimal
+    if (Model.randomInt(state, 0, 7) === 0) {
+      value = special[Model.randomIndex(state, special.length)]
+    } else if (generatePreferred !== undefined && Model.randomInt(state, 0, 3) !== 0) {
+      value = BigDecimal.make(generatePreferred(state), boundaryScale!)
+    } else {
+      value = witness
+      for (let attempt = 0; attempt < 16; attempt++) {
+        const scale = randomScale(state, boundaryScale)
+        const range = coefficientRange(scale, bounds)
+        if (range === undefined) continue
+        const coefficient = randomCoefficient(state, range)
+        if (Model.randomInt(state, 0, 7) === 0 && scale < Number.MAX_SAFE_INTEGER) {
+          const trailing = Model.randomInt(state, 1, Math.min(8, Number.MAX_SAFE_INTEGER - scale))
+          value = BigDecimal.make(coefficient * bigint10 ** BigInt(trailing), scale + trailing)
+        } else {
+          value = BigDecimal.make(coefficient, scale)
+        }
+        break
+      }
+    }
+    return state.shrinks ? sample(value, target) : Model.makeSample(value)
+  })
+}
diff --git a/repos/effect/packages/effect/src/internal/arbitrary/bigInt.ts b/repos/effect/packages/effect/src/internal/arbitrary/bigInt.ts
new file mode 100644
index 000000000..6404018eb
--- /dev/null
+++ b/repos/effect/packages/effect/src/internal/arbitrary/bigInt.ts
@@ -0,0 +1,126 @@
+import * as Effect from "../../Effect.ts"
+import * as Model from "./model.ts"
+
+const bigint0 = BigInt(0)
+const bigint1 = BigInt(1)
+const bigint2 = BigInt(2)
+const ordinaryMaximumBits = 20
+const wideMaximumBits = 2_048
+
+const semanticMagnitudes = [
+  bigint1,
+  bigint2,
+  BigInt(0x7fff_ffff),
+  BigInt(0x8000_0000),
+  BigInt(Number.MAX_SAFE_INTEGER),
+  BigInt(Number.MAX_SAFE_INTEGER) + bigint1,
+  BigInt(Number.MAX_VALUE),
+  BigInt(Number.MAX_VALUE) + bigint1,
+  bigint1 << BigInt(1_024)
+] as const
+
+function isWithin(value: bigint, minimum: bigint | undefined, maximum: bigint | undefined): boolean {
+  return (minimum === undefined || value >= minimum) && (maximum === undefined || value <= maximum)
+}
+
+function bitLength(value: bigint): number {
+  return value === bigint0 ? 0 : (value < bigint0 ? -value : value).toString(2).length
+}
+
+function randomMagnitude(state: Model.GenerationState, maximum?: bigint): bigint {
+  if (maximum === bigint0) return bigint0
+  const family = Model.randomInt(state, 0, 7)
+  if (family === 0) return bigint0
+  const maximumBits = maximum === undefined ? wideMaximumBits : bitLength(maximum)
+  const bits = Model.randomInt(state, 1, family <= 3 ? Math.min(ordinaryMaximumBits, maximumBits) : maximumBits)
+  const minimum = bigint1 << BigInt(bits - 1)
+  const upper = (minimum << bigint1) - bigint1
+  return Model.randomBigInt(state, minimum, maximum !== undefined && maximum < upper ? maximum : upper)
+}
+
+function makeGenerator(
+  minimum: bigint | undefined,
+  maximum: bigint | undefined
+): (state: Model.GenerationState) => bigint {
+  if (minimum !== undefined && maximum !== undefined) return Model.makeRandomNumericBigInt(minimum, maximum)
+
+  const special = [
+    bigint0,
+    ...(minimum === undefined ? [] : [minimum, minimum + bigint1]),
+    ...(maximum === undefined ? [] : [maximum, maximum - bigint1]),
+    ...semanticMagnitudes.flatMap((value) => [value, -value])
+  ].filter((value) => isWithin(value, minimum, maximum))
+  const boundary = minimum ?? maximum
+  const direction = minimum === undefined ? -bigint1 : bigint1
+  const finiteMagnitude = boundary !== undefined && boundary * direction <= bigint0 ? -boundary * direction : undefined
+
+  return (state) => {
+    if (Model.randomInt(state, 0, 7) === 0) return special[Model.randomIndex(state, special.length)]
+    if (boundary !== undefined && (boundary * direction > bigint0 || Model.randomBoolean(state))) {
+      return boundary + direction * randomMagnitude(state)
+    }
+    const sign = Model.randomBoolean(state) ? bigint1 : -bigint1
+    return sign * randomMagnitude(state, sign === -direction ? finiteMagnitude : undefined)
+  }
+}
+
+function sample(value: bigint, target: bigint, context?: bigint): Model.Sample<bigint> {
+  return Model.makeSampleWithLazyShrinks(value, () => {
+    const from = context ?? target
+    const gap = value - from
+    if (gap === bigint0) return undefined
+    if (context !== undefined && (gap === bigint1 || gap === -bigint1)) {
+      return Model.pullFromArray([sample(context, target)])
+    }
+    const direction = gap > bigint0 ? bigint1 : -bigint1
+    const candidates = new Set<bigint>(context === undefined ? [target] : [])
+    // Both endpoints satisfy the bounds, so every candidate strictly between them does too.
+    const add = (candidate: bigint) => {
+      if ((candidate - from) * direction > bigint0 && (value - candidate) * direction > bigint0) {
+        candidates.add(candidate)
+      }
+    }
+    if (context === undefined) {
+      for (const magnitude of semanticMagnitudes) add(target + direction * magnitude)
+      const maximumBits = bitLength(gap)
+      for (let bits = 1; bits < maximumBits; bits *= 2) {
+        add(target + direction * ((bigint1 << BigInt(bits)) - bigint1))
+      }
+    } else {
+      const passingBits = bitLength(context)
+      const failingBits = bitLength(value)
+      if (
+        Math.abs(failingBits - passingBits) > 1 && (context === bigint0 || (context > bigint0) === (value > bigint0))
+      ) {
+        const bits = Math.floor((passingBits + failingBits) / 2)
+        add(direction * ((bigint1 << BigInt(bits)) - bigint1))
+      }
+    }
+    let toRemove = gap / bigint2
+    for (let step = 0; toRemove !== bigint0 && step < 256; step++, toRemove /= bigint2) {
+      add(value - toRemove)
+    }
+    candidates.add(value - direction)
+    const ordered = [...candidates].sort((a, b) => a < b ? -Number(direction) : a > b ? Number(direction) : 0)
+    let previous = context
+    return Effect.map(Model.pullFromArray(ordered), (candidate) => {
+      const child = sample(candidate, target, previous)
+      previous = candidate
+      return child
+    })
+  })
+}
+
+/** @internal */
+export function make(minimum: bigint | undefined, maximum: bigint | undefined): Model.Compiled<bigint> {
+  const generate = makeGenerator(minimum, maximum)
+  const target = minimum !== undefined && minimum > bigint0
+    ? minimum
+    : maximum !== undefined && maximum < bigint0
+    ? maximum
+    : bigint0
+  return Model.makeCompiled([], () => 0, (state) => {
+    const value = generate(state)
+    return state.shrinks ? sample(value, target) : Model.makeSample(value)
+  })
+}
diff --git a/repos/effect/packages/effect/src/internal/arbitrary/model.ts b/repos/effect/packages/effect/src/internal/arbitrary/model.ts
index 9a589ca4f..f6d017433 100644
--- a/repos/effect/packages/effect/src/internal/arbitrary/model.ts
+++ b/repos/effect/packages/effect/src/internal/arbitrary/model.ts
@@ -1,6 +1,7 @@
 import type * as Cause from "../../Cause.ts"
 import * as Effect from "../../Effect.ts"
 import * as Option from "../../Option.ts"
+import * as InternalArray from "../array.ts"
 import { done } from "../core.ts"
 
 /** @internal */
@@ -143,10 +144,70 @@ export const makeSample = <A>(value: A, shrinks?: ShrinkPull<Attempt<A>>): Sampl
   shrinks
 })
 
-function replaceAt<A>(values: ReadonlyArray<A>, index: number, value: A): Array<A> {
-  const out = values.slice()
-  out[index] = value
-  return out
+/** @internal */
+export function makeSampleWithLazyShrinks<A>(
+  value: A,
+  makeShrinks: () => ShrinkPull<Attempt<A>> | undefined
+): Sample<A> {
+  let shrinks: ShrinkPull<Attempt<A>> | undefined
+  return makeSample(
+    value,
+    Effect.suspend(() => {
+      shrinks ??= makeShrinks() ?? done()
+      return shrinks
+    })
+  )
+}
+
+/** @internal */
+export interface Retained<out A> {
+  readonly _tag: "Retained"
+  readonly value: A
+  readonly shrinks: (() => ShrinkPull<Retained<A> | Discarded>) | undefined
+}
+
+// Collection candidates share their children. Give each candidate its own cursor
+// over a lazy child history so exploring one branch cannot exhaust another.
+/** @internal */
+export function retain<A>(sample: Sample<A>): Retained<A> {
+  const source = sample.shrinks
+  if (source === undefined) return { _tag: "Retained", value: sample.value, shrinks: undefined }
+  let history: Array<Retained<A> | Discarded> | undefined
+  let ended = false
+  return {
+    _tag: "Retained",
+    value: sample.value,
+    shrinks: () => {
+      let index = 0
+      return Effect.suspend(() => {
+        if (history !== undefined && index < history.length) return Effect.succeed(history[index++])
+        if (ended) return done()
+        return Effect.matchEffect(source, {
+          onFailure: () => {
+            ended = true
+            return done()
+          },
+          onSuccess: (attempt) => {
+            const item = attempt._tag === "Discarded" ? attempt : retain(attempt)
+            history ??= []
+            history.push(item)
+            index++
+            return Effect.succeed(item)
+          }
+        })
+      })
+    }
+  }
+}
+
+/** @internal */
+export function fromRetained<A>(self: Retained<A>): Sample<A> {
+  return makeSample(
+    self.value,
+    self.shrinks === undefined
+      ? undefined
+      : Effect.map(self.shrinks(), (attempt) => attempt._tag === "Discarded" ? attempt : fromRetained(attempt))
+  )
 }
 
 /** @internal */
@@ -169,20 +230,17 @@ export function sampleFromValidatedShrink<A>(
   shrink: (value: A) => ReadonlyArray<A>,
   validate: (value: A) => Computation<Option.Option<A>>
 ): Sample<A> {
-  let candidates: ShrinkPull<A> | undefined
-  return makeSample(
+  return makeSampleWithLazyShrinks(
     value,
-    Effect.suspend(() => {
-      candidates ??= pullFromArray(shrink(value))
-      return Effect.flatMapEager(
-        candidates,
+    () =>
+      Effect.flatMapEager(
+        pullFromArray(shrink(value)),
         (candidate) =>
           Effect.mapEager(toEffect(validate(candidate)), (validated) =>
             Option.isSome(validated)
               ? sampleFromValidatedShrink(validated.value, shrink, validate)
               : discarded)
       )
-    })
   )
 }
 
@@ -199,20 +257,26 @@ export function mapSample<A, B>(self: Sample<A>, f: (value: A) => B): Sample<B>
 /** @internal */
 export function productSample<A>(
   children: ReadonlyArray<Sample<any>>,
-  make: (children: ReadonlyArray<Sample<any>>) => A,
-  rebuild: (children: ReadonlyArray<Sample<any>>) => Sample<A> = (children) => productSample(children, make)
+  make: (children: ReadonlyArray<{ readonly value: any }>) => A
 ): Sample<A> {
-  const pulls: Array<ShrinkPull<Attempt<A>>> = []
-  for (let index = 0; index < children.length; index++) {
-    const shrinks = children[index].shrinks
-    if (shrinks !== undefined) {
-      pulls.push(Effect.map(
-        shrinks,
-        (attempt) => mapAttempt(attempt, (sample) => rebuild(replaceAt(children, index, sample)))
-      ))
+  const value = make(children)
+  if (!children.some((child) => child.shrinks !== undefined)) return makeSample(value)
+  const rebuild = (children: ReadonlyArray<Retained<any>>, start = 0): Sample<A> => {
+    const pulls: Array<ShrinkPull<Attempt<A>>> = []
+    // Preserve field order explicitly instead of relying on exhausted sibling cursors.
+    for (let index = start; index < children.length; index++) {
+      const shrinks = children[index].shrinks
+      if (shrinks !== undefined) {
+        pulls.push(Effect.map(
+          shrinks(),
+          (attempt) =>
+            attempt._tag === "Discarded" ? attempt : rebuild(InternalArray.replaceAt(children, index, attempt), index)
+        ))
+      }
     }
+    return makeSample(make(children), pulls.length === 0 ? undefined : concatPulls(pulls))
   }
-  return makeSample(make(children), pulls.length === 0 ? undefined : concatPulls(pulls))
+  return makeSampleWithLazyShrinks(value, () => rebuild(children.map(retain)).shrinks)
 }
 
 function filterMapPull<A, B>(
diff --git a/repos/effect/packages/effect/src/internal/arbitrary/regexp.ts b/repos/effect/packages/effect/src/internal/arbitrary/regexp.ts
index 34d548ae3..916993f26 100644
--- a/repos/effect/packages/effect/src/internal/arbitrary/regexp.ts
+++ b/repos/effect/packages/effect/src/internal/arbitrary/regexp.ts
@@ -39,6 +39,7 @@ interface Interval {
   readonly maximum: number
 }
 
+/** @internal */
 export interface Compiled {
   readonly minimumLength: number
   readonly generate: (
@@ -823,6 +824,7 @@ function addUnanchoredSurroundings(node: Node, source: string, flags: string): N
  * exact UTF-16 length analysis; no fast-check parser or arbitrary is included.
  * https://github.com/dubzzz/fast-check/blob/v4.9.0/packages/fast-check/src/arbitrary/stringMatching.ts
  */
+/** @internal */
 export function compile(pattern: Pattern): Compiled | undefined {
   const { flags, source } = pattern
   // Case folding, multiline assertions, and Unicode sets require dedicated AST semantics. Falling back preserves the
diff --git a/repos/effect/packages/effect/src/internal/arbitrary/runner.ts b/repos/effect/packages/effect/src/internal/arbitrary/runner.ts
index da5dc922c..376ac5641 100644
--- a/repos/effect/packages/effect/src/internal/arbitrary/runner.ts
+++ b/repos/effect/packages/effect/src/internal/arbitrary/runner.ts
@@ -7,6 +7,7 @@ import * as Scheduler from "../../Scheduler.ts"
 import type * as Schema from "../../Schema.ts"
 import type {
   Arbitrary,
+  ArrayOptions,
   CheckOptions,
   CheckResult,
   PropertyError,
@@ -19,6 +20,7 @@ import type {
 } from "../../unstable/arbitrary/Arbitrary.ts"
 import { done } from "../core.ts"
 import * as InternalRecord from "../record.ts"
+import * as Arrays from "./array.ts"
 import * as Model from "./model.ts"
 import * as Compiler from "./schema.ts"
 
@@ -277,6 +279,43 @@ export function filterMap<A, B, X>(
   ))
 }
 
+/** @internal */
+export function array<A>(item: Arbitrary<A>, options?: ArrayOptions): Arbitrary<Array<A>> {
+  const minimum = options?.minLength ?? 0
+  const maximum = options?.maxLength ?? 0xffffffff
+  if (
+    !Number.isInteger(minimum) || minimum < 0 || minimum > 0xffffffff ||
+    !Number.isInteger(maximum) || maximum < minimum || maximum > 0xffffffff
+  ) {
+    throw new RangeError("Arbitrary.array: expected 0 <= minLength <= maxLength <= 4294967295 with integer lengths")
+  }
+  const child = item.gen
+  const minCost = minimum === 0 ? 0 : minimum * child.minCost
+  return make(Model.makeGenerator(minCost, (state) => {
+    const upper = Math.min(
+      maximum,
+      Math.max(minimum, state.size),
+      child.minCost > 0 ? Math.floor(state.budget.remaining / child.minCost) : maximum
+    )
+    if (upper < minimum) return Model.discarded
+    const length = Model.randomLength(state, minimum, upper)
+    const children = Array.from({ length }, () => child)
+    const order = length < 2 ? undefined : Model.shuffle(state, children.keys())
+    const itemState = state.size >= length ? state : { ...state, size: length }
+    return Model.mapComputation(
+      Model.generateProduct(children, itemState, order, length === 0 ? 0 : length * child.minCost),
+      (samples) =>
+        samples === undefined ? Model.discarded : Arrays.sample<A>(samples, {
+          fixedCount: 0,
+          optionalCount: 0,
+          repeatCount: length,
+          tailCount: 0,
+          minimum
+        }, state.shrinks)
+    )
+  }))
+}
+
 /** @internal */
 export function all(
   input: Iterable<Arbitrary<any>> | Record<string, Arbitrary<any>>
diff --git a/repos/effect/packages/effect/src/internal/arbitrary/schema.ts b/repos/effect/packages/effect/src/internal/arbitrary/schema.ts
index b8fc05c7d..4f421cda1 100644
--- a/repos/effect/packages/effect/src/internal/arbitrary/schema.ts
+++ b/repos/effect/packages/effect/src/internal/arbitrary/schema.ts
@@ -1,29 +1,35 @@
+import * as BigDecimal from "../../BigDecimal.ts"
 import * as Effect from "../../Effect.ts"
 import * as Equal from "../../Equal.ts"
 import { identity } from "../../Function.ts"
 import * as Hash from "../../Hash.ts"
 import * as Option from "../../Option.ts"
 import * as Order from "../../Order.ts"
+import * as Predicate from "../../Predicate.ts"
 import * as Schema from "../../Schema.ts"
 import * as SchemaAST from "../../SchemaAST.ts"
 import * as SchemaGetter from "../../SchemaGetter.ts"
 import * as SchemaParser from "../../SchemaParser.ts"
+import * as InternalArray from "../array.ts"
 import { effectIsExit } from "../effect.ts"
 import { errorWithPath } from "../errors.ts"
 import * as InternalRecord from "../record.ts"
+import { sample as arraySample } from "./array.ts"
+import * as BigDecimalArbitrary from "./bigDecimal.ts"
+import * as BigIntArbitrary from "./bigInt.ts"
 import * as Model from "./model.ts"
 import * as Regexp from "./regexp.ts"
 
-type Constraint = Schema.Annotations.ToArbitrary.Constraint<any>
+type FilterConstraint = Schema.Annotations.ToArbitrary.FilterConstraint<any>
 type GenerationConstraint = Schema.Annotations.ToArbitrary.GenerationConstraint<any>
 
 interface Checks {
-  readonly constraint: Constraint | undefined
+  readonly constraint: FilterConstraint | undefined
   readonly filters: ReadonlyArray<SchemaAST.Filter<any>>
 }
 
 const infinity = Number.POSITIVE_INFINITY
-const finiteNumberConstraint: Constraint = { number: "finite" }
+const finiteNumberConstraint: FilterConstraint = { number: "finite" }
 const optionMatch = { onFailure: Option.none, onSuccess: Option.some }
 
 const optionComputation = <A, E, R>(self: Effect.Effect<A, E, R>): Model.Computation<Option.Option<A>> => {
@@ -79,7 +85,7 @@ function mergeMaximum(self: number | undefined, that: number | undefined): numbe
   return self === undefined ? that : that === undefined ? self : Math.min(self, that)
 }
 
-function mergeConstraint(self: Constraint | undefined, that: Constraint): Constraint {
+function mergeConstraint(self: FilterConstraint | undefined, that: FilterConstraint): FilterConstraint {
   const order = that.order ?? self?.order
   if (self?.order !== undefined && that.order !== undefined && self.order !== that.order) {
     throw new Error("Cannot merge ordered arbitrary constraints with different Order instances")
@@ -142,7 +148,7 @@ function mergeConstraint(self: Constraint | undefined, that: Constraint): Constr
   }
 }
 
-function collectChecks(checks: SchemaAST.Checks | undefined, inherited: Constraint | undefined): Checks {
+function collectChecks(checks: SchemaAST.Checks | undefined, inherited: FilterConstraint | undefined): Checks {
   let constraint = inherited
   const filters: Array<SchemaAST.Filter<any>> = []
   const visit = (check: SchemaAST.Check<any>): void => {
@@ -158,7 +164,29 @@ function collectChecks(checks: SchemaAST.Checks | undefined, inherited: Constrai
   return { constraint, filters }
 }
 
-function validateConstraint(constraint: Constraint | undefined, path: ReadonlyArray<PropertyKey>): void {
+function applyFilters(
+  compiled: Model.Compiled<any>,
+  ast: SchemaAST.AST,
+  filters: ReadonlyArray<SchemaAST.Filter<any>>
+): void {
+  if (filters.length === 0) return
+  const generate = compiled.generate
+  const passes = (value: unknown) => {
+    for (let index = 0; index < filters.length; index++) {
+      if (filters[index].run(value, ast, SchemaAST.defaultParseOptions) !== undefined) return false
+    }
+    return true
+  }
+  compiled.generate = (state) =>
+    Model.mapGeneration(generate(state), (attempt) => {
+      if (attempt._tag === "Discarded") return Model.discarded
+      if (!state.shrinks) return passes(attempt.value) ? attempt : Model.discarded
+      const sample = Model.filterSample(attempt, passes)
+      return sample ?? Model.discarded
+    })
+}
+
+function validateConstraint(constraint: FilterConstraint | undefined, path: ReadonlyArray<PropertyKey>): void {
   if (constraint === undefined) return
   const cardinalities = [
     [constraint.minLength, constraint.maxLength],
@@ -185,7 +213,7 @@ function validateConstraint(constraint: Constraint | undefined, path: ReadonlyAr
   }
 }
 
-function withoutOrder(constraint: Constraint | undefined): GenerationConstraint | undefined {
+function withoutOrder(constraint: FilterConstraint | undefined): GenerationConstraint | undefined {
   if (constraint === undefined) return undefined
   const { order: _, ...out } = constraint
   return Object.keys(out).length === 0 ? undefined : out
@@ -330,7 +358,7 @@ function builtInDeclarationLink(
 }
 
 function lengthBounds(
-  constraint: Constraint | undefined,
+  constraint: FilterConstraint | undefined,
   keys: readonly [
     minimum: "minLength" | "minSize" | "minProperties",
     maximum: "maxLength" | "maxSize" | "maxProperties"
@@ -354,59 +382,7 @@ function constant<A>(value: A): Model.Compiled<A> {
   return Model.makeCompiled([], () => 0, () => sample)
 }
 
-function replaceAt<A>(values: ReadonlyArray<A>, index: number, value: A): Array<A> {
-  const out = values.slice()
-  out[index] = value
-  return out
-}
-
-function arraySample(
-  children: ReadonlyArray<Model.Sample<any>>,
-  shape: {
-    readonly fixedCount: number
-    readonly optionalCount: number
-    readonly repeatCount: number
-    readonly tailCount: number
-    readonly minimum: number
-  },
-  shrinks = true
-): Model.Sample<ReadonlyArray<any>> {
-  if (!shrinks) return Model.makeSample(children.map((child) => child.value))
-  const product = Model.productSample(
-    children,
-    (children) => children.map((child) => child.value),
-    (children) => arraySample(children, shape)
-  )
-  // Like fast-check v4.9.0's ArrayArbitrary (MIT), structural shrinks are tried before element shrinks.
-  // https://github.com/dubzzz/fast-check/blob/v4.9.0/packages/fast-check/src/arbitrary/_internals/ArrayArbitrary.ts
-  const structural: Array<() => Model.Sample<ReadonlyArray<any>>> = []
-  if (shape.repeatCount > 0 && children.length - 1 >= shape.minimum) {
-    const index = shape.fixedCount + shape.repeatCount - 1
-    structural.push(() =>
-      arraySample(children.slice(0, index).concat(children.slice(index + 1)), {
-        ...shape,
-        repeatCount: shape.repeatCount - 1
-      })
-    )
-  } else if (
-    shape.optionalCount > 0 && shape.repeatCount === 0 && shape.tailCount === 0 &&
-    children.length - 1 >= shape.minimum
-  ) {
-    structural.push(() =>
-      arraySample(children.slice(0, -1), {
-        ...shape,
-        fixedCount: shape.fixedCount - 1,
-        optionalCount: shape.optionalCount - 1
-      })
-    )
-  }
-  if (structural.length === 0) return product
-  const structuralPull = Effect.map(Model.pullFromArray(structural), (make) => make())
-  return Model.makeSample(
-    product.value,
-    product.shrinks === undefined ? structuralPull : Model.concatPulls([structuralPull, product.shrinks])
-  )
-}
+const uninhabited: Model.Compiled<never> = Model.makeCompiled([], () => infinity, () => Model.discarded)
 
 interface ObjectEntry {
   readonly key: PropertyKey
@@ -415,12 +391,13 @@ interface ObjectEntry {
   readonly removable: boolean
 }
 
+interface RetainedObjectEntry extends Omit<ObjectEntry, "sample" | "keySample"> {
+  readonly sample: Model.Retained<any>
+  readonly keySample?: Model.Retained<PropertyKey> | undefined
+}
+
 function normalizePropertyKeySample(sample: Model.Sample<any>): Model.Sample<PropertyKey> | undefined {
-  const filtered = Model.filterSample(
-    sample,
-    (value): value is string | number | symbol =>
-      typeof value === "string" || typeof value === "number" || typeof value === "symbol"
-  )
+  const filtered = Model.filterSample(sample, Predicate.isPropertyKey)
   return filtered === undefined
     ? undefined
     : Model.mapSample(filtered, (value) => typeof value === "symbol" ? value : globalThis.String(value))
@@ -430,64 +407,80 @@ function objectSample(
   entries: ReadonlyArray<ObjectEntry>,
   minimum: number,
   nullPrototype: boolean,
+  reservedKeys: ReadonlySet<PropertyKey>,
   shrinks = true
 ): Model.Sample<Record<PropertyKey, any>> {
-  const make = (entries: ReadonlyArray<ObjectEntry>) => {
+  const make = (entries: ReadonlyArray<ObjectEntry | RetainedObjectEntry>) => {
     const out = Model.makeObject(nullPrototype)
     for (const entry of entries) InternalRecord.assignProperty(out, entry.key, entry.sample.value)
     return out
   }
   if (!shrinks) return Model.makeSample(make(entries))
-  const childPulls = entries.flatMap((entry, index) =>
-    entry.sample.shrinks === undefined
-      ? []
-      : [
-        Effect.map(
-          entry.sample.shrinks,
-          (attempt) =>
-            Model.mapAttempt(
-              attempt,
-              (sample) => objectSample(replaceAt(entries, index, { ...entry, sample }), minimum, nullPrototype)
+  const rebuild = (
+    entries: ReadonlyArray<RetainedObjectEntry>,
+    valueStart = 0,
+    keyStart = 0
+  ): Model.Sample<Record<PropertyKey, any>> => {
+    const pulls: Array<Model.ShrinkPull<Model.Attempt<Record<PropertyKey, any>>>> = []
+    if (entries.length > minimum) {
+      const structural = entries.flatMap((entry, index) =>
+        entry.removable
+          ? [() => rebuild(entries.slice(0, index).concat(entries.slice(index + 1)))]
+          : []
+      )
+      if (structural.length > 0) pulls.push(Effect.map(Model.pullFromArray(structural), (make) => make()))
+    }
+    for (let index = valueStart; index < entries.length; index++) {
+      const entry = entries[index]
+      if (entry.sample.shrinks === undefined) continue
+      pulls.push(Effect.map(
+        entry.sample.shrinks(),
+        (attempt) =>
+          attempt._tag === "Discarded"
+            ? attempt
+            : rebuild(InternalArray.replaceAt(entries, index, { ...entry, sample: attempt }), index)
+      ))
+    }
+    // Key shrinking uses the same uniqueness-preserving descendant filtering principle as fast-check v4.9.0's
+    // ArrayArbitrary (MIT). Structural removals and value shrinks retain their established precedence.
+    // https://github.com/dubzzz/fast-check/blob/v4.9.0/packages/fast-check/src/arbitrary/_internals/ArrayArbitrary.ts
+    for (let index = keyStart; index < entries.length; index++) {
+      const entry = entries[index]
+      if (entry.keySample === undefined || entry.keySample.shrinks === undefined) continue
+      const filtered = Model.filterSample(
+        Model.fromRetained(entry.keySample),
+        (key) =>
+          !reservedKeys.has(key) &&
+          !entries.some((other, otherIndex) => otherIndex !== index && other.key === key)
+      )
+      if (filtered?.shrinks === undefined) continue
+      pulls.push(Effect.map(
+        filtered.shrinks,
+        (attempt) =>
+          attempt._tag === "Discarded"
+            ? attempt
+            : rebuild(
+              InternalArray.replaceAt(entries, index, {
+                ...entry,
+                key: attempt.value,
+                keySample: Model.retain(attempt)
+              }),
+              entries.length,
+              index
             )
-        )
-      ]
+      ))
+    }
+    return Model.makeSample(make(entries), pulls.length === 0 ? undefined : Model.concatPulls(pulls))
+  }
+  return Model.makeSampleWithLazyShrinks(
+    make(entries),
+    () =>
+      rebuild(entries.map((entry) => ({
+        ...entry,
+        sample: Model.retain(entry.sample),
+        keySample: entry.keySample === undefined ? undefined : Model.retain(entry.keySample)
+      }))).shrinks
   )
-  // Key shrinking uses the same uniqueness-preserving descendant filtering principle as fast-check v4.9.0's
-  // ArrayArbitrary (MIT). Structural removals and value shrinks retain their established precedence.
-  // https://github.com/dubzzz/fast-check/blob/v4.9.0/packages/fast-check/src/arbitrary/_internals/ArrayArbitrary.ts
-  const keyPulls = entries.flatMap((entry, index) => {
-    if (entry.keySample === undefined || entry.keySample.shrinks === undefined) return []
-    const filtered = Model.filterSample(
-      entry.keySample,
-      (key) => !entries.some((other, otherIndex) => otherIndex !== index && other.key === key)
-    )
-    if (filtered?.shrinks === undefined) return []
-    return [Effect.map(
-      filtered.shrinks,
-      (attempt) =>
-        Model.mapAttempt(
-          attempt,
-          (keySample) =>
-            objectSample(
-              replaceAt(entries, index, { ...entry, key: keySample.value, keySample }),
-              minimum,
-              nullPrototype
-            )
-        )
-    )]
-  })
-  const structural: Array<() => Model.Sample<Record<PropertyKey, any>>> = entries.length <= minimum
-    ? []
-    : entries.flatMap((entry, index) =>
-      entry.removable
-        ? [() => objectSample(entries.slice(0, index).concat(entries.slice(index + 1)), minimum, nullPrototype)]
-        : []
-    )
-  const descendantPulls = [...childPulls, ...keyPulls]
-  const pulls = structural.length === 0
-    ? descendantPulls
-    : [Effect.map(Model.pullFromArray(structural), (make) => make()), ...descendantPulls]
-  return Model.makeSample(make(entries), pulls.length === 0 ? undefined : Model.concatPulls(pulls))
 }
 
 const generateSamples = (
@@ -779,7 +772,7 @@ function randomString(state: Model.GenerationState, minimum: number, maximum: nu
   return value
 }
 
-function numberBounds(constraint: Constraint | undefined, integer: boolean, path: ReadonlyArray<PropertyKey>) {
+function numberBounds(constraint: FilterConstraint | undefined, integer: boolean, path: ReadonlyArray<PropertyKey>) {
   const ordered = constraint?.order === Order.Number ? constraint : undefined
   let minimum = ordered?.minimum as number | undefined
   let maximum = ordered?.maximum as number | undefined
@@ -944,75 +937,17 @@ function numberSample(
   )
 }
 
-interface BigIntShrink {
-  readonly value: bigint
-  readonly context: bigint | undefined
-}
-
-function shrinkBigInt(current: bigint, target: bigint, tryTargetAsap: boolean): ReadonlyArray<BigIntShrink> {
-  const out: Array<BigIntShrink> = []
-  const realGap = current - target
-  let previous = tryTargetAsap ? undefined : target
-  for (
-    let toRemove = tryTargetAsap ? realGap : realGap / BigInt(2);
-    toRemove !== BigInt(0);
-    toRemove /= BigInt(2)
-  ) {
-    const value = current - toRemove
-    out.push({ value, context: previous })
-    previous = value
-  }
-  return out
-}
-
-function bigIntSample(
-  value: bigint,
-  minimum: bigint | undefined,
-  maximum: bigint | undefined,
-  context?: bigint
-): Model.Sample<bigint> {
-  // The passing-value context and gap-halving sequence are adapted from fast-check v4.9.0's BigIntArbitrary and
-  // ShrinkBigInt (MIT). Retaining the closest passing candidate lets the runner converge on a local failure boundary.
-  // https://github.com/dubzzz/fast-check/blob/v4.9.0/packages/fast-check/src/arbitrary/_internals/BigIntArbitrary.ts
-  // https://github.com/dubzzz/fast-check/blob/v4.9.0/packages/fast-check/src/arbitrary/_internals/helpers/ShrinkBigInt.ts
-  let candidates: ReadonlyArray<BigIntShrink>
-  if (context === undefined) {
-    const target = minimum !== undefined && minimum > BigInt(0)
-      ? minimum
-      : maximum !== undefined && maximum < BigInt(0)
-      ? maximum
-      : BigInt(0)
-    candidates = shrinkBigInt(value, target, true)
-  } else if (
-    value > BigInt(0) && value === context + BigInt(1) && (minimum === undefined || value > minimum) ||
-    value < BigInt(0) && value === context - BigInt(1) && (maximum === undefined || value < maximum)
-  ) {
-    candidates = [{ value: context, context: undefined }]
-  } else {
-    candidates = shrinkBigInt(value, context, false)
-  }
-  return Model.makeSample(
-    value,
-    candidates.length === 0
-      ? undefined
-      : Effect.map(
-        Model.pullFromArray(candidates),
-        (candidate) => bigIntSample(candidate.value, minimum, maximum, candidate.context)
-      )
-  )
-}
-
 /** @internal */
 export function compile<S extends Schema.Constraint>(schema: S): Model.Compiled<S["Type"]> {
   const rootAst = SchemaAST.toType(schema.ast)
-  const cache = new WeakMap<SchemaAST.AST, Map<Constraint | undefined, Model.Compiled<any>>>()
+  const cache = new WeakMap<SchemaAST.AST, Map<FilterConstraint | undefined, Model.Compiled<any>>>()
   const nodes: Array<Model.Compiled<any>> = []
   const suspendBodies = new Map<Model.Compiled<any>, Model.Compiled<any>>()
   const pending: Array<() => void> = []
   const recur = (
     ast: SchemaAST.AST,
     path: ReadonlyArray<PropertyKey>,
-    inherited?: Constraint
+    inherited?: FilterConstraint
   ): Model.Compiled<any> => {
     let entries = cache.get(ast)
     const cached = entries?.get(inherited)
@@ -1049,22 +984,7 @@ export function compile<S extends Schema.Constraint>(schema: S): Model.Compiled<
         placeholder.computeMinCost = base.computeMinCost
         placeholder.generate = base.generate
       }
-      if (checks.filters.length > 0) {
-        const generate = placeholder.generate
-        const passes = (value: unknown) => {
-          for (let index = 0; index < checks.filters.length; index++) {
-            if (checks.filters[index].run(value, ast, SchemaAST.defaultParseOptions) !== undefined) return false
-          }
-          return true
-        }
-        placeholder.generate = (state) =>
-          Model.mapGeneration(generate(state), (attempt) => {
-            if (attempt._tag === "Discarded") return Model.discarded
-            if (!state.shrinks) return passes(attempt.value) ? attempt : Model.discarded
-            const sample = Model.filterSample(attempt, passes)
-            return sample ?? Model.discarded
-          })
-      }
+      applyFilters(placeholder, ast, checks.filters)
     })
     return placeholder
   }
@@ -1072,11 +992,11 @@ export function compile<S extends Schema.Constraint>(schema: S): Model.Compiled<
   const compileBase = (
     ast: SchemaAST.AST,
     path: ReadonlyArray<PropertyKey>,
-    constraint: Constraint | undefined
+    constraint: FilterConstraint | undefined
   ): Model.Compiled<any> => {
     switch (ast._tag) {
       case "Never":
-        throw arbitraryError("Never", path)
+        return uninhabited
       case "Null":
         return constant(null)
       case "Undefined":
@@ -1192,32 +1112,7 @@ export function compile<S extends Schema.Constraint>(schema: S): Model.Compiled<
         if (minimum !== undefined && maximum !== undefined && minimum > maximum) {
           throw arbitraryError("bigint constraints", path)
         }
-        let previousLow: bigint | undefined
-        let previousHigh: bigint | undefined
-        let randomBigInt: ((state: Model.GenerationState) => bigint) | undefined
-        return Model.makeCompiled(
-          [],
-          () => 0,
-          (state) => {
-            const magnitude = BigInt(Math.max(1, state.size * state.size))
-            const center = minimum !== undefined && minimum > BigInt(0)
-              ? minimum
-              : maximum !== undefined && maximum < BigInt(0)
-              ? maximum
-              : BigInt(0)
-            const low = minimum ?? center - magnitude
-            const high = maximum ?? center + magnitude
-            if (randomBigInt === undefined || low !== previousLow || high !== previousHigh) {
-              previousLow = low
-              previousHigh = high
-              randomBigInt = Model.makeRandomNumericBigInt(low, high)
-            }
-            const value = randomBigInt(state)
-            return state.shrinks
-              ? bigIntSample(value, minimum, maximum)
-              : Model.makeSample(value)
-          }
-        )
+        return BigIntArbitrary.make(minimum, maximum)
       }
       case "Symbol": {
         const strings = recur(SchemaAST.string, path, constraint)
@@ -1285,7 +1180,7 @@ export function compile<S extends Schema.Constraint>(schema: S): Model.Compiled<
         const members = ast.types.map((member) => recur(member, path, constraint))
         if (members.length === 0) throw arbitraryError("a union with no members", path)
         let generate = (state: Model.GenerationState): Model.Generation<unknown> => Model.generateUnion(members, state)
-        if (ast.mode === "oneOf") {
+        if (ast.options?.mode === "oneOf") {
           const parse = SchemaParser.run<unknown, never>(ast)
           const validate = (value: unknown) => optionComputation(parse(value))
           generate = (state) => Model.filterMapGeneration(Model.generateUnion(members, state), validate)
@@ -1298,8 +1193,25 @@ export function compile<S extends Schema.Constraint>(schema: S): Model.Compiled<
       }
       case "Arrays":
         return compileArrays(ast, path, constraint)
-      case "Objects":
-        return compileObjects(ast, path, constraint)
+      case "Objects": {
+        const compiled = compileObjects(ast, path, constraint)
+        if (
+          ast.indexSignatures.length === 0 ||
+          (ast.indexSignatures.length === 1 && ast.propertySignatures.length === 0)
+        ) return compiled
+        const parse = SchemaParser.run<Record<PropertyKey, any>, never>(
+          new SchemaAST.Objects([], ast.indexSignatures)
+        )
+        const generate = compiled.generate
+        compiled.generate = (state) =>
+          Model.filterMapGeneration(
+            generate(state),
+            (value) =>
+              Model.mapComputation(optionComputation(parse(value)), (parsed) =>
+                Option.isNone(parsed) ? parsed : Option.some(value))
+          )
+        return compiled
+      }
       case "Suspend": {
         const body = recur(ast.thunk(), path)
         return Model.makeCompiled([body], () => body.minCost, (state) => body.generate(state))
@@ -1312,7 +1224,7 @@ export function compile<S extends Schema.Constraint>(schema: S): Model.Compiled<
   const compileArrays = (
     ast: SchemaAST.Arrays,
     path: ReadonlyArray<PropertyKey>,
-    constraint: Constraint | undefined
+    constraint: FilterConstraint | undefined
   ): Model.Compiled<ReadonlyArray<any>> => {
     const uniqueBy = constraint?.uniqueBy
     const elements = ast.elements.map((element, index) => ({
@@ -1468,17 +1380,66 @@ export function compile<S extends Schema.Constraint>(schema: S): Model.Compiled<
   const compileObjects = (
     ast: SchemaAST.Objects,
     path: ReadonlyArray<PropertyKey>,
-    constraint: Constraint | undefined
+    constraint: FilterConstraint | undefined
   ): Model.Compiled<Record<PropertyKey, any>> => {
+    const constrainedIndexes = ast.indexSignatures.flatMap((index, position) => {
+      const constraint = collectChecks(index.type.checks, undefined).constraint
+      return constraint === undefined ? [] : [{ index, position, constraint }]
+    })
+    const compileIndexedValue = (type: SchemaAST.AST, path: ReadonlyArray<PropertyKey>) => {
+      const compiled = recur(type, path)
+      // Scalar specializations have no recursive dependencies and keep the same minimum cost.
+      const candidates = type._tag === "String" || type._tag === "Number" || type._tag === "BigInt"
+        ? constrainedIndexes.filter(({ index }) => index.type !== type && index.type._tag === type._tag)
+        : []
+      const specializations = new Map<string, Model.Compiled<any>>()
+      const forKey = (key: PropertyKey): Model.Compiled<any> => {
+        if (candidates.length === 0) return compiled
+        const input = { [key]: undefined }
+        const matching = candidates.filter(({ index }) =>
+          SchemaAST.getIndexSignatureKeys(input, index.parameter).length > 0
+        )
+        if (matching.length === 0) return compiled
+        const cacheKey = matching.map(({ position }) => position).join(",")
+        const cached = specializations.get(cacheKey)
+        if (cached !== undefined) return cached
+        let specialized = compiled
+        try {
+          let inherited: FilterConstraint | undefined
+          for (const match of matching) inherited = mergeConstraint(inherited, match.constraint)
+          const checks = collectChecks(type.checks, inherited)
+          specialized = compileBase(type, path, checks.constraint)
+          specialized.minCost = 0
+          applyFilters(specialized, type, checks.filters)
+        } catch {
+          // Incompatible scalar constraints keep the original generator and indexed validation.
+        }
+        specializations.set(cacheKey, specialized)
+        return specialized
+      }
+      return {
+        compiled,
+        forKey
+      }
+    }
     const properties = ast.propertySignatures.map((property) => ({
       property,
       optional: SchemaAST.isOptional(property.type),
-      compiled: recur(property.type, [...path, property.name])
-    }))
-    const indexes = ast.indexSignatures.map((index, position) => ({
-      parameter: recur(index.parameter, [...path, `index-${position}-key`]),
-      value: recur(index.type, [...path, `index-${position}-value`])
+      compiled: compileIndexedValue(property.type, [...path, property.name]).forKey(property.name)
     }))
+    const propertyNames = new Set<PropertyKey>(
+      properties.map(({ property }) =>
+        typeof property.name === "symbol" ? property.name : globalThis.String(property.name)
+      )
+    )
+    const indexes = ast.indexSignatures.map((index, position) => {
+      const value = compileIndexedValue(index.type, [...path, `index-${position}-value`])
+      return {
+        parameter: recur(index.parameter, [...path, `index-${position}-key`]),
+        value: value.compiled,
+        valueForKey: value.forKey
+      }
+    })
     const required = properties.filter((property) => !property.optional)
     const optional = properties.filter((property) => property.optional)
     const [minimum, maximum] = lengthBounds(
@@ -1492,21 +1453,28 @@ export function compile<S extends Schema.Constraint>(schema: S): Model.Compiled<
     }
     const needed = Math.max(0, minimum - required.length)
     const minOptional = indexes.length === 0 ? needed : 0
-    const fallbackOptionalCount = Math.min(optional.length, needed)
+    const minimumPropertyPlan = () => {
+      const indexCost = Math.min(...indexes.map((index) => index.parameter.minCost + index.value.minCost))
+      const selected = optional
+        .filter((property) => property.compiled.minCost <= indexCost)
+        .sort((a, b) => a.compiled.minCost - b.compiled.minCost)
+        .slice(0, needed)
+      const indexCount = needed - selected.length
+      return {
+        optional: selected,
+        indexCount,
+        indexCost,
+        cost: sumCosts(selected.map((property) => property.compiled.minCost)) +
+          (indexCount === 0 ? 0 : indexCount * indexCost)
+      }
+    }
     const dependencies = [
       ...properties.map((property) => property.compiled),
       ...indexes.flatMap((index) => [index.parameter, index.value])
     ]
     return Model.makeCompiled(
       dependencies,
-      () => {
-        const requiredCost = sumCosts(required.map((property) => property.compiled.minCost))
-        const optionalCosts = optional.map((property) => property.compiled.minCost).sort((a, b) => a - b)
-        if (needed <= optionalCosts.length) return requiredCost + sumCosts(optionalCosts.slice(0, needed))
-        if (indexes.length === 0) return infinity
-        const indexCost = Math.min(...indexes.map((index) => index.parameter.minCost + index.value.minCost))
-        return requiredCost + sumCosts(optionalCosts) + (needed - optionalCosts.length) * indexCost
-      },
+      () => sumCosts(required.map((property) => property.compiled.minCost)) + minimumPropertyPlan().cost,
       (state) => {
         if (!state.shrinks && optional.length === 0 && indexes.length === 0) {
           return generateRequiredObjectValues(required, state, state.nullPrototype)
@@ -1514,21 +1482,17 @@ export function compile<S extends Schema.Constraint>(schema: S): Model.Compiled<
         const currentMaximum = Math.max(minimum, required.length, state.size)
         const upper = maximum === undefined ? currentMaximum : Math.min(maximum, currentMaximum)
         const maxOptional = Math.min(optional.length, upper - required.length)
-        const minimumIndexCost = indexes.length === 0
-          ? infinity
-          : Math.min(...indexes.map((index) => index.parameter.minCost + index.value.minCost))
+        const minimumPlan = minimumPropertyPlan()
+        const minimumIndexCost = minimumPlan.indexCost
         const optionalCount = Model.randomInt(state, minOptional, maxOptional)
-        const shuffledOptional = optionalCount === 0 ? undefined : Model.shuffle(state, optional)
-        let selectedOptional = optionalCount === 0 ? [] : shuffledOptional!.slice(0, optionalCount)
-        let named = [...required, ...selectedOptional]
+        let named = optionalCount === 0
+          ? required
+          : [...required, ...Model.shuffle(state, optional).slice(0, optionalCount)]
         let minimumIndexes = Math.max(0, minimum - named.length)
         let namedCost = sumCosts(named.map((property) => property.compiled.minCost))
         if (namedCost + (minimumIndexes === 0 ? 0 : minimumIndexes * minimumIndexCost) > state.budget.remaining) {
-          selectedOptional = (shuffledOptional ?? Model.shuffle(state, optional))
-            .sort((a, b) => a.compiled.minCost - b.compiled.minCost)
-            .slice(0, fallbackOptionalCount)
-          named = [...required, ...selectedOptional]
-          minimumIndexes = Math.max(0, minimum - named.length)
+          named = [...required, ...minimumPlan.optional]
+          minimumIndexes = minimumPlan.indexCount
           namedCost = sumCosts(named.map((property) => property.compiled.minCost))
         }
         const maximumIndexes = indexes.length === 0
@@ -1552,7 +1516,7 @@ export function compile<S extends Schema.Constraint>(schema: S): Model.Compiled<
               removable: named[index].optional
             }))
             if (indexCount === 0) {
-              return objectSample(entries, minimum, state.nullPrototype, state.shrinks)
+              return objectSample(entries, minimum, state.nullPrototype, propertyNames, state.shrinks)
             }
             return Effect.gen(function*() {
               for (let position = 0; position < indexCount; position++) {
@@ -1576,7 +1540,10 @@ export function compile<S extends Schema.Constraint>(schema: S): Model.Compiled<
                   const normalized = normalizePropertyKeySample(keyAttempt)
                   if (normalized === undefined) return Model.discarded
                   keySample = normalized
-                  if (!entries.some((entry) => entry.key === keySample.value)) break
+                  if (
+                    !propertyNames.has(keySample.value) &&
+                    !entries.some((entry) => entry.key === keySample.value)
+                  ) break
                   if (retries++ >= 10) return Model.discarded
                   state.budget.remaining = budget
                   keyAttempt = yield* Model.toEffectGeneration(
@@ -1584,12 +1551,12 @@ export function compile<S extends Schema.Constraint>(schema: S): Model.Compiled<
                   )
                 }
                 const value = yield* Model.toEffectGeneration(
-                  Model.generateWithReservedBudget(index.value, state, futureReserved)
+                  Model.generateWithReservedBudget(index.valueForKey(keySample.value), state, futureReserved)
                 )
                 if (value._tag === "Discarded") return Model.discarded
                 entries.push({ key: keySample.value, keySample, sample: value, removable: true })
               }
-              return objectSample(entries, minimum, state.nullPrototype, state.shrinks)
+              return objectSample(entries, minimum, state.nullPrototype, propertyNames, state.shrinks)
             })
           }
         )
@@ -1600,12 +1567,24 @@ export function compile<S extends Schema.Constraint>(schema: S): Model.Compiled<
   const compileDeclaration = (
     ast: SchemaAST.Declaration,
     path: ReadonlyArray<PropertyKey>,
-    constraint: Constraint | undefined
+    constraint: FilterConstraint | undefined
   ): Model.Compiled<any> => {
     validateConstraint(constraint, path)
     const typeParameters = ast.typeParameters.map((parameter, index) => recur(parameter, [...path, index]))
     const parameters = ast.typeParameters.map((parameter) => Schema.make(SchemaAST.toType(parameter)))
     const getArbitrary = ast.annotations?.toCodecArbitrary
+    const representation = (ast.annotations as Schema.Annotations.Declaration<any> | undefined)?.representation
+    if (typeof getArbitrary !== "function" && representation?.id === "effect/schema/BigDecimal") {
+      const ordered = constraint?.order === BigDecimal.Order ? constraint : undefined
+      const compiled: Model.Compiled<unknown> | undefined = BigDecimalArbitrary.make({
+        minimum: ordered?.minimum as BigDecimal.BigDecimal | undefined,
+        exclusiveMinimum: ordered?.exclusiveMinimum,
+        maximum: ordered?.maximum as BigDecimal.BigDecimal | undefined,
+        exclusiveMaximum: ordered?.exclusiveMaximum
+      })
+      if (compiled === undefined) throw arbitraryError("BigDecimal constraints", path)
+      return compiled
+    }
     let link: SchemaAST.Link
     if (typeof getArbitrary === "function") {
       link = getArbitrary({
@@ -1633,7 +1612,7 @@ export function compile<S extends Schema.Constraint>(schema: S): Model.Compiled<
     const decodeDeclaration = SchemaParser.run<unknown, never>(ast)
     const decode = (value: unknown): Model.Computation<Option.Option<unknown>> => {
       const transformed = link.transformation._tag === "Transformation"
-        ? link.transformation.decode.run(Option.some(value), SchemaAST.defaultParseOptions)
+        ? SchemaGetter.run(link.transformation.decode, Option.some(value), SchemaAST.defaultParseOptions)
         : link.transformation.decode(Effect.succeed(Option.some(value)), SchemaAST.defaultParseOptions)
       return Model.flatMapComputation(optionComputation(transformed), (outer) => {
         if (Option.isNone(outer) || Option.isNone(outer.value)) return Option.none()
@@ -1673,7 +1652,7 @@ export function compile<S extends Schema.Constraint>(schema: S): Model.Compiled<
     }
   }
   if (root.minCost === infinity) {
-    throw arbitraryError("a recursive schema without a finite generation path", [])
+    throw arbitraryError("a schema without a finite generation path", [])
   }
   return root
 }
diff --git a/repos/effect/packages/effect/src/internal/array.ts b/repos/effect/packages/effect/src/internal/array.ts
index 9f5100e33..29aa0d5d9 100644
--- a/repos/effect/packages/effect/src/internal/array.ts
+++ b/repos/effect/packages/effect/src/internal/array.ts
@@ -6,3 +6,10 @@ import type { NonEmptyArray } from "../Array.ts"
 
 /** @internal */
 export const isArrayNonEmpty = <A>(self: ReadonlyArray<A>): self is NonEmptyArray<A> => self.length > 0
+
+/** @internal */
+export function replaceAt<A>(self: ReadonlyArray<A>, index: number, value: A): Array<A> {
+  const out = self.slice()
+  out[index] = value
+  return out
+}
diff --git a/repos/effect/packages/effect/src/internal/config.ts b/repos/effect/packages/effect/src/internal/config.ts
deleted file mode 100644
index 3e538d2bc..000000000
--- a/repos/effect/packages/effect/src/internal/config.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import * as Schema from "../Schema.ts"
-import * as SchemaTransformation from "../SchemaTransformation.ts"
-
-export const trueValues = Schema.Literals(["true", "yes", "on", "1", "y"])
-
-export const falseValues = Schema.Literals(["false", "no", "off", "0", "n"])
-
-export const boolean = Schema.Literals([...trueValues.literals, ...falseValues.literals]).pipe(
-  Schema.decodeTo(
-    Schema.Boolean,
-    SchemaTransformation.transform({
-      decode: (value) => value === "true" || value === "yes" || value === "on" || value === "1" || value === "y",
-      encode: (value) => value ? "true" : "false"
-    })
-  )
-)
diff --git a/repos/effect/packages/effect/src/internal/core.ts b/repos/effect/packages/effect/src/internal/core.ts
index 021d72dd1..11f07efbe 100644
--- a/repos/effect/packages/effect/src/internal/core.ts
+++ b/repos/effect/packages/effect/src/internal/core.ts
@@ -113,7 +113,7 @@ export const EffectProto = {
 }
 
 /** @internal */
-export const isEffect = (u: unknown): u is Effect.Effect<any, any, any> => hasProperty(u, EffectTypeId)
+export const isEffect = (u: unknown): u is Effect.Effect<unknown, unknown, unknown> => hasProperty(u, EffectTypeId)
 
 /** @internal */
 export const isExit = (u: unknown): u is Exit.Exit<unknown, unknown> => hasProperty(u, ExitTypeId)
@@ -136,8 +136,8 @@ export const isCauseReason = (self: unknown): self is Cause.Reason<unknown> => h
 
 /** @internal */
 export class CauseImpl<E> implements Cause.Cause<E> {
-  readonly [CauseTypeId]: typeof CauseTypeId
-  readonly reasons: ReadonlyArray<
+  declare readonly [CauseTypeId]: typeof CauseTypeId
+  declare readonly reasons: ReadonlyArray<
     Cause.Fail<E> | Cause.Die | Cause.Interrupt
   >
   constructor(
@@ -243,7 +243,7 @@ export const constEmptyAnnotations: ReadonlyMap<string, unknown> = new Map<strin
 
 /** @internal */
 export class Fail<E> extends ReasonBase<"Fail"> implements Cause.Fail<E> {
-  readonly error: E
+  declare readonly error: E
   constructor(
     error: E,
     annotations = constEmptyAnnotations
@@ -287,7 +287,7 @@ export const causeFail = <E>(error: E): Cause.Cause<E> => new CauseImpl([new Fai
 
 /** @internal */
 export class Die extends ReasonBase<"Die"> implements Cause.Die {
-  readonly defect: unknown
+  declare readonly defect: unknown
   constructor(
     defect: unknown,
     annotations = constEmptyAnnotations
@@ -380,6 +380,11 @@ export interface Primitive {
   [evaluate](fiber: FiberImpl): Primitive | Yield
 }
 
+interface PrimitiveClass {
+  new(value: any): Primitive
+  prototype: any
+}
+
 function defaultEvaluate(_fiber: FiberImpl): Primitive | Yield {
   return exitDie(`Effect.evaluate: Not implemented`) as any
 }
@@ -393,12 +398,14 @@ export const makePrimitiveProto = <Op extends string>(options: {
   readonly [contA]?: (
     this: Primitive,
     value: any,
-    fiber: FiberImpl
+    fiber: FiberImpl,
+    exit?: Exit.Exit<any, any>
   ) => Primitive | Effect.Effect<any, any, any> | Yield
   readonly [contE]?: (
     this: Primitive,
     cause: Cause.Cause<any>,
-    fiber: FiberImpl
+    fiber: FiberImpl,
+    exit?: Exit.Exit<any, any>
   ) => Primitive | Effect.Effect<any, any, any> | Yield
   readonly [contAll]?: (
     this: Primitive,
@@ -416,20 +423,18 @@ export const makePrimitiveProto = <Op extends string>(options: {
 
 /** @internal */
 export const makePrimitive = <
-  Fn extends (...args: Array<any>) => any,
-  Single extends boolean = true
+  Fn extends (...args: Array<any>) => any
 >(options: {
   readonly op: string
-  readonly single?: Single
   readonly [evaluate]?: (
     this: Primitive & {
-      readonly [args]: Single extends true ? Parameters<Fn>[0] : Parameters<Fn>
+      readonly [args]: Parameters<Fn>[0]
     },
     fiber: FiberImpl
   ) => Primitive | Effect.Effect<any, any, any> | Yield
   readonly [contA]?: (
     this: Primitive & {
-      readonly [args]: Single extends true ? Parameters<Fn>[0] : Parameters<Fn>
+      readonly [args]: Parameters<Fn>[0]
     },
     value: any,
     fiber: FiberImpl,
@@ -437,7 +442,7 @@ export const makePrimitive = <
   ) => Primitive | Effect.Effect<any, any, any> | Yield
   readonly [contE]?: (
     this: Primitive & {
-      readonly [args]: Single extends true ? Parameters<Fn>[0] : Parameters<Fn>
+      readonly [args]: Parameters<Fn>[0]
     },
     cause: Cause.Cause<any>,
     fiber: FiberImpl,
@@ -445,16 +450,18 @@ export const makePrimitive = <
   ) => Primitive | Effect.Effect<any, any, any> | Yield
   readonly [contAll]?: (
     this: Primitive & {
-      readonly [args]: Single extends true ? Parameters<Fn>[0] : Parameters<Fn>
+      readonly [args]: Parameters<Fn>[0]
     },
     fiber: FiberImpl
   ) => void | ((value: any, fiber: FiberImpl) => void)
 }): Fn => {
   const Proto = makePrimitiveProto(options as any)
-  return function() {
-    const self = Object.create(Proto)
-    self[args] = options.single === false ? arguments : arguments[0]
-    return self
+  const PrimitiveImpl = function(this: any, value: any) {
+    this[args] = value
+  } as unknown as PrimitiveClass
+  PrimitiveImpl.prototype = Proto
+  return function(value: any) {
+    return new PrimitiveImpl(value)
   } as Fn
 }
 
@@ -498,10 +505,12 @@ export const makeExit = <
       return Hash.combine(Hash.string(options.op), Hash.hash(this[args]))
     }
   }
+  const ExitPrimitive = function(this: any, value: unknown) {
+    this[args] = value
+  } as unknown as PrimitiveClass
+  ExitPrimitive.prototype = Proto
   return function(value: unknown) {
-    const self = Object.create(Proto)
-    self[args] = value
-    return self
+    return new ExitPrimitive(value)
   } as Fn
 }
 
@@ -532,8 +541,8 @@ export const exitFailCause: <E>(cause: Cause.Cause<E>) => Exit.Exit<never, E> =
   [evaluate](fiber) {
     let cause = this[args]
     let annotated = false
-    if (fiber.currentStackFrame) {
-      cause = causeAnnotate(cause, { mapUnsafe: new Map([[StackTraceKey.key, fiber.currentStackFrame]]) } as any)
+    if (fiber.cache.stackFrame) {
+      cause = causeAnnotate(cause, { mapUnsafe: new Map([[StackTraceKey.key, fiber.cache.stackFrame]]) } as any)
       annotated = true
     }
     let cont = fiber.getCont(contE)
@@ -562,6 +571,23 @@ export const withFiber: <A, E = never, R = never>(
   }
 })
 
+/**
+ * Accesses the current fiber to compute a value without a separate `succeed`
+ * operation.
+ *
+ * @internal
+ */
+export const withFiberSucceed: <A, R = never>(
+  evaluate: (fiber: FiberImpl<unknown, unknown>) => A
+) => Effect.Effect<A, never, R> = makePrimitive({
+  op: "WithFiberSucceed",
+  [evaluate](fiber) {
+    const value = this[args](fiber)
+    const cont = fiber.getCont(contA)
+    return cont ? cont[contA](value, fiber) : fiber.yieldWith(exitSucceed(value))
+  }
+})
+
 /** @internal */
 export const YieldableError: new(
   message?: string,
diff --git a/repos/effect/packages/effect/src/internal/dateTime.ts b/repos/effect/packages/effect/src/internal/dateTime.ts
index c88826a2c..57dc1a236 100644
--- a/repos/effect/packages/effect/src/internal/dateTime.ts
+++ b/repos/effect/packages/effect/src/internal/dateTime.ts
@@ -661,14 +661,12 @@ export const getPart: {
 } = dual(2, (self: DateTime.DateTime, part: keyof DateTime.DateTime.PartsWithWeekday): number => toParts(self)[part])
 
 const setPartsDate = (date: Date, parts: Partial<DateTime.DateTime.PartsWithWeekday>): void => {
-  if (parts.year !== undefined) {
-    date.setUTCFullYear(parts.year)
-  }
-  if (parts.month !== undefined) {
-    date.setUTCMonth(parts.month - 1)
-  }
-  if (parts.day !== undefined) {
-    date.setUTCDate(parts.day)
+  if (parts.year !== undefined || parts.month !== undefined || parts.day !== undefined) {
+    date.setUTCFullYear(
+      parts.year ?? date.getUTCFullYear(),
+      parts.month !== undefined ? parts.month - 1 : date.getUTCMonth(),
+      parts.day ?? date.getUTCDate()
+    )
   }
   if (parts.weekDay !== undefined) {
     const diff = parts.weekDay - date.getUTCDay()
diff --git a/repos/effect/packages/effect/src/internal/effect.ts b/repos/effect/packages/effect/src/internal/effect.ts
index ebbe14cce..931d6b4cd 100644
--- a/repos/effect/packages/effect/src/internal/effect.ts
+++ b/repos/effect/packages/effect/src/internal/effect.ts
@@ -18,7 +18,6 @@ import * as Iterable from "../Iterable.ts"
 import type * as _Latch from "../Latch.ts"
 import type * as Logger from "../Logger.ts"
 import type * as LogLevel from "../LogLevel.ts"
-import type * as Metric from "../Metric.ts"
 import * as Option from "../Option.ts"
 import * as Order from "../Order.ts"
 import { pipeArguments } from "../Pipeable.ts"
@@ -51,6 +50,7 @@ import type { Primitive } from "./core.ts"
 import {
   args,
   causeAnnotate,
+  causeDie,
   causeEmpty,
   causeFromReasons,
   CauseImpl,
@@ -105,7 +105,7 @@ import { addSpanStackTrace, makeStackCleaner } from "./tracer.ts"
 
 /** @internal */
 export class Interrupt extends ReasonBase<"Interrupt"> implements Cause.Interrupt {
-  readonly fiberId: number | undefined
+  declare readonly fiberId: number | undefined
   constructor(
     fiberId: number | undefined,
     annotations = constEmptyAnnotations
@@ -238,6 +238,29 @@ export const causeAnnotations = <E>(
   return Context.makeUnsafe(map)
 }
 
+const dedupeReasons = <E>(
+  self: ReadonlyArray<Cause.Reason<E>>,
+  that: ReadonlyArray<Cause.Reason<E>>
+): Array<Cause.Reason<E>> => {
+  // Keep deduplication local so causeCombine does not retain Array.ts in the core bundle.
+  // Snapshot both arrays before invoking user-defined hash or equality methods.
+  const buckets = new Map<number, Array<Cause.Reason<E>>>()
+  const out: Array<Cause.Reason<E>> = []
+  for (const reason of self.concat(that)) {
+    const hash = Hash.hash(reason)
+    const bucket = buckets.get(hash)
+    if (bucket === undefined) {
+      buckets.set(hash, [reason])
+    } else if (bucket.some((previous) => Equal.equals(previous, reason))) {
+      continue
+    } else {
+      bucket.push(reason)
+    }
+    out.push(reason)
+  }
+  return out
+}
+
 /** @internal */
 export const causeCombine: {
   <E2>(that: Cause.Cause<E2>): <E>(self: Cause.Cause<E>) => Cause.Cause<E | E2>
@@ -251,7 +274,7 @@ export const causeCombine: {
       return self as Cause.Cause<E | E2>
     }
     const newCause = new CauseImpl<E | E2>(
-      Arr.union(self.reasons, that.reasons)
+      dedupeReasons<E | E2>(self.reasons, that.reasons)
     )
     return Equal.equals(self, newCause) ? self : newCause
   }
@@ -317,7 +340,7 @@ export const causePrettyErrors = <E>(self: Cause.Cause<E>, options?: {
   if (self.reasons.length === 0) return errors
 
   const prevStackLimit = getStackTraceLimit()
-  setStackTraceLimit(1)
+  if (prevStackLimit !== 0) setStackTraceLimit(1)
 
   for (const failure of self.reasons) {
     if (failure._tag === "Interrupt") {
@@ -342,7 +365,7 @@ export const causePrettyErrors = <E>(self: Cause.Cause<E>, options?: {
     errors.push(causePrettyError(error, interrupts[0].annotations, options))
   }
 
-  setStackTraceLimit(prevStackLimit)
+  if (prevStackLimit !== 0) setStackTraceLimit(prevStackLimit)
   return errors
 }
 
@@ -513,14 +536,15 @@ export class FiberImpl<A = any, E = any> implements Fiber.Fiber<A, E> {
     this.currentOpCount = 0
     this.interruptible = interruptible
     this._stack = []
-    this._observers = []
+    this._observers = undefined
     this._exit = undefined
     this._children = undefined
     this._interruptedCause = undefined
     this._yielded = undefined
     this._running = false
     this._deferredInterrupt = false
-    this.runtimeMetrics?.recordFiberStart(this.context)
+    this._parent = undefined
+    this.cache.runtimeMetrics?.recordFiberStart(this.context)
   }
 
   readonly [FiberTypeId]: Fiber.Fiber.Variance<A, E>
@@ -529,29 +553,22 @@ export class FiberImpl<A = any, E = any> implements Fiber.Fiber<A, E> {
   interruptible: boolean
   currentOpCount: number
   readonly _stack: Array<Primitive>
-  readonly _observers: Array<(exit: Exit.Exit<A, E>) => void>
+  _observers: Array<(exit: Exit.Exit<A, E>) => void> | undefined
   _exit: Exit.Exit<A, E> | undefined
   _children: Set<FiberImpl<any, any>> | undefined
   _interruptedCause: Cause.Cause<never> | undefined
   _yielded: Exit.Exit<any, any> | (() => void) | undefined
   _running: boolean
   _deferredInterrupt: boolean
+  _parent: FiberImpl<any, any> | undefined
 
   // set in setContext
   context!: Context.Context<never>
-  currentScheduler!: Scheduler.Scheduler
-  currentTracerContext: Tracer.Tracer["context"]
-  currentSpan: Tracer.AnySpan | undefined
-  currentLogLevel!: LogLevel.LogLevel
-  minimumLogLevel!: LogLevel.LogLevel
-  currentStackFrame: StackFrame | undefined
-  runtimeMetrics: Metric.FiberRuntimeMetricsService | undefined
-  maxOpsBeforeYield!: number
-  currentPreventYield!: boolean
+  cache!: Fiber.Fiber.Cache
 
   _dispatcher: Scheduler.SchedulerDispatcher | undefined = undefined
   get currentDispatcher(): Scheduler.SchedulerDispatcher {
-    return this._dispatcher ??= this.currentScheduler.makeDispatcher()
+    return this._dispatcher ??= this.cache.scheduler.makeDispatcher()
   }
 
   getRef<X>(ref: Context.Reference<X>): X {
@@ -562,9 +579,13 @@ export class FiberImpl<A = any, E = any> implements Fiber.Fiber<A, E> {
       cb(this._exit)
       return constVoid
     }
-    this._observers.push(cb)
+    if (this._observers === undefined) {
+      this._observers = [cb]
+    } else {
+      this._observers.push(cb)
+    }
     return () => {
-      if (this._exit) return
+      if (this._exit || this._observers === undefined) return
       const index = this._observers.indexOf(cb)
       if (index >= 0) {
         this._observers.splice(index, 1)
@@ -576,8 +597,8 @@ export class FiberImpl<A = any, E = any> implements Fiber.Fiber<A, E> {
       return
     }
     let cause = causeInterrupt(fiberId)
-    if (this.currentStackFrame) {
-      cause = causeAnnotate(cause, Context.make(CauseStackTrace, this.currentStackFrame))
+    if (this.cache.stackFrame) {
+      cause = causeAnnotate(cause, Context.make(CauseStackTrace, this.cache.stackFrame))
     }
     if (annotations) {
       cause = causeAnnotate(cause, annotations)
@@ -617,11 +638,18 @@ export class FiberImpl<A = any, E = any> implements Fiber.Fiber<A, E> {
     }
 
     this._exit = exit
-    this.runtimeMetrics?.recordFiberEnd(this.context, this._exit)
-    for (let i = 0; i < this._observers.length; i++) {
-      this._observers[i](exit)
+    this.cache.runtimeMetrics?.recordFiberEnd(this.context, this._exit)
+    if (this._parent) {
+      this._parent._children?.delete(this)
+      this._parent = undefined
+    }
+    if (this._observers !== undefined) {
+      const observers = this._observers
+      this._observers = undefined
+      for (let i = 0; i < observers.length; i++) {
+        observers[i](exit)
+      }
     }
-    this._observers.length = 0
     this._stack.length = 0
     this._children = undefined
     this.context = Context.empty()
@@ -641,17 +669,19 @@ export class FiberImpl<A = any, E = any> implements Fiber.Fiber<A, E> {
           current = failCause(this._interruptedCause!) as any
         }
         this.currentOpCount++
+        // Refresh the cache because a primitive can replace the fiber context.
+        const cache = this.cache
         if (
           !yielding &&
-          !this.currentPreventYield &&
-          this.currentScheduler.shouldYield(this as any)
+          !cache.preventYield &&
+          cache.scheduler.shouldYield(this as any)
         ) {
           yielding = true
           const prev = current
           current = flatMap(yieldNow, () => prev as any) as any
         }
-        current = this.currentTracerContext
-          ? this.currentTracerContext(current as any, this)
+        current = cache.tracerContext
+          ? cache.tracerContext(current as any, this)
           : (current as any)[evaluate](this)
         if (current === Yield) {
           const yielded = this._yielded!
@@ -688,10 +718,13 @@ export class FiberImpl<A = any, E = any> implements Fiber.Fiber<A, E> {
     while (true) {
       const op = this._stack.pop()
       if (!op) return undefined
-      const cont = op[contAll] && op[contAll](this)
-      if (cont) {
-        ;(cont as any)[symbol] = cont
-        return cont as any
+      const all = op[contAll]
+      if (all !== undefined) {
+        const cont = all.call(op, this)
+        if (cont) {
+          ;(cont as any)[symbol] = cont
+          return cont as any
+        }
       }
       if (op[symbol]) return op as any
     }
@@ -712,25 +745,38 @@ export class FiberImpl<A = any, E = any> implements Fiber.Fiber<A, E> {
     // Every key cached below opts in to Context caching, so contexts related
     // only by non-caching adds cannot have changed any of them
     if (previous !== undefined && Context.hasSameCache(previous, context)) return
-    const scheduler = this.getRef(Scheduler.Scheduler)
-    if (scheduler !== this.currentScheduler) {
-      this.currentScheduler = scheduler
+    // Contexts sharing a cacheRoot resolve every cached key identically, so
+    // the derived cache object is computed once per root and shared by all
+    // fibers running with that root (forked fibers reuse the parent's).
+    const root: any = (context as any).cacheRoot
+    const cache: Fiber.Fiber.Cache = root._fiberCache ??= makeFiberContextCache(context)
+    if (this.cache !== undefined && this.cache.scheduler !== cache.scheduler) {
       this._dispatcher = undefined
     }
-    // The string-keyed lookups keep the Tracer key values (and the native
-    // tracer behind Tracer.Tracer's default) out of every bundle
-    this.currentSpan = Context.getOrUndefinedUnsafe(context, Tracer.ParentSpanKey)
-    this.currentLogLevel = this.getRef(CurrentLogLevel)
-    this.minimumLogLevel = this.getRef(MinimumLogLevel)
-    this.currentStackFrame = this.getRef(CurrentStackFrame)
-    this.maxOpsBeforeYield = this.getRef(Scheduler.MaxOpsBeforeYield)
-    this.currentPreventYield = this.getRef(Scheduler.PreventSchedulerYield)
-    this.runtimeMetrics = Context.getOrUndefinedUnsafe(context, InternalMetric.FiberRuntimeMetricsKey)
-    const currentTracer = Context.getOrUndefinedUnsafe<Tracer.Tracer>(context, Tracer.TracerKey)
-    this.currentTracerContext = currentTracer ? currentTracer["context"] : undefined
+    this.cache = cache
   }
   get currentSpanLocal(): Tracer.Span | undefined {
-    return this.currentSpan?._tag === "Span" ? this.currentSpan : undefined
+    const span = this.cache.span
+    return span?._tag === "Span" ? span : undefined
+  }
+}
+
+const makeFiberContextCache = (context: Context.Context<never>): Fiber.Fiber.Cache => {
+  // The string-keyed lookups keep the Tracer key values (and the native
+  // tracer behind Tracer.Tracer's default) out of every bundle
+  const currentTracer = Context.getOrUndefinedUnsafe<Tracer.Tracer>(context, Tracer.TracerKey)
+  return {
+    scheduler: Context.get(context, Scheduler.Scheduler),
+    tracer: currentTracer,
+    tracerContext: currentTracer ? currentTracer["context"] : undefined,
+    tracerEnabled: Context.get(context, TracerEnabled),
+    span: Context.getOrUndefinedUnsafe(context, Tracer.ParentSpanKey),
+    logLevel: Context.get(context, CurrentLogLevel),
+    minimumLogLevel: Context.get(context, MinimumLogLevel),
+    stackFrame: Context.get(context, CurrentStackFrame),
+    runtimeMetrics: Context.getOrUndefinedUnsafe(context, InternalMetric.FiberRuntimeMetricsKey),
+    maxOpsBeforeYield: Context.get(context, Scheduler.MaxOpsBeforeYield),
+    preventYield: Context.get(context, Scheduler.PreventSchedulerYield)
   }
 }
 
@@ -750,9 +796,9 @@ const fiberMiddleware = {
 }
 
 const fiberStackAnnotations = (fiber: Fiber.Fiber<any, any>) => {
-  if (!fiber.currentStackFrame) return undefined
+  if (!fiber.cache.stackFrame) return undefined
   const annotations = new Map<string, unknown>()
-  annotations.set(InterruptorStackTrace.key, fiber.currentStackFrame)
+  annotations.set(InterruptorStackTrace.key, fiber.cache.stackFrame)
   return Context.makeUnsafe(annotations)
 }
 
@@ -1106,41 +1152,50 @@ const callbackOptions: <A, E = never, R = never>(
     signal?: AbortSignal
   ) => void | Effect.Effect<void, never, R>,
   withSignal: boolean
-) => Effect.Effect<A, E, R> = makePrimitive({
-  op: "Async",
-  single: false,
-  [evaluate](fiber) {
-    const register = internalCall(() => this[args][0].bind(fiber.currentScheduler))
-    let resumed = false
-    let yielded: boolean | Primitive = false
-    const controller = this[args][1] ? new AbortController() : undefined
-    const onCancel = register((effect) => {
-      if (resumed) return
-      resumed = true
-      if (yielded) {
-        fiber.evaluate(effect as any)
-      } else {
-        yielded = effect as any
+) => Effect.Effect<A, E, R> = (function() {
+  const Proto = makePrimitiveProto({
+    op: "Async",
+    [evaluate](this: any, fiber) {
+      const register = internalCall(() => this.register.bind(fiber.cache.scheduler))
+      let resumed = false
+      let yielded: boolean | Primitive = false
+      const controller = this.withSignal ? new AbortController() : undefined
+      const onCancel = register((effect: Effect.Effect<any, any, any>) => {
+        if (resumed) return
+        resumed = true
+        if (yielded) {
+          fiber.evaluate(effect as any)
+        } else {
+          yielded = effect as any
+        }
+      }, controller?.signal)
+      if (yielded !== false) return yielded
+      yielded = true
+      fiber._yielded = () => {
+        resumed = true
       }
-    }, controller?.signal)
-    if (yielded !== false) return yielded
-    yielded = true
-    fiber._yielded = () => {
-      resumed = true
-    }
-    if (controller === undefined && onCancel === undefined) {
+      if (controller === undefined && onCancel === undefined) {
+        return Yield
+      }
+      fiber._stack.push(
+        asyncFinalizer(() => {
+          resumed = true
+          controller?.abort()
+          return onCancel ?? exitVoid
+        })
+      )
       return Yield
     }
-    fiber._stack.push(
-      asyncFinalizer(() => {
-        resumed = true
-        controller?.abort()
-        return onCancel ?? exitVoid
-      })
-    )
-    return Yield
-  }
-})
+  })
+  const AsyncImpl = function(this: any, register: any, withSignal: boolean) {
+    this.register = register
+    this.withSignal = withSignal
+  } as unknown as PrimitiveCtor<[register: any, withSignal: boolean]>
+  AsyncImpl.prototype = Proto
+  return function(register: any, withSignal: boolean) {
+    return new AsyncImpl(register, withSignal)
+  } as any
+})()
 
 const asyncFinalizer: (
   onInterrupt: () => Effect.Effect<void, any, any>
@@ -1188,12 +1243,14 @@ export const gen = <
   [Eff] extends [never] ? never
     : [Eff] extends [Effect.Effect<infer _A, infer _E, infer R>] ? R
     : never
-> =>
-  suspend(() =>
-    fromIteratorUnsafe(
-      args.length === 1 ? args[0]() : (args[1].call(args[0].self) as any)
-    )
-  )
+> => {
+  if (args.length === 1) {
+    const body = args[0]
+    return suspend(() => fromIteratorUnsafe(body()))
+  }
+  const [options, body] = args
+  return suspend(() => fromIteratorUnsafe(body.call(options.self) as any))
+}
 
 /** @internal */
 export const fnUntraced: Effect.fn.Untraced = (
@@ -1229,9 +1286,12 @@ export const fn: typeof Effect.fn = function() {
   const spanOptions = nameFirst ? arguments[1] : undefined
 
   const prevLimit = getStackTraceLimit()
-  setStackTraceLimit(2)
-  const defError = new globalThis.Error()
-  setStackTraceLimit(prevLimit)
+  let defError: Error | undefined
+  if (prevLimit !== 0) {
+    setStackTraceLimit(2)
+    defError = new globalThis.Error()
+    setStackTraceLimit(prevLimit)
+  }
 
   if (nameFirst) {
     return (body: Function | { readonly self: any }, ...pipeables: Array<Function>) =>
@@ -1251,7 +1311,7 @@ export const fn: typeof Effect.fn = function() {
 const makeFn = (
   name: string,
   bodyOrOptions: Function | { readonly self: any },
-  defError: Error,
+  defError: Error | undefined,
   pipeables: Array<Function>,
   addSpan: boolean,
   spanOptions: Tracer.SpanOptionsNoTrace | undefined
@@ -1272,9 +1332,12 @@ const makeFn = (
       return result
     }
     const prevLimit = getStackTraceLimit()
-    setStackTraceLimit(2)
-    const callError = new globalThis.Error()
-    setStackTraceLimit(prevLimit)
+    let callError: Error | undefined
+    if (prevLimit !== 0) {
+      setStackTraceLimit(2)
+      callError = new globalThis.Error()
+      setStackTraceLimit(prevLimit)
+    }
     return updateService(
       addSpan ?
         useSpan(name, spanOptions!, (span) => provideParentSpan(result, span)) :
@@ -1282,10 +1345,10 @@ const makeFn = (
       CurrentStackFrame,
       (prev) => ({
         name,
-        stack: fnStackCleaner(() => callError.stack),
+        stack: callError ? fnStackCleaner(() => callError.stack) : constUndefined,
         parent: {
           name: `${name} (definition)`,
-          stack: fnStackCleaner(() => defError.stack),
+          stack: defError ? fnStackCleaner(() => defError.stack) : constUndefined,
           parent: prev
         }
       })
@@ -1307,7 +1370,7 @@ export const fnUntracedEager: Effect.fn.Untraced = (
       : function(this: any) {
         let effect = fromIteratorEagerUnsafe(() => body.apply(this, arguments))
         for (const pipeable of pipeables) {
-          effect = pipeable(effect)
+          effect = pipeable(effect, ...arguments)
         }
         return effect
       }
@@ -1356,27 +1419,36 @@ const fromIteratorEagerUnsafe = (
 const fromIteratorUnsafe: (
   iterator: Iterator<Effect.Effect<any, any, any>>,
   initial?: undefined
-) => Effect.Effect<any, any, any> = makePrimitive({
-  op: "Iterator",
-  single: false,
-  [contA](value, fiber) {
-    const iter = this[args][0]
-    while (true) {
-      const state = iter.next(value)
-      if (state.done) return succeed(state.value)
-      if (!effectIsExit(state.value)) {
-        fiber._stack.push(this)
-        return state.value
-      } else if (state.value._tag === "Failure") {
-        return state.value
+) => Effect.Effect<any, any, any> = (function() {
+  const Proto = makePrimitiveProto({
+    op: "Iterator",
+    [contA](this: any, value, fiber) {
+      const iter = this.iterator
+      while (true) {
+        const state = iter.next(value)
+        if (state.done) return succeed(state.value)
+        if (!effectIsExit(state.value)) {
+          fiber._stack.push(this)
+          return state.value
+        } else if (state.value._tag === "Failure") {
+          return state.value
+        }
+        value = state.value.value
       }
-      value = state.value.value
+    },
+    [evaluate](this: any, fiber: FiberImpl) {
+      return this[contA](this.initial, fiber)
     }
-  },
-  [evaluate](this: any, fiber: FiberImpl) {
-    return this[contA](this[args][1], fiber)
-  }
-})
+  })
+  const IteratorImpl = function(this: any, iterator: any, initial: any) {
+    this.iterator = iterator
+    this.initial = initial
+  } as unknown as PrimitiveCtor<[iterator: any, initial: any]>
+  IteratorImpl.prototype = Proto
+  return function(iterator: any, initial?: undefined) {
+    return new IteratorImpl(iterator, initial)
+  } as any
+})()
 
 // ----------------------------------------------------------------------------
 // mapping & sequencing
@@ -1393,12 +1465,71 @@ export const as: {
   <A, E, R, B>(
     self: Effect.Effect<A, E, R>,
     value: B
-  ): Effect.Effect<B, E, R> => {
-    const b = succeed(value)
-    return flatMap(self, (_) => b)
-  }
+  ): Effect.Effect<B, E, R> => new ContImpl(self, returnPayload, succeed(value))
 )
 
+const evaluateCont = function(this: any, fiber: FiberImpl): Primitive {
+  fiber._stack.push(this)
+  return this[args]
+}
+
+interface PrimitiveCtor<Args extends Array<any>> {
+  new(...args: Args): Primitive & Effect.Effect<any, any, any>
+  prototype: any
+}
+
+const OnSuccessProto = makePrimitiveProto({
+  op: "OnSuccess",
+  [evaluate]: evaluateCont
+})
+
+const OnSuccessImpl = function(this: any, self: Effect.Effect<any, any, any>, f: any) {
+  this[args] = self
+  this[contA] = f
+} as unknown as PrimitiveCtor<[self: Effect.Effect<any, any, any>, f: any]>
+OnSuccessImpl.prototype = OnSuccessProto
+
+// A success continuation with an extra payload slot. The stored continuation
+// receives the primitive as `this` and reads `this.payload`, so combinators
+// like map / as / tap / andThen can share module-level continuation functions
+// instead of allocating a closure per call.
+const ContImpl = function(
+  this: any,
+  self: Effect.Effect<any, any, any>,
+  cont: (this: { readonly payload: any }, value: any, fiber: FiberImpl) => unknown,
+  payload: unknown
+) {
+  this[args] = self
+  this[contA] = cont
+  this.payload = payload
+} as unknown as PrimitiveCtor<
+  [
+    self: Effect.Effect<any, any, any>,
+    cont: (this: { readonly payload: any }, value: any, fiber: FiberImpl) => unknown,
+    payload: unknown
+  ]
+>
+ContImpl.prototype = OnSuccessProto
+
+const returnPayload = function(this: { readonly payload: any }) {
+  return this.payload
+}
+const mapCont = function(this: { readonly payload: any }, value: any) {
+  const f = this.payload
+  return succeed(internalCall(() => f(value)))
+}
+const andThenCont = function(this: { readonly payload: any }, value: any) {
+  const f = this.payload
+  return internalCall(() => f(value))
+}
+const tapCont = function(this: { readonly payload: any }, value: any) {
+  const f = this.payload
+  return new ContImpl(internalCall(() => f(value)), returnPayload, exitSucceed(value))
+}
+const tapEffectCont = function(this: { readonly payload: any }, value: any) {
+  return new ContImpl(this.payload, returnPayload, exitSucceed(value))
+}
+
 /** @internal */
 export const asSome = <A, E, R>(
   self: Effect.Effect<A, E, R>
@@ -1434,8 +1565,7 @@ export const andThen: {
   <A, E, R, B, E2, R2>(
     self: Effect.Effect<A, E, R>,
     f: ((a: A) => Effect.Effect<B, E2, R2>) | Effect.Effect<B, E2, R2>
-  ): Effect.Effect<B, E | E2, R | R2> =>
-    flatMap(self, (a) => isEffect(f) ? f : internalCall(() => (f as (a: A) => Effect.Effect<B, E2, R2>)(a)))
+  ): Effect.Effect<B, E | E2, R | R2> => new ContImpl(self, isEffect(f) ? returnPayload : andThenCont, f)
 )
 
 /** @internal */
@@ -1459,14 +1589,13 @@ export const tap: {
   <A, E, R, B, E2, R2>(
     self: Effect.Effect<A, E, R>,
     f: ((a: A) => Effect.Effect<B, E2, R2>) | Effect.Effect<B, E2, R2>
-  ): Effect.Effect<A, E | E2, R | R2> =>
-    flatMap(self, (a) => as(isEffect(f) ? f : internalCall(() => (f as (a: A) => Effect.Effect<B, E2, R2>)(a)), a))
+  ): Effect.Effect<A, E | E2, R | R2> => new ContImpl(self, isEffect(f) ? tapEffectCont : tapCont, f)
 )
 
 /** @internal */
 export const asVoid = <A, E, R>(
   self: Effect.Effect<A, E, R>
-): Effect.Effect<void, E, R> => flatMap(self, (_) => exitVoid)
+): Effect.Effect<void, E, R> => new ContImpl(self, returnPayload, exitVoid)
 
 /** @internal */
 export const sandbox = <A, E, R>(
@@ -1673,20 +1802,8 @@ export const flatMap: {
   <A, E, R, B, E2, R2>(
     self: Effect.Effect<A, E, R>,
     f: (a: A) => Effect.Effect<B, E2, R2>
-  ): Effect.Effect<B, E | E2, R | R2> => {
-    const onSuccess = Object.create(OnSuccessProto)
-    onSuccess[args] = self
-    onSuccess[contA] = f.length !== 1 ? (a: A) => f(a) : f
-    return onSuccess
-  }
+  ): Effect.Effect<B, E | E2, R | R2> => new OnSuccessImpl(self, f.length !== 1 ? (a: A) => f(a) : f)
 )
-const OnSuccessProto = makePrimitiveProto({
-  op: "OnSuccess",
-  [evaluate](this: any, fiber: FiberImpl): Primitive {
-    fiber._stack.push(this)
-    return this[args]
-  }
-})
 
 /** @internal */
 export const matchCauseEffectEager: {
@@ -1722,7 +1839,8 @@ export const matchCauseEffectEager: {
 )
 
 /** @internal */
-export const effectIsExit = <A, E, R>(effect: Effect.Effect<A, E, R>): effect is Exit.Exit<A, E> => ExitTypeId in effect
+export const effectIsExit = <A, E, R>(effect: Effect.Effect<A, E, R>): effect is Exit.Exit<A, E> =>
+  (effect as any)[ExitTypeId] !== undefined
 
 /** @internal */
 export const flatMapEager: {
@@ -1769,7 +1887,7 @@ export const map: {
   <A, E, R, B>(
     self: Effect.Effect<A, E, R>,
     f: (a: A) => B
-  ): Effect.Effect<B, E, R> => flatMap(self, (a) => succeed(internalCall(() => f(a))))
+  ): Effect.Effect<B, E, R> => new ContImpl(self, mapCont, f)
 )
 
 /** @internal */
@@ -2135,7 +2253,9 @@ export const updateServiceScoped = <I, A>(
     const updated = update(original)
     fiber.setContext(Context.add(fiber.context, service, updated))
     return scopeAddFinalizerExit(Context.getUnsafe(fiber.context, scopeTag), (_) => {
-      const current = Context.getUnsafe(fiber.context, service)
+      const currentOption = Context.getOption(fiber.context, service)
+      if (Option.isNone(currentOption)) return void_
+      const current = currentOption.value
       let next: A
       if (options?.reset === undefined) {
         if (current !== updated) return void_
@@ -2311,7 +2431,7 @@ export const zipWith: {
 // filtering & conditionals
 // ----------------------------------------------------------------------------
 
-/* @internal */
+/** @internal */
 export const filterOrFail: {
   <A, E2, B extends A>(
     refinement: Predicate.Refinement<NoInfer<A>, B>,
@@ -2485,20 +2605,18 @@ export const catchCause: {
   <A, E, R, B, E2, R2>(
     self: Effect.Effect<A, E, R>,
     f: (cause: NoInfer<Cause.Cause<E>>) => Effect.Effect<B, E2, R2>
-  ): Effect.Effect<A | B, E2, R | R2> => {
-    const onFailure = Object.create(OnFailureProto)
-    onFailure[args] = self
-    onFailure[contE] = f.length !== 1 ? (cause: Cause.Cause<E>) => f(cause) : f
-    return onFailure
-  }
+  ): Effect.Effect<A | B, E2, R | R2> =>
+    new OnFailureImpl(self, f.length !== 1 ? (cause: Cause.Cause<E>) => f(cause) : f)
 )
 const OnFailureProto = makePrimitiveProto({
   op: "OnFailure",
-  [evaluate](this: any, fiber: FiberImpl): Primitive {
-    fiber._stack.push(this as any)
-    return this[args]
-  }
+  [evaluate]: evaluateCont
 })
+const OnFailureImpl = function(this: any, self: Effect.Effect<any, any, any>, f: any) {
+  this[args] = self
+  this[contE] = f
+} as unknown as PrimitiveCtor<[self: Effect.Effect<any, any, any>, f: any]>
+OnFailureImpl.prototype = OnFailureProto
 
 /** @internal */
 export const catchCauseIf: {
@@ -2741,9 +2859,9 @@ export const tapErrorTag: {
 
 /** @internal */
 export const tapDefect: {
-  <E, B, E2, R2>(
+  <B, E2, R2>(
     f: (defect: unknown) => Effect.Effect<B, E2, R2>
-  ): <A, R>(self: Effect.Effect<A, E, R>) => Effect.Effect<A, E | E2, R | R2>
+  ): <A, E, R>(self: Effect.Effect<A, E, R>) => Effect.Effect<A, E | E2, R | R2>
   <A, E, R, B, E2, R2>(
     self: Effect.Effect<A, E, R>,
     f: (defect: unknown) => Effect.Effect<B, E2, R2>
@@ -3098,7 +3216,10 @@ export const catchReason: {
   > =>
     catchIf(
       self,
-      ((e: any) => isTagged(e, errorTag) && hasProperty(e, "reason")) as any,
+      ((e: any) =>
+        isTagged(e, errorTag) &&
+        hasProperty(e, "reason") &&
+        (orElse !== undefined || isTagged(e.reason, reasonTag))) as any,
       (e: any): Effect.Effect<A2 | A3, E | E2 | E3, R2 | R3> => {
         const reason = e.reason as any
         if (isTagged(reason, reasonTag)) return f(reason as any, e)
@@ -3198,7 +3319,8 @@ export const catchReasons: {
       isTagged(e, errorTag) &&
       hasProperty(e, "reason") &&
       hasProperty(e.reason, "_tag") &&
-      isString(e.reason._tag)) as any,
+      isString(e.reason._tag) &&
+      (orElse !== undefined || (keys ??= Object.keys(cases)).includes(e.reason._tag))) as any,
     (e: any) => {
       const reason = e.reason
       keys ??= Object.keys(cases)
@@ -3267,7 +3389,7 @@ export const mapError: {
   ): Effect.Effect<A, E2, R> => catch_(self, (error) => failSync(() => f(error)))
 )
 
-/* @internal */
+/** @internal */
 export const mapBoth: {
   <E, E2, A, A2>(
     options: { readonly onFailure: (e: E) => E2; readonly onSuccess: (a: A) => A2 }
@@ -3292,19 +3414,19 @@ export const orDie = <A, E, R>(
 
 /** @internal */
 export const orElseSucceed: {
-  <B>(
-    f: LazyArg<B>
-  ): <A, E, R>(self: Effect.Effect<A, E, R>) => Effect.Effect<A | B, never, R>
+  <E, B>(
+    f: (error: NoInfer<E>) => B
+  ): <A, R>(self: Effect.Effect<A, E, R>) => Effect.Effect<A | B, never, R>
   <A, E, R, B>(
     self: Effect.Effect<A, E, R>,
-    f: LazyArg<B>
+    f: (error: E) => B
   ): Effect.Effect<A | B, never, R>
 } = dual(
   2,
   <A, E, R, B>(
     self: Effect.Effect<A, E, R>,
-    f: LazyArg<B>
-  ): Effect.Effect<A | B, never, R> => catch_(self, (_) => sync(f))
+    f: (error: E) => B
+  ): Effect.Effect<A | B, never, R> => catch_(self, (error) => sync(() => f(error)))
 )
 
 /** @internal */
@@ -3446,23 +3568,30 @@ export const matchCauseEffect: {
       readonly onFailure: (cause: Cause.Cause<E>) => Effect.Effect<A2, E2, R2>
       readonly onSuccess: (a: A) => Effect.Effect<A3, E3, R3>
     }
-  ): Effect.Effect<A2 | A3, E2 | E3, R2 | R3 | R> => {
-    const primitive = Object.create(OnSuccessAndFailureProto)
-    primitive[args] = self
-    primitive[contA] = options.onSuccess.length !== 1 ? (a: A) => options.onSuccess(a) : options.onSuccess
-    primitive[contE] = options.onFailure.length !== 1
-      ? (cause: Cause.Cause<E>) => options.onFailure(cause)
-      : options.onFailure
-    return primitive
-  }
+  ): Effect.Effect<A2 | A3, E2 | E3, R2 | R3 | R> =>
+    new OnSuccessAndFailureImpl(
+      self,
+      options.onSuccess.length !== 1 ? (a: A) => options.onSuccess(a) : options.onSuccess,
+      options.onFailure.length !== 1
+        ? (cause: Cause.Cause<E>) => options.onFailure(cause)
+        : options.onFailure
+    )
 )
 const OnSuccessAndFailureProto = makePrimitiveProto({
   op: "OnSuccessAndFailure",
-  [evaluate](this: any, fiber: FiberImpl): Primitive {
-    fiber._stack.push(this)
-    return this[args]
-  }
+  [evaluate]: evaluateCont
 })
+const OnSuccessAndFailureImpl = function(
+  this: any,
+  self: Effect.Effect<any, any, any>,
+  onSuccess: any,
+  onFailure: any
+) {
+  this[args] = self
+  this[contA] = onSuccess
+  this[contE] = onFailure
+} as unknown as PrimitiveCtor<[self: Effect.Effect<any, any, any>, onSuccess: any, onFailure: any]>
+OnSuccessAndFailureImpl.prototype = OnSuccessAndFailureProto
 
 /** @internal */
 export const matchCause: {
@@ -3697,9 +3826,9 @@ export const timeoutOrElse: {
       readonly orElse: LazyArg<Effect.Effect<A2, E2, R2>>
     }
   ): Effect.Effect<A | A2, E | E2, R | R2> =>
-    raceFirst(
-      self,
-      flatMap(sleep(options.duration), options.orElse)
+    flatMap(
+      timeoutOption(self, options.duration),
+      (option): Effect.Effect<A | A2, E2, R2> => Option.isNone(option) ? options.orElse() : succeed(option.value)
     )
 )
 
@@ -4009,30 +4138,40 @@ export const onExitPrimitive: <A, E, R, XE = never, XR = never>(
   self: Effect.Effect<A, E, R>,
   f: (exit: Exit.Exit<A, E>) => Effect.Effect<void, XE, XR> | undefined,
   interruptible?: boolean
-) => Effect.Effect<A, E | XE, R | XR> = makePrimitive({
-  op: "OnExit",
-  single: false,
-  [evaluate](fiber: FiberImpl) {
-    fiber._stack.push(this)
-    return this[args][0]
-  },
-  [contAll](fiber) {
-    if (fiber.interruptible && this[args][2] !== true) {
-      fiber._stack.push(setInterruptibleTrue)
-      fiber.interruptible = false
+) => Effect.Effect<A, E | XE, R | XR> = (function() {
+  const Proto = makePrimitiveProto({
+    op: "OnExit",
+    [evaluate](this: any, fiber: FiberImpl) {
+      fiber._stack.push(this)
+      return this.effect
+    },
+    [contAll](this: any, fiber) {
+      if (fiber.interruptible && this.interruptible !== true) {
+        fiber._stack.push(setInterruptibleTrue)
+        fiber.interruptible = false
+      }
+    },
+    [contA](this: any, value, _, exit) {
+      exit ??= exitSucceed(value)
+      const eff = this.onExit(exit)
+      return eff ? flatMap(eff, (_) => exit) : exit
+    },
+    [contE](this: any, cause, _, exit) {
+      exit ??= exitFailCause(cause)
+      const eff = this.onExit(exit)
+      return eff ? flatMap(combineFinalizerCause(exit, eff), (_) => exit) : exit
     }
-  },
-  [contA](value, _, exit) {
-    exit ??= exitSucceed(value)
-    const eff = this[args][1](exit)
-    return eff ? flatMap(eff, (_) => exit) : exit
-  },
-  [contE](cause, _, exit) {
-    exit ??= exitFailCause(cause)
-    const eff = this[args][1](exit)
-    return eff ? flatMap(combineFinalizerCause(exit, eff), (_) => exit) : exit
-  }
-})
+  })
+  const OnExitImpl = function(this: any, effect: any, onExit: any, interruptible: any) {
+    this.effect = effect
+    this.onExit = onExit
+    this.interruptible = interruptible
+  } as unknown as PrimitiveCtor<[effect: any, onExit: any, interruptible: any]>
+  OnExitImpl.prototype = Proto
+  return function(effect: any, onExit: any, interruptible?: boolean) {
+    return new OnExitImpl(effect, onExit, interruptible)
+  } as any
+})()
 
 /** @internal */
 export const onExit: {
@@ -4212,7 +4351,7 @@ export const acquireUseRelease = <Resource, E, R, A, E2, R2, E3, R3>(
   uninterruptibleMask((restore) =>
     flatMap(acquire, (a) =>
       onExitPrimitive(
-        restore(use(a)),
+        suspend(() => restore(use(a))),
         (exit) => release(a, exit),
         true
       ))
@@ -4233,20 +4372,27 @@ export const acquireDisposable = <A extends AsyncDisposable | Disposable, E, R>(
 
 /** @internal */
 export const cachedInvalidateWithTTL: {
+  <A, E>(timeToLive: (exit: Exit.Exit<A, E>) => Duration.Input): <R>(
+    self: Effect.Effect<A, E, R>
+  ) => Effect.Effect<[Effect.Effect<A, E, R>, Effect.Effect<void>]>
   (timeToLive: Duration.Input): <A, E, R>(
     self: Effect.Effect<A, E, R>
   ) => Effect.Effect<[Effect.Effect<A, E, R>, Effect.Effect<void>]>
+  <A, E>(timeToLive: Duration.Input | ((exit: Exit.Exit<A, E>) => Duration.Input)): <R>(
+    self: Effect.Effect<A, E, R>
+  ) => Effect.Effect<[Effect.Effect<A, E, R>, Effect.Effect<void>]>
   <A, E, R>(
     self: Effect.Effect<A, E, R>,
-    timeToLive: Duration.Input
+    timeToLive: Duration.Input | ((exit: Exit.Exit<A, E>) => Duration.Input)
   ): Effect.Effect<[Effect.Effect<A, E, R>, Effect.Effect<void>]>
 } = dual(2, <A, E, R>(
   self: Effect.Effect<A, E, R>,
-  ttl: Duration.Input
+  ttl: Duration.Input | ((exit: Exit.Exit<A, E>) => Duration.Input)
 ): Effect.Effect<[Effect.Effect<A, E, R>, Effect.Effect<void>]> =>
   sync(() => {
-    const ttlMillis = Duration.toMillis(Duration.fromInputUnsafe(ttl))
-    const isFinite = Number.isFinite(ttlMillis)
+    const ttlMillis = typeof ttl === "function"
+      ? (exit: Exit.Exit<A, E>) => Duration.toMillis(Duration.fromInputUnsafe(ttl(exit)))
+      : constant(Duration.toMillis(Duration.fromInputUnsafe(ttl)))
     const latch = makeLatchUnsafe(false)
     let expiresAt = 0
     let running = false
@@ -4255,17 +4401,26 @@ export const cachedInvalidateWithTTL: {
     return [
       withFiber((fiber) => {
         const clock = fiber.getRef(ClockRef)
-        const now = isFinite ? clock.currentTimeMillisUnsafe() : 0
+        const now = expiresAt === Infinity ? 0 : clock.currentTimeMillisUnsafe()
         if (running || now < expiresAt) return exit ?? wait
         running = true
         latch.closeUnsafe()
         exit = undefined
         return onExit(self, (exit_) =>
           sync(() => {
-            running = false
-            expiresAt = clock.currentTimeMillisUnsafe() + ttlMillis
-            exit = exit_
-            latch.openUnsafe()
+            try {
+              const duration = ttlMillis(exit_)
+              expiresAt = clock.currentTimeMillisUnsafe() + duration
+              exit = exit_
+            } catch (error) {
+              const cause = causeDie(error)
+              // Publish the same combined cause that onExit returns to the owner.
+              exit = exitFailCause(exitIsFailure(exit_) ? causeCombine(exit_.cause, cause) : cause)
+              throw error
+            } finally {
+              running = false
+              latch.openUnsafe()
+            }
           }))
       }),
       sync(() => {
@@ -4278,24 +4433,45 @@ export const cachedInvalidateWithTTL: {
 
 /** @internal */
 export const cachedWithTTL: {
+  <A, E>(
+    timeToLive: (exit: Exit.Exit<A, E>) => Duration.Input
+  ): <R>(self: Effect.Effect<A, E, R>) => Effect.Effect<Effect.Effect<A, E, R>>
   (
     timeToLive: Duration.Input
   ): <A, E, R>(self: Effect.Effect<A, E, R>) => Effect.Effect<Effect.Effect<A, E, R>>
+  <A, E>(
+    timeToLive: Duration.Input | ((exit: Exit.Exit<A, E>) => Duration.Input)
+  ): <R>(self: Effect.Effect<A, E, R>) => Effect.Effect<Effect.Effect<A, E, R>>
   <A, E, R>(
     self: Effect.Effect<A, E, R>,
-    timeToLive: Duration.Input
+    timeToLive: Duration.Input | ((exit: Exit.Exit<A, E>) => Duration.Input)
   ): Effect.Effect<Effect.Effect<A, E, R>>
 } = dual(
   2,
   <A, E, R>(
     self: Effect.Effect<A, E, R>,
-    timeToLive: Duration.Input
+    timeToLive: Duration.Input | ((exit: Exit.Exit<A, E>) => Duration.Input)
   ): Effect.Effect<Effect.Effect<A, E, R>> => map(cachedInvalidateWithTTL(self, timeToLive), (tuple) => tuple[0])
 )
 
 /** @internal */
 export const cached = <A, E, R>(self: Effect.Effect<A, E, R>): Effect.Effect<Effect.Effect<A, E, R>> =>
-  cachedWithTTL(self, Duration.infinity)
+  sync(() => {
+    const latch = makeLatchUnsafe(false)
+    let started = false
+    let exit: Exit.Exit<A, E> | undefined
+    const wait = flatMap(latch.await, () => exit!)
+    return suspend(() => {
+      if (exit !== undefined) return exit
+      if (started) return wait
+      started = true
+      return onExit(self, (result) =>
+        sync(() => {
+          exit = result
+          latch.openUnsafe()
+        }))
+    })
+  })
 
 // ----------------------------------------------------------------------------
 // interruption
@@ -4333,6 +4509,34 @@ const setFiberInterruptible = (fiber: FiberImpl): Effect.Effect<never> | undefin
   if (fiber._interruptedCause) return failCause(fiber._interruptedCause)
 }
 
+/**
+ * Makes the current fiber uninterruptible for the returned effect without an
+ * extra primitive. Call only within `withFiber`.
+ *
+ * @internal
+ */
+export const fiberEnterUninterruptibleUnsafe = (fiber: Fiber.Fiber<unknown, unknown>): void => {
+  const impl = fiber as FiberImpl
+  if (!impl.interruptible) return
+  impl.interruptible = false
+  impl._stack.push(setInterruptibleTrue)
+}
+
+/**
+ * Makes the current fiber interruptible for the returned effect without an
+ * extra primitive. Call only within `withFiber` and return any pending
+ * interruption it produces.
+ *
+ * @internal
+ */
+export const fiberEnterInterruptibleUnsafe = (
+  fiber: Fiber.Fiber<unknown, unknown>
+): Effect.Effect<never> | undefined => {
+  const impl = fiber as FiberImpl
+  if (impl.interruptible) return undefined
+  return setFiberInterruptible(impl)
+}
+
 /** @internal */
 export const interruptible = <A, E, R>(
   self: Effect.Effect<A, E, R>
@@ -4678,10 +4882,7 @@ export const forEach: {
   }
 ): Effect.Effect<any, E, R> =>
   suspend(() => {
-    const concurrencyOption = options?.concurrency ?? 1
-    const concurrency = concurrencyOption === "unbounded"
-      ? Number.POSITIVE_INFINITY
-      : Math.max(1, concurrencyOption)
+    const concurrency = resolveConcurrency(options?.concurrency)
 
     if (concurrency === 1) {
       return forEachSequential(iterable, f, options)
@@ -4734,19 +4935,22 @@ const forEachSequential = <A, B, E, R>(
     )
   })
 
-type IterateEagerOptions = {
-  readonly concurrency?: number | undefined
-  readonly end?: number | undefined
-  readonly orderedStep?: boolean | undefined
-}
+/** @internal */
+export const resolveConcurrency = (concurrency: Concurrency | undefined): number =>
+  concurrency === "unbounded" ? Number.POSITIVE_INFINITY : Math.max(1, concurrency ?? 1)
 
-const iterateEagerImpl = <S, A, X, E, R, E2>(options: {
+type IterateOptions<S, A, X, E, R, E2> = {
   readonly onItem: (state: S, item: A, index: number) => Effect.Effect<X, E, R>
   readonly step: (state: NoInfer<S>, item: A, exit: Exit.Exit<X, E>, index: number) => Exit.Exit<void, E2> | void
-}): (
+}
+
+/** @internal */
+export const iterateEager = <S, A>() =>
+<X, E, R, E2>(options: IterateOptions<S, A, X, E, R, E2>): (
   initialState: S,
   items: ReadonlyArray<A>,
-  options?: IterateEagerOptions
+  start?: number,
+  end?: number
 ) => Effect.Effect<void, E | E2, R> | undefined => {
   const onItem = options.onItem
   const step = options.step
@@ -4754,8 +4958,8 @@ const iterateEagerImpl = <S, A, X, E, R, E2>(options: {
   const runSequential = (
     state: S,
     items: ReadonlyArray<A>,
-    index: number,
-    end: number
+    index = 0,
+    end = items.length
   ): Effect.Effect<void, E | E2, R> | undefined => {
     for (; index < end; index++) {
       const item = items[index]
@@ -4771,18 +4975,20 @@ const iterateEagerImpl = <S, A, X, E, R, E2>(options: {
     }
   }
 
+  return runSequential
+}
+
+const iterateConcurrentImpl = <S, A, X, E, R, E2>(options: IterateOptions<S, A, X, E, R, E2>) => {
+  const onItem = options.onItem
+  const step = options.step
   return (
     state: S,
     items: ReadonlyArray<A>,
-    opts: IterateEagerOptions | undefined
+    opts: { readonly concurrency: number; readonly end?: number | undefined }
   ): Effect.Effect<void, E | E2, R> | undefined => {
     let index = 0
-    const end = opts?.end ?? items.length
-    const concurrency = opts?.concurrency ?? 1
-    if (concurrency === 1) {
-      return runSequential(state, items, 0, end)
-    }
-    const orderedStep = opts?.orderedStep === true
+    const end = opts.end ?? items.length
+    const concurrency = opts.concurrency
     let done = false
     let parentFiber: Fiber.Fiber<any, any> | undefined
     let fibers: Set<Fiber.Fiber<any, any>> | undefined
@@ -4790,8 +4996,6 @@ const iterateEagerImpl = <S, A, X, E, R, E2>(options: {
     let interrupted = false
     let terminal: Exit.Exit<void, E | E2> | void
     let effect: Effect.Effect<X, E, R> | undefined
-    let nextIndex = index
-    const exits: Array<Exit.Exit<X, E> | undefined> | undefined = orderedStep ? new Array(end) : undefined
 
     const failDefect = (error: unknown): Effect.Effect<void, E | E2, R> => {
       const defect = exitDie(error)
@@ -4803,20 +5007,6 @@ const iterateEagerImpl = <S, A, X, E, R, E2>(options: {
         : defect
     }
 
-    const runStep = (item: A, exit: Exit.Exit<X, E>, currentIndex: number): Exit.Exit<void, E | E2> | void => {
-      if (!orderedStep) return step(state, item, exit, currentIndex)
-      if (terminal) return terminal
-      exits![currentIndex] = exit
-      while (nextIndex < end) {
-        const nextExit = exits![nextIndex]
-        if (nextExit === undefined) return
-        exits![nextIndex] = undefined
-        const index = nextIndex++
-        const result = step(state, items[index], nextExit, index)
-        if (result) return result
-      }
-    }
-
     const go = (): Effect.Effect<void, E | E2, R> | undefined => {
       let paused = false
       for (; !terminal && index < end; index++) {
@@ -4825,7 +5015,7 @@ const iterateEagerImpl = <S, A, X, E, R, E2>(options: {
 
         // fast case (already an exit)
         if (effectIsExit(eff)) {
-          terminal = runStep(item, eff, index)
+          terminal = step(state, item, eff, index)
           if (terminal) break
 
           // We have an effect, so enter "async" mode
@@ -4856,7 +5046,7 @@ const iterateEagerImpl = <S, A, X, E, R, E2>(options: {
 
           const fiber = forkUnsafe(parentFiber, eff, true, true, "inherit")
           if (fiber._exit) {
-            terminal = runStep(item, fiber._exit, index)
+            terminal = step(state, item, fiber._exit, index)
             if (terminal) break
             continue
           }
@@ -4880,7 +5070,7 @@ const iterateEagerImpl = <S, A, X, E, R, E2>(options: {
                   }
                 }
               } else {
-                const result = runStep(item, exit, currentIndex)
+                const result = step(state, item, exit, currentIndex)
                 if (result) {
                   terminal = result._tag === "Failure"
                     ? exitFailCause(causeFromReasons(result.cause.reasons.slice()))
@@ -4933,16 +5123,10 @@ const iterateEagerImpl = <S, A, X, E, R, E2>(options: {
 }
 
 /** @internal */
-export const iterateEager = <S, A>(): <X, E, R, E2>(options: {
-  readonly onItem: (state: S, item: A, index: number) => Effect.Effect<X, E, R>
-  readonly step: (state: NoInfer<S>, item: A, exit: Exit.Exit<X, E>, index: number) => Exit.Exit<void, E2> | void
-}) => (
-  initialState: S,
-  items: ReadonlyArray<A>,
-  options?: IterateEagerOptions
-) => Effect.Effect<void, E | E2, R> | undefined => iterateEagerImpl
+export const iterateConcurrent = <S, A>() => <X, E, R, E2>(options: IterateOptions<S, A, X, E, R, E2>) =>
+  iterateConcurrentImpl<S, A, X, E, R, E2>(options)
 
-const forEachConcurrent = iterateEagerImpl({
+const forEachConcurrent = iterateConcurrentImpl({
   onItem(
     state: {
       readonly f: (a: any, i: number) => Effect.Effect<any, any, any>
@@ -4961,7 +5145,7 @@ const forEachConcurrent = iterateEagerImpl({
   }
 })
 
-/* @internal */
+/** @internal */
 export const filterOrElse: {
   <A, C, E2, R2, B extends A>(
     refinement: Predicate.Refinement<NoInfer<A>, B>,
@@ -5017,7 +5201,7 @@ export const filterMapOrElse: {
     }
   ))
 
-/* @internal */
+/** @internal */
 export const filterMapOrFail: {
   <A, B, X, E2>(
     filter: Filter.Filter<NoInfer<A>, B, X>,
@@ -5284,7 +5468,7 @@ export const forkUnsafe = <FA, FE, A, E, R>(
   }
   if (!daemon && !child._exit) {
     parentRuntime.children().add(child)
-    child.addObserver(() => parentRuntime._children!.delete(child))
+    child._parent = parentRuntime
   }
   return child
 }
@@ -5739,7 +5923,7 @@ export const makeSpanUnsafe = <XA, XE>(
     ? Option.some(options.parent)
     : options?.root
     ? Option.none<Tracer.AnySpan>()
-    : filterDisablePropagation(fiber.currentSpan)
+    : filterDisablePropagation(fiber.cache.span)
 
   let span: Tracer.Span
 
@@ -5772,7 +5956,7 @@ export const makeSpanUnsafe = <XA, XE>(
       parent,
       annotations: options?.annotations ?? Context.empty(),
       links,
-      startTime: timingEnabled ? clock.currentTimeNanosUnsafe() : BigInt(0),
+      startTime: timingEnabled ? clock.currentTimeNanosUnsafe() : bigint0,
       kind: options?.kind ?? "internal",
       root: options?.root ?? Option.isNone(parent),
       sampled: options?.sampled ??
@@ -5916,7 +6100,10 @@ export const useSpan: {
     const span = makeSpanUnsafe(fiber, name, options)
     const clock = fiber.getRef(ClockRef)
     const timingEnabled = fiber.getRef(TracerTimingEnabled)
-    return onExit(internalCall(() => evaluate(span)), (exit) => endSpan(span, exit, clock, timingEnabled))
+    return onExit(
+      suspend(() => internalCall(() => evaluate(span))),
+      (exit) => endSpan(span, exit, clock, timingEnabled)
+    )
   })
 }
 
@@ -6226,7 +6413,7 @@ export class UnknownError extends TaggedError("UnknownError")<{
 
 /** @internal */
 export const ConsoleRef = Context.Reference<Console.Console>(
-  "effect/Console/CurrentConsole",
+  "effect/Console",
   { defaultValue: (): Console.Console => globalThis.console }
 )
 
@@ -6269,7 +6456,7 @@ export const isLogLevelGreaterThan = Order.isGreaterThan(LogLevelOrder)
 /** @internal */
 export const CurrentLoggers = Context.Reference<
   ReadonlySet<Logger.Logger<unknown, any>>
->("effect/Loggers/CurrentLoggers", {
+>("effect/Logger/CurrentLoggers", {
   defaultValue: () => new Set([defaultLogger, tracerLogger])
 })
 
@@ -6299,7 +6486,7 @@ export const annotateLogsScoped: {
       const next = { ...current }
       for (let i = 0; i < entries.length; i++) {
         const [key, value] = entries[i]
-        if (current[key] !== value) continue
+        if (current[key] !== value && !Object.is(current[key], value)) continue
         if (Object.hasOwn(prev, key)) {
           InternalRecord.assignProperty(next, key, prev[key])
         } else {
@@ -6387,8 +6574,8 @@ export const logWithLevel = (level?: LogLevel.Severity) =>
     cause = causeEmpty
   }
   return withFiber((fiber) => {
-    const logLevel = level ?? fiber.currentLogLevel
-    if (isLogLevelGreaterThan(fiber.minimumLogLevel, logLevel)) {
+    const logLevel = level ?? fiber.cache.logLevel
+    if (isLogLevelGreaterThan(fiber.cache.minimumLogLevel, logLevel)) {
       return void_
     }
     const clock = fiber.getRef(ClockRef)
@@ -6464,29 +6651,36 @@ export const consolePretty = (options?: {
 }) => {
   // evaluated lazily so the module-level bundle stays free of `process`
   // property accesses, which bundlers must retain as possible side effects
-  const process = (globalThis as {
-    readonly process?: { readonly stdout?: { readonly isTTY?: boolean } }
-  }).process
+  const process = (globalThis as { readonly process?: { readonly stdout?: unknown } }).process
   const hasProcessStdout = typeof process?.stdout === "object" && process.stdout !== null
-  const processStdoutIsTTY = hasProcessStdout &&
-    process.stdout.isTTY === true
-  const hasProcessStdoutOrDeno = hasProcessStdout || "Deno" in globalThis
-  const mode_ = options?.mode ?? "auto"
-  const mode = mode_ === "auto" ? (hasProcessStdoutOrDeno ? "tty" : "browser") : mode_
-  const isBrowser = mode === "browser"
-  const showColors = typeof options?.colors === "boolean" ? options.colors : processStdoutIsTTY || isBrowser
-  const formatDate = options?.formatDate ?? defaultDateFormat
-  return isBrowser
-    ? prettyLoggerBrowser({ colors: showColors, formatDate })
-    : prettyLoggerTty({ colors: showColors, formatDate })
+  const isDeno = "Deno" in globalThis
+  const mode = options?.mode ?? "auto"
+  const isTtyLogger = mode === "auto" ? hasProcessStdout || isDeno : mode === "tty"
+
+  return isTtyLogger ? prettyLoggerTty(options) : prettyLoggerBrowser(options)
 }
 
-const prettyLoggerTty = (options: {
-  readonly colors: boolean
-  readonly formatDate: (date: Date) => string
+/** @internal */
+export const prettyLoggerTty = (options?: {
+  readonly colors?: "auto" | boolean | undefined
+  readonly formatDate?: ((date: Date) => string) | undefined
 }) => {
-  const processIsBun = (globalThis as { readonly process?: { readonly isBun?: boolean } }).process?.isBun === true
-  const color = options.colors ? withColor : withColorNoop
+  const formatDate = options?.formatDate ?? defaultDateFormat
+  // evaluated lazily so the module-level bundle stays free of `process`
+  // property accesses, which bundlers must retain as possible side effects
+  const process = (globalThis as {
+    readonly process?: {
+      readonly stdout?: { readonly isTTY?: unknown }
+      readonly isBun?: boolean
+    }
+  }).process
+
+  const hasProcessStdout = typeof process?.stdout === "object" && process.stdout !== null
+  const processStdoutIsTTY = hasProcessStdout && process.stdout.isTTY === true
+  const showColors = typeof options?.colors === "boolean" ? options.colors : processStdoutIsTTY
+  const color = showColors ? withColor : withColorNoop
+
+  const processIsBun = process?.isBun === true
   return loggerMake<unknown, void>(
     ({ cause, date, fiber, logLevel, message: message_ }) => {
       const console = fiber.getRef(ConsoleRef)
@@ -6495,7 +6689,7 @@ const prettyLoggerTty = (options: {
 
       const message = Array.isArray(message_) ? message_.slice() : [message_]
 
-      let firstLine = color(`[${options.formatDate(date)}]`, colors.white)
+      let firstLine = color(`[${formatDate(date)}]`, colors.white)
         + ` ${color(logLevel.toUpperCase(), ...logLevelColors[logLevel])}`
         + ` (#${fiber.id})`
 
@@ -6540,24 +6734,27 @@ const prettyLoggerTty = (options: {
   )
 }
 
-const prettyLoggerBrowser = (options: {
-  readonly colors: boolean
-  readonly formatDate: (date: Date) => string
+/** @internal */
+export const prettyLoggerBrowser = (options?: {
+  readonly colors?: "auto" | boolean | undefined
+  readonly formatDate?: ((date: Date) => string) | undefined
 }) => {
-  const color = options.colors ? "%c" : ""
+  const showColors = options?.colors !== false
+  const color = showColors ? "%c" : ""
+  const formatDate = options?.formatDate ?? defaultDateFormat
   return loggerMake<unknown, void>(
     ({ cause, date, fiber, logLevel, message: message_ }) => {
       const console = fiber.getRef(ConsoleRef)
 
       const message = Array.isArray(message_) ? message_.slice() : [message_]
 
-      let firstLine = `${color}[${options.formatDate(date)}]`
+      let firstLine = `${color}[${formatDate(date)}]`
       const firstParams = []
-      if (options.colors) {
+      if (showColors) {
         firstParams.push("color:gray")
       }
       firstLine += ` ${color}${logLevel.toUpperCase()}${color} (#${fiber.id})`
-      if (options.colors) {
+      if (showColors) {
         firstParams.push(logLevelStyle[logLevel], "")
       }
 
@@ -6574,7 +6771,7 @@ const prettyLoggerBrowser = (options: {
         const firstMaybeString = structuredMessage(message[0])
         if (typeof firstMaybeString === "string") {
           firstLine += ` ${color}${firstMaybeString}`
-          if (options.colors) {
+          if (showColors) {
             firstParams.push("color:deepskyblue")
           }
           messageIndex++
@@ -6599,7 +6796,7 @@ const prettyLoggerBrowser = (options: {
       const annotations = fiber.getRef(CurrentLogAnnotations)
       for (const [key, value] of Object.entries(annotations)) {
         const redacted = redact(value)
-        if (options.colors) {
+        if (showColors) {
           // oxlint-disable-next-line no-console
           console.log(`%c${key}:`, "color:gray", redacted)
         } else {
@@ -6640,7 +6837,7 @@ export const defaultLogger = loggerMake<unknown, void>(({ cause, date, fiber, lo
 export const tracerLogger = loggerMake<unknown, void>(({ cause, fiber, logLevel, message }) => {
   const clock = fiber.getRef(ClockRef)
   const annotations = fiber.getRef(CurrentLogAnnotations)
-  const span = fiber.currentSpan
+  const span = fiber.cache.span
   if (span === undefined || span._tag === "ExternalSpan") return
   const attributes: Record<string, unknown> = {}
   for (const [key, value] of Object.entries(annotations)) {
@@ -6685,7 +6882,7 @@ export const withErrorReporting: <
   options?: {
     readonly defectsOnly?: boolean | undefined
   } | undefined
-) => [Arg] extends [Effect.Effect<infer _A, infer _E, infer _R>] ? Arg
+) => [Arg] extends [Effect.Effect<infer A, infer E, infer R>] ? Effect.Effect<A, E, R>
   : <A, E, R>(self: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R> = dual(
     (args) => isEffect(args[0]),
     <A, E, R>(
diff --git a/repos/effect/packages/effect/src/internal/graph.ts b/repos/effect/packages/effect/src/internal/graph.ts
index da85e1602..2385b8b70 100644
--- a/repos/effect/packages/effect/src/internal/graph.ts
+++ b/repos/effect/packages/effect/src/internal/graph.ts
@@ -9,6 +9,11 @@ import { hasProperty } from "../Predicate.ts"
 /** @internal */
 export const TypeId = "~effect/Graph"
 
+/** @internal */
+export const isGraph = <N = unknown, E = unknown, T extends Graph.Kind = Graph.Kind, U = never>(
+  u: U | Graph.Graph<N, E, T> | Graph.MutableGraph<N, E, T>
+): u is Graph.Graph<N, E, T> | Graph.MutableGraph<N, E, T> => hasProperty(u, TypeId)
+
 /** @internal */
 export interface GraphImpl<in out N, in out E, T extends Graph.Kind>
   extends Iterable<readonly [Graph.NodeIndex, N]>, Equal.Equal
diff --git a/repos/effect/packages/effect/src/internal/hashMap.ts b/repos/effect/packages/effect/src/internal/hashMap.ts
index b8cf8870f..651982e37 100644
--- a/repos/effect/packages/effect/src/internal/hashMap.ts
+++ b/repos/effect/packages/effect/src/internal/hashMap.ts
@@ -410,8 +410,10 @@ class CollisionNode<K, V> extends Node<K, V> {
     return new CollisionNode(edit, this.hash, newEntries)
   }
 
-  iterator(): Iterator<[K, V]> {
-    return this.entries[Symbol.iterator]()
+  *iterator(): Iterator<[K, V]> {
+    for (const [key, value] of this.entries) {
+      yield [key, value]
+    }
   }
 
   [Symbol.iterator](): Iterator<[K, V]> {
diff --git a/repos/effect/packages/effect/src/internal/metric.ts b/repos/effect/packages/effect/src/internal/metric.ts
index e00c79fde..62b6990df 100644
--- a/repos/effect/packages/effect/src/internal/metric.ts
+++ b/repos/effect/packages/effect/src/internal/metric.ts
@@ -1,2 +1,2 @@
 /** @internal */
-export const FiberRuntimeMetricsKey = "effect/observability/Metric/FiberRuntimeMetricsKey"
+export const FiberRuntimeMetricsKey = "effect/Metric/FiberRuntimeMetrics"
diff --git a/repos/effect/packages/effect/src/internal/option.ts b/repos/effect/packages/effect/src/internal/option.ts
index b8b64aa0c..058e36ec6 100644
--- a/repos/effect/packages/effect/src/internal/option.ts
+++ b/repos/effect/packages/effect/src/internal/option.ts
@@ -91,8 +91,10 @@ export const isSome = <A>(fa: Option.Option<A>): fa is Option.Some<A> => fa._tag
 export const none: Option.Option<never> = Object.create(NoneProto)
 
 /** @internal */
-export const some = <A>(value: A): Option.Option<A> => {
-  const a = Object.create(SomeProto)
-  a.value = value
-  return a
-}
+const SomeImpl = function(this: any, value: unknown) {
+  this.value = value
+} as unknown as { new<A>(value: A): Option.Option<A>; prototype: any }
+SomeImpl.prototype = SomeProto
+
+/** @internal */
+export const some = <A>(value: A): Option.Option<A> => new SomeImpl(value)
diff --git a/repos/effect/packages/effect/src/internal/random.ts b/repos/effect/packages/effect/src/internal/random.ts
index 8ce753a5b..4da2f5195 100644
--- a/repos/effect/packages/effect/src/internal/random.ts
+++ b/repos/effect/packages/effect/src/internal/random.ts
@@ -1,13 +1,8 @@
 import * as Context from "../Context.ts"
+import type { Random as RandomService } from "../Random.ts"
 
 /** @internal */
-export interface Random {
-  nextIntUnsafe(): number
-  nextDoubleUnsafe(): number
-}
-
-/** @internal */
-export const Random: Context.Reference<Random> = Context.Reference<Random>("effect/Random", {
+export const Random: Context.Reference<RandomService> = Context.Reference<RandomService>("effect/Random", {
   defaultValue: () => ({
     nextIntUnsafe() {
       return Math.floor(Math.random() * (Number.MAX_SAFE_INTEGER - Number.MIN_SAFE_INTEGER + 1)) +
@@ -18,3 +13,21 @@ export const Random: Context.Reference<Random> = Context.Reference<Random>("effe
     }
   })
 })
+
+/** @internal */
+export const nextBetween = (min: number, max: number, draw: number): number => {
+  const value = draw * (max - min) + min
+  if (value !== max || min >= max || !Number.isFinite(max)) {
+    return value
+  }
+  // Rounding can reach the excluded endpoint even for a draw below 1.
+  // Return its immediate predecessor, which is at least min for finite min < max.
+  if (max === 0) {
+    return -Number.MIN_VALUE
+  }
+  const view = new DataView(new ArrayBuffer(8))
+  view.setFloat64(0, max)
+  const bits = view.getBigUint64(0)
+  view.setBigUint64(0, max > 0 ? bits - BigInt(1) : bits + BigInt(1))
+  return view.getFloat64(0)
+}
diff --git a/repos/effect/packages/effect/src/internal/rcRef.ts b/repos/effect/packages/effect/src/internal/rcRef.ts
index 56245e27d..f6c24037f 100644
--- a/repos/effect/packages/effect/src/internal/rcRef.ts
+++ b/repos/effect/packages/effect/src/internal/rcRef.ts
@@ -79,7 +79,9 @@ export const make = <A, E, R>(options: {
       options.acquire as Effect.Effect<A, E>,
       context,
       scope,
-      options.idleTimeToLive ? Duration.fromInputUnsafe(options.idleTimeToLive) : undefined
+      options.idleTimeToLive !== undefined
+        ? Duration.fromInputUnsafe(options.idleTimeToLive)
+        : undefined
     )
     return Effect.as(
       Scope.addFinalizerExit(scope, () => {
@@ -116,7 +118,10 @@ const getState = <A, E>(self: RcRefImpl<A, E>) =>
               self.acquire as Effect.Effect<A, E>,
               Context.add(self.context, Scope.Scope, scope)
             )).pipe(
-              Effect.map((value) => {
+              Effect.flatMap((value) => {
+                if (self.state._tag === "Closed") {
+                  return Effect.interrupt
+                }
                 const state: State.Acquired<A> = {
                   _tag: "Acquired",
                   value,
@@ -126,7 +131,7 @@ const getState = <A, E>(self: RcRefImpl<A, E>) =>
                   invalidated: false
                 }
                 self.state = state
-                return state
+                return Effect.succeed(state)
               }),
               Effect.onExit((exit) => Exit.isFailure(exit) ? Scope.close(scope, exit) : Effect.void)
             )
@@ -149,17 +154,17 @@ export const get = Effect.fnUntraced(function*<A, E>(
     if (state.refCount > 0) {
       return Effect.void
     }
-    if (self.idleTimeToLive === undefined) {
-      self.state = stateEmpty
-      return Scope.close(state.scope, Exit.void)
-    } else if (state.invalidated) {
+    if (self.idleTimeToLive === undefined || state.invalidated) {
+      if (self.state === state) {
+        self.state = stateEmpty
+      }
       return Scope.close(state.scope, Exit.void)
     } else if (!isFinite) {
       return Effect.void
     }
     state.fiber = Effect.sleep(self.idleTimeToLive).pipe(
       Effect.flatMap(() => {
-        if (self.state._tag === "Acquired" && self.state.refCount === 0) {
+        if (self.state === state && state.refCount === 0) {
           self.state = stateEmpty
           return Scope.close(state.scope, Exit.void)
         }
diff --git a/repos/effect/packages/effect/src/internal/references.ts b/repos/effect/packages/effect/src/internal/references.ts
index 6cb160019..26df6f346 100644
--- a/repos/effect/packages/effect/src/internal/references.ts
+++ b/repos/effect/packages/effect/src/internal/references.ts
@@ -20,6 +20,7 @@ export const CurrentStackFrame = Context.Reference<StackFrame | undefined>("effe
 
 /** @internal */
 export const TracerEnabled = Context.Reference<boolean>("effect/References/TracerEnabled", {
+  fiberCached: true,
   defaultValue: constTrue
 })
 
diff --git a/repos/effect/packages/effect/src/internal/request.ts b/repos/effect/packages/effect/src/internal/request.ts
index 7eb1662b4..bd3874f22 100644
--- a/repos/effect/packages/effect/src/internal/request.ts
+++ b/repos/effect/packages/effect/src/internal/request.ts
@@ -62,7 +62,7 @@ export const requestUnsafe = <A extends Request.Any>(
 ): () => void => {
   const entry = addEntry(options.resolver, self, options.onExit, {
     context: options.context,
-    currentScheduler: Context.get(options.context, Scheduler)
+    cache: { scheduler: Context.get(options.context, Scheduler) }
   })
   return () => removeEntryUnsafe(options.resolver, entry)
 }
@@ -87,7 +87,7 @@ const addEntry = <A extends Request.Any>(
   resume: (exit: Exit<any, any>) => void,
   fiber: {
     readonly context: Context.Context<never>
-    readonly currentScheduler: Scheduler
+    readonly cache: { readonly scheduler: Scheduler }
     readonly id?: number
   }
 ) => {
@@ -105,8 +105,9 @@ const addEntry = <A extends Request.Any>(
     completeUnsafe(effect) {
       if (completed) return
       completed = true
+      // Removed entries still notify resolver hooks, but not their cancelled callers.
+      if (batch && !batch.entrySet.delete(entry)) return
       resume(effect)
-      batch?.entrySet.delete(entry)
     }
   })
   if (resolver.preCheck !== undefined && !resolver.preCheck(entry)) {
@@ -161,7 +162,7 @@ const addEntry = <A extends Request.Any>(
       batch = newBatch
     }
     batchMap.set(key, batch)
-    batch.fiber = effect.runForkWith(fiber.context)(batch.delayEffect, { scheduler: fiber.currentScheduler })
+    batch.fiber = effect.runForkWith(fiber.context)(batch.delayEffect, { scheduler: fiber.cache.scheduler })
   }
 
   batch.entrySet.add(entry)
@@ -169,7 +170,7 @@ const addEntry = <A extends Request.Any>(
   if (batch.resolver.collectWhile(batch.entries)) return entry
 
   batch.fiber!.interruptUnsafe(fiber.id)
-  batch.fiber = effect.runForkWith(fiber.context)(runBatch(batch), { scheduler: fiber.currentScheduler })
+  batch.fiber = effect.runForkWith(fiber.context)(runBatch(batch), { scheduler: fiber.cache.scheduler })
   return entry
 }
 
@@ -184,13 +185,17 @@ const removeEntryUnsafe = <A extends Request.Any>(
   const batch = batchMap.get(key)
   if (!batch) return
 
-  batch.entries.delete(entry)
+  if (!batch.entries.delete(entry)) return
   batch.entrySet.delete(entry)
 
+  let fiber: Fiber<void, unknown> | undefined
   if (batch.entries.size === 0) {
     batchMap.delete(key)
-    batch.fiber?.interruptUnsafe()
+    fiber = batch.fiber
   }
+  // Delay finalizers may enqueue new requests, so complete the removed entry first.
+  entry.completeUnsafe(effect.exitInterrupt())
+  fiber?.interruptUnsafe()
 }
 
 const maybeRemoveEntry = <A extends Request.Any>(
diff --git a/repos/effect/packages/effect/src/internal/result.ts b/repos/effect/packages/effect/src/internal/result.ts
index a3ba1e798..72a0c4eff 100644
--- a/repos/effect/packages/effect/src/internal/result.ts
+++ b/repos/effect/packages/effect/src/internal/result.ts
@@ -80,18 +80,22 @@ export const isSuccess = <A, E>(result: Result.Result<A, E>): result is Result.S
   result._tag === "Success"
 
 /** @internal */
-export const fail = <E>(failure: E): Result.Result<never, E> => {
-  const a = Object.create(FailureProto)
-  a.failure = failure
-  return a
-}
+const FailureImpl = function(this: any, failure: unknown) {
+  this.failure = failure
+} as unknown as { new<E>(failure: E): Result.Result<never, E>; prototype: any }
+FailureImpl.prototype = FailureProto
 
 /** @internal */
-export const succeed = <A>(success: A): Result.Result<A> => {
-  const a = Object.create(SuccessProto)
-  a.success = success
-  return a
-}
+export const fail = <E>(failure: E): Result.Result<never, E> => new FailureImpl(failure)
+
+/** @internal */
+const SuccessImpl = function(this: any, success: unknown) {
+  this.success = success
+} as unknown as { new<A>(success: A): Result.Result<A>; prototype: any }
+SuccessImpl.prototype = SuccessProto
+
+/** @internal */
+export const succeed = <A>(success: A): Result.Result<A> => new SuccessImpl(success)
 
 /** @internal */
 export const getFailure = <A, E>(self: Result.Result<A, E>): Option<E> =>
diff --git a/repos/effect/packages/effect/src/internal/schema/codegen.ts b/repos/effect/packages/effect/src/internal/schema/codegen.ts
new file mode 100644
index 000000000..bb51af4c1
--- /dev/null
+++ b/repos/effect/packages/effect/src/internal/schema/codegen.ts
@@ -0,0 +1,922 @@
+import * as SchemaAST from "../../SchemaAST.ts"
+import type { CompiledDecoder } from "../../unstable/schema/SchemaCompiler.ts"
+import type { runtime } from "../../unstable/schema/SchemaCompiler/runtime.ts"
+
+const getEncodingChecks = (ast: SchemaAST.AST): SchemaAST.Checks | undefined =>
+  "encodingChecks" in ast ? ast.encodingChecks : undefined
+const getExpectedKeys = (ast: SchemaAST.Objects): ReadonlyArray<PropertyKey> =>
+  ast.propertySignatures.map((p) => typeof p.name === "number" ? String(p.name) : p.name)
+
+const isOptional = (ast: SchemaAST.AST): boolean => ast.context?.isOptional ?? false
+
+const maxGeneratedDepth = 256
+/** @internal */
+export const maxGeneratedNodes = 2048
+
+type Emission = "unsupported" | "decode" | "is"
+type Operation = "decode" | "is"
+
+const failureExpression = (operation: Operation): string => operation === "decode" ? "I" : "false"
+
+/** @internal */
+const getEmission = (
+  ast: SchemaAST.AST,
+  depth = 0,
+  local = false,
+  budget = { remaining: maxGeneratedNodes }
+): Emission => {
+  // Count occurrences, not distinct ASTs: shared subgraphs are expanded by the emitter.
+  if (--budget.remaining < 0 || depth > maxGeneratedDepth || !local && ast.encoding !== undefined) return "unsupported"
+  switch (ast._tag) {
+    case "Null":
+    case "Undefined":
+    case "Void":
+    case "Never":
+    case "Any":
+    case "Unknown":
+    case "ObjectKeyword":
+    case "Enum":
+    case "UniqueSymbol":
+    case "Literal":
+    case "String":
+    case "Number":
+    case "Boolean":
+    case "Symbol":
+    case "BigInt":
+      return "is"
+    case "TemplateLiteral": {
+      for (const part of ast.parts) {
+        if (getEmission(part, depth + 1, false, budget) === "unsupported") return "unsupported"
+      }
+      return "is"
+    }
+    case "Arrays": {
+      let isOutputFree = ast.checks === undefined
+      for (const element of ast.elements) {
+        const emission = getEmission(element, depth + 1, false, budget)
+        if (emission === "unsupported") return "unsupported"
+        if (emission === "decode") isOutputFree = false
+      }
+      for (const element of ast.rest) {
+        const emission = getEmission(element, depth + 1, false, budget)
+        if (emission === "unsupported") return "unsupported"
+        if (emission === "decode") isOutputFree = false
+      }
+      return isOutputFree ? "is" : "decode"
+    }
+    case "Objects": {
+      let isOutputFree = ast.checks === undefined
+      for (const property of ast.propertySignatures) {
+        const emission = getEmission(property.type, depth + 1, false, budget)
+        if (emission === "unsupported") return "unsupported"
+        if (emission === "decode") isOutputFree = false
+      }
+      for (const signature of ast.indexSignatures) {
+        const key = getEmission(SchemaAST.parameterFromPropertyKey(signature.parameter), depth + 1, false, budget)
+        const value = getEmission(signature.type, depth + 1, false, budget)
+        if (key === "unsupported" || value === "unsupported") return "unsupported"
+        if (key === "decode" || value === "decode") isOutputFree = false
+      }
+      return isOutputFree ? "is" : "decode"
+    }
+    case "Union": {
+      let isOutputFree = ast.checks === undefined
+      for (const type of ast.types) {
+        const emission = getEmission(type, depth + 1, false, budget)
+        if (emission === "unsupported") return "unsupported"
+        if (emission === "decode") isOutputFree = false
+      }
+      return isOutputFree ? "is" : "decode"
+    }
+    case "Declaration":
+    case "Suspend":
+      return "unsupported"
+  }
+}
+
+const canEmit = (ast: SchemaAST.AST, depth = 0): boolean => getEmission(ast, depth) !== "unsupported"
+
+const isMakeSafe = (
+  ast: SchemaAST.AST,
+  depth = 0,
+  budget = { remaining: maxGeneratedNodes }
+): boolean => {
+  if (
+    --budget.remaining < 0 ||
+    depth > maxGeneratedDepth ||
+    ast.encoding !== undefined ||
+    ast.context?.constructorDefault !== undefined ||
+    SchemaAST.getConstructorDescriptor(ast) !== undefined
+  ) {
+    return false
+  }
+  switch (ast._tag) {
+    case "Null":
+    case "Undefined":
+    case "Void":
+    case "Never":
+    case "Any":
+    case "Unknown":
+    case "ObjectKeyword":
+    case "Enum":
+    case "UniqueSymbol":
+    case "Literal":
+    case "String":
+    case "Number":
+    case "Boolean":
+    case "Symbol":
+    case "BigInt":
+      return true
+    case "TemplateLiteral":
+      return ast.parts.every((part) => isMakeSafe(part, depth + 1, budget))
+    case "Arrays":
+      return ast.elements.every((element) => isMakeSafe(element, depth + 1, budget)) &&
+        ast.rest.every((element) => isMakeSafe(element, depth + 1, budget))
+    case "Objects":
+      return ast.indexSignatures.length === 0 &&
+        ast.propertySignatures.every((property) => isMakeSafe(property.type, depth + 1, budget))
+    case "Union":
+    case "Declaration":
+    case "Suspend":
+      return false
+  }
+}
+
+const shouldCompileMake = (ast: SchemaAST.AST): ast is SchemaAST.Arrays | SchemaAST.Objects =>
+  (ast._tag === "Arrays" && ast.elements.length === 0 && ast.rest.length === 1 ||
+    ast._tag === "Objects" && ast.propertySignatures.length > 0 && ast.indexSignatures.length === 0) &&
+  isMakeSafe(ast)
+
+type Emitter = {
+  readonly statements: Array<string>
+  readonly helpers: Array<string>
+  readonly initializers: Array<string>
+  readonly decoderHelpers: Map<SchemaAST.AST, string>
+  readonly unionHelpers: Map<SchemaAST.Union, string>
+  readonly bindings: Array<Binding>
+  readonly constantIndexes: Map<unknown, number>
+  next: number
+}
+
+const variable = (emitter: Emitter): string => `v${emitter.next++}`
+
+const propertyKey = (emitter: Emitter, key: PropertyKey, reference: string): string =>
+  typeof key === "string" ? JSON.stringify(key) : constant(emitter, key, reference)
+
+const propertyPresence = (input: string, key: string, name: PropertyKey): string =>
+  name === "__proto__" ? `Object.hasOwn(${input},${key})` : `${key} in ${input}`
+
+const assignProperty = (output: string, key: string, value: string, name: PropertyKey): string =>
+  name === "__proto__"
+    ? `Object.defineProperty(${output},${key},{value:${value},writable:true,enumerable:true,configurable:true})`
+    : `${output}[${key}]=${value}`
+
+const constant = (emitter: Emitter, value: unknown, reference: string): string => {
+  const cached = emitter.constantIndexes.get(value)
+  if (cached !== undefined) return `C[${cached}]`
+  const index = emitter.bindings.length
+  emitter.bindings.push({ value, reference })
+  emitter.constantIndexes.set(value, index)
+  return `C[${index}]`
+}
+
+const needsPresenceCheck = (ast: SchemaAST.AST): boolean => {
+  if (!canEmit(ast)) return true
+  switch (ast._tag) {
+    case "Undefined":
+    case "Void":
+    case "Any":
+    case "Unknown":
+      return true
+    case "Union":
+      return ast.types.some(needsPresenceCheck)
+    default:
+      return false
+  }
+}
+
+const propertyNeedsPresenceCheck = (name: PropertyKey, ast: SchemaAST.AST): boolean =>
+  name === "__proto__" || needsPresenceCheck(ast)
+
+/** @internal */
+export const shouldCompileParser = (ast: SchemaAST.AST, local = false): boolean => {
+  if (!local && ast.encoding !== undefined) return true
+  if (SchemaAST.getConstructorDescriptor(ast) !== undefined) return true
+  if (ast.checks !== undefined || getEncodingChecks(ast) !== undefined) return true
+  switch (ast._tag) {
+    case "TemplateLiteral":
+    case "Arrays":
+    case "Objects":
+    case "Union":
+      return true
+    default:
+      return false
+  }
+}
+
+const lookupMemberValues = (ast: SchemaAST.AST): ReadonlyArray<unknown> | undefined => {
+  if (ast.checks !== undefined || getEncodingChecks(ast) !== undefined || ast.encoding !== undefined) return undefined
+  switch (ast._tag) {
+    case "Null":
+      return [null]
+    case "Undefined":
+      return [undefined]
+    case "Literal":
+      return [ast.literal]
+    case "UniqueSymbol":
+      return [ast.symbol]
+    case "Enum":
+      return [...new Set(ast.enums.map((entry) => entry[1]))]
+    default:
+      return undefined
+  }
+}
+
+const lookupMemberReferences = (ast: SchemaAST.AST, path: string): ReadonlyArray<string> => {
+  switch (ast._tag) {
+    case "Null":
+      return ["null"]
+    case "Undefined":
+      return ["void 0"]
+    case "Literal":
+      return [`${path}.literal`]
+    case "UniqueSymbol":
+      return [`${path}.symbol`]
+    case "Enum": {
+      const references = new Map<unknown, string>()
+      ast.enums.forEach((entry, index) => {
+        if (!references.has(entry[1])) references.set(entry[1], `${path}.enums[${index}][1]`)
+      })
+      return [...references.values()]
+    }
+    default:
+      throw new Error(`Unsupported lookup member: ${ast._tag}`)
+  }
+}
+
+function emit(
+  ast: SchemaAST.AST,
+  input: string,
+  statements: Array<string>,
+  emitter: Emitter,
+  operation: Operation,
+  path: string
+): string {
+  const output = emitBase(ast, input, statements, emitter, operation, path)
+  const invalid = failureExpression(operation)
+  const encodingChecks = getEncodingChecks(ast)
+  const astConstant = ast.checks !== undefined || encodingChecks !== undefined
+    ? constant(emitter, ast, path)
+    : undefined
+  if (encodingChecks !== undefined) {
+    statements.push(`if(K(${astConstant},${input},1,o))return ${invalid}`)
+  }
+  if (ast.checks === undefined) return operation === "decode" ? output : "true"
+  const checked = variable(emitter)
+  statements.push(
+    `const ${checked}=${output}`,
+    `if(K(${astConstant},${checked},0,o))return ${invalid}`
+  )
+  return operation === "decode" ? checked : "true"
+}
+
+const emitDecoderHelper = (ast: SchemaAST.AST, emitter: Emitter, operation: Operation, path: string): string => {
+  const cached = emitter.decoderHelpers.get(ast)
+  if (cached !== undefined) return cached
+  const name = `d${emitter.next++}`
+  emitter.decoderHelpers.set(ast, name)
+  const statements: Array<string> = []
+  const output = emit(ast, "i", statements, emitter, operation, path)
+  emitter.helpers.push(
+    `function ${name}(i,o){${statements.join(";")};return ${output}}`
+  )
+  return name
+}
+
+const emitUnionHelper = (ast: SchemaAST.Union, emitter: Emitter, operation: Operation, path: string): string => {
+  const cached = emitter.unionHelpers.get(ast)
+  if (cached !== undefined) return cached
+  const name = `u${emitter.next++}`
+  emitter.unionHelpers.set(ast, name)
+  const entries = ast.types.map((type, index) =>
+    `[${constant(emitter, type, `${path}.types[${index}]`)},${
+      emitDecoderHelper(type, emitter, operation, `${path}.types[${index}]`)
+    }]`
+  )
+  emitter.initializers.push(`const ${name}=new Map([${entries.join(",")}])`)
+  return name
+}
+
+const emitIndexes = (
+  ast: SchemaAST.Objects,
+  input: string,
+  output: string | undefined,
+  statements: Array<string>,
+  emitter: Emitter,
+  operation: Operation,
+  path: string
+): void => {
+  const fixedKeys = output === undefined || ast.propertySignatures.length === 0
+    ? undefined
+    : constant(
+      emitter,
+      new Set(getExpectedKeys(ast)),
+      `new Set(${runtimeReference("getExpectedKeys")}(${path}))`
+    )
+  for (let signatureIndex = 0; signatureIndex < ast.indexSignatures.length; signatureIndex++) {
+    const signature = ast.indexSignatures[signatureIndex]
+    const signaturePath = `${path}.indexSignatures[${signatureIndex}]`
+    const keys = variable(emitter)
+    const index = variable(emitter)
+    const key = variable(emitter)
+    const parameter = signature.parameter
+    statements.push(
+      `const ${keys}=${
+        parameter._tag === "String" && parameter.checks === undefined
+          ? `Object.keys(${input})`
+          : `G(${input},${constant(emitter, parameter, `${signaturePath}.parameter`)},o)`
+      }`
+    )
+    const loop: Array<string> = [`const ${key}=${keys}[${index}]`]
+    const decodedKey = parameter._tag === "String" && parameter.checks === undefined && parameter.encoding === undefined
+      ? key
+      : emit(
+        SchemaAST.parameterFromPropertyKey(parameter),
+        key,
+        loop,
+        emitter,
+        operation,
+        `${runtimeReference("parameterFromPropertyKey")}(${signaturePath}.parameter)`
+      )
+    const value = variable(emitter)
+    loop.push(`const ${value}=${input}[${key}]`)
+    const decoded = emit(signature.type, value, loop, emitter, operation, `${signaturePath}.type`)
+    if (output !== undefined) {
+      const assign =
+        `if(${decodedKey}==="__proto__")Object.defineProperty(${output},${decodedKey},{value:${decoded},writable:true,enumerable:true,configurable:true});else ${output}[${decodedKey}]=${decoded}`
+      loop.push(
+        fixedKeys === undefined
+          ? assign
+          : `if(!${fixedKeys}.has(${key})&&!${fixedKeys}.has(${decodedKey})){${assign}}`
+      )
+    }
+    statements.push(`for(let ${index}=0;${index}<${keys}.length;${index}++){${loop.join(";")}}`)
+  }
+}
+
+const emitBase = (
+  ast: SchemaAST.AST,
+  input: string,
+  statements: Array<string>,
+  emitter: Emitter,
+  operation: Operation,
+  path: string
+): string => {
+  const needsValue = operation === "decode"
+  const invalid = failureExpression(operation)
+  switch (ast._tag) {
+    case "Null":
+      statements.push(`if(${input}!==null)return ${invalid}`)
+      return input
+    case "Undefined":
+      statements.push(`if(${input}!==void 0)return ${invalid}`)
+      return input
+    case "Void":
+      return "void 0"
+    case "Never":
+      statements.push(`return ${invalid}`)
+      return input
+    case "Any":
+    case "Unknown":
+      return input
+    case "ObjectKeyword":
+      statements.push(
+        `if((${input}===null||typeof ${input}!=="object")&&typeof ${input}!=="function")return ${invalid}`
+      )
+      return input
+    case "Enum": {
+      const values = constant(
+        emitter,
+        new Set(ast.enums.map((entry) => entry[1])),
+        `new Set(${path}.enums.map(entry=>entry[1]))`
+      )
+      statements.push(`if(!${values}.has(${input}))return ${invalid}`)
+      return input
+    }
+    case "UniqueSymbol": {
+      const value = constant(emitter, ast.symbol, `${path}.symbol`)
+      statements.push(`if(${input}!==${value})return ${invalid}`)
+      return input
+    }
+    case "Literal": {
+      const value = constant(emitter, ast.literal, `${path}.literal`)
+      statements.push(`if(${input}!==${value})return ${invalid}`)
+      return input
+    }
+    case "String":
+      statements.push(`if(typeof ${input}!=="string")return ${invalid}`)
+      return input
+    case "Number":
+      statements.push(`if(typeof ${input}!=="number")return ${invalid}`)
+      return input
+    case "Boolean":
+      statements.push(`if(typeof ${input}!=="boolean")return ${invalid}`)
+      return input
+    case "Symbol":
+      statements.push(`if(typeof ${input}!=="symbol")return ${invalid}`)
+      return input
+    case "BigInt":
+      statements.push(`if(typeof ${input}!=="bigint")return ${invalid}`)
+      return input
+    case "TemplateLiteral": {
+      const template = constant(emitter, ast, path)
+      statements.push(`if(!T(${template},${input},o))return ${invalid}`)
+      return input
+    }
+    case "Arrays": {
+      statements.push(`if(!Array.isArray(${input}))return ${invalid}`)
+      const length = variable(emitter)
+      statements.push(`const ${length}=${input}.length`)
+      const elementLength = ast.elements.length
+      const requiredElementLength = ast.elements.findIndex(isOptional)
+      const minimumElementLength = requiredElementLength === -1 ? elementLength : requiredElementLength
+      const tailLength = Math.max(0, ast.rest.length - 1)
+      if (ast.rest.length === 0) {
+        statements.push(
+          minimumElementLength === elementLength
+            ? `if(${length}!==${elementLength})return ${invalid}`
+            : `if(${length}<${minimumElementLength}||${length}>${elementLength})return ${invalid}`
+        )
+        if (minimumElementLength === elementLength) {
+          const elements = ast.elements.map((element, index) => {
+            const value = variable(emitter)
+            statements.push(`const ${value}=${input}[${index}]`)
+            return emit(element, value, statements, emitter, operation, `${path}.elements[${index}]`)
+          })
+          return needsValue ? `[${elements.join(",")}]` : input
+        }
+        const output = needsValue ? variable(emitter) : undefined
+        if (output !== undefined) statements.push(`const ${output}=new Array(${length})`)
+        for (let index = 0; index < elementLength; index++) {
+          const value = variable(emitter)
+          const elementStatements: Array<string> = [`const ${value}=${input}[${index}]`]
+          const decoded = emit(
+            ast.elements[index],
+            value,
+            elementStatements,
+            emitter,
+            operation,
+            `${path}.elements[${index}]`
+          )
+          if (output !== undefined) elementStatements.push(`${output}[${index}]=${decoded}`)
+          statements.push(
+            index < minimumElementLength
+              ? elementStatements.join(";")
+              : `if(${index}<${length}){${elementStatements.join(";")}}`
+          )
+        }
+        return output ?? input
+      }
+      statements.push(`if(${length}<${minimumElementLength + tailLength})return ${invalid}`)
+      const output = needsValue ? variable(emitter) : undefined
+      if (output !== undefined) statements.push(`const ${output}=new Array(${length})`)
+      for (let index = 0; index < elementLength; index++) {
+        const value = variable(emitter)
+        const elementStatements: Array<string> = [`const ${value}=${input}[${index}]`]
+        const decoded = emit(
+          ast.elements[index],
+          value,
+          elementStatements,
+          emitter,
+          operation,
+          `${path}.elements[${index}]`
+        )
+        if (output !== undefined) elementStatements.push(`${output}[${index}]=${decoded}`)
+        statements.push(
+          index < minimumElementLength
+            ? elementStatements.join(";")
+            : `if(${index}<${length}){${elementStatements.join(";")}}`
+        )
+      }
+      const index = variable(emitter)
+      const restStatements: Array<string> = []
+      const value = variable(emitter)
+      restStatements.push(`const ${value}=${input}[${index}]`)
+      const decoded = emit(ast.rest[0], value, restStatements, emitter, operation, `${path}.rest[0]`)
+      if (output !== undefined) restStatements.push(`${output}[${index}]=${decoded}`)
+      statements.push(
+        `for(let ${index}=${elementLength};${index}<${length}-${tailLength};${index}++){${restStatements.join(";")}}`
+      )
+      for (let index = 0; index < tailLength; index++) {
+        const inputIndex = `${length}-${tailLength - index}`
+        const value = variable(emitter)
+        statements.push(`const ${value}=${input}[${inputIndex}]`)
+        const decoded = emit(ast.rest[index + 1], value, statements, emitter, operation, `${path}.rest[${index + 1}]`)
+        if (output !== undefined) statements.push(`${output}[${inputIndex}]=${decoded}`)
+      }
+      return output ?? input
+    }
+    case "Objects": {
+      if (ast.propertySignatures.length === 0 && ast.indexSignatures.length === 0) {
+        statements.push(`if(${input}===null||${input}===void 0)return ${invalid}`)
+        return input
+      }
+      statements.push(
+        `if(typeof ${input}!=="object"||${input}===null||Array.isArray(${input}))return ${invalid}`
+      )
+      statements.push(
+        `if(o!==D&&o.onExcessProperty==="error"&&E(${constant(emitter, ast, path)},${input},o))return ${invalid}`
+      )
+      const hasOptional = ast.propertySignatures.some((property) => isOptional(property.type))
+      if (needsValue && ast.propertySignatures.length > 0 && !hasOptional) {
+        const output = variable(emitter)
+        const properties = ast.propertySignatures.map((property, index) => {
+          const propertyPath = `${path}.propertySignatures[${index}]`
+          const key = propertyKey(emitter, property.name, `${propertyPath}.name`)
+          const outputKey = typeof property.name === "string" && property.name !== "__proto__" ? key : `[${key}]`
+          const value = variable(emitter)
+          if (propertyNeedsPresenceCheck(property.name, property.type)) {
+            statements.push(`if(!(${propertyPresence(input, key, property.name)}))return ${invalid}`)
+          }
+          statements.push(`const ${value}=${input}[${key}]`)
+          return `${outputKey}:${emit(property.type, value, statements, emitter, operation, `${propertyPath}.type`)}`
+        })
+        statements.push(`const ${output}={${properties.join(",")}}`)
+        if (ast.indexSignatures.length > 0) emitIndexes(ast, input, output, statements, emitter, operation, path)
+        return output
+      }
+      const output = needsValue ? variable(emitter) : undefined
+      if (output !== undefined) statements.push(`const ${output}={}`)
+      for (let propertyIndex = 0; propertyIndex < ast.propertySignatures.length; propertyIndex++) {
+        const property = ast.propertySignatures[propertyIndex]
+        const propertyPath = `${path}.propertySignatures[${propertyIndex}]`
+        const key = propertyKey(emitter, property.name, `${propertyPath}.name`)
+        const value = variable(emitter)
+        const propertyStatements: Array<string> = [`const ${value}=${input}[${key}]`]
+        const decoded = emit(property.type, value, propertyStatements, emitter, operation, `${propertyPath}.type`)
+        if (output !== undefined) propertyStatements.push(assignProperty(output, key, decoded, property.name))
+        statements.push(
+          isOptional(property.type)
+            ? `if(${propertyPresence(input, key, property.name)}){${propertyStatements.join(";")}}`
+            : `${
+              propertyNeedsPresenceCheck(property.name, property.type)
+                ? `if(!(${propertyPresence(input, key, property.name)}))return ${invalid};`
+                : ""
+            }${propertyStatements.join(";")}`
+        )
+      }
+      if (ast.indexSignatures.length > 0) emitIndexes(ast, input, output, statements, emitter, operation, path)
+      return output ?? input
+    }
+    case "Union": {
+      const memberValues = ast.types.map(lookupMemberValues)
+      if (memberValues.every((values) => values !== undefined)) {
+        const references = ast.types.map((type, index) => lookupMemberReferences(type, `${path}.types[${index}]`))
+        if (ast.options?.mode !== "oneOf") {
+          const values = constant(emitter, new Set(memberValues.flat()), `new Set([${references.flat().join(",")}])`)
+          statements.push(`if(!${values}.has(${input}))return ${invalid}`)
+        } else {
+          const counts = new Map<unknown, number>()
+          const valueReferences = new Map<unknown, string>()
+          for (let memberIndex = 0; memberIndex < memberValues.length; memberIndex++) {
+            const values = memberValues[memberIndex]
+            for (let valueIndex = 0; valueIndex < values.length; valueIndex++) {
+              const value = values[valueIndex]
+              counts.set(value, (counts.get(value) ?? 0) + 1)
+              if (!valueReferences.has(value)) valueReferences.set(value, references[memberIndex][valueIndex])
+            }
+          }
+          const entries = [...counts].map(([value, count]) => `[${valueReferences.get(value)},${count}]`)
+          const lookup = constant(emitter, counts, `new Map([${entries.join(",")}])`)
+          statements.push(`if(${lookup}.get(${input})!==1)return ${invalid}`)
+        }
+        return input
+      }
+      const candidates = variable(emitter)
+      const output = variable(emitter)
+      const candidate = variable(emitter)
+      const index = variable(emitter)
+      const decoder = variable(emitter)
+      const types = constant(emitter, ast.types, `${path}.types`)
+      const decoders = emitUnionHelper(ast, emitter, operation, path)
+      statements.push(
+        `const ${candidates}=U(${input},${types})`,
+        `let ${output}=${invalid},${candidate},${decoder}`
+      )
+      if (ast.options?.mode !== "oneOf") {
+        statements.push(
+          `for(let ${index}=0;${index}<${candidates}.length;${index}++){${decoder}=${decoders}.get(${candidates}[${index}]);${candidate}=${decoder}(${input},o);if(${candidate}!==${invalid}){${output}=${candidate};break}}`
+        )
+        statements.push(`if(${output}===${invalid})return ${invalid}`)
+      } else {
+        const successes = variable(emitter)
+        statements.push(`let ${successes}=0`)
+        statements.push(
+          `for(let ${index}=0;${index}<${candidates}.length;${index}++){${decoder}=${decoders}.get(${candidates}[${index}]);${candidate}=${decoder}(${input},o);if(${candidate}!==${invalid}){if(++${successes}>1)return ${invalid};${output}=${candidate}}}`
+        )
+        statements.push(`if(${successes}!==1)return ${invalid}`)
+      }
+      return output
+    }
+    default:
+      throw new Error(`Unsupported Schema AST: ${ast._tag}`)
+  }
+}
+
+/** @internal */
+export interface Binding {
+  readonly value: unknown
+  readonly reference: string
+}
+
+/** @internal */
+export const runtimeReference = (name: keyof typeof runtime): string => `R.${name}`
+
+const runtimeBindings = (aliases: Readonly<Record<string, keyof typeof runtime>>): string =>
+  `const {${Object.entries(aliases).map(([alias, name]) => `${name}:${alias}`).join(",")}}=R;`
+
+/** @internal */
+export interface GeneratedOperation {
+  readonly source: string
+  readonly bindings: ReadonlyArray<Binding>
+}
+
+const emitOperation = (ast: SchemaAST.AST, operation: Operation, path = "ast"): GeneratedOperation => {
+  const emitter: Emitter = {
+    statements: [],
+    helpers: [],
+    initializers: [],
+    decoderHelpers: new Map(),
+    unionHelpers: new Map(),
+    bindings: [],
+    constantIndexes: new Map(),
+    next: 0
+  }
+  const output = emit(ast, "i", emitter.statements, emitter, operation, path)
+  const bindings = {
+    K: "getCheckIssues",
+    T: "matchesTemplateLiteral",
+    U: "getCandidates",
+    G: "getIndexSignatureKeys",
+    D: "defaultParseOptions",
+    E: "hasExcessProperties"
+  } as const
+  const source = `"use strict";${runtimeBindings(operation === "decode" ? { I: "invalid", ...bindings } : bindings)}${
+    emitter.helpers.join(";")
+  };${emitter.initializers.join(";")};return function(i,o){${emitter.statements.join(";")};return ${output}}`
+  return { source, bindings: emitter.bindings }
+}
+
+/** @internal */
+export type DecoderOperation = keyof CompiledDecoder
+
+const renderOperation = (emitted: GeneratedOperation): string =>
+  `(function(C,R){${emitted.source}})([${emitted.bindings.map((binding) => binding.reference).join(",")}],R)`
+
+/** @internal */
+export function generate(ast: SchemaAST.AST, operation: DecoderOperation): string | undefined {
+  if (operation === "make") {
+    if (!shouldCompileMake(ast)) return undefined
+    if (ast._tag === "Objects") {
+      return `if(ast.propertySignatures.some(p=>resolve(p.type).compiled!==void 0))return;return ${
+        renderOperation(emitOperation(ast, "decode"))
+      }`
+    }
+    const element = renderOperation(emitOperation(ast.rest[0], "decode", "ast.rest[0]"))
+    return `const e=resolve(ast.rest[0]),m=e.compiled===void 0?${element}:e.make;if(m===void 0)return;` +
+      "return function(i,o){if(i===R.missing)return R.missing;if(!Array.isArray(i))return R.invalid;" +
+      "const out=new Array(i.length);for(let x=0;x<i.length;x++){const v=m(i[x],o);" +
+      "if(v===R.invalid||v===R.missing)return R.invalid;out[x]=v}" +
+      "return R.getCheckIssues(ast,out,false,o)?R.invalid:out}"
+  }
+  if (operation === "is" || operation === "decode") {
+    if (!shouldCompileParser(ast)) return undefined
+    const emission = getEmission(ast)
+    if (emission === "unsupported" || operation === "is" && emission !== "is") return undefined
+    return "return " + renderOperation(emitOperation(ast, operation))
+  }
+  if (operation === "decodeEffect") {
+    const encoding = emitEncoding(ast)
+    if (encoding !== undefined) return encoding
+  }
+  const object = ast._tag === "Objects" && ast.propertySignatures.length > 0 &&
+      ast.indexSignatures.length === 0 && ast.propertySignatures.length <= maxGeneratedNodes
+    ? emitObject(ast)
+    : "undefined"
+  const array = ast._tag === "Arrays" && ast.elements.length === 0 && ast.rest.length === 1
+    ? emitArray()
+    : "undefined"
+  if (operation === "makeEffect") return `return R.make(ast,resolve,${object},${array})`
+  const checkpoint = ast.encoding !== undefined && getEmission(ast, 0, true) !== "unsupported"
+    ? `()=>${renderOperation(emitOperation(ast, "decode"))}`
+    : "undefined"
+  return `return R.decode(ast,resolve,${object},${getEmission(ast) !== "unsupported"},${checkpoint},${array})`
+}
+
+const emitArray = (): string =>
+  `function({getElement,step,resume}){return function(s,input,index=0,end=input.length){
+    const parser=getElement();let r,t,value;
+    for(;index<end;index++){
+      const item=input[index];r=parser(item,s.options);
+      if(r===R.sameExit&&item!==R.missing){s.output[index]=item;continue}
+      if(!R.effectIsExit(r))return resume(s,item,index,r,end);
+      if(r._tag==="Success"&&(value=r===R.sameExit?item:r[R.args])!==R.missing){s.output[index]=value}
+      else{t=step(s,item,r,index);if(t)return t}
+    }
+  }}`
+
+const inlineTypePredicate = (ast: SchemaAST.AST, input: string, path: string): string | undefined => {
+  switch (ast._tag) {
+    case "Null":
+      return `${input}===null`
+    case "Undefined":
+      return `${input}===void 0`
+    case "Never":
+      return "false"
+    case "Any":
+    case "Unknown":
+      return "true"
+    case "ObjectKeyword":
+      return `((${input}!==null&&typeof ${input}==="object")||typeof ${input}==="function")`
+    case "UniqueSymbol":
+      return `${input}===${path}.symbol`
+    case "Literal":
+      return `${input}===${path}.literal`
+    case "String":
+      return `typeof ${input}==="string"`
+    case "Number":
+      return `typeof ${input}==="number"`
+    case "Boolean":
+      return `typeof ${input}==="boolean"`
+    case "Symbol":
+      return `typeof ${input}==="symbol"`
+    case "BigInt":
+      return `typeof ${input}==="bigint"`
+    case "TemplateLiteral":
+      return `R.matchesTemplateLiteral(${path},${input},o)`
+    default:
+      return undefined
+  }
+}
+
+const inlineIdentityPredicate = (ast: SchemaAST.AST, input: string, path: string): string | undefined =>
+  ast.checks === undefined && getEncodingChecks(ast) === undefined
+    ? inlineTypePredicate(ast, input, path)
+    : undefined
+
+const emitEncoding = (ast: SchemaAST.AST): string | undefined => {
+  const links = ast.encoding
+  if (links?.length !== 1 || getEncodingChecks(ast) !== undefined) return undefined
+  const link = links[0]
+  const transformation = link.transformation
+  if (
+    link.to.encoding !== undefined ||
+    link.to.checks !== undefined ||
+    getEncodingChecks(link.to) !== undefined ||
+    transformation._tag !== "Transformation" ||
+    transformation.decode._tag !== "Transform"
+  ) {
+    return undefined
+  }
+  const source = inlineTypePredicate(link.to, "i", "ast.encoding[0].to")
+  const target = inlineTypePredicate(ast, "value", "ast")
+  if (source === undefined || target === undefined) return undefined
+  const success = ast.checks === undefined ? "R.succeed(value)" : "R.check(ast,value,o)"
+  return `const transform=ast.encoding[0].transformation.decode.transform;return function(i,o){try{
+    if(i===R.missing)return R.missingExit;
+    if(!(${source}))return R.invalidEncoding(ast,1,i,i,o);
+    const value=transform(i);
+    if(value===R.missing)return R.missingExit;
+    if(!(${target}))return R.invalidEncoding(ast,0,i,value,o);
+    return ${success}
+  }catch(e){return R.die(e)}}`
+}
+
+const canInlineEncoding = (ast: SchemaAST.AST): ast is SchemaAST.AST & { readonly encoding: SchemaAST.Encoding } =>
+  ast.encoding !== undefined &&
+  ast.checks === undefined &&
+  getEncodingChecks(ast) === undefined &&
+  inlineIdentityPredicate(ast, "v", "ast") !== undefined &&
+  ast.encoding.every((link) =>
+    link.to.encoding === undefined &&
+    inlineIdentityPredicate(link.to, "v", "ast") !== undefined &&
+    link.transformation._tag === "Transformation" &&
+    (link.transformation.decode._tag === "Passthrough" || link.transformation.decode._tag === "Transform")
+  )
+
+const inlinePropertyHandler =
+  `const handle=(state,index,property,present,input,result)=>{let value;if(result===R.sameExit){if(!present)return;value=input}else{if(!R.effectIsExit(result))return resume(state,index,result);if(result._tag!=="Success"||(value=result[R.args])===R.missing)return step(state,property,result)}const name=property.name;if(name==="__proto__")Object.defineProperty(state.out,name,{value,writable:true,enumerable:true,configurable:true});else state.out[name]=value}`
+
+const emitObject = (ast: SchemaAST.Objects): string => {
+  const initializers: Array<string> = []
+  const transforms = new Map<object, string>()
+  let usesInlinePropertyHandler = false
+  let usesInlinePropertyFailure = false
+  const lazyProperties = ast.propertySignatures.every((property) =>
+    typeof property.name !== "symbol" && canInlineEncoding(property.type)
+  )
+  if (lazyProperties) initializers.push("const p=i=>getProperties()[i]")
+  const statements = [
+    "if(i===R.missing)return R.missingExit",
+    "if(o.errors===\"all\"||o.onExcessProperty!==void 0||(o.concurrency!==void 0&&o.concurrency!==1))return fallback(i,o)",
+    "if(typeof i!==\"object\"||i===null||Array.isArray(i))return R.invalidType(ast,i,o)",
+    lazyProperties ? "const out={}" : "const properties=getProperties(),out={}",
+    "const state={ast,input:i,out,options:o,issues:void 0}",
+    "let r,t,value"
+  ]
+  ast.propertySignatures.forEach((property, index) => {
+    const key = typeof property.name === "symbol" ? `properties[${index}].name` : JSON.stringify(String(property.name))
+    const present = property.name === "__proto__" ? `Object.hasOwn(i,${key})` : `${key} in i`
+    const handle = `if(r===R.sameExit){if(h${index}){${assignProperty("out", key, `v${index}`, property.name)}}}else{` +
+      `if(!R.effectIsExit(r))return resume(state,${index},r);` +
+      `if(r._tag==="Success"&&(value=r[R.args])!==R.missing){${assignProperty("out", key, "value", property.name)}}` +
+      `else{t=step(state,p${index},r);if(t)return t}}`
+    const propertyPath = `ast.propertySignatures[${index}].type`
+    if (canInlineEncoding(property.type)) {
+      usesInlinePropertyHandler = true
+      const descriptor = lazyProperties ? `p(${index})` : `p${index}`
+      const handleInline = `t=handle(state,${index},${descriptor},h${index},v${index},r);if(t)return t`
+      const links = property.type.encoding
+      const sourcePath = `${propertyPath}.encoding[${links.length - 1}].to`
+      const source = inlineIdentityPredicate(links[links.length - 1].to, `v${index}`, sourcePath)!
+      // Share cold diagnostics without adding a call to the successful path.
+      if (lazyProperties && links.length === 1 && property.name !== "__proto__") {
+        usesInlinePropertyFailure = true
+        const transformation = links[0].transformation
+        let decoded = `v${index}`
+        if (transformation._tag === "Transformation" && transformation.decode._tag === "Transform") {
+          let transform = transforms.get(transformation.decode.transform)
+          if (transform === undefined) {
+            transform = `t${transforms.size}`
+            transforms.set(transformation.decode.transform, transform)
+            initializers.push(`const ${transform}=${propertyPath}.encoding[0].transformation.decode.transform`)
+          }
+          decoded = `${transform}(v${index})`
+        }
+        const predicate = inlineIdentityPredicate(property.type, `x${index}`, propertyPath)!
+        statements.push(
+          `const h${index}=${present},v${index}=h${index}?i[${key}]:R.missing`,
+          `if(v${index}!==R.missing&&(${source})){const x${index}=${decoded};` +
+            `if(x${index}!==R.missing&&(${predicate})){out[${key}]=x${index}}` +
+            `else{t=invalid(state,${index},h${index},v${index},x${index},o);if(t)return t}}` +
+            `else{t=fallbackProperty(state,${index},h${index},v${index},o);if(t)return t}`
+        )
+        return
+      }
+      const fast: Array<string> = [`let x${index}=v${index};r=void 0;l${index}:{`]
+      for (let linkIndex = links.length - 1; linkIndex >= 0; linkIndex--) {
+        const transformation = links[linkIndex].transformation
+        if (transformation._tag === "Transformation" && transformation.decode._tag === "Transform") {
+          let transform = transforms.get(transformation.decode.transform)
+          if (transform === undefined) {
+            transform = `t${transforms.size}`
+            transforms.set(transformation.decode.transform, transform)
+            initializers.push(
+              `const ${transform}=${propertyPath}.encoding[${linkIndex}].transformation.decode.transform`
+            )
+          }
+          fast.push(`x${index}=${transform}(x${index})`)
+        }
+        const targetPath = linkIndex === 0
+          ? propertyPath
+          : `${propertyPath}.encoding[${linkIndex - 1}].to`
+        const target = linkIndex === 0 ? property.type : links[linkIndex - 1].to
+        const predicate = inlineIdentityPredicate(target, `x${index}`, targetPath)!
+        fast.push(
+          `if(x${index}===R.missing){r=R.missingExit;break l${index}}else if(!(${predicate})){r=R.invalidEncoding(${descriptor}.type,${linkIndex},v${index},x${index},o);break l${index}}`
+        )
+      }
+      fast.push(
+        `};if(r!==void 0){${handleInline}}else{${assignProperty("out", key, `x${index}`, property.name)}}`
+      )
+      const run = `if(v${index}!==R.missing&&(${source})){${
+        fast.join(";")
+      }}else{r=${descriptor}.parser(v${index},o);${handleInline}}`
+      statements.push(
+        lazyProperties
+          ? `const h${index}=${present},v${index}=h${index}?i[${key}]:R.missing`
+          : `const p${index}=properties[${index}],h${index}=${present},v${index}=h${index}?i[${key}]:R.missing`,
+        run
+      )
+    } else {
+      statements.push(
+        `const p${index}=properties[${index}],h${index}=${present},v${index}=h${index}?i[${key}]:R.missing`,
+        `r=p${index}.parser(v${index},o)`,
+        handle
+      )
+    }
+  })
+  statements.push("return R.succeed(out)")
+  if (usesInlinePropertyHandler) {
+    initializers.unshift(inlinePropertyHandler)
+  }
+  if (usesInlinePropertyFailure) {
+    initializers.push(
+      "const invalid=(state,index,present,input,output,o)=>{const property=p(index);return handle(state,index,property,present,input,output===R.missing?R.missingExit:R.invalidEncoding(property.type,0,input,output,o))}",
+      "const fallbackProperty=(state,index,present,input,o)=>{const property=p(index);return handle(state,index,property,present,input,property.parser(input,o))}"
+    )
+  }
+  return `function({ast,getProperties,fallback,resume,step}){${initializers.join(";")};return function(i,o){try{${
+    statements.join(";")
+  }}catch(e){return R.die(e)}}}`
+}
diff --git a/repos/effect/packages/effect/src/internal/schema/compilerRegistry.ts b/repos/effect/packages/effect/src/internal/schema/compilerRegistry.ts
new file mode 100644
index 000000000..bdb0e157a
--- /dev/null
+++ b/repos/effect/packages/effect/src/internal/schema/compilerRegistry.ts
@@ -0,0 +1,230 @@
+import * as Effect from "../../Effect.ts"
+import type * as SchemaAST from "../../SchemaAST.ts"
+import type { Parser } from "../../SchemaParser.ts"
+import type { CompiledDecoder, Decode, Is, Make } from "../../unstable/schema/SchemaCompiler.ts"
+import * as Interpreter from "./interpreter.ts"
+import * as InternalParser from "./parser.ts"
+
+/** @internal */
+export const invalid = Symbol()
+
+/** @internal */
+export type Resolve = (ast: SchemaAST.AST) => Entry
+
+/** @internal */
+export type DecoderSource = Partial<CompiledDecoder>
+
+/** @internal */
+export type DecoderOperation = keyof CompiledDecoder
+
+/** @internal */
+export type Compile = <K extends DecoderOperation>(
+  ast: SchemaAST.AST,
+  resolve: Resolve,
+  operation: K
+) => CompiledDecoder[K] | undefined
+
+/** @internal */
+export type CompileSource = (ast: SchemaAST.AST, resolve: Resolve) => DecoderSource | undefined
+
+/** @internal */
+export type Compiled = DecoderSource | Compile
+
+const cache = new WeakMap<SchemaAST.AST, Entry>()
+let compiler: CompileSource | undefined
+
+/** @internal */
+export let compilerAdaptersEnabled = false
+
+function activateCompilerAdapters(): void {
+  compilerAdaptersEnabled = true
+}
+
+const decodeChild = (ast: SchemaAST.AST): Parser =>
+  compilerAdaptersEnabled
+    ? lazyParser(resolve, ast, "parser")
+    : resolve(ast).parser
+const makeChild = (ast: SchemaAST.AST): Parser =>
+  compilerAdaptersEnabled
+    ? lazyParser(resolve, ast, "makeEffect")
+    : resolve(ast).makeEffect
+const makeField = (ast: SchemaAST.AST): Parser => Interpreter.compileField(ast, makeChild)
+
+/** @internal */
+export interface Entry {
+  readonly ast: SchemaAST.AST
+  readonly compiled?: Compiled | undefined
+  readonly resolve?: Resolve | undefined
+  readonly is?: Is | undefined
+  readonly decode?: Decode | undefined
+  readonly make?: Make | undefined
+  readonly decodeEffect: Parser
+  readonly parser: Parser
+  readonly makeEffect: Parser
+}
+
+class InterpretedEntry implements Entry {
+  readonly ast: SchemaAST.AST
+  declare private cachedDecodeEffect: Parser | undefined
+  declare private cachedMakeEffect: Parser | undefined
+
+  constructor(ast: SchemaAST.AST) {
+    this.ast = ast
+  }
+
+  get decodeEffect(): Parser {
+    return this.cachedDecodeEffect ??= Interpreter.compile(this.ast, decodeChild)
+  }
+
+  get parser(): Parser {
+    return this.decodeEffect
+  }
+
+  get makeEffect(): Parser {
+    return this.cachedMakeEffect ??= Interpreter.compile(this.ast, makeChild, makeField)
+  }
+}
+
+class CompilerEntry extends InterpretedEntry {
+  readonly compiled: Compiled | undefined
+  readonly resolve: Resolve
+
+  constructor(ast: SchemaAST.AST, compiled: Compiled | undefined, resolve: Resolve) {
+    super(ast)
+    this.compiled = compiled
+    this.resolve = resolve
+  }
+
+  private save<K extends keyof Entry>(key: K, value: Entry[K]): Entry[K] {
+    Object.defineProperty(this, key, { value })
+    return value
+  }
+
+  private operation<K extends DecoderOperation>(key: K): CompiledDecoder[K] | undefined {
+    const compiled = this.compiled
+    return typeof compiled === "function" ? compiled(this.ast, this.resolve, key) : compiled?.[key]
+  }
+
+  get is(): Is | undefined {
+    return this.save("is", this.operation("is"))
+  }
+
+  get decode(): Decode | undefined {
+    return this.save("decode", this.operation("decode"))
+  }
+
+  get make(): Make | undefined {
+    return this.save("make", this.operation("make"))
+  }
+
+  override get decodeEffect(): Parser {
+    return this.save(
+      "decodeEffect",
+      this.operation("decodeEffect") ?? Interpreter.compile(this.ast, (ast) => lazyParser(this.resolve, ast, "parser"))
+    )
+  }
+
+  override get parser(): Parser {
+    const decode = this.decode
+    return decode === undefined
+      ? this.decodeEffect
+      : this.save("parser", withDecode(decode, () => this.decodeEffect))
+  }
+
+  override get makeEffect(): Parser {
+    const makeEffect = this.operation("makeEffect")
+    if (makeEffect !== undefined) return this.save("makeEffect", makeEffect)
+    const child = (ast: SchemaAST.AST): Parser => lazyParser(this.resolve, ast, "makeEffect")
+    return this.save(
+      "makeEffect",
+      Interpreter.compile(
+        this.ast,
+        child,
+        (ast) => Interpreter.compileField(ast, child)
+      )
+    )
+  }
+}
+
+/** @internal */
+export function withDecode(fastDecode: Decode, decodeEffect: () => Parser): Parser {
+  let detailed: Parser | undefined
+  return (input, options) => {
+    if (input !== InternalParser.missing) {
+      try {
+        const value = fastDecode(input, options)
+        if (value !== invalid) return value === input ? InternalParser.sameExit : InternalParser.succeed(value)
+      } catch (error) {
+        return Effect.die(error)
+      }
+    }
+    return (detailed ??= decodeEffect())(input, options)
+  }
+}
+
+/** @internal */
+export function lazyParser(
+  resolve: Resolve,
+  ast: SchemaAST.AST,
+  operation: "parser" | "decodeEffect" | "makeEffect"
+): Parser {
+  const entry = resolve(ast)
+  if (entry.compiled === undefined || Object.hasOwn(entry, operation)) {
+    return entry[operation]
+  }
+  let parser: Parser | undefined
+  return (input, options) => (parser ??= entry[operation])(input, options)
+}
+
+/** @internal */
+export function resolve(ast: SchemaAST.AST): Entry {
+  const cached = cache.get(ast)
+  if (cached !== undefined) return cached
+  const entry = compiler === undefined
+    ? new InterpretedEntry(ast)
+    : new CompilerEntry(ast, compiler(ast, resolve), resolve)
+  cache.set(ast, entry)
+  return entry
+}
+
+/** @internal */
+export function set(ast: SchemaAST.AST, decoder: DecoderSource | undefined, resolveChild: Resolve = resolve): Entry {
+  if (decoder !== undefined) activateCompilerAdapters()
+  const entry = new CompilerEntry(ast, decoder, resolveChild)
+  cache.set(ast, entry)
+  return entry
+}
+
+/** @internal */
+export function setCompiler(
+  ast: SchemaAST.AST,
+  compile: Compile,
+  resolveChild: Resolve = resolve
+): Entry {
+  activateCompilerAdapters()
+  const entry = new CompilerEntry(ast, compile, resolveChild)
+  cache.set(ast, entry)
+  return entry
+}
+
+/** @internal */
+export function install(compile: CompileSource): void {
+  activateCompilerAdapters()
+  compiler = compile
+}
+
+/** @internal */
+export function enable(ast: SchemaAST.AST, compile: CompileSource): void {
+  activateCompilerAdapters()
+  const scoped: Resolve = (child) => {
+    const cached = cache.get(child)
+    return cached !== undefined && (cached.compiled !== undefined || cached.resolve === scoped)
+      ? cached
+      : set(child, compile(child, scoped), scoped)
+  }
+  const decoder = compile(ast, scoped)
+  const cached = cache.get(ast)
+  if (decoder !== undefined || cached?.compiled === undefined) {
+    set(ast, decoder, scoped)
+  }
+}
diff --git a/repos/effect/packages/effect/src/internal/schema/fromJsonSchemaDocument.ts b/repos/effect/packages/effect/src/internal/schema/fromJsonSchemaDocument.ts
index da20ca372..bcfee4041 100644
--- a/repos/effect/packages/effect/src/internal/schema/fromJsonSchemaDocument.ts
+++ b/repos/effect/packages/effect/src/internal/schema/fromJsonSchemaDocument.ts
@@ -1,7 +1,7 @@
 import * as JsonSchema from "../../JsonSchema.ts"
 import { remainder } from "../../Number.ts"
-import * as Schema from "../../Schema.ts"
-import * as SchemaAST from "../../SchemaAST.ts"
+import type * as Schema from "../../Schema.ts"
+import * as InternalAST from "../../SchemaAST.ts"
 import type * as SchemaRepresentation from "../../SchemaRepresentation.ts"
 import { errorWithPath } from "../errors.ts"
 import * as InternalRecord from "../record.ts"
@@ -11,6 +11,11 @@ type Path = ReadonlyArray<string | number>
 type Representation = SchemaRepresentation.Representation
 type Check = SchemaRepresentation.Check
 
+interface Checked {
+  readonly checks: ReadonlyArray<Check>
+  readonly annotations?: Schema.Annotations.Annotations | undefined
+}
+
 type ImportedJsonSchemaRepresentation = Extract<Representation, {
   readonly _tag:
     | "Reference"
@@ -48,12 +53,18 @@ interface ImportedObjectScope {
 const never: ImportedJsonSchemaRepresentation = { _tag: "Never", checks: [] }
 const unknown: ImportedJsonSchemaRepresentation = { _tag: "Unknown", checks: [] }
 const string: ImportedJsonSchemaRepresentation = { _tag: "String", checks: [] }
+const unsupportedStructuredValue = "Only primitive values are supported in \"const\" and \"enum\"."
+
+function isObject(input: unknown): input is Record<string, unknown> {
+  return typeof input === "object" && input !== null && !Array.isArray(input)
+}
 
-function makeJsonLiteral(input: unknown): ImportedJsonSchemaRepresentation | undefined {
+function makeJsonLiteral(input: unknown, path: Path): ImportedJsonSchemaRepresentation | undefined {
   if (input === null) return { _tag: "Null", checks: [] }
-  return typeof input === "string" || typeof input === "number" || typeof input === "boolean"
-    ? { _tag: "Literal", literal: input, checks: [] }
-    : undefined
+  if (typeof input === "string" || typeof input === "number" || typeof input === "boolean") {
+    return { _tag: "Literal", literal: input, checks: [] }
+  }
+  if (typeof input === "object") throw errorWithPath(unsupportedStructuredValue, path)
 }
 
 const jsonSchemaValueTypes = ["null", "string", "number", "boolean", "object", "array"] as const
@@ -128,7 +139,7 @@ function jsonSchemaAnnotations(
   if (typeof schema.format === "string") annotations.format = schema.format
   if (typeof schema.contentEncoding === "string") annotations.contentEncoding = schema.contentEncoding
   if (typeof schema.contentMediaType === "string") annotations.contentMediaType = schema.contentMediaType
-  if (SchemaAST.isJson(schema.contentSchema)) annotations.contentSchema = schema.contentSchema
+  if (InternalAST.isJson(schema.contentSchema)) annotations.contentSchema = schema.contentSchema
   return Object.keys(annotations).length === 0 ? undefined : annotations
 }
 
@@ -150,56 +161,6 @@ function jsonDeclaration(
   }
 }
 
-function unknownJsonSchemas(representation: Representation): Representation {
-  switch (representation._tag) {
-    case "Unknown":
-      return jsonDeclaration(representation.annotations)
-    case "Suspend":
-      return { ...representation, thunk: unknownJsonSchemas(representation.thunk) }
-    case "Arrays":
-      return {
-        ...representation,
-        elements: representation.elements.map((element) => ({
-          ...element,
-          type: unknownJsonSchemas(element.type)
-        })),
-        rest: representation.rest.map(unknownJsonSchemas)
-      }
-    case "Objects":
-      return {
-        ...representation,
-        propertySignatures: representation.propertySignatures.map((property) => ({
-          ...property,
-          type: unknownJsonSchemas(property.type)
-        })),
-        indexSignatures: representation.indexSignatures.map((indexSignature) => ({
-          parameter: unknownJsonSchemas(indexSignature.parameter),
-          type: unknownJsonSchemas(indexSignature.type)
-        })),
-        checks: representation.checks.map(unknownJsonSchemaCheck)
-      }
-    case "Union":
-      return { ...representation, types: representation.types.map(unknownJsonSchemas) }
-    default:
-      return representation
-  }
-}
-
-function unknownJsonSchemaCheck(check: Check): Check {
-  const representation = check.representation
-  const schemas = representation?.schemas
-  if (representation === undefined || schemas === undefined) {
-    return check
-  }
-  return {
-    ...check,
-    representation: {
-      ...representation,
-      schemas: schemas.map(unknownJsonSchemas)
-    }
-  }
-}
-
 function translateJsonSchemaMultiDocument(
   document: JsonSchema.MultiDocument<"draft-2020-12">,
   options?: SchemaRepresentation.FromJsonSchemaOptions,
@@ -209,13 +170,80 @@ function translateJsonSchemaMultiDocument(
   const reachableDefinitions = new Map<string, Path>()
   const objectScopesByProperties = new WeakMap<
     SchemaRepresentation.Objects["propertySignatures"],
-    ReadonlyArray<ImportedObjectScope>
+    readonly [ReadonlyArray<ImportedObjectScope>, Path]
   >()
   const annotatedReferences: Array<{
     readonly reference: SchemaRepresentation.Reference
     readonly path: Path
   }> = []
   const resolvingChoices = new Set<string>()
+  const finalReferences = new Set<string>()
+  let inNestedResource = false
+
+  function finalize(representation: Representation): Representation {
+    switch (representation._tag) {
+      case "Unknown":
+        return jsonDeclaration(representation.annotations)
+      case "Reference":
+        finalReferences.add(representation.$ref)
+        return representation
+      case "Suspend":
+        return { ...representation, thunk: finalize(representation.thunk) }
+      case "Arrays":
+        return {
+          ...representation,
+          elements: representation.elements.map((element) => ({
+            ...element,
+            type: finalize(element.type)
+          })),
+          rest: representation.rest.map(finalize)
+        }
+      case "Objects":
+        // Intersections may reduce open patterns to fixed properties, so reject only
+        // if an open pattern remains in the final representation.
+        const [scopes, path] = objectScopesByProperties.get(representation.propertySignatures)!
+        if (
+          representation.indexSignatures[0]?.parameter === string &&
+          scopes.some((scope) => scope.patterns.length > 0)
+        ) {
+          throw errorWithPath(
+            "Cannot import open \"patternProperties\": unmatched keys cannot be typed correctly.",
+            path
+          )
+        }
+        return {
+          ...representation,
+          propertySignatures: representation.propertySignatures.map((property) => ({
+            ...property,
+            type: finalize(property.type)
+          })),
+          indexSignatures: representation.indexSignatures.map((indexSignature) => ({
+            parameter: finalize(indexSignature.parameter),
+            type: finalize(indexSignature.type)
+          })),
+          checks: representation.checks.map(finalizeCheck)
+        }
+      case "Union":
+        return { ...representation, types: representation.types.map(finalize) }
+      default:
+        return representation
+    }
+  }
+
+  function finalizeCheck(check: Check): Check {
+    const representation = check.representation
+    const schemas = representation?.schemas
+    if (representation === undefined || schemas === undefined) {
+      return check
+    }
+    return {
+      ...check,
+      representation: {
+        ...representation,
+        schemas: schemas.map(finalize)
+      }
+    }
+  }
 
   function annotate(
     representation: ImportedJsonSchemaRepresentation,
@@ -239,15 +267,16 @@ function translateJsonSchemaMultiDocument(
     const cached = definitionCache.get(key)
     if (cached !== undefined) {
       if (cached === null) {
-        throw errorWithPath(recursiveReferenceError ?? `Invalid reference ${key}`, [...path, "$ref"])
+        throw errorWithPath(
+          recursiveReferenceError ??
+            `Definition ${JSON.stringify(key)} is a circular alias.`,
+          [...path, "$ref"]
+        )
       }
       return cached
     }
-    if (!Object.hasOwn(document.definitions, key)) {
-      throw errorWithPath(`Invalid reference ${key}`, [...path, "$ref"])
-    }
     definitionCache.set(key, null)
-    const representation = recur(document.definitions[key], ["definitions", key])
+    const representation = translateSchema(document.definitions[key], ["definitions", key])
     definitionCache.set(key, representation)
     return representation
   }
@@ -255,20 +284,23 @@ function translateJsonSchemaMultiDocument(
   function resolveReference(
     reference: SchemaRepresentation.Reference,
     path: Path,
-    options?: { readonly recursiveReferenceError?: string },
+    recursiveReferenceError?: string,
     seen: Set<string> = new Set()
   ): ImportedJsonSchemaRepresentation {
     if (seen.has(reference.$ref)) {
-      throw errorWithPath(`Invalid reference ${reference.$ref}`, [...path, "$ref"])
+      throw errorWithPath(
+        `Definition ${JSON.stringify(reference.$ref)} is a circular alias.`,
+        [...path, "$ref"]
+      )
     }
     seen.add(reference.$ref)
-    const representation = translateDefinition(reference.$ref, path, options?.recursiveReferenceError)
+    const representation = translateDefinition(reference.$ref, path, recursiveReferenceError)
     if (representation._tag === "Reference") {
-      return resolveReference(representation, path, options, seen)
+      return resolveReference(representation, path, recursiveReferenceError, seen)
     }
     if (representation._tag === "Suspend" && representation.thunk._tag === "Reference") {
       return annotate(
-        resolveReference(representation.thunk, path, options, seen),
+        resolveReference(representation.thunk, path, recursiveReferenceError, seen),
         representation.annotations
       )
     }
@@ -284,7 +316,7 @@ function translateJsonSchemaMultiDocument(
     return { ...left, ...right }
   }
 
-  function combinedAnnotations(
+  function annotateIntersection(
     representation: ImportedJsonSchemaRepresentation,
     left: ImportedJsonSchemaRepresentation,
     right: ImportedJsonSchemaRepresentation
@@ -298,42 +330,31 @@ function translateJsonSchemaMultiDocument(
     )
   }
 
-  function asChecks(
-    checks: ReadonlyArray<Check>,
-    annotations: Schema.Annotations.Annotations | undefined
-  ): ReadonlyArray<Check> | undefined {
-    if (checks.length === 0) return undefined
-    if (annotations === undefined) return checks
-    if (checks.length === 1 && checks[0].annotations === undefined) {
-      return [{
-        ...checks[0],
-        annotations
-      }]
-    }
-    return [{
-      _tag: "FilterGroup",
-      checks: checks as [Check, ...Array<Check>],
-      annotations
-    }]
-  }
-
-  function combineChecks(
-    left: ReadonlyArray<Check>,
-    right: ReadonlyArray<Check>,
-    annotations: Schema.Annotations.Annotations | undefined,
+  function intersectChecks(
+    left: Checked,
+    right: Checked,
     deduplicate: ReadonlyArray<string> = []
-  ): ReadonlyArray<Check> | undefined {
+  ): readonly [ReadonlyArray<Check>, Schema.Annotations.Annotations | undefined] {
+    let checks = right.checks
     for (const id of deduplicate) {
-      if (left.some((check) => checkId(check) === id)) {
-        right = right.filter((check) => checkId(check) !== id)
+      if (left.checks.some((check) => check._tag === "Filter" && check.representation?.id === id)) {
+        checks = checks.filter((check) => check._tag !== "Filter" || check.representation?.id !== id)
       }
     }
-    const checks = asChecks(right, annotations)
-    return checks === undefined ? undefined : [...left, ...checks]
-  }
-
-  function checkId(check: Check): string | undefined {
-    return check._tag === "Filter" ? check.representation?.id : undefined
+    if (checks.length === 0) {
+      const annotations = mergeAnnotations(left.annotations, right.annotations)
+      return [left.checks, annotations]
+    }
+    if (right.annotations !== undefined) {
+      checks = checks.length === 1 && checks[0].annotations === undefined
+        ? [{ ...checks[0], annotations: right.annotations }]
+        : [{
+          _tag: "FilterGroup",
+          checks: checks as [Check, ...Array<Check>],
+          annotations: right.annotations
+        }]
+    }
+    return [[...left.checks, ...checks], left.annotations]
   }
 
   function satisfiesPrimitiveCheck(check: Check, value: string | number): boolean | undefined {
@@ -379,7 +400,7 @@ function translateJsonSchemaMultiDocument(
     return representation.checks.every((check) => satisfiesPrimitiveCheck(check, value as string | number))
   }
 
-  function combinePrimitiveWithLiteral(
+  function intersectPrimitiveWithLiteral(
     primitive:
       | SchemaRepresentation.String
       | SchemaRepresentation.Number
@@ -389,10 +410,10 @@ function translateJsonSchemaMultiDocument(
     const satisfies = primitive._tag === "Boolean"
       ? typeof literal.literal === "boolean"
       : satisfiesLiteral(primitive, literal)
-    return satisfies ? combinedAnnotations(literal, primitive, literal) : never
+    return satisfies ? annotateIntersection(literal, primitive, literal) : never
   }
 
-  function combineArrays(
+  function intersectArrays(
     left: SchemaRepresentation.Arrays,
     right: SchemaRepresentation.Arrays,
     path: Path
@@ -408,7 +429,7 @@ function translateJsonSchemaMultiDocument(
       if (leftType === undefined || rightType === undefined) {
         return isOptional ? { elements, rest: [] } : undefined
       }
-      const type = combine(
+      const type = intersect(
         leftType as ImportedJsonSchemaRepresentation,
         rightType as ImportedJsonSchemaRepresentation,
         [...path, "elements", index, "type"]
@@ -427,7 +448,7 @@ function translateJsonSchemaMultiDocument(
     if (leftRest === undefined || rightRest === undefined) {
       return { elements, rest: [] }
     }
-    const rest = combine(
+    const rest = intersect(
       leftRest as ImportedJsonSchemaRepresentation,
       rightRest as ImportedJsonSchemaRepresentation,
       [...path, "rest", 0]
@@ -435,13 +456,13 @@ function translateJsonSchemaMultiDocument(
     return { elements, rest: rest._tag === "Never" ? [] : [rest] }
   }
 
-  function combineTypes(
+  function intersectAll(
     types: ReadonlyArray<ImportedJsonSchemaRepresentation>,
     path: Path
   ): ImportedJsonSchemaRepresentation {
     let out = types[0] ?? unknown
     for (let index = 1; index < types.length; index++) {
-      out = combine(out, types[index], [...path, index])
+      out = intersect(out, types[index], [...path, index])
     }
     return out
   }
@@ -461,8 +482,17 @@ function translateJsonSchemaMultiDocument(
       requiresFiniteKeyDomain ||= scope.additionalProperties._tag === "Never" ||
         scope.additionalProperties._tag !== "Unknown" && (scope.hasProperties || scope.patterns.length > 0)
     }
-    if (!hasFiniteKeyDomain && requiresFiniteKeyDomain) {
-      throw errorWithPath("Unsupported object keyword scopes", path)
+    const closedPattern = scopes.length === 1 && names.size === 0 &&
+        scopes[0].additionalProperties._tag === "Never" && scopes[0].patterns.length === 1
+      ? scopes[0].patterns[0]
+      : undefined
+    if (!hasFiniteKeyDomain && requiresFiniteKeyDomain && closedPattern === undefined) {
+      throw errorWithPath(
+        scopes.some((scope) => scope.additionalProperties._tag === "Never")
+          ? "Cannot import this closed patterned object: only one pattern without properties is supported."
+          : "Cannot combine typed \"additionalProperties\" with other property schemas: Effect index signatures also check excluded keys.",
+        path
+      )
     }
 
     const properties: Array<SchemaRepresentation.PropertySignature> = []
@@ -484,55 +514,33 @@ function translateJsonSchemaMultiDocument(
         }
         if (property?.type === undefined && !matches) types.push(scope.additionalProperties)
       }
-      const type = combineTypes(types, [...path, "properties", name])
+      const type = intersectAll(types, [...path, "properties", name])
       if (!isOptional && type._tag === "Never") return never
       properties.push({ name, type, isOptional, isMutable: false })
     }
 
-    const indexSignatures: Array<SchemaRepresentation.IndexSignature> = []
-    if (!hasFiniteKeyDomain) {
-      const additionalProperties = combineTypes(
-        scopes.map((scope) => scope.additionalProperties),
-        [...path, "additionalProperties"]
-      )
-      const patterns = new Map<string, ImportedObjectPattern>()
-      for (const scope of scopes) {
-        for (const pattern of scope.patterns) {
-          const previous = patterns.get(pattern.source)
-          patterns.set(
-            pattern.source,
-            previous === undefined
-              ? pattern
-              : {
-                ...pattern,
-                type: combine(
-                  previous.type,
-                  pattern.type,
-                  [...path, "patternProperties", pattern.source]
-                )
-              }
-          )
-        }
-      }
-      for (const { parameter, type } of patterns.values()) {
-        indexSignatures.push({
-          parameter,
-          type: combine(type, additionalProperties, [...path, "indexSignatures"])
-        })
-      }
-      indexSignatures.push({ parameter: string, type: additionalProperties })
-    } else if (properties.length === 0) {
-      indexSignatures.push({ parameter: string, type: never })
-    }
-
-    objectScopesByProperties.set(properties, scopes)
-    return {
+    const indexSignatures: ReadonlyArray<SchemaRepresentation.IndexSignature> = closedPattern !== undefined
+      ? [{ parameter: closedPattern.parameter, type: closedPattern.type }]
+      : !hasFiniteKeyDomain
+      ? [{
+        parameter: string,
+        type: intersectAll(
+          scopes.map((scope) => scope.additionalProperties),
+          [...path, "additionalProperties"]
+        )
+      }]
+      : properties.length === 0
+      ? [{ parameter: string, type: never }]
+      : []
+    const representation: SchemaRepresentation.Objects = {
       _tag: "Objects",
       propertySignatures: properties,
       indexSignatures,
       checks,
       annotations
     }
+    objectScopesByProperties.set(properties, [scopes, path])
+    return representation
   }
 
   const jsonRootTags = ["Null", "String", "Number", "Boolean", "Objects", "Arrays"] as const
@@ -597,7 +605,11 @@ function translateJsonSchemaMultiDocument(
           representation.indexSignatures.some((indexSignature) =>
             hasChoices(indexSignature.parameter as ImportedJsonSchemaRepresentation) ||
             hasChoices(indexSignature.type as ImportedJsonSchemaRepresentation)
-          ) || representation.checks.some(checkHasChoices)
+          ) ||
+          objectScopesByProperties.get(representation.propertySignatures)![0].some((scope) =>
+            scope.patterns.some((pattern) => hasChoices(pattern.type))
+          ) ||
+          representation.checks.some(checkHasChoices)
       default:
         return false
     }
@@ -629,12 +641,14 @@ function translateJsonSchemaMultiDocument(
       : undefined
   }
 
-  function combineLiteralUnions(
+  function intersectLiteralUnions(
     left: SchemaRepresentation.Union,
     right: SchemaRepresentation.Union,
     path: Path
   ): ImportedJsonSchemaRepresentation | undefined {
-    if (left.mode !== "anyOf" || right.mode !== "anyOf") return undefined
+    if ((left.options?.mode ?? "anyOf") !== "anyOf" || (right.options?.mode ?? "anyOf") !== "anyOf") {
+      return undefined
+    }
     const rightByValue = new Map<string | number | boolean | null, ImportedJsonSchemaRepresentation>()
     for (const type of right.types) {
       const representation = type as ImportedJsonSchemaRepresentation
@@ -648,12 +662,12 @@ function translateJsonSchemaMultiDocument(
       const value = literalValue(representation)
       if (value === undefined) return undefined
       const match = rightByValue.get(value)
-      if (match !== undefined) types.push(combine(representation, annotate(match, right.annotations), path))
+      if (match !== undefined) types.push(intersect(representation, annotate(match, right.annotations), path))
     }
     return makeUnion(left, types)
   }
 
-  function combineUnionWithType(
+  function intersectUnionWithType(
     union: SchemaRepresentation.Union,
     type: ImportedJsonSchemaRepresentation,
     path: Path,
@@ -672,16 +686,16 @@ function translateJsonSchemaMultiDocument(
     if (members.length === 1 && union.checks.length === 0) {
       const member = annotate(members[0].type, union.annotations)
       return unionOnLeft
-        ? combine(member, type, [...path, "types", members[0].index])
-        : combine(type, member, [...path, "types", members[0].index])
+        ? intersect(member, type, [...path, "types", members[0].index])
+        : intersect(type, member, [...path, "types", members[0].index])
     }
     return makeUnion(
       union,
       members
         .map((member) =>
           unionOnLeft
-            ? combine(member.type, type, [...path, "types", member.index])
-            : combine(type, member.type, [...path, "types", member.index])
+            ? intersect(member.type, type, [...path, "types", member.index])
+            : intersect(type, member.type, [...path, "types", member.index])
         )
         .filter((type) => type._tag !== "Never")
     )
@@ -698,10 +712,13 @@ function translateJsonSchemaMultiDocument(
   }
 
   function unsupportedIntersection(path: Path): never {
-    throw errorWithPath("Unsupported intersection of overlapping unions", path)
+    throw errorWithPath(
+      "Cannot intersect these \"anyOf\" or \"oneOf\" alternatives without expanding their branches.",
+      path
+    )
   }
 
-  function combinePartition(
+  function intersectPartition(
     partition: SchemaRepresentation.Union,
     other: SchemaRepresentation.Union,
     path: Path,
@@ -718,91 +735,79 @@ function translateJsonSchemaMultiDocument(
     const types: Array<ImportedJsonSchemaRepresentation> = []
     for (let index = 0; index < partitionTypes.length; index++) {
       const member = partitionTypes[index]
-      const type = combineUnionWithType(other, member, [...path, "types", index], !partitionOnLeft)
+      const type = intersectUnionWithType(other, member, [...path, "types", index], !partitionOnLeft)
       if (type._tag !== "Never") types.push(type)
     }
     return makeUnion(partition, types)
   }
 
-  function combineUnions(
+  function intersectUnions(
     left: SchemaRepresentation.Union,
     right: SchemaRepresentation.Union,
     path: Path
   ): ImportedJsonSchemaRepresentation {
-    const literals = combineLiteralUnions(left, right, path)
+    const literals = intersectLiteralUnions(left, right, path)
     if (literals !== undefined) return literals
-    if (isTypePartition(left)) return combinePartition(left, right, path, true)
-    if (isTypePartition(right)) return combinePartition(right, left, path, false)
+    if (isTypePartition(left)) return intersectPartition(left, right, path, true)
+    if (isTypePartition(right)) return intersectPartition(right, left, path, false)
     return unsupportedIntersection(path)
   }
 
-  function combine(
+  function intersect(
     left: ImportedJsonSchemaRepresentation,
     right: ImportedJsonSchemaRepresentation,
     path: Path
   ): ImportedJsonSchemaRepresentation {
     if (left._tag === "Never") return left
     if (right._tag === "Never") return right
-    if (left._tag === "Unknown") return combinedAnnotations(right, left, right)
-    if (right._tag === "Unknown") return combinedAnnotations(left, left, right)
-    if (left._tag === "Reference") return combine(resolveReference(left, path), right, path)
-    if (right._tag === "Reference") return combine(left, resolveReference(right, path), path)
+    if (left._tag === "Unknown") return annotateIntersection(right, left, right)
+    if (right._tag === "Unknown") return annotateIntersection(left, left, right)
+    if (left._tag === "Reference") return intersect(resolveReference(left, path), right, path)
+    if (right._tag === "Reference") return intersect(left, resolveReference(right, path), path)
     if (left._tag === "Suspend") {
       return annotate(
-        combine(left.thunk as ImportedJsonSchemaRepresentation, right, path),
+        intersect(left.thunk as ImportedJsonSchemaRepresentation, right, path),
         left.annotations
       )
     }
     if (right._tag === "Suspend") {
       return annotate(
-        combine(left, right.thunk as ImportedJsonSchemaRepresentation, path),
+        intersect(left, right.thunk as ImportedJsonSchemaRepresentation, path),
         right.annotations
       )
     }
-    if (left._tag === "Union" && right._tag === "Union") return combineUnions(left, right, path)
-    if (left._tag === "Union") return combineUnionWithType(left, right, path, true)
-    if (right._tag === "Union") return combineUnionWithType(right, left, path, false)
+    if (left._tag === "Union" && right._tag === "Union") return intersectUnions(left, right, path)
+    if (left._tag === "Union") return intersectUnionWithType(left, right, path, true)
+    if (right._tag === "Union") return intersectUnionWithType(right, left, path, false)
 
     switch (left._tag) {
       case "Null":
         return right._tag === "Null"
-          ? combinedAnnotations({ _tag: "Null", checks: [...left.checks, ...right.checks] }, left, right)
+          ? annotateIntersection({ _tag: "Null", checks: [...left.checks, ...right.checks] }, left, right)
           : never
       case "String":
         if (right._tag === "Literal") {
-          return combinePrimitiveWithLiteral(left, right)
+          return intersectPrimitiveWithLiteral(left, right)
         }
         if (right._tag !== "String") return never
-        const stringChecks = combineChecks(left.checks, right.checks, right.annotations)
-        return annotate(
-          {
-            _tag: "String",
-            checks: stringChecks ?? left.checks
-          },
-          mergeAnnotations(left.annotations, stringChecks === undefined ? right.annotations : undefined)
-        )
+        const [stringChecks, stringAnnotations] = intersectChecks(left, right)
+        return annotate({ _tag: "String", checks: stringChecks }, stringAnnotations)
       case "Number":
         if (right._tag === "Literal") {
-          return combinePrimitiveWithLiteral(left, right)
+          return intersectPrimitiveWithLiteral(left, right)
         }
         if (right._tag !== "Number") return never
-        const numberChecks = combineChecks(left.checks, right.checks, right.annotations, [
+        const [numberChecks, numberAnnotations] = intersectChecks(left, right, [
           "effect/schema/isFinite",
           "effect/schema/isInt"
         ])
-        return annotate(
-          {
-            _tag: "Number",
-            checks: numberChecks ?? left.checks
-          },
-          mergeAnnotations(left.annotations, numberChecks === undefined ? right.annotations : undefined)
-        )
+        return annotate({ _tag: "Number", checks: numberChecks }, numberAnnotations)
       case "Boolean":
         if (right._tag === "Literal") {
-          return combinePrimitiveWithLiteral(left, right)
+          return intersectPrimitiveWithLiteral(left, right)
         }
         return right._tag === "Boolean"
-          ? combinedAnnotations(
+          ? annotateIntersection(
             {
               _tag: "Boolean",
               checks: [...left.checks, ...right.checks]
@@ -814,7 +819,7 @@ function translateJsonSchemaMultiDocument(
       case "Literal":
         if (right._tag === "Literal") {
           return left.literal === right.literal
-            ? combinedAnnotations(
+            ? annotateIntersection(
               {
                 ...left,
                 checks: [...left.checks, ...right.checks]
@@ -828,58 +833,54 @@ function translateJsonSchemaMultiDocument(
           (right._tag === "String" || right._tag === "Number") && satisfiesLiteral(right, left) ||
           right._tag === "Boolean" && typeof left.literal === "boolean"
         ) {
-          return combinedAnnotations(left, left, right)
+          return annotateIntersection(left, left, right)
         }
         return never
       case "Arrays": {
         if (right._tag !== "Arrays") return never
-        const arrays = combineArrays(left, right, path)
+        const arrays = intersectArrays(left, right, path)
         if (arrays === undefined) return never
-        const arrayChecks = combineChecks(left.checks, right.checks, right.annotations, ["effect/schema/isUnique"])
-        return annotate(
-          {
-            _tag: "Arrays",
-            elements: arrays.elements,
-            rest: arrays.rest,
-            checks: arrayChecks ?? left.checks
-          },
-          mergeAnnotations(left.annotations, arrayChecks === undefined ? right.annotations : undefined)
-        )
+        const [checks, annotations] = intersectChecks(left, right, ["effect/schema/isUnique"])
+        return annotate({ _tag: "Arrays", ...arrays, checks }, annotations)
       }
       case "Objects": {
         if (right._tag !== "Objects") return never
-        const objectChecks = combineChecks(left.checks, right.checks, right.annotations)
+        const [checks, annotations] = intersectChecks(left, right)
         const scopes = [
-          ...objectScopesByProperties.get(left.propertySignatures)!,
-          ...objectScopesByProperties.get(right.propertySignatures)!
+          ...objectScopesByProperties.get(left.propertySignatures)![0],
+          ...objectScopesByProperties.get(right.propertySignatures)![0]
         ]
         return lowerObject(
           scopes,
-          objectChecks ?? left.checks,
-          mergeAnnotations(left.annotations, objectChecks === undefined ? right.annotations : undefined),
+          checks,
+          annotations,
           path
         )
       }
     }
   }
 
-  function recur(input: unknown, path: Path): ImportedJsonSchemaRepresentation {
+  function translateSchema(
+    input: unknown,
+    path: Path,
+    isRoot = false
+  ): ImportedJsonSchemaRepresentation {
     if (input === false) {
       return never
     }
-    if (typeof input !== "object" || input === null || Array.isArray(input)) return unknown
+    if (!isObject(input)) return unknown
     const schema = options?.onEnter === undefined
       ? input as JsonSchema.JsonSchema
       : options.onEnter(input as JsonSchema.JsonSchema)
     if (schema === undefined) {
       return unknown
     }
-    const enumIndex = Array.isArray(schema.enum)
-      ? schema.enum.findIndex((value) => typeof value === "object" && value !== null)
-      : -1
-    if (enumIndex !== -1) {
-      throw errorWithPath(`Unsupported structured JSON Schema value for "enum"`, [...path, "enum", enumIndex])
-    }
+    if (
+      isObject(schema.not) &&
+      Object.keys(schema.not).length === 0
+    ) return annotate(never, jsonSchemaAnnotations(schema))
+    const wasInNestedResource = inNestedResource
+    inNestedResource ||= !isRoot && typeof schema.$id === "string"
     for (const keyword of Object.keys(schema)) {
       if (keyword === "if" && !Object.hasOwn(schema, "then") && !Object.hasOwn(schema, "else")) continue
       switch (keyword) {
@@ -891,35 +892,48 @@ function translateJsonSchemaMultiDocument(
         case "not":
         case "unevaluatedItems":
         case "unevaluatedProperties":
-          throw errorWithPath(`Unsupported JSON Schema keyword "${keyword}"`, [...path, keyword])
+          throw errorWithPath(
+            `Cannot import JSON Schema keyword "${keyword}": Effect has no equivalent constraint.`,
+            [...path, keyword]
+          )
       }
     }
 
-    let representation = on(schema, path)
+    let representation = translateType(schema, path)
     if (Object.hasOwn(schema, "const")) {
-      const literal = makeJsonLiteral(schema.const)
-      if (literal === undefined && typeof schema.const === "object") {
-        throw errorWithPath(`Unsupported structured JSON Schema value for "const"`, [...path, "const"])
-      }
-      if (literal !== undefined) representation = combine(representation, literal, [...path, "const"])
+      const constPath = [...path, "const"]
+      const literal = makeJsonLiteral(schema.const, constPath)
+      if (literal !== undefined) representation = intersect(representation, literal, constPath)
     }
     if (Array.isArray(schema.enum)) {
-      const types = schema.enum.map((value) => makeJsonLiteral(value) ?? unknown)
-      representation = combine(
+      const types = schema.enum.map((value, index) => makeJsonLiteral(value, [...path, "enum", index]) ?? unknown)
+      representation = intersect(
         representation,
         types.length === 1
           ? types[0]
-          : { _tag: "Union", types, mode: "anyOf", checks: [] },
+          : { _tag: "Union", types, checks: [] },
         [...path, "enum"]
       )
     }
     if (typeof schema.$ref === "string") {
+      if (inNestedResource) {
+        throw errorWithPath(
+          "Cannot resolve $ref under a nested \"$id\". Resolve or flatten it first.",
+          [...path, "$ref"]
+        )
+      }
       const $ref = JsonSchema.getReferenceKey(schema.$ref)
       if ($ref === undefined) {
-        throw errorWithPath(`Unsupported reference ${JSON.stringify(schema.$ref)}`, [...path, "$ref"])
+        throw errorWithPath(
+          `Unsupported $ref ${JSON.stringify(schema.$ref)}. Use "#/$defs/Name".`,
+          [...path, "$ref"]
+        )
       }
       if (!Object.hasOwn(document.definitions, $ref)) {
-        throw errorWithPath(`Invalid reference ${JSON.stringify(schema.$ref)}`, [...path, "$ref"])
+        throw errorWithPath(
+          `Missing definition ${JSON.stringify($ref)} for $ref ${JSON.stringify(schema.$ref)}.`,
+          [...path, "$ref"]
+        )
       }
       if (!reachableDefinitions.has($ref)) reachableDefinitions.set($ref, path)
       const reference: SchemaRepresentation.Reference = { _tag: "Reference", $ref }
@@ -927,10 +941,12 @@ function translateJsonSchemaMultiDocument(
         ? reference
         : representation._tag === "Never"
         ? never
-        : combine(
-          resolveReference(reference, path, {
-            recursiveReferenceError: `Unsupported assertion siblings on recursive reference ${reference.$ref}`
-          }),
+        : intersect(
+          resolveReference(
+            reference,
+            path,
+            `Recursive $ref ${JSON.stringify(reference.$ref)} cannot have sibling constraints.`
+          ),
           representation,
           path
         )
@@ -943,9 +959,9 @@ function translateJsonSchemaMultiDocument(
 
     if (Array.isArray(schema.allOf)) {
       for (let index = 0; index < schema.allOf.length; index++) {
-        representation = combine(
+        representation = intersect(
           representation,
-          recur(schema.allOf[index], [...path, "allOf", index]),
+          translateSchema(schema.allOf[index], [...path, "allOf", index]),
           [...path, "allOf", index]
         )
       }
@@ -956,17 +972,21 @@ function translateJsonSchemaMultiDocument(
       if (Array.isArray(members)) {
         const union: ImportedJsonSchemaRepresentation = {
           _tag: "Union",
-          types: members.map((member, index) => recur(member, [...path, mode, index])),
-          mode,
+          types: members.map((member, index) => translateSchema(member, [...path, mode, index])),
+          ...(mode === "oneOf" ? { options: { mode } } : {}),
           checks: []
         }
-        representation = combine(union, representation, [...path, mode])
+        representation = intersect(union, representation, [...path, mode])
       }
     }
+    inNestedResource = wasInNestedResource
     return representation
   }
 
-  function on(schema: JsonSchema.JsonSchema, path: Path): ImportedJsonSchemaRepresentation {
+  function translateType(
+    schema: JsonSchema.JsonSchema,
+    path: Path
+  ): ImportedJsonSchemaRepresentation {
     const types = Array.isArray(schema.type) && schema.type.every(isImportedJsonSchemaType)
       ? schema.type
       : !isImportedJsonSchemaType(schema.type) && hasTypeSpecificKeywords(schema)
@@ -975,8 +995,7 @@ function translateJsonSchemaMultiDocument(
     if (types !== undefined) {
       return {
         _tag: "Union",
-        types: types.map((type) => on({ ...schema, type }, path)),
-        mode: "anyOf",
+        types: types.map((type) => translateType({ ...schema, type }, path)),
         checks: []
       }
     }
@@ -1006,7 +1025,7 @@ function translateJsonSchemaMultiDocument(
         const minItems = typeof schema.minItems === "number" ? schema.minItems : 0
         const elements = prefixItems?.map((element, index) => ({
           isOptional: index + 1 > minItems,
-          type: recur(element, [...path, "prefixItems", index])
+          type: translateSchema(element, [...path, "prefixItems", index])
         })) ?? []
         const isTupleClosed = schema.items === false ||
           (schema.items === undefined &&
@@ -1020,7 +1039,9 @@ function translateJsonSchemaMultiDocument(
           elements,
           rest: isTupleClosed
             ? []
-            : [schema.items === undefined ? unknown : recur(schema.items, [...path, "items"])],
+            : [
+              schema.items === undefined ? unknown : translateSchema(schema.items, [...path, "items"])
+            ],
           checks: collectArrayChecks(schema, isMaxItemsRedundant)
         }
       }
@@ -1033,14 +1054,17 @@ function translateJsonSchemaMultiDocument(
     }
   }
 
-  function importPatternChecks(pattern: string, path: Path): Array<Check> {
+  function importPatternCheck(pattern: string, path: Path): Check | undefined {
     switch (options?.patterns ?? "error") {
       case "error":
-        throw errorWithPath(`Pattern encountered while patterns is set to "error"`, path)
+        throw errorWithPath(
+          "Patterns may block validation and are disabled. Use patterns: \"apply\" for trusted schemas or \"ignore\" to discard them.",
+          path
+        )
       case "ignore":
-        return []
+        return undefined
       case "apply":
-        return [jsonSchemaFilter("effect/schema/isPattern", { source: pattern, flags: "" })]
+        return jsonSchemaFilter("effect/schema/isPattern", { source: pattern, flags: "" })
     }
   }
 
@@ -1049,7 +1073,8 @@ function translateJsonSchemaMultiDocument(
     addNumberCheck(checks, schema.minLength, "effect/schema/isMinLength", "minLength")
     addNumberCheck(checks, schema.maxLength, "effect/schema/isMaxLength", "maxLength")
     if (typeof schema.pattern === "string") {
-      checks.push(...importPatternChecks(schema.pattern, [...path, "pattern"]))
+      const check = importPatternCheck(schema.pattern, [...path, "pattern"])
+      if (check !== undefined) checks.push(check)
     }
     return checks
   }
@@ -1085,45 +1110,42 @@ function translateJsonSchemaMultiDocument(
     schema: JsonSchema.JsonSchema,
     path: Path
   ): ImportedObjectScope {
-    const sourceProperties =
-      typeof schema.properties === "object" && schema.properties !== null && !Array.isArray(schema.properties)
-        ? schema.properties as Record<string, unknown>
-        : {}
-    const required = Array.isArray(schema.required)
-      ? schema.required.filter((key): key is string => typeof key === "string")
-      : []
+    const sourceProperties = isObject(schema.properties) ? schema.properties : {}
+    const required = new Set(
+      Array.isArray(schema.required)
+        ? schema.required.filter((key): key is string => typeof key === "string")
+        : []
+    )
     const propertyNames = Object.keys(sourceProperties)
     const keys = new Set([...propertyNames, ...required])
     const properties = new Map(Array.from(keys, (name) => [name, {
       type: Object.hasOwn(sourceProperties, name)
-        ? recur(sourceProperties[name], [...path, "properties", name])
+        ? translateSchema(sourceProperties[name], [...path, "properties", name])
         : undefined,
-      isOptional: !required.includes(name)
+      isOptional: !required.has(name)
     }]))
     const hasProperties = propertyNames.length > 0
     const patterns: Array<ImportedObjectPattern> = []
     if (
-      typeof schema.patternProperties === "object" &&
-      schema.patternProperties !== null &&
-      !Array.isArray(schema.patternProperties)
+      isObject(schema.patternProperties)
     ) {
       for (const [pattern, value] of Object.entries(schema.patternProperties)) {
-        const checks = importPatternChecks(pattern, [...path, "patternProperties", pattern])
-        if (checks.length === 0) return { properties, hasProperties, patterns: [], additionalProperties: unknown }
+        const check = importPatternCheck(pattern, [...path, "patternProperties", pattern])
+        if (check === undefined) return { properties, hasProperties, patterns: [], additionalProperties: unknown }
         patterns.push({
           source: pattern,
           parameter: {
             _tag: "String",
-            checks
+            checks: [check]
           },
-          type: recur(value, [...path, "patternProperties", pattern])
+          type: translateSchema(value, [...path, "patternProperties", pattern])
         })
       }
     }
     const additionalProperties = schema.additionalProperties === false
       ? never
-      : typeof schema.additionalProperties === "object" && schema.additionalProperties !== null
-      ? recur(schema.additionalProperties, [...path, "additionalProperties"])
+      : isObject(schema.additionalProperties)
+      ? translateSchema(schema.additionalProperties, [...path, "additionalProperties"])
       : unknown
     return { properties, hasProperties, patterns, additionalProperties }
   }
@@ -1140,7 +1162,11 @@ function translateJsonSchemaMultiDocument(
       checks.push(jsonSchemaFilter(
         "effect/schema/isPropertyNames",
         null,
-        [combine(string, recur(schema.propertyNames, propertyNamesPath), propertyNamesPath)]
+        [intersect(
+          string,
+          translateSchema(schema.propertyNames, propertyNamesPath),
+          propertyNamesPath
+        )]
       ))
     }
     return checks
@@ -1148,10 +1174,11 @@ function translateJsonSchemaMultiDocument(
 
   const references: Record<string, Representation> = {}
   const representations = document.schemas.map((schema, index) =>
-    unknownJsonSchemas(recur(schema, singleRoot ? ["schema"] : ["schemas", index]))
+    finalize(translateSchema(schema, singleRoot ? ["schema"] : ["schemas", index], true))
   ) as [Representation, ...Array<Representation>]
-  for (const [key, path] of reachableDefinitions) {
-    InternalRecord.assignProperty(references, key, unknownJsonSchemas(translateDefinition(key, path)))
+  // Definitions expanded away by intersections do not need a standalone output schema.
+  for (const key of finalReferences) {
+    InternalRecord.assignProperty(references, key, finalize(translateDefinition(key, reachableDefinitions.get(key)!)))
   }
   for (const { reference, path } of annotatedReferences) {
     resolveReference(reference, path)
@@ -1159,28 +1186,11 @@ function translateJsonSchemaMultiDocument(
   return { representations, references }
 }
 
-const jsonSchemaRevivers: ReadonlyArray<SchemaRepresentation.AnyReviver> = [
-  Schema.JsonReviver,
-  Schema.isPatternReviver,
-  Schema.isFiniteReviver,
-  Schema.isGreaterThanReviver,
-  Schema.isGreaterThanOrEqualToReviver,
-  Schema.isLessThanReviver,
-  Schema.isLessThanOrEqualToReviver,
-  Schema.isMultipleOfReviver,
-  Schema.isIntReviver,
-  Schema.isMinLengthReviver,
-  Schema.isMaxLengthReviver,
-  Schema.isMinPropertiesReviver,
-  Schema.isMaxPropertiesReviver,
-  Schema.isPropertyNamesReviver,
-  Schema.isUniqueReviver
-]
-
 /** @internal */
 export function fromJsonSchemaDocument(
   document: JsonSchema.Document<"draft-2020-12">,
-  options?: SchemaRepresentation.FromJsonSchemaOptions
+  options: SchemaRepresentation.FromJsonSchemaOptions | undefined,
+  revivers: ReadonlyArray<SchemaRepresentation.AnyReviver>
 ): Schema.Top {
   const translated = translateJsonSchemaMultiDocument(
     {
@@ -1194,13 +1204,14 @@ export function fromJsonSchemaDocument(
   return fromRepresentation({
     representation: translated.representations[0],
     references: translated.references
-  }, jsonSchemaRevivers)
+  }, revivers)
 }
 
 /** @internal */
 export function fromJsonSchemaMultiDocument(
   document: JsonSchema.MultiDocument<"draft-2020-12">,
-  options?: SchemaRepresentation.FromJsonSchemaOptions
+  options: SchemaRepresentation.FromJsonSchemaOptions | undefined,
+  revivers: ReadonlyArray<SchemaRepresentation.AnyReviver>
 ): readonly [Schema.Top, ...Array<Schema.Top>] {
-  return fromRepresentations(translateJsonSchemaMultiDocument(document, options), jsonSchemaRevivers)
+  return fromRepresentations(translateJsonSchemaMultiDocument(document, options), revivers)
 }
diff --git a/repos/effect/packages/effect/src/internal/schema/fromRepresentation.ts b/repos/effect/packages/effect/src/internal/schema/fromRepresentation.ts
index 30b647beb..da18ec7b7 100644
--- a/repos/effect/packages/effect/src/internal/schema/fromRepresentation.ts
+++ b/repos/effect/packages/effect/src/internal/schema/fromRepresentation.ts
@@ -2,9 +2,11 @@ import * as Arr from "../../Array.ts"
 import * as Result from "../../Result.ts"
 import * as Schema from "../../Schema.ts"
 import type * as SchemaAST from "../../SchemaAST.ts"
+import * as SchemaParser from "../../SchemaParser.ts"
 import type * as SchemaRepresentation from "../../SchemaRepresentation.ts"
 import { errorWithPath } from "../errors.ts"
 import * as InternalRecord from "../record.ts"
+import * as InternalToCodec from "./toCodec.ts"
 
 type Path = ReadonlyArray<string | number>
 
@@ -43,7 +45,7 @@ function makeReviverMap(
     }
     out.set(reviver.id, {
       ...reviver,
-      payloadSchema: Schema.toCodecJson(reviver.payloadSchema)
+      payloadSchema: InternalToCodec.toCodecJson(reviver.payloadSchema)
     })
   }
 
@@ -102,7 +104,7 @@ function revivePersisted(
     reviver: SchemaRepresentation.AnyReviver,
     path: Path
   ): any {
-    const decoded = Schema.decodeUnknownResult(reviver.payloadSchema)(representation.payload)
+    const decoded = SchemaParser.decodeUnknownResult(reviver.payloadSchema)(representation.payload)
     if (Result.isFailure(decoded)) {
       throw errorWithPath(`Invalid representation payload for ${representation.id}`, path)
     }
@@ -314,7 +316,7 @@ function revivePersisted(
       }
       case "Union": {
         const members = representation.types.map((member, index) => recur(member, [...path, "types", index]))
-        return finishStructural(Schema.Union(members, { mode: representation.mode }), representation, path)
+        return finishStructural(Schema.Union(members, representation.options), representation, path)
       }
     }
   }
diff --git a/repos/effect/packages/effect/src/internal/schema/interpreter.ts b/repos/effect/packages/effect/src/internal/schema/interpreter.ts
new file mode 100644
index 000000000..a4600d77a
--- /dev/null
+++ b/repos/effect/packages/effect/src/internal/schema/interpreter.ts
@@ -0,0 +1,241 @@
+import * as Cause from "../../Cause.ts"
+import * as Effect from "../../Effect.ts"
+import type * as Exit from "../../Exit.ts"
+import type * as Option from "../../Option.ts"
+import * as SchemaAST from "../../SchemaAST.ts"
+import * as SchemaIssue from "../../SchemaIssue.ts"
+import type { Compiler, Parser } from "../../SchemaParser.ts"
+import { effectIsExit } from "../effect.ts"
+import * as InternalParser from "./parser.ts"
+
+type ApplyTransformation = (
+  result: Effect.Effect<unknown, SchemaIssue.Issue, unknown>,
+  current: unknown,
+  options: SchemaAST.ParseOptions
+) => Effect.Effect<unknown, SchemaIssue.Issue, unknown>
+
+const flatMapTransformation = (
+  result: Effect.Effect<unknown, SchemaIssue.Issue, unknown>,
+  current: unknown,
+  f: (value: unknown) => Effect.Effect<unknown, SchemaIssue.Issue, unknown>
+): Effect.Effect<unknown, SchemaIssue.Issue, unknown> =>
+  result === InternalParser.sameExit ? f(current) : Effect.flatMapEager(result, f)
+
+function compileTransformation(transformation: SchemaAST.Link["transformation"]): ApplyTransformation {
+  if (transformation._tag === "Middleware") {
+    return (result, current, options) => {
+      const transformed = result === InternalParser.sameExit
+        ? transformation.decode(InternalParser.succeed(InternalParser.toOption(current)), options)
+        : transformation.decode(Effect.mapEager(result, InternalParser.toOption), options)
+      return fromOptionalEffect(transformed)
+    }
+  }
+
+  const getter = transformation.decode
+  switch (getter._tag) {
+    case "Passthrough":
+      return (result, current) => result === InternalParser.sameExit ? InternalParser.succeed(current) : result
+    case "Transform": {
+      const transform = (value: unknown) =>
+        value === InternalParser.missing
+          ? InternalParser.missingExit
+          : InternalParser.succeed(getter.transform(value))
+      return (result, current) => flatMapTransformation(result, current, transform)
+    }
+    case "TransformOptional": {
+      const transform = (value: unknown) =>
+        InternalParser.fromOptionExit(getter.transform(InternalParser.toOption(value)))
+      return (result, current) => flatMapTransformation(result, current, transform)
+    }
+    case "TransformEffect":
+      return (result, current, options) =>
+        flatMapTransformation(result, current, (value) =>
+          value === InternalParser.missing
+            ? InternalParser.missingExit
+            : getter.transform(value, options))
+    case "TransformOptionalEffect":
+      return (result, current, options) =>
+        flatMapTransformation(
+          result,
+          current,
+          (value) => fromOptionalEffect(getter.transform(InternalParser.toOption(value), options))
+        )
+  }
+}
+
+const fromOptionalEffect = (
+  effect: Effect.Effect<Option.Option<unknown>, SchemaIssue.Issue, unknown>
+): Effect.Effect<unknown, SchemaIssue.Issue, unknown> => Effect.flatMapEager(effect, InternalParser.fromOptionExit)
+
+/** @internal */
+export const wrapEncoding = (
+  ast: SchemaAST.AST,
+  input: unknown,
+  options: SchemaAST.ParseOptions,
+  effect: Effect.Effect<unknown, SchemaIssue.Issue, unknown>
+): Effect.Effect<unknown, SchemaIssue.Issue, unknown> =>
+  Effect.catchCause(
+    effect,
+    (cause) =>
+      Effect.failCauseSync(() => Cause.map(cause, (issue) => new SchemaIssue.Encoding(ast, issue, input, options)))
+  )
+
+function makeConstructorParser(descriptor: SchemaAST.ConstructorDescriptor, compile: Compiler): Parser {
+  const transform = compileTransformation(descriptor.link.transformation)
+  let sourceParser: Parser
+  return (input, options) => {
+    if (input === InternalParser.missing) return InternalParser.missingExit
+    if (descriptor.isConstructed(input)) return InternalParser.sameExit
+    const result = (sourceParser ??= compile(descriptor.link.to))(input, options)
+    return transform(result, input, options)
+  }
+}
+
+function withDefault(ast: SchemaAST.AST, parser: Parser): Parser {
+  const defaultValue = ast.context!.constructorDefault!
+  return (input, options) => {
+    if (input !== InternalParser.missing && input !== undefined) return parser(input, options)
+    const result = defaultValue
+    if (effectIsExit(result) && result._tag === "Success") {
+      const local = parser((result as InternalParser.Success<unknown>)[InternalParser.args], options)
+      return local === InternalParser.sameExit ? result : local
+    }
+    return Effect.flatMapEager(
+      wrapEncoding(ast, input, options, result),
+      (value) => {
+        const local = parser(value, options)
+        return local === InternalParser.sameExit ? InternalParser.succeed(value) : local
+      }
+    )
+  }
+}
+
+/** @internal */
+export function compileField(ast: SchemaAST.AST, compile: Compiler): Parser {
+  const parser = compile(ast)
+  return ast.context?.constructorDefault === undefined ? parser : withDefault(ast, parser)
+}
+
+/** @internal */
+export function compile(
+  ast: SchemaAST.AST,
+  compile: Compiler,
+  compileField?: Compiler,
+  base?: Parser,
+  specialize?: (local: Parser) => Parser
+): Parser {
+  if (ast._tag === "Declaration") {
+    // Declaration callbacks can create public parsers for their type parameters.
+    // Register those ASTs with the same resolver before invoking the callback.
+    for (const parameter of ast.typeParameters) compile(parameter)
+  }
+  // Construction supplies compileField for parent-owned defaults. Its presence
+  // also selects the constructor semantics of declarations and Unions.
+  const descriptor = compileField ? SchemaAST.getConstructorDescriptor(ast) : undefined
+  const parser = descriptor
+    ? makeConstructorParser(descriptor, compile)
+    : base ?? ast.getParser(compile, compileField)
+  const checks = ast.checks
+  const links = ast.encoding
+  const transformations = links?.map((link) => compileTransformation(link.transformation))
+  const encodingChecks = (ast as any).encodingChecks
+  if (!links && !checks && !encodingChecks) {
+    return parser
+  }
+  let encodingParsers: ReadonlyArray<Parser> | undefined
+  const parseChecks = (
+    input: unknown,
+    options: SchemaAST.ParseOptions
+  ) => {
+    let result = parser(input, options)
+    if (encodingChecks && !options.disableChecks) {
+      if (effectIsExit(result)) {
+        if (result._tag === "Success") {
+          const output = result === InternalParser.sameExit
+            ? input
+            : (result as InternalParser.Success<unknown, SchemaIssue.Issue>)[InternalParser.args]
+          if (input !== InternalParser.missing && output !== InternalParser.missing) {
+            const issues = SchemaAST.collectIssues(encodingChecks, input, undefined, ast, options)
+            if (issues) {
+              result = Effect.fail(new SchemaIssue.Composite(ast, issues, input, options))
+            }
+          }
+        }
+      } else {
+        result = Effect.flatMap(result, (value) => {
+          if (input !== InternalParser.missing && value !== InternalParser.missing) {
+            const issues = SchemaAST.collectIssues(encodingChecks, input, undefined, ast, options)
+            if (issues) {
+              return Effect.fail(new SchemaIssue.Composite(ast, issues, input, options))
+            }
+          }
+          return Effect.succeed(value)
+        })
+      }
+    }
+
+    if (checks && !options.disableChecks) {
+      if (effectIsExit(result)) {
+        if (result._tag === "Success") {
+          const value = result === InternalParser.sameExit
+            ? input
+            : (result as InternalParser.Success<unknown, SchemaIssue.Issue>)[InternalParser.args]
+          if (value === InternalParser.missing) return result
+          const issues = SchemaAST.collectIssues(checks, value, undefined, ast, options)
+          if (issues) {
+            result = Effect.fail(new SchemaIssue.Composite(ast, issues, value, options))
+          }
+        }
+      } else {
+        result = Effect.flatMap(result, (value) => {
+          if (value !== InternalParser.missing) {
+            const issues = SchemaAST.collectIssues(checks, value, undefined, ast, options)
+            if (issues) {
+              return Effect.fail(new SchemaIssue.Composite(ast, issues, value, options))
+            }
+          }
+          return Effect.succeed(value)
+        })
+      }
+    }
+
+    return result
+  }
+  const parseLocal = specialize === undefined ? parseChecks : specialize(parseChecks)
+  if (!links) {
+    return parseLocal
+  }
+  return (
+    input: unknown,
+    options: SchemaAST.ParseOptions
+  ) => {
+    const parsers = encodingParsers ??= links.map((link) => compile(link.to))
+    let current = input
+    let result = parsers[parsers.length - 1](input, options)
+    for (let i = links.length - 1; i >= 0; i--) {
+      result = transformations![i](result, current, options)
+      if (i !== 0) {
+        const next = parsers[i - 1]
+        if ((result as Exit.Exit<unknown, unknown>)._tag === "Success") {
+          current = (result as InternalParser.Success<unknown, SchemaIssue.Issue>)[InternalParser.args]
+          result = next(current, options)
+        } else {
+          result = Effect.flatMapEager(result, (value) => {
+            const nextResult = next(value, options)
+            return nextResult === InternalParser.sameExit ? InternalParser.succeed(value) : nextResult
+          })
+        }
+      }
+    }
+    if ((result as Exit.Exit<unknown, unknown>)._tag === "Success") {
+      const value = (result as InternalParser.Success<unknown, SchemaIssue.Issue>)[InternalParser.args]
+      const local = parseLocal(value, options)
+      return local === InternalParser.sameExit ? result : local
+    }
+    result = wrapEncoding(ast, input, options, result)
+    return Effect.flatMapEager(result, (value) => {
+      const local = parseLocal(value, options)
+      return local === InternalParser.sameExit ? InternalParser.succeed(value) : local
+    })
+  }
+}
diff --git a/repos/effect/packages/effect/src/internal/schema/schema.ts b/repos/effect/packages/effect/src/internal/schema/make.ts
similarity index 54%
rename from repos/effect/packages/effect/src/internal/schema/schema.ts
rename to repos/effect/packages/effect/src/internal/schema/make.ts
index cdbb85ff5..f83575a02 100644
--- a/repos/effect/packages/effect/src/internal/schema/schema.ts
+++ b/repos/effect/packages/effect/src/internal/schema/make.ts
@@ -2,50 +2,10 @@ import * as Pipeable from "../../Pipeable.ts"
 import type * as Schema from "../../Schema.ts"
 import * as SchemaAST from "../../SchemaAST.ts"
 import * as SchemaParser from "../../SchemaParser.ts"
-import type * as SchemaRepresentation from "../../SchemaRepresentation.ts"
 
 /** @internal */
 export const TypeId = "~effect/Schema/Schema"
 
-/** @internal */
-export function makeDeclarationReviver<P>(
-  id: string,
-  payloadSchema: Schema.Decoder<P>,
-  revive: SchemaRepresentation.DeclarationReviver<P>["revive"]
-): SchemaRepresentation.DeclarationReviver<P> {
-  return {
-    id,
-    payloadSchema,
-    revive
-  }
-}
-
-/** @internal */
-export function makeFilterReviver<P>(
-  id: string,
-  payloadSchema: Schema.Decoder<P>,
-  revive: SchemaRepresentation.FilterReviver<P>["revive"]
-): SchemaRepresentation.FilterReviver<P> {
-  return {
-    id,
-    payloadSchema,
-    revive
-  }
-}
-
-/** @internal */
-export function makeFilterGroupReviver<P>(
-  id: string,
-  payloadSchema: Schema.Decoder<P>,
-  revive: SchemaRepresentation.FilterGroupReviver<P>["revive"]
-): SchemaRepresentation.FilterGroupReviver<P> {
-  return {
-    id,
-    payloadSchema,
-    revive
-  }
-}
-
 const SchemaProto = {
   [TypeId]: TypeId,
   pipe() {
@@ -65,10 +25,15 @@ const SchemaProto = {
 /** @internal */
 export function make<S extends Schema.Constraint>(ast: S["ast"], options?: object): S {
   function Schema() {}
-  const self = Object.defineProperties(
-    Object.setPrototypeOf(Schema, SchemaProto),
-    Object.getOwnPropertyDescriptors({ ...options })
-  )
+  const self = Object.setPrototypeOf(Schema, SchemaProto)
+  if (
+    options &&
+    (Object.hasOwn(options, "name") || Object.hasOwn(options, "length") || Object.hasOwn(options, "__proto__"))
+  ) {
+    Object.defineProperties(self, Object.getOwnPropertyDescriptors({ ...options }))
+  } else {
+    Object.assign(self, options)
+  }
   self.ast = ast
   self.rebuild = (ast: SchemaAST.AST) => make(ast, options)
   self.makeEffect = SchemaParser.makeEffect(self)
diff --git a/repos/effect/packages/effect/src/internal/schema/parser.ts b/repos/effect/packages/effect/src/internal/schema/parser.ts
index 77bd15057..feb9aa8fa 100644
--- a/repos/effect/packages/effect/src/internal/schema/parser.ts
+++ b/repos/effect/packages/effect/src/internal/schema/parser.ts
@@ -2,21 +2,29 @@ import * as Exit from "../../Exit.ts"
 import * as Option from "../../Option.ts"
 import { args } from "../core.ts"
 
+/** @internal */
 export const missing = Symbol()
 
+/** @internal */
 export { args }
 
+/** @internal */
 export type Success<A, E = never> = Exit.Success<A, E> & { readonly [args]: A }
 
+/** @internal */
 export const succeed = Exit.succeed as <A>(value: A) => Success<A>
 
+/** @internal */
 export const missingExit = succeed(missing)
 
 // Shared success for a present input returned unchanged. It must be resolved
 // before crossing an asynchronous or transformation boundary.
+/** @internal */
 export const sameExit: Success<unknown> = succeed(missing)
 
+/** @internal */
 export const toOption = <A>(value: A): Option.Option<A> => value === missing ? Option.none() : Option.some(value as A)
 
+/** @internal */
 export const fromOptionExit = <A>(option: Option.Option<A>): Success<A | typeof missing> =>
   option._tag === "None" ? missingExit : succeed(option.value)
diff --git a/repos/effect/packages/effect/src/internal/schema/standardSchema.ts b/repos/effect/packages/effect/src/internal/schema/standardSchema.ts
new file mode 100644
index 000000000..66147c958
--- /dev/null
+++ b/repos/effect/packages/effect/src/internal/schema/standardSchema.ts
@@ -0,0 +1,125 @@
+import * as Cause from "../../Cause.ts"
+import * as Effect from "../../Effect.ts"
+import * as Exit from "../../Exit.ts"
+import * as JsonSchema from "../../JsonSchema.ts"
+import * as Scheduler from "../../Scheduler.ts"
+import type * as Schema from "../../Schema.ts"
+import * as SchemaAST from "../../SchemaAST.ts"
+import * as SchemaIssue from "../../SchemaIssue.ts"
+import * as SchemaParser from "../../SchemaParser.ts"
+import type { StandardJSONSchemaV1, StandardSchemaV1 } from "../../StandardSchema.ts"
+import * as InternalToCodec from "./toCodec.ts"
+import * as InternalToJsonSchemaDocument from "./toJsonSchemaDocument.ts"
+import * as InternalToRepresentation from "./toRepresentation.ts"
+
+function makeStandardResult<A>(exit: Exit.Exit<StandardSchemaV1.Result<A>>): StandardSchemaV1.Result<A> {
+  return Exit.isSuccess(exit) ? exit.value : {
+    issues: [{ message: Cause.pretty(exit.cause) }]
+  }
+}
+
+/** @internal */
+export function toStandardSchemaV1<S extends Schema.ConstraintDecoder<unknown>>(
+  self: S,
+  options?: {
+    readonly leafHook?: SchemaIssue.LeafHook | undefined
+    readonly checkHook?: SchemaIssue.CheckHook | undefined
+    readonly parseOptions?: SchemaAST.ParseOptions | undefined
+  }
+): StandardSchemaV1<S["Encoded"], S["Type"]> & S {
+  const decodeUnknownEffect = SchemaParser.decodeUnknownEffect(self) as (
+    input: unknown,
+    options?: SchemaAST.ParseOptions
+  ) => Effect.Effect<S["Type"], SchemaIssue.Issue>
+  const parseOptions: SchemaAST.ParseOptions = { errors: "all", ...options?.parseOptions }
+  const formatter = SchemaIssue.makeFormatterStandardSchemaV1(options)
+  const validate: StandardSchemaV1<S["Encoded"], S["Type"]>["~standard"]["validate"] = (value: unknown) => {
+    const scheduler = new Scheduler.MixedScheduler("sync")
+    const fiber = Effect.runFork(
+      Effect.match(decodeUnknownEffect(value, parseOptions), {
+        onFailure: formatter,
+        onSuccess: (value): StandardSchemaV1.Result<S["Type"]> => ({ value })
+      }),
+      { scheduler }
+    )
+    fiber.currentDispatcher?.flush()
+    const exit = fiber.pollUnsafe()
+    if (exit) {
+      return makeStandardResult(exit)
+    }
+    return new Promise((resolve) => {
+      fiber.addObserver((exit) => {
+        resolve(makeStandardResult(exit))
+      })
+    })
+  }
+  if ("~standard" in self) {
+    const out = self as any
+    if ("validate" in out["~standard"]) return out
+    Object.assign(out["~standard"], { validate })
+    return out
+  }
+  return Object.assign(self, {
+    "~standard": {
+      version: 1,
+      vendor: "effect",
+      validate
+    } as const
+  })
+}
+
+function toJsonSchemaDocument(ast: SchemaAST.AST): JsonSchema.Document<"draft-2020-12"> {
+  const document = InternalToRepresentation.toRepresentation(
+    InternalToCodec.toCodecJsonAST(ast)
+  )
+  return InternalToJsonSchemaDocument.toJsonSchemaDocument(document)
+}
+
+function toBaseStandardJSONSchemaV1(
+  ast: SchemaAST.AST,
+  target: StandardJSONSchemaV1.Target
+): JsonSchema.JsonSchema {
+  const doc2020_12 = toJsonSchemaDocument(ast)
+  if (target === "draft-2020-12") {
+    const schema = doc2020_12.schema
+    if (Object.keys(doc2020_12.definitions).length > 0) {
+      schema.$defs = doc2020_12.definitions
+    }
+    return schema
+  } else if (target === "draft-07") {
+    const doc07 = JsonSchema.toDocumentDraft07(doc2020_12)
+    const schema = doc07.schema
+    if (Object.keys(doc07.definitions).length > 0) {
+      schema.definitions = doc07.definitions
+    }
+    return schema
+  }
+  throw new globalThis.Error(`Unsupported target: ${target}`)
+}
+
+/** @internal */
+export function toStandardJSONSchemaV1<S extends Schema.Constraint>(
+  self: S
+): StandardJSONSchemaV1<S["Encoded"], S["Type"]> & S {
+  const jsonSchema: StandardJSONSchemaV1.Props<S["Encoded"], S["Type"]>["jsonSchema"] = {
+    input(options) {
+      return toBaseStandardJSONSchemaV1(self.ast, options.target)
+    },
+    output(options) {
+      return toBaseStandardJSONSchemaV1(SchemaAST.toType(self.ast), options.target)
+    }
+  }
+  if ("~standard" in self) {
+    const out = self as any
+    if ("jsonSchema" in out["~standard"]) return out
+    Object.assign(out["~standard"], { jsonSchema })
+    return out
+  }
+  return Object.assign(self, {
+    "~standard": {
+      version: 1,
+      vendor: "effect",
+      jsonSchema
+    } as const
+  })
+}
diff --git a/repos/effect/packages/effect/src/internal/schema/toCodeDocument.ts b/repos/effect/packages/effect/src/internal/schema/toCodeDocument.ts
index 0e6f1804f..68d587c9d 100644
--- a/repos/effect/packages/effect/src/internal/schema/toCodeDocument.ts
+++ b/repos/effect/packages/effect/src/internal/schema/toCodeDocument.ts
@@ -45,7 +45,7 @@ function renderEmittableAnnotation(input: unknown): string | undefined {
     if (rendered === undefined) return undefined
     entries.push(`${formatPropertyKey(key)}: ${rendered}`)
   }
-  return `{ ${entries.join(", ")} }`
+  return entries.length === 0 ? "{}" : `{ ${entries.join(", ")} }`
 }
 
 function renderAnnotations(
@@ -330,6 +330,11 @@ export function toCodeDocument(
     return rendered === undefined ? "" : `.${method}(${rendered})`
   }
 
+  function unionOptionsRuntime(options: NonNullable<SchemaRepresentation.Union["options"]>): string {
+    if (!Object.hasOwn(options, "mode")) return "{}"
+    return `{ mode: ${options.mode === undefined ? "undefined" : format(options.mode)} }`
+  }
+
   function compileCheck(
     check: SchemaRepresentation.Check,
     path: Path
@@ -479,86 +484,93 @@ export function toCodeDocument(
             `${element.isOptional ? "Schema.optionalKey(" : ""}${type.runtime}${element.isOptional ? ")" : ""}${
               runtimeAnnotate(element.annotations, "annotateKey")
             }`,
-            `${type.Type}${element.isOptional ? "?" : ""}`
+            element.isOptional ? `(${type.Type})?` : type.Type
           )
         })
         const rest = representation.rest.map((item, index) => recur(item, [...path, "rest", index]))
+        let code: SchemaRepresentation.Code
         if (Arr.isArrayNonEmpty(rest)) {
           const item = rest[0]
           if (elements.length === 0 && rest.length === 1) {
-            return makeCode(`Schema.Array(${item.runtime})`, `ReadonlyArray<${item.Type}>`)
+            code = makeCode(`Schema.Array(${item.runtime})`, `ReadonlyArray<${item.Type}>`)
+          } else {
+            const post = rest.slice(1)
+            code = makeCode(
+              `Schema.TupleWithRest(Schema.Tuple([${elements.map((element) => element.runtime).join(", ")}]), [${
+                rest.map((item) => item.runtime).join(", ")
+              }])`,
+              `readonly [${elements.map((element) => element.Type).join(", ")}, ...Array<${item.Type}>${
+                post.length > 0 ? `, ${post.map((item) => item.Type).join(", ")}` : ""
+              }]`
+            )
           }
-          const post = rest.slice(1)
-          return makeCode(
-            `Schema.TupleWithRest(Schema.Tuple([${elements.map((element) => element.runtime).join(", ")}]), [${
-              rest.map((item) => item.runtime).join(", ")
-            }])`,
-            `readonly [${elements.map((element) => element.Type).join(", ")}, ...Array<${item.Type}>${
-              post.length > 0 ? `, ${post.map((item) => item.Type).join(", ")}` : ""
-            }]`
+        } else {
+          code = makeCode(
+            `Schema.Tuple([${elements.map((element) => element.runtime).join(", ")}])`,
+            `readonly [${elements.map((element) => element.Type).join(", ")}]`
           )
         }
-        return makeCode(
-          `Schema.Tuple([${elements.map((element) => element.runtime).join(", ")}])`,
-          `readonly [${elements.map((element) => element.Type).join(", ")}]`
-        )
+        return code
       }
       case "Objects": {
         const properties = representation.propertySignatures.map((property, index) => {
           const isSymbol = typeof property.name === "symbol"
           const name = isSymbol
-            ? addSymbol(property.name)
+            ? `[${addSymbol(property.name)}]`
             : formatPropertyKey(property.name)
           const type = recur(property.type, [...path, "propertySignatures", index, "type"])
           let runtime = type.runtime
           if (property.isMutable) runtime = `Schema.mutableKey(${runtime})`
           if (property.isOptional) runtime = `Schema.optionalKey(${runtime})`
-          const runtimeName = isSymbol ? `[${name}]` : name
-          const typeName = `${property.isMutable ? "" : "readonly "}${runtimeName}${property.isOptional ? "?" : ""}`
-          return makeCode(
-            `${runtimeName}: ${runtime}${runtimeAnnotate(property.annotations, "annotateKey")}`,
-            `${typeName}: ${type.Type}`
-          )
+          runtime += runtimeAnnotate(property.annotations, "annotateKey")
+          const runtimeName = property.name === "__proto__" ? `[${name}]` : name
+          const typeName = `${property.isMutable ? "" : "readonly "}${name}${property.isOptional ? "?" : ""}`
+          return {
+            code: makeCode(`${runtimeName}: ${runtime}`, `${typeName}: ${type.Type}`)
+          }
         })
         const indexSignatures = representation.indexSignatures.map((signature, index) => ({
           parameter: recur(signature.parameter, [...path, "indexSignatures", index, "parameter"]),
           type: recur(signature.type, [...path, "indexSignatures", index, "type"])
         }))
-        const propertyRuntimes = properties.map((property) => property.runtime).join(", ")
-        const propertyTypes = properties.map((property) => property.Type).join(", ")
+        const propertyRuntimes = properties.map((property) => property.code.runtime).join(", ")
+        const propertyTypes = properties.map((property) => property.code.Type).join(", ")
+        let code: SchemaRepresentation.Code
         if (indexSignatures.length === 0) {
-          return makeCode(
+          code = makeCode(
             `Schema.Struct({ ${propertyRuntimes} })`,
             `{ ${propertyTypes} }`
           )
-        }
-        if (properties.length === 0 && indexSignatures.length === 1) {
+        } else if (properties.length === 0 && indexSignatures.length === 1) {
           const signature = indexSignatures[0]
-          return makeCode(
+          code = makeCode(
             `Schema.Record(${signature.parameter.runtime}, ${signature.type.runtime})`,
             `{ readonly [x: ${signature.parameter.Type}]: ${signature.type.Type} }`
           )
-        }
-        const indexRuntimes = indexSignatures.map((signature) =>
-          `Schema.Record(${signature.parameter.runtime}, ${signature.type.runtime})`
-        ).join(", ")
-        const indexTypes = indexSignatures.map((signature) =>
-          `readonly [x: ${signature.parameter.Type}]: ${signature.type.Type}`
-        )
-        if (properties.length === 0) {
-          return makeCode(
-            `Schema.StructWithRest(Schema.Struct({ ${propertyRuntimes} }), [${indexRuntimes}])`,
-            `{ ${indexTypes.join(", ")} }`
+        } else {
+          const indexRuntimes = indexSignatures.map((signature) =>
+            `Schema.Record(${signature.parameter.runtime}, ${signature.type.runtime})`
+          ).join(", ")
+          const indexTypes = indexSignatures.map((signature) =>
+            `readonly [x: ${signature.parameter.Type}]: ${signature.type.Type}`
           )
+          code = properties.length === 0
+            ? makeCode(
+              `Schema.StructWithRest(Schema.Struct({ ${propertyRuntimes} }), [${indexRuntimes}])`,
+              `{ ${indexTypes.join(", ")} }`
+            )
+            : makeCode(
+              `Schema.StructWithRest(Schema.Struct({ ${propertyRuntimes} }), [${indexRuntimes}])`,
+              [`{ ${propertyTypes} }`, ...indexTypes.map((indexType) => `{ ${indexType} }`)].join(" & ")
+            )
         }
-        return makeCode(
-          `Schema.StructWithRest(Schema.Struct({ ${propertyRuntimes} }), [${indexRuntimes}])`,
-          [`{ ${propertyTypes} }`, ...indexTypes.map((indexType) => `{ ${indexType} }`)].join(" & ")
-        )
+        return code
       }
       case "Union": {
-        if (representation.types.length === 0) return makeCode("Schema.Never", "never")
-        if (representation.types.every(isSimpleLiveLiteral)) {
+        if (representation.options === undefined && representation.types.length === 0) {
+          return makeCode("Schema.Never", "never")
+        }
+        if (representation.options === undefined && representation.types.every(isSimpleLiveLiteral)) {
           const literals = representation.types.map((literal) => format(literal.literal))
           return literals.length === 1
             ? makeCode(`Schema.Literal(${literals[0]})`, literals[0])
@@ -567,10 +579,12 @@ export function toCodeDocument(
         const types = representation.types.map((type, index) =>
           recur(type, [...path, "types", index], includeTypeBrands)
         )
-        const mode = representation.mode === "anyOf" ? "" : `, { mode: "oneOf" }`
+        const options = representation.options === undefined
+          ? ""
+          : `, ${unionOptionsRuntime(representation.options)}`
         return makeCode(
-          `Schema.Union([${types.map((type) => type.runtime).join(", ")}]${mode})`,
-          types.map((type) => type.Type).join(" | ")
+          `Schema.Union([${types.map((type) => type.runtime).join(", ")}]${options})`,
+          types.length === 0 ? "never" : types.map((type) => type.Type).join(" | ")
         )
       }
     }
diff --git a/repos/effect/packages/effect/src/internal/schema/toCodec.ts b/repos/effect/packages/effect/src/internal/schema/toCodec.ts
new file mode 100644
index 000000000..d73ca2816
--- /dev/null
+++ b/repos/effect/packages/effect/src/internal/schema/toCodec.ts
@@ -0,0 +1,312 @@
+import { memoize } from "../../Function.ts"
+import * as Predicate from "../../Predicate.ts"
+import type * as PublicSchema from "../../Schema.ts"
+import * as SchemaAST from "../../SchemaAST.ts"
+import * as SchemaGetter from "../../SchemaGetter.ts"
+import * as InternalTransformation from "../../SchemaTransformation.ts"
+import * as InternalMake from "./make.ts"
+
+/** @internal */
+export function toCodecJson<S extends PublicSchema.Constraint>(schema: S): PublicSchema.toCodecJson<S> {
+  return InternalMake.make(toCodecJsonAST(schema.ast), { schema })
+}
+
+/** @internal */
+export const toCodecJsonAST = SchemaAST.applyToSelfOrLastLinkEncodingIdempotent((ast) => {
+  const out = toCodecJsonASTStep(ast, toCodecJsonAST)
+  const context = ast.context
+  if (out === ast || context === undefined) return out
+  return SchemaAST.replaceContextLastLink(out, withoutConstructorDefault(context))
+})
+
+function withoutConstructorDefault(context: SchemaAST.Context): SchemaAST.Context {
+  return context.constructorDefault === undefined ?
+    context :
+    new SchemaAST.Context(context.isOptional, context.isMutable, undefined, context.annotations)
+}
+
+function validateCanonicalObjectPropertyNames(ast: SchemaAST.Objects): void {
+  if (ast.propertySignatures.some((ps) => typeof ps.name !== "string")) {
+    throw new globalThis.Error("Objects property names must be strings", { cause: ast })
+  }
+}
+
+function makeReorder(getPriority: (ast: SchemaAST.AST) => number) {
+  return (types: ReadonlyArray<SchemaAST.AST>): ReadonlyArray<SchemaAST.AST> => {
+    // Create a map of original indices for O(1) lookup
+    const indexMap = new Map<SchemaAST.AST, number>()
+    for (let i = 0; i < types.length; i++) {
+      indexMap.set(SchemaAST.toEncoded(types[i]), i)
+    }
+
+    // Create a sorted copy of the types array
+    const sortedTypes = [...types].sort((a, b) => {
+      a = SchemaAST.toEncoded(a)
+      b = SchemaAST.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
+  }
+}
+
+const toCodecJsonReorder = makeReorder((ast: SchemaAST.AST) => {
+  switch (ast._tag) {
+    case "BigInt":
+    case "Symbol":
+    case "UniqueSymbol":
+      return 0
+    default:
+      return 1
+  }
+})
+
+function toCodecJsonASTStep(ast: SchemaAST.AST, recur: (ast: SchemaAST.AST) => SchemaAST.AST): SchemaAST.AST {
+  switch (ast._tag) {
+    case "Declaration": {
+      const getLink = ast.annotations?.toCodecJson ?? ast.annotations?.toCodec
+      if (!Predicate.isFunction(getLink)) {
+        return SchemaAST.replaceEncoding(ast, [SchemaAST.unknownToJson])
+      }
+      const typeParameters = ast.typeParameters.map((tp) => InternalMake.make(SchemaAST.toEncoded(tp)))
+      const link = getLink(typeParameters)
+      return link === undefined ? ast : SchemaAST.replaceEncoding(ast, [SchemaAST.mapLink(link, recur)])
+    }
+    case "Unknown":
+      return SchemaAST.replaceEncoding(ast, [SchemaAST.unknownToJson])
+    case "ObjectKeyword":
+      return SchemaAST.replaceEncoding(ast, [SchemaAST.objectKeywordToJson])
+    case "Undefined":
+    case "Void":
+    case "Literal":
+    case "Number":
+      return ast.toCodecJson()
+    case "UniqueSymbol":
+    case "Symbol":
+    case "BigInt":
+      return ast.toCodecStringTree()
+    case "Objects": {
+      validateCanonicalObjectPropertyNames(ast)
+      return ast.recur(recur, SchemaAST.parameterFromString)
+    }
+    case "Union": {
+      const sortedTypes = toCodecJsonReorder(ast.types)
+      if (sortedTypes !== ast.types) {
+        return new SchemaAST.Union(
+          sortedTypes,
+          ast.options,
+          ast.annotations,
+          ast.checks,
+          ast.encoding,
+          ast.context,
+          ast.encodingChecks
+        ).recur(recur)
+      }
+      return ast.recur(recur)
+    }
+    case "Arrays":
+    case "Suspend":
+      return ast.recur(recur)
+  }
+  // `Schema.Any` is used as an escape hatch
+  return ast
+}
+
+/** @internal */
+export function toCodecIso<S extends PublicSchema.Constraint>(
+  schema: S
+): PublicSchema.Codec<S["Type"], S["Iso"]> {
+  return InternalMake.make(toCodecIsoAST(SchemaAST.toType(schema.ast)))
+}
+
+const toCodecIsoAST = memoize((ast: SchemaAST.AST): SchemaAST.AST => {
+  const out = toCodecIsoASTStep(ast, toCodecIsoAST)
+  return out !== ast && ast.context !== undefined ?
+    SchemaAST.replaceContextLastLink(out, withoutConstructorDefault(ast.context)) :
+    out
+})
+
+function toCodecIsoASTStep(ast: SchemaAST.AST, recur: (ast: SchemaAST.AST) => SchemaAST.AST): SchemaAST.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) => InternalMake.make(tp)))
+        return SchemaAST.replaceEncoding(ast, [SchemaAST.mapLink(link, recur)])
+      }
+      return ast
+    }
+    case "Arrays":
+    case "Objects":
+    case "Union":
+    case "Suspend":
+      return ast.recur(recur)
+  }
+  return ast
+}
+
+/** @internal */
+export function toCodecStringTree<S extends PublicSchema.Constraint>(
+  schema: S
+): PublicSchema.toCodecStringTree<S> {
+  return InternalMake.make(toCodecStringTreeAST(schema.ast), { schema })
+}
+
+/** @internal */
+export function toCodecArrayFromSingle<S extends PublicSchema.Constraint>(
+  schema: S
+): PublicSchema.toCodecArrayFromSingle<S> {
+  return InternalMake.make(toCodecArrayFromSingleAST(schema.ast))
+}
+
+const toStringTreeReorder = makeReorder((ast: SchemaAST.AST) => {
+  switch (ast._tag) {
+    case "Null":
+    case "Boolean":
+    case "Number":
+    case "BigInt":
+    case "Symbol":
+    case "UniqueSymbol":
+      return 0
+    default:
+      return 1
+  }
+})
+
+function toCodecStringTreeASTStep(
+  ast: SchemaAST.AST,
+  recur: (ast: SchemaAST.AST) => SchemaAST.AST,
+  onMissingAnnotation: (ast: SchemaAST.AST) => SchemaAST.AST
+): SchemaAST.AST {
+  switch (ast._tag) {
+    case "Declaration": {
+      const typeParameters = ast.typeParameters.map((tp) => InternalMake.make(recur(SchemaAST.toEncoded(tp))))
+      const getStringTreeLink = ast.annotations?.toCodecStringTree
+      if (Predicate.isFunction(getStringTreeLink)) {
+        const link = getStringTreeLink(typeParameters)
+        if (link === undefined) return ast
+        return SchemaAST.replaceEncoding(ast, [SchemaAST.mapLink(link, recur)])
+      }
+      const getJsonLink = ast.annotations?.toCodecJson
+      const jsonLink = Predicate.isFunction(getJsonLink) ? getJsonLink(typeParameters) : undefined
+      const getLink = jsonLink === undefined ? ast.annotations?.toCodec : undefined
+      const link = jsonLink ?? (Predicate.isFunction(getLink) ? getLink(typeParameters) : undefined)
+      return link === undefined
+        ? onMissingAnnotation(ast)
+        : SchemaAST.replaceEncoding(ast, [SchemaAST.mapLink(link, recur)])
+    }
+    case "Null":
+      return SchemaAST.replaceEncoding(ast, [nullToString])
+    case "Boolean":
+      return SchemaAST.replaceEncoding(ast, [booleanToString])
+    case "Unknown":
+    case "ObjectKeyword":
+      return SchemaAST.replaceEncoding(ast, [SchemaAST.unknownToStringTree])
+    case "Enum":
+    case "Number":
+    case "Literal":
+    case "UniqueSymbol":
+    case "Symbol":
+    case "BigInt":
+      return ast.toCodecStringTree()
+    case "Objects": {
+      validateCanonicalObjectPropertyNames(ast)
+      return ast.recur(recur, SchemaAST.parameterFromString)
+    }
+    case "Union": {
+      const sortedTypes = toStringTreeReorder(ast.types)
+      if (sortedTypes !== ast.types) {
+        return new SchemaAST.Union(
+          sortedTypes,
+          ast.options,
+          ast.annotations,
+          ast.checks,
+          ast.encoding,
+          ast.context,
+          ast.encodingChecks
+        ).recur(recur)
+      }
+      return ast.recur(recur)
+    }
+    case "Arrays":
+    case "Suspend":
+      return ast.recur(recur)
+  }
+  // `Schema.Any` is used as an escape hatch
+  return ast
+}
+
+const nullToString = new SchemaAST.Link(
+  new SchemaAST.Literal("null"),
+  new InternalTransformation.Transformation(
+    SchemaGetter.transform(() => null),
+    SchemaGetter.transform(() => "null")
+  )
+)
+
+const booleanToString = new SchemaAST.Link(
+  new SchemaAST.Union([new SchemaAST.Literal("true"), new SchemaAST.Literal("false")]),
+  new InternalTransformation.Transformation(
+    SchemaGetter.transform((s) => s === "true"),
+    SchemaGetter.String()
+  )
+)
+
+const arrayFromSingleTransformation = new InternalTransformation.Transformation(
+  SchemaGetter.transform((input: ReadonlyArray<unknown> | string) => typeof input === "string" ? [input] : input),
+  SchemaGetter.passthrough()
+)
+
+const isCodecArrayFromSingleLink = (link: SchemaAST.Link): boolean =>
+  link.transformation === arrayFromSingleTransformation
+
+const toCodecStringTreeAST = SchemaAST.applyToSelfOrLastLinkEncodingIdempotent((ast) => {
+  const out = toCodecStringTreeASTStep(ast, toCodecStringTreeAST, (ast) => {
+    throw new globalThis.Error("Missing structural codec for StringTree", { cause: ast })
+  })
+  if (out !== ast && ast.context !== undefined) {
+    return SchemaAST.replaceContextLastLink(out, withoutConstructorDefault(ast.context))
+  }
+  return out
+}, { stopAt: isCodecArrayFromSingleLink })
+
+const toArrayFromSingleInputElement = (ast: SchemaAST.AST): SchemaAST.AST =>
+  SchemaAST.isOptional(ast) ? SchemaAST.optionalKey(SchemaAST.unknown) : SchemaAST.unknown
+
+const toCodecArrayFromSingleAST = SchemaAST.applyToSelfOrLastLinkEncodingIdempotent((ast) => {
+  const out = toCodecArrayFromSingleASTStep(ast)
+  if (SchemaAST.isArrays(out)) {
+    const ensure = SchemaAST.decodeTo(
+      new SchemaAST.Union(
+        [
+          new SchemaAST.Arrays(
+            out.isMutable,
+            out.elements.map(toArrayFromSingleInputElement),
+            out.rest.map(toArrayFromSingleInputElement)
+          ),
+          SchemaAST.string
+        ],
+        { mode: "anyOf" }
+      ),
+      out,
+      arrayFromSingleTransformation
+    )
+    return SchemaAST.isOptional(ast) ? SchemaAST.optionalKey(ensure) : ensure
+  }
+  return out
+}, { stopAt: isCodecArrayFromSingleLink })
+
+function toCodecArrayFromSingleASTStep(ast: SchemaAST.AST): SchemaAST.AST {
+  return ast._tag === "Declaration" || ast._tag === "Arrays" || ast._tag === "Objects" || ast._tag === "Union" ||
+      ast._tag === "Suspend"
+    ? ast.recur(toCodecArrayFromSingleAST)
+    : ast
+}
diff --git a/repos/effect/packages/effect/src/internal/schema/toDifferJsonPatch.ts b/repos/effect/packages/effect/src/internal/schema/toDifferJsonPatch.ts
new file mode 100644
index 000000000..cc68ec325
--- /dev/null
+++ b/repos/effect/packages/effect/src/internal/schema/toDifferJsonPatch.ts
@@ -0,0 +1,24 @@
+import type { Differ } from "../../Differ.ts"
+import * as JsonPatch from "../../JsonPatch.ts"
+import type * as Schema from "../../Schema.ts"
+import * as SchemaParser from "../../SchemaParser.ts"
+import * as InternalToCodec from "./toCodec.ts"
+
+/** @internal */
+export function toDifferJsonPatch<T>(
+  schema: Schema.ConstraintCodec<T, unknown>
+): Differ<T, JsonPatch.JsonPatch> {
+  const serializer = InternalToCodec.toCodecJson(schema)
+  const get = SchemaParser.encodeSync(serializer)
+  const set = SchemaParser.decodeSync(serializer)
+  return {
+    empty: [],
+    diff: (oldValue, newValue) => JsonPatch.get(get(oldValue), get(newValue)),
+    combine: (first, second) => [...first, ...second],
+    patch: (oldValue, patch) => {
+      const value = get(oldValue)
+      const patched = JsonPatch.apply(patch, value)
+      return Object.is(patched, value) ? oldValue : set(patched)
+    }
+  }
+}
diff --git a/repos/effect/packages/effect/src/internal/schema/toEncoderXml.ts b/repos/effect/packages/effect/src/internal/schema/toEncoderXml.ts
new file mode 100644
index 000000000..9a60890f9
--- /dev/null
+++ b/repos/effect/packages/effect/src/internal/schema/toEncoderXml.ts
@@ -0,0 +1,110 @@
+import * as Effect from "../../Effect.ts"
+import { format } from "../../Formatter.ts"
+import type * as Schema from "../../Schema.ts"
+import * as SchemaParser from "../../SchemaParser.ts"
+import * as InternalAnnotations from "./annotations.ts"
+import * as InternalToCodec from "./toCodec.ts"
+
+interface XmlEncoderOptions {
+  readonly rootName?: string | undefined
+  readonly arrayItemName?: string | undefined
+  readonly pretty?: boolean | undefined
+  readonly indent?: string | undefined
+  readonly sortKeys?: boolean | undefined
+}
+
+/** @internal */
+export function toEncoderXml<T, RE>(
+  codec: Schema.ConstraintCodec<T, unknown, unknown, RE>,
+  options?: XmlEncoderOptions
+) {
+  const rootName = InternalAnnotations.resolveIdentifier(codec.ast) ?? InternalAnnotations.resolveTitle(codec.ast)
+  const serialize = SchemaParser.encodeEffect(InternalToCodec.toCodecStringTree(codec))
+  return (value: T) =>
+    serialize(value).pipe(Effect.map((stringTree) => stringTreeToXml(stringTree, { rootName, ...options })))
+}
+
+function stringTreeToXml(value: Schema.StringTree, options: XmlEncoderOptions): string {
+  const rootName = options.rootName ?? "root"
+  const arrayItemName = options.arrayItemName ?? "item"
+  const pretty = options.pretty ?? true
+  const indent = options.indent ?? "  "
+  const sortKeys = options.sortKeys ?? true
+
+  const seen = new Set<object>()
+  const lines: Array<string> = []
+
+  recur(rootName, value, 0)
+  return lines.join(pretty ? "\n" : "")
+
+  function push(depth: number, text: string): void {
+    lines.push(pretty ? indent.repeat(depth) + text : text)
+  }
+
+  function recur(tagName: string, node: Schema.StringTree, depth: number, originalNameForMeta?: string): void {
+    const { attrs, safe } = xml.tagInfo(tagName, originalNameForMeta)
+
+    if (node === undefined) {
+      push(depth, `<${safe}${attrs}/>`)
+    } else if (typeof node === "string") {
+      push(depth, `<${safe}${attrs}>${xml.escapeText(node)}</${safe}>`)
+    } else if (typeof node !== "object" || node === null) {
+      push(depth, `<${safe}${attrs}>${xml.escapeText(format(node))}</${safe}>`)
+    } else {
+      if (seen.has(node)) throw new globalThis.Error("Cycle detected while serializing to XML.", { cause: node })
+      seen.add(node)
+      try {
+        if (globalThis.Array.isArray(node)) {
+          if (node.length === 0) {
+            push(depth, `<${safe}${attrs}/>`)
+            return
+          }
+          push(depth, `<${safe}${attrs}>`)
+          for (const item of node) recur(arrayItemName, item, depth + 1)
+          push(depth, `</${safe}>`)
+          return
+        }
+
+        const object = node as Record<string, Schema.StringTree>
+        const keys = Object.keys(object)
+        if (sortKeys) keys.sort()
+
+        if (keys.length === 0) {
+          push(depth, `<${safe}${attrs}/>`)
+          return
+        }
+
+        push(depth, `<${safe}${attrs}>`)
+        for (const key of keys) {
+          recur(xml.parseTagName(key).safe, object[key], depth + 1, key)
+        }
+        push(depth, `</${safe}>`)
+      } finally {
+        seen.delete(node)
+      }
+    }
+  }
+}
+
+const xml = {
+  escapeText(value: string): string {
+    return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")
+  },
+  escapeAttribute(value: string): string {
+    return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;")
+  },
+  parseTagName(name: string): { safe: string; changed: boolean } {
+    const original = name
+    let safe = name
+    if (!/^[A-Za-z_]/.test(safe)) safe = "_" + safe
+    safe = safe.replace(/[^A-Za-z0-9._-]/g, "_")
+    if (/^xml/i.test(safe)) safe = "_" + safe
+    return { safe, changed: safe !== original }
+  },
+  tagInfo(name: string, original?: string): { safe: string; attrs: string } {
+    const { changed, safe } = xml.parseTagName(name)
+    const needsMeta = changed || (original && original !== name)
+    const attrs = needsMeta ? ` data-name="${xml.escapeAttribute(original ?? name)}"` : ""
+    return { safe, attrs }
+  }
+}
diff --git a/repos/effect/packages/effect/src/internal/schema/toEquivalence.ts b/repos/effect/packages/effect/src/internal/schema/toEquivalence.ts
index 6fd9646bb..5032387d3 100644
--- a/repos/effect/packages/effect/src/internal/schema/toEquivalence.ts
+++ b/repos/effect/packages/effect/src/internal/schema/toEquivalence.ts
@@ -153,8 +153,8 @@ function recur(ast: SchemaAST.AST, path: ReadonlyArray<PropertyKey>): Equivalenc
       })
     }
     case "Suspend": {
-      const get = SchemaAST.memoizeThunk(() => recur(ast.thunk(), path))
-      return Equivalence.make((a, b) => get()(a, b))
+      let equivalence: Equivalence.Equivalence<any>
+      return Equivalence.make((a, b) => (equivalence ??= recur(ast.thunk(), path))(a, b))
     }
   }
 }
diff --git a/repos/effect/packages/effect/src/internal/schema/toFormatter.ts b/repos/effect/packages/effect/src/internal/schema/toFormatter.ts
new file mode 100644
index 000000000..21eef24e3
--- /dev/null
+++ b/repos/effect/packages/effect/src/internal/schema/toFormatter.ts
@@ -0,0 +1,230 @@
+import type * as Cause from "../../Cause.ts"
+import * as Chunk from "../../Chunk.ts"
+import type * as Exit from "../../Exit.ts"
+import type { Formatter } from "../../Formatter.ts"
+import { format, formatPropertyKey } from "../../Formatter.ts"
+import * as HashMap from "../../HashMap.ts"
+import * as HashSet from "../../HashSet.ts"
+import * as Option from "../../Option.ts"
+import * as Result from "../../Result.ts"
+import type * as Schema from "../../Schema.ts"
+import * as SchemaAST from "../../SchemaAST.ts"
+import * as SchemaParser from "../../SchemaParser.ts"
+import * as InternalAnnotations from "./annotations.ts"
+
+function causeReasonToFormatter<E>(error: Formatter<E>, defect: Formatter<unknown>) {
+  return (reason: Cause.Reason<E>) => {
+    switch (reason._tag) {
+      case "Fail":
+        return `Fail(${error(reason.error)})`
+      case "Die":
+        return `Die(${defect(reason.defect)})`
+      case "Interrupt":
+        return "Interrupt"
+    }
+  }
+}
+
+function causeToFormatter<E>(error: Formatter<E>, defect: Formatter<unknown>) {
+  const causeReason = causeReasonToFormatter(error, defect)
+  return (cause: Cause.Cause<E>) => `Cause([${cause.reasons.map(causeReason).join(", ")}])`
+}
+
+/** @internal */
+export function toFormatter<T>(ast: SchemaAST.AST, options?: {
+  readonly onBefore?:
+    | ((ast: SchemaAST.AST, recur: (ast: SchemaAST.AST) => Formatter<any>) => Formatter<any> | undefined)
+    | undefined
+}): Formatter<T> {
+  return recur(ast)
+
+  function recur(ast: SchemaAST.AST): Formatter<any> {
+    const annotation = InternalAnnotations.resolve(ast)?.["toFormatter"]
+    if (typeof annotation === "function") {
+      return annotation(SchemaAST.isDeclaration(ast) ? ast.typeParameters.map(recur) : [])
+    }
+    if (options?.onBefore) {
+      const onBefore = options.onBefore(ast, recur)
+      if (onBefore !== undefined) {
+        return onBefore
+      }
+    }
+    return on(ast)
+  }
+
+  function on(ast: SchemaAST.AST): Formatter<any> {
+    switch (ast._tag) {
+      default:
+        return format
+      case "Never":
+        return () => "never"
+      case "Void":
+        return () => "void"
+      case "Declaration": {
+        const representation = (ast.annotations as Schema.Annotations.Declaration<any> | undefined)?.representation
+        if (representation === undefined) return format
+        const typeParameters = ast.typeParameters.map(recur)
+        switch (representation.id) {
+          case "effect/schema/Option": {
+            const [value] = typeParameters
+            return Option.match({
+              onNone: () => "none()",
+              onSome: (value_) => `some(${value(value_)})`
+            })
+          }
+          case "effect/schema/Result": {
+            const [success, failure] = typeParameters
+            return Result.match({
+              onSuccess: (value) => `success(${success(value)})`,
+              onFailure: (error) => `failure(${failure(error)})`
+            })
+          }
+          case "effect/schema/CauseReason":
+            return causeReasonToFormatter(typeParameters[0], typeParameters[1])
+          case "effect/schema/Cause":
+            return causeToFormatter(typeParameters[0], typeParameters[1])
+          case "effect/schema/Exit": {
+            const [value, error, defect] = typeParameters
+            const cause = causeToFormatter(error, defect)
+            return (exit: Exit.Exit<unknown, unknown>) => {
+              switch (exit._tag) {
+                case "Success":
+                  return `Exit.Success(${value(exit.value)})`
+                case "Failure":
+                  return `Exit.Failure(${cause(exit.cause)})`
+              }
+            }
+          }
+          case "effect/schema/ReadonlyMap": {
+            const [key, value] = typeParameters
+            return (map: globalThis.ReadonlyMap<unknown, unknown>) => {
+              const size = map.size
+              if (size === 0) return "ReadonlyMap(0) {}"
+              const entries = globalThis.Array.from(map.entries()).sort().map(([key_, value_]) =>
+                `${key(key_)} => ${value(value_)}`
+              )
+              return `ReadonlyMap(${size}) { ${entries.join(", ")} }`
+            }
+          }
+          case "effect/schema/HashMap": {
+            const [key, value] = typeParameters
+            return (map: HashMap.HashMap<unknown, unknown>) => {
+              const size = HashMap.size(map)
+              if (size === 0) return "HashMap(0) {}"
+              const entries = HashMap.toEntries(map).sort().map(([key_, value_]) => `${key(key_)} => ${value(value_)}`)
+              return `HashMap(${size}) { ${entries.join(", ")} }`
+            }
+          }
+          case "effect/schema/ReadonlySet": {
+            const [value] = typeParameters
+            return (set: globalThis.ReadonlySet<unknown>) => {
+              const size = set.size
+              if (size === 0) return "ReadonlySet(0) {}"
+              const values = globalThis.Array.from(set.values()).sort().map((item) => `${value(item)}`)
+              return `ReadonlySet(${size}) { ${values.join(", ")} }`
+            }
+          }
+          case "effect/schema/HashSet": {
+            const [value] = typeParameters
+            return (set: HashSet.HashSet<unknown>) => {
+              const size = HashSet.size(set)
+              if (size === 0) return "HashSet(0) {}"
+              const values = globalThis.Array.from(set).sort().map((item) => `${value(item)}`)
+              return `HashSet(${size}) { ${values.join(", ")} }`
+            }
+          }
+          case "effect/schema/Chunk": {
+            const [value] = typeParameters
+            return (chunk: Chunk.Chunk<unknown>) => {
+              const size = Chunk.size(chunk)
+              if (size === 0) return "Chunk(0) {}"
+              const values = globalThis.Array.from(chunk).sort().map((item) => `${value(item)}`)
+              return `Chunk(${size}) { ${values.join(", ")} }`
+            }
+          }
+          default:
+            return format
+        }
+      }
+      case "Arrays": {
+        const elements = ast.elements.map((element) => recur(element))
+        const rest = ast.rest.map(recur)
+        return (value) => {
+          const out: Array<string> = []
+          let i = 0
+          for (; i < elements.length; i++) {
+            if (value.length < i + 1) {
+              if (SchemaAST.isOptional(ast.elements[i])) {
+                continue
+              }
+            } else {
+              out.push(elements[i](value[i]))
+            }
+          }
+          if (rest.length > 0) {
+            const [head, ...tail] = rest
+            for (; i < value.length - tail.length; i++) {
+              out.push(head(value[i]))
+            }
+            for (let j = 0; j < tail.length; j++) {
+              out.push(tail[j](value[i + j]))
+            }
+          }
+          return "[" + out.join(", ") + "]"
+        }
+      }
+      case "Objects": {
+        const propertySignatures = ast.propertySignatures.map((signature) => recur(signature.type))
+        const indexSignatures = ast.indexSignatures.map((signature) => recur(signature.type))
+        if (ast.propertySignatures.length === 0 && ast.indexSignatures.length === 0) {
+          return format
+        }
+        return (value) => {
+          const out: Array<string> = []
+          const visited = new Set<PropertyKey>()
+          for (let i = 0; i < propertySignatures.length; i++) {
+            const signature = ast.propertySignatures[i]
+            const name = signature.name
+            visited.add(name)
+            if (SchemaAST.isOptional(signature.type) && !Object.hasOwn(value, name)) {
+              continue
+            }
+            out.push(`${formatPropertyKey(name)}: ${propertySignatures[i](value[name])}`)
+          }
+          for (let i = 0; i < indexSignatures.length; i++) {
+            const keys = SchemaAST.getIndexSignatureKeys(value, ast.indexSignatures[i].parameter)
+            for (const key of keys) {
+              if (visited.has(key)) {
+                continue
+              }
+              visited.add(key)
+              out.push(`${formatPropertyKey(key)}: ${indexSignatures[i](value[key])}`)
+            }
+          }
+          return out.length > 0 ? "{ " + out.join(", ") + " }" : "{}"
+        }
+      }
+      case "Union": {
+        const types = SchemaAST.toType(ast).types
+        const getCandidates = (value: any) => SchemaAST.getCandidates(value, types)
+        const compiled = new Map(
+          types.map((candidate, i) => [candidate, [SchemaParser._is(candidate), recur(ast.types[i])] as const] as const)
+        )
+        return (value) => {
+          const candidates = getCandidates(value)
+          for (let i = 0; i < candidates.length; i++) {
+            const [is, formatter] = compiled.get(candidates[i])!
+            if (is(value)) {
+              return formatter(value)
+            }
+          }
+          return format(value)
+        }
+      }
+      case "Suspend": {
+        let formatter: Formatter<any>
+        return (value) => (formatter ??= recur(ast.thunk()))(value)
+      }
+    }
+  }
+}
diff --git a/repos/effect/packages/effect/src/internal/schema/toIso.ts b/repos/effect/packages/effect/src/internal/schema/toIso.ts
new file mode 100644
index 000000000..fceff5553
--- /dev/null
+++ b/repos/effect/packages/effect/src/internal/schema/toIso.ts
@@ -0,0 +1,20 @@
+import * as Optic from "../../Optic.ts"
+import type * as Schema from "../../Schema.ts"
+import * as SchemaParser from "../../SchemaParser.ts"
+import * as InternalToCodec from "./toCodec.ts"
+
+/** @internal */
+export function toIso<S extends Schema.Constraint>(schema: S): Optic.Iso<S["Type"], S["Iso"]> {
+  const serializer = InternalToCodec.toCodecIso(schema)
+  return Optic.makeIso(SchemaParser.encodeSync(serializer), SchemaParser.decodeSync(serializer))
+}
+
+/** @internal */
+export function toIsoSource<S extends Schema.Constraint>(_: S): Optic.Iso<S["Type"], S["Type"]> {
+  return Optic.id()
+}
+
+/** @internal */
+export function toIsoFocus<S extends Schema.Constraint>(_: S): Optic.Iso<S["Iso"], S["Iso"]> {
+  return Optic.id()
+}
diff --git a/repos/effect/packages/effect/src/internal/schema/toJsonSchemaDocument.ts b/repos/effect/packages/effect/src/internal/schema/toJsonSchemaDocument.ts
index a7194d2e8..ae5dd5584 100644
--- a/repos/effect/packages/effect/src/internal/schema/toJsonSchemaDocument.ts
+++ b/repos/effect/packages/effect/src/internal/schema/toJsonSchemaDocument.ts
@@ -1,11 +1,11 @@
 import * as Arr from "../../Array.ts"
 import * as Equal from "../../Equal.ts"
-import { escapeToken, unescapeToken } from "../../JsonPointer.ts"
+import { decodeUriFragment, formatUriFragmentToken, unescapeToken } from "../../JsonPointer.ts"
 import type * as JsonSchema from "../../JsonSchema.ts"
 import { rewriteRefs } from "../../JsonSchema.ts"
 import * as RegEx from "../../RegExp.ts"
 import type * as Schema from "../../Schema.ts"
-import * as SchemaAST from "../../SchemaAST.ts"
+import * as InternalAST from "../../SchemaAST.ts"
 import type * as SchemaRepresentation from "../../SchemaRepresentation.ts"
 import { errorWithPath } from "../errors.ts"
 import * as InternalRecord from "../record.ts"
@@ -16,6 +16,10 @@ type CheckRepresentationAnnotation = SchemaRepresentation.CheckRepresentationAnn
   SchemaRepresentation.Representation
 >
 
+function formatDefinitionReference(key: string): string {
+  return `#/$defs/${formatUriFragmentToken(key)}`
+}
+
 const jsonSchemaAnnotationExcludedKeys = new Set([
   ...InternalAnnotations.annotationExcludedKeys,
   InternalAnnotations.IDENTIFIER_FALLBACK_KEY,
@@ -37,9 +41,9 @@ function collectJsonSchemaAnnotations(
   else if (options?.generateDescriptions === true && typeof expected === "string") out.description = expected
 
   const defaultValue = annotations.default
-  if (SchemaAST.isJson(defaultValue)) out.default = defaultValue
+  if (InternalAST.isJson(defaultValue)) out.default = defaultValue
   const examples = annotations.examples
-  if (Array.isArray(examples) && SchemaAST.isJson(examples)) out.examples = examples
+  if (Array.isArray(examples) && InternalAST.isJson(examples)) out.examples = examples
   const readOnly = annotations.readOnly
   if (typeof readOnly === "boolean") out.readOnly = readOnly
   const writeOnly = annotations.writeOnly
@@ -51,7 +55,7 @@ function collectJsonSchemaAnnotations(
   const contentMediaType = annotations.contentMediaType
   if (typeof contentMediaType === "string") out.contentMediaType = contentMediaType
   const contentSchema = annotations.contentSchema
-  if (SchemaAST.isJson(contentSchema)) out.contentSchema = contentSchema
+  if (InternalAST.isJson(contentSchema)) out.contentSchema = contentSchema
 
   if (options?.includeAnnotationKey !== undefined) {
     for (const [key, value] of Object.entries(annotations)) {
@@ -61,7 +65,7 @@ function collectJsonSchemaAnnotations(
       ) {
         continue
       }
-      if (SchemaAST.isJson(value)) InternalRecord.assignProperty(out, key, value)
+      if (InternalAST.isJson(value)) InternalRecord.assignProperty(out, key, value)
     }
   }
 
@@ -102,8 +106,10 @@ function extractJsonSchemaNumberType(schema: JsonSchema.JsonSchema): {
 }
 
 function isJsonSchemaNumberEncoding(schema: JsonSchema.JsonSchema): boolean {
-  return Array.isArray(schema.anyOf) && schema.anyOf.length === 4 && schema.anyOf[0]?.type === "number" &&
-    schema.anyOf.slice(1).every((member) => member.type === "string")
+  if (!Array.isArray(schema.anyOf) || schema.anyOf.length !== 2 || schema.anyOf[0]?.type !== "number") return false
+  const special = schema.anyOf[1]
+  return special?.type === "string" && Array.isArray(special.enum) && special.enum.length === 3 &&
+    special.enum.includes("NaN") && special.enum.includes("Infinity") && special.enum.includes("-Infinity")
 }
 
 // Keep this allowlist closed: applicators and dependent keywords can change meaning when moved across schema objects.
@@ -172,7 +178,6 @@ function compileJsonSchema(
   const definitionStates = new Map<string, JsonSchema.JsonSchema | string | null>()
   const compiledRepresentations = new WeakMap<SchemaRepresentation.Representation, JsonSchema.JsonSchema>()
   const fallbackDefinitions = new Map<string, Array<string>>()
-  let hasAliases = false
   const referenceKeys = Object.keys(references)
   for (const key of referenceKeys) {
     compileDefinition(key, ["references", key])
@@ -209,7 +214,6 @@ function compileJsonSchema(
         if (candidates === undefined) fallbackDefinitions.set(fallback, [key])
         else candidates.push(key)
       } else {
-        hasAliases = true
         definitionStates.set(key, match)
         return match
       }
@@ -219,12 +223,24 @@ function compileJsonSchema(
   }
 
   function finalizeJsonSchema(schema: JsonSchema.JsonSchema): JsonSchema.JsonSchema {
-    if (!hasAliases) return schema
-    return rewriteRefs(schema, ($ref) =>
-      $ref.replace(/^#\/\$defs\/([^/]*)/, (match, token) => {
-        const canonical = definitionStates.get(unescapeToken(token))
-        return typeof canonical === "string" ? `#/$defs/${escapeToken(canonical)}` : match
-      }))
+    return rewriteRefs(schema, ($ref) => {
+      const pointer = decodeUriFragment($ref)
+      if (pointer === undefined) {
+        if (/^#(?:\/|%2f)/i.test($ref)) {
+          throw new Error(`Invalid JSON Pointer URI fragment ${JSON.stringify($ref)}`)
+        }
+        return $ref
+      }
+      if (!pointer.startsWith("/$defs/")) return $ref
+      const separator = pointer.indexOf("/", 7)
+      const canonical = definitionStates.get(unescapeToken(pointer.slice(7, separator < 0 ? undefined : separator)))
+      if (typeof canonical !== "string") return $ref
+      // URI-encoded slashes separate pointer tokens; only ~1 represents a slash within a token.
+      return $ref.replace(
+        /^#(?:\/|%2f).*?(?:\/|%2f).*?(?=\/|%2f|$)/i,
+        formatDefinitionReference(canonical)
+      )
+    })
   }
 
   function getIdentifierFallback(
@@ -283,7 +299,7 @@ function compileJsonSchema(
   ): JsonSchema.JsonSchema {
     if (representation._tag === "Reference") {
       const canonical = compileDefinition(representation.$ref, path)
-      return { $ref: `#/$defs/${escapeToken(canonical)}` }
+      return { $ref: formatDefinitionReference(canonical) }
     }
     const cached = compiledRepresentations.get(representation)
     if (cached !== undefined) return cached
@@ -321,8 +337,11 @@ function compileJsonSchema(
       case "BigInt":
         return { type: "string", allOf: [{ pattern: "^-?\\d+$" }] }
       case "Symbol":
+        return { type: "string", allOf: [{ pattern: "^Symbol\\(([\\s\\S]*)\\)$" }] }
       case "UniqueSymbol":
-        return { type: "string", allOf: [{ pattern: "^Symbol\\((.*)\\)$" }] }
+        return globalThis.Symbol.keyFor(representation.symbol) === undefined
+          ? { not: {} }
+          : { type: "string", enum: [globalThis.String(representation.symbol)] }
       case "Declaration": {
         return {}
       }
@@ -336,9 +355,7 @@ function compileJsonSchema(
         return {
           anyOf: [
             { type: "number" },
-            { type: "string", enum: ["NaN"] },
-            { type: "string", enum: ["Infinity"] },
-            { type: "string", enum: ["-Infinity"] }
+            { type: "string", enum: ["NaN", "Infinity", "-Infinity"] }
           ]
         }
       case "Boolean":
@@ -350,11 +367,15 @@ function compileJsonSchema(
           : { type: typeof literal, enum: [literal] }
       }
       case "Enum": {
-        const types = representation.enums.map(([title, literal]) =>
-          typeof literal === "number" && !globalThis.Number.isFinite(literal)
-            ? { type: "string", enum: [globalThis.String(literal)], title }
-            : { type: typeof literal, enum: [literal], title }
-        )
+        const types = representation.enums.map(([title, literal], index) => {
+          if (typeof literal === "number" && !globalThis.Number.isFinite(literal)) {
+            throw errorWithPath(
+              `Invalid numeric enum value ${globalThis.String(literal)}`,
+              [...path, "enums", index, 1]
+            )
+          }
+          return { type: typeof literal, enum: [literal], title }
+        })
         return types.length === 0 ? { not: {} } : { anyOf: types }
       }
       case "TemplateLiteral":
@@ -388,7 +409,7 @@ function compileJsonSchema(
       }
       case "Objects": {
         if (representation.propertySignatures.length === 0 && representation.indexSignatures.length === 0) {
-          return { anyOf: [{ type: "object" }, { type: "array" }] }
+          return { not: { type: "null" } }
         }
         const out: JsonSchema.JsonSchema = { type: "object" }
         const properties: Record<string, JsonSchema.JsonSchema> = {}
@@ -416,21 +437,28 @@ function compileJsonSchema(
         if (representation.propertySignatures.length > 0) out.properties = properties
         if (required.length > 0) out.required = required
         const patternProperties: Record<string, JsonSchema.JsonSchema | false> = {}
-        const additionalProperties: Array<JsonSchema.JsonSchema | false> = []
+        const additionalPropertySchemas: Array<JsonSchema.JsonSchema | false> = []
+        const indexValueSchemas: Array<JsonSchema.JsonSchema | false> = []
+        let hasUnrepresentableIndexPattern = false
         for (let index = 0; index < representation.indexSignatures.length; index++) {
           const signature = representation.indexSignatures[index]
           let type: JsonSchema.JsonSchema | false = recur(
             signature.type,
             [...path, "indexSignatures", index, "type"]
           )
-          if (Object.keys(type).length === 1 && "not" in type) type = false
+          if (Equal.equals(type, { not: {} })) type = false
+          indexValueSchemas.push(type)
           const patterns = getParameterPatterns(
             signature.parameter,
             [...path, "indexSignatures", index, "parameter"],
             new Set()
           )
+          if (patterns === undefined) {
+            hasUnrepresentableIndexPattern = true
+            continue
+          }
           if (patterns.length === 0) {
-            additionalProperties.push(type)
+            additionalPropertySchemas.push(type)
           } else {
             for (const pattern of patterns) {
               const previous = patternProperties[pattern]
@@ -450,16 +478,36 @@ function compileJsonSchema(
         if (hasPatternProperties) {
           out.patternProperties = patternProperties
         }
-        if (representation.indexSignatures.length === 0) {
-          out.additionalProperties = options?.additionalProperties ?? false
+        if (hasUnrepresentableIndexPattern && options?.onExcessProperty === "error") {
+          const propertyNames: Array<JsonSchema.JsonSchema> = []
+          if (representation.propertySignatures.length > 0) {
+            propertyNames.push({ enum: Object.keys(properties) })
+          }
+          for (let index = 0; index < representation.indexSignatures.length; index++) {
+            propertyNames.push(
+              recur(
+                representation.indexSignatures[index].parameter,
+                [...path, "indexSignatures", index, "parameter"]
+              )
+            )
+          }
+          out.propertyNames = propertyNames.length === 1 ? propertyNames[0] : { anyOf: propertyNames }
+          out.additionalProperties = indexValueSchemas.length === 1
+            ? indexValueSchemas[0]
+            : { anyOf: indexValueSchemas }
+          if (additionalPropertySchemas.length > 0) {
+            out.allOf = additionalPropertySchemas.map((type) => ({ type: "object", additionalProperties: type }))
+          }
+        } else if (additionalPropertySchemas.length === 0) {
+          out.additionalProperties = hasUnrepresentableIndexPattern || options?.onExcessProperty !== "error"
         } else if (
-          additionalProperties.length === 1 &&
+          additionalPropertySchemas.length === 1 &&
           representation.propertySignatures.length === 0 &&
           !hasPatternProperties
         ) {
-          out.additionalProperties = additionalProperties[0]
-        } else if (additionalProperties.length > 0) {
-          out.allOf = additionalProperties.map((type) => ({ type: "object", additionalProperties: type }))
+          out.additionalProperties = additionalPropertySchemas[0]
+        } else if (additionalPropertySchemas.length > 0) {
+          out.allOf = additionalPropertySchemas.map((type) => ({ type: "object", additionalProperties: type }))
         }
         if (
           typeof out.additionalProperties === "object" &&
@@ -473,11 +521,12 @@ function compileJsonSchema(
       case "Union": {
         const types = representation.types.map((type, index) => recur(type, [...path, "types", index]))
         if (types.length === 0) return { not: {} }
-        if (representation.mode === "anyOf" && types.length > 1) {
+        const mode = representation.options?.mode ?? "anyOf"
+        if (mode === "anyOf" && types.length > 1) {
           const compacted = compactEnums(types)
           if (compacted !== undefined) return compacted
         }
-        return representation.mode === "anyOf" ? { anyOf: types } : { oneOf: types }
+        return mode === "anyOf" ? { anyOf: types } : { oneOf: types }
       }
     }
   }
@@ -486,25 +535,47 @@ function compileJsonSchema(
     parameter: SchemaRepresentation.Representation,
     path: Path,
     seenReferences: ReadonlySet<string>
-  ): ReadonlyArray<string> {
+  ): ReadonlyArray<string> | undefined {
     switch (parameter._tag) {
       case "Reference": {
         if (!Object.hasOwn(references, parameter.$ref)) {
           throw errorWithPath(`Invalid reference ${parameter.$ref}`, [...path, "$ref"])
         }
         compileDefinition(parameter.$ref, path)
-        if (seenReferences.has(parameter.$ref)) return []
+        if (seenReferences.has(parameter.$ref)) return undefined
         const next = new Set(seenReferences).add(parameter.$ref)
         return getParameterPatterns(references[parameter.$ref], ["references", parameter.$ref], next)
       }
-      case "String":
-        return collectPatterns(recur(parameter, path))
+      case "String": {
+        if (parameter.checks.length === 0) return []
+        if (
+          parameter.checks.length !== 1 ||
+          parameter.checks[0]._tag !== "Filter" ||
+          parameter.checks[0].annotations?.toJsonSchema === undefined
+        ) {
+          return undefined
+        }
+        const schema = recur(parameter, path)
+        return schema.type === "string" && typeof schema.pattern === "string" &&
+            hasOnlyKeywords(schema, "|type|pattern|title|description|default|examples|readOnly|writeOnly|")
+          ? [schema.pattern]
+          : undefined
+      }
       case "TemplateLiteral":
-        return [`^${parameter.parts.map(getPartPattern).join("")}$`]
-      case "Union":
-        return parameter.types.flatMap((type, index) =>
-          getParameterPatterns(type, [...path, "types", index], seenReferences)
-        )
+        return parameter.checks.length === 0 ? [`^${parameter.parts.map(getPartPattern).join("")}$`] : undefined
+      case "Union": {
+        if (parameter.types.length === 0 || parameter.checks.length > 0 || parameter.options?.mode === "oneOf") {
+          return undefined
+        }
+        const patterns: Array<string> = []
+        for (let index = 0; index < parameter.types.length; index++) {
+          const memberPatterns = getParameterPatterns(parameter.types[index], [...path, "types", index], seenReferences)
+          if (memberPatterns === undefined) return undefined
+          if (memberPatterns.length === 0) return []
+          patterns.push(...memberPatterns)
+        }
+        return patterns
+      }
       default:
         throw errorWithPath("Invalid schema representation document", path)
     }
@@ -528,25 +599,12 @@ function compactEnums(
     }
     if (sharedType === undefined) sharedType = schema.type
     else if (schema.type !== sharedType) return undefined
-    values.push(...schema.enum)
-  }
-  return { type: sharedType, enum: values }
-}
-
-function collectPatterns(schema: JsonSchema.JsonSchema): ReadonlyArray<string> {
-  const patterns: Array<string> = []
-  if (typeof schema.pattern === "string") patterns.push(schema.pattern)
-  for (const key of ["allOf", "anyOf", "oneOf"] as const) {
-    const members = schema[key]
-    if (Array.isArray(members)) {
-      for (const member of members) {
-        if (typeof member === "object" && member !== null && !Array.isArray(member)) {
-          patterns.push(...collectPatterns(member))
-        }
-      }
+    for (const value of schema.enum) {
+      if (values.includes(value)) return undefined
+      values.push(value)
     }
   }
-  return patterns
+  return { type: sharedType, enum: values }
 }
 
 function getPartPattern(part: SchemaRepresentation.Representation): string {
@@ -554,13 +612,13 @@ function getPartPattern(part: SchemaRepresentation.Representation): string {
     case "Literal":
       return RegEx.escape(globalThis.String(part.literal))
     case "String":
-      return SchemaAST.STRING_PATTERN
+      return InternalAST.STRING_PATTERN
     case "Number":
-      return SchemaAST.FINITE_PATTERN
+      return InternalAST.FINITE_PATTERN
     case "TemplateLiteral":
       return part.parts.map(getPartPattern).join("")
     case "Union":
-      return part.types.map(getPartPattern).join("|")
+      return `(?:${part.types.map(getPartPattern).join("|")})`
     default:
       throw errorWithPath("Invalid schema representation document", [])
   }
diff --git a/repos/effect/packages/effect/src/internal/schema/toRepresentation.ts b/repos/effect/packages/effect/src/internal/schema/toRepresentation.ts
index 89474d36b..f44431b4d 100644
--- a/repos/effect/packages/effect/src/internal/schema/toRepresentation.ts
+++ b/repos/effect/packages/effect/src/internal/schema/toRepresentation.ts
@@ -283,7 +283,7 @@ export function toRepresentations(
         return {
           _tag: "Union",
           types: ast.types.map((ast) => recur(ast)),
-          mode: ast.mode,
+          ...(ast.options === undefined ? {} : { options: ast.options }),
           checks,
           ...annotationsField(ast.annotations)
         }
diff --git a/repos/effect/packages/effect/src/internal/schemaError.ts b/repos/effect/packages/effect/src/internal/schemaError.ts
new file mode 100644
index 000000000..e968e2986
--- /dev/null
+++ b/repos/effect/packages/effect/src/internal/schemaError.ts
@@ -0,0 +1,8 @@
+import * as Predicate from "../Predicate.ts"
+import type { SchemaError } from "../Schema.ts"
+
+export const SchemaErrorTypeId = "~effect/Schema/SchemaError"
+
+export function isSchemaError(u: unknown): u is SchemaError {
+  return Predicate.hasProperty(u, SchemaErrorTypeId) && u[SchemaErrorTypeId] === SchemaErrorTypeId
+}
diff --git a/repos/effect/packages/effect/src/internal/stream.ts b/repos/effect/packages/effect/src/internal/stream.ts
index ae688cd85..4b0aa2b98 100644
--- a/repos/effect/packages/effect/src/internal/stream.ts
+++ b/repos/effect/packages/effect/src/internal/stream.ts
@@ -12,17 +12,25 @@ const streamVariance = {
   _A: identity
 }
 
-const StreamProto = {
+const Stream: {
+  new<A extends Arr.NonEmptyReadonlyArray<any>, E, R>(
+    channel: Channel.Channel<A, E, void, unknown, unknown, unknown, R>
+  ): Stream<A extends Arr.NonEmptyReadonlyArray<infer A> ? A : never, E, R>
+} = function<A extends Arr.NonEmptyReadonlyArray<any>, E, R>(
+  this: any,
+  channel: Channel.Channel<A, E, void, unknown, unknown, unknown, R>
+) {
+  this.channel = channel
+} as any
+
+Stream.prototype = {
   [TypeId]: streamVariance,
   pipe() {
     return pipeArguments(this, arguments)
   }
 }
+
 /** @internal */
 export const fromChannel = <A extends Arr.NonEmptyReadonlyArray<any>, E, R>(
   channel: Channel.Channel<A, E, void, unknown, unknown, unknown, R>
-): Stream<A extends Arr.NonEmptyReadonlyArray<infer A> ? A : never, E, R> => {
-  const self = Object.create(StreamProto)
-  self.channel = channel
-  return self
-}
+): Stream<A extends Arr.NonEmptyReadonlyArray<infer A> ? A : never, E, R> => new Stream(channel)
diff --git a/repos/effect/packages/effect/src/internal/tracer.ts b/repos/effect/packages/effect/src/internal/tracer.ts
index fe9e84a44..a7e2b4a1f 100644
--- a/repos/effect/packages/effect/src/internal/tracer.ts
+++ b/repos/effect/packages/effect/src/internal/tracer.ts
@@ -1,6 +1,7 @@
 import type * as Tracer from "../Tracer.ts"
 import { getStackTraceLimit, setStackTraceLimit } from "./stackTraceLimit.ts"
 
+/** @internal */
 export interface ErrorWithStackTraceLimit {
   stackTraceLimit?: number | undefined
 }
@@ -15,6 +16,9 @@ export const addSpanStackTrace = <A extends Tracer.TraceOptions>(
     return options
   }
   const limit = getStackTraceLimit()
+  if (limit === 0 && options?.captureStackTrace !== true) {
+    return { ...options, captureStackTrace: false } as A
+  }
   setStackTraceLimit(3)
   const traceError = new Error()
   setStackTraceLimit(limit)
diff --git a/repos/effect/packages/effect/src/internal/trie.ts b/repos/effect/packages/effect/src/internal/trie.ts
index 4145b5b94..faeb6e3e2 100644
--- a/repos/effect/packages/effect/src/internal/trie.ts
+++ b/repos/effect/packages/effect/src/internal/trie.ts
@@ -516,7 +516,10 @@ export const remove = dual<
       const n2 = nStack[s]
       const d = dStack[s]
       const child = nStack[s + 1]
-      const nc = child.left === undefined && child.mid === undefined && child.right === undefined ? undefined : child
+      const nc =
+        child.value === undefined && child.left === undefined && child.mid === undefined && child.right === undefined
+          ? undefined
+          : child
       if (d === -1) {
         // left
         nStack[s] = {
diff --git a/repos/effect/packages/effect/src/internal/ulid.ts b/repos/effect/packages/effect/src/internal/ulid.ts
new file mode 100644
index 000000000..c58196a51
--- /dev/null
+++ b/repos/effect/packages/effect/src/internal/ulid.ts
@@ -0,0 +1,30 @@
+const maxTimestamp = 2 ** 48 - 1
+const base32Chars = "0123456789ABCDEFGHJKMNPQRSTVWXYZ"
+
+/** @internal */
+export const ulidString = (timestampMillis: number, bytes: Uint8Array): string => {
+  if (bytes.length !== 10) {
+    throw new Error(`ULID randomness must be exactly 10 bytes, received ${bytes.length}`)
+  }
+
+  const timestamp = Math.min(Math.max(0, Math.trunc(timestampMillis)), maxTimestamp)
+  let out = ""
+  for (let shift = 45; shift >= 0; shift -= 5) {
+    // Take the low 5 bits and map NaN to zero, matching UUIDv7's byte encoding.
+    out += base32Chars[Math.floor(timestamp / 2 ** shift) & 0x1f]
+  }
+
+  let accumulator = 0
+  let bits = 0
+  for (const byte of bytes) {
+    accumulator = (accumulator << 8) | byte
+    bits += 8
+    while (bits >= 5) {
+      bits -= 5
+      out += base32Chars[(accumulator >>> bits) & 0x1f]
+    }
+    accumulator &= (1 << bits) - 1
+  }
+
+  return out
+}
diff --git a/repos/effect/packages/effect/src/internal/uuid.ts b/repos/effect/packages/effect/src/internal/uuid.ts
index b40334fa8..46f0e7fce 100644
--- a/repos/effect/packages/effect/src/internal/uuid.ts
+++ b/repos/effect/packages/effect/src/internal/uuid.ts
@@ -17,7 +17,9 @@ const randomBytes = (): Uint8Array<ArrayBuffer> => globalThis.crypto.getRandomVa
 
 /** @internal */
 export function v4Bytes(): Uint8Array<ArrayBuffer>
+/** @internal */
 export function v4Bytes<A extends ArrayBufferLike>(bytes: Uint8Array<A>): Uint8Array<A>
+/** @internal */
 export function v4Bytes(bytes: Uint8Array = randomBytes()): Uint8Array {
   bytes[6] = (bytes[6] & 0x0f) | 0x40
   bytes[8] = (bytes[8] & 0x3f) | 0x80
@@ -31,7 +33,9 @@ const maxV7Timestamp = 2 ** 48 - 1
 
 /** @internal */
 export function v7Bytes(timestampMillis: number): Uint8Array<ArrayBuffer>
+/** @internal */
 export function v7Bytes<A extends ArrayBufferLike>(timestampMillis: number, bytes: Uint8Array<A>): Uint8Array<A>
+/** @internal */
 export function v7Bytes(timestampMillis: number, bytes: Uint8Array = randomBytes()): Uint8Array {
   const timestamp = Math.min(Math.max(0, Math.trunc(timestampMillis)), maxV7Timestamp)
 
diff --git a/repos/effect/packages/effect/src/testing/TestSchema.ts b/repos/effect/packages/effect/src/testing/TestSchema.ts
index 993054499..f56708f01 100644
--- a/repos/effect/packages/effect/src/testing/TestSchema.ts
+++ b/repos/effect/packages/effect/src/testing/TestSchema.ts
@@ -14,7 +14,6 @@ import { isDeepStrictEqual } from "node:util"
 import type * as Context from "../Context.ts"
 import * as Effect from "../Effect.ts"
 import { pipe } from "../Function.ts"
-import * as Record from "../Record.ts"
 import * as Result from "../Result.ts"
 import * as Schema from "../Schema.ts"
 import * as SchemaAST from "../SchemaAST.ts"
@@ -82,7 +81,10 @@ export class Asserts<S extends Schema.Constraint> {
   static ast = {
     fields: {
       equals: (a: Schema.Struct.Fields, b: Schema.Struct.Fields) => {
-        assert.deepStrictEqual(Record.map(a, SchemaAST.getAST), Record.map(b, SchemaAST.getAST))
+        assert.deepStrictEqual(
+          Object.fromEntries(Reflect.ownKeys(a).map((key) => [key, SchemaAST.getAST(a[key])])),
+          Object.fromEntries(Reflect.ownKeys(b).map((key) => [key, SchemaAST.getAST(b[key])]))
+        )
       }
     },
     elements: {
diff --git a/repos/effect/packages/effect/src/unstable/ai/AiError.ts b/repos/effect/packages/effect/src/unstable/ai/AiError.ts
index 4c399b017..69ec66c4d 100644
--- a/repos/effect/packages/effect/src/unstable/ai/AiError.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/AiError.ts
@@ -20,7 +20,73 @@ import { redact } from "../../Redactable.ts"
 import * as Redacted from "../../Redacted.ts"
 import * as Schema from "../../Schema.ts"
 import type * as HttpClientError from "../http/HttpClientError.ts"
-import { HttpRequestDetails, HttpResponseDetails } from "./Response.ts"
+
+/**
+ * Schema for HTTP requests to an AI provider.
+ *
+ * **Example** (Describing an HTTP request)
+ *
+ * ```ts import.meta.vitest
+ * import type { AiError } from "effect/unstable/ai"
+ *
+ * const requestDetails: typeof AiError.HttpRequestDetails.Type = {
+ *   method: "POST",
+ *   url: "https://api.openai.com/v1/responses",
+ *   urlParams: [],
+ *   hash: undefined,
+ *   headers: { "Content-Type": "application/json" }
+ * }
+ * const result = [requestDetails.method, requestDetails.urlParams] // => ["POST", []]
+ * ```
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const HttpRequestDetails = Schema.Struct({
+  method: Schema.Literals(["GET", "POST", "PATCH", "PUT", "DELETE", "HEAD", "OPTIONS", "TRACE", "QUERY"]),
+  url: Schema.String,
+  urlParams: Schema.Array(Schema.Tuple([Schema.String, Schema.String])),
+  hash: Schema.optional(Schema.String),
+  headers: Schema.Record(
+    Schema.String,
+    Schema.Union([
+      Schema.String,
+      Schema.Redacted(Schema.String)
+    ])
+  )
+}).annotate({ identifier: "HttpRequestDetails" })
+
+/**
+ * Schema for HTTP responses from an AI provider.
+ *
+ * **Example** (Describing an HTTP response)
+ *
+ * ```ts import.meta.vitest
+ * import type { AiError } from "effect/unstable/ai"
+ *
+ * const responseDetails: typeof AiError.HttpResponseDetails.Type = {
+ *   status: 200,
+ *   headers: {
+ *     "Content-Type": "application/json",
+ *     "X-Request-Id": "req_abc123"
+ *   }
+ * }
+ * const result = [responseDetails.status, responseDetails.headers["X-Request-Id"]] // => [200, "req_abc123"]
+ * ```
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const HttpResponseDetails = Schema.Struct({
+  status: Schema.Int,
+  headers: Schema.Record(
+    Schema.String,
+    Schema.Union([
+      Schema.String,
+      Schema.Redacted(Schema.String)
+    ])
+  )
+}).annotate({ identifier: "HttpResponseDetails" })
 
 const ReasonTypeId = "~effect/ai/AiError/Reason" as const
 
@@ -1055,7 +1121,6 @@ export class ToolNotFoundError extends Schema.Error<ToolNotFoundError>(
  *
  * const error = new AiError.ToolParameterValidationError({
  *   toolName: "GetWeather",
- *   toolParams: { location: 123 },
  *   description: "Expected string, got number"
  * })
  *
@@ -1070,7 +1135,6 @@ export class ToolParameterValidationError extends Schema.Error<ToolParameterVali
 )({
   _tag: Schema.tag("ToolParameterValidationError"),
   toolName: Schema.String,
-  toolParams: Schema.Json,
   description: Schema.String
 }) {
   /**
@@ -1636,7 +1700,7 @@ export const reasonFromHttpStatus = (params: {
   readonly status: number
   readonly body?: unknown
   readonly http?: typeof HttpContext.Type
-  readonly metadata?: typeof ProviderMetadata.Type
+  readonly metadata?: ProviderMetadata
   readonly description?: string | undefined
 }): AiErrorReason => {
   const { status, http, metadata, description } = params
diff --git a/repos/effect/packages/effect/src/unstable/ai/AnthropicStructuredOutput.ts b/repos/effect/packages/effect/src/unstable/ai/AnthropicStructuredOutput.ts
index 7578c99b4..280c14f7f 100644
--- a/repos/effect/packages/effect/src/unstable/ai/AnthropicStructuredOutput.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/AnthropicStructuredOutput.ts
@@ -58,7 +58,10 @@ export function toCodecAnthropic<T, E, RD, RE>(
   readonly jsonSchema: JsonSchema.JsonSchema
 } {
   const codec = InternalStructuredOutput.toCodec(schema)
-  const unresolvedDocument = Schema.toJsonSchemaDocument(codec, { generateDescriptions: true })
+  const unresolvedDocument = Schema.toJsonSchemaDocument(codec, {
+    generateDescriptions: true,
+    onExcessProperty: "error"
+  })
   if (hasReferenceCycle(unresolvedDocument.schema, unresolvedDocument.definitions)) {
     throw new Error("AnthropicStructuredOutput: Recursive schemas are not supported")
   }
diff --git a/repos/effect/packages/effect/src/unstable/ai/Chat.ts b/repos/effect/packages/effect/src/unstable/ai/Chat.ts
index df23e283b..5572c8657 100644
--- a/repos/effect/packages/effect/src/unstable/ai/Chat.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/Chat.ts
@@ -33,18 +33,7 @@ import type * as Response from "./Response.ts"
 import type * as Tool from "./Tool.ts"
 
 /**
- * Service tag for stateful AI conversation sessions.
- *
- * **When to use**
- *
- * Use to access or provide conversational AI sessions through the Effect
- * context.
- *
- * **Details**
- *
- * This tag provides access to chat functionality throughout your application,
- * enabling persistent conversational AI interactions with full context
- * management.
+ * Service key for stateful AI conversations.
  *
  * **Example** (Accessing the Chat service)
  *
@@ -82,26 +71,35 @@ import type * as Tool from "./Tool.ts"
  * @category services
  * @since 4.0.0
  */
-export class Chat extends Context.Service<Chat, Service>()(
-  "effect/ai/Chat"
-) {}
+export const Chat: Context.Service<Chat, Chat> = Context.Service("effect/ai/Chat")
 
 /**
- * Represents the interface that the `Chat` service provides.
+ * Brand type for `Chat`.
  *
- * **When to use**
+ * @category type IDs
+ * @since 4.0.0
+ */
+export type TypeId = "~effect/ai/Chat"
+
+/**
+ * Brand for `Chat` implementations.
  *
- * Use as the service contract for code that receives or constructs a stateful
- * chat session and needs history, export, text generation, streaming, and
- * structured-output operations.
+ * @category type IDs
+ * @since 4.0.0
+ */
+export const TypeId: TypeId = "~effect/ai/Chat"
+
+/**
+ * Chat session with history, export, and generation operations.
  *
- * @see {@link Chat} for the context tag that provides this service
  * @see {@link Persisted} for the persistence-backed extension
  *
  * @category models
  * @since 4.0.0
  */
-export interface Service {
+export interface Chat {
+  readonly [TypeId]: TypeId
+
   /**
    * Reference to the chat history.
    *
@@ -240,7 +238,7 @@ export interface Service {
         readonly toolkit: LanguageModel.ToolkitInput<Tools>
       }
     ): Effect.Effect<
-      LanguageModel.GenerateTextResponse<Tools, LanguageModel.ExtractEncodedToolParameters<Options>>,
+      LanguageModel.GenerateTextResponse<Tools, LanguageModel.ExtractToolParametersMode<Options>>,
       LanguageModel.ExtractError<Options>,
       LanguageModel.LanguageModel | LanguageModel.ExtractServices<Options>
     >
@@ -255,7 +253,7 @@ export interface Service {
     ): Effect.Effect<
       LanguageModel.GenerateTextResponse<
         LanguageModel.ExtractTools<Options>,
-        LanguageModel.ExtractEncodedToolParameters<Options>
+        LanguageModel.ExtractToolParametersMode<Options>
       >,
       LanguageModel.ExtractError<Options>,
       LanguageModel.LanguageModel | LanguageModel.ExtractServices<Options>
@@ -322,7 +320,7 @@ export interface Service {
         readonly toolkit: LanguageModel.ToolkitInput<Tools>
       }
     ): Stream.Stream<
-      Response.StreamPart<Tools, LanguageModel.ExtractEncodedToolParameters<Options>>,
+      Response.StreamPart<Tools, LanguageModel.ExtractToolParametersMode<Options>>,
       LanguageModel.ExtractError<Options>,
       LanguageModel.LanguageModel | LanguageModel.ExtractServices<Options>
     >
@@ -337,7 +335,7 @@ export interface Service {
     ): Stream.Stream<
       Response.StreamPart<
         LanguageModel.ExtractTools<Options>,
-        LanguageModel.ExtractEncodedToolParameters<Options>
+        LanguageModel.ExtractToolParametersMode<Options>
       >,
       LanguageModel.ExtractError<Options>,
       LanguageModel.LanguageModel | LanguageModel.ExtractServices<Options>
@@ -399,7 +397,7 @@ export interface Service {
     LanguageModel.GenerateObjectResponse<
       LanguageModel.ExtractTools<Options>,
       ObjectSchema["Type"],
-      LanguageModel.ExtractEncodedToolParameters<Options>
+      LanguageModel.ExtractToolParametersMode<Options>
     >,
     LanguageModel.ExtractError<Options>,
     LanguageModel.ExtractServices<Options> | ObjectSchema["DecodingServices"] | LanguageModel.LanguageModel
@@ -419,6 +417,7 @@ const makeUnsafe = (history: Ref.Ref<Prompt.Prompt>) => {
   const semaphore = Semaphore.makeUnsafe(1)
 
   return Chat.of({
+    [TypeId]: TypeId,
     history,
     export: Ref.get(history).pipe(
       Effect.flatMap(encodeHistory),
@@ -455,7 +454,7 @@ const makeUnsafe = (history: Ref.Ref<Prompt.Prompt>) => {
       },
       semaphore.withPermits(1),
       (effect) => Effect.withSpan(effect, "Chat.generateText", { captureStackTrace: false })
-    ) as Service["generateText"],
+    ) as Chat["generateText"],
     streamText: Effect.fnUntraced(
       function*(options) {
         let parts = Chunk.empty<Response.AnyPart>()
@@ -487,7 +486,7 @@ const makeUnsafe = (history: Ref.Ref<Prompt.Prompt>) => {
         )
       },
       Stream.unwrap
-    ) as Service["streamText"],
+    ) as Chat["streamText"],
     generateObject: Effect.fnUntraced(
       function*(options) {
         const newPrompt = Prompt.make(options.prompt)
@@ -539,7 +538,7 @@ const makeUnsafe = (history: Ref.Ref<Prompt.Prompt>) => {
  * @category constructors
  * @since 4.0.0
  */
-export const empty: Effect.Effect<Service> = Effect.sync(() => makeUnsafe(Ref.makeUnsafe(Prompt.empty)))
+export const empty: Effect.Effect<Chat> = Effect.sync(() => makeUnsafe(Ref.makeUnsafe(Prompt.empty)))
 
 /**
  * Creates a new Chat service from an initial prompt.
@@ -655,7 +654,7 @@ export const fromPrompt = (prompt: Prompt.RawInput) =>
  * @since 4.0.0
  */
 export const fromExport = (data: unknown): Effect.Effect<
-  Service,
+  Chat,
   Schema.SchemaError
 > => Effect.flatMap(decodeHistory(data), fromPrompt)
 
@@ -689,7 +688,7 @@ export const fromExport = (data: unknown): Effect.Effect<
  * @since 4.0.0
  */
 export const fromJson = (data: string): Effect.Effect<
-  Service,
+  Chat,
   Schema.SchemaError
 > => Effect.flatMap(decodeHistoryJson(data), fromPrompt)
 
@@ -779,7 +778,7 @@ export declare namespace Persistence {
  * @category models
  * @since 4.0.0
  */
-export interface Persisted extends Service {
+export interface Persisted extends Chat {
   /**
    * The identifier for the chat in the backing persistence store.
    */
@@ -816,7 +815,7 @@ export const makePersisted = Effect.fnUntraced(function*(options: {
   const store = yield* persistence.make(options.storeId)
 
   const toPersisted = Effect.fnUntraced(
-    function*(chatId: string, chat: Service, ttl: Duration.Input | undefined) {
+    function*(chatId: string, chat: Chat, ttl: Duration.Input | undefined) {
       const idGenerator = yield* Effect.serviceOption(IdGenerator.IdGenerator).pipe(
         Effect.map(Option.getOrElse(() => IdGenerator.defaultIdGenerator))
       )
@@ -865,7 +864,7 @@ export const makePersisted = Effect.fnUntraced(function*(options: {
           return yield* chat.generateText(options).pipe(
             Effect.ensuring(Effect.orDie(saveChat(history)))
           )
-        }) as Service["generateText"],
+        }) as Chat["generateText"],
         generateObject: Effect.fnUntraced(function*(options) {
           const history = yield* Ref.get(chat.history)
           return yield* chat.generateObject(options).pipe(
@@ -878,7 +877,7 @@ export const makePersisted = Effect.fnUntraced(function*(options: {
             Stream.ensuring(Effect.orDie(saveChat(history)))
           )
           return stream
-        }, Stream.unwrap) as Service["streamText"]
+        }, Stream.unwrap) as Chat["streamText"]
       }
 
       return persisted
diff --git a/repos/effect/packages/effect/src/unstable/ai/Decision.ts b/repos/effect/packages/effect/src/unstable/ai/Decision.ts
new file mode 100644
index 000000000..45e185247
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/ai/Decision.ts
@@ -0,0 +1,334 @@
+/**
+ * Defines decisions that a `DecisionModel` answers over a single input.
+ * Pair an input schema with named classification, rating, or probability
+ * decisions using `make`, then answer them with `DecisionModel.decide`.
+ *
+ * @see {@link make} for building a definition from an input schema and decisions
+ *
+ * @since 4.0.0
+ */
+import type * as Schema from "../../Schema.ts"
+
+/**
+ * Brand type for decision definitions.
+ *
+ * @category type IDs
+ * @since 4.0.0
+ */
+export type TypeId = "~effect/ai/Decision"
+
+/**
+ * Brand for decision definitions.
+ *
+ * @category type IDs
+ * @since 4.0.0
+ */
+export const TypeId: TypeId = "~effect/ai/Decision"
+
+/**
+ * Decision that assigns the input one label out of a set of criteria.
+ * `criteria` maps labels to descriptions.
+ *
+ * @see {@link classify} for the constructor
+ * @see {@link ClassifyAnswer} for the answer produced by this decision
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface Classify<Label extends string> {
+  readonly _tag: "Classify"
+  readonly instructions: string
+  readonly criteria: { readonly [L in Label]: string }
+}
+
+/**
+ * Decision that places the input on an ordered scale of criteria.
+ * `criteria` lists levels from lowest to highest.
+ *
+ * @see {@link rate} for the constructor
+ * @see {@link RateAnswer} for the answer produced by this decision
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface Rate<Level extends string> {
+  readonly _tag: "Rate"
+  readonly instructions: string
+  readonly criteria: ReadonlyArray<Level>
+}
+
+/**
+ * Decision that estimates how likely a statement about the input is to hold.
+ * Optional `criteria` describes both outcomes when supplied.
+ * The answer is the probability of `true`.
+ *
+ * @see {@link probability} for the constructor
+ * @see {@link ProbabilityAnswer} for the answer produced by this decision
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface Probability {
+  readonly _tag: "Probability"
+  readonly instructions: string
+  readonly criteria?: {
+    readonly false: string
+    readonly true: string
+  } | undefined
+}
+
+/**
+ * Union of every decision kind.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type Any = Classify<string> | Rate<string> | Probability
+
+/**
+ * Answer to a {@link Classify} decision.
+ * `label` is chosen by the provider and need not have the highest probability.
+ * `confidence` is an optional, provider-defined measure in `[0, 1]`.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface ClassifyAnswer<Label extends string> {
+  readonly label: Label
+  readonly probabilities: { readonly [L in Label]: number }
+  readonly confidence?: number | undefined
+}
+
+/**
+ * Answer to a {@link Rate} decision.
+ * `rating` is the probability-weighted position on the scale and may fall
+ * between two levels, within `[0, criteria.length - 1]`. `label` is the level
+ * with the highest probability, choosing the first criteria entry on ties.
+ * `confidence` is an optional, provider-defined measure in `[0, 1]`.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface RateAnswer<Level extends string> {
+  readonly rating: number
+  readonly label: Level
+  readonly probabilities: { readonly [L in Level]: number }
+  readonly confidence?: number | undefined
+}
+
+/**
+ * Answer to a {@link Probability} decision.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface ProbabilityAnswer {
+  readonly probability: number
+}
+
+/**
+ * Answer type for a single decision.
+ *
+ * @category utility types
+ * @since 4.0.0
+ */
+export type Answer<D extends Any> = D extends Classify<infer Label> ? ClassifyAnswer<Label>
+  : D extends Rate<infer Level> ? RateAnswer<Level>
+  : D extends Probability ? ProbabilityAnswer
+  : never
+
+/**
+ * Answers keyed by decision name.
+ *
+ * @category utility types
+ * @since 4.0.0
+ */
+export type Answers<Decisions extends Record<string, Any>> = {
+  readonly [K in keyof Decisions]: Answer<Decisions[K]>
+}
+
+/**
+ * Input schema and named decisions that run together in one provider call.
+ *
+ * @see {@link make} for the constructor
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface Definition<Input extends Schema.Constraint, Decisions extends Record<string, Any>> {
+  readonly [TypeId]: TypeId
+  readonly input: Input
+  readonly decisions: Decisions
+}
+
+/**
+ * Creates a classification decision from labelled criteria.
+ * Throws if fewer than two labels are supplied.
+ *
+ * **Example** (Choosing a department)
+ *
+ * ```ts
+ * import { Decision } from "effect/unstable/ai"
+ *
+ * const department = Decision.classify({
+ *   instructions: "Which team should handle this",
+ *   criteria: {
+ *     billing: "payments",
+ *     technical: "bugs",
+ *     sales: "pricing"
+ *   }
+ * })
+ * ```
+ *
+ * @see {@link rate} for an ordered scale
+ * @see {@link probability} for a single yes or no likelihood
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const classify = <Label extends string>(options: {
+  readonly instructions: string
+  readonly criteria: { readonly [L in Label]: string }
+}): Classify<Label> => {
+  if (Object.keys(options.criteria).length < 2) {
+    throw new Error("Decision.classify: criteria must contain at least two labels")
+  }
+  return {
+    _tag: "Classify",
+    instructions: options.instructions,
+    criteria: options.criteria
+  }
+}
+
+/**
+ * Creates a rating decision from an ordered list of criteria.
+ * Throws if fewer than two levels or duplicate levels are supplied.
+ *
+ * **Example** (Rating frustration)
+ *
+ * ```ts
+ * import { Decision } from "effect/unstable/ai"
+ *
+ * const frustration = Decision.rate({
+ *   instructions: "How frustrated",
+ *   criteria: ["calm", "frustrated", "angry"]
+ * })
+ * ```
+ *
+ * @see {@link classify} for unordered labels
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const rate = <const Level extends string>(options: {
+  readonly instructions: string
+  readonly criteria: ReadonlyArray<Level>
+}): Rate<Level> => {
+  if (options.criteria.length < 2) {
+    throw new Error("Decision.rate: criteria must contain at least two levels")
+  }
+  if (new Set(options.criteria).size !== options.criteria.length) {
+    throw new Error("Decision.rate: criteria must contain distinct levels")
+  }
+  return {
+    _tag: "Rate",
+    instructions: options.instructions,
+    criteria: options.criteria
+  }
+}
+
+/**
+ * Creates a probability decision from instructions and optional outcome descriptions.
+ * When `criteria` is supplied, descriptions for both `false` and `true` are required.
+ *
+ * **Example** (Estimating urgency)
+ *
+ * ```ts
+ * import { Decision } from "effect/unstable/ai"
+ *
+ * const urgent = Decision.probability({
+ *   instructions: "The message is time-sensitive"
+ * })
+ * ```
+ *
+ * **Example** (Providing outcome descriptions)
+ *
+ * ```ts
+ * import { Decision } from "effect/unstable/ai"
+ *
+ * const urgent = Decision.probability({
+ *   instructions: "The message is time-sensitive",
+ *   criteria: {
+ *     false: "The message can wait",
+ *     true: "The message needs immediate attention"
+ *   }
+ * })
+ * ```
+ *
+ * @see {@link classify} for more than two outcomes
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const probability = (options: {
+  readonly instructions: string
+  readonly criteria?: {
+    readonly false: string
+    readonly true: string
+  } | undefined
+}): Probability => ({
+  _tag: "Probability",
+  instructions: options.instructions,
+  criteria: options.criteria
+})
+
+/**
+ * Creates a decision definition from an input schema and named decisions.
+ * `DecisionModel.decide` encodes the input with `Schema.toCodecJson` before
+ * calling the provider. Answer keys and types are inferred from the decisions.
+ * Throws if `decisions` is empty.
+ *
+ * **Example** (Defining ticket triage)
+ *
+ * ```ts
+ * import { Schema } from "effect"
+ * import { Decision } from "effect/unstable/ai"
+ *
+ * const Ticket = Schema.Struct({
+ *   subject: Schema.String,
+ *   body: Schema.String
+ * })
+ *
+ * const TicketTriage = Decision.make({
+ *   input: Ticket,
+ *   decisions: {
+ *     department: Decision.classify({
+ *       instructions: "Which team should handle this",
+ *       criteria: { billing: "payments", technical: "bugs" }
+ *     }),
+ *     urgent: Decision.probability({
+ *       instructions: "The message is time-sensitive",
+ *       criteria: { false: "No time pressure", true: "Needs action now" }
+ *     })
+ *   }
+ * })
+ * ```
+ *
+ * @see {@link Definition} for the returned shape
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const make = <Input extends Schema.Constraint, Decisions extends Record<string, Any>>(options: {
+  readonly input: Input
+  readonly decisions: Decisions
+}): Definition<Input, Decisions> => {
+  if (Object.keys(options.decisions).length === 0) {
+    throw new Error("Decision.make: decisions must not be empty")
+  }
+  return {
+    [TypeId]: TypeId,
+    input: options.input,
+    decisions: options.decisions
+  }
+}
diff --git a/repos/effect/packages/effect/src/unstable/ai/DecisionModel.ts b/repos/effect/packages/effect/src/unstable/ai/DecisionModel.ts
new file mode 100644
index 000000000..5a077f8c3
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/ai/DecisionModel.ts
@@ -0,0 +1,384 @@
+/**
+ * Defines the provider-neutral service for structured decisions.
+ * `decide` encodes one input as JSON, sends its named decisions in one provider
+ * call, and validates the answers. Failures are reported as `AiError` values.
+ *
+ * @see {@link make} for constructing a decision model service from a provider
+ *
+ * @since 4.0.0
+ */
+import * as Context from "../../Context.ts"
+import * as Effect from "../../Effect.ts"
+import * as Predicate from "../../Predicate.ts"
+import * as Schema from "../../Schema.ts"
+import * as AiError from "./AiError.ts"
+import type * as Decision from "./Decision.ts"
+
+/**
+ * Service key for answering decisions about an input.
+ *
+ * @see {@link make} for constructing a decision model service from a provider
+ * @see {@link decide} for answering a definition through the current service
+ *
+ * @category services
+ * @since 4.0.0
+ */
+export const DecisionModel: Context.Service<DecisionModel, DecisionModel> = Context.Service(
+  "effect/unstable/ai/DecisionModel"
+)
+
+/**
+ * Brand type for `DecisionModel`.
+ *
+ * @category type IDs
+ * @since 4.0.0
+ */
+export type TypeId = "~effect/ai/DecisionModel"
+
+/**
+ * Brand for `DecisionModel` implementations.
+ *
+ * @category type IDs
+ * @since 4.0.0
+ */
+export const TypeId: TypeId = "~effect/ai/DecisionModel"
+
+/**
+ * Provider-reported token usage. Unreported counts are `undefined`.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export class DecisionUsage extends Schema.Class<DecisionUsage>(
+  "effect/ai/DecisionModel/DecisionUsage"
+)({
+  inputTokens: Schema.optional(Schema.Finite),
+  outputTokens: Schema.optional(Schema.Finite)
+}) {}
+
+/**
+ * Options for answering a decision definition.
+ *
+ * @category options
+ * @since 4.0.0
+ */
+export interface DecideOptions<Input extends Schema.Constraint> {
+  readonly input: Input["Type"]
+}
+
+/**
+ * Answers for every decision in a definition together with usage metadata.
+ *
+ * @see {@link DecisionUsage} for token usage metadata
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface DecideResponse<Decisions extends Record<string, Decision.Any>> {
+  readonly answers: Decision.Answers<Decisions>
+  readonly usage: DecisionUsage
+}
+
+/**
+ * Provider input options for a decision request.
+ * `state` is encoded with `Schema.toCodecJson`, not stringified.
+ * All `decisions` must be answered in one call.
+ *
+ * @category options
+ * @since 4.0.0
+ */
+export interface ProviderOptions {
+  readonly state: Schema.Json
+  readonly decisions: Record<string, Decision.Any>
+}
+
+/**
+ * Provider answer for a classify decision.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface ProviderClassifyAnswer {
+  readonly _tag: "Classify"
+  readonly label: string
+  readonly probabilities: Readonly<Record<string, number>>
+  readonly confidence?: number | undefined
+}
+
+/**
+ * Provider answer for a rate decision.
+ * The core derives the label from the highest probability, choosing the
+ * first criteria entry on ties.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface ProviderRateAnswer {
+  readonly _tag: "Rate"
+  readonly rating: number
+  readonly probabilities: Readonly<Record<string, number>>
+  readonly confidence?: number | undefined
+}
+
+/**
+ * Provider answer for a probability decision.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface ProviderProbabilityAnswer {
+  readonly _tag: "Probability"
+  readonly probability: number
+}
+
+/**
+ * Provider answer for any decision kind.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type ProviderAnswer = ProviderClassifyAnswer | ProviderRateAnswer | ProviderProbabilityAnswer
+
+/**
+ * Provider response for a decision request.
+ * `answers` is keyed like the requested decisions. Each answer is validated
+ * against its decision before it is returned to the caller.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface ProviderResponse {
+  readonly answers: Readonly<Record<string, ProviderAnswer>>
+  readonly usage: {
+    readonly inputTokens: number | undefined
+    readonly outputTokens: number | undefined
+  }
+}
+
+/**
+ * Decision operations over a definition.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface DecisionModel {
+  readonly [TypeId]: TypeId
+  readonly decide: <Input extends Schema.Constraint, Decisions extends Record<string, Decision.Any>>(
+    definition: Decision.Definition<Input, Decisions>,
+    options: DecideOptions<Input>
+  ) => Effect.Effect<DecideResponse<Decisions>, AiError.AiError, Input["EncodingServices"]>
+}
+
+const invalidOutput = (description: string): AiError.AiError =>
+  AiError.make({
+    module: "DecisionModel",
+    method: "decide",
+    reason: new AiError.InvalidOutputError({ description })
+  })
+
+const isFiniteNumber = (value: unknown): value is number => Predicate.isNumber(value) && Number.isFinite(value)
+
+const isUnitInterval = (value: unknown): value is number => isFiniteNumber(value) && value >= 0 && value <= 1
+
+const validateDistribution = (
+  key: string,
+  labels: ReadonlyArray<string>,
+  answer: Record<string, unknown>
+): Record<string, number> | AiError.AiError => {
+  const raw = answer.probabilities
+  if (!Predicate.isObject(raw)) {
+    return invalidOutput(`Provider returned no probabilities for decision "${key}"`)
+  }
+  const probabilities: Record<string, number> = Object.create(null)
+  let total = 0
+  for (const label of labels) {
+    const value = raw[label]
+    if (!isUnitInterval(value)) {
+      return invalidOutput(`Provider returned no probability for label "${label}" of decision "${key}"`)
+    }
+    probabilities[label] = value
+    total += value
+  }
+  if (Math.abs(total - 1) > 1e-6) {
+    return invalidOutput(`Provider returned probabilities that do not sum to 1 for decision "${key}"`)
+  }
+  return probabilities
+}
+
+const validateConfidence = (
+  key: string,
+  answer: Record<string, unknown>
+): number | undefined | AiError.AiError => {
+  if (answer.confidence === undefined) {
+    return undefined
+  }
+  return isUnitInterval(answer.confidence)
+    ? answer.confidence
+    : invalidOutput(`Provider returned confidence outside [0, 1] for decision "${key}"`)
+}
+
+const validateAnswer = (
+  key: string,
+  decision: Decision.Any,
+  answer: unknown
+): Decision.Answer<Decision.Any> | AiError.AiError => {
+  if (!Predicate.isObject(answer)) {
+    return invalidOutput(`Provider returned no answer for decision "${key}"`)
+  }
+  if (answer._tag !== decision._tag) {
+    return invalidOutput(
+      `Provider returned a "${String(answer._tag)}" answer for decision "${key}", expected "${decision._tag}"`
+    )
+  }
+  switch (decision._tag) {
+    case "Classify": {
+      const labels = Object.keys(decision.criteria)
+      if (!Predicate.isString(answer.label) || !labels.includes(answer.label)) {
+        return invalidOutput(`Provider returned an unknown label for decision "${key}"`)
+      }
+      const confidence = validateConfidence(key, answer)
+      if (AiError.isAiError(confidence)) {
+        return confidence
+      }
+      const probabilities = validateDistribution(key, labels, answer)
+      if (AiError.isAiError(probabilities)) {
+        return probabilities
+      }
+      return { label: answer.label, probabilities, ...(confidence === undefined ? undefined : { confidence }) }
+    }
+    case "Rate": {
+      const levels = decision.criteria
+      if (!isFiniteNumber(answer.rating) || answer.rating < 0 || answer.rating > levels.length - 1) {
+        return invalidOutput(`Provider returned a rating outside [0, ${levels.length - 1}] for decision "${key}"`)
+      }
+      const confidence = validateConfidence(key, answer)
+      if (AiError.isAiError(confidence)) {
+        return confidence
+      }
+      const probabilities = validateDistribution(key, levels, answer)
+      if (AiError.isAiError(probabilities)) {
+        return probabilities
+      }
+      let label = levels[0]
+      for (let i = 1; i < levels.length; i++) {
+        if (probabilities[levels[i]] > probabilities[label]) {
+          label = levels[i]
+        }
+      }
+      return { rating: answer.rating, label, probabilities, ...(confidence === undefined ? undefined : { confidence }) }
+    }
+    case "Probability": {
+      if (!isUnitInterval(answer.probability)) {
+        return invalidOutput(`Provider returned a probability outside [0, 1] for decision "${key}"`)
+      }
+      return { probability: answer.probability }
+    }
+  }
+}
+
+const validateAnswers = <Decisions extends Record<string, Decision.Any>>(
+  decisions: Decisions,
+  answers: Readonly<Record<string, ProviderAnswer>>
+): Effect.Effect<Decision.Answers<Decisions>, AiError.AiError> => {
+  const validated: Record<string, Decision.Answer<Decision.Any>> = Object.create(null)
+  for (const key of Object.keys(decisions)) {
+    const answer = validateAnswer(key, decisions[key], answers[key])
+    if (AiError.isAiError(answer)) {
+      return Effect.fail(answer)
+    }
+    validated[key] = answer
+  }
+  return Effect.succeed(validated as Decision.Answers<Decisions>)
+}
+
+/**
+ * Creates a `DecisionModel` that encodes inputs as JSON and validates provider answers.
+ * Answers must cover every decision and use its labels. Distributions must
+ * sum to 1 within `1e-6`, optional confidence must be in `[0, 1]`, and ratings must be
+ * in `[0, criteria.length - 1]`. Invalid answers fail with
+ * `AiError.InvalidOutputError`; encoding failures use `AiError.InvalidUserInputError`.
+ *
+ * @see {@link DecisionModel} for the service shape returned by this constructor
+ * @see {@link ProviderOptions} for the input passed to the provider implementation
+ * @see {@link ProviderResponse} for the provider response contract consumed by this constructor
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const make = (params: {
+  readonly decide: (options: ProviderOptions) => Effect.Effect<ProviderResponse, AiError.AiError>
+}): Effect.Effect<DecisionModel> =>
+  Effect.sync(() =>
+    DecisionModel.of({
+      [TypeId]: TypeId,
+      decide: <Input extends Schema.Constraint, Decisions extends Record<string, Decision.Any>>(
+        definition: Decision.Definition<Input, Decisions>,
+        options: DecideOptions<Input>
+      ): Effect.Effect<DecideResponse<Decisions>, AiError.AiError, Input["EncodingServices"]> =>
+        Schema.encodeEffect(Schema.toCodecJson(definition.input))(options.input).pipe(
+          Effect.mapError((error) =>
+            AiError.make({
+              module: "DecisionModel",
+              method: "decide",
+              reason: new AiError.InvalidUserInputError({ description: error.message })
+            })
+          ),
+          Effect.flatMap((state) => params.decide({ state, decisions: definition.decisions })),
+          Effect.flatMap((response) =>
+            Effect.map(
+              validateAnswers(definition.decisions, response.answers),
+              (answers): DecideResponse<Decisions> => ({
+                answers,
+                usage: new DecisionUsage({
+                  inputTokens: response.usage.inputTokens,
+                  outputTokens: response.usage.outputTokens
+                })
+              })
+            )
+          ),
+          (effect) => Effect.withSpan(effect, "DecisionModel.decide", { captureStackTrace: false })
+        )
+    })
+  )
+
+/**
+ * Answers a decision definition using the current `DecisionModel` service.
+ * Encodes the input with `Schema.toCodecJson`, requiring the schema's encoding services.
+ * Explicit `undefined` fields become `null`; absent fields stay absent.
+ * Custom declarations need a JSON codec annotation or encoding fails.
+ * Returned answers and probability dictionaries have null prototypes.
+ *
+ * **Example** (Triaging a ticket)
+ *
+ * ```ts
+ * import { Effect, Schema } from "effect"
+ * import { Decision, DecisionModel } from "effect/unstable/ai"
+ *
+ * const TicketTriage = Decision.make({
+ *   input: Schema.String,
+ *   decisions: {
+ *     urgent: Decision.probability({
+ *       instructions: "The message is time-sensitive",
+ *       criteria: { false: "No time pressure", true: "Needs action now" }
+ *     })
+ *   }
+ * })
+ *
+ * const program = Effect.gen(function*() {
+ *   const { answers, usage } = yield* DecisionModel.decide(TicketTriage, {
+ *     input: "My card was charged twice, please fix this today"
+ *   })
+ *   return { probability: answers.urgent.probability, usage }
+ * })
+ * ```
+ *
+ * @see {@link DecisionModel} for the service this function requires
+ *
+ * @category decisions
+ * @since 4.0.0
+ */
+export const decide = <Input extends Schema.Constraint, Decisions extends Record<string, Decision.Any>>(
+  definition: Decision.Definition<Input, Decisions>,
+  options: DecideOptions<Input>
+): Effect.Effect<DecideResponse<Decisions>, AiError.AiError, DecisionModel | Input["EncodingServices"]> =>
+  DecisionModel.use((model) => model.decide(definition, options))
diff --git a/repos/effect/packages/effect/src/unstable/ai/EmbeddingModel.ts b/repos/effect/packages/effect/src/unstable/ai/EmbeddingModel.ts
index acf6fa7f8..c34f7596b 100644
--- a/repos/effect/packages/effect/src/unstable/ai/EmbeddingModel.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/EmbeddingModel.ts
@@ -19,23 +19,33 @@ import * as Schema from "../../Schema.ts"
 import * as AiError from "./AiError.ts"
 
 /**
- * Service tag for embedding model operations.
+ * Service key for embedding text into vectors.
  *
- * **When to use**
- *
- * Use to retrieve or provide the embedding model service for an `Effect`
- * program that embeds text into vectors.
- *
- * @see {@link Service} for the service contract provided by this tag
  * @see {@link make} for constructing an embedding model service from a provider
  * @see {@link Dimensions} for the current embedding vector size service
  *
  * @category services
  * @since 4.0.0
  */
-export class EmbeddingModel extends Context.Service<EmbeddingModel, Service>()(
+export const EmbeddingModel: Context.Service<EmbeddingModel, EmbeddingModel> = Context.Service(
   "effect/unstable/ai/EmbeddingModel"
-) {}
+)
+
+/**
+ * Brand type for `EmbeddingModel`.
+ *
+ * @category type IDs
+ * @since 4.0.0
+ */
+export type TypeId = "~effect/ai/EmbeddingModel"
+
+/**
+ * Brand for `EmbeddingModel` implementations.
+ *
+ * @category type IDs
+ * @since 4.0.0
+ */
+export const TypeId: TypeId = "~effect/ai/EmbeddingModel"
 
 /**
  * Service tag that provides the current embedding dimensions.
@@ -137,7 +147,7 @@ export interface ProviderResponse {
  * Use when you need a typed request for one embedding input while building or
  * calling a low-level embedding request resolver.
  *
- * @see {@link Service} for the resolver-bearing service contract
+ * @see {@link EmbeddingModel} for the resolver-bearing service contract
  * @see {@link make} for constructing the request resolver from a provider implementation
  * @see {@link EmbedResponse} for the response produced by this request
  *
@@ -151,12 +161,13 @@ export class EmbeddingRequest extends Request.TaggedClass("EmbeddingRequest")<
 > {}
 
 /**
- * Defines the service interface for embedding operations.
+ * Single-input and batch embedding operations.
  *
  * @category models
  * @since 4.0.0
  */
-export interface Service {
+export interface EmbeddingModel {
+  readonly [TypeId]: TypeId
   readonly resolver: RequestResolver.RequestResolver<EmbeddingRequest>
   readonly embed: (input: string) => Effect.Effect<EmbedResponse, AiError.AiError>
   readonly embedMany: (input: ReadonlyArray<string>) => Effect.Effect<EmbedManyResponse, AiError.AiError>
@@ -175,7 +186,7 @@ const invalidProviderResponse = (description: string): AiError.AiError =>
  * **When to use**
  *
  * Use to adapt a provider's batch embedding implementation into an
- * `EmbeddingModel.Service` that offers single-input and batch embedding
+ * `EmbeddingModel` that offers single-input and batch embedding
  * operations.
  *
  * **Details**
@@ -192,7 +203,7 @@ const invalidProviderResponse = (description: string): AiError.AiError =>
  * result for each requested input. If the provider returns a different number
  * of results, `embed` and `embedMany` fail with `AiError.InvalidOutputError`.
  *
- * @see {@link Service} for the service shape returned by this constructor
+ * @see {@link EmbeddingModel} for the service shape returned by this constructor
  * @see {@link ProviderOptions} for the input passed to the provider implementation
  * @see {@link ProviderResponse} for the provider response contract consumed by this constructor
  *
@@ -201,7 +212,7 @@ const invalidProviderResponse = (description: string): AiError.AiError =>
  */
 export const make: (params: {
   readonly embedMany: (options: ProviderOptions) => Effect.Effect<ProviderResponse, AiError.AiError>
-}) => Effect.Effect<Service> = Effect.fnUntraced(function*(params) {
+}) => Effect.Effect<EmbeddingModel> = Effect.fnUntraced(function*(params) {
   const resolver = RequestResolver.make<EmbeddingRequest>((entries) =>
     Effect.flatMap(
       params.embedMany({
@@ -219,6 +230,7 @@ export const make: (params: {
   )
 
   return EmbeddingModel.of({
+    [TypeId]: TypeId,
     resolver,
     embed: (input) =>
       Effect.request(new EmbeddingRequest({ input }), resolver).pipe(
diff --git a/repos/effect/packages/effect/src/unstable/ai/LanguageModel.ts b/repos/effect/packages/effect/src/unstable/ai/LanguageModel.ts
index 3046e6a56..1bffdea26 100644
--- a/repos/effect/packages/effect/src/unstable/ai/LanguageModel.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/LanguageModel.ts
@@ -38,17 +38,8 @@ import { CurrentSpanTransformer } from "./Telemetry.ts"
 import type * as Tool from "./Tool.ts"
 import * as Toolkit from "./Toolkit.ts"
 
-// =============================================================================
-// Service Definition
-// =============================================================================
-
 /**
- * Service tag for AI model services.
- *
- * **When to use**
- *
- * Use to access or provide text generation, streaming generation, structured
- * output, and tool-calling capabilities through the Effect context.
+ * Service key for text generation, structured output, and tool calls.
  *
  * **Example** (Accessing the language model service)
  *
@@ -82,17 +73,35 @@ import * as Toolkit from "./Toolkit.ts"
  * @category services
  * @since 4.0.0
  */
-export class LanguageModel extends Context.Service<LanguageModel, Service>()(
+export const LanguageModel: Context.Service<LanguageModel, LanguageModel> = Context.Service(
   "effect/unstable/ai/LanguageModel"
-) {}
+)
+
+/**
+ * Brand type for `LanguageModel`.
+ *
+ * @category type IDs
+ * @since 4.0.0
+ */
+export type TypeId = "~effect/ai/LanguageModel"
 
 /**
- * The service interface for language model operations, defining the contract that all language model implementations must fulfill.
+ * Brand for `LanguageModel` implementations.
+ *
+ * @category type IDs
+ * @since 4.0.0
+ */
+export const TypeId: TypeId = "~effect/ai/LanguageModel"
+
+/**
+ * Text generation, streaming, and structured output operations.
  *
  * @category models
  * @since 4.0.0
  */
-export interface Service {
+export interface LanguageModel {
+  readonly [TypeId]: TypeId
+
   /**
    * Generate text using the language model.
    */
@@ -115,7 +124,7 @@ export interface Service {
     >(
       options: Options & GenerateTextOptions<Tools> & { readonly toolkit: ToolkitInput<Tools> }
     ): Effect.Effect<
-      GenerateTextResponse<Tools, ExtractEncodedToolParameters<Options>>,
+      GenerateTextResponse<Tools, ExtractToolParametersMode<Options>>,
       ExtractError<Options>,
       ExtractServices<Options>
     >
@@ -127,7 +136,7 @@ export interface Service {
     >(
       options: Options & GenerateTextOptions<ExtractTools<Options>> & { readonly toolkit: Options["toolkit"] }
     ): Effect.Effect<
-      GenerateTextResponse<ExtractTools<Options>, ExtractEncodedToolParameters<Options>>,
+      GenerateTextResponse<ExtractTools<Options>, ExtractToolParametersMode<Options>>,
       ExtractError<Options>,
       ExtractServices<Options>
     >
@@ -147,7 +156,7 @@ export interface Service {
   >(
     options: Options & GenerateObjectOptions<Tools, StructuredOutputSchema>
   ) => Effect.Effect<
-    GenerateObjectResponse<Tools, StructuredOutputSchema["Type"], ExtractEncodedToolParameters<Options>>,
+    GenerateObjectResponse<Tools, StructuredOutputSchema["Type"], ExtractToolParametersMode<Options>>,
     ExtractError<Options>,
     ExtractServices<Options> | StructuredOutputSchema["DecodingServices"]
   >
@@ -174,7 +183,7 @@ export interface Service {
     >(
       options: Options & GenerateTextOptions<Tools> & { readonly toolkit: ToolkitInput<Tools> }
     ): Stream.Stream<
-      Response.StreamPart<Tools, ExtractEncodedToolParameters<Options>>,
+      Response.StreamPart<Tools, ExtractToolParametersMode<Options>>,
       ExtractError<Options>,
       ExtractServices<Options>
     >
@@ -186,7 +195,7 @@ export interface Service {
     >(
       options: Options & GenerateTextOptions<ExtractTools<Options>> & { readonly toolkit: Options["toolkit"] }
     ): Stream.Stream<
-      Response.StreamPart<ExtractTools<Options>, ExtractEncodedToolParameters<Options>>,
+      Response.StreamPart<ExtractTools<Options>, ExtractToolParametersMode<Options>>,
       ExtractError<Options>,
       ExtractServices<Options>
     >
@@ -366,11 +375,11 @@ export type ToolChoice<ToolName extends string> =
  */
 export class GenerateTextResponse<
   Tools extends Record<string, Tool.Any>,
-  EncodedToolParameters extends boolean = false
+  ParametersMode extends Response.ToolParametersMode = "decoded"
 > {
-  readonly content: Array<Response.Part<Tools, EncodedToolParameters>>
+  readonly content: Array<Response.Part<Tools, ParametersMode>>
 
-  constructor(content: Array<Response.Part<Tools, EncodedToolParameters>>) {
+  constructor(content: Array<Response.Part<Tools, ParametersMode>>) {
     this.content = content
   }
 
@@ -410,7 +419,7 @@ export class GenerateTextResponse<
   /**
    * Returns all tool call parts from the response.
    */
-  get toolCalls(): Array<Response.ToolCallParts<Tools, EncodedToolParameters>> {
+  get toolCalls(): Array<Response.ToolCallParts<Tools, ParametersMode>> {
     return this.content.filter((part) => part.type === "tool-call")
   }
 
@@ -476,14 +485,14 @@ export class GenerateTextResponse<
 export class GenerateObjectResponse<
   Tools extends Record<string, Tool.Any>,
   A,
-  EncodedToolParameters extends boolean = false
-> extends GenerateTextResponse<Tools, EncodedToolParameters> {
+  ParametersMode extends Response.ToolParametersMode = "decoded"
+> extends GenerateTextResponse<Tools, ParametersMode> {
   /**
    * The parsed structured object that conforms to the provided schema.
    */
   readonly value: A
 
-  constructor(value: A, content: Array<Response.Part<Tools, EncodedToolParameters>>) {
+  constructor(value: A, content: Array<Response.Part<Tools, ParametersMode>>) {
     super(content)
     this.value = value
   }
@@ -558,16 +567,16 @@ export type ExtractTools<Options> = Options extends {
   : {}
 
 /**
- * Utility type that determines whether language model responses contain
- * encoded tool call parameters.
+ * Resolves to `"encoded"` when tool call resolution is
+ * disabled, otherwise `"opaque"`.
  *
  * @category utility types
  * @since 4.0.0
  */
-export type ExtractEncodedToolParameters<Options> = Options extends {
+export type ExtractToolParametersMode<Options> = Options extends {
   readonly disableToolCallResolution: true
-} ? true
-  : false
+} ? "encoded"
+  : "opaque"
 
 type ExtractErrorFromToolkitOption<ToolkitValue, DisableToolCallResolution extends boolean> = ToolkitValue extends
   Toolkit.WithHandler<infer Tools> ?
@@ -583,6 +592,7 @@ type ExtractErrorFromToolkitOption<ToolkitValue, DisableToolCallResolution exten
 type ExtractServicesFromToolkitOption<ToolkitValue> = ToolkitValue extends Toolkit.WithHandler<infer Tools> ?
     | Tool.HandlerServices<Tools[keyof Tools]>
     | Tool.ResultDecodingServices<Tools[keyof Tools]>
+    | Tool.ParametersEncodingServices<Tools[keyof Tools]>
   : ToolkitValue extends Effect.Effect<
     Toolkit.WithHandler<infer Tools>,
     infer _E,
@@ -590,9 +600,22 @@ type ExtractServicesFromToolkitOption<ToolkitValue> = ToolkitValue extends Toolk
   > ?
       | Tool.HandlerServices<Tools[keyof Tools]>
       | Tool.ResultDecodingServices<Tools[keyof Tools]>
+      | Tool.ParametersEncodingServices<Tools[keyof Tools]>
       | R
   : never
 
+// Disabled resolution needs parameter encoding but not handlers or result
+// decoding. Match Toolkit before Effect to omit its handler requirement.
+type ExtractDisabledResolutionServicesFromToolkitOption<ToolkitValue> = ToolkitValue extends
+  Toolkit.WithHandler<infer Tools> ? Tool.ParametersEncodingServices<Tools[keyof Tools]>
+  : ToolkitValue extends Toolkit.Toolkit<infer Tools> ? Tool.ParametersEncodingServices<Tools[keyof Tools]>
+  : ToolkitValue extends Effect.Effect<
+    Toolkit.WithHandler<infer Tools>,
+    infer _E,
+    infer R
+  > ? Tool.ParametersEncodingServices<Tools[keyof Tools]> | R
+  : never
+
 type ExtractToolkitResolutionError<ToolkitValue> = ToolkitValue extends Effect.Effect<
   Toolkit.WithHandler<infer _Tools>,
   infer E,
@@ -642,10 +665,13 @@ export type ExtractError<Options> = Options extends {
  */
 export type ExtractServices<Options> = Options extends {
   readonly disableToolCallResolution: true
-} ? never
+} ? Options extends {
+    readonly toolkit: infer ToolkitValue
+  } ? ExtractDisabledResolutionServicesFromToolkitOption<Exclude<ToolkitValue, undefined>>
+  : never
   : Options extends {
-    readonly toolkit: infer Toolkit
-  } ? ExtractServicesFromToolkitOption<Exclude<Toolkit, undefined>>
+    readonly toolkit: infer ToolkitValue
+  } ? ExtractServicesFromToolkitOption<Exclude<ToolkitValue, undefined>>
   : never
 
 // =============================================================================
@@ -754,7 +780,7 @@ export interface ProviderOptions {
  * response format prepared in `ProviderOptions`; invalid parts fail decoding as
  * `AiError.InvalidOutputError`.
  *
- * @see {@link Service} for the returned service contract
+ * @see {@link LanguageModel} for the returned service contract
  * @see {@link ProviderOptions} for the normalized options passed to provider hooks
  * @see {@link defaultCodecTransformer} for the default structured-output schema transformer
  *
@@ -781,7 +807,7 @@ export const make: (params: {
    * for structured output generation.
    */
   readonly codecTransformer?: CodecTransformer | undefined
-}) => Effect.Effect<Service> = Effect.fnUntraced(function*(params) {
+}) => Effect.Effect<LanguageModel> = Effect.fnUntraced(function*(params) {
   const codecTransformer = params.codecTransformer ?? defaultCodecTransformer
 
   const parentSpanTransformer = yield* Effect.serviceOption(
@@ -860,7 +886,7 @@ export const make: (params: {
   >(
     options: Options & GenerateObjectOptions<Tools, StructuredOutputSchema>
   ): Effect.Effect<
-    GenerateObjectResponse<Tools, StructuredOutputSchema["Type"]>,
+    GenerateObjectResponse<Tools, StructuredOutputSchema["Type"], ExtractToolParametersMode<Options>>,
     ExtractError<Options>,
     ExtractServices<Options> | StructuredOutputSchema["DecodingServices"]
   > => {
@@ -1122,6 +1148,7 @@ export const make: (params: {
     }
 
     // Pre-resolve pending tool approvals before calling the LLM
+    let preResolvedResults: Array<Response.ToolResultPart<string, unknown, unknown>> = []
     if (hasPendingApprovals) {
       for (const approval of approved) {
         if (approval.toolCall && !toolkit.tools[approval.toolCall.name]) {
@@ -1142,12 +1169,12 @@ export const make: (params: {
         concurrency
       )
       const deniedResults = createDenialResults(denied)
-      const preResolvedResults = [...approvedResults, ...deniedResults]
+      preResolvedResults = [...approvedResults, ...deniedResults]
 
       if (preResolvedResults.length > 0) {
         providerOptions.prompt = Prompt.fromMessages([
           ...providerOptions.prompt.content,
-          Prompt.makeMessage("tool", { content: preResolvedResults })
+          ...Prompt.fromResponseParts(preResolvedResults).content
         ])
       }
     }
@@ -1181,10 +1208,10 @@ export const make: (params: {
       }
     }
 
-    // Construct the response schema with the tools from the toolkit, keeping
-    // tool call parameters encoded when tool call resolution is disabled
     const ResponseSchema = Schema.mutable(Schema.Array(Response.Part(
-      options.disableToolCallResolution === true ? makeToolkitWithEncodedParameters(toolkit) : toolkit
+      options.disableToolCallResolution === true
+        ? makeToolkitWithEncodedParameters(toolkit)
+        : makeToolkitWithOpaqueParameters(toolkit)
     )))
 
     // If tool call resolution is disabled, return the response without
@@ -1198,21 +1225,14 @@ export const make: (params: {
           tracker.markParts(providerOptions.prompt.content, responseMetadata.id)
         }
       }
-      return content as Array<Response.Part<Tools>>
+      return [...preResolvedResults, ...content] as Array<Response.Part<Tools>>
     }
 
-    // Validates the complete response before tool handlers can perform side
-    // effects. Tool parameters remain opaque here so their validation keeps
-    // using Toolkit's more specific ToolParameterValidationError; rawContent
-    // is decoded a second time with ResponseSchema below to produce the
-    // typed response.
-    const PrevalidationSchema = Schema.mutable(
-      Schema.Array(Response.Part(makeToolkitWithOpaqueParameters(toolkit)))
-    )
-
     const rawContent = yield* generateWithNonIncrementalFallback()
 
-    yield* Schema.decodeEffect(PrevalidationSchema)(rawContent)
+    // Validate before running tool handlers.
+    const content = yield* Schema.decodeEffect(ResponseSchema)(rawContent)
+    yield* validateProviderExecutedToolCalls(toolkit, rawContent)
 
     // Resolve the generated tool calls. When the finish reason indicates an
     // incomplete response, handlers do not run and every executable tool call
@@ -1240,8 +1260,6 @@ export const make: (params: {
         Stream.runCollect
       )
 
-    const content = yield* Schema.decodeEffect(ResponseSchema)(rawContent)
-
     if (tracker) {
       const responseMetadata = content.find((part) => part.type === "response-metadata")
       if (Predicate.isNotUndefined(responseMetadata) && Predicate.isNotUndefined(responseMetadata.id)) {
@@ -1249,8 +1267,8 @@ export const make: (params: {
       }
     }
 
-    // Return the content merged with the tool call results
-    return [...content, ...toolResults] as Array<Response.Part<Tools>>
+    // Retain pre-resolved results so Chat can recognize completed approvals on later turns.
+    return [...preResolvedResults, ...content, ...toolResults] as Array<Response.Part<Tools>>
   })
 
   const streamContent: <
@@ -1442,15 +1460,14 @@ export const make: (params: {
       if (preResolvedResults.length > 0) {
         providerOptions.prompt = Prompt.fromMessages([
           ...providerOptions.prompt.content,
-          Prompt.makeMessage("tool", { content: preResolvedResults })
+          ...Prompt.fromResponseParts(preResolvedResults).content
         ])
       }
 
       // Emit pre-resolved tool-results as stream parts so Chat.streamText
       // persists them to history. This lets collectToolApprovals find them
       // on subsequent rounds and skip the now-resolved approvals.
-      // Note: r.result is already encoded (from executeApprovedToolCalls /
-      // createDenialResults), so it goes into both result and encodedResult.
+      // Preserve the existing encoded result representation for streaming approvals.
       for (const r of preResolvedResults) {
         preResolvedStreamParts.push(
           Response.makePart("tool-result", {
@@ -1458,8 +1475,8 @@ export const make: (params: {
             name: r.name,
             providerExecuted: false,
             preliminary: false,
-            result: r.result,
-            encodedResult: r.result,
+            result: r.encodedResult,
+            encodedResult: r.encodedResult,
             isFailure: r.isFailure
           }) as Response.StreamPart<Tools>
         )
@@ -1493,10 +1510,10 @@ export const make: (params: {
       }
     }
 
-    // Construct the response schema with the tools from the toolkit, keeping
-    // tool call parameters encoded when tool call resolution is disabled
     const ResponseSchema = Schema.NonEmptyArray(Response.StreamPart(
-      options.disableToolCallResolution === true ? makeToolkitWithEncodedParameters(toolkit) : toolkit
+      options.disableToolCallResolution === true
+        ? makeToolkitWithEncodedParameters(toolkit)
+        : makeToolkitWithOpaqueParameters(toolkit)
     ))
     const decodeParts = Schema.decodeEffect(ResponseSchema)
 
@@ -1586,7 +1603,10 @@ export const make: (params: {
             id: part.id,
             name: part.name,
             providerExecuted: false,
-            ...result
+            result: result.result,
+            encodedResult: result.encodedResult,
+            isFailure: result.isFailure,
+            preliminary: result.preliminary
           }) as Response.StreamPart<Tools>
           return Effect.sync(() => {
             Queue.offerUnsafe(queue, toolResultPart)
@@ -1616,7 +1636,8 @@ export const make: (params: {
     yield* streamWithNonIncrementalFallback().pipe(
       Stream.runForEachArray(
         Effect.fnUntraced(function*(chunk) {
-          const parts = yield* decodeParts(chunk)
+          const parts = (yield* decodeParts(chunk)) as ReadonlyArray<Response.StreamPart<Tools>>
+          yield* validateProviderExecutedToolCalls(toolkit, chunk)
           if (tracker) {
             for (const part of parts) {
               if (part.type === "response-metadata" && part.id) {
@@ -1698,11 +1719,12 @@ export const make: (params: {
     return Stream.fromQueue(queue)
   }) as any
 
-  return {
-    generateText: generateText as Service["generateText"],
-    generateObject,
-    streamText: streamText as Service["streamText"]
-  } as const
+  return LanguageModel.of({
+    [TypeId]: TypeId,
+    generateText: generateText as LanguageModel["generateText"],
+    generateObject: generateObject as LanguageModel["generateObject"],
+    streamText: streamText as LanguageModel["streamText"]
+  })
 })
 
 // =============================================================================
@@ -1774,7 +1796,7 @@ export const generateText: {
   >(
     options: Options & GenerateTextOptions<Tools> & { readonly toolkit: ToolkitInput<Tools> }
   ): Effect.Effect<
-    GenerateTextResponse<Tools, ExtractEncodedToolParameters<Options>>,
+    GenerateTextResponse<Tools, ExtractToolParametersMode<Options>>,
     ExtractError<Options>,
     LanguageModel | ExtractServices<Options>
   >
@@ -1786,12 +1808,12 @@ export const generateText: {
   >(
     options: Options & GenerateTextOptions<ExtractTools<Options>> & { readonly toolkit: Options["toolkit"] }
   ): Effect.Effect<
-    GenerateTextResponse<ExtractTools<Options>, ExtractEncodedToolParameters<Options>>,
+    GenerateTextResponse<ExtractTools<Options>, ExtractToolParametersMode<Options>>,
     ExtractError<Options>,
     ExtractServices<Options> | LanguageModel
   >
 } = (options: GenerateTextOptions<any>): Effect.Effect<
-  GenerateTextResponse<any>,
+  GenerateTextResponse<any, any>,
   AiError.AiError,
   LanguageModel
 > =>
@@ -1855,7 +1877,7 @@ export const generateObject = <
   GenerateObjectResponse<
     ExtractTools<Options>,
     StructuredOutputSchema["Type"],
-    ExtractEncodedToolParameters<Options>
+    ExtractToolParametersMode<Options>
   >,
   ExtractError<Options>,
   ExtractServices<Options> | StructuredOutputSchema["DecodingServices"] | LanguageModel
@@ -1922,7 +1944,7 @@ export const streamText: {
   >(
     options: Options & GenerateTextOptions<Tools> & { readonly toolkit: ToolkitInput<Tools> }
   ): Stream.Stream<
-    Response.StreamPart<Tools, ExtractEncodedToolParameters<Options>>,
+    Response.StreamPart<Tools, ExtractToolParametersMode<Options>>,
     ExtractError<Options>,
     ExtractServices<Options> | LanguageModel
   >
@@ -1934,7 +1956,7 @@ export const streamText: {
   >(
     options: Options & GenerateTextOptions<ExtractTools<Options>> & { readonly toolkit: Options["toolkit"] }
   ): Stream.Stream<
-    Response.StreamPart<ExtractTools<Options>, ExtractEncodedToolParameters<Options>>,
+    Response.StreamPart<ExtractTools<Options>, ExtractToolParametersMode<Options>>,
     ExtractError<Options>,
     ExtractServices<Options> | LanguageModel
   >
@@ -2125,7 +2147,7 @@ const executeApprovedToolCalls = <Tools extends Record<string, Tool.Any>>(
   toolkit: Toolkit.WithHandler<Tools>,
   concurrency: Concurrency
 ): Effect.Effect<
-  Array<Prompt.ToolResultPart>,
+  Array<Response.ToolResultPart<string, unknown, unknown>>,
   Tool.HandlerError<Tools[keyof Tools]> | AiError.AiError,
   Tool.HandlerServices<Tools[keyof Tools]>
 > => {
@@ -2166,11 +2188,13 @@ const executeApprovedToolCalls = <Tools extends Record<string, Tool.Any>>(
       )
     )
 
-    return Prompt.makePart("tool-result", {
+    return Response.makePart("tool-result", {
       id: approval.toolCallId,
       name: toolCall.name,
+      result: terminalResult.result,
+      encodedResult: terminalResult.encodedResult,
       isFailure: terminalResult.isFailure,
-      result: terminalResult.encodedResult,
+      preliminary: terminalResult.preliminary,
       providerExecuted: false
     })
   })
@@ -2182,16 +2206,18 @@ const executeApprovedToolCalls = <Tools extends Record<string, Tool.Any>>(
 
 const createDenialResults = (
   denials: ReadonlyArray<ApprovalResult>
-): ReadonlyArray<Prompt.ToolResultPart> => {
-  const results: Array<Prompt.ToolResultPart> = []
+): ReadonlyArray<Response.ToolResultPart<string, unknown, unknown>> => {
+  const results: Array<Response.ToolResultPart<string, unknown, unknown>> = []
   for (const denial of denials) {
     if (Predicate.isNotUndefined(denial.toolCall)) {
       results.push(
-        Prompt.makePart("tool-result", {
+        Response.makePart("tool-result", {
           id: denial.toolCallId,
           name: denial.toolCall.name,
           isFailure: true,
           result: { type: "execution-denied", reason: denial.reason },
+          encodedResult: { type: "execution-denied", reason: denial.reason },
+          preliminary: false,
           providerExecuted: false
         })
       )
@@ -2314,7 +2340,10 @@ const resolveToolCalls = <Tools extends Record<string, Tool.Any>>(
                 id: toolCall.id,
                 name: toolCall.name,
                 providerExecuted: false,
-                ...result
+                result: result.result,
+                encodedResult: result.encodedResult,
+                isFailure: result.isFailure,
+                preliminary: result.preliminary
               }) as ToolResolutionResult<Tools>
           )
         )
@@ -2340,7 +2369,10 @@ const resolveToolCalls = <Tools extends Record<string, Tool.Any>>(
               id: toolCall.id,
               name: toolCall.name,
               providerExecuted: false,
-              ...result
+              result: result.result,
+              encodedResult: result.encodedResult,
+              isFailure: result.isFailure,
+              preliminary: result.preliminary
             }) as ToolResolutionResult<Tools>
         )
       )
@@ -2368,6 +2400,28 @@ const makeToolkitWithOpaqueParameters = <Tools extends Record<string, Tool.Any>>
     ...Object.values(toolkit.tools).map((tool) => tool.setParameters(Schema.Unknown))
   )
 
+// Provider-executed tools bypass Toolkit, so validate their parameters here.
+const validateProviderExecutedToolCalls = <Tools extends Record<string, Tool.Any>>(
+  toolkit: Toolkit.WithHandler<Tools>,
+  parts: ReadonlyArray<Response.PartEncoded | Response.StreamPartEncoded>
+): Effect.Effect<void, Schema.SchemaError> =>
+  Effect.forEach(
+    parts,
+    (part) => {
+      if (part.type !== "tool-call" || part.providerExecuted !== true) {
+        return Effect.void
+      }
+      const tool = toolkit.tools[part.name]
+      if (Predicate.isUndefined(tool) || !Schema.isSchema(tool.parametersSchema)) {
+        return Effect.void
+      }
+      return Effect.asVoid(
+        Schema.decodeUnknownEffect(tool.parametersSchema)(part.params)
+      ) as Effect.Effect<void, Schema.SchemaError>
+    },
+    { discard: true }
+  )
+
 const resolveToolkit = <Tools extends Record<string, Tool.Any>, E, R>(
   toolkit: ToolkitInput<Tools, E, R>
 ): Effect.Effect<Toolkit.WithHandler<Tools>, E, R> =>
diff --git a/repos/effect/packages/effect/src/unstable/ai/McpProtocol.ts b/repos/effect/packages/effect/src/unstable/ai/McpProtocol.ts
index 88f370c1e..31c53a6be 100644
--- a/repos/effect/packages/effect/src/unstable/ai/McpProtocol.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/McpProtocol.ts
@@ -13,6 +13,7 @@ import { protocol as protocol2024_11_05 } from "./internal/mcpProtocol/v2024_11_
 import { protocol as protocol2025_03_26 } from "./internal/mcpProtocol/v2025_03_26.ts"
 import { protocol as protocol2025_06_18 } from "./internal/mcpProtocol/v2025_06_18.ts"
 import { protocol as protocol2025_11_25 } from "./internal/mcpProtocol/v2025_11_25.ts"
+import { protocol as protocol2026_07_28 } from "./internal/mcpProtocol/v2026_07_28.ts"
 import type * as McpSchema from "./McpSchema.ts"
 
 /**
@@ -21,7 +22,15 @@ import type * as McpSchema from "./McpSchema.ts"
  * @category models
  * @since 4.0.0
  */
-export type ProtocolVersion = "2024-11-05" | "2025-03-26" | "2025-06-18" | "2025-11-25"
+export type ProtocolVersion = "2024-11-05" | "2025-03-26" | "2025-06-18" | "2025-11-25" | "2026-07-28"
+
+/**
+ * MCP protocol versions that use initialization and server-managed sessions.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type StatefulProtocolVersion = Exclude<ProtocolVersion, "2026-07-28">
 
 /**
  * Payload codecs used by a protocol adapter.
@@ -65,18 +74,80 @@ export interface ErasedClientRpcGroup extends ErasedRpcGroup {
   readonly prefix: (prefix: string) => RpcGroup.RpcGroup<any>
 }
 
+/**
+ * Transport behavior declared by an MCP runtime descriptor.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface TransportPolicy {
+  readonly jsonRpc: {
+    readonly acceptsBatches: boolean
+  }
+  readonly http: {
+    readonly requiresVersionHeader?: boolean | undefined
+  }
+}
+
+/**
+ * Request information decoded by a stateless MCP runtime.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface StatelessRuntimeProfile {
+  readonly protocolVersion: string
+  readonly clientCapabilities: Schema.JsonObject
+  readonly clientInfo?: McpSchema.Implementation | undefined
+  readonly requestMetadata: Schema.JsonObject
+}
+
+/**
+ * Stateful lifecycle runtime declaration carried by a protocol adapter.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface StatefulRuntimeDescriptor {
+  readonly _tag: "Stateful"
+  readonly transport: TransportPolicy
+}
+
+/**
+ * Stateless lifecycle runtime declaration carried by a protocol adapter.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface StatelessRuntimeDescriptor {
+  readonly _tag: "Stateless"
+  readonly transport: TransportPolicy
+  readonly profileFromRequestMetadata: (
+    metadata: unknown
+  ) => Effect.Effect<StatelessRuntimeProfile, unknown>
+}
+
+/**
+ * Lifecycle runtime declaration carried by a protocol adapter.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type RuntimeDescriptor = StatefulRuntimeDescriptor | StatelessRuntimeDescriptor
+
 /**
  * The operational shape shared by protocol adapters.
  *
  * @category models
  * @since 4.0.0
  */
-export interface AnyProtocolAdapter<out Version extends string = string, HandlerRequirements = unknown> {
+export interface AnyProtocolAdapter<
+  out Version extends string = string,
+  HandlerRequirements = unknown,
+  out Runtime extends RuntimeDescriptor = RuntimeDescriptor
+> {
   readonly protocolVersion: Version
-  readonly transport: {
-    readonly acceptsJsonRpcBatches: boolean
-    readonly requiresVersionHeader: boolean
-  }
+  readonly runtime: Runtime
   readonly clientRpcs: ErasedClientRpcGroup
   readonly clientNotificationRpcs: ErasedRpcGroup
   readonly serverRequestRpcs: RpcGroup.Any
@@ -102,9 +173,27 @@ export interface AnyProtocolAdapter<out Version extends string = string, Handler
  * @category models
  * @since 4.0.0
  */
-export interface ProtocolAdapter<out Version extends ProtocolVersion = ProtocolVersion>
-  extends AnyProtocolAdapter<Version>
-{}
+export interface ProtocolAdapter<
+  out Version extends ProtocolVersion = ProtocolVersion,
+  out Runtime extends RuntimeDescriptor = RuntimeDescriptor
+> extends AnyProtocolAdapter<Version, unknown, Runtime> {}
+
+/**
+ * The MCP 2026-07-28 protocol implementation.
+ *
+ * **Details**
+ *
+ * This revision uses request-scoped metadata instead of initialization and
+ * protocol-level sessions.
+ *
+ * When the selected transport supports server notifications, discovery
+ * advertises change-notification capabilities and `subscriptions/listen`
+ * delivers the requested notifications over the long-lived response.
+ *
+ * @category protocols
+ * @since 4.0.0
+ */
+export const v2026_07_28: ProtocolAdapter<"2026-07-28", StatelessRuntimeDescriptor> = protocol2026_07_28
 
 /**
  * The MCP 2025-11-25 protocol implementation.
@@ -112,7 +201,7 @@ export interface ProtocolAdapter<out Version extends ProtocolVersion = ProtocolV
  * @category protocols
  * @since 4.0.0
  */
-export const v2025_11_25: ProtocolAdapter<"2025-11-25"> = protocol2025_11_25
+export const v2025_11_25: ProtocolAdapter<"2025-11-25", StatefulRuntimeDescriptor> = protocol2025_11_25
 
 /**
  * The MCP 2025-06-18 protocol implementation.
@@ -120,7 +209,7 @@ export const v2025_11_25: ProtocolAdapter<"2025-11-25"> = protocol2025_11_25
  * @category protocols
  * @since 4.0.0
  */
-export const v2025_06_18: ProtocolAdapter<"2025-06-18"> = protocol2025_06_18
+export const v2025_06_18: ProtocolAdapter<"2025-06-18", StatefulRuntimeDescriptor> = protocol2025_06_18
 
 /**
  * The MCP 2025-03-26 protocol implementation.
@@ -128,7 +217,7 @@ export const v2025_06_18: ProtocolAdapter<"2025-06-18"> = protocol2025_06_18
  * @category protocols
  * @since 4.0.0
  */
-export const v2025_03_26: ProtocolAdapter<"2025-03-26"> = protocol2025_03_26
+export const v2025_03_26: ProtocolAdapter<"2025-03-26", StatefulRuntimeDescriptor> = protocol2025_03_26
 
 /**
  * The MCP 2024-11-05 protocol implementation.
@@ -143,4 +232,4 @@ export const v2025_03_26: ProtocolAdapter<"2025-03-26"> = protocol2025_03_26
  * @category protocols
  * @since 4.0.0
  */
-export const v2024_11_05: ProtocolAdapter<"2024-11-05"> = protocol2024_11_05
+export const v2024_11_05: ProtocolAdapter<"2024-11-05", StatefulRuntimeDescriptor> = protocol2024_11_05
diff --git a/repos/effect/packages/effect/src/unstable/ai/McpSchema.ts b/repos/effect/packages/effect/src/unstable/ai/McpSchema.ts
index 2c44f0238..66c949525 100644
--- a/repos/effect/packages/effect/src/unstable/ai/McpSchema.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/McpSchema.ts
@@ -2,7 +2,7 @@
  * Defines schemas for Model Context Protocol messages.
  *
  * MCP clients and servers use these schemas to describe the JSON-RPC requests,
- * notifications, results, and errors that can cross the protocol boundary. This
+ * notifications, results, and errors that can cross the protocol boundary.
  * This is the stable public compatibility and authoring surface. It is not an
  * exact dated wire contract: MCP protocol adapters use frozen schemas under
  * `internal/mcpSchema` for decoding and encoding. This module groups the
@@ -24,7 +24,7 @@ import type * as Scope from "../../Scope.ts"
 import * as Rpc from "../rpc/Rpc.ts"
 import * as RpcGroup from "../rpc/RpcGroup.ts"
 import * as RpcMiddleware from "../rpc/RpcMiddleware.ts"
-import type { ProtocolVersion } from "./McpProtocol.ts"
+import type { ProtocolVersion, StatefulProtocolVersion } from "./McpProtocol.ts"
 
 /**
  * Schema type returned by `optionalWithDefault`.
@@ -145,16 +145,19 @@ export type ProgressToken = typeof ProgressToken.Type
  * @since 4.0.0
  */
 export class RequestMeta extends Schema.Opaque<RequestMeta>()(Schema.Struct({
-  _meta: optional(Schema.Struct({
-    /**
-     * If specified, the caller is requesting out-of-band progress notifications
-     * for this request (as represented by notifications/progress). The value of
-     * this parameter is an opaque token that will be attached to any subsequent
-     * notifications. The receiver is not obligated to provide these
-     * notifications.
-     */
-    progressToken: optional(ProgressToken)
-  }))
+  _meta: optional(Schema.StructWithRest(
+    Schema.Struct({
+      /**
+       * If specified, the caller is requesting out-of-band progress notifications
+       * for this request (as represented by notifications/progress). The value of
+       * this parameter is an opaque token that will be attached to any subsequent
+       * notifications. The receiver is not obligated to provide these
+       * notifications.
+       */
+      progressToken: optional(ProgressToken)
+    }),
+    [Schema.JsonObject]
+  ))
 })) {}
 
 /**
@@ -577,6 +580,20 @@ export const INTERNAL_ERROR_CODE = -32603 as const
  */
 export const PARSE_ERROR_CODE = -32700 as const
 
+/**
+ * Represents the MCP error code for HTTP headers that do not match the
+ * corresponding request values.
+ *
+ * **When to use**
+ *
+ * Use when building an MCP error response for missing, malformed, or
+ * mismatched request-routing headers.
+ *
+ * @category constants
+ * @since 4.0.0
+ */
+export const HEADER_MISMATCH_ERROR_CODE = -32020 as const
+
 /**
  * Represents an MCP/JSON-RPC error for invalid JSON that could not be parsed.
  *
@@ -700,6 +717,14 @@ export const McpError = Schema.Union([
   McpErrorBase
 ])
 
+/**
+ * Type represented by the MCP protocol error schema.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type McpError = typeof McpError.Type
+
 // =============================================================================
 // Ping
 // =============================================================================
@@ -1357,6 +1382,14 @@ export const ContentBlock = Schema.Union([
   ResourceLink
 ])
 
+/**
+ * Type represented by the MCP content block schema.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type ContentBlock = typeof ContentBlock.Type
+
 /**
  * Describes a message returned as part of a prompt.
  *
@@ -1519,7 +1552,7 @@ export class ToolAnnotations extends Schema.Opaque<ToolAnnotations>()(Schema.Str
 })) {}
 
 /**
- * Object-root JSON Schema used by MCP tool inputs and outputs.
+ * Object-root JSON Schema used by MCP tool inputs.
  *
  * **Details**
  *
@@ -1529,19 +1562,19 @@ export class ToolAnnotations extends Schema.Opaque<ToolAnnotations>()(Schema.Str
  * @category tools
  * @since 4.0.0
  */
-export type ToolJsonSchema = Schema.JsonObject & {
+export type ToolJson = Schema.JsonObject & {
   readonly type: "object"
   readonly properties?: Readonly<Record<string, Schema.JsonObject>> | undefined
   readonly required?: ReadonlyArray<string> | undefined
 }
 
 /**
- * Schema for {@link ToolJsonSchema}.
+ * Schema for {@link ToolJson}.
  *
  * @category tools
  * @since 4.0.0
  */
-export const ToolJsonSchema: Schema.Codec<ToolJsonSchema> = Schema.StructWithRest(
+export const ToolJson: Schema.Codec<ToolJson> = Schema.StructWithRest(
   Schema.Struct({
     type: Schema.Literal("object"),
     properties: optional(Schema.Record(Schema.String, Schema.JsonObject)),
@@ -1550,6 +1583,26 @@ export const ToolJsonSchema: Schema.Codec<ToolJsonSchema> = Schema.StructWithRes
   [Schema.JsonObject]
 )
 
+/**
+ * JSON Schema used by MCP tool outputs.
+ *
+ * **Details**
+ *
+ * Unlike tool inputs, tool outputs may use any JSON Schema root type.
+ *
+ * @category tools
+ * @since 4.0.0
+ */
+export type ToolOutputJson = Schema.JsonObject
+
+/**
+ * Schema for {@link ToolOutputJson}.
+ *
+ * @category tools
+ * @since 4.0.0
+ */
+export const ToolOutputJson: Schema.Codec<ToolOutputJson> = Schema.JsonObject
+
 /**
  * Schema for the definition of a tool the client can call.
  *
@@ -1573,11 +1626,11 @@ export class Tool extends Schema.Class<Tool>(
   /**
    * A JSON Schema object defining the expected parameters for the tool.
    */
-  inputSchema: ToolJsonSchema,
+  inputSchema: ToolJson,
   /**
    * An optional JSON Schema object defining the structure of the tool output.
    */
-  outputSchema: optional(ToolJsonSchema),
+  outputSchema: optional(ToolOutputJson),
   /**
    * Optional additional tool information.
    */
@@ -1836,7 +1889,7 @@ export class ToolResultContent extends Schema.Class<ToolResultContent>("@effect/
   /**
    * Optional structured result returned by the tool.
    */
-  structuredContent: optional(Schema.Record(Schema.String, Schema.Unknown)),
+  structuredContent: optional(Schema.Json),
   /**
    * Whether tool execution ended in an error.
    */
@@ -1858,6 +1911,14 @@ export const SamplingMessageContentBlock = Schema.Union([
   ToolResultContent
 ])
 
+/**
+ * Type represented by the MCP sampling message content block schema.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type SamplingMessageContentBlock = typeof SamplingMessageContentBlock.Type
+
 /**
  * Describes a message issued to or received from an LLM API.
  *
@@ -2264,7 +2325,7 @@ export class RootsListChangedNotification extends Rpc.make("notifications/roots/
  * @category elicitation
  * @since 4.0.0
  */
-export class StringSchema extends Schema.Class<StringSchema>("@effect/ai/McpSchema/StringSchema")({
+export class ElicitationString extends Schema.Class<ElicitationString>("@effect/ai/McpSchema/ElicitationString")({
   type: Schema.tag("string"),
   title: optional(Schema.String),
   description: optional(Schema.String),
@@ -2280,7 +2341,7 @@ export class StringSchema extends Schema.Class<StringSchema>("@effect/ai/McpSche
  * @category elicitation
  * @since 4.0.0
  */
-export class NumberSchema extends Schema.Class<NumberSchema>("@effect/ai/McpSchema/NumberSchema")({
+export class ElicitationNumber extends Schema.Class<ElicitationNumber>("@effect/ai/McpSchema/ElicitationNumber")({
   type: Schema.Literals(["number", "integer"]),
   title: optional(Schema.String),
   description: optional(Schema.String),
@@ -2295,7 +2356,7 @@ export class NumberSchema extends Schema.Class<NumberSchema>("@effect/ai/McpSche
  * @category elicitation
  * @since 4.0.0
  */
-export class BooleanSchema extends Schema.Class<BooleanSchema>("@effect/ai/McpSchema/BooleanSchema")({
+export class ElicitationBoolean extends Schema.Class<ElicitationBoolean>("@effect/ai/McpSchema/ElicitationBoolean")({
   type: Schema.tag("boolean"),
   title: optional(Schema.String),
   description: optional(Schema.String),
@@ -2308,8 +2369,8 @@ export class BooleanSchema extends Schema.Class<BooleanSchema>("@effect/ai/McpSc
  * @category elicitation
  * @since 4.0.0
  */
-export class UntitledSingleSelectEnumSchema extends Schema.Class<UntitledSingleSelectEnumSchema>(
-  "@effect/ai/McpSchema/UntitledSingleSelectEnumSchema"
+export class UntitledSingleSelectEnum extends Schema.Class<UntitledSingleSelectEnum>(
+  "@effect/ai/McpSchema/UntitledSingleSelectEnum"
 )({
   type: Schema.tag("string"),
   title: optional(Schema.String),
@@ -2324,8 +2385,8 @@ export class UntitledSingleSelectEnumSchema extends Schema.Class<UntitledSingleS
  * @category elicitation
  * @since 4.0.0
  */
-export class TitledSingleSelectEnumSchema extends Schema.Class<TitledSingleSelectEnumSchema>(
-  "@effect/ai/McpSchema/TitledSingleSelectEnumSchema"
+export class TitledSingleSelectEnum extends Schema.Class<TitledSingleSelectEnum>(
+  "@effect/ai/McpSchema/TitledSingleSelectEnum"
 )({
   type: Schema.tag("string"),
   title: optional(Schema.String),
@@ -2343,19 +2404,27 @@ export class TitledSingleSelectEnumSchema extends Schema.Class<TitledSingleSelec
  * @category elicitation
  * @since 4.0.0
  */
-export const SingleSelectEnumSchema = Schema.Union([
-  UntitledSingleSelectEnumSchema,
-  TitledSingleSelectEnumSchema
+export const SingleSelectEnum = Schema.Union([
+  UntitledSingleSelectEnum,
+  TitledSingleSelectEnum
 ])
 
+/**
+ * Type represented by the single-select elicitation field schema.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type SingleSelectEnum = typeof SingleSelectEnum.Type
+
 /**
  * Schema for an untitled multi-select field in an MCP elicitation form.
  *
  * @category elicitation
  * @since 4.0.0
  */
-export class UntitledMultiSelectEnumSchema extends Schema.Class<UntitledMultiSelectEnumSchema>(
-  "@effect/ai/McpSchema/UntitledMultiSelectEnumSchema"
+export class UntitledMultiSelectEnum extends Schema.Class<UntitledMultiSelectEnum>(
+  "@effect/ai/McpSchema/UntitledMultiSelectEnum"
 )({
   type: Schema.tag("array"),
   title: optional(Schema.String),
@@ -2375,8 +2444,8 @@ export class UntitledMultiSelectEnumSchema extends Schema.Class<UntitledMultiSel
  * @category elicitation
  * @since 4.0.0
  */
-export class TitledMultiSelectEnumSchema extends Schema.Class<TitledMultiSelectEnumSchema>(
-  "@effect/ai/McpSchema/TitledMultiSelectEnumSchema"
+export class TitledMultiSelectEnum extends Schema.Class<TitledMultiSelectEnum>(
+  "@effect/ai/McpSchema/TitledMultiSelectEnum"
 )({
   type: Schema.tag("array"),
   title: optional(Schema.String),
@@ -2398,20 +2467,28 @@ export class TitledMultiSelectEnumSchema extends Schema.Class<TitledMultiSelectE
  * @category elicitation
  * @since 4.0.0
  */
-export const MultiSelectEnumSchema = Schema.Union([
-  UntitledMultiSelectEnumSchema,
-  TitledMultiSelectEnumSchema
+export const MultiSelectEnum = Schema.Union([
+  UntitledMultiSelectEnum,
+  TitledMultiSelectEnum
 ])
 
+/**
+ * Type represented by the multi-select elicitation field schema.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type MultiSelectEnum = typeof MultiSelectEnum.Type
+
 /**
  * Schema for the legacy titled single-select elicitation field.
  *
- * @deprecated Use {@link TitledSingleSelectEnumSchema} instead.
+ * @deprecated Use {@link TitledSingleSelectEnum} instead.
  * @category elicitation
  * @since 4.0.0
  */
-export class LegacyTitledEnumSchema extends Schema.Class<LegacyTitledEnumSchema>(
-  "@effect/ai/McpSchema/LegacyTitledEnumSchema"
+export class LegacyTitledEnum extends Schema.Class<LegacyTitledEnum>(
+  "@effect/ai/McpSchema/LegacyTitledEnum"
 )({
   type: Schema.tag("string"),
   title: optional(Schema.String),
@@ -2427,12 +2504,20 @@ export class LegacyTitledEnumSchema extends Schema.Class<LegacyTitledEnumSchema>
  * @category elicitation
  * @since 4.0.0
  */
-export const EnumSchema = Schema.Union([
-  SingleSelectEnumSchema,
-  MultiSelectEnumSchema,
-  LegacyTitledEnumSchema
+export const ElicitationEnum = Schema.Union([
+  LegacyTitledEnum,
+  SingleSelectEnum,
+  MultiSelectEnum
 ])
 
+/**
+ * Type represented by the elicitation enumeration field schema.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type ElicitationEnum = typeof ElicitationEnum.Type
+
 /**
  * Schema for primitive field definitions accepted by MCP elicitation forms.
  *
@@ -2440,13 +2525,21 @@ export const EnumSchema = Schema.Union([
  * @since 4.0.0
  */
 export const PrimitiveSchemaDefinition = Schema.Union([
-  StringSchema,
-  NumberSchema,
-  BooleanSchema,
-  EnumSchema
+  ElicitationEnum,
+  ElicitationString,
+  ElicitationNumber,
+  ElicitationBoolean
 ])
 
-const ElicitationFormSchema = Schema.Struct({
+/**
+ * Type represented by the primitive elicitation field schema.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type PrimitiveSchemaDefinition = typeof PrimitiveSchemaDefinition.Type
+
+const ElicitationForm = Schema.Struct({
   $schema: optional(Schema.String),
   type: Schema.tag("object"),
   properties: Schema.Record(Schema.String, PrimitiveSchemaDefinition),
@@ -2465,7 +2558,7 @@ export class ElicitRequestFormParams extends Schema.Class<ElicitRequestFormParam
   ...RequestMeta.fields,
   mode: optional(Schema.Literal("form")),
   message: Schema.String,
-  requestedSchema: ElicitationFormSchema
+  requestedSchema: ElicitationForm
 }) {}
 
 /**
@@ -2495,6 +2588,14 @@ export const ElicitRequestParams = Schema.Union([
   ElicitRequestURLParams
 ])
 
+/**
+ * Type represented by the MCP elicitation request parameters schema.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type ElicitRequestParams = typeof ElicitRequestParams.Type
+
 /**
  * Schema for an accepted client response to an elicitation request.
  *
@@ -2552,6 +2653,70 @@ export const ElicitResult = Schema.Union([
   ElicitDeclineResult
 ])
 
+/**
+ * Type represented by the MCP elicitation result schema.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type ElicitResult = typeof ElicitResult.Type
+
+/**
+ * Version-neutral request for additional MCP client input.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type McpInputRequest =
+  | { readonly method: "roots/list"; readonly params?: Schema.JsonObject | undefined }
+  | { readonly method: "sampling/createMessage"; readonly params: Schema.JsonObject }
+  | { readonly method: "elicitation/create"; readonly params: Schema.JsonObject }
+
+/**
+ * Version-neutral response supplied by an MCP client for a prior input request.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type McpInputResponse = Schema.JsonObject
+
+/**
+ * Indicates that an MCP operation requires additional keyed input from the client.
+ *
+ * **When to use**
+ *
+ * Use when a handler cannot complete until the client supplies roots, sampling,
+ * or elicitation input in a later request.
+ *
+ * **Details**
+ *
+ * `requestState` is opaque to the client and is returned unchanged with the
+ * keyed input responses.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export class InputRequired extends Data.TaggedClass("InputRequired")<{
+  readonly inputRequests?: Readonly<Record<string, McpInputRequest>> | undefined
+  readonly requestState?: string | undefined
+}> {
+  // The overload preserves the requirement that at least one of inputRequests or requestState is present.
+  // oxlint-disable-next-line no-useless-constructor
+  constructor(
+    fields:
+      | {
+        readonly inputRequests: Readonly<Record<string, McpInputRequest>>
+        readonly requestState?: string | undefined
+      }
+      | {
+        readonly inputRequests?: Readonly<Record<string, McpInputRequest>> | undefined
+        readonly requestState: string
+      }
+  ) {
+    super(fields)
+  }
+}
+
 /**
  * Sent from the server asking the client to collect structured input from the
  * user.
@@ -2644,9 +2809,33 @@ export interface McpReverseClient {
   ) => Effect.Effect<CreateMessageResult, McpReverseOperationError | McpReverseOperationUnsupported>
   readonly elicit: (
     request: typeof Elicit.payloadSchema.Type
-  ) => Effect.Effect<typeof ElicitResult.Type, McpReverseOperationError | McpReverseOperationUnsupported>
+  ) => Effect.Effect<ElicitResult, McpReverseOperationError | McpReverseOperationUnsupported>
 }
 
+/**
+ * Protocol-neutral context available while handling an MCP request.
+ *
+ * **Details**
+ *
+ * Unlike `McpServerClient`, this service does not imply an initialized session
+ * or support for server-initiated requests.
+ *
+ * @category services
+ * @since 4.0.0
+ */
+export class McpRequestContext extends Context.Service<McpRequestContext, {
+  readonly clientId: number
+  readonly protocolVersion: string
+  readonly clientCapabilities: ClientCapabilities
+  readonly clientInfo?: Implementation | undefined
+  readonly requestMetadata?:
+    | NonNullable<typeof Initialize.payloadSchema.Type["_meta"]>
+    | Schema.JsonObject
+    | undefined
+  readonly inputResponses?: Readonly<Record<string, McpInputResponse>> | undefined
+  readonly requestState?: string | undefined
+}>()("effect/ai/McpSchema/McpRequestContext") {}
+
 /**
  * Service available while handling an MCP client request.
  *
@@ -2660,10 +2849,11 @@ export interface McpReverseClient {
  */
 export class McpServerClient extends Context.Service<McpServerClient, {
   readonly clientId: number
-  readonly protocolVersion: ProtocolVersion
+  readonly protocolVersion: StatefulProtocolVersion
   readonly clientCapabilities: ClientCapabilities
   readonly clientInfo: Implementation
   readonly initializePayload: typeof Initialize.payloadSchema["Type"]
+  readonly requestMetadata?: Schema.JsonObject | undefined
   readonly getClient: Effect.Effect<
     McpReverseClient,
     never,
@@ -3021,8 +3211,13 @@ export function param<const Name extends string, S extends Schema.Constraint>(
  * @category services
  * @since 4.0.0
  */
-export class EnabledWhen
-  extends Context.Service<EnabledWhen, Predicate.Predicate<typeof Initialize.payloadSchema.Type>>()(
-    "effect/unstable/ai/McpSchema/EnabledWhen"
-  )
-{}
+export class EnabledWhen extends Context.Service<
+  EnabledWhen,
+  Predicate.Predicate<{
+    readonly protocolVersion: string
+    readonly capabilities: ClientCapabilities
+    readonly clientInfo?: Implementation | undefined
+  }>
+>()(
+  "effect/unstable/ai/McpSchema/EnabledWhen"
+) {}
diff --git a/repos/effect/packages/effect/src/unstable/ai/McpServer.ts b/repos/effect/packages/effect/src/unstable/ai/McpServer.ts
index e5ada2add..8ed7ac1b4 100644
--- a/repos/effect/packages/effect/src/unstable/ai/McpServer.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/McpServer.ts
@@ -2,8 +2,8 @@
  * Builds Model Context Protocol (MCP) servers with Effect.
  *
  * The `McpServer` service stores the tools, resources, resource templates,
- * prompts, completions, initialized clients, and outgoing notifications exposed
- * by a server. This module also includes the server runner, custom protocol,
+ * prompts, completions, and outgoing notifications exposed by a server. This
+ * module also includes the server runner, custom protocol,
  * stdio, and HTTP layers, registration helpers, and APIs that let handlers ask
  * the connected client for structured input or read its advertised
  * capabilities.
@@ -14,20 +14,23 @@ import * as Arr from "../../Array.ts"
 import * as Cause from "../../Cause.ts"
 import * as Context from "../../Context.ts"
 import * as Data from "../../Data.ts"
+import * as Deferred from "../../Deferred.ts"
 import * as Effect from "../../Effect.ts"
+import * as ErrorReporter from "../../ErrorReporter.ts"
 import * as Exit from "../../Exit.ts"
 import * as Fiber from "../../Fiber.ts"
+import type * as JsonSchema from "../../JsonSchema.ts"
 import * as Layer from "../../Layer.ts"
-import * as LogLevel from "../../LogLevel.ts"
 import * as Option from "../../Option.ts"
 import * as Predicate from "../../Predicate.ts"
+import * as PubSub from "../../PubSub.ts"
 import * as Queue from "../../Queue.ts"
 import * as RcMap from "../../RcMap.ts"
-import { CurrentLogLevel } from "../../References.ts"
+import { CurrentLogLevel, Scheduler } from "../../References.ts"
 import * as Result from "../../Result.ts"
 import * as Schema from "../../Schema.ts"
 import * as SchemaAST from "../../SchemaAST.ts"
-import * as Sink from "../../Sink.ts"
+import * as Scope from "../../Scope.ts"
 import type { Stdio } from "../../Stdio.ts"
 import * as Stream from "../../Stream.ts"
 import * as FindMyWay from "../http/FindMyWay.ts"
@@ -38,14 +41,15 @@ import * as HttpServerRequest from "../http/HttpServerRequest.ts"
 import * as HttpServerResponse from "../http/HttpServerResponse.ts"
 import * as Rpc from "../rpc/Rpc.ts"
 import * as RpcClient from "../rpc/RpcClient.ts"
-import * as RpcGroup from "../rpc/RpcGroup.ts"
+import type * as RpcGroup from "../rpc/RpcGroup.ts"
 import * as RpcMessage from "../rpc/RpcMessage.ts"
 import * as RpcSerialization from "../rpc/RpcSerialization.ts"
 import * as RpcServer from "../rpc/RpcServer.ts"
 import * as AiError from "./AiError.ts"
 import * as McpCore from "./internal/mcpCore.ts"
 import * as McpProtocolInternal from "./internal/mcpProtocol.ts"
-import * as McpProtocolRegistry from "./internal/mcpProtocolRegistry.ts"
+import * as McpRuntime from "./internal/mcpRuntime.ts"
+import * as InternalStructuredOutput from "./internal/structured-output.ts"
 import type * as McpProtocol from "./McpProtocol.ts"
 import * as McpSchema from "./McpSchema.ts"
 import {
@@ -53,22 +57,21 @@ import {
   ElicitationDeclined,
   EnabledWhen,
   GetPromptResult,
-  Initialize,
   InternalError,
   InvalidParams,
   InvalidRequest,
   isParam,
+  McpRequestContext,
   McpServerClient,
   McpServerClientMiddleware,
   MethodNotFound,
-  Ping,
   Prompt,
   Resource,
   ResourceTemplate,
   ServerNotificationRpcs,
   TextContent,
   Tool as McpTool,
-  ToolJsonSchema
+  ToolJson
 } from "./McpSchema.ts"
 import type {
   CallTool,
@@ -84,47 +87,30 @@ import type {
   ServerCapabilities
 } from "./McpSchema.ts"
 import * as Tool from "./Tool.ts"
-import type * as Toolkit from "./Toolkit.ts"
+import * as Toolkit from "./Toolkit.ts"
 
 type CompletionContext = typeof Complete.payloadSchema.Type["context"]
 
 interface QueuedServerNotification {
   readonly notification: McpCore.ServerNotification
   readonly targetClientId?: number | undefined
+  readonly delivered: Deferred.Deferred<void>
+  readonly requestContext?: McpRequestContext["Service"] | undefined
+  readonly requestHeaders?: Headers.Headers | undefined
 }
 
 const internalState = new WeakMap<object, {
   readonly core: McpCore.McpCore
   readonly notifications: Queue.Dequeue<QueuedServerNotification>
+  readonly notificationDelivery: { consumers: number }
 }>()
-type ServerExtensions = NonNullable<typeof ServerCapabilities.Type["extensions"]>
+type ServerExtensions = NonNullable<ServerCapabilities["extensions"]>
 type ServerNotificationRequest<
   R extends Rpc.Any = RpcGroup.Rpcs<typeof BroadcastServerNotificationRpcs>
 > = R extends Rpc.Any ? RpcMessage.Request<R> : never
 
 const BroadcastServerNotificationRpcs = ServerNotificationRpcs.omit("notifications/elicitation/complete")
-
-/**
- * MCP models `structuredContent` as a JSON object, so a `null` or array
- * encoded result must be omitted rather than sent through as-is.
- */
-const toStructuredContent = (value: unknown): Schema.JsonObject | undefined =>
-  typeof value === "object" && value !== null && !Array.isArray(value)
-    ? value as Schema.JsonObject
-    : undefined
-
-const validateStructuredContent = (
-  toolName: string,
-  value: unknown
-): Effect.Effect<Schema.Json, McpCore.ToolResultProjectionError> =>
-  Schema.is(Schema.Json)(value)
-    ? Effect.succeed(value)
-    : Effect.fail(
-      new McpCore.ToolResultProjectionError({
-        name: toolName,
-        message: `Tool '${toolName}' returned structured content that is not valid JSON`
-      })
-    )
+const isLoggingLevel = Schema.is(McpSchema.LoggingLevel)
 
 const toInternalServerNotification = (
   message: ServerNotificationRequest
@@ -167,6 +153,39 @@ const toInternalServerNotification = (
   }
 }
 
+// Request services must come from the invocation, including when a handler is registered during a request.
+const omitRequestServices = Context.omit(
+  McpRequestContext,
+  McpServerClient,
+  HttpServerRequest.HttpServerRequest,
+  CurrentLogLevel
+)
+
+const provideInvocationContext = <A, E, R>(
+  effect: Effect.Effect<A, E, R>,
+  invocation: McpCore.McpInvocation
+): Effect.Effect<A, E, Exclude<R, McpRequestContext>> => {
+  let provided = Effect.provideService(effect, McpRequestContext, invocation.requestContext)
+  const requestMetadata = invocation.requestContext.requestMetadata
+  const logLevel = Predicate.hasProperty(requestMetadata, "io.modelcontextprotocol/logLevel")
+    ? requestMetadata["io.modelcontextprotocol/logLevel"]
+    : undefined
+  if (isLoggingLevel(logLevel)) {
+    provided = Effect.provideService(
+      provided,
+      CurrentLogLevel,
+      McpProtocolInternal.mcpLogLevels[logLevel].effect
+    )
+  }
+  return (invocation.serverClient === undefined
+    ? provided
+    : Effect.provideService(provided, McpServerClient, invocation.serverClient)) as Effect.Effect<
+      A,
+      E,
+      Exclude<R, McpRequestContext>
+    >
+}
+
 /**
  * Service that stores and serves an MCP server's registered tools, resources,
  * prompts, completions, and outgoing notifications.
@@ -185,7 +204,6 @@ export class McpServer extends Context.Service<McpServer, {
     readonly clientId: number
     readonly elicitationId: string
   }) => Effect.Effect<void>
-  readonly initializedClients: Set<number>
   readonly tools: ReadonlyArray<{
     readonly tool: McpTool
     readonly annotations: Context.Context<never>
@@ -193,7 +211,13 @@ export class McpServer extends Context.Service<McpServer, {
   readonly addTool: (options: {
     readonly tool: McpTool
     readonly annotations: Context.Context<never>
-    readonly handle: (payload: any) => Effect.Effect<CallToolResult, InternalError | InvalidParams, McpServerClient>
+    readonly handle: (
+      payload: any
+    ) => Effect.Effect<
+      CallToolResult | McpSchema.InputRequired,
+      InternalError | InvalidParams,
+      McpRequestContext
+    >
   }) => Effect.Effect<void>
   readonly callTool: (
     requests: typeof CallTool.payloadSchema.Type
@@ -206,7 +230,11 @@ export class McpServer extends Context.Service<McpServer, {
   readonly addResource: (options: {
     readonly resource: Resource
     readonly annotations: Context.Context<never>
-    readonly handle: Effect.Effect<typeof ReadResourceResult.Type, InternalError, McpServerClient>
+    readonly handle: Effect.Effect<
+      ReadResourceResult,
+      InternalError,
+      McpRequestContext
+    >
   }) => Effect.Effect<void>
 
   readonly resourceTemplates: ReadonlyArray<{
@@ -229,16 +257,16 @@ export class McpServer extends Context.Service<McpServer, {
         uri: string,
         params: Array<string>
       ) => Effect.Effect<
-        typeof ReadResourceResult.Type,
+        ReadResourceResult,
         InvalidParams | InternalError,
-        McpServerClient
+        McpRequestContext
       >
     }
   ) => Effect.Effect<void>
 
   readonly findResource: (
     uri: string
-  ) => Effect.Effect<typeof ReadResourceResult.Type, McpErrorBase | InvalidParams | InternalError, McpServerClient>
+  ) => Effect.Effect<ReadResourceResult, McpErrorBase | InvalidParams | InternalError, McpServerClient>
 
   readonly prompts: ReadonlyArray<{
     readonly prompt: Prompt
@@ -252,11 +280,11 @@ export class McpServer extends Context.Service<McpServer, {
       (
         input: string,
         context: CompletionContext
-      ) => Effect.Effect<CompleteResult, InternalError, McpServerClient>
+      ) => Effect.Effect<CompleteResult, InternalError, McpRequestContext>
     >
     readonly handle: (
       params: Record<string, string>
-    ) => Effect.Effect<GetPromptResult, InternalError | InvalidParams, McpServerClient>
+    ) => Effect.Effect<GetPromptResult | McpSchema.InputRequired, InternalError | InvalidParams, McpRequestContext>
   }) => Effect.Effect<void>
   readonly getPromptResult: (
     request: typeof GetPrompt.payloadSchema.Type
@@ -290,49 +318,75 @@ export class McpServer extends Context.Service<McpServer, {
       readonly annotations: Context.Context<never>
     }> = []
     const notificationsQueue = yield* Queue.make<QueuedServerNotification>()
-    const listChangedHandles = new Map<string, any>()
+    const notificationDelivery = { consumers: 0 }
+    const pendingListChanges = new Set<string>()
+    const dispatcher = (yield* Scheduler).makeDispatcher()
     const notifications = yield* RpcClient.makeNoSerialization(BroadcastServerNotificationRpcs, {
       spanPrefix: "McpServer/Notifications",
       onFromClient: (options) =>
-        Effect.suspend((): Effect.Effect<void> => {
-          const message = options.message
-          if (message._tag !== "Request") {
-            return Effect.void
-          }
-          const notification = toInternalServerNotification(message)
-          if (notification === undefined) {
-            return Effect.void
-          }
-          if (message.tag.includes("list_changed")) {
-            if (!listChangedHandles.has(message.tag)) {
-              listChangedHandles.set(
-                message.tag,
-                setTimeout(() => {
-                  Queue.offerUnsafe(notificationsQueue, { notification })
-                  listChangedHandles.delete(message.tag)
+        Deferred.make<void>().pipe(Effect.flatMap((delivered) =>
+          Effect.withFiber((fiber): Effect.Effect<void> => {
+            const message = options.message
+            if (message._tag !== "Request") {
+              return Effect.void
+            }
+            const notification = toInternalServerNotification(message)
+            if (notification === undefined) {
+              return Effect.void
+            }
+            const queued = {
+              notification,
+              delivered,
+              requestContext: Context.getOrUndefined(fiber.context, McpRequestContext),
+              requestHeaders: Context.getOrUndefined(fiber.context, HttpServerRequest.HttpServerRequest)?.headers
+            }
+            let enqueued = false
+            if (message.tag.includes("list_changed")) {
+              if (!pendingListChanges.has(message.tag)) {
+                enqueued = true
+                const tag = message.tag
+                dispatcher.scheduleTask(() => {
+                  Queue.offerUnsafe(notificationsQueue, queued)
+                  pendingListChanges.delete(message.tag)
                 }, 0)
-              )
+                pendingListChanges.add(tag)
+              }
+            } else {
+              enqueued = true
+              Queue.offerUnsafe(notificationsQueue, queued)
             }
-          } else {
-            Queue.offerUnsafe(notificationsQueue, { notification })
-          }
-          return notifications.write({
-            clientId: 0,
-            requestId: message.id,
-            _tag: "Exit",
-            exit: Exit.void
+            // write resumes the caller synchronously, so defer it until delivery completes.
+            const acknowledge = Effect.suspend(() =>
+              notifications.write({
+                clientId: 0,
+                requestId: message.id,
+                _tag: "Exit",
+                exit: Exit.void
+              })
+            )
+            return enqueued && queued.requestContext !== undefined && notificationDelivery.consumers > 0
+              ? Effect.andThen(Deferred.await(delivered), acknowledge)
+              : acknowledge
           })
-        })
+        ))
     })
 
     const service = McpServer.of({
       notifications: notifications.client,
       notifyElicitationComplete: ({ clientId, elicitationId }) =>
-        Queue.offer(notificationsQueue, {
-          notification: McpCore.ServerNotification.ElicitationComplete({ elicitationId }),
-          targetClientId: clientId
-        }),
-      initializedClients: new Set(),
+        Deferred.make<void>().pipe(
+          Effect.flatMap((delivered) =>
+            Queue.offer(notificationsQueue, {
+              notification: McpCore.ServerNotification.ElicitationComplete({ elicitationId }),
+              targetClientId: clientId,
+              delivered
+            }).pipe(
+              Effect.andThen(
+                Effect.suspend(() => notificationDelivery.consumers > 0 ? Deferred.await(delivered) : Effect.void)
+              )
+            )
+          )
+        ),
       get tools() {
         return tools
       },
@@ -359,11 +413,7 @@ export class McpServer extends Context.Service<McpServer, {
                 }
               ),
             handle: (call, invocation) =>
-              options.handle(call.arguments).pipe(
-                Effect.provideService(
-                  McpServerClient,
-                  invocation.requestContext
-                ),
+              provideInvocationContext(options.handle(call.arguments), invocation).pipe(
                 Effect.catchTags({
                   InternalError: (error) =>
                     Effect.fail(
@@ -374,18 +424,19 @@ export class McpServer extends Context.Service<McpServer, {
                     ),
                   InvalidParams: (error) =>
                     Effect.fail(
-                      new McpCore.InvalidToolInput({
+                      new (invocation.requestContext.requestState === undefined &&
+                          invocation.requestContext.inputResponses === undefined
+                        ? McpCore.InvalidToolInput
+                        : McpCore.InvalidToolContinuation)({
                         name: options.tool.name,
                         message: error.message
                       })
                     )
                 }),
-                Effect.flatMap((result) =>
-                  result.structuredContent === undefined
-                    ? Effect.succeed(result)
-                    : validateStructuredContent(options.tool.name, result.structuredContent).pipe(
-                      Effect.as(result)
-                    )
+                Effect.map((result) =>
+                  Predicate.isTagged(result, "InputRequired")
+                    ? McpCore.OperationOutcome.InputRequired(result)
+                    : McpCore.OperationOutcome.Complete(result)
                 )
               )
           })
@@ -394,15 +445,10 @@ export class McpServer extends Context.Service<McpServer, {
       callTool: (request) =>
         Effect.gen(function*() {
           const client = yield* McpServerClient
-          const result = yield* internalCore.tools.call(request, {
-            clientId: client.clientId,
-            protocol: {
-              protocolVersion: client.protocolVersion,
-              clientCapabilities: client.initializePayload.capabilities,
-              clientInfo: client.initializePayload.clientInfo
-            },
-            requestContext: client
-          }).pipe(
+          const result = yield* internalCore.tools.call(
+            request,
+            McpProtocolInternal.invocationFromClient(client)
+          ).pipe(
             Effect.mapError((error) =>
               new InvalidParams({
                 message: error._tag === "ToolNotFound"
@@ -411,7 +457,10 @@ export class McpServer extends Context.Service<McpServer, {
               })
             )
           )
-          return result
+          if (result._tag === "InputRequired") {
+            return yield* new InvalidParams({ message: "Client input is not supported by this MCP protocol" })
+          }
+          return result.value
         }),
       get resources() {
         return resources
@@ -437,10 +486,7 @@ export class McpServer extends Context.Service<McpServer, {
                 clientInfo: profile.clientInfo
               })
             },
-            read: (invocation) =>
-              options.handle.pipe(
-                Effect.provideService(McpServerClient, invocation.requestContext)
-              )
+            read: (invocation) => provideInvocationContext(options.handle, invocation)
           })
           yield* notifications.client["notifications/resources/list_changed"]({})
         }),
@@ -477,16 +523,13 @@ export class McpServer extends Context.Service<McpServer, {
               }
               return params
             },
-            read: (uri, params, invocation) =>
-              handle(uri, Array.from(params)).pipe(
-                Effect.provideService(McpServerClient, invocation.requestContext)
-              )
+            read: (uri, params, invocation) => provideInvocationContext(handle(uri, Array.from(params)), invocation)
           })
           for (const [param, handle] of Object.entries(completions)) {
             yield* internalCore.completions.register(
               `resource/${template.uriTemplate}/${param}`,
-              (request) =>
-                handle(request.argument.value, request.context).pipe(
+              (request, invocation) =>
+                provideInvocationContext(handle(request.argument.value, request.context), invocation).pipe(
                   Effect.map((result) => ({
                     values: result.completion.values,
                     total: result.completion.total,
@@ -501,16 +544,10 @@ export class McpServer extends Context.Service<McpServer, {
       findResource: (uri) =>
         Effect.gen(function*() {
           const client = yield* McpServerClient
-          return yield* internalCore.resources.read(uri, {
-            clientId: client.clientId,
-            protocol: {
-              protocolVersion: client.protocolVersion,
-              clientCapabilities: client.clientCapabilities,
-              clientInfo: client.clientInfo,
-              requestMetadata: client.initializePayload._meta
-            },
-            requestContext: client
-          }).pipe(
+          return yield* internalCore.resources.read(
+            uri,
+            McpProtocolInternal.invocationFromClient(client)
+          ).pipe(
             Effect.catchTag("ResourceNotFound", (error) =>
               Effect.fail(new InvalidParams({ message: `Resource '${error.uri}' not found` })))
           )
@@ -537,19 +574,19 @@ export class McpServer extends Context.Service<McpServer, {
               })
             },
             get: (params, invocation) =>
-              options.handle(params).pipe(
-                Effect.provideService(McpServerClient, invocation.requestContext)
+              provideInvocationContext(options.handle(params), invocation).pipe(
+                Effect.map((result) =>
+                  Predicate.isTagged(result, "InputRequired")
+                    ? McpCore.OperationOutcome.InputRequired(result)
+                    : McpCore.OperationOutcome.Complete(result)
+                )
               )
           })
           for (const [param, handle] of Object.entries(options.completions)) {
             yield* internalCore.completions.register(
               `prompt/${options.prompt.name}/${param}`,
               (request, invocation) =>
-                handle(request.argument.value, request.context).pipe(
-                  Effect.provideService(
-                    McpServerClient,
-                    invocation.requestContext
-                  ),
+                provideInvocationContext(handle(request.argument.value, request.context), invocation).pipe(
                   Effect.map((result) => ({
                     values: result.completion.values,
                     total: result.completion.total,
@@ -563,13 +600,16 @@ export class McpServer extends Context.Service<McpServer, {
         }),
       getPromptResult: Effect.fnUntraced(function*({ arguments: params, name }) {
         const client = yield* McpServerClient
-        return yield* internalCore.prompts.get(
+        const outcome = yield* internalCore.prompts.get(
           name,
           params ?? {},
           McpProtocolInternal.invocationFromClient(client)
         ).pipe(
           Effect.catchTag("PromptNotFound", () => new InvalidParams({ message: `Prompt '${name}' not found` }))
         )
+        return outcome._tag === "Complete"
+          ? outcome.value
+          : yield* new InvalidParams({ message: "Client input is not supported by this MCP protocol" })
       }),
       completion: Effect.fnUntraced(function*(complete) {
         const client = yield* McpServerClient
@@ -591,7 +631,7 @@ export class McpServer extends Context.Service<McpServer, {
         }
       })
     })
-    internalState.set(service, { core: internalCore, notifications: notificationsQueue })
+    internalState.set(service, { core: internalCore, notifications: notificationsQueue, notificationDelivery })
     return service
   })
 
@@ -606,63 +646,27 @@ export class McpServer extends Context.Service<McpServer, {
 const MCP_SESSION_ID_HEADER = "mcp-session-id"
 const MCP_PROTOCOL_VERSION_HEADER = "mcp-protocol-version"
 const MCP_INVALID_BATCH_METHOD = "invalid/json-rpc-batch"
+const cancelledResponses = new WeakMap<object, string | number>()
 const requestKey = (requestId: string | number): string => `${typeof requestId}:${requestId}`
 
-type SessionLogLevel =
-  | { readonly _tag: "Effect"; readonly level: LogLevel.LogLevel }
-  | { readonly _tag: "Mcp"; readonly level: McpSchema.LoggingLevel }
-
-interface Session {
-  readonly initializePayload: typeof Initialize.payloadSchema.Type
-  readonly negotiatedProfile: McpCore.NegotiatedProtocolProfile
-  readonly protocol: McpProtocol.ProtocolAdapter
-  readonly resourceSubscriptions: Set<string> | undefined
-  logLevel: SessionLogLevel
-}
-
-interface Sessions {
-  readonly bySessionId: Map<string, Session>
-  readonly byClientId: Map<number, Session>
+interface ActiveRequest {
+  readonly prepared: McpRuntime.PreparedRequest
+  readonly cancelled: boolean
 }
 
 class McpClientKey extends Data.Class<{
   readonly clientId: number
-  readonly profile: McpCore.NegotiatedProtocolProfile
+  readonly profile: McpCore.NegotiatedProtocolProfile<string>
 }> {}
 
-class McpProtocolState extends Context.Service<McpProtocolState, {
-  readonly sessions: Sessions
-  readonly protocolRegistry: McpProtocolRegistry.ProtocolRegistry<McpProtocol.ProtocolAdapter>
-}>()("effect/ai/McpServer/McpProtocolState") {}
-
-const makeMcpProtocolState = Effect.fnUntraced(function*(
-  protocols: Arr.NonEmptyReadonlyArray<McpProtocol.ProtocolAdapter>
-) {
-  // TODO: Replace the shared session map with an adapter-owned lifecycle strategy
-  // before v2026-07-28. The strategy must let sessionful revisions pin a profile
-  // after initialize while stateless revisions select and derive it per request.
-  return McpProtocolState.of({
-    sessions: {
-      bySessionId: new Map(),
-      byClientId: new Map()
-    },
-    protocolRegistry: yield* McpProtocolRegistry.make(protocols)
-  })
-})
-
-const layerMcpProtocolState = (
-  protocols: Arr.NonEmptyReadonlyArray<McpProtocol.ProtocolAdapter>
-): Layer.Layer<McpProtocolState, Cause.IllegalArgumentError> =>
-  Layer.effect(McpProtocolState)(makeMcpProtocolState(protocols))
-
 /**
  * Runs an MCP server over the current `RpcServer.Protocol`.
  *
  * **Details**
  *
- * The server performs initialization and session handling, serves registered
- * tools, resources, and prompts, and forwards queued server notifications to
- * initialized clients.
+ * The server serves registered tools, resources, and prompts. The selected MCP
+ * runtime handles protocol lifecycle state and determines which clients receive
+ * queued server notifications.
  *
  * @category running
  * @since 4.0.0
@@ -670,6 +674,7 @@ const layerMcpProtocolState = (
 export const run: (options: {
   readonly name: string
   readonly version: string
+  readonly instructions?: string | undefined
   readonly description?: string | undefined
   readonly websiteUrl?: string | undefined
   readonly icons?: ReadonlyArray<McpSchema.Icon> | undefined
@@ -682,45 +687,137 @@ export const run: (options: {
 > = Effect.fnUntraced(function*(options: {
   readonly name: string
   readonly version: string
+  readonly instructions?: string | undefined
   readonly description?: string | undefined
   readonly websiteUrl?: string | undefined
   readonly icons?: ReadonlyArray<McpSchema.Icon> | undefined
   readonly protocols: Arr.NonEmptyReadonlyArray<McpProtocol.ProtocolAdapter>
   readonly extensions?: ServerExtensions | undefined
 }) {
-  const protocolStateOption = yield* Effect.serviceOption(McpProtocolState)
-  const protocolState = Option.isSome(protocolStateOption)
-    ? protocolStateOption.value
-    : yield* makeMcpProtocolState(options.protocols)
-  return yield* runWithProtocolState(options, protocolState)
+  const runtimeOption = yield* Effect.serviceOption(McpRuntime.ServerRuntime)
+  const runtime = Option.isSome(runtimeOption)
+    ? runtimeOption.value
+    : yield* McpRuntime.make(options.protocols)
+  return yield* runWithRuntime(options, runtime, "custom")
 })
 
-const runWithProtocolState = Effect.fnUntraced(function*(options: {
-  readonly name: string
-  readonly version: string
-  readonly description?: string | undefined
-  readonly websiteUrl?: string | undefined
-  readonly icons?: ReadonlyArray<McpSchema.Icon> | undefined
-  readonly extensions?: ServerExtensions | undefined
-}, protocolState: McpProtocolState["Service"]) {
-  const protocolRegistry = protocolState.protocolRegistry
-  const serverScope = yield* Effect.scope
+const runWithRuntime = Effect.fnUntraced(function*(
+  options: {
+    readonly name: string
+    readonly version: string
+    readonly instructions?: string | undefined
+    readonly description?: string | undefined
+    readonly websiteUrl?: string | undefined
+    readonly icons?: ReadonlyArray<McpSchema.Icon> | undefined
+    readonly extensions?: ServerExtensions | undefined
+  },
+  runtime: McpRuntime.ServerRuntimeShape,
+  transport: "custom" | "http" | "stdio"
+) {
   const protocol = yield* RpcServer.Protocol
   const server = yield* McpServer
   const defaultLogLevel = yield* CurrentLogLevel
-  const isHttp = Option.isSome(yield* Effect.serviceOption(HttpRouter.HttpRouter))
-  const sessions = protocolState.sessions
-  const clientProtocols = new Map<number, McpProtocol.ProtocolAdapter>()
-  const activeRequests = new Map<number, Map<string, boolean>>()
-  const clientProfiles = new Map<number, McpCore.NegotiatedProtocolProfile>()
-  const handlers = yield* Layer.build(layerHandlers(options, {
-    sessions,
-    protocolRegistry
-  }))
+  const isHttp = transport === "http"
+  const clientStates = new Map<number, {
+    protocol: McpProtocol.AnyProtocolAdapter
+    profile: McpCore.NegotiatedProtocolProfile<string> | undefined
+    sessionHeaders: Headers.Headers | undefined
+  }>()
+  const activeRequests = new Map<number, Map<string, ActiveRequest>>()
+  const reverseRequestClients = new Map<string, Array<McpClientKey>>()
+  const disconnectClient = (clientId: number) => {
+    activeRequests.delete(clientId)
+    clientStates.delete(clientId)
+    runtime.disconnect(clientId)
+  }
+  const sendRequestError = (clientId: number, requestId: string | number, error: unknown) =>
+    protocol.send(clientId, {
+      _tag: "Exit",
+      requestId,
+      exit: { _tag: "Failure", cause: [{ _tag: "Fail", error }] }
+    })
+  const removeReverseRequestClient = (requestId: string, key: McpClientKey) => {
+    const waiting = reverseRequestClients.get(requestId)
+    if (waiting === undefined) return
+    const remaining = waiting.filter((entry) => entry !== key)
+    if (remaining.length === 0) reverseRequestClients.delete(requestId)
+    else reverseRequestClients.set(requestId, remaining)
+  }
+  // A bounded PubSub would let one slow listener block the shared worker and
+  // legacy delivery. Each request scope releases its subscription on exit.
+  const serverNotifications = yield* PubSub.unbounded<McpProtocolInternal.CanonicalServerNotification>()
+  const sendNotification = (
+    protocolVersion: string,
+    clientId: number,
+    notification: McpProtocol.ProjectedNotification
+  ) =>
+    Effect.suspend(() => {
+      const selectedProtocol = runtime.selectProtocol(protocolVersion)
+      const rpc = selectedProtocol.serverNotificationRpcs.requests.get(notification.tag)
+      if (rpc === undefined) {
+        return Effect.die(
+          `MCP protocol ${protocolVersion} does not define server notification ${notification.tag}`
+        )
+      }
+      return selectedProtocol.payloadCodecs(rpc).encode(notification.payload).pipe(
+        Effect.orDie,
+        Effect.flatMap((payload) =>
+          protocol.send(clientId, {
+            _tag: "Request",
+            id: "",
+            tag: notification.tag,
+            payload,
+            headers: [],
+            isNotification: true
+          })
+        )
+      )
+    })
+  const cancelRequest = (clientId: number, requestId: RpcMessage.RequestId) => {
+    const requests = activeRequests.get(clientId)
+    const key = requestKey(requestId)
+    const request = requests?.get(key)
+    if (request === undefined) {
+      return false
+    }
+    requests!.set(key, { ...request, cancelled: true })
+    return true
+  }
+  const terminateSubscription = (
+    protocolVersion: string,
+    clientId: number,
+    requestId: RpcMessage.RequestId,
+    reason: string
+  ): Effect.Effect<void> =>
+    Effect.suspend(() => {
+      if (!cancelRequest(clientId, requestId)) {
+        return Effect.void
+      }
+      return isHttp
+        ? protocol.end(clientId)
+        : sendNotification(protocolVersion, clientId, {
+          tag: "notifications/cancelled",
+          payload: { requestId, reason }
+        })
+    })
+  const handlers = yield* runtime.installHandlers({
+    core: internalState.get(server)!.core,
+    subscribeServerNotifications: PubSub.subscribe(serverNotifications),
+    ...(!protocol.supportsNotifications ? {} : {
+      sendNotification,
+      markSubscriptionCancelled: (clientId: number, requestId: RpcMessage.RequestId) =>
+        Effect.sync(() => {
+          cancelRequest(clientId, requestId)
+        }),
+      terminateSubscription
+    }),
+    defaultLogLevel,
+    serverInfo: options
+  })
 
   const clients = yield* RcMap.make({
     lookup: Effect.fnUntraced(function*(key: McpClientKey) {
-      const selectedProtocol = protocolRegistry.select(key.profile.protocolVersion)
+      const selectedProtocol = runtime.selectProtocol(key.profile.protocolVersion)
       let write!: (message: RpcMessage.FromServerEncoded) => Effect.Effect<void>
       const reverseProtocol = yield* RpcClient.Protocol.make(Effect.fnUntraced(function*(writeResponse) {
         let cid = 0
@@ -729,13 +826,21 @@ const runWithProtocolState = Effect.fnUntraced(function*(options: {
           send(id, request, _transferables) {
             cid = id
             if (request._tag === "Request") {
+              const requestId = requestKey(request.id)
+              const waiting = reverseRequestClients.get(requestId) ?? []
+              waiting.push(key)
+              reverseRequestClients.set(requestId, waiting)
               return protocol.send(key.clientId, {
                 _tag: "Request",
                 id: request.id,
                 tag: request.tag,
                 payload: request.payload,
                 headers: []
-              })
+              }).pipe(Effect.onError(() => Effect.sync(() => removeReverseRequestClient(requestId, key))))
+            }
+            if (request._tag === "Interrupt") {
+              // A cancelled reverse request may never receive a reply.
+              removeReverseRequestClient(requestKey(request.requestId), key)
             }
             // Ack & co are not part of FromServerEncoded, but the JSON-RPC
             // serializer encodes them symmetrically for reverse control flow
@@ -757,7 +862,7 @@ const runWithProtocolState = Effect.fnUntraced(function*(options: {
   })
 
   const clientMiddleware = McpServerClientMiddleware.of((effect, { client, headers, payload, rpc }) => {
-    const session = getClientSession(sessions, client.id, headers)
+    const session = runtime.resolveRequest(client.id, headers)
     const isInitialize = rpc._tag.endsWith("/initialize")
     if (!isInitialize && !session) {
       const fiber = Fiber.getCurrent()!
@@ -775,40 +880,60 @@ const runWithProtocolState = Effect.fnUntraced(function*(options: {
       }
       return Effect.die(new Error(`Mcp-Session-Id does not exist`))
     }
-    const selectedProtocol = session?.protocol ?? protocolForInternalTag(protocolRegistry, rpc._tag)
-    // NOTE: RPC middleware erases the correlation between the initialize tag
+    // RPC middleware erases the correlation between the initialize tag
     // and its decoded payload. Restore it once after non-initialize requests
     // without a session have been rejected above.
-    const initializePayload = session?.initializePayload ?? payload as typeof Initialize.payloadSchema.Type
-    const profile = session?.negotiatedProfile ?? {
+    const initializePayload = session?.initializePayload ?? payload as typeof McpSchema.Initialize.payloadSchema.Type
+    const clientState = clientStates.get(client.id)
+    const selectedProtocol = session?.protocol ??
+      clientState?.protocol ??
+      runtime.protocolForInternalTag(rpc._tag)
+    if (!isProtocolVersion(selectedProtocol.protocolVersion) || selectedProtocol.protocolVersion === "2026-07-28") {
+      return Effect.die(`Unsupported selected MCP protocol version: ${selectedProtocol.protocolVersion}`)
+    }
+    const profile: McpCore.NegotiatedProtocolProfile = session?.negotiatedProfile ?? {
       protocolVersion: selectedProtocol.protocolVersion,
       clientCapabilities: initializePayload.capabilities,
       clientInfo: initializePayload.clientInfo
     }
-    clientProfiles.set(client.id, profile)
+    if (clientState !== undefined) clientState.profile = profile
+    const requestContext = McpRequestContext.of({
+      clientId: client.id,
+      protocolVersion: profile.protocolVersion,
+      clientCapabilities: profile.clientCapabilities,
+      clientInfo: profile.clientInfo,
+      requestMetadata: initializePayload._meta
+    })
     return Effect.provideService(
       Effect.provideService(
-        effect,
-        McpServerClient,
-        McpServerClient.of({
-          clientId: client.id,
-          protocolVersion: session?.negotiatedProfile.protocolVersion ?? selectedProtocol.protocolVersion,
-          clientCapabilities: profile.clientCapabilities,
-          clientInfo: profile.clientInfo,
-          initializePayload,
-          getClient: RcMap.get(
-            clients,
-            new McpClientKey({
-              clientId: client.id,
-              profile
-            })
-          ).pipe(
-            Effect.map(({ client }) => client)
-          )
-        })
+        Effect.provideService(
+          effect,
+          McpServerClient,
+          McpServerClient.of({
+            clientId: client.id,
+            protocolVersion: profile.protocolVersion,
+            clientCapabilities: profile.clientCapabilities,
+            clientInfo: profile.clientInfo,
+            initializePayload,
+            requestMetadata: Predicate.isReadonlyObject(payload) && Predicate.isReadonlyObject(payload._meta)
+              ? payload._meta as Schema.JsonObject
+              : undefined,
+            getClient: RcMap.get(
+              clients,
+              new McpClientKey({
+                clientId: client.id,
+                profile
+              })
+            ).pipe(
+              Effect.map(({ client }) => client)
+            )
+          })
+        ),
+        McpRequestContext,
+        requestContext
       ),
       CurrentLogLevel,
-      effectLogLevel(session?.logLevel, defaultLogLevel)
+      runtime.effectLogLevel(client.id, headers, defaultLogLevel)
     )
   })
 
@@ -818,12 +943,14 @@ const runWithProtocolState = Effect.fnUntraced(function*(options: {
       if (response._tag === "Exit") {
         const requests = activeRequests.get(clientId)
         const key = requestKey(response.requestId)
-        const cancelled = requests?.get(key)
+        const cancelled = requests?.get(key)?.cancelled
         if (requests !== undefined && requests.delete(key) && requests.size === 0) {
           activeRequests.delete(clientId)
         }
         if (cancelled === true) {
-          return Effect.void
+          if (transport === "custom") return Effect.void
+          cancelledResponses.set(response, response.requestId)
+          return protocol.send(clientId, response)
         }
         if (
           response.exit._tag === "Failure" &&
@@ -874,31 +1001,43 @@ const runWithProtocolState = Effect.fnUntraced(function*(options: {
                 HttpServerRequest.HttpServerRequest
               ).headers
               : Headers.fromInput(request.headers)
-            const session = getClientSession(sessions, clientId, headers)
-            const selectedProtocol = session?.protocol ??
-              (request.tag === "initialize"
-                ? protocolRegistry.select(getOfferedProtocolVersion(request.payload))
-                : protocolRegistry.protocols[0])
-            // Selection happens before dated payload decoding. Once a
-            // session exists, all later messages reuse its pinned adapter.
-            clientProtocols.set(clientId, selectedProtocol)
-            if (request.tag === MCP_INVALID_BATCH_METHOD) {
-              return protocol.send(clientId, {
-                _tag: "Exit",
-                requestId: request.id,
-                exit: {
-                  _tag: "Failure",
-                  cause: [{
-                    _tag: "Fail",
-                    error: new InvalidRequest({ message: "JSON-RPC batches are not supported" })
-                  }]
-                }
+            const cancellationRequest = request.tag === "notifications/cancelled" &&
+                typeof request.payload === "object" && request.payload !== null && "requestId" in request.payload &&
+                (typeof request.payload.requestId === "string" || typeof request.payload.requestId === "number")
+              ? activeRequests.get(clientId)?.get(requestKey(request.payload.requestId))
+              : undefined
+            const prepare = cancellationRequest === undefined
+              ? runtime.prepareRequest(clientId, headers, request)
+              : Effect.succeed(cancellationRequest.prepared)
+            return Effect.gen(function*() {
+              const prepared = yield* prepare
+              const clientState = clientStates.get(clientId)
+              if (isHttp && clientState === undefined) {
+                // HTTP EOF only ends the request body; handlers and streamed replies may still be running.
+                yield* Scope.addFinalizer(
+                  Context.getUnsafe(fiber.context, Scope.Scope),
+                  Effect.sync(() => disconnectClient(clientId))
+                )
+              }
+              const session = prepared.binding
+              const selectedProtocol = prepared.protocol
+              // Select before dated payload decoding: legacy requests use
+              // their session's adapter; modern requests carry their own version.
+              clientStates.set(clientId, {
+                protocol: selectedProtocol,
+                profile: prepared.profile ?? clientState?.profile,
+                sessionHeaders: isHttp && headers[MCP_SESSION_ID_HEADER] !== undefined
+                  ? Headers.fromInput({ [MCP_SESSION_ID_HEADER]: headers[MCP_SESSION_ID_HEADER] })
+                  : clientState?.sessionHeaders
               })
-            }
-            if (isHttp) {
-              const fiber = Fiber.getCurrent()!
-              const httpRequest = Context.getUnsafe(fiber.context, HttpServerRequest.HttpServerRequest)
-              if (session) {
+              if (request.tag === MCP_INVALID_BATCH_METHOD) {
+                return yield* sendRequestError(
+                  clientId,
+                  request.id,
+                  new InvalidRequest({ message: "JSON-RPC batches are not supported" })
+                )
+              }
+              if (httpRequest !== undefined && session !== undefined) {
                 appendPreResponseHandlerUnsafe(httpRequest, (_, res) =>
                   Effect.succeed(
                     HttpServerResponse.setHeader(
@@ -908,67 +1047,54 @@ const runWithProtocolState = Effect.fnUntraced(function*(options: {
                     )
                   ))
               }
-            }
-            const routedRequest = protocolRegistry.routeClientRequest(selectedProtocol, request)
-            const rpc = protocolRegistry.clientRpcs.requests.get(routedRequest.tag)
-            if (
-              rpc &&
-              selectedProtocol.clientNotificationRpcs.requests.has(request.tag)
-            ) {
-              if (!session) {
-                if (httpRequest) {
-                  appendPreResponseHandlerUnsafe(
-                    httpRequest,
-                    () =>
-                      Effect.succeed(
-                        HttpServerResponse.empty({
-                          status: headers[MCP_SESSION_ID_HEADER] === undefined ? 400 : 404
-                        })
-                      )
-                  )
-                }
-                return Effect.void
-              }
-              const decode = selectedProtocol.payloadCodecs(rpc).decode(request.payload)
-              return decode.pipe(
-                Effect.flatMap((payload) => {
-                  if (
-                    request.tag === "notifications/roots/list_changed" &&
-                    session.initializePayload.capabilities.roots?.listChanged === true &&
-                    httpRequest === undefined
-                  ) {
-                    return RcMap.get(
-                      clients,
-                      new McpClientKey({
-                        clientId,
-                        profile: session.negotiatedProfile
-                      })
-                    ).pipe(
-                      Effect.flatMap(({ client }) => client.listRoots()),
-                      Effect.scoped,
-                      Effect.ignoreCause,
-                      Effect.forkIn(serverScope),
-                      Effect.asVoid
+              const routedRequest = runtime.routeClientRequest(selectedProtocol, request)
+              const rpc = runtime.clientRpcs.requests.get(routedRequest.tag)
+              const isClientNotification = selectedProtocol.clientNotificationRpcs.requests.has(request.tag)
+              if (rpc && isClientNotification && request.isNotification) {
+                if (!session && selectedProtocol.runtime._tag === "Stateful") {
+                  if (httpRequest) {
+                    appendPreResponseHandlerUnsafe(
+                      httpRequest,
+                      () =>
+                        Effect.succeed(
+                          HttpServerResponse.empty({
+                            status: headers[MCP_SESSION_ID_HEADER] === undefined ? 400 : 404
+                          })
+                        )
                     )
                   }
+                  return
+                }
+                const decode = selectedProtocol.payloadCodecs(rpc).decode(request.payload)
+                return yield* Effect.gen(function*() {
+                  const payload = yield* decode
                   if (request.tag === "notifications/cancelled") {
-                    return selectedProtocol.normalizeCancellation(payload).pipe(
-                      Effect.flatMap((cancellation) => {
-                        const key = requestKey(cancellation.requestId)
-                        const requests = activeRequests.get(clientId)
-                        if (requests?.has(key) !== true) {
-                          return Effect.void
-                        }
-                        requests.set(key, true)
-                        return f(clientId, {
-                          _tag: "Interrupt",
-                          requestId: String(cancellation.requestId)
-                        })
-                      })
-                    )
+                    const cancellation = yield* selectedProtocol.normalizeCancellation(payload)
+                    const key = requestKey(cancellation.requestId)
+                    let ownerClientId = clientId
+                    if (isHttp) {
+                      if (session === undefined) {
+                        return
+                      }
+                      // Each HTTP POST has its own transport ID, but cancellation belongs to the session.
+                      const owner = Array.from(activeRequests).find(([, requests]) =>
+                        requests.get(key)?.prepared.binding === session
+                      )
+                      if (owner === undefined) {
+                        return
+                      }
+                      ownerClientId = owner[0]
+                    }
+                    if (!cancelRequest(ownerClientId, cancellation.requestId)) {
+                      return
+                    }
+                    return yield* f(ownerClientId, {
+                      _tag: "Interrupt",
+                      requestId: cancellation.requestId
+                    })
                   }
                   const handler = handlers.mapUnsafe.get(rpc.key) as Rpc.Handler<string> | undefined
-                  return handler
+                  const handled = handler
                     ? handler.handler(payload, {
                       rpc,
                       requestId: RpcMessage.RequestId(request.id),
@@ -976,45 +1102,48 @@ const runWithProtocolState = Effect.fnUntraced(function*(options: {
                       headers
                     }) as any as Effect.Effect<void>
                     : Effect.void
-                }),
-                Effect.ignoreCause
-              )
-            }
-            if (!rpc) {
-              if (request.isNotification) {
-                return Effect.void
+                  return yield* prepared.requestContext === undefined
+                    ? handled
+                    : Effect.provideService(handled, McpRequestContext, prepared.requestContext)
+                }).pipe(Effect.ignoreCause)
               }
-              return protocol.send(clientId, {
-                _tag: "Exit",
-                requestId: request.id,
-                exit: {
-                  _tag: "Failure",
-                  cause: [{ _tag: "Fail", error: new MethodNotFound({ message: `Method not found: ${request.tag}` }) }]
+              if (!rpc || isClientNotification) {
+                if (request.isNotification) {
+                  return
                 }
-              })
-            }
-            return selectedProtocol.payloadCodecs(rpc).decode(request.payload).pipe(
-              Effect.matchEffect({
-                onSuccess: () => {
-                  if (request.isNotification !== true) {
-                    const requests = activeRequests.get(clientId) ?? new Map<string, boolean>()
-                    requests.set(requestKey(request.id), false)
-                    activeRequests.set(clientId, requests)
-                  }
-                  return f(clientId, routedRequest)
-                },
-                onFailure: () =>
-                  request.isNotification
-                    ? Effect.void
-                    : protocol.send(clientId, {
-                      _tag: "Exit",
-                      requestId: request.id,
-                      exit: {
-                        _tag: "Failure",
-                        cause: [{ _tag: "Fail", error: new InvalidParams({ message: "Invalid method parameters" }) }]
-                      }
-                    })
-              })
+                return yield* sendRequestError(
+                  clientId,
+                  request.id,
+                  new MethodNotFound({ message: `Method not found: ${request.tag}` })
+                )
+              }
+              const decoded = yield* Effect.result(selectedProtocol.payloadCodecs(rpc).decode(request.payload))
+              if (Result.isFailure(decoded)) {
+                return yield* request.isNotification
+                  ? Effect.void
+                  : sendRequestError(clientId, request.id, new InvalidParams({ message: "Invalid method parameters" }))
+              }
+              if (request.isNotification !== true) {
+                const requests = activeRequests.get(clientId) ?? new Map<string, ActiveRequest>()
+                requests.set(requestKey(request.id), { prepared, cancelled: false })
+                activeRequests.set(clientId, requests)
+              }
+              const handled = f(clientId, routedRequest)
+              return yield* prepared.requestContext === undefined
+                ? handled
+                : Effect.provideService(handled, McpRequestContext, prepared.requestContext)
+            }).pipe(
+              Effect.catch((error) =>
+                request.isNotification
+                  ? Effect.void
+                  : sendRequestError(
+                    clientId,
+                    request.id,
+                    Predicate.isTagged(error, "ProtocolError")
+                      ? McpProtocolInternal.ProtocolError.fromFeature(error)
+                      : new InvalidParams({ message: "Invalid request metadata" })
+                  )
+              )
             )
           }
           case "Ping":
@@ -1022,11 +1151,8 @@ const runWithProtocolState = Effect.fnUntraced(function*(options: {
           case "Interrupt":
             return f(clientId, request)
           case "Eof":
-            activeRequests.delete(clientId)
-            clientProtocols.delete(clientId)
-            clientProfiles.delete(clientId)
             if (!isHttp) {
-              sessions.byClientId.delete(clientId)
+              disconnectClient(clientId)
             }
             return f(clientId, request)
           case "Pong":
@@ -1034,8 +1160,29 @@ const runWithProtocolState = Effect.fnUntraced(function*(options: {
           case "Chunk":
           case "ClientProtocolError":
           case "Defect": {
-            const selectedProtocol = getProtocolForClient(clientProtocols, clientId, protocolRegistry)
-            const profile = clientProfiles.get(clientId) ?? {
+            const requestId = request._tag === "Exit"
+              ? requestKey(request.requestId)
+              : undefined
+            const session = isHttp
+              ? runtime.resolveRequest(
+                clientId,
+                Context.getUnsafe(Fiber.getCurrent()!.context, HttpServerRequest.HttpServerRequest).headers
+              )
+              : undefined
+            const waiting = requestId === undefined ? undefined : reverseRequestClients.get(requestId)
+            const reverseKey = waiting?.find((key) =>
+              isHttp ? key.profile === session?.negotiatedProfile : key.clientId === clientId
+            )
+            if (request._tag === "Exit" && reverseKey === undefined) {
+              return Effect.void
+            }
+            if (reverseKey !== undefined && requestId !== undefined) {
+              removeReverseRequestClient(requestId, reverseKey)
+            }
+            const targetClientId = reverseKey?.clientId ?? clientId
+            const clientState = clientStates.get(targetClientId)
+            const selectedProtocol = clientState?.protocol ?? runtime.protocols[0]
+            const profile = reverseKey?.profile ?? clientState?.profile ?? {
               protocolVersion: selectedProtocol.protocolVersion,
               clientCapabilities: {},
               clientInfo: { name: "unknown", version: "unknown" }
@@ -1043,7 +1190,7 @@ const runWithProtocolState = Effect.fnUntraced(function*(options: {
             return RcMap.get(
               clients,
               new McpClientKey({
-                clientId,
+                clientId: targetClientId,
                 profile
               })
             ).pipe(
@@ -1055,25 +1202,45 @@ const runWithProtocolState = Effect.fnUntraced(function*(options: {
       })
   })
 
-  yield* Queue.take(internalState.get(server)!.notifications).pipe(
-    Effect.flatMap(Effect.fnUntraced(function*({ notification, targetClientId }) {
+  const { notificationDelivery, notifications } = internalState.get(server)!
+  yield* Effect.acquireRelease(
+    Effect.sync(() => {
+      notificationDelivery.consumers++
+    }),
+    () =>
+      Effect.sync(() => {
+        notificationDelivery.consumers--
+      })
+  )
+  const notificationTails = new Map<number, Deferred.Deferred<void>>()
+  yield* Queue.take(notifications).pipe(
+    Effect.flatMap(Effect.fnUntraced(function*(queued) {
+      const { delivered, notification, targetClientId, requestContext, requestHeaders } = queued
+      if (McpProtocolInternal.isSubscriptionServerNotification(notification)) {
+        yield* PubSub.publish(serverNotifications, { notification, targetClientId })
+      }
       const clientIds = yield* patchedProtocol.clientIds
-      for (const clientId of clientProtocols.keys()) {
+      for (const clientId of clientStates.keys()) {
         if (!clientIds.has(clientId)) {
-          clientProtocols.delete(clientId)
-          clientProfiles.delete(clientId)
-          // HTTP client IDs are request-scoped; their UUID sessions outlive them.
-          if (!isHttp) {
-            sessions.byClientId.delete(clientId)
-          }
+          clientStates.delete(clientId)
+          // HTTP UUID sessions are stored separately and outlive request-scoped client IDs.
+          runtime.disconnect(clientId)
         }
       }
-      for (const clientId of server.initializedClients.keys()) {
+      const requestNotification = notification._tag === "LoggingMessage" || notification._tag === "Progress"
+      const deliveryClientIds = requestNotification && requestContext !== undefined
+        ? [requestContext.clientId]
+        : targetClientId === undefined
+        ? isHttp ? clientStates.keys() : runtime.deliveryClientIds()
+        : [targetClientId]
+      const deliveries: Array<Effect.Effect<void>> = []
+      let hasOriginDelivery = false
+      for (const clientId of deliveryClientIds) {
         if (targetClientId !== undefined && clientId !== targetClientId) {
           continue
         }
         if (!clientIds.has(clientId)) {
-          server.initializedClients.delete(clientId)
+          runtime.disconnect(clientId)
           continue
         }
         // This must stay below stale-client cleanup so transports without
@@ -1081,25 +1248,53 @@ const runWithProtocolState = Effect.fnUntraced(function*(options: {
         if (!patchedProtocol.supportsNotifications) {
           continue
         }
-        const selectedProtocol = clientProtocols.get(clientId)
+        const selectedProtocol = requestNotification && requestContext !== undefined
+          ? runtime.selectProtocol(requestContext.protocolVersion)
+          : clientStates.get(clientId)?.protocol
         if (!selectedProtocol) {
           continue
         }
-        yield* Effect.gen(function*() {
+        // Reserve delivery order before forking so one blocked client cannot hold up another.
+        const previous = notificationTails.get(clientId)
+        const isOrigin = clientId === (targetClientId ?? requestContext?.clientId)
+        hasOriginDelivery ||= isOrigin
+        // Await delivery to the explicit target or originating request, not unrelated broadcast recipients.
+        const completed = isOrigin ? delivered : Deferred.makeUnsafe<void>()
+        notificationTails.set(clientId, completed)
+        const delivery = Effect.gen(function*() {
+          if (previous !== undefined) yield* Deferred.await(previous)
           const projected = yield* selectedProtocol.projectNotification(notification)
           if (projected === undefined) {
             return
           }
-          const session = sessions.byClientId.get(clientId)
           if (
-            notification._tag === "LoggingMessage" &&
-            !isMcpLogLevelEnabled(notification.level, session?.logLevel, defaultLogLevel)
+            notification._tag === "Progress" && selectedProtocol.runtime._tag === "Stateless" &&
+            requestContext?.requestMetadata?.progressToken !== notification.progressToken
           ) {
             return
           }
-          if (
-            notification._tag === "ResourceUpdated" &&
-            session?.resourceSubscriptions?.has(notification.uri) !== true
+          if (notification._tag === "LoggingMessage" && selectedProtocol.runtime._tag === "Stateless") {
+            const metadata = requestContext?.requestMetadata
+            const level = Predicate.hasProperty(metadata, "io.modelcontextprotocol/logLevel")
+              ? metadata["io.modelcontextprotocol/logLevel"]
+              : undefined
+
+            if (
+              requestContext?.clientId !== clientId ||
+              !isLoggingLevel(level) ||
+              McpSchema.LoggingLevel.literals.indexOf(notification.level) <
+                McpSchema.LoggingLevel.literals.indexOf(level)
+            ) {
+              return
+            }
+          } else if (
+            !runtime.canDeliver(
+              clientId,
+              (requestContext?.clientId === clientId ? requestHeaders : undefined) ??
+                clientStates.get(clientId)?.sessionHeaders ?? Headers.empty,
+              notification,
+              defaultLogLevel
+            )
           ) {
             return
           }
@@ -1116,15 +1311,26 @@ const runWithProtocolState = Effect.fnUntraced(function*(options: {
             headers: [],
             isNotification: true
           })
-        }).pipe(Effect.catchCause(() => Effect.void))
+        }).pipe(
+          Effect.ignoreCause,
+          Effect.ensuring(Effect.sync(() => {
+            Deferred.doneUnsafe(completed, Exit.void)
+            if (notificationTails.get(clientId) === completed) notificationTails.delete(clientId)
+          }))
+        )
+        deliveries.push(delivery)
       }
+      if (!hasOriginDelivery) yield* Deferred.succeed(delivered, undefined)
+      yield* Effect.all(deliveries, { concurrency: "unbounded", discard: true }).pipe(
+        Effect.forkScoped({ startImmediately: true })
+      )
     })),
-    Effect.catchCause(() => Effect.void),
+    Effect.ignoreCause,
     Effect.forever,
     Effect.forkScoped
   )
 
-  return yield* RpcServer.make(protocolRegistry.clientRpcs, {
+  return yield* RpcServer.make(runtime.clientRpcs, {
     spanPrefix: "McpServer",
     disableFatalDefects: true
   }).pipe(
@@ -1136,8 +1342,9 @@ const runWithProtocolState = Effect.fnUntraced(function*(options: {
 
 /**
  * Creates a layer that starts an MCP server over an existing
- * `RpcServer.Protocol` and provides the `McpServer` and `McpServerClient`
- * services.
+ * `RpcServer.Protocol` and provides `McpServer`. Request handlers receive
+ * `McpRequestContext`; initialized legacy requests additionally receive
+ * `McpServerClient`.
  *
  * **When to use**
  *
@@ -1166,28 +1373,34 @@ const runWithProtocolState = Effect.fnUntraced(function*(options: {
 export const layer = (options: {
   readonly name: string
   readonly version: string
+  readonly instructions?: string | undefined
   readonly description?: string | undefined
   readonly websiteUrl?: string | undefined
   readonly icons?: ReadonlyArray<McpSchema.Icon> | undefined
   readonly protocols: Arr.NonEmptyReadonlyArray<McpProtocol.ProtocolAdapter>
   readonly extensions?: ServerExtensions | undefined
 }): Layer.Layer<McpServer | McpServerClient, Cause.IllegalArgumentError, RpcServer.Protocol> =>
-  layerWithProtocolState(options).pipe(
-    Layer.provide(layerMcpProtocolState(options.protocols))
+  layerWithRuntime(options, "custom").pipe(
+    Layer.provide(McpRuntime.layer(options.protocols))
   )
 
-const layerWithProtocolState = (options: {
+const layerWithRuntime = (options: {
   readonly name: string
   readonly version: string
+  readonly instructions?: string | undefined
   readonly description?: string | undefined
   readonly websiteUrl?: string | undefined
   readonly icons?: ReadonlyArray<McpSchema.Icon> | undefined
   readonly extensions?: ServerExtensions | undefined
-}): Layer.Layer<McpServer | McpServerClient, never, RpcServer.Protocol | McpProtocolState> =>
+}, transport: "custom" | "http" | "stdio"): Layer.Layer<
+  McpServer | McpServerClient,
+  never,
+  RpcServer.Protocol | McpRuntime.ServerRuntime
+> =>
   Layer.effectDiscard(
     Effect.gen(function*() {
-      const protocolState = yield* McpProtocolState
-      yield* Effect.forkScoped(runWithProtocolState(options, protocolState))
+      const runtime = yield* McpRuntime.ServerRuntime
+      yield* Effect.forkScoped(runWithRuntime(options, runtime, transport))
     })
   ).pipe(
     Layer.provideMerge(McpServer.layer)
@@ -1204,7 +1417,8 @@ const layerWithProtocolState = (options: {
  * **Details**
  *
  * The selected protocol adapter controls the dated RPC schemas and JSON-RPC
- * batch policy. The layer provides `McpServer` and `McpServerClient` and
+ * batch policy. The layer provides `McpServer`, supplies request-scoped
+ * `McpRequestContext` and legacy `McpServerClient` services to handlers, and
  * requires `Stdio`.
  *
  * @see {@link layer} for running over an existing `RpcServer.Protocol`
@@ -1216,13 +1430,15 @@ const layerWithProtocolState = (options: {
 export const layerStdio = (options: {
   readonly name: string
   readonly version: string
+  readonly instructions?: string | undefined
   readonly description?: string | undefined
   readonly websiteUrl?: string | undefined
   readonly icons?: ReadonlyArray<McpSchema.Icon> | undefined
   readonly protocols: Arr.NonEmptyReadonlyArray<McpProtocol.ProtocolAdapter>
   readonly extensions?: ServerExtensions | undefined
 }): Layer.Layer<McpServer | McpServerClient, Cause.IllegalArgumentError, Stdio> =>
-  layer(options).pipe(
+  layerWithRuntime(options, "stdio").pipe(
+    Layer.provide(McpRuntime.layer(options.protocols)),
     Layer.provide(RpcServer.layerProtocolStdio),
     Layer.provide(Layer.succeed(
       RpcSerialization.RpcSerialization,
@@ -1233,7 +1449,7 @@ export const layerStdio = (options: {
 const mcpStdioSerialization = (
   protocols: Arr.NonEmptyReadonlyArray<McpProtocol.ProtocolAdapter>
 ): RpcSerialization.RpcSerialization["Service"] => {
-  const serialization = RpcSerialization.jsonRpc({
+  const serialization = mcpJsonRpcSerialization({
     contentType: "application/json-rpc"
   })
   return RpcSerialization.RpcSerialization.of({
@@ -1249,10 +1465,11 @@ const mcpStdioSerialization = (
           const decoded: Array<unknown> = []
           for (const frame of frames.decode(data)) {
             if (Array.isArray(frame)) {
-              const acceptsBatch = selectedProtocol?.transport.acceptsJsonRpcBatches === true
+              const acceptsBatch = selectedProtocol?.runtime.transport.jsonRpc.acceptsBatches === true
               if (
                 !acceptsBatch ||
                 frame.length === 0 ||
+                frame.some(McpRuntime.hasRequestProtocolVersion) ||
                 frame.some(isInitializeJsonRpcMessage)
               ) {
                 decoded.push({
@@ -1266,8 +1483,7 @@ const mcpStdioSerialization = (
               }
             } else if (isInitializeJsonRpcMessage(frame)) {
               const offered = getJsonRpcProtocolVersion(frame)
-              selectedProtocol = protocols.find((protocol) => protocol.protocolVersion === offered) ??
-                protocols[0]
+              selectedProtocol = McpRuntime.selectStatefulProtocol(protocols, offered)
             }
             decoded.push(...parser.decode(JSON.stringify(frame)))
           }
@@ -1280,10 +1496,8 @@ const mcpStdioSerialization = (
               jsonrpc: "2.0",
               id: null,
               error: {
-                _tag: "Cause",
                 code: McpSchema.INVALID_REQUEST_ERROR_CODE,
-                message: "JSON-RPC batches are not supported",
-                data: invalidBatchExit.success.exit.cause
+                message: "JSON-RPC batches are not supported"
               }
             }) + "\n"
           }
@@ -1305,7 +1519,9 @@ const mcpStdioSerialization = (
  * **Details**
  *
  * POST serves JSON-RPC and accepted notification-only requests return `202`.
- * Unsupported protocol versions return `400`; methods without MCP handlers
+ * Modern routing-header mismatches and unsupported protocol versions return
+ * JSON-RPC errors with status `400`; unknown modern RPC methods return a
+ * JSON-RPC method-not-found error with status `404`. Unsupported HTTP methods
  * return `405`. Requests carrying an `Origin` header are rejected unless the
  * exact origin appears in `allowedOrigins`; Origin-less non-browser clients
  * remain valid. The surrounding HTTP server remains responsible for binding
@@ -1326,6 +1542,7 @@ const mcpStdioSerialization = (
 export const layerHttp = (options: {
   readonly name: string
   readonly version: string
+  readonly instructions?: string | undefined
   readonly description?: string | undefined
   readonly websiteUrl?: string | undefined
   readonly icons?: ReadonlyArray<McpSchema.Icon> | undefined
@@ -1334,7 +1551,7 @@ export const layerHttp = (options: {
   readonly extensions?: ServerExtensions | undefined
   readonly allowedOrigins?: ReadonlyArray<string> | undefined
 }): Layer.Layer<McpServer | McpServerClient, Cause.IllegalArgumentError, HttpRouter.HttpRouter> => {
-  const protocolState = layerMcpProtocolState(options.protocols)
+  const runtime = McpRuntime.layer(options.protocols)
   const methodNotAllowedResponse = HttpServerResponse.empty({
     status: 405,
     headers: { allow: "POST" }
@@ -1350,9 +1567,9 @@ export const layerHttp = (options: {
     HttpRouter.add("DELETE", options.path, methodNotAllowed),
     HttpRouter.add("OPTIONS", options.path, methodNotAllowed)
   )
-  return Layer.merge(layerWithProtocolState(options), routes).pipe(
+  return Layer.merge(layerWithRuntime(options, "http"), routes).pipe(
     Layer.provide(layerMcpProtocolHttp(options)),
-    Layer.provide(protocolState),
+    Layer.provide(runtime),
     Layer.provide(RpcSerialization.layerJsonRpc())
   )
 }
@@ -1363,11 +1580,13 @@ const layerMcpProtocolHttp = (options: {
 }): Layer.Layer<
   RpcServer.Protocol,
   never,
-  McpProtocolState | RpcSerialization.RpcSerialization | HttpRouter.HttpRouter
+  McpRuntime.ServerRuntime | HttpRouter.HttpRouter
 > =>
   Layer.effect(RpcServer.Protocol)(Effect.gen(function*() {
-    const state = yield* McpProtocolState
-    const { httpEffect, protocol } = yield* RpcServer.makeProtocolWithHttpEffect()
+    const runtime = yield* McpRuntime.ServerRuntime
+    const { httpEffect, protocol } = yield* RpcServer.makeProtocolWithHttpEffect().pipe(
+      Effect.provideService(RpcSerialization.RpcSerialization, mcpHttpSerialization)
+    )
     const router = yield* HttpRouter.HttpRouter
     yield* router.add("POST", options.path, (request) => {
       if (!isAllowedMcpOrigin(request, options.allowedOrigins)) {
@@ -1380,90 +1599,133 @@ const layerMcpProtocolHttp = (options: {
       if (!accepted.includes("application/json") || !accepted.includes("text/event-stream")) {
         return Effect.succeed(HttpServerResponse.empty({ status: 406 }))
       }
-      const protocolVersion = request.headers[MCP_PROTOCOL_VERSION_HEADER]
-      const sessionId = request.headers[MCP_SESSION_ID_HEADER]
-      const session = sessionId === undefined
-        ? undefined
-        : state.sessions.bySessionId.get(sessionId)
-      if (sessionId !== undefined && session === undefined) {
-        return Effect.succeed(HttpServerResponse.empty({ status: 404 }))
-      }
-      const protocolVersionHeaderRejected = (protocolVersion !== undefined &&
-        !state.protocolRegistry.protocols.some((protocol) => protocol.protocolVersion === protocolVersion)) ||
-        (session?.protocol.transport.requiresVersionHeader === true &&
-          protocolVersion !== session.protocol.protocolVersion)
-      const parseErrorResponse = protocolVersionHeaderRejected
-        ? HttpServerResponse.empty({ status: 400 })
-        : HttpServerResponse.jsonUnsafe({
-          jsonrpc: "2.0",
-          id: null,
-          error: new McpSchema.ParseError({ message: "Parse error" })
-        })
-      return request.text.pipe(
-        Effect.flatMap(Schema.decodeUnknownEffect(Schema.UnknownFromJsonString)),
-        Effect.matchEffect({
-          onFailure: () => Effect.succeed(parseErrorResponse),
-          onSuccess: (input) => {
-            if (!Array.isArray(input)) {
-              const hasId = Predicate.hasProperty(input, "id")
-              const id = hasId && (typeof input.id === "string" || typeof input.id === "number")
-                ? input.id
-                : null
-              const isJsonRpc = Predicate.hasProperty(input, "jsonrpc") && input.jsonrpc === "2.0"
-              const hasValidRequestId = !hasId || typeof input.id === "string" || typeof input.id === "number"
-              const isRequest = isJsonRpc && hasValidRequestId &&
-                Predicate.hasProperty(input, "method") && typeof input.method === "string"
-              const hasValidResponseId = hasId &&
-                (typeof input.id === "string" || typeof input.id === "number" || input.id === null)
-              const hasResult = Predicate.hasProperty(input, "result")
-              const hasError = Predicate.hasProperty(input, "error")
-              const isResponse = isJsonRpc && hasValidResponseId && hasResult !== hasError
-              const isInitialize = isRequest && isInitializeJsonRpcMessage(input)
-              // Initialize requests are exempt from the version header check:
-              // rejecting them with a 400 makes clients treat the endpoint as a
-              // legacy HTTP+SSE server and retry initialization with a GET.
-              if (!isInitialize && protocolVersionHeaderRejected) {
-                return Effect.succeed(HttpServerResponse.empty({ status: 400 }))
-              }
-              if (!isRequest && !isResponse) {
-                return Effect.succeed(HttpServerResponse.jsonUnsafe({
-                  jsonrpc: "2.0",
-                  id,
-                  error: new InvalidRequest({ message: "Invalid Request" })
-                }))
-              }
-              if (isInitialize && sessionId !== undefined) {
-                return Effect.succeed(HttpServerResponse.empty({ status: 400 }))
-              }
-              if (!isInitialize && isRequest && sessionId === undefined) {
-                return Effect.succeed(HttpServerResponse.empty({ status: 400 }))
-              }
-              return httpEffect
-            }
-            if (protocolVersionHeaderRejected) {
-              return Effect.succeed(HttpServerResponse.empty({ status: 400 }))
-            }
-            if (input.length === 0) {
-              return Effect.succeed(HttpServerResponse.jsonUnsafe({
-                jsonrpc: "2.0",
-                id: null,
-                error: new InvalidRequest({ message: "Invalid Request" })
-              }, { status: 400 }))
-            }
-            if (input.some(isInitializeJsonRpcMessage) || session === undefined) {
-              return Effect.succeed(HttpServerResponse.empty({ status: 400 }))
-            }
-            const selectedProtocol = session.protocol
-            return selectedProtocol.transport.acceptsJsonRpcBatches
-              ? httpEffect
-              : Effect.succeed(HttpServerResponse.empty({ status: 400 }))
-          }
+      return Effect.gen(function*() {
+        const parsed = yield* Effect.result(
+          Effect.flatMap(request.text, Schema.decodeEffect(Schema.UnknownFromJsonString))
+        )
+        const admission = runtime.admitHttp(request.headers, parsed)
+        if (admission._tag === "Rejected") {
+          return admission.response
+        }
+        const response = Effect.map(httpEffect, (response) => {
+          // Completed responses may already contain notifications followed by the result.
+          const hasMultipleMessages = response.body._tag === "Uint8Array" &&
+            response.body.body.subarray(0, -1).includes(10)
+          return admission.isSubscription || response.body._tag === "Stream" || hasMultipleMessages
+            ? toServerSentEvents(response)
+            : response
         })
-      )
+        return yield* admission.acknowledge
+          ? Effect.catchCause(response, () => Effect.succeed(HttpServerResponse.empty({ status: 202 })))
+          : response
+      })
     })
     return protocol
   }))
 
+const mcpHttpSerialization: RpcSerialization.RpcSerialization["Service"] = (() => {
+  const serialization = mcpJsonRpcSerialization()
+  return RpcSerialization.RpcSerialization.of({
+    contentType: serialization.contentType,
+    includesFraming: true,
+    codecFor: serialization.codecFor,
+    makeUnsafe: () => {
+      const parser = serialization.makeUnsafe()
+      return {
+        decode: parser.decode,
+        encode: (response) => {
+          const encoded = parser.encode(response)
+          // Preserve message boundaries when the HTTP transport joins buffered chunks.
+          return typeof encoded === "string" ? `${encoded}\n` : encoded
+        }
+      }
+    }
+  })
+})()
+
+const isEncodedMcpFailureCause = Schema.is(Schema.TaggedStruct("Cause", {
+  data: Schema.Tuple([Schema.TaggedStruct("Fail", {
+    error: Schema.toEncoded(McpSchema.McpError)
+  })])
+}))
+
+const normalizeMcpJsonRpcResponse = (response: unknown): unknown => {
+  if (Array.isArray(response)) {
+    return response.map(normalizeMcpJsonRpcResponse)
+  }
+  if (!Predicate.isReadonlyObject(response) || !Predicate.hasProperty(response, "error")) {
+    return response
+  }
+  return isEncodedMcpFailureCause(response.error)
+    ? { ...response, error: response.error.data[0].error }
+    : response
+}
+
+function mcpJsonRpcSerialization(options?: {
+  readonly contentType?: string | undefined
+}): RpcSerialization.RpcSerialization["Service"] {
+  const serialization = RpcSerialization.jsonRpc(options)
+  return RpcSerialization.RpcSerialization.of({
+    ...serialization,
+    makeUnsafe: () => {
+      const parser = serialization.makeUnsafe()
+      const cancelledIds = new Set<string | number>()
+      return {
+        decode: parser.decode,
+        encode: (response) => {
+          if (Predicate.isReadonlyObject(response)) {
+            const cancelledId = cancelledResponses.get(response)
+            if (cancelledId !== undefined) {
+              cancelledResponses.delete(response)
+              cancelledIds.add(cancelledId)
+            }
+          }
+          const encoded = parser.encode(response)
+          if (typeof encoded !== "string") return encoded
+          if (cancelledIds.size === 0 && !encoded.includes("\"_tag\":\"Cause\"")) return encoded
+          let message: unknown = JSON.parse(encoded)
+          if (cancelledIds.size > 0) {
+            // Count cancelled completions toward the batch, but never write their responses.
+            // https://modelcontextprotocol.io/specification/2025-03-26/basic/utilities/cancellation
+            const keep = (message: unknown) =>
+              !(Predicate.isReadonlyObject(message) && !Predicate.hasProperty(message, "method") &&
+                (typeof message.id === "string" || typeof message.id === "number") && cancelledIds.delete(message.id))
+            if (Array.isArray(message)) {
+              const remaining = message.filter(keep)
+              if (remaining.length === 0) return undefined
+              message = remaining
+            } else if (!keep(message)) {
+              return undefined
+            }
+          }
+          return JSON.stringify(normalizeMcpJsonRpcResponse(message))
+        }
+      }
+    }
+  })
+}
+
+const toServerSentEvents = (response: HttpServerResponse.HttpServerResponse) => {
+  const encoder = new TextEncoder()
+  const decoder = new TextDecoder()
+  const frame = (data: Uint8Array) =>
+    encoder.encode(decoder.decode(data).trimEnd().split("\n").map((message) => `data: ${message}\n\n`).join(""))
+  const options = {
+    status: response.status,
+    statusText: response.statusText,
+    headers: Headers.remove(response.headers, "content-type"),
+    cookies: response.cookies,
+    contentType: "text/event-stream"
+  }
+  if (response.body._tag === "Stream") {
+    return HttpServerResponse.stream(response.body.stream.pipe(Stream.map(frame)), options)
+  }
+  if (response.body._tag === "Uint8Array") {
+    return HttpServerResponse.uint8Array(frame(response.body.body), options)
+  }
+  return HttpServerResponse.setHeader(response, "content-type", "text/event-stream")
+}
+
 const isAllowedMcpOrigin = (
   request: HttpServerRequest.HttpServerRequest,
   allowedOrigins: ReadonlyArray<string> | undefined
@@ -1515,6 +1777,9 @@ const toolErrorResult = (message: string): CallToolResult =>
     content: [{ type: "text", text: message }]
   })
 
+const toolResultContent = (encoded: unknown): CallToolResult["content"] =>
+  encoded === undefined ? [] : [{ type: "text", text: JSON.stringify(encoded) }]
+
 /**
  * Registers a `Toolkit` with the `McpServer`.
  *
@@ -1526,7 +1791,7 @@ export const registerToolkit: <Tools extends Record<string, Tool.Any>>(
 ) => Effect.Effect<
   void,
   never,
-  McpServer | Tool.HandlersFor<Tools> | Exclude<Tool.HandlerServices<Tools>, McpServerClient>
+  McpServer | Tool.HandlersFor<Tools> | Exclude<Tool.HandlerServices<Tools>, McpRequestContext>
 > = Effect.fnUntraced(function*<Tools extends Record<string, Tool.Any>>(
   toolkit: Toolkit.Toolkit<Tools>
 ) {
@@ -1534,25 +1799,76 @@ export const registerToolkit: <Tools extends Record<string, Tool.Any>>(
   const built = yield* (toolkit as any as Effect.Effect<
     Toolkit.WithHandler<Tools>,
     never,
-    Exclude<Tool.HandlersFor<Tools>, McpServerClient>
-  >)
-  const services = yield* Effect.context<never>()
+    Exclude<Tool.HandlersFor<Tools>, McpRequestContext>
+  >).pipe(Effect.updateContext((context: Context.Context<Exclude<Tool.HandlersFor<Tools>, McpRequestContext>>) => {
+    // Toolkit handlers also retain the context in which their layer was built.
+    const services = new Map(context.mapUnsafe)
+    for (const tool of Object.values(toolkit.tools)) {
+      const handler = services.get(tool.id) as Tool.Handler<string> | undefined
+      if (handler !== undefined) {
+        services.set(tool.id, { ...handler, context: omitRequestServices(handler.context) })
+      }
+    }
+    return Context.makeUnsafe(services)
+  }))
+  const services = omitRequestServices(yield* Effect.context<never>())
+  const reportCause = (cause: Cause.Cause<unknown>) => Effect.provideContext(ErrorReporter.report(cause), services)
+  // Interruption propagates; anything else is logged, reported and scrubbed.
+  const internalToolError = (cause: Cause.Cause<unknown>) => {
+    const failure = Cause.findFail(cause)
+    return Result.isFailure(failure) && !Cause.hasDies(cause)
+      ? Effect.failCause(failure.failure)
+      : Effect.logError(cause).pipe(
+        Effect.andThen(reportCause(cause)),
+        Effect.as(toolErrorResult(INTERNAL_TOOL_ERROR_MESSAGE))
+      )
+  }
+  const registrations: Array<Parameters<typeof registry.addTool>[0]> = []
   for (const tool of Object.values(built.tools)) {
+    const strict = Tool.getStrictMode(tool) === true
+    const rawJsonSchema = Tool.isDynamic(tool) ? tool.jsonSchema : undefined
+    if (strict && rawJsonSchema !== undefined) {
+      return yield* Effect.die(
+        `McpServer cannot strictly validate the raw JSON Schema for tool '${tool.name}'; use an Effect Schema instead`
+      )
+    }
+    const decodeOptions: SchemaAST.ParseOptions | undefined = strict ? { onExcessProperty: "error" } : undefined
     const annotations = tool.annotations
     const toolMeta = Context.getOrUndefined(annotations, Tool.Meta)
     const isDeclaredFailure = Schema.is(tool.failureSchema)
-    const outputJsonSchema = Tool.getJsonSchemaFromSchema(tool.successSchema)
-    const outputSchema = outputJsonSchema.type === "object"
-      ? yield* Schema.decodeUnknownEffect(ToolJsonSchema)(outputJsonSchema).pipe(Effect.orDie)
-      : undefined
-    const inputSchema = yield* Schema.decodeUnknownEffect(ToolJsonSchema)(
-      Tool.getJsonSchema(tool)
+    const encodeFailure = Schema.encodeUnknownEffect(tool.failureSchema) as (
+      error: unknown
+    ) => Effect.Effect<unknown, Schema.SchemaError, Tool.HandlerServices<Tools[keyof Tools]>>
+    const declaredFailureResult = (error: unknown) =>
+      error instanceof Error
+        ? Effect.succeed(toolErrorResult(error.message))
+        : Effect.map(encodeFailure(error), (encoded) =>
+          new CallToolResult({ isError: true, content: toolResultContent(encoded) }))
+    const handleCause = (cause: Cause.Cause<unknown>) => {
+      const failure = Cause.findFail(cause)
+      if (Result.isSuccess(failure)) {
+        const error = failure.success.error
+        const origin = Context.get(Cause.reasonAnnotations(failure.success), Toolkit.FailureOrigin)
+        if (origin === "parameters" && isParameterValidationError(error)) {
+          return Effect.fail(new InvalidParams({ message: error.reason.message }))
+        }
+        if (origin === "handler" && isDeclaredFailure(error)) {
+          return Effect.catchCause(declaredFailureResult(error), internalToolError)
+        }
+      }
+      return internalToolError(cause)
+    }
+    const outputSchema = yield* Schema.decodeUnknownEffect(McpSchema.ToolOutputJson)(
+      toolJsonSchema(tool.successSchema, false)
+    ).pipe(Effect.orDie)
+    const inputSchema = yield* Schema.decodeUnknownEffect(ToolJson)(
+      rawJsonSchema ?? toolJsonSchema(tool.parametersSchema, strict)
     ).pipe(Effect.orDie)
     const mcpTool = new McpTool({
       name: tool.name,
       description: Tool.getDescription(tool),
       inputSchema,
-      ...(outputSchema === undefined ? {} : { outputSchema }),
+      outputSchema,
       annotations: {
         ...(Context.getOption(tool.annotations, Tool.Title).pipe(
           Option.map((title) => ({ title })),
@@ -1565,50 +1881,55 @@ export const registerToolkit: <Tools extends Record<string, Tool.Any>>(
       },
       _meta: toolMeta
     })
-    yield* registry.addTool({
+    registrations.push({
       tool: mcpTool,
       annotations,
       handle(payload) {
-        return built.handle(tool.name as keyof Tools, payload ?? {}).pipe(
+        return built.handle(tool.name as keyof Tools, payload ?? {}, undefined, decodeOptions).pipe(
           Stream.unwrap,
-          Stream.run(Sink.last()),
+          Stream.runLast,
           Effect.flatMap(Effect.fromOption),
-          Effect.provideContext(
-            services as Context.Context<Tool.HandlerServices<Tools[keyof Tools]>>
-          ),
-          Effect.map((result) =>
-            new CallToolResult({
-              isError: false,
-              structuredContent: toStructuredContent(result.encodedResult),
-              content: result.encodedResult === undefined ? [] : [{
-                type: "text",
-                text: JSON.stringify(result.encodedResult)
-              }]
-            })
+          Effect.flatMap((result) =>
+            // Declared failures return their encoded payload; anything else is classified by origin.
+            result.isFailure && result.failureOrigin !== "handler"
+              ? Effect.failCause(Cause.annotate(
+                Cause.fail(result.result),
+                Context.make(Toolkit.FailureOrigin, result.failureOrigin ?? "result")
+              ))
+              : Effect.succeed(
+                new CallToolResult({
+                  isError: result.isFailure,
+                  structuredContent: result.isFailure ? undefined : result.encodedResult,
+                  content: toolResultContent(result.encodedResult)
+                })
+              )
           ),
-          Effect.tapCause(Effect.logError),
-          Effect.catch((error) => {
-            if (AiError.isAiError(error)) {
-              const reason = (error as AiError.AiError).reason
-              return reason._tag === "ToolParameterValidationError"
-                ? Effect.fail(new InvalidParams({ message: reason.message }))
-                : Effect.succeed(toolErrorResult(INTERNAL_TOOL_ERROR_MESSAGE))
-            }
-            if (isDeclaredFailure(error)) {
-              const message = error instanceof Error
-                ? error.message
-                : INTERNAL_TOOL_ERROR_MESSAGE
-              return Effect.succeed(toolErrorResult(message))
-            }
-            return Effect.succeed(toolErrorResult(INTERNAL_TOOL_ERROR_MESSAGE))
-          }),
-          Effect.catchDefect(() => Effect.succeed(toolErrorResult(INTERNAL_TOOL_ERROR_MESSAGE)))
+          Effect.catchCause(handleCause),
+          Effect.provideContext(services as Context.Context<Tool.HandlerServices<Tools[keyof Tools]>>)
         )
       }
     })
   }
+  for (const registration of registrations) {
+    yield* registry.addTool(registration)
+  }
 })
 
+const isParameterValidationError = (
+  error: unknown
+): error is AiError.AiError & { readonly reason: AiError.ToolParameterValidationError } =>
+  AiError.isAiError(error) && error.reason._tag === "ToolParameterValidationError"
+
+// MCP requires an object root, so a top-level `$ref` is inlined.
+const toolJsonSchema = (schema: Schema.Constraint, strict: boolean): JsonSchema.JsonSchema => {
+  const document = InternalStructuredOutput.resolveTopLevelReference(
+    Schema.toJsonSchemaDocument(schema, { onExcessProperty: strict ? "error" : "ignore" })
+  )
+  return Object.keys(document.definitions).length === 0
+    ? document.schema
+    : { ...document.schema, $defs: document.definitions }
+}
+
 /**
  * Registers an `AiToolkit` with the `McpServer`.
  *
@@ -1620,7 +1941,7 @@ export const toolkit = <Tools extends Record<string, Tool.Any>>(
 ): Layer.Layer<
   never,
   never,
-  Tool.HandlersFor<Tools> | Exclude<Tool.HandlerServices<Tools>, McpServerClient>
+  Tool.HandlersFor<Tools> | Exclude<Tool.HandlerServices<Tools>, McpRequestContext>
 > =>
   Layer.effectDiscard(registerToolkit(toolkit)).pipe(
     Layer.provide(McpServer.layer)
@@ -1688,12 +2009,12 @@ export const registerResource: {
     readonly audience?: ReadonlyArray<"user" | "assistant"> | undefined
     readonly priority?: number | undefined
     readonly content: Effect.Effect<
-      typeof ReadResourceResult.Type | string | Uint8Array,
+      ReadResourceResult | string | Uint8Array,
       E,
       R
     >
     readonly annotations?: Context.Context<never> | undefined
-  }): Effect.Effect<void, never, Exclude<R, McpServerClient> | McpServer>
+  }): Effect.Effect<void, never, Exclude<R, McpRequestContext> | McpServer>
   <const Schemas extends ReadonlyArray<Schema.Constraint>>(segments: TemplateStringsArray, ...schemas: Schemas): <
     E,
     R,
@@ -1706,7 +2027,7 @@ export const registerResource: {
     readonly priority?: number | undefined
     readonly completion?: ValidateCompletions<Completions, keyof ResourceCompletions<Schemas>> | undefined
     readonly content: (uri: string, ...params: { readonly [K in keyof Schemas]: Schemas[K]["Type"] }) => Effect.Effect<
-      typeof ReadResourceResult.Type | string | Uint8Array,
+      ReadResourceResult | string | Uint8Array,
       E,
       R
     >
@@ -1721,7 +2042,7 @@ export const registerResource: {
       | (Completions[keyof Completions] extends (input: string) => infer Ret ?
         Ret extends Effect.Effect<infer _A, infer _E, infer _R> ? _R : never
         : never),
-      McpServerClient
+      McpRequestContext
     >
     | McpServer
   >
@@ -1734,11 +2055,11 @@ export const registerResource: {
       readonly mimeType?: string | undefined
       readonly audience?: ReadonlyArray<"user" | "assistant"> | undefined
       readonly priority?: number | undefined
-      readonly content: Effect.Effect<typeof ReadResourceResult.Type | string | Uint8Array, any, any>
+      readonly content: Effect.Effect<ReadResourceResult | string | Uint8Array, any, any>
       readonly annotations?: Context.Context<never> | undefined
     }
     return Effect.gen(function*() {
-      const services = yield* Effect.context<any>()
+      const services = omitRequestServices(yield* Effect.context<any>())
       const registry = yield* McpServer
       yield* registry.addResource({
         resource: new Resource({
@@ -1779,13 +2100,13 @@ export const registerResource: {
       >
       | undefined
     readonly content: (uri: string, ...params: Array<any>) => Effect.Effect<
-      typeof ReadResourceResult.Type | string | Uint8Array,
+      ReadResourceResult | string | Uint8Array,
       E,
       R
     >
     readonly annotations?: Context.Context<never> | undefined
   }) {
-    const services = yield* Effect.context<any>()
+    const services = omitRequestServices(yield* Effect.context<any>())
     const registry = yield* McpServer
     const decode = Schema.decodeUnknownEffect(schema)
     const template = new ResourceTemplate({
@@ -1867,11 +2188,11 @@ export const resource: {
     readonly audience?: ReadonlyArray<"user" | "assistant"> | undefined
     readonly priority?: number | undefined
     readonly content: Effect.Effect<
-      typeof ReadResourceResult.Type | string | Uint8Array,
+      ReadResourceResult | string | Uint8Array,
       E,
       R
     >
-  }): Layer.Layer<never, never, Exclude<R, McpServerClient>>
+  }): Layer.Layer<never, never, Exclude<R, McpRequestContext>>
   <const Schemas extends ReadonlyArray<Schema.Constraint>>(segments: TemplateStringsArray, ...schemas: Schemas): <
     E,
     R,
@@ -1884,7 +2205,7 @@ export const resource: {
     readonly priority?: number | undefined
     readonly completion?: ValidateCompletions<Completions, keyof ResourceCompletions<Schemas>> | undefined
     readonly content: (uri: string, ...params: { readonly [K in keyof Schemas]: Schemas[K]["Type"] }) => Effect.Effect<
-      typeof ReadResourceResult.Type | string | Uint8Array,
+      ReadResourceResult | string | Uint8Array,
       E,
       R
     >
@@ -1896,7 +2217,7 @@ export const resource: {
       | (Completions[keyof Completions] extends (input: string) => infer Ret ?
         Ret extends Effect.Effect<infer _A, infer _E, infer _R> ? _R : never
         : never),
-      McpServerClient
+      McpRequestContext
     >
   >
 } = function() {
@@ -1939,19 +2260,26 @@ export const registerPrompt = <
     readonly [K in keyof Params]?: (
       input: string,
       context: CompletionContext
-    ) => Effect.Effect<Array<Params[K]>, any, any>
+    ) => Effect.Effect<Array<Params[K]["Type"]>, any, any>
   } = {}
 >(
   options: {
     readonly name: string
+    readonly title?: string | undefined
     readonly description?: string | undefined
     readonly parameters?: Params | undefined
     readonly completion?: ValidateCompletions<Completions, Extract<keyof Params, string>> | undefined
-    readonly content: (params: Params) => Effect.Effect<Array<typeof PromptMessage.Type> | string, E, R>
+    readonly content: (
+      params: Schema.Struct.Type<Params>
+    ) => Effect.Effect<Array<PromptMessage> | string, E, R>
     readonly annotations?: Context.Context<never> | undefined
   }
-): Effect.Effect<void, never, Exclude<Schema.Struct.DecodingServices<Params> | R, McpServerClient> | McpServer> => {
-  const args = Arr.empty<typeof PromptArgument.Type>()
+): Effect.Effect<
+  void,
+  never,
+  Exclude<Schema.Struct.DecodingServices<Params> | R, McpRequestContext> | McpServer
+> => {
+  const args = Arr.empty<PromptArgument>()
   const props: Record<string, Schema.Constraint> = options.parameters ?? {}
   for (const [name, prop] of Object.entries(props)) {
     args.push({
@@ -1962,6 +2290,7 @@ export const registerPrompt = <
   }
   const prompt = new Prompt({
     name: options.name,
+    title: options.title,
     description: options.description,
     arguments: args
   })
@@ -1977,13 +2306,17 @@ export const registerPrompt = <
   > = options.completion ?? {}
   return Effect.gen(function*() {
     const registry = yield* McpServer
-    const services = yield* Effect.context<Exclude<R | Schema.Struct.DecodingServices<Params>, McpServerClient>>()
+    const services = omitRequestServices(
+      yield* Effect.context<
+        Exclude<R | Schema.Struct.DecodingServices<Params>, McpRequestContext>
+      >()
+    )
     const completions: Record<
       string,
       (
         input: string,
         context: CompletionContext
-      ) => Effect.Effect<CompleteResult, InternalError, McpServerClient>
+      ) => Effect.Effect<CompleteResult, InternalError, McpRequestContext>
     > = Object.create(null)
     for (const [param, handle] of Object.entries(completion)) {
       const encodeArray = Schema.encodeEffect(Schema.Array(props[param]))
@@ -2069,15 +2402,20 @@ export const prompt = <
 >(
   options: {
     readonly name: string
+    readonly title?: string | undefined
     readonly description?: string | undefined
     readonly parameters?: Params | undefined
     readonly completion?: ValidateCompletions<Completions, Extract<keyof Params, string>> | undefined
     readonly content: (
       params: Schema.Struct.Type<Params>
-    ) => Effect.Effect<Array<typeof PromptMessage.Type> | string, E, R>
+    ) => Effect.Effect<Array<PromptMessage> | string, E, R>
     readonly annotations?: Context.Context<never> | undefined
   }
-): Layer.Layer<never, never, Exclude<Schema.Struct.DecodingServices<Params> | R, McpServerClient>> =>
+): Layer.Layer<
+  never,
+  never,
+  Exclude<Schema.Struct.DecodingServices<Params> | R, McpRequestContext>
+> =>
   Layer.effectDiscard(registerPrompt(options)).pipe(
     Layer.provide(McpServer.layer)
   )
@@ -2111,7 +2449,7 @@ export const elicit: <S extends Schema.ConstraintEncoder<Record<string, unknown>
   const request = yield* Schema.decodeUnknownEffect(McpSchema.ElicitRequestFormParams)({
     mode: "form",
     message: options.message,
-    requestedSchema: Tool.getJsonSchemaFromSchema(schema)
+    requestedSchema: toolJsonSchema(schema, false)
   }).pipe(Effect.orDie)
   const res = yield* client.elicit(request).pipe(
     Effect.catchCause((cause) => Effect.fail(new ElicitationDeclined({ cause: Cause.squash(cause), request })))
@@ -2135,8 +2473,8 @@ export const elicit: <S extends Schema.ConstraintEncoder<Record<string, unknown>
 export const clientCapabilities: Effect.Effect<
   ClientCapabilities,
   never,
-  McpServerClient
-> = McpServerClient.useSync((_) => _.clientCapabilities)
+  McpRequestContext
+> = McpRequestContext.useSync((_) => _.clientCapabilities)
 
 // -----------------------------------------------------------------------------
 // Internal
@@ -2149,9 +2487,9 @@ const makeUriMatcher = <A>() => {
     caseSensitive: true
   })
   const add = (uri: string, value: A) => {
-    router.on("GET", uri as any, value)
+    router.on("GET", `/${uri}`, value)
   }
-  const find = (uri: string) => router.find("GET", uri)
+  const find = (uri: string) => router.find("GET", `/${uri}`)
 
   return { add, find } as const
 }
@@ -2184,156 +2522,10 @@ const compileUriTemplate = (segments: TemplateStringsArray, ...schemas: Readonly
   } as const
 }
 
-const PingRpcs = RpcGroup.make(Ping).middleware(McpServerClientMiddleware)
-const layerHandlers = (serverInfo: {
-  readonly name: string
-  readonly version: string
-  readonly description?: string | undefined
-  readonly websiteUrl?: string | undefined
-  readonly icons?: ReadonlyArray<McpSchema.Icon> | undefined
-  readonly extensions?: ServerExtensions | undefined
-}, options: {
-  readonly sessions: Sessions
-  readonly protocolRegistry: McpProtocolRegistry.ProtocolRegistry<McpProtocol.ProtocolAdapter>
-}) =>
-  Layer.effectContext(
-    Effect.gen(function*() {
-      const server = yield* McpServer
-      const defaultLogLevel = yield* CurrentLogLevel
-      const contextMap = new Map<string, unknown>()
-      const internalCore = internalState.get(server)!.core
-      const handlerTarget = options.protocolRegistry.handlerTarget(contextMap)
-
-      for (const protocol of options.protocolRegistry.protocols) {
-        const wireHandlers = PingRpcs.of({
-          // Requests
-          ping: () => Effect.succeed({})
-        })
-        yield* handlerTarget.install(protocol, PingRpcs, wireHandlers)
-        const lifecycle: McpProtocolInternal.LifecycleRuntime = {
-          initialize: Effect.fnUntraced(
-            function*(protocolVersion, profile, clientId) {
-              const presence = yield* internalCore.registrationPresence
-              let capabilities: McpCore.CanonicalServerCapabilities = {
-                completions: true,
-                logging: true
-              }
-              if (presence.tools) {
-                capabilities = { ...capabilities, tools: { listChanged: true } }
-              }
-              if (presence.resources) {
-                capabilities = {
-                  ...capabilities,
-                  resources: {
-                    listChanged: true,
-                    subscribe: true
-                  }
-                }
-              }
-              if (presence.prompts) {
-                capabilities = { ...capabilities, prompts: { listChanged: true } }
-              }
-              if (serverInfo.extensions) {
-                capabilities = {
-                  ...capabilities,
-                  extensions: serverInfo.extensions
-                }
-              }
-              return yield* Effect.withFiber((fiber) => {
-                const httpRequest = Context.getOrUndefined(fiber.context, HttpServerRequest.HttpServerRequest)
-                if (httpRequest !== undefined && capabilities.resources !== undefined) {
-                  capabilities = {
-                    ...capabilities,
-                    resources: { ...capabilities.resources, subscribe: false }
-                  }
-                }
-                const initializePayload = Initialize.payloadSchema.make({
-                  protocolVersion,
-                  capabilities: profile.clientCapabilities,
-                  clientInfo: profile.clientInfo,
-                  _meta: profile.requestMetadata
-                })
-                const session: Session = {
-                  initializePayload,
-                  negotiatedProfile: profile,
-                  protocol,
-                  resourceSubscriptions: httpRequest === undefined && capabilities.resources?.subscribe === true
-                    ? new Set()
-                    : undefined,
-                  logLevel: { _tag: "Effect", level: defaultLogLevel }
-                }
-                if (httpRequest) {
-                  const sessionId = crypto.randomUUID()
-                  options.sessions.bySessionId.set(sessionId, session)
-                  appendPreResponseHandlerUnsafe(httpRequest, (_req, res) =>
-                    Effect.succeed(HttpServerResponse.setHeaders(res, {
-                      [MCP_SESSION_ID_HEADER]: sessionId,
-                      [MCP_PROTOCOL_VERSION_HEADER]: protocol.protocolVersion
-                    })))
-                } else {
-                  options.sessions.byClientId.set(clientId, session)
-                }
-                return Effect.succeed({
-                  capabilities,
-                  serverInfo: McpSchema.Implementation.make({
-                    name: serverInfo.name,
-                    version: serverInfo.version,
-                    description: serverInfo.description,
-                    websiteUrl: serverInfo.websiteUrl,
-                    icons: serverInfo.icons
-                  })
-                })
-              })
-            }
-          ),
-          setLogLevel: Effect.fnUntraced(function*(level, clientId, headers) {
-            const session = getClientSession(options.sessions, clientId, headers)
-            if (session === undefined) {
-              return
-            }
-            session.logLevel = { _tag: "Mcp", level }
-          }),
-          subscribe: Effect.fnUntraced(function*(uri, clientId, headers) {
-            const subscriptions = getClientSession(options.sessions, clientId, headers)?.resourceSubscriptions
-            if (subscriptions === undefined) {
-              return yield* new McpProtocolInternal.ProtocolError({
-                code: McpSchema.METHOD_NOT_FOUND_ERROR_CODE,
-                message: "Resource subscriptions are not supported"
-              })
-            }
-            subscriptions.add(uri)
-          }),
-          unsubscribe: Effect.fnUntraced(function*(uri, clientId, headers) {
-            const subscriptions = getClientSession(options.sessions, clientId, headers)?.resourceSubscriptions
-            if (subscriptions === undefined) {
-              return yield* new McpProtocolInternal.ProtocolError({
-                code: McpSchema.METHOD_NOT_FOUND_ERROR_CODE,
-                message: "Resource subscriptions are not supported"
-              })
-            }
-            subscriptions.delete(uri)
-          }),
-          clientNotification: Effect.fnUntraced(function*(notification, clientId) {
-            if (notification._tag === "Initialized") {
-              server.initializedClients.add(clientId)
-            }
-            return
-          })
-        }
-        yield* protocol.installHandlers(
-          internalCore,
-          lifecycle,
-          handlerTarget
-        )
-      }
-      return Context.makeUnsafe(contextMap)
-    })
-  )
-
 const resolveResourceContent = (
   uri: string,
-  content: typeof ReadResourceResult.Type | string | Uint8Array
-): typeof ReadResourceResult.Type => {
+  content: ReadResourceResult | string | Uint8Array
+): ReadResourceResult => {
   if (typeof content === "string") {
     return {
       contents: [{
@@ -2352,84 +2544,18 @@ const resolveResourceContent = (
   return content
 }
 
-const getClientSession = (
-  sessions: Sessions,
-  clientId: number,
-  headers: Headers.Headers
-) => {
-  const sessionId = headers[MCP_SESSION_ID_HEADER]
-  if (sessionId === undefined) {
-    return sessions.byClientId.get(clientId)
-  }
-  return sessions.bySessionId.get(sessionId)
-}
-
-const InvalidBatchExit = Schema.Struct({
-  _tag: Schema.Literal("Exit"),
+const InvalidBatchExit = Schema.TaggedStruct("Exit", {
   requestId: Schema.Null,
-  exit: Schema.Struct({
-    _tag: Schema.Literal("Failure"),
+  exit: Schema.TaggedStruct("Failure", {
     cause: Schema.Unknown
   })
 })
 
 const decodeInvalidBatchExit = Schema.decodeUnknownResult(InvalidBatchExit)
 
-const mcpLogLevels: Record<McpSchema.LoggingLevel, { readonly effect: LogLevel.LogLevel; readonly order: number }> = {
-  debug: { effect: "Debug", order: 0 },
-  info: { effect: "Info", order: 1 },
-  notice: { effect: "Info", order: 2 },
-  warning: { effect: "Warn", order: 3 },
-  error: { effect: "Error", order: 4 },
-  critical: { effect: "Fatal", order: 5 },
-  alert: { effect: "Fatal", order: 6 },
-  emergency: { effect: "Fatal", order: 7 }
-}
-
-const effectLogLevel = (logLevel: SessionLogLevel | undefined, fallback: LogLevel.LogLevel): LogLevel.LogLevel =>
-  logLevel?._tag === "Mcp" ? mcpLogLevels[logLevel.level].effect : logLevel?.level ?? fallback
-
-const isMcpLogLevelEnabled = (
-  level: McpSchema.LoggingLevel,
-  minimum: SessionLogLevel | undefined,
-  fallback: LogLevel.LogLevel
-): boolean =>
-  minimum?._tag === "Mcp"
-    ? mcpLogLevels[level].order >= mcpLogLevels[minimum.level].order
-    : LogLevel.isGreaterThanOrEqualTo(mcpLogLevels[level].effect, minimum?.level ?? fallback)
-
-const OfferedProtocolVersion = Schema.Struct({
-  protocolVersion: Schema.String
-})
-
-const getOfferedProtocolVersion = (payload: unknown): string => {
-  const decoded = Schema.decodeUnknownResult(OfferedProtocolVersion)(payload)
-  return Result.isSuccess(decoded) ? decoded.success.protocolVersion : ""
-}
-
-const protocolForInternalTag = (
-  registry: McpProtocolRegistry.ProtocolRegistry<McpProtocol.ProtocolAdapter>,
-  tag: string
-): McpProtocol.ProtocolAdapter => {
-  for (const protocol of registry.protocols) {
-    const routed = registry.routeClientRequest(protocol, {
-      _tag: "Request",
-      id: 0,
-      tag: "",
-      payload: undefined,
-      headers: []
-    })
-    if (tag.startsWith(routed.tag)) {
-      return protocol
-    }
-  }
-  return registry.protocols[0]
-}
-
-const getProtocolForClient = (
-  clientProtocols: Map<number, McpProtocol.ProtocolAdapter>,
-  clientId: number,
-  registry: McpProtocolRegistry.ProtocolRegistry<McpProtocol.ProtocolAdapter>
-): McpProtocol.ProtocolAdapter =>
-  clientProtocols.get(clientId) ??
-    registry.protocols[0]
+const isProtocolVersion = (version: string): version is McpProtocol.ProtocolVersion =>
+  version === "2024-11-05" ||
+  version === "2025-03-26" ||
+  version === "2025-06-18" ||
+  version === "2025-11-25" ||
+  version === "2026-07-28"
diff --git a/repos/effect/packages/effect/src/unstable/ai/OpenAiStructuredOutput.ts b/repos/effect/packages/effect/src/unstable/ai/OpenAiStructuredOutput.ts
index 5ad978475..b0325080d 100644
--- a/repos/effect/packages/effect/src/unstable/ai/OpenAiStructuredOutput.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/OpenAiStructuredOutput.ts
@@ -63,7 +63,10 @@ export function toCodecOpenAI<T, E, RD, RE>(
 } {
   const codec = InternalStructuredOutput.toCodec(schema)
   const document = InternalStructuredOutput.resolveTopLevelReference(
-    Schema.toJsonSchemaDocument(codec, { generateDescriptions: true })
+    Schema.toJsonSchemaDocument(codec, {
+      generateDescriptions: true,
+      onExcessProperty: "error"
+    })
   )
   const jsonSchema = rewriteOpenAI(document.schema)
   if (jsonSchema.type !== "object" || jsonSchema.anyOf !== undefined) {
diff --git a/repos/effect/packages/effect/src/unstable/ai/Prompt.ts b/repos/effect/packages/effect/src/unstable/ai/Prompt.ts
index e902ba692..1f9b0b5ce 100644
--- a/repos/effect/packages/effect/src/unstable/ai/Prompt.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/Prompt.ts
@@ -11,6 +11,7 @@
  */
 import * as Arr from "../../Array.ts"
 import * as Effect from "../../Effect.ts"
+import * as Encoding from "../../Encoding.ts"
 import { dual } from "../../Function.ts"
 import { type Pipeable, pipeArguments } from "../../Pipeable.ts"
 import * as Predicate from "../../Predicate.ts"
@@ -1385,7 +1386,9 @@ export const UserMessage: Schema.Struct<{
   ...BaseMessage.fields,
   role: Schema.Literal("user"),
   content: Schema.Union([
-    ContentFromString,
+    ContentFromString.check(
+      Schema.makeFilter((content) => content.length === 1 && Object.keys(content[0].options).length === 0)
+    ),
     Schema.Array(Schema.Union([TextPart, FilePart]))
   ])
 }).annotate({ identifier: "UserMessage" })
@@ -1585,7 +1588,9 @@ export const AssistantMessage: Schema.Struct<{
   ...BaseMessage.fields,
   role: Schema.Literal("assistant"),
   content: Schema.Union([
-    ContentFromString,
+    ContentFromString.check(
+      Schema.makeFilter((content) => content.length === 1 && Object.keys(content[0].options).length === 0)
+    ),
     Schema.Array(Schema.Union([
       TextPart,
       FilePart,
@@ -1839,7 +1844,7 @@ export const Prompt: Schema.Codec<Prompt, PromptEncoded> = Schema.Struct({
 }).pipe(
   Schema.decodeTo(
     $Prompt,
-    SchemaTransformation.transformOrFail({
+    SchemaTransformation.transformEffect({
       decode: (input, options) =>
         Effect.mapBothEager(
           SchemaParser.decodeEffect(Schema.Array(Message))(input.content),
@@ -2125,6 +2130,16 @@ export const fromResponseParts = (parts: ReadonlyArray<Response.AnyPart>): Promp
         break
       }
 
+      // File Parts
+      case "file": {
+        assistantParts.push(makePart("file", {
+          data: Encoding.encodeBase64(part.data),
+          mediaType: part.mediaType,
+          options: part.metadata
+        }))
+        break
+      }
+
       // Tool Call Parts
       case "tool-call": {
         assistantParts.push(makePart("tool-call", {
diff --git a/repos/effect/packages/effect/src/unstable/ai/Response.ts b/repos/effect/packages/effect/src/unstable/ai/Response.ts
index 26b50b3eb..48db92809 100644
--- a/repos/effect/packages/effect/src/unstable/ai/Response.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/Response.ts
@@ -16,7 +16,8 @@ import { identity } from "../../Function.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Schema from "../../Schema.ts"
 import * as SchemaTransformation from "../../SchemaTransformation.ts"
-import type * as Tool from "./Tool.ts"
+import * as AiError from "./AiError.ts"
+import * as Tool from "./Tool.ts"
 import type * as Toolkit from "./Toolkit.ts"
 
 const PartTypeId = "~effect/ai/Response/Part" as const
@@ -185,7 +186,7 @@ export const AllParts = <T extends Toolkit.Any | Toolkit.WithHandler<any>>(
   const toolResults: Array<Schema.Top> = []
   for (const tool of Object.values(toolkit.tools as Record<string, Tool.Any>)) {
     const toolCall = ToolCallPart(tool.name, tool.parametersSchema)
-    const toolResult = ToolResultPart(tool.name, tool.successSchema, tool.failureSchema)
+    const toolResult = ToolResultPart(tool.name, tool.successSchema, Tool.failureResultSchema(tool))
     toolCalls.push(toolCall)
     toolResults.push(toolResult)
   }
@@ -226,11 +227,11 @@ export const AllParts = <T extends Toolkit.Any | Toolkit.WithHandler<any>>(
  */
 export type Part<
   Tools extends Record<string, Tool.Any>,
-  EncodedToolParameters extends boolean = false
+  ParametersMode extends ToolParametersMode = "decoded"
 > =
   | TextPart
   | ReasoningPart
-  | ToolCallParts<Tools, EncodedToolParameters>
+  | ToolCallParts<Tools, ParametersMode>
   | ToolResultParts<Tools>
   | ToolApprovalRequestPart
   | FilePart
@@ -277,7 +278,7 @@ export const Part = <T extends Toolkit.Any | Toolkit.WithHandler<any>>(
   const toolResults: Array<Schema.Top> = []
   for (const tool of Object.values(toolkit.tools as Record<string, Tool.Any>)) {
     const toolCall = ToolCallPart(tool.name, tool.parametersSchema)
-    const toolResult = ToolResultPart(tool.name, tool.successSchema, tool.failureSchema)
+    const toolResult = ToolResultPart(tool.name, tool.successSchema, Tool.failureResultSchema(tool))
     toolCalls.push(toolCall)
     toolResults.push(toolResult)
   }
@@ -307,7 +308,7 @@ export const Part = <T extends Toolkit.Any | Toolkit.WithHandler<any>>(
  */
 export type StreamPart<
   Tools extends Record<string, Tool.Any>,
-  EncodedToolParameters extends boolean = false
+  ParametersMode extends ToolParametersMode = "decoded"
 > =
   | TextStartPart
   | TextDeltaPart
@@ -318,7 +319,7 @@ export type StreamPart<
   | ToolParamsStartPart
   | ToolParamsDeltaPart
   | ToolParamsEndPart
-  | ToolCallParts<Tools, EncodedToolParameters>
+  | ToolCallParts<Tools, ParametersMode>
   | ToolResultParts<Tools>
   | ToolApprovalRequestPart
   | FilePart
@@ -372,7 +373,7 @@ export const StreamPart = <T extends Toolkit.Any | Toolkit.WithHandler<any>>(
   const toolResults: Array<Schema.Top> = []
   for (const tool of Object.values(toolkit.tools as Record<string, Tool.Any>)) {
     const toolCall = ToolCallPart(tool.name, tool.parametersSchema)
-    const toolResult = ToolResultPart(tool.name, tool.successSchema, tool.failureSchema)
+    const toolResult = ToolResultPart(tool.name, tool.successSchema, Tool.failureResultSchema(tool))
     toolCalls.push(toolCall)
     toolResults.push(toolResult)
   }
@@ -410,16 +411,26 @@ export const StreamPart = <T extends Toolkit.Any | Toolkit.WithHandler<any>>(
  */
 export type ToolCallParts<
   Tools extends Record<string, Tool.Any>,
-  EncodedParameters extends boolean = false
-> = ToolCallPartForName<Tools, EncodedParameters, keyof Tools>
+  ParametersMode extends ToolParametersMode = "decoded"
+> = ToolCallPartForName<Tools, ParametersMode, keyof Tools>
+
+/**
+ * Controls whether tool parameters are decoded, encoded, or opaque.
+ *
+ * @category utility types
+ * @since 4.0.0
+ */
+export type ToolParametersMode = "decoded" | "encoded" | "opaque"
 
 type ToolCallPartForName<
   Tools extends Record<string, Tool.Any>,
-  EncodedParameters extends boolean,
+  ParametersMode extends ToolParametersMode,
   Name extends keyof Tools
 > = Name extends string ? ToolCallPart<
     Name,
-    EncodedParameters extends true ? Tool.ParametersEncoded<Tools[Name]> : Tool.Parameters<Tools[Name]>
+    ParametersMode extends "encoded" ? Tool.ParametersEncoded<Tools[Name]>
+      : ParametersMode extends "opaque" ? unknown
+      : Tool.Parameters<Tools[Name]>
   >
   : never
 
@@ -1619,7 +1630,7 @@ export interface ToolResultPartMetadata extends ProviderMetadata {}
  * @category schemas
  * @since 4.0.0
  */
-export const ToolResultPart: <
+export const ToolResultPart = <
   const Name extends string,
   Success extends Schema.Constraint,
   Failure extends Schema.Constraint
@@ -1627,89 +1638,54 @@ export const ToolResultPart: <
   name: Name,
   success: Success,
   failure: Failure
-) => Schema.decodeTo<
-  Schema.Struct<
-    {
-      readonly "~effect/ai/Response/Part": Schema.Literal<"~effect/ai/Response/Part">
-      readonly result: Schema.Union<readonly [Success, Failure]>
-      readonly providerExecuted: Schema.Boolean
-      readonly metadata: Schema.$Record<
-        Schema.String,
-        Schema.NullOr<Schema.Codec<Schema.Json>>
-      >
-      readonly encodedResult: Schema.toEncoded<Schema.Union<readonly [Success, Failure]>>
-      readonly preliminary: Schema.Boolean
-      readonly id: Schema.String
-      readonly type: Schema.Literal<"tool-result">
-      readonly isFailure: Schema.Boolean
-      readonly name: Schema.Literal<Name>
-    }
-  >,
-  Schema.Struct<
-    {
-      readonly result: Schema.toEncoded<Schema.Union<readonly [Success, Failure]>>
-      readonly providerExecuted: Schema.optional<Schema.Boolean>
-      readonly metadata: Schema.optional<
-        Schema.$Record<Schema.String, Schema.NullOr<Schema.Codec<Schema.Json>>>
-      >
-      readonly preliminary: Schema.optional<Schema.Boolean>
-      readonly id: Schema.String
-      readonly type: Schema.Literal<"tool-result">
-      readonly isFailure: Schema.Boolean
-      readonly name: Schema.Literal<Name>
+): Schema.Codec<
+  ToolResultPart<Name, Success["Type"], Failure["Type"]>,
+  ToolResultPartEncoded,
+  Success["DecodingServices"] | Failure["DecodingServices"],
+  Success["EncodingServices"] | Failure["EncodingServices"]
+> => {
+  const makeSchema = (result: Schema.Constraint, isFailure: boolean) => {
+    const encodedResult = Schema.toEncoded(result)
+    const Common = {
+      id: Schema.String,
+      type: Schema.Literal("tool-result"),
+      isFailure: Schema.Literal(isFailure),
+      name: Schema.Literal(name)
     }
-  >
-> = <
-  const Name extends string,
-  Success extends Schema.Constraint,
-  Failure extends Schema.Constraint
->(
-  name: Name,
-  success: Success,
-  failure: Failure
-) => {
-  const ResultSchema = Schema.Union([success, failure])
-  const Common = {
-    id: Schema.String,
-    type: Schema.Literal("tool-result"),
-    isFailure: Schema.Boolean,
-    name: Schema.Literal(name)
+    const Decoded = Schema.Struct({
+      ...Common,
+      [PartTypeId]: Schema.Literal(PartTypeId),
+      result,
+      providerExecuted: Schema.Boolean,
+      metadata: ProviderMetadata,
+      encodedResult,
+      preliminary: Schema.Boolean
+    })
+    const Encoded = Schema.Struct({
+      ...Common,
+      result: encodedResult,
+      providerExecuted: Schema.optional(Schema.Boolean),
+      metadata: Schema.optional(ProviderMetadata),
+      preliminary: Schema.optional(Schema.Boolean)
+    })
+    return Decoded.pipe(Schema.encodeTo(
+      Encoded,
+      SchemaTransformation.transform({
+        decode: (encoded) => ({
+          ...encoded,
+          [PartTypeId]: PartTypeId,
+          providerExecuted: encoded.providerExecuted ?? false,
+          metadata: encoded.metadata ?? {},
+          encodedResult: encoded.result,
+          preliminary: encoded.preliminary ?? false
+        }),
+        encode: identity
+      })
+    ))
   }
-  const Decoded = Schema.Struct({
-    ...Common,
-    [PartTypeId]: Schema.Literal(PartTypeId),
-    result: ResultSchema,
-    providerExecuted: Schema.Boolean,
-    metadata: ProviderMetadata,
-    encodedResult: Schema.toEncoded(ResultSchema),
-    preliminary: Schema.Boolean
+  return Schema.Union([makeSchema(success, false), makeSchema(failure, true)]).annotate({
+    identifier: `ToolResultPart(${name})`
   })
-  const Encoded = Schema.Struct({
-    ...Common,
-    result: Schema.toEncoded(ResultSchema),
-    providerExecuted: Schema.optional(Schema.Boolean),
-    metadata: Schema.optional(ProviderMetadata),
-    preliminary: Schema.optional(Schema.Boolean)
-  })
-  return Decoded.pipe(Schema.encodeTo(
-    Encoded,
-    SchemaTransformation.transform({
-      decode: (encoded) => ({
-        ...encoded,
-        [PartTypeId]: PartTypeId,
-        providerExecuted: encoded.providerExecuted ?? false,
-        metadata: encoded.metadata ?? {},
-        encodedResult: encoded.result,
-        preliminary: encoded.preliminary ?? false
-      }),
-      encode: identity
-    })
-  )).annotate({ identifier: `ToolResultPart(${name})` }) satisfies Schema.Codec<
-    ToolResultPart<Name, Success["Type"], Failure["Type"]>,
-    ToolResultPartEncoded,
-    Success["EncodingServices"] | Failure["EncodingServices"],
-    Success["DecodingServices"] | Failure["DecodingServices"]
-  >
 }
 
 /**
@@ -2132,83 +2108,20 @@ export const UrlSourcePart: Schema.Struct<{
 // =============================================================================
 
 /**
- * Schema for HTTP request details associated with an AI response.
- *
- * **Details**
- *
- * Captures comprehensive information about the HTTP request made to the
- * AI provider, enabling inspection of request metadata for debugging and
- * observability purposes.
- *
- * **Example** (Describing an HTTP request)
- *
- * ```ts import.meta.vitest
- * import type { Response } from "effect/unstable/ai"
- *
- * const requestDetails: typeof Response.HttpRequestDetails.Type = {
- *   method: "POST",
- *   url: "https://api.openai.com/v1/responses",
- *   urlParams: [],
- *   hash: undefined,
- *   headers: { "Content-Type": "application/json" }
- * }
- * const result = [requestDetails.method, requestDetails.urlParams] // => ["POST", []]
- * ```
+ * Alias of {@link AiError.HttpRequestDetails}.
  *
  * @category schemas
  * @since 4.0.0
  */
-export const HttpRequestDetails = Schema.Struct({
-  method: Schema.Literals(["GET", "POST", "PATCH", "PUT", "DELETE", "HEAD", "OPTIONS", "TRACE"]),
-  url: Schema.String,
-  urlParams: Schema.Array(Schema.Tuple([Schema.String, Schema.String])),
-  hash: Schema.optional(Schema.String),
-  headers: Schema.Record(
-    Schema.String,
-    Schema.Union([
-      Schema.String,
-      Schema.Redacted(Schema.String)
-    ])
-  )
-}).annotate({ identifier: "HttpRequestDetails" })
+export const HttpRequestDetails = AiError.HttpRequestDetails
 
 /**
- * Schema for HTTP response details associated with an AI response.
- *
- * **Details**
- *
- * Captures essential information about the HTTP response received from
- * the AI provider, including status codes and headers for debugging and
- * observability purposes.
- *
- * **Example** (Describing an HTTP response)
- *
- * ```ts import.meta.vitest
- * import type { Response } from "effect/unstable/ai"
- *
- * const responseDetails: typeof Response.HttpResponseDetails.Type = {
- *   status: 200,
- *   headers: {
- *     "Content-Type": "application/json",
- *     "X-Request-Id": "req_abc123"
- *   }
- * }
- * const result = [responseDetails.status, responseDetails.headers["X-Request-Id"]] // => [200, "req_abc123"]
- * ```
+ * Alias of {@link AiError.HttpResponseDetails}.
  *
  * @category schemas
  * @since 4.0.0
  */
-export const HttpResponseDetails = Schema.Struct({
-  status: Schema.Int,
-  headers: Schema.Record(
-    Schema.String,
-    Schema.Union([
-      Schema.String,
-      Schema.Redacted(Schema.String)
-    ])
-  )
-}).annotate({ identifier: "HttpResponseDetails" })
+export const HttpResponseDetails = AiError.HttpResponseDetails
 
 // =============================================================================
 // Response Metadata Part
diff --git a/repos/effect/packages/effect/src/unstable/ai/Tokenizer.ts b/repos/effect/packages/effect/src/unstable/ai/Tokenizer.ts
index a919d9b17..65f7cece6 100644
--- a/repos/effect/packages/effect/src/unstable/ai/Tokenizer.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/Tokenizer.ts
@@ -165,7 +165,6 @@ const truncate = (
   maxTokens: number
 ): Effect.Effect<Prompt.Prompt, AiError.AiError> =>
   Effect.suspend(() => {
-    let count = 0
     let inputMessages = self.content
     let outputMessages: Array<Prompt.Message> = []
     const loop: Effect.Effect<Prompt.Prompt, AiError.AiError> = Effect.suspend(() => {
@@ -174,12 +173,12 @@ const truncate = (
         return Effect.succeed(Prompt.fromMessages(outputMessages))
       }
       inputMessages = inputMessages.slice(0, inputMessages.length - 1)
-      return Effect.flatMap(tokenize(Prompt.fromMessages([message])), (tokens) => {
-        count += tokens.length
-        if (count > maxTokens) {
+      const candidate = [message, ...outputMessages]
+      return Effect.flatMap(tokenize(Prompt.fromMessages(candidate)), (tokens) => {
+        if (tokens.length > maxTokens) {
           return Effect.succeed(Prompt.fromMessages(outputMessages))
         }
-        outputMessages = [message, ...outputMessages]
+        outputMessages = candidate
         return loop
       })
     })
diff --git a/repos/effect/packages/effect/src/unstable/ai/Tool.ts b/repos/effect/packages/effect/src/unstable/ai/Tool.ts
index 39aa8f824..688d35224 100644
--- a/repos/effect/packages/effect/src/unstable/ai/Tool.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/Tool.ts
@@ -22,7 +22,7 @@ import * as Schema from "../../Schema.ts"
 import * as SchemaAST from "../../SchemaAST.ts"
 import type * as Struct from "../../Struct.ts"
 import type * as Types from "../../Types.ts"
-import type * as AiError from "./AiError.ts"
+import * as AiError from "./AiError.ts"
 import type { CodecTransformer } from "./LanguageModel.ts"
 import type * as Prompt from "./Prompt.ts"
 
@@ -818,9 +818,8 @@ export type FailureEncoded<T> = T extends Tool<
   : never
 
 /**
- * A utility type for the actual failure value that can appear in tool results.
- * When `failureMode` is `"return"`, this includes both user-defined failures
- * and `AiError`.
+ * A tool's failure type, plus {@link ExecutionFailure} in both failure modes
+ * and `AiError` in `"return"` mode.
  *
  * @category utility types
  * @since 4.0.0
@@ -829,8 +828,11 @@ export type FailureResult<T> = T extends Tool<
   infer _Name,
   infer _Config,
   infer _Requirements
-> ? _Config["failureMode"] extends "return" ? _Config["failure"]["Type"] | AiError.AiError
-  : _Config["failure"]["Type"]
+> ? _Config["failureMode"] extends "return" ?
+      | _Config["failure"]["Type"]
+      | typeof ExecutionFailure.Type
+      | AiError.AiError
+  : _Config["failure"]["Type"] | typeof ExecutionFailure.Type
   : never
 
 /**
@@ -843,47 +845,28 @@ export type FailureResultEncoded<T> = T extends Tool<
   infer _Name,
   infer _Config,
   infer _Requirements
-> ? _Config["failureMode"] extends "return" ? _Config["failure"]["Encoded"] | AiError.AiErrorEncoded
-  : _Config["failure"]["Encoded"]
+> ? _Config["failureMode"] extends "return" ?
+      | _Config["failure"]["Encoded"]
+      | typeof ExecutionFailure.Encoded
+      | AiError.AiErrorEncoded
+  : _Config["failure"]["Encoded"] | typeof ExecutionFailure.Encoded
   : never
 
 /**
- * A utility type to extract the type of the tool call result whether it
- * succeeds or fails.
- *
- * **Details**
- *
- * When `failureMode` is `"return"`, the result may also be an `AiError`.
+ * A tool's success or {@link FailureResult} type.
  *
  * @category utility types
  * @since 4.0.0
  */
-export type Result<T> = T extends Tool<
-  infer _Name,
-  infer _Config,
-  infer _Requirements
-> ? _Config["failureMode"] extends "return" ? Success<T> | Failure<T> | AiError.AiError
-  : Success<T> | Failure<T>
-  : never
+export type Result<T> = Success<T> | FailureResult<T>
 
 /**
- * A utility type to extract the encoded type of the tool call result whether
- * it succeeds or fails.
- *
- * **Details**
- *
- * When `failureMode` is `"return"`, the result may also be an encoded `AiError`.
+ * The encoded form of {@link Result}.
  *
  * @category utility types
  * @since 4.0.0
  */
-export type ResultEncoded<T> = T extends Tool<
-  infer _Name,
-  infer _Config,
-  infer _Requirements
-> ? _Config["failureMode"] extends "return" ? SuccessEncoded<T> | FailureEncoded<T> | AiError.AiErrorEncoded
-  : SuccessEncoded<T> | FailureEncoded<T>
-  : never
+export type ResultEncoded<T> = SuccessEncoded<T> | FailureResultEncoded<T>
 
 /**
  * A utility type to extract the requirements of a `Tool` call handler.
@@ -932,6 +915,19 @@ export type ResultDecodingServices<T> = T extends Tool<
 > ? _Config["success"]["DecodingServices"] | _Config["failure"]["DecodingServices"]
   : never
 
+/**
+ * Extracts the services required to encode tool parameters.
+ *
+ * @category utility types
+ * @since 4.0.0
+ */
+export type ParametersEncodingServices<T> = T extends Tool<
+  infer _Name,
+  infer _Config,
+  infer _Requirements
+> ? _Config["parameters"]["EncodingServices"]
+  : never
+
 /**
  * Represents an `Tool` that has been implemented within the application.
  *
@@ -945,6 +941,20 @@ export interface Handler<Name extends string> {
   readonly handler: (params: any, ctx: any) => Effect.Effect<any, any>
 }
 
+/**
+ * The phase of handling a tool call that produced a failure.
+ *
+ * **Details**
+ *
+ * - `"parameters"`: the tool call arguments failed to decode
+ * - `"handler"`: the tool handler itself failed
+ * - `"result"`: the handler's output failed to validate or encode
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type FailureOrigin = "parameters" | "handler" | "result"
+
 /**
  * Represents the result of calling the handler for a particular `Tool`.
  *
@@ -966,6 +976,11 @@ export interface HandlerResult<Tool extends Any> {
    * Whether the result of executing the tool call handler was an error or not.
    */
   readonly isFailure: boolean
+  /**
+   * Which phase of handling the tool call failed. Present when `isFailure` is
+   * `true`.
+   */
+  readonly failureOrigin?: FailureOrigin
   /**
    * Whether this is a preliminary (intermediate) result or the final result.
    * Preliminary results represent progress updates; only the final result
@@ -1051,7 +1066,7 @@ const Proto = {
     return clone(this)
   },
   setParameters(this: Any, parametersSchema: Schema.Constraint) {
-    return clone(this, { parametersSchema })
+    return clone(this, { parametersSchema, jsonSchema: undefined })
   },
   setSuccess(this: Any, successSchema: Schema.Constraint) {
     return clone(this, { successSchema })
@@ -1996,6 +2011,33 @@ export const unsafeSecureJsonParse = (text: string): unknown => {
   }
 }
 
+/**
+ * Schema for denied or interrupted tool calls.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const ExecutionFailure = Schema.Struct({
+  type: Schema.Literals(["execution-denied", "execution-interrupted"]),
+  reason: Schema.String
+}).annotate({ identifier: "ToolExecutionFailure" })
+
+/**
+ * Returns the failure schema shared by `Toolkit` and `Response`.
+ *
+ * **Details**
+ *
+ * `AiError` comes first to restore error instances. The user schema precedes
+ * {@link ExecutionFailure} to preserve user fields.
+ *
+ * @category schemas
+ * @since 4.0.0
+ */
+export const failureResultSchema = <T extends Any>(
+  tool: T
+): Schema.Union<readonly [typeof AiError.AiError, T["failureSchema"], typeof ExecutionFailure]> =>
+  Schema.Union([AiError.AiError, tool.failureSchema, ExecutionFailure])
+
 /**
  * Type of the `EmptyParams` schema used for tools with no parameters.
  *
diff --git a/repos/effect/packages/effect/src/unstable/ai/Toolkit.ts b/repos/effect/packages/effect/src/unstable/ai/Toolkit.ts
index 39e01beb7..6cf9252b7 100644
--- a/repos/effect/packages/effect/src/unstable/ai/Toolkit.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/Toolkit.ts
@@ -9,7 +9,7 @@
  *
  * @since 4.0.0
  */
-import type * as Cause from "../../Cause.ts"
+import * as Cause from "../../Cause.ts"
 import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import * as Effectable from "../../Effectable.ts"
@@ -19,11 +19,13 @@ import * as InternalRecord from "../../internal/record.ts"
 import * as Layer from "../../Layer.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Queue from "../../Queue.ts"
+import * as Result from "../../Result.ts"
 import * as Schema from "../../Schema.ts"
+import type * as SchemaAST from "../../SchemaAST.ts"
 import type * as Scope from "../../Scope.ts"
 import * as Stream from "../../Stream.ts"
 import * as AiError from "./AiError.ts"
-import type * as Tool from "./Tool.ts"
+import * as Tool from "./Tool.ts"
 
 const TypeId = "~effect/ai/Toolkit" as const
 
@@ -212,7 +214,11 @@ export interface WithHandler<in out Tools extends Record<string, Tool.Any>> {
     /**
      * The unique identifier of the tool call.
      */
-    toolCallId?: string
+    toolCallId?: string,
+    /**
+     * Schema parse options for tool parameters.
+     */
+    options?: SchemaAST.ParseOptions
   ) => Effect.Effect<
     Stream.Stream<
       Tool.HandlerResult<Tools[Name]>,
@@ -232,6 +238,56 @@ export interface WithHandler<in out Tools extends Record<string, Tool.Any>> {
  */
 export type WithHandlerTools<T> = T extends WithHandler<infer Tools> ? Tools : never
 
+/**
+ * Cause annotation identifying the phase of a typed `Toolkit.handle` failure.
+ *
+ * **Details**
+ *
+ * Typed failures raised by `Toolkit.handle` carry one of these origins:
+ *
+ * - `"parameters"`: the tool call arguments failed to decode
+ * - `"handler"`: the tool handler itself failed
+ * - `"result"`: the handler's output failed to validate or encode
+ *
+ * Unannotated causes default to `"result"`, allowing consumers to treat them
+ * as internal failures.
+ *
+ * Returned failures expose the same origin in `Tool.HandlerResult.failureOrigin`.
+ *
+ * **Example** (Reading a handler failure's origin)
+ *
+ * ```ts import.meta.vitest
+ * import { Cause, Context, Effect, Schema, Stream } from "effect"
+ * import { Tool, Toolkit } from "effect/unstable/ai"
+ *
+ * const toolkit = Toolkit.make(Tool.make("Lookup", {
+ *   failure: Schema.String,
+ *   failureMode: "error"
+ * }))
+ *
+ * const program = Effect.gen(function*() {
+ *   const handlers = yield* toolkit
+ *   yield* handlers.handle("Lookup", {}).pipe(Effect.flatMap(Stream.runDrain))
+ * }).pipe(
+ *   Effect.catchCause((cause) =>
+ *     Effect.succeed(Context.get(Cause.annotations(cause), Toolkit.FailureOrigin))
+ *   ),
+ *   Effect.provide(toolkit.toLayer({ Lookup: () => Effect.fail("Not found") }))
+ * )
+ *
+ * await Effect.runPromise(program) // => "handler"
+ * ```
+ *
+ * @category services
+ * @since 4.0.0
+ */
+export const FailureOrigin = Context.Reference<Tool.FailureOrigin>("effect/ai/Toolkit/FailureOrigin", {
+  defaultValue: () => "result"
+})
+
+const failureCause = <E>(error: E, origin: Tool.FailureOrigin): Cause.Cause<E> =>
+  Cause.annotate(Cause.fail(error), Context.make(FailureOrigin, origin))
+
 const Proto = {
   ...Effectable.Prototype({
     label: "Toolkit",
@@ -241,28 +297,27 @@ const Proto = {
       const schemasCache = new WeakMap<any, {
         readonly context: Context.Context<never>
         readonly handler: Tool.Handler<any>["handler"]
-        readonly decodeParameters: (u: unknown) => Effect.Effect<unknown, Schema.SchemaError>
-        readonly decodeResult: (u: unknown) => Effect.Effect<unknown, Schema.SchemaError>
-        readonly encodeResult: (u: unknown) => Effect.Effect<unknown, Schema.SchemaError>
+        readonly decodeParameters: (
+          u: unknown,
+          options?: SchemaAST.ParseOptions
+        ) => Effect.Effect<unknown, Schema.SchemaError>
+        readonly encodeResult: (u: unknown, isFailure: boolean) => Effect.Effect<unknown, Schema.SchemaError>
       }>()
 
       const getSchemas = (tool: Tool.Any) => {
         let schemas = schemasCache.get(tool)
         if (Predicate.isUndefined(schemas)) {
           const handler = services.mapUnsafe.get(tool.id)! as Tool.Handler<any>
-          const resultSchema = tool.failureMode === "return"
-            ? Schema.Union([tool.successSchema, tool.failureSchema, AiError.AiError])
-            : tool.successSchema
           const decodeParameters = Schema.isSchema(tool.parametersSchema)
             ? Schema.decodeUnknownEffect(tool.parametersSchema) as any
             : (u: unknown) => Effect.succeed(u)
-          const decodeResult = Schema.decodeUnknownEffect(resultSchema) as any
-          const encodeResult = Schema.encodeUnknownEffect(resultSchema) as any
+          const encodeSuccess = Schema.encodeUnknownEffect(tool.successSchema) as any
+          const encodeFailure = Schema.encodeUnknownEffect(Tool.failureResultSchema(tool)) as any
+          const encodeResult = (u: unknown, isFailure: boolean) => isFailure ? encodeFailure(u) : encodeSuccess(u)
           schemas = {
             context: handler.context,
             handler: handler.handler,
             decodeParameters,
-            decodeResult,
             encodeResult
           }
           schemasCache.set(tool, schemas)
@@ -270,7 +325,12 @@ const Proto = {
         return schemas
       }
 
-      const handle = Effect.fnUntraced(function*(name: string, params: unknown, toolCallId?: string) {
+      const handle = Effect.fnUntraced(function*(
+        name: string,
+        params: unknown,
+        toolCallId?: string,
+        options?: SchemaAST.ParseOptions
+      ) {
         const tool = Object.hasOwn(tools, name) ? tools[name] : undefined
 
         yield* Effect.annotateCurrentSpan({
@@ -278,7 +338,6 @@ const Proto = {
           parameters: params
         })
 
-        // If the tool is not found, return an error
         if (Predicate.isUndefined(tool)) {
           return yield* AiError.make({
             module: "Toolkit",
@@ -290,25 +349,48 @@ const Proto = {
           })
         }
 
-        // Fetch cached schemas / handlers for the tool
         const schemas = getSchemas(tool)
 
-        // Decode the tool call parameters which will be passed to the handler
-        const decodedParams = yield* schemas.decodeParameters(params).pipe(
-          Effect.mapError((cause) =>
-            AiError.make({
-              module: "Toolkit",
-              method: `${name}.handle`,
-              reason: new AiError.ToolParameterValidationError({
-                toolName: name,
-                toolParams: params,
-                description: cause.message
+        const encodeResult = (result: any, isFailure: boolean) =>
+          schemas.encodeResult(result, isFailure).pipe(
+            Effect.mapError((cause) =>
+              AiError.make({
+                module: "Toolkit",
+                method: `${name}.handle`,
+                reason: new AiError.ToolResultEncodingError({
+                  toolName: name,
+                  toolResult: result,
+                  description: cause.message
+                })
               })
-            })
+            )
           )
-        )
 
-        // Setup the handler context
+        const decodedParamsResult = yield* Effect.result(schemas.decodeParameters(params, options))
+        if (Result.isFailure(decodedParamsResult)) {
+          const error = AiError.make({
+            module: "Toolkit",
+            method: `${name}.handle`,
+            reason: new AiError.ToolParameterValidationError({
+              toolName: name,
+              description: decodedParamsResult.failure.message
+            })
+          })
+          if (tool.failureMode === "error") {
+            return yield* Effect.failCause(failureCause(error, "parameters"))
+          }
+          return Stream.fromEffect(
+            Effect.map(encodeResult(error, true), (encodedResult) => ({
+              result: error,
+              isFailure: true,
+              failureOrigin: "parameters" as const,
+              preliminary: false,
+              encodedResult
+            }))
+          ) satisfies Stream.Stream<Tool.HandlerResult<any>, any>
+        }
+        const decodedParams = decodedParamsResult.success
+
         const queue = yield* Queue.make<{
           readonly result: any
           readonly isFailure: boolean
@@ -334,23 +416,7 @@ const Proto = {
           Effect.forkChild
         )
 
-        const encodeResult = (result: any) =>
-          schemas.encodeResult(result).pipe(
-            Effect.mapError((cause) =>
-              AiError.make({
-                module: "Toolkit",
-                method: `${name}.handle`,
-                reason: new AiError.ToolResultEncodingError({
-                  toolName: name,
-                  toolResult: result,
-                  description: cause.message
-                })
-              })
-            )
-          )
-
         const normalizeError = (error: unknown) => {
-          // Schema errors indicate handler returned invalid data
           const normalizedError = Schema.isSchemaError(error)
             ? AiError.make({
               module: "Toolkit",
@@ -371,16 +437,15 @@ const Proto = {
         }
 
         return Stream.fromQueue(queue).pipe(
-          // If the tool handler failed, check the tool's failure mode to
-          // determine how the result should be returned to the end user
           Stream.catch((error) => {
             const normalizedError = normalizeError(error)
+            const failureOrigin: Tool.FailureOrigin = Schema.isSchemaError(error) ? "result" : "handler"
             return tool.failureMode === "error"
-              ? Stream.fail(normalizedError)
-              : Stream.succeed({ result: normalizedError, isFailure: true, preliminary: false })
+              ? Stream.failCause(failureCause(normalizedError, failureOrigin))
+              : Stream.succeed({ result: normalizedError, isFailure: true, failureOrigin, preliminary: false })
           }),
           Stream.mapEffect(Effect.fnUntraced(function*(output) {
-            const encodedResult = yield* encodeResult(output.result)
+            const encodedResult = yield* encodeResult(output.result, output.isFailure)
             return { ...output, encodedResult }
           })),
           Stream.onEnd(Fiber.interrupt(fiber))
diff --git a/repos/effect/packages/effect/src/unstable/ai/index.ts b/repos/effect/packages/effect/src/unstable/ai/index.ts
index 0c99d8153..adaa3f2dc 100644
--- a/repos/effect/packages/effect/src/unstable/ai/index.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/index.ts
@@ -19,6 +19,16 @@ export * as AnthropicStructuredOutput from "./AnthropicStructuredOutput.ts"
  */
 export * as Chat from "./Chat.ts"
 
+/**
+ * @since 4.0.0
+ */
+export * as Decision from "./Decision.ts"
+
+/**
+ * @since 4.0.0
+ */
+export * as DecisionModel from "./DecisionModel.ts"
+
 /**
  * @since 4.0.0
  */
diff --git a/repos/effect/packages/effect/src/unstable/ai/internal/mcpCore.ts b/repos/effect/packages/effect/src/unstable/ai/internal/mcpCore.ts
index 571efbfa9..c863ce8cb 100644
--- a/repos/effect/packages/effect/src/unstable/ai/internal/mcpCore.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/internal/mcpCore.ts
@@ -11,20 +11,43 @@ import type * as Schema from "../../../Schema.ts"
 import type * as McpProtocol from "../McpProtocol.ts"
 import * as McpSchema from "../McpSchema.ts"
 
+/** @internal */
+export interface InputRequiredFields {
+  readonly inputRequests?: Readonly<Record<string, McpSchema.McpInputRequest>> | undefined
+  readonly requestState?: string | undefined
+}
+
+/** @internal */
+export type OperationOutcome<A> = Data.TaggedEnum<{
+  Complete: { readonly value: A }
+  InputRequired: InputRequiredFields
+}>
+
+/** @internal */
+export const OperationOutcome = {
+  Complete: <A>(value: A): OperationOutcome<A> => ({ _tag: "Complete", value }),
+  InputRequired: (fields: InputRequiredFields): OperationOutcome<never> => ({
+    _tag: "InputRequired",
+    ...fields
+  })
+}
+
 /** @internal */
 export type CanonicalRequestMetadata = NonNullable<
   typeof McpSchema.Initialize.payloadSchema.Type["_meta"]
 >
 
 /** @internal */
-export interface NegotiatedProtocolProfile<
-  out Version extends string = McpProtocol.ProtocolVersion
-> {
+export interface NegotiatedProtocolProfile<out Version extends string = McpProtocol.StatefulProtocolVersion> {
   // Core decisions receive negotiated facts rather than dated wire requests.
   readonly protocolVersion: Version
   readonly clientCapabilities: McpSchema.ClientCapabilities
-  readonly clientInfo: McpSchema.Implementation
-  readonly requestMetadata?: CanonicalRequestMetadata | undefined
+  readonly clientInfo: Version extends McpProtocol.StatefulProtocolVersion ? McpSchema.Implementation
+    : McpSchema.Implementation | undefined
+  readonly requestMetadata?:
+    | (Version extends McpProtocol.StatefulProtocolVersion ? CanonicalRequestMetadata
+      : CanonicalRequestMetadata | Schema.JsonObject)
+    | undefined
 }
 
 // NOTE: Capabilities remain a normalized core model because dated revisions
@@ -55,8 +78,9 @@ export interface CanonicalInitializeResult {
 /** @internal */
 export interface McpInvocation {
   readonly clientId: number
-  readonly protocol: NegotiatedProtocolProfile
-  readonly requestContext: McpSchema.McpServerClient["Service"]
+  readonly protocol: NegotiatedProtocolProfile<string>
+  readonly requestContext: McpSchema.McpRequestContext["Service"]
+  readonly serverClient?: McpSchema.McpServerClient["Service"] | undefined
 }
 
 // NOTE: McpInvocation is runtime context, not a wire DTO. It combines the
@@ -81,18 +105,17 @@ export class InvalidToolInput extends Data.TaggedError("InvalidToolInput")<{
 }> {}
 
 /** @internal */
-export class ToolExecutionError extends Data.TaggedError("ToolExecutionError")<{
+export class InvalidToolContinuation extends Data.TaggedError("InvalidToolContinuation")<{
   readonly name: string
   readonly message: string
 }> {}
 
 /** @internal */
-export class ToolResultProjectionError extends Data.TaggedError("ToolResultProjectionError")<{
+export class ToolExecutionError extends Data.TaggedError("ToolExecutionError")<{
   readonly name: string
   readonly message: string
 }> {}
 
-/** @internal */
 /** @internal */
 export class UnsupportedByProtocol extends Data.TaggedError("UnsupportedByProtocol")<{
   readonly protocolVersion: McpProtocol.ProtocolVersion
@@ -103,21 +126,21 @@ export class UnsupportedByProtocol extends Data.TaggedError("UnsupportedByProtoc
 export type ToolError =
   | ToolNotFound
   | InvalidToolInput
+  | InvalidToolContinuation
   | ToolExecutionError
-  | ToolResultProjectionError
 
 /** @internal */
 export interface ToolRegistration {
   // The canonical Tool copy normalizes its top-level title from
   // `tool.title ?? tool.annotations?.title` at the public boundary.
   readonly descriptor: McpSchema.Tool
-  readonly isVisible: (profile: NegotiatedProtocolProfile) => boolean
+  readonly isVisible: (profile: NegotiatedProtocolProfile<string>) => boolean
   readonly handle: (
     call: typeof McpSchema.CallTool.payloadSchema.Type,
     invocation: McpInvocation
   ) => Effect.Effect<
-    McpSchema.CallToolResult,
-    InvalidToolInput | ToolExecutionError | ToolResultProjectionError,
+    OperationOutcome<McpSchema.CallToolResult>,
+    InvalidToolInput | InvalidToolContinuation | ToolExecutionError,
     never
   >
 }
@@ -128,18 +151,18 @@ export interface Tools {
     registration: ToolRegistration
   ) => Effect.Effect<void>
   readonly list: (
-    profile: NegotiatedProtocolProfile
+    profile: NegotiatedProtocolProfile<string>
   ) => Effect.Effect<ReadonlyArray<McpSchema.Tool>>
   readonly call: (
     call: typeof McpSchema.CallTool.payloadSchema.Type,
     invocation: McpInvocation
-  ) => Effect.Effect<McpSchema.CallToolResult, ToolError>
+  ) => Effect.Effect<OperationOutcome<McpSchema.CallToolResult>, ToolError>
 }
 
 /** @internal */
 export interface ResourceRegistration {
   readonly descriptor: McpSchema.Resource
-  readonly isVisible: (profile: NegotiatedProtocolProfile) => boolean
+  readonly isVisible: (profile: NegotiatedProtocolProfile<string>) => boolean
   readonly read: (
     invocation: McpInvocation
   ) => Effect.Effect<McpSchema.ReadResourceResult, McpSchema.InternalError>
@@ -148,7 +171,7 @@ export interface ResourceRegistration {
 /** @internal */
 export interface ResourceTemplateRegistration {
   readonly descriptor: McpSchema.ResourceTemplate
-  readonly isVisible: (profile: NegotiatedProtocolProfile) => boolean
+  readonly isVisible: (profile: NegotiatedProtocolProfile<string>) => boolean
   readonly match: (uri: string) => ReadonlyArray<string> | undefined
   readonly read: (
     uri: string,
@@ -162,10 +185,10 @@ export interface Resources {
   readonly register: (registration: ResourceRegistration) => Effect.Effect<void>
   readonly registerTemplate: (registration: ResourceTemplateRegistration) => Effect.Effect<void>
   readonly list: (
-    profile: NegotiatedProtocolProfile
+    profile: NegotiatedProtocolProfile<string>
   ) => Effect.Effect<ReadonlyArray<McpSchema.Resource>>
   readonly listTemplates: (
-    profile: NegotiatedProtocolProfile
+    profile: NegotiatedProtocolProfile<string>
   ) => Effect.Effect<ReadonlyArray<McpSchema.ResourceTemplate>>
   readonly read: (
     uri: string,
@@ -184,25 +207,25 @@ export class PromptNotFound extends Data.TaggedError("PromptNotFound")<{
 /** @internal */
 export interface PromptRegistration {
   readonly descriptor: McpSchema.Prompt
-  readonly isVisible: (profile: NegotiatedProtocolProfile) => boolean
+  readonly isVisible: (profile: NegotiatedProtocolProfile<string>) => boolean
   readonly get: (
     args: Readonly<Record<string, string>>,
     invocation: McpInvocation
-  ) => Effect.Effect<McpSchema.GetPromptResult, McpSchema.InvalidParams | McpSchema.InternalError>
+  ) => Effect.Effect<OperationOutcome<McpSchema.GetPromptResult>, McpSchema.InvalidParams | McpSchema.InternalError>
 }
 
 /** @internal */
 export interface Prompts {
   readonly register: (registration: PromptRegistration) => Effect.Effect<void>
   readonly list: (
-    profile: NegotiatedProtocolProfile
+    profile: NegotiatedProtocolProfile<string>
   ) => Effect.Effect<ReadonlyArray<McpSchema.Prompt>>
   readonly get: (
     name: string,
     args: Readonly<Record<string, string>>,
     invocation: McpInvocation
   ) => Effect.Effect<
-    McpSchema.GetPromptResult,
+    OperationOutcome<McpSchema.GetPromptResult>,
     PromptNotFound | McpSchema.InvalidParams | McpSchema.InternalError
   >
 }
@@ -342,7 +365,7 @@ export const make: Effect.Effect<McpCore> = Effect.sync(() => {
         return descriptors
       }),
     call: (call, invocation) =>
-      Effect.suspend((): Effect.Effect<McpSchema.CallToolResult, ToolError> => {
+      Effect.suspend((): Effect.Effect<OperationOutcome<McpSchema.CallToolResult>, ToolError> => {
         const registration = registrations.get(call.name)
         if (registration === undefined) {
           return new ToolNotFound({ name: call.name })
diff --git a/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol.ts b/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol.ts
index 7a88b015a..dc0aeeb91 100644
--- a/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol.ts
@@ -1,6 +1,10 @@
 import * as Data from "../../../Data.ts"
 import * as Effect from "../../../Effect.ts"
+import * as Encoding from "../../../Encoding.ts"
+import type * as LogLevel from "../../../LogLevel.ts"
 import * as Match from "../../../Match.ts"
+import * as Predicate from "../../../Predicate.ts"
+import type * as PubSub from "../../../PubSub.ts"
 import * as Result from "../../../Result.ts"
 import * as Schema from "../../../Schema.ts"
 import type * as Scope from "../../../Scope.ts"
@@ -9,10 +13,52 @@ import type * as Rpc from "../../rpc/Rpc.ts"
 import * as RpcClient from "../../rpc/RpcClient.ts"
 import type { RpcClientError } from "../../rpc/RpcClientError.ts"
 import type * as RpcGroup from "../../rpc/RpcGroup.ts"
+import type * as RpcMessage from "../../rpc/RpcMessage.ts"
 import type * as PublicMcpProtocol from "../McpProtocol.ts"
 import * as PublicMcpSchema from "../McpSchema.ts"
 import * as McpCore from "./mcpCore.ts"
 
+const LEGACY_RESOURCE_NOT_FOUND_ERROR_CODE = -32002
+const BASE64_SENTINEL_PREFIX = "=?base64?"
+const BASE64_SENTINEL_SUFFIX = "?="
+// A leading U+FEFF belongs to the header value and must survive comparison with the JSON body.
+const routingHeaderDecoder = new TextDecoder("utf-8", { fatal: true, ignoreBOM: true })
+
+/** @internal */
+export const mcpLogLevels: Readonly<
+  Record<
+    PublicMcpSchema.LoggingLevel,
+    { readonly effect: LogLevel.LogLevel; readonly order: number }
+  >
+> = {
+  debug: { effect: "Debug", order: 0 },
+  info: { effect: "Info", order: 1 },
+  notice: { effect: "Info", order: 2 },
+  warning: { effect: "Warn", order: 3 },
+  error: { effect: "Error", order: 4 },
+  critical: { effect: "Fatal", order: 5 },
+  alert: { effect: "Fatal", order: 6 },
+  emergency: { effect: "Fatal", order: 7 }
+}
+
+/** @internal */
+export const decodeRoutingHeader = (value: string): string | undefined => {
+  const startsWithSentinel = value.startsWith(BASE64_SENTINEL_PREFIX)
+  const endsWithSentinel = value.endsWith(BASE64_SENTINEL_SUFFIX)
+  if (!startsWithSentinel || !endsWithSentinel) {
+    return /^[\t\x20-\x7e]*$/.test(value) ? value : undefined
+  }
+  const decoded = Encoding.decodeBase64(
+    value.slice(BASE64_SENTINEL_PREFIX.length, -BASE64_SENTINEL_SUFFIX.length)
+  )
+  if (Result.isFailure(decoded)) return undefined
+  try {
+    return routingHeaderDecoder.decode(decoded.success)
+  } catch {
+    return undefined
+  }
+}
+
 /** @internal */
 export const profileFromClient = (
   request: PublicMcpSchema.McpServerClient["Service"]
@@ -29,9 +75,54 @@ export const invocationFromClient = (
 ): McpCore.McpInvocation => ({
   clientId: request.clientId,
   protocol: profileFromClient(request),
+  requestContext: PublicMcpSchema.McpRequestContext.of({
+    clientId: request.clientId,
+    protocolVersion: request.protocolVersion,
+    clientCapabilities: request.clientCapabilities,
+    clientInfo: request.clientInfo,
+    requestMetadata: request.requestMetadata
+  }),
+  serverClient: request
+})
+
+/** @internal */
+export const invocationFromRequestContext = (
+  request: PublicMcpSchema.McpRequestContext["Service"]
+): McpCore.McpInvocation => ({
+  clientId: request.clientId,
+  protocol: {
+    protocolVersion: request.protocolVersion,
+    clientCapabilities: request.clientCapabilities,
+    clientInfo: request.clientInfo,
+    requestMetadata: request.requestMetadata
+  },
   requestContext: request
 })
 
+/** @internal */
+export const requireCompleteOperation = <A>(
+  protocolVersion: PublicMcpProtocol.ProtocolVersion,
+  outcome: McpCore.OperationOutcome<A>
+): Effect.Effect<A, McpCore.UnsupportedByProtocol> =>
+  outcome._tag === "Complete"
+    ? Effect.succeed(outcome.value)
+    : Effect.fail(new McpCore.UnsupportedByProtocol({ protocolVersion, feature: "Client input" }))
+
+const isSamplingToolContent = (content: unknown): boolean =>
+  Predicate.isReadonlyObject(content) && (content.type === "tool_use" || content.type === "tool_result")
+
+/** @internal */
+export const samplingRequestRequiresTools = (request: unknown): boolean => {
+  if (!Predicate.isReadonlyObject(request)) return false
+  if (request.tools !== undefined || request.toolChoice !== undefined) return true
+  if (!Array.isArray(request.messages)) return false
+  return request.messages.some((message) => {
+    if (!Predicate.isReadonlyObject(message)) return false
+    const content = message.content
+    return Array.isArray(content) ? content.some(isSamplingToolContent) : isSamplingToolContent(content)
+  })
+}
+
 // NOTE: Keep the two codec assertions below as the single documented
 // existential-schema boundary. Rpc.AnyWithProps intentionally erases each
 // request's payload type, while the runtime schema still performs decoding and
@@ -75,41 +166,56 @@ export class ProtocolError extends Data.TaggedError("ProtocolError")<{
       ),
       Match.tags({
         InvalidToolInput: (error) => error.message,
-        ToolExecutionError: (error) => error.message,
-        ToolResultProjectionError: (error) => error.message
+        InvalidToolContinuation: (error) => error.message,
+        ToolExecutionError: (error) => error.message
       }),
       Match.exhaustive
     )
-    return new ProtocolError({ code: -32602, message })
+    return new ProtocolError({ code: PublicMcpSchema.INVALID_PARAMS_ERROR_CODE, message })
   }
 
   static fromFeature(error: unknown): ProtocolError {
-    if (error instanceof McpCore.PromptNotFound) {
-      return new ProtocolError({ code: -32602, message: `Prompt '${error.name}' not found` })
-    }
-    if (error instanceof McpCore.ResourceNotFound) {
-      return new ProtocolError({ code: -32002, message: `Resource '${error.uri}' not found` })
-    }
-    const decoded = Schema.decodeUnknownResult(ProtocolErrorFields)(error)
-    if (Result.isSuccess(decoded)) {
-      return new ProtocolError(decoded.success)
+    if (Predicate.hasProperty(error, "_tag")) {
+      if (error._tag === "PromptNotFound" && Predicate.hasProperty(error, "name") && Predicate.isString(error.name)) {
+        return new ProtocolError({
+          code: PublicMcpSchema.INVALID_PARAMS_ERROR_CODE,
+          message: `Prompt '${error.name}' not found`
+        })
+      }
+      if (error._tag === "ResourceNotFound" && Predicate.hasProperty(error, "uri") && Predicate.isString(error.uri)) {
+        return new ProtocolError({
+          code: LEGACY_RESOURCE_NOT_FOUND_ERROR_CODE,
+          message: `Resource '${error.uri}' not found`
+        })
+      }
     }
-    return new ProtocolError({ code: -32603, message: "MCP feature handler failed" })
+    const decoded = decodeProtocolErrorFields(error)
+    return Result.isSuccess(decoded)
+      ? new ProtocolError(decoded.success)
+      : new ProtocolError({
+        code: PublicMcpSchema.INTERNAL_ERROR_CODE,
+        message: "MCP feature handler failed"
+      })
   }
 }
 
 const ProtocolErrorFields = Schema.Struct({
-  code: Schema.Number,
+  code: Schema.Finite,
   message: Schema.String,
   data: Schema.optionalKey(Schema.Unknown)
 })
 
+const decodeProtocolErrorFields = Schema.decodeUnknownResult(ProtocolErrorFields)
+
+const isReverseOperationUnsupported = (cause: unknown): cause is PublicMcpSchema.McpReverseOperationUnsupported =>
+  Predicate.isTagged(cause, "McpReverseOperationUnsupported")
+
 /** @internal */
 export const reverseError = (
   operation: PublicMcpSchema.McpReverseOperationError["operation"]
 ) =>
 (cause: unknown) =>
-  cause instanceof PublicMcpSchema.McpReverseOperationUnsupported
+  isReverseOperationUnsupported(cause)
     ? cause
     : new PublicMcpSchema.McpReverseOperationError({ operation, cause })
 
@@ -205,6 +311,7 @@ export const makeNotificationProjector = Effect.fn(function*(
 
 /** @internal */
 export interface HandlerInstallationTarget {
+  readonly context: HandlerInstallationContext
   readonly install: <
     Rpcs extends Rpc.Any,
     Handlers extends RpcGroup.HandlersFrom<Rpcs>
@@ -217,9 +324,76 @@ export interface HandlerInstallationTarget {
   ) => Effect.Effect<void, never, RpcGroup.HandlersServices<Rpcs, Handlers>>
 }
 
+/** @internal */
+export interface HandlerInstallationContext {
+  readonly subscribeServerNotifications: Effect.Effect<
+    PubSub.Subscription<CanonicalServerNotification>,
+    never,
+    Scope.Scope
+  >
+  readonly sendNotification?: (
+    protocolVersion: string,
+    clientId: number,
+    notification: PublicMcpProtocol.ProjectedNotification
+  ) => Effect.Effect<void>
+  readonly terminateSubscription?: (
+    protocolVersion: string,
+    clientId: number,
+    requestId: RpcMessage.RequestId,
+    reason: string
+  ) => Effect.Effect<void>
+  readonly markSubscriptionCancelled?: (
+    clientId: number,
+    requestId: RpcMessage.RequestId
+  ) => Effect.Effect<void>
+  readonly supportedVersions: ReadonlyArray<string>
+  readonly serverInfo: {
+    readonly name: string
+    readonly version: string
+    readonly instructions?: string | undefined
+    readonly description?: string | undefined
+    readonly websiteUrl?: string | undefined
+    readonly icons?: ReadonlyArray<PublicMcpSchema.Icon> | undefined
+    readonly extensions?: PublicMcpSchema.ServerCapabilities["extensions"] | undefined
+  }
+  readonly registrationPresence: Effect.Effect<{
+    readonly tools: boolean
+    readonly resources: boolean
+    readonly prompts: boolean
+  }>
+}
+
+/** @internal */
+export interface CanonicalServerNotification {
+  readonly notification: SubscriptionServerNotification
+  readonly targetClientId?: number | undefined
+}
+
+/** @internal */
+export type SubscriptionServerNotification = Extract<
+  McpCore.ServerNotification,
+  { readonly _tag: "ToolsChanged" | "PromptsChanged" | "ResourcesChanged" | "ResourceUpdated" }
+>
+
+/** @internal */
+export const isSubscriptionServerNotification = (
+  notification: McpCore.ServerNotification
+): notification is SubscriptionServerNotification => {
+  switch (notification._tag) {
+    case "ToolsChanged":
+    case "PromptsChanged":
+    case "ResourcesChanged":
+    case "ResourceUpdated":
+      return true
+    default:
+      return false
+  }
+}
+
 /** @internal */
 export interface ProtocolAdapter<
   out Version extends string = string,
+  out Runtime extends PublicMcpProtocol.RuntimeDescriptor = PublicMcpProtocol.RuntimeDescriptor,
   ClientRpcs extends Rpc.Any = Rpc.Any,
   ClientNotificationRpcs extends ClientRpcs = ClientRpcs,
   ServerRequestRpcs extends Rpc.Any = Rpc.Any,
@@ -230,10 +404,7 @@ export interface ProtocolAdapter<
   // Each adapter owns its dated RPC vocabulary, transport policy, handler
   // projection, and wire behavior.
   readonly protocolVersion: Version
-  readonly transport: {
-    readonly acceptsJsonRpcBatches: boolean
-    readonly requiresVersionHeader: boolean
-  }
+  readonly runtime: Runtime
   readonly clientRpcs: RpcGroup.RpcGroup<ClientRpcs>
   readonly clientNotificationRpcs: RpcGroup.RpcGroup<ClientNotificationRpcs>
   readonly serverRequestRpcs: RpcGroup.RpcGroup<ServerRequestRpcs>
@@ -242,7 +413,7 @@ export interface ProtocolAdapter<
   readonly handlerRpcs?: RpcGroup.RpcGroup<HandlerRpcs> | undefined
   readonly installHandlers: (
     core: McpCore.McpCore,
-    lifecycle: LifecycleRuntime,
+    lifecycle: LifecycleRuntime | undefined,
     target: HandlerInstallationTarget
   ) => Effect.Effect<void, never, HandlerRequirements>
   readonly makeReverseClient: (
@@ -260,9 +431,13 @@ export interface ProtocolAdapter<
   ) => Effect.Effect<McpCore.Cancellation, unknown>
 }
 
+type HandlerLifecycle<Runtime extends PublicMcpProtocol.RuntimeDescriptor> = Runtime extends
+  PublicMcpProtocol.StatefulRuntimeDescriptor ? LifecycleRuntime : undefined
+
 /** @internal */
 export const make = <
   const Version extends string,
+  const Runtime extends PublicMcpProtocol.RuntimeDescriptor,
   ClientRpcs extends Rpc.Any,
   ClientNotificationRpcs extends ClientRpcs,
   ServerRequestRpcs extends Rpc.Any,
@@ -271,10 +446,7 @@ export const make = <
   Handlers extends RpcGroup.HandlersFrom<HandlerRpcs> = RpcGroup.HandlersFrom<HandlerRpcs>
 >(options: {
   readonly protocolVersion: Version
-  readonly transport: {
-    readonly acceptsJsonRpcBatches: boolean
-    readonly requiresVersionHeader: boolean
-  }
+  readonly runtime: Runtime
   readonly clientRpcs: RpcGroup.RpcGroup<ClientRpcs>
   readonly clientNotificationRpcs: RpcGroup.RpcGroup<ClientNotificationRpcs>
   readonly serverRequestRpcs: RpcGroup.RpcGroup<ServerRequestRpcs>
@@ -283,7 +455,8 @@ export const make = <
   readonly makeHandlers?:
     | ((
       core: McpCore.McpCore,
-      lifecycle: LifecycleRuntime
+      lifecycle: HandlerLifecycle<Runtime>,
+      context: HandlerInstallationContext
     ) => Handlers)
     | undefined
   readonly toReverseClient: (
@@ -298,6 +471,7 @@ export const make = <
   ) => Effect.Effect<McpCore.Cancellation, unknown>
 }): ProtocolAdapter<
   Version,
+  Runtime,
   ClientRpcs,
   ClientNotificationRpcs,
   ServerRequestRpcs,
@@ -321,12 +495,24 @@ export const make = <
 
   const installHandlers = (
     core: McpCore.McpCore,
-    lifecycle: LifecycleRuntime,
+    lifecycle: LifecycleRuntime | undefined,
     target: HandlerInstallationTarget
   ): Effect.Effect<void, never, RpcGroup.HandlersServices<HandlerRpcs, Handlers>> =>
     options.handlerRpcs === undefined || options.makeHandlers === undefined
       ? Effect.void
-      : target.install(options, options.handlerRpcs, options.makeHandlers(core, lifecycle))
+      : lifecycle === undefined && options.runtime._tag === "Stateful"
+      ? Effect.die("MCP sessionful handler installation requires a lifecycle runtime")
+      : target.install(
+        options,
+        options.handlerRpcs,
+        options.makeHandlers(
+          core,
+          // TypeScript cannot narrow HandlerLifecycle<Runtime> from the generic runtime tag; the preceding guard
+          // enforces the stateful lifecycle invariant.
+          (options.runtime._tag === "Stateful" ? lifecycle : undefined) as HandlerLifecycle<Runtime>,
+          target.context
+        )
+      )
 
   const makeReverseClient = (
     profile: McpCore.NegotiatedProtocolProfile
diff --git a/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2024_11_05.ts b/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2024_11_05.ts
index a0224ff4a..e3d85c9bd 100644
--- a/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2024_11_05.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2024_11_05.ts
@@ -6,6 +6,7 @@ import * as Schema from "../../../../Schema.ts"
 import * as PublicMcpSchema from "../../McpSchema.ts"
 import * as McpCore from "../mcpCore.ts"
 import * as McpProtocol from "../mcpProtocol.ts"
+import * as McpRuntime from "../mcpRuntime.ts"
 import * as McpSchema from "../mcpSchema/v2024_11_05.ts"
 
 const ClientRequestRpcs = McpSchema.ClientRequestRpcs.middleware(
@@ -55,7 +56,7 @@ const projectCapabilities = (
   tools: capabilities.tools
 })
 
-const projectContent = Effect.fnUntraced(function*(content: typeof PublicMcpSchema.ContentBlock.Type) {
+const projectContent = Effect.fnUntraced(function*(content: PublicMcpSchema.ContentBlock) {
   const projected = Match.value(content).pipe(
     Match.when({ type: "text" }, (content) => ({
       ...content,
@@ -106,10 +107,10 @@ const projectContent = Effect.fnUntraced(function*(content: typeof PublicMcpSche
 /** @internal */
 export const protocol = McpProtocol.make({
   protocolVersion: McpSchema.protocolVersion,
-  transport: {
-    acceptsJsonRpcBatches: false,
-    requiresVersionHeader: false
-  },
+  runtime: McpRuntime.stateful({
+    jsonRpc: { acceptsBatches: false },
+    http: { requiresVersionHeader: false }
+  }),
   clientRpcs: ClientRpcs,
   clientNotificationRpcs: McpSchema.ClientNotificationRpcs,
   serverRequestRpcs: McpSchema.ServerRequestRpcs,
@@ -200,9 +201,18 @@ export const protocol = McpProtocol.make({
           ),
       "prompts/get": Effect.fnUntraced(function*({ arguments: args, name }) {
         const request = yield* PublicMcpSchema.McpServerClient
-        const result = yield* core.prompts.get(name, args ?? {}, McpProtocol.invocationFromClient(request)).pipe(
+        const outcome = yield* core.prompts.get(name, args ?? {}, McpProtocol.invocationFromClient(request)).pipe(
           Effect.mapError(McpProtocol.ProtocolError.fromFeature)
         )
+        if (outcome._tag === "InputRequired") {
+          return yield* McpProtocol.ProtocolError.fromFeature(
+            new McpCore.UnsupportedByProtocol({
+              protocolVersion: McpSchema.protocolVersion,
+              feature: "prompt input requirements"
+            })
+          )
+        }
+        const result = outcome.value
         const messages = yield* Effect.forEach(result.messages, (message) =>
           projectContent(message.content).pipe(
             Effect.map((content) => ({ role: message.role, content })),
@@ -254,6 +264,7 @@ export const protocol = McpProtocol.make({
           { ...call, arguments: call.arguments ?? {} },
           McpProtocol.invocationFromClient(request)
         ).pipe(
+          Effect.flatMap((outcome) => McpProtocol.requireCompleteOperation(McpSchema.protocolVersion, outcome)),
           Effect.mapError(McpProtocol.ProtocolError.fromTool)
         )
         const content = yield* Effect.forEach(result.content, projectContent).pipe(
diff --git a/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2025_03_26.ts b/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2025_03_26.ts
index 66dd94ecd..c5135d360 100644
--- a/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2025_03_26.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2025_03_26.ts
@@ -6,6 +6,7 @@ import * as Schema from "../../../../Schema.ts"
 import * as PublicMcpSchema from "../../McpSchema.ts"
 import * as McpCore from "../mcpCore.ts"
 import * as McpProtocol from "../mcpProtocol.ts"
+import * as McpRuntime from "../mcpRuntime.ts"
 import * as McpSchema from "../mcpSchema/v2025_03_26.ts"
 
 const ClientRequestRpcs = McpSchema.ClientRequestRpcs.middleware(
@@ -45,7 +46,7 @@ const requireCapability = (
     ? Effect.void
     : Effect.fail(unsupported(operation, `Client did not advertise the ${capability} capability`))
 
-const projectContent = Effect.fnUntraced(function*(content: typeof PublicMcpSchema.ContentBlock.Type) {
+const projectContent = Effect.fnUntraced(function*(content: PublicMcpSchema.ContentBlock) {
   const projected = Match.value(content).pipe(
     Match.when({ type: "text" }, (content) => ({
       ...content,
@@ -110,10 +111,10 @@ const projectResourceContents = (
 /** @internal */
 export const protocol = McpProtocol.make({
   protocolVersion: McpSchema.protocolVersion,
-  transport: {
-    acceptsJsonRpcBatches: true,
-    requiresVersionHeader: false
-  },
+  runtime: McpRuntime.stateful({
+    jsonRpc: { acceptsBatches: true },
+    http: { requiresVersionHeader: false }
+  }),
   clientRpcs: ClientRpcs,
   clientNotificationRpcs: McpSchema.ClientNotificationRpcs,
   serverRequestRpcs: McpSchema.ServerRequestRpcs,
@@ -223,9 +224,18 @@ export const protocol = McpProtocol.make({
           ),
       "prompts/get": Effect.fnUntraced(function*({ arguments: args, name }) {
         const request = yield* PublicMcpSchema.McpServerClient
-        const result = yield* core.prompts.get(name, args ?? {}, McpProtocol.invocationFromClient(request)).pipe(
+        const outcome = yield* core.prompts.get(name, args ?? {}, McpProtocol.invocationFromClient(request)).pipe(
           Effect.mapError(McpProtocol.ProtocolError.fromFeature)
         )
+        if (outcome._tag === "InputRequired") {
+          return yield* McpProtocol.ProtocolError.fromFeature(
+            new McpCore.UnsupportedByProtocol({
+              protocolVersion: McpSchema.protocolVersion,
+              feature: "prompt input requirements"
+            })
+          )
+        }
+        const result = outcome.value
         const messages = yield* Effect.forEach(result.messages, (message) =>
           projectContent(message.content).pipe(
             Effect.map((content) => ({ role: message.role, content })),
@@ -280,6 +290,7 @@ export const protocol = McpProtocol.make({
           { ...call, arguments: call.arguments ?? {} },
           McpProtocol.invocationFromClient(request)
         ).pipe(
+          Effect.flatMap((outcome) => McpProtocol.requireCompleteOperation(McpSchema.protocolVersion, outcome)),
           Effect.mapError(McpProtocol.ProtocolError.fromTool)
         )
         const content = yield* Effect.forEach(result.content, projectContent).pipe(
diff --git a/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2025_06_18.ts b/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2025_06_18.ts
index 1420b635f..526d94f43 100644
--- a/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2025_06_18.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2025_06_18.ts
@@ -1,11 +1,13 @@
 import * as Effect from "../../../../Effect.ts"
 import * as Encoding from "../../../../Encoding.ts"
 import * as Match from "../../../../Match.ts"
+import * as Predicate from "../../../../Predicate.ts"
 import * as Schema from "../../../../Schema.ts"
 import * as Struct from "../../../../Struct.ts"
 import * as PublicMcpSchema from "../../McpSchema.ts"
 import * as McpCore from "../mcpCore.ts"
 import * as McpProtocol from "../mcpProtocol.ts"
+import * as McpRuntime from "../mcpRuntime.ts"
 import * as McpSchema from "../mcpSchema/v2025_06_18.ts"
 
 const ClientRequestRpcs = McpSchema.ClientRequestRpcs.middleware(
@@ -15,6 +17,21 @@ const ClientRequestRpcs = McpSchema.ClientRequestRpcs.middleware(
 const ClientRpcs = ClientRequestRpcs.merge(McpSchema.ClientNotificationRpcs)
 
 const AdapterRpcs = ClientRpcs.omit("ping")
+const isToolOutputSchema = (
+  schema: PublicMcpSchema.ToolOutputJson | undefined
+): schema is PublicMcpSchema.ToolJson => {
+  if (schema?.type !== "object") {
+    return false
+  }
+
+  const isPropertiesSupported = schema.properties === undefined ||
+    (Predicate.isReadonlyObject(schema.properties) &&
+      Object.values(schema.properties).every(Predicate.isReadonlyObject))
+  const isRequiredDefined = schema.required === undefined ||
+    (Array.isArray(schema.required) && schema.required.every(Predicate.isString))
+
+  return isPropertiesSupported && isRequiredDefined
+}
 
 const profileFromInitialize = (
   initialize: typeof McpSchema.Initialize.payloadSchema.Type
@@ -45,7 +62,7 @@ const requireCapability = (
     ? Effect.void
     : Effect.fail(unsupported(operation, `Client did not advertise the ${capability} capability`))
 
-const projectContent = Effect.fnUntraced(function*(content: typeof PublicMcpSchema.ContentBlock.Type) {
+const projectContent = Effect.fnUntraced(function*(content: PublicMcpSchema.ContentBlock) {
   return Match.value(content).pipe(
     Match.when({ type: Match.is("text", "resource_link") }, (content) => content),
     Match.when({ type: Match.is("image", "audio") }, (content) => ({
@@ -103,31 +120,19 @@ const projectResourceContents = (
       blob: Encoding.encodeBase64(content.blob)
     }
 
-const projectStructuredContent: (
+const projectStructuredContent = (
   content: Schema.Json | undefined
-) => Effect.Effect<
-  Schema.JsonObject | undefined,
-  McpCore.UnsupportedByProtocol
-> = Effect.fnUntraced(function*(content) {
-  if (content === undefined || isJsonObject(content)) {
-    return content
-  }
-  return yield* new McpCore.UnsupportedByProtocol({
-    protocolVersion: McpSchema.protocolVersion,
-    feature: "non-object structured tool content"
-  })
-})
+): Schema.JsonObject | undefined => content === undefined || isJsonObject(content) ? content : undefined
 
-const isJsonObject = (value: Schema.Json): value is Schema.JsonObject =>
-  typeof value === "object" && value !== null && !Array.isArray(value)
+const isJsonObject = (value: Schema.Json): value is Schema.JsonObject => Predicate.isReadonlyObject(value)
 
 /** @internal */
 export const protocol = McpProtocol.make({
   protocolVersion: McpSchema.protocolVersion,
-  transport: {
-    acceptsJsonRpcBatches: false,
-    requiresVersionHeader: true
-  },
+  runtime: McpRuntime.stateful({
+    jsonRpc: { acceptsBatches: false },
+    http: { requiresVersionHeader: true }
+  }),
   clientRpcs: ClientRpcs,
   clientNotificationRpcs: McpSchema.ClientNotificationRpcs,
   serverRequestRpcs: McpSchema.ServerRequestRpcs,
@@ -204,9 +209,18 @@ export const protocol = McpProtocol.make({
           ),
       "prompts/get": Effect.fnUntraced(function*({ arguments: args, name }) {
         const request = yield* PublicMcpSchema.McpServerClient
-        const result = yield* core.prompts.get(name, args ?? {}, McpProtocol.invocationFromClient(request)).pipe(
+        const outcome = yield* core.prompts.get(name, args ?? {}, McpProtocol.invocationFromClient(request)).pipe(
           Effect.mapError(McpProtocol.ProtocolError.fromFeature)
         )
+        if (outcome._tag === "InputRequired") {
+          return yield* McpProtocol.ProtocolError.fromFeature(
+            new McpCore.UnsupportedByProtocol({
+              protocolVersion: McpSchema.protocolVersion,
+              feature: "prompt input requirements"
+            })
+          )
+        }
+        const result = outcome.value
         const messages = yield* Effect.forEach(result.messages, (message) =>
           projectContent(message.content).pipe(
             Effect.map((content) => ({ role: message.role, content })),
@@ -253,7 +267,9 @@ export const protocol = McpProtocol.make({
               title: tool.title,
               description: tool.description,
               inputSchema: tool.inputSchema,
-              outputSchema: tool.outputSchema,
+              outputSchema: isToolOutputSchema(tool.outputSchema)
+                ? tool.outputSchema
+                : undefined,
               annotations: tool.annotations === undefined
                 ? undefined
                 : McpSchema.ToolAnnotations.make({
@@ -273,14 +289,13 @@ export const protocol = McpProtocol.make({
           { ...call, arguments: call.arguments ?? {} },
           McpProtocol.invocationFromClient(request)
         ).pipe(
+          Effect.flatMap((outcome) => McpProtocol.requireCompleteOperation(McpSchema.protocolVersion, outcome)),
           Effect.mapError(McpProtocol.ProtocolError.fromTool)
         )
         const content = yield* Effect.forEach(result.content, projectContent).pipe(
           Effect.mapError(McpProtocol.ProtocolError.fromTool)
         )
-        const structuredContent = yield* projectStructuredContent(result.structuredContent).pipe(
-          Effect.mapError(McpProtocol.ProtocolError.fromTool)
-        )
+        const structuredContent = projectStructuredContent(result.structuredContent)
         return McpSchema.CallToolResult.make({
           content,
           structuredContent,
diff --git a/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2025_11_25.ts b/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2025_11_25.ts
index e37feca1e..f2a917d83 100644
--- a/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2025_11_25.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2025_11_25.ts
@@ -1,10 +1,12 @@
 import * as Effect from "../../../../Effect.ts"
 import * as Encoding from "../../../../Encoding.ts"
 import * as Match from "../../../../Match.ts"
+import * as Predicate from "../../../../Predicate.ts"
 import * as Schema from "../../../../Schema.ts"
 import * as PublicMcpSchema from "../../McpSchema.ts"
 import * as McpCore from "../mcpCore.ts"
 import * as McpProtocol from "../mcpProtocol.ts"
+import * as McpRuntime from "../mcpRuntime.ts"
 import * as McpSchema from "../mcpSchema/v2025_11_25.ts"
 
 const ClientRequestRpcs = McpSchema.ClientRequestRpcs.middleware(
@@ -14,6 +16,21 @@ const ClientRequestRpcs = McpSchema.ClientRequestRpcs.middleware(
 const ClientRpcs = ClientRequestRpcs.merge(McpSchema.ClientNotificationRpcs)
 
 const AdapterRpcs = ClientRpcs.omit("ping")
+const isToolOutputSchema = (
+  schema: PublicMcpSchema.ToolOutputJson | undefined
+): schema is PublicMcpSchema.ToolJson => {
+  if (schema?.type !== "object") {
+    return false
+  }
+
+  const isPropertiesSupported = schema.properties === undefined ||
+    (Predicate.isReadonlyObject(schema.properties) &&
+      Object.values(schema.properties).every(Predicate.isReadonlyObject))
+  const isRequiredDefined = schema.required === undefined ||
+    (Array.isArray(schema.required) && schema.required.every(Predicate.isString))
+
+  return isPropertiesSupported && isRequiredDefined
+}
 
 const unsupported = (
   operation: PublicMcpSchema.McpReverseOperationUnsupported["operation"],
@@ -35,16 +52,6 @@ const requireCapability = (
     ? Effect.void
     : Effect.fail(unsupported(operation, `Client did not advertise the ${capability} capability`))
 
-const requiresSamplingTools = (request: typeof PublicMcpSchema.CreateMessage.payloadSchema.Type): boolean =>
-  request.tools !== undefined ||
-  request.toolChoice !== undefined ||
-  request.messages.some((message) => {
-    const content = message.content
-    return "type" in content
-      ? content.type === "tool_use" || content.type === "tool_result"
-      : content.some((block) => block.type === "tool_use" || block.type === "tool_result")
-  })
-
 const resultRequiresSamplingTools = (result: typeof McpSchema.CreateMessage.successSchema.Type): boolean =>
   result.stopReason === "toolUse" ||
   ("type" in result.content
@@ -62,7 +69,7 @@ const hasElicitationModeCapability = (
     : elicitation.url !== undefined
 }
 
-const projectContent = Effect.fnUntraced(function*(content: typeof PublicMcpSchema.ContentBlock.Type) {
+const projectContent = Effect.fnUntraced(function*(content: PublicMcpSchema.ContentBlock) {
   return Match.value(content).pipe(
     Match.when({ type: Match.is("text", "resource_link") }, (content) => content),
     Match.when({ type: Match.is("image", "audio") }, (content) => ({
@@ -103,23 +110,19 @@ const projectContent = Effect.fnUntraced(function*(content: typeof PublicMcpSche
   )
 })
 
-const projectStructuredContent = Effect.fnUntraced(function*(content: Schema.Json | undefined) {
-  if (content === undefined || Schema.is(Schema.JsonObject)(content)) {
-    return content
-  }
-  return yield* new McpCore.UnsupportedByProtocol({
-    protocolVersion: McpSchema.protocolVersion,
-    feature: "non-object structured tool content"
-  })
-})
+const projectStructuredContent = (
+  content: Schema.Json | undefined
+): Schema.JsonObject | undefined => content === undefined || isJsonObject(content) ? content : undefined
+
+const isJsonObject = (value: Schema.Json): value is Schema.JsonObject => Predicate.isReadonlyObject(value)
 
 /** @internal */
 export const protocol = McpProtocol.make({
   protocolVersion: McpSchema.protocolVersion,
-  transport: {
-    acceptsJsonRpcBatches: false,
-    requiresVersionHeader: true
-  },
+  runtime: McpRuntime.stateful({
+    jsonRpc: { acceptsBatches: false },
+    http: { requiresVersionHeader: true }
+  }),
   clientRpcs: ClientRpcs,
   clientNotificationRpcs: McpSchema.ClientNotificationRpcs,
   serverRequestRpcs: McpSchema.ServerRequestRpcs,
@@ -229,9 +232,18 @@ export const protocol = McpProtocol.make({
           ),
       "prompts/get": Effect.fnUntraced(function*({ arguments: args, name }) {
         const request = yield* PublicMcpSchema.McpServerClient
-        const result = yield* core.prompts.get(name, args ?? {}, McpProtocol.invocationFromClient(request)).pipe(
+        const outcome = yield* core.prompts.get(name, args ?? {}, McpProtocol.invocationFromClient(request)).pipe(
           Effect.mapError(McpProtocol.ProtocolError.fromFeature)
         )
+        if (outcome._tag === "InputRequired") {
+          return yield* McpProtocol.ProtocolError.fromFeature(
+            new McpCore.UnsupportedByProtocol({
+              protocolVersion: McpSchema.protocolVersion,
+              feature: "prompt input requirements"
+            })
+          )
+        }
+        const result = outcome.value
         const messages = yield* Effect.forEach(result.messages, (message) =>
           projectContent(message.content).pipe(
             Effect.map((content) => ({ role: message.role, content })),
@@ -278,7 +290,9 @@ export const protocol = McpProtocol.make({
               title: tool.title,
               description: tool.description,
               inputSchema: tool.inputSchema,
-              outputSchema: tool.outputSchema,
+              outputSchema: isToolOutputSchema(tool.outputSchema)
+                ? tool.outputSchema
+                : undefined,
               icons: tool.icons,
               annotations: tool.annotations === undefined
                 ? undefined
@@ -299,6 +313,7 @@ export const protocol = McpProtocol.make({
           { ...call, arguments: call.arguments ?? {} },
           McpProtocol.invocationFromClient(request)
         ).pipe(
+          Effect.flatMap((outcome) => McpProtocol.requireCompleteOperation(McpSchema.protocolVersion, outcome)),
           Effect.catchTag("InvalidToolInput", (error) =>
             Effect.succeed(PublicMcpSchema.CallToolResult.make({
               content: [PublicMcpSchema.TextContent.make({
@@ -312,9 +327,7 @@ export const protocol = McpProtocol.make({
         const content = yield* Effect.forEach(result.content, projectContent).pipe(
           Effect.mapError(McpProtocol.ProtocolError.fromTool)
         )
-        const structuredContent = yield* projectStructuredContent(result.structuredContent).pipe(
-          Effect.mapError(McpProtocol.ProtocolError.fromTool)
-        )
+        const structuredContent = projectStructuredContent(result.structuredContent)
         return McpSchema.CallToolResult.make({
           content,
           structuredContent,
@@ -340,7 +353,9 @@ export const protocol = McpProtocol.make({
     }),
     createMessage: Effect.fnUntraced(function*(request) {
       yield* requireCapability(profile, "sampling/createMessage", "sampling")
-      if (requiresSamplingTools(request) && profile.clientCapabilities.sampling?.tools == undefined) {
+      if (
+        McpProtocol.samplingRequestRequiresTools(request) && profile.clientCapabilities.sampling?.tools == undefined
+      ) {
         return yield* unsupported("sampling/createMessage", "Client did not advertise the sampling.tools capability")
       }
       if (
diff --git a/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2026_07_28.ts b/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2026_07_28.ts
new file mode 100644
index 000000000..20d8cb2c1
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocol/v2026_07_28.ts
@@ -0,0 +1,696 @@
+/**
+ * MCP v2026-07-28 wire projections.
+ *
+ * @internal
+ */
+import * as Deferred from "../../../../Deferred.ts"
+import * as Effect from "../../../../Effect.ts"
+import * as Encoding from "../../../../Encoding.ts"
+import * as Match from "../../../../Match.ts"
+import * as Option from "../../../../Option.ts"
+import * as Predicate from "../../../../Predicate.ts"
+import * as PubSub from "../../../../PubSub.ts"
+import * as Queue from "../../../../Queue.ts"
+import * as Record from "../../../../Record.ts"
+import * as Schema from "../../../../Schema.ts"
+import * as Scope from "../../../../Scope.ts"
+import type * as Types from "../../../../Types.ts"
+import { appendPreResponseHandlerUnsafe } from "../../../http/HttpEffect.ts"
+import * as HttpServerRequest from "../../../http/HttpServerRequest.ts"
+import * as HttpServerResponse from "../../../http/HttpServerResponse.ts"
+import type * as Rpc from "../../../rpc/Rpc.ts"
+import type * as RpcMessage from "../../../rpc/RpcMessage.ts"
+import type * as PublicMcpProtocol from "../../McpProtocol.ts"
+import * as PublicMcpSchema from "../../McpSchema.ts"
+import * as McpCore from "../mcpCore.ts"
+import * as McpProtocol from "../mcpProtocol.ts"
+import * as McpSchema from "../mcpSchema/v2026_07_28.ts"
+
+const InputResponses = Schema.Record(Schema.String, Schema.JsonObject)
+const decodeRequestMetadata = Schema.decodeUnknownEffect(McpSchema.RequestMetaObject)
+const decodeCancellation = Schema.decodeUnknownEffect(McpSchema.CancelledNotification.payloadSchema)
+const isJson = Schema.is(Schema.Json)
+const encodeImplementation = Schema.encodeEffect(McpSchema.Implementation)
+const MAX_PENDING_SUBSCRIPTION_NOTIFICATIONS = 64
+
+type ObjectWithUndefined = Readonly<Record<string, unknown>>
+
+const omitUndefined = (value: ObjectWithUndefined): Record<string, unknown> => {
+  const result: Record<string, unknown> = {}
+  for (const key in value) {
+    if (value[key] !== undefined) {
+      result[key] = value[key]
+    }
+  }
+  return result
+}
+
+const parameterHeaderMatches = (header: string | undefined, argument: unknown): boolean => {
+  if (Predicate.isNullish(argument)) {
+    return header === undefined
+  }
+  if (header === undefined) {
+    return false
+  }
+  const decoded = McpProtocol.decodeRoutingHeader(header)
+  if (decoded === undefined) {
+    return false
+  }
+  return Match.value(argument).pipe(
+    Match.when(Match.string, (argument) => decoded === argument),
+    Match.when(Match.boolean, (argument) => decoded === String(argument)),
+    Match.when(
+      Match.number,
+      (argument) => Number.isSafeInteger(argument) && decoded.trim().length > 0 && Number(decoded) === argument
+    ),
+    Match.orElse(() => false)
+  )
+}
+
+/** @internal */
+export interface StatelessRequestProfile {
+  readonly protocolVersion: typeof McpSchema.protocolVersion
+  readonly clientCapabilities: typeof McpSchema.ClientCapabilities.Type
+  readonly clientInfo?: typeof McpSchema.Implementation.Type | undefined
+  readonly requestMetadata: typeof McpSchema.RequestMetaObject.Type
+}
+
+/** @internal */
+export const profileFromRequestMetadata = Effect.fnUntraced(function*(metadata: unknown) {
+  const requestMetadata = yield* decodeRequestMetadata(metadata)
+  return {
+    protocolVersion: McpSchema.protocolVersion,
+    clientCapabilities: requestMetadata["io.modelcontextprotocol/clientCapabilities"],
+    clientInfo: requestMetadata["io.modelcontextprotocol/clientInfo"],
+    requestMetadata
+  } satisfies StatelessRequestProfile
+})
+
+const resultMetadata = (
+  value: ObjectWithUndefined,
+  serverInfo: Schema.JsonObject
+): Schema.JsonObject => {
+  const metadata: unknown = value._meta
+  return {
+    ...(Predicate.isReadonlyObject(metadata) ? metadata : {}),
+    "io.modelcontextprotocol/serverInfo": serverInfo
+  }
+}
+
+const projectInputRequired = (
+  outcome: McpCore.InputRequiredFields,
+  serverInfo: Schema.JsonObject
+) =>
+  omitUndefined({
+    _meta: { "io.modelcontextprotocol/serverInfo": serverInfo },
+    resultType: "input_required",
+    inputRequests: outcome.inputRequests,
+    requestState: outcome.requestState
+  })
+
+const decodeCallToolOutcome = Schema.decodeUnknownEffect(Schema.Union([
+  McpSchema.CallToolResult,
+  McpSchema.InputRequiredResult
+]))
+
+/** @internal */
+export const projectCallToolOutcome = Effect.fnUntraced(function*(
+  outcome: McpCore.OperationOutcome<ObjectWithUndefined>,
+  serverInfo: typeof McpSchema.Implementation.Type
+) {
+  const encodedServerInfo = yield* encodeImplementation(serverInfo)
+  if (outcome._tag === "Complete") {
+    return yield* decodeCallToolOutcome({
+      ...omitUndefined(outcome.value),
+      _meta: resultMetadata(outcome.value, encodedServerInfo),
+      resultType: "complete"
+    })
+  }
+  return yield* decodeCallToolOutcome(projectInputRequired(outcome, encodedServerInfo))
+})
+
+const requiredCapabilitiesForInputRequests = (
+  inputRequests: McpCore.InputRequiredFields["inputRequests"],
+  capabilities: McpCore.NegotiatedProtocolProfile["clientCapabilities"]
+): Record<string, Schema.JsonObject> => {
+  const required: Record<string, Types.Mutable<Schema.JsonObject>> = {}
+  for (const request of Object.values(inputRequests ?? {})) {
+    Match.value(request).pipe(
+      Match.when({ method: "roots/list" }, () => {
+        if (capabilities.roots === undefined) required.roots = {}
+      }),
+      Match.when({ method: "sampling/createMessage" }, (request) => {
+        const sampling = required.sampling ?? {}
+        if (McpProtocol.samplingRequestRequiresTools(request.params) && capabilities.sampling?.tools === undefined) {
+          sampling.tools = {}
+        }
+        if (
+          (request.params.includeContext === "thisServer" || request.params.includeContext === "allServers") &&
+          capabilities.sampling?.context === undefined
+        ) {
+          sampling.context = {}
+        }
+        if (capabilities.sampling === undefined || Object.keys(sampling).length > 0) required.sampling = sampling
+      }),
+      Match.when({ method: "elicitation/create" }, (request) => {
+        const mode = request.params.mode === "url" ? "url" : "form"
+        const elicitation = capabilities.elicitation
+        const supportsMode = elicitation !== undefined && (mode === "url"
+          ? elicitation.url !== undefined
+          : elicitation.form !== undefined || Object.keys(elicitation).length === 0)
+        if (!supportsMode) (required.elicitation ??= {})[mode] = {}
+      }),
+      Match.exhaustive
+    )
+  }
+  return required
+}
+
+const projectResourceContents = (
+  resource: PublicMcpSchema.TextResourceContents | PublicMcpSchema.BlobResourceContents
+) =>
+  omitUndefined({
+    uri: resource.uri,
+    mimeType: resource.mimeType,
+    _meta: resource._meta,
+    ...("text" in resource ? { text: resource.text } : { blob: Encoding.encodeBase64(resource.blob) })
+  })
+
+const projectContent = Match.type<PublicMcpSchema.ContentBlock>().pipe(
+  Match.when({ type: Match.is("text", "resource_link") }, (content) => content),
+  Match.when({ type: Match.is("image", "audio") }, (content) =>
+    omitUndefined({
+      type: content.type,
+      mimeType: content.mimeType,
+      data: Encoding.encodeBase64(content.data),
+      annotations: content.annotations,
+      _meta: content._meta
+    })),
+  Match.when({ type: "resource" }, (content) =>
+    omitUndefined({
+      type: "resource",
+      resource: projectResourceContents(content.resource),
+      annotations: content.annotations,
+      _meta: content._meta
+    })),
+  Match.exhaustive
+)
+
+const projectResource = (resource: PublicMcpSchema.Resource) => McpSchema.Resource.make(resource)
+const projectResourceTemplate = (resourceTemplate: PublicMcpSchema.ResourceTemplate) =>
+  McpSchema.ResourceTemplate.make(resourceTemplate)
+
+const projectPrompt = (prompt: PublicMcpSchema.Prompt) =>
+  McpProtocol.transcode(PublicMcpSchema.Prompt, McpSchema.Prompt, prompt)
+
+const projectTool = (tool: PublicMcpSchema.Tool) => McpProtocol.transcode(PublicMcpSchema.Tool, McpSchema.Tool, tool)
+
+const privateStaleCache = {
+  ttlMs: 0,
+  cacheScope: "private"
+} satisfies { readonly ttlMs: number; readonly cacheScope: "private" }
+
+const projectCompleteResult = Effect.fnUntraced(function*(
+  value: ObjectWithUndefined,
+  serverInfo: typeof McpSchema.Implementation.Type
+) {
+  const encodedServerInfo = yield* encodeImplementation(serverInfo)
+  return {
+    ...omitUndefined(value),
+    _meta: resultMetadata(value, encodedServerInfo),
+    resultType: "complete"
+  }
+})
+
+type ProtocolError =
+  | McpCore.ResourceNotFound
+  | McpCore.PromptNotFound
+  | McpCore.ToolError
+  | McpCore.UnsupportedByProtocol
+  | McpProtocol.ProtocolError
+  | PublicMcpSchema.McpError
+  | Schema.SchemaError
+
+const matchedProtocolError = Match.type<ProtocolError>().pipe(
+  Match.tag("ResourceNotFound", (error) =>
+    new McpProtocol.ProtocolError({
+      code: McpSchema.INVALID_PARAMS,
+      message: `Resource '${error.uri}' not found`,
+      data: { uri: error.uri }
+    })),
+  Match.tag(
+    "ToolNotFound",
+    "InvalidToolInput",
+    "InvalidToolContinuation",
+    "ToolExecutionError",
+    "UnsupportedByProtocol",
+    McpProtocol.ProtocolError.fromTool
+  ),
+  Match.orElse(McpProtocol.ProtocolError.fromFeature)
+)
+
+const projectError = (error: ProtocolError): McpSchema.McpError => {
+  const protocolError = matchedProtocolError(error)
+  return McpSchema.McpError.make({
+    code: protocolError.code,
+    message: protocolError.message,
+    ...(isJson(protocolError.data) ? { data: protocolError.data } : {})
+  })
+}
+
+const failWithHttpStatus = Effect.fnUntraced(function*(status: number, error: McpProtocol.ProtocolError) {
+  const request = yield* Effect.serviceOption(HttpServerRequest.HttpServerRequest)
+  if (Option.isSome(request)) {
+    appendPreResponseHandlerUnsafe(
+      request.value,
+      (_request, response) => Effect.succeed(HttpServerResponse.setStatus(response, status))
+    )
+  }
+  return yield* error
+})
+
+/** @internal */
+export const normalizeCancellation = (payload: unknown) =>
+  decodeCancellation(payload).pipe(
+    Effect.map((request) => ({
+      requestId: request.requestId,
+      reason: request.reason,
+      metadata: request._meta
+    }))
+  )
+
+const unsupported = (
+  operation: PublicMcpSchema.McpReverseOperationUnsupported["operation"]
+): PublicMcpSchema.McpReverseOperationUnsupported =>
+  new PublicMcpSchema.McpReverseOperationUnsupported({
+    operation,
+    protocolVersion: McpSchema.protocolVersion,
+    reason: "MCP 2026-07-28 carries server input requests in multi round-trip results"
+  })
+
+/** @internal */
+export const handlerRpcs = McpSchema.ClientRequestRpcs.merge(McpSchema.ClientNotificationRpcs)
+
+/** @internal */
+export const makeHandlers = (
+  core: McpCore.McpCore,
+  _lifecycle: McpProtocol.LifecycleRuntime | undefined,
+  context: McpProtocol.HandlerInstallationContext
+) => {
+  const decodeInputResponses = Schema.decodeUnknownEffect(InputResponses)
+  const decodeDiscoverResult = Schema.decodeUnknownEffect(McpSchema.DiscoverResult)
+  const decodeListResourcesResult = Schema.decodeUnknownEffect(McpSchema.ListResourcesResult)
+  const decodeListResourceTemplatesResult = Schema.decodeUnknownEffect(McpSchema.ListResourceTemplatesResult)
+  const decodeReadResourceResult = Schema.decodeUnknownEffect(McpSchema.ReadResourceResult)
+  const decodeListPromptsResult = Schema.decodeUnknownEffect(McpSchema.ListPromptsResult)
+  const decodeGetPromptResult = Schema.decodeUnknownEffect(McpSchema.GetPromptResult)
+  const decodePromptOutcome = Schema.decodeUnknownEffect(Schema.Union([
+    McpSchema.GetPromptResult,
+    McpSchema.InputRequiredResult
+  ]))
+  const decodeCompleteResult = Schema.decodeUnknownEffect(McpSchema.CompleteResult)
+  const decodeListToolsResult = Schema.decodeUnknownEffect(McpSchema.ListToolsResult)
+  const sendNotification = context.sendNotification
+  const supportsSubscriptions = sendNotification !== undefined
+  // Older adapters accept arbitrary JSON; this binding requires extension settings objects.
+  const extensions = context.serverInfo.extensions === undefined ? undefined : Record.filter(
+    context.serverInfo.extensions,
+    (value): value is Schema.JsonObject => Predicate.isReadonlyObject(value)
+  )
+  const getDiscovery = Effect.map(context.registrationPresence, (presence) => {
+    const capabilities: Types.Mutable<typeof McpSchema.ServerCapabilities.Type> = { completions: {}, logging: {} }
+    if (extensions !== undefined) capabilities.extensions = extensions
+    if (presence.tools) capabilities.tools = { listChanged: supportsSubscriptions }
+    if (presence.resources) {
+      capabilities.resources = { listChanged: supportsSubscriptions, subscribe: supportsSubscriptions }
+    }
+    if (presence.prompts) capabilities.prompts = { listChanged: supportsSubscriptions }
+    return { supportedVersions: context.supportedVersions, capabilities, serverInfo: context.serverInfo }
+  })
+  const getInvocation = PublicMcpSchema.McpRequestContext.useSync(
+    McpProtocol.invocationFromRequestContext
+  )
+  const getInputInvocation = Effect.fnUntraced(function*(
+    request: Pick<typeof McpSchema.CallTool.payloadSchema.Type, "inputResponses" | "requestState">
+  ) {
+    const context = yield* PublicMcpSchema.McpRequestContext
+    const inputResponses = request.inputResponses === undefined
+      ? undefined
+      // The RPC payload already validated the dated response union; this decode only erases it into canonical JSON.
+      : yield* decodeInputResponses(request.inputResponses).pipe(Effect.orDie)
+    return McpProtocol.invocationFromRequestContext(PublicMcpSchema.McpRequestContext.of({
+      ...context,
+      inputResponses,
+      requestState: request.requestState
+    }))
+  })
+  const validateInputRequestCapabilities = Effect.fnUntraced(function*(
+    inputRequired: McpCore.InputRequiredFields,
+    capabilities: McpCore.NegotiatedProtocolProfile["clientCapabilities"]
+  ) {
+    const requiredCapabilities = requiredCapabilitiesForInputRequests(inputRequired.inputRequests, capabilities)
+    if (Object.keys(requiredCapabilities).length === 0) {
+      return
+    }
+    return yield* failWithHttpStatus(
+      400,
+      new McpProtocol.ProtocolError({
+        code: McpSchema.MISSING_REQUIRED_CLIENT_CAPABILITY,
+        message: "The request requires client capabilities that were not declared",
+        data: { requiredCapabilities }
+      })
+    )
+  })
+  return ({
+    "subscriptions/listen": Effect.fnUntraced(function*(
+      request: typeof McpSchema.SubscriptionsListen.payloadSchema.Type,
+      { client, requestId }: { readonly client: Rpc.ServerClient; readonly requestId: RpcMessage.RequestId }
+    ) {
+      if (sendNotification === undefined) {
+        return yield* new McpProtocol.ProtocolError({
+          code: McpSchema.METHOD_NOT_FOUND,
+          message: "Method not found: subscriptions/listen"
+        })
+      }
+      const presence = yield* context.registrationPresence
+      const eventsScope = yield* Scope.fork(yield* Effect.scope)
+      const events = yield* Scope.provide(context.subscribeServerNotifications, eventsScope)
+      const honored = {
+        ...(presence.tools && request.notifications.toolsListChanged === true
+          ? { toolsListChanged: true }
+          : {}),
+        ...(presence.prompts && request.notifications.promptsListChanged === true
+          ? { promptsListChanged: true }
+          : {}),
+        ...(presence.resources && request.notifications.resourcesListChanged === true
+          ? { resourcesListChanged: true }
+          : {}),
+        ...(presence.resources && request.notifications.resourceSubscriptions !== undefined
+          ? { resourceSubscriptions: request.notifications.resourceSubscriptions }
+          : {})
+      }
+      const subscriptionMetadata = { "io.modelcontextprotocol/subscriptionId": requestId }
+      const resourceSubscriptions = new Set(honored.resourceSubscriptions)
+      const pending = yield* Queue.dropping<PublicMcpProtocol.ProjectedNotification>(
+        MAX_PENDING_SUBSCRIPTION_NOTIFICATIONS
+      )
+      const overflowed = yield* Deferred.make<void>()
+      yield* Effect.gen(function*() {
+        while (true) {
+          const event = yield* PubSub.take(events)
+          if (event.targetClientId !== undefined && event.targetClientId !== client.id) {
+            continue
+          }
+          const notification = event.notification
+          const rpc: Rpc.AnyWithProps | undefined = Match.value(notification).pipe(
+            Match.tags({
+              ToolsChanged: () => honored.toolsListChanged === true ? McpSchema.ToolListChangedNotification : undefined,
+              PromptsChanged: () =>
+                honored.promptsListChanged === true ? McpSchema.PromptListChangedNotification : undefined,
+              ResourcesChanged: () =>
+                honored.resourcesListChanged === true ? McpSchema.ResourceListChangedNotification : undefined,
+              ResourceUpdated: (notification) =>
+                resourceSubscriptions.has(notification.uri) ? McpSchema.ResourceUpdatedNotification : undefined
+            }),
+            Match.exhaustive
+          )
+          if (rpc === undefined) {
+            continue
+          }
+          const projected = {
+            tag: rpc._tag,
+            payload: rpc.payloadSchema.make({
+              _meta: { ...notification.metadata, ...subscriptionMetadata },
+              ...(notification._tag === "ResourceUpdated" ? { uri: notification.uri } : {})
+            })
+          }
+          if (!(yield* Queue.offer(pending, projected))) {
+            break
+          }
+        }
+      }).pipe(
+        // Release the upstream listener on overflow even while transport writes remain blocked.
+        Scope.use(eventsScope),
+        Effect.andThen(Effect.suspend(() => context.markSubscriptionCancelled?.(client.id, requestId) ?? Effect.void)),
+        Effect.andThen(Deferred.succeed(overflowed, undefined)),
+        Effect.forkScoped
+      )
+      yield* sendNotification(McpSchema.protocolVersion, client.id, {
+        tag: McpSchema.SubscriptionsAcknowledgedNotification._tag,
+        payload: McpSchema.SubscriptionsAcknowledgedNotification.payloadSchema.make({
+          _meta: subscriptionMetadata,
+          notifications: honored
+        })
+      })
+      const deliver = Effect.forever(
+        Queue.take(pending).pipe(
+          Effect.flatMap((notification) => sendNotification(McpSchema.protocolVersion, client.id, notification))
+        )
+      )
+      yield* Effect.race(deliver, Deferred.await(overflowed))
+      yield* context.terminateSubscription?.(
+        McpSchema.protocolVersion,
+        client.id,
+        requestId,
+        "Pending notification limit exceeded"
+      ) ?? Effect.void
+      const encodedServerInfo = yield* encodeImplementation(context.serverInfo)
+      return McpSchema.SubscriptionsListenResult.make({
+        _meta: {
+          ...subscriptionMetadata,
+          "io.modelcontextprotocol/serverInfo": encodedServerInfo
+        },
+        resultType: "complete"
+      })
+    }, Effect.mapError(projectError)),
+    "server/discover": Effect.fnUntraced(function*(
+      _request: typeof McpSchema.Discover.payloadSchema.Type
+    ) {
+      const discovery = yield* getDiscovery
+      const result = yield* projectCompleteResult({
+        ...privateStaleCache,
+        supportedVersions: Array.from(discovery.supportedVersions),
+        capabilities: discovery.capabilities,
+        instructions: context.serverInfo.instructions
+      }, context.serverInfo)
+      return yield* decodeDiscoverResult(result)
+    }, Effect.mapError(projectError)),
+    "resources/list": Effect.fnUntraced(function*(
+      _request: typeof McpSchema.ListResources.payloadSchema.Type
+    ) {
+      const invocation = yield* getInvocation
+      const resources = yield* core.resources.list(invocation.protocol)
+      const result = yield* projectCompleteResult({
+        ...privateStaleCache,
+        resources: resources.map(projectResource)
+      }, context.serverInfo)
+      return yield* decodeListResourcesResult(result)
+    }, Effect.mapError(projectError)),
+    "resources/templates/list": Effect.fnUntraced(function*(
+      _request: typeof McpSchema.ListResourceTemplates.payloadSchema.Type
+    ) {
+      const invocation = yield* getInvocation
+      const resourceTemplates = yield* core.resources.listTemplates(invocation.protocol)
+      const result = yield* projectCompleteResult({
+        ...privateStaleCache,
+        resourceTemplates: resourceTemplates.map(projectResourceTemplate)
+      }, context.serverInfo)
+      return yield* decodeListResourceTemplatesResult(result)
+    }, Effect.mapError(projectError)),
+    "resources/read": Effect.fnUntraced(function*(request: typeof McpSchema.ReadResource.payloadSchema.Type) {
+      const invocation = yield* getInputInvocation(request)
+      const read = yield* core.resources.read(request.uri, invocation)
+      const contents = read.contents.map(projectResourceContents)
+      const result = yield* projectCompleteResult({
+        ...privateStaleCache,
+        contents,
+        _meta: read._meta
+      }, context.serverInfo)
+      return yield* decodeReadResourceResult(result)
+    }, Effect.mapError(projectError)),
+    "prompts/list": Effect.fnUntraced(function*(
+      _request: typeof McpSchema.ListPrompts.payloadSchema.Type
+    ) {
+      const presence = yield* context.registrationPresence
+      if (!presence.prompts) {
+        return yield* failWithHttpStatus(
+          404,
+          new McpProtocol.ProtocolError({
+            code: PublicMcpSchema.METHOD_NOT_FOUND_ERROR_CODE,
+            message: "Method not found"
+          })
+        )
+      }
+      const invocation = yield* getInvocation
+      const prompts = yield* core.prompts.list(invocation.protocol)
+      const projectedPrompts = yield* Effect.forEach(prompts, projectPrompt)
+      const result = yield* projectCompleteResult({
+        ...privateStaleCache,
+        prompts: projectedPrompts
+      }, context.serverInfo)
+      return yield* decodeListPromptsResult(result)
+    }, Effect.mapError(projectError)),
+    "prompts/get": Effect.fnUntraced(function*(request: typeof McpSchema.GetPrompt.payloadSchema.Type) {
+      const invocation = yield* getInputInvocation(request)
+      const outcome = yield* core.prompts.get(request.name, request.arguments ?? {}, invocation)
+      if (outcome._tag === "InputRequired") {
+        yield* validateInputRequestCapabilities(outcome, invocation.protocol.clientCapabilities)
+        const encodedServerInfo = yield* encodeImplementation(context.serverInfo)
+        return yield* decodePromptOutcome(projectInputRequired(outcome, encodedServerInfo))
+      }
+      const prompt = outcome.value
+      const messages = prompt.messages.map((message) => ({
+        role: message.role,
+        content: projectContent(message.content)
+      }))
+      const result = yield* projectCompleteResult({
+        description: prompt.description,
+        messages,
+        _meta: prompt._meta
+      }, context.serverInfo)
+      return yield* decodeGetPromptResult(result)
+    }, Effect.mapError(projectError)),
+    "completion/complete": Effect.fnUntraced(function*(
+      request: typeof McpSchema.Complete.payloadSchema.Type
+    ) {
+      const invocation = yield* getInvocation
+      const completion = yield* core.completions.complete({
+        reference: request.ref.type === "ref/prompt"
+          ? { type: "prompt", name: request.ref.name, title: request.ref.title }
+          : { type: "resourceTemplate", uriTemplate: request.ref.uri },
+        argument: request.argument,
+        context: request.context?.arguments === undefined
+          ? undefined
+          : { arguments: request.context.arguments },
+        metadata: request._meta
+      }, invocation)
+      const result = yield* projectCompleteResult({
+        completion: omitUndefined({
+          values: Array.from(completion.values),
+          total: completion.total,
+          hasMore: completion.hasMore
+        }),
+        _meta: completion.metadata
+      }, context.serverInfo)
+      return yield* decodeCompleteResult(result)
+    }, Effect.mapError(projectError)),
+    "tools/list": Effect.fnUntraced(function*(
+      _request: typeof McpSchema.ListTools.payloadSchema.Type
+    ) {
+      const invocation = yield* getInvocation
+      const tools = yield* core.tools.list(invocation.protocol)
+      const projectedTools = yield* Effect.forEach(tools, projectTool)
+      const result = yield* projectCompleteResult({
+        ...privateStaleCache,
+        tools: projectedTools
+      }, context.serverInfo)
+      return yield* decodeListToolsResult(result)
+    }, Effect.mapError(projectError)),
+    "tools/call": Effect.fnUntraced(function*(request: typeof McpSchema.CallTool.payloadSchema.Type) {
+      const invocation = yield* getInputInvocation(request)
+      const tool = (yield* core.tools.list(invocation.protocol)).find((tool) => tool.name === request.name)
+      const httpRequest = yield* Effect.serviceOption(HttpServerRequest.HttpServerRequest)
+
+      if (tool !== undefined && Option.isSome(httpRequest)) {
+        const pending: Array<{ readonly schema: unknown; readonly argument: unknown; readonly path: string }> = [
+          { schema: tool.inputSchema, argument: request.arguments, path: "" }
+        ]
+        // Only properties paths may mirror headers; composition, arrays, and references do not qualify.
+        while (pending.length > 0) {
+          const { schema, argument, path } = pending.pop()!
+          if (!Predicate.isReadonlyObject(schema)) continue
+          const annotation = schema["x-mcp-header"]
+          if (typeof annotation === "string") {
+            const headerName = `mcp-param-${annotation.toLowerCase()}`
+            if (!parameterHeaderMatches(httpRequest.value.headers[headerName], argument)) {
+              return yield* failWithHttpStatus(
+                400,
+                new McpProtocol.ProtocolError({
+                  code: PublicMcpSchema.HEADER_MISMATCH_ERROR_CODE,
+                  message: `${headerName} does not match argument '${path}'`
+                })
+              )
+            }
+          }
+          if (Predicate.isReadonlyObject(schema.properties)) {
+            for (const [name, property] of Object.entries(schema.properties)) {
+              pending.push({
+                schema: property,
+                argument: Predicate.isReadonlyObject(argument) && Object.hasOwn(argument, name)
+                  ? argument[name]
+                  : undefined,
+                path: path === "" ? name : `${path}.${name}`
+              })
+            }
+          }
+        }
+      }
+
+      const outcome = yield* core.tools.call({ name: request.name, arguments: request.arguments ?? {} }, invocation)
+        .pipe(
+          Effect.catchTag(
+            ["ToolExecutionError", "InvalidToolInput"],
+            (error) =>
+              Effect.succeed(McpCore.OperationOutcome.Complete(PublicMcpSchema.CallToolResult.make({
+                content: [PublicMcpSchema.TextContent.make({ type: "text", text: error.message })],
+                isError: true
+              })))
+          )
+        )
+      if (outcome._tag === "InputRequired") {
+        yield* validateInputRequestCapabilities(outcome, invocation.protocol.clientCapabilities)
+        return yield* projectCallToolOutcome(outcome, context.serverInfo)
+      }
+      const toolResult = outcome.value
+      const content = toolResult.content.map(projectContent)
+      return yield* projectCallToolOutcome(
+        McpCore.OperationOutcome.Complete({
+          content,
+          structuredContent: toolResult.structuredContent,
+          isError: toolResult.isError,
+          _meta: toolResult._meta
+        }),
+        context.serverInfo
+      )
+    }, Effect.mapError(projectError)),
+    "notifications/cancelled": Effect.fnUntraced(function*(
+      _request: typeof McpSchema.CancelledNotification.payloadSchema.Type
+    ) {
+      return yield* Effect.void
+    })
+  })
+}
+
+const runtime = {
+  _tag: "Stateless",
+  transport: {
+    jsonRpc: { acceptsBatches: false },
+    http: {}
+  },
+  profileFromRequestMetadata
+} as const
+
+/** @internal */
+export const protocol = McpProtocol.make({
+  protocolVersion: McpSchema.protocolVersion,
+  runtime,
+  clientRpcs: McpSchema.ClientRpcs,
+  clientNotificationRpcs: McpSchema.ClientNotificationRpcs,
+  serverRequestRpcs: McpSchema.ServerRequestRpcs,
+  serverNotificationRpcs: McpSchema.ServerNotificationRpcs,
+  handlerRpcs,
+  makeHandlers,
+  toReverseClient: () => ({
+    listRoots: () => Effect.fail(unsupported("roots/list")),
+    createMessage: () => Effect.fail(unsupported("sampling/createMessage")),
+    elicit: () => Effect.fail(unsupported("elicitation/create"))
+  }),
+  projectNotification: (notification) =>
+    McpProtocol.isSubscriptionServerNotification(notification)
+      // @effect-diagnostics-next-line effectSucceedWithVoid:off the projector requires the value `undefined`
+      ? Effect.succeed(undefined)
+      : McpProtocol.makeNotificationProjector({
+        supportsProgressMessage: true
+      }, notification),
+  normalizeCancellation
+})
diff --git a/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocolRegistry.ts b/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocolRegistry.ts
index 0f6762d14..243f24d15 100644
--- a/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocolRegistry.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/internal/mcpProtocolRegistry.ts
@@ -20,12 +20,14 @@ export interface ProtocolRegistry<
   readonly protocols: NonEmptyReadonlyArray<Protocol>
   readonly clientRpcs: AnyRpcGroup
   readonly select: (offeredVersion: string) => Protocol
+  readonly protocolForInternalTag: (tag: string) => Protocol
   readonly routeClientRequest: (
     protocol: Protocol,
     request: RpcMessage.RequestEncoded
   ) => RpcMessage.RequestEncoded
   readonly handlerTarget: (
-    contextMap: Map<string, unknown>
+    contextMap: Map<string, unknown>,
+    context: McpProtocolInternal.HandlerInstallationContext
   ) => McpProtocolInternal.HandlerInstallationTarget
 }
 
@@ -65,6 +67,8 @@ export const make = Effect.fnUntraced(function*<
     protocols: snapshot,
     clientRpcs,
     select: (offeredVersion: string) => byVersion.get(offeredVersion) ?? snapshot[0],
+    protocolForInternalTag: (tag: string) =>
+      snapshot.find((protocol) => tag.startsWith(prefix(protocol))) ?? snapshot[0],
     routeClientRequest: (
       protocol: Protocol,
       request: RpcMessage.RequestEncoded
@@ -72,7 +76,8 @@ export const make = Effect.fnUntraced(function*<
       ...request,
       tag: `${prefix(protocol)}${request.tag}`
     }),
-    handlerTarget: (contextMap: Map<string, unknown>): McpProtocolInternal.HandlerInstallationTarget => ({
+    handlerTarget: (contextMap, context): McpProtocolInternal.HandlerInstallationTarget => ({
+      context,
       install: Effect.fnUntraced(function*<
         Rpcs extends Rpc.Any,
         Handlers extends RpcGroup.HandlersFrom<Rpcs>
diff --git a/repos/effect/packages/effect/src/unstable/ai/internal/mcpRuntime.ts b/repos/effect/packages/effect/src/unstable/ai/internal/mcpRuntime.ts
new file mode 100644
index 000000000..39a19e1ed
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/ai/internal/mcpRuntime.ts
@@ -0,0 +1,547 @@
+/**
+ * Runtime descriptors for MCP protocol adapters.
+ *
+ * @internal
+ */
+import type { NonEmptyReadonlyArray } from "../../../Array.ts"
+import * as Cause from "../../../Cause.ts"
+import * as Context from "../../../Context.ts"
+import * as Effect from "../../../Effect.ts"
+import * as Layer from "../../../Layer.ts"
+import type * as LogLevel from "../../../LogLevel.ts"
+import * as Predicate from "../../../Predicate.ts"
+import * as Result from "../../../Result.ts"
+import type * as Headers from "../../http/Headers.ts"
+import { appendPreResponseHandlerUnsafe } from "../../http/HttpEffect.ts"
+import * as HttpServerRequest from "../../http/HttpServerRequest.ts"
+import * as HttpServerResponse from "../../http/HttpServerResponse.ts"
+import * as RpcGroup from "../../rpc/RpcGroup.ts"
+import type * as RpcMessage from "../../rpc/RpcMessage.ts"
+import type * as PublicMcpProtocol from "../McpProtocol.ts"
+import * as PublicMcpSchema from "../McpSchema.ts"
+import type * as McpCore from "./mcpCore.ts"
+import * as McpProtocol from "./mcpProtocol.ts"
+import * as McpProtocolRegistry from "./mcpProtocolRegistry.ts"
+import * as McpStatefulRuntime from "./mcpStatefulRuntime.ts"
+
+const MCP_SESSION_ID_HEADER = "mcp-session-id"
+const MCP_PROTOCOL_VERSION_HEADER = "mcp-protocol-version"
+const MCP_METHOD_HEADER = "mcp-method"
+const MCP_NAME_HEADER = "mcp-name"
+const PROTOCOL_VERSION_METADATA_KEY = "io.modelcontextprotocol/protocolVersion"
+const CLIENT_CAPABILITIES_METADATA_KEY = "io.modelcontextprotocol/clientCapabilities"
+const UNSUPPORTED_PROTOCOL_VERSION_ERROR_CODE = -32022
+
+const asRecord = (input: unknown): Record<string, unknown> | undefined =>
+  typeof input === "object" && input !== null ? input as Record<string, unknown> : undefined
+
+const protocolVersionClaim = (input: unknown): { readonly present: boolean; readonly value: unknown } => {
+  const metadata = asRecord(input)
+  return metadata !== undefined && PROTOCOL_VERSION_METADATA_KEY in metadata
+    ? { present: true, value: metadata[PROTOCOL_VERSION_METADATA_KEY] }
+    : { present: false, value: undefined }
+}
+
+/** @internal */
+export const hasRequestProtocolVersion = (input: unknown): boolean =>
+  protocolVersionClaim(asRecord(asRecord(input)?.params)?._meta).present
+
+const routingNameKey = (method: string): "name" | "uri" | undefined => {
+  switch (method) {
+    case "tools/call":
+    case "prompts/get":
+      return "name"
+    case "resources/read":
+      return "uri"
+    default:
+      return undefined
+  }
+}
+
+const headerMismatch = (message: string): HttpProtocolSelection => ({
+  _tag: "Rejected",
+  status: 400,
+  error: { code: PublicMcpSchema.HEADER_MISMATCH_ERROR_CODE, message }
+})
+
+const PingRpcs = RpcGroup.make(PublicMcpSchema.Ping).middleware(PublicMcpSchema.McpServerClientMiddleware)
+
+/** @internal */
+export interface RequestBinding {
+  readonly initializePayload: typeof PublicMcpSchema.Initialize.payloadSchema.Type
+  readonly negotiatedProfile: McpCore.NegotiatedProtocolProfile
+  readonly protocol: PublicMcpProtocol.AnyProtocolAdapter
+}
+
+/** @internal */
+export interface PreparedRequest {
+  readonly protocol: PublicMcpProtocol.AnyProtocolAdapter
+  readonly binding?: RequestBinding | undefined
+  readonly profile?: McpCore.NegotiatedProtocolProfile<string> | undefined
+  readonly requestContext?: PublicMcpSchema.McpRequestContext["Service"] | undefined
+}
+
+type HttpProtocolSelection =
+  | {
+    readonly _tag: "Accepted"
+    readonly binding: RequestBinding | undefined
+    readonly protocol?: PublicMcpProtocol.AnyProtocolAdapter | undefined
+  }
+  | {
+    readonly _tag: "Rejected"
+    readonly status: 400 | 404
+    readonly error?: {
+      readonly code: number
+      readonly message: string
+      readonly data?: unknown
+    } | undefined
+  }
+
+/** @internal */
+export type HttpAdmission =
+  | {
+    readonly _tag: "Accepted"
+    readonly acknowledge: boolean
+    readonly isSubscription: boolean
+  }
+  | {
+    readonly _tag: "Rejected"
+    readonly response: HttpServerResponse.HttpServerResponse
+  }
+
+/** @internal */
+export interface HandlerInstallationOptions {
+  readonly core: McpCore.McpCore
+  readonly subscribeServerNotifications: McpProtocol.HandlerInstallationContext["subscribeServerNotifications"]
+  readonly sendNotification?: NonNullable<McpProtocol.HandlerInstallationContext["sendNotification"]>
+  readonly markSubscriptionCancelled?: NonNullable<
+    McpProtocol.HandlerInstallationContext["markSubscriptionCancelled"]
+  >
+  readonly terminateSubscription?: NonNullable<McpProtocol.HandlerInstallationContext["terminateSubscription"]>
+  readonly defaultLogLevel: LogLevel.LogLevel
+  readonly serverInfo: {
+    readonly name: string
+    readonly version: string
+    readonly instructions?: string | undefined
+    readonly description?: string | undefined
+    readonly websiteUrl?: string | undefined
+    readonly icons?: ReadonlyArray<PublicMcpSchema.Icon> | undefined
+    readonly extensions?: NonNullable<PublicMcpSchema.ServerCapabilities["extensions"]> | undefined
+  }
+}
+
+/** @internal */
+export const stateful = (
+  transport: PublicMcpProtocol.TransportPolicy
+): PublicMcpProtocol.StatefulRuntimeDescriptor => ({
+  _tag: "Stateful",
+  transport
+})
+
+/** @internal */
+export interface ServerRuntimeShape {
+  readonly protocols: NonEmptyReadonlyArray<PublicMcpProtocol.AnyProtocolAdapter>
+  readonly clientRpcs: McpProtocolRegistry.ProtocolRegistry<PublicMcpProtocol.AnyProtocolAdapter>["clientRpcs"]
+  readonly selectProtocol: (offeredVersion: string) => PublicMcpProtocol.AnyProtocolAdapter
+  readonly protocolForInternalTag: (tag: string) => PublicMcpProtocol.AnyProtocolAdapter
+  readonly routeClientRequest: (
+    protocol: PublicMcpProtocol.AnyProtocolAdapter,
+    request: RpcMessage.RequestEncoded
+  ) => RpcMessage.RequestEncoded
+  readonly prepareRequest: (
+    clientId: number,
+    headers: Headers.Headers,
+    request: RpcMessage.RequestEncoded
+  ) => Effect.Effect<PreparedRequest, unknown>
+  readonly resolveRequest: (clientId: number, headers: Headers.Headers) => RequestBinding | undefined
+  readonly admitHttp: (headers: Headers.Headers, input: Result.Result<unknown, unknown>) => HttpAdmission
+  readonly effectLogLevel: (
+    clientId: number,
+    headers: Headers.Headers,
+    fallback: LogLevel.LogLevel
+  ) => LogLevel.LogLevel
+  readonly disconnect: (clientId: number) => void
+  readonly deliveryClientIds: () => Iterable<number>
+  readonly canDeliver: (
+    clientId: number,
+    headers: Headers.Headers,
+    notification: McpCore.ServerNotification,
+    fallbackLogLevel: LogLevel.LogLevel
+  ) => boolean
+  readonly installHandlers: (
+    options: HandlerInstallationOptions
+  ) => Effect.Effect<Context.Context<never>, never, unknown>
+}
+
+/** @internal */
+export class ServerRuntime extends Context.Service<ServerRuntime, ServerRuntimeShape>()(
+  "effect/ai/McpRuntime/ServerRuntime"
+) {}
+
+/** @internal */
+export const selectStatefulProtocol = <Protocol extends PublicMcpProtocol.AnyProtocolAdapter>(
+  protocols: ReadonlyArray<Protocol>,
+  offeredVersion: unknown
+): Protocol | undefined =>
+  protocols.find((protocol) => protocol.runtime._tag === "Stateful" && protocol.protocolVersion === offeredVersion) ??
+    protocols.find((protocol) => protocol.runtime._tag === "Stateful")
+
+/** @internal */
+export const make = Effect.fnUntraced(function*(
+  protocols: NonEmptyReadonlyArray<PublicMcpProtocol.AnyProtocolAdapter>
+) {
+  const statefulProtocol = protocols.find((protocol) => protocol.runtime._tag === "Stateful")
+  const stateful = statefulProtocol === undefined ? undefined : McpStatefulRuntime.make()
+  const protocolVersions = protocols.map((protocol) => protocol.protocolVersion)
+  let statelessDescriptor: PublicMcpProtocol.StatelessRuntimeDescriptor | undefined
+  let statelessProtocol: PublicMcpProtocol.AnyProtocolAdapter | undefined
+  for (const protocol of protocols) {
+    if (protocol.runtime._tag !== "Stateless") {
+      continue
+    }
+    if (statelessDescriptor !== undefined) {
+      return yield* new Cause.IllegalArgumentError(
+        "MCP runtime supports at most one stateless protocol"
+      )
+    }
+    statelessDescriptor = protocol.runtime
+    statelessProtocol = protocol
+  }
+  const registry = yield* McpProtocolRegistry.make(protocols)
+  const selectHttpProtocol = (headers: Headers.Headers, input: unknown): HttpProtocolSelection => {
+    const protocolVersion = headers[MCP_PROTOCOL_VERSION_HEADER]
+    const sessionId = headers[MCP_SESSION_ID_HEADER]
+    const inputRecord = asRecord(input)
+    const metadata = asRecord(asRecord(inputRecord?.params)?._meta)
+    const claim = protocolVersionClaim(metadata)
+    const id = inputRecord?.id
+    const isInitialize = inputRecord?.jsonrpc === "2.0" && inputRecord.method === "initialize" &&
+      (typeof id === "string" || typeof id === "number")
+    const isCancellationNotification = inputRecord?.jsonrpc === "2.0" &&
+      inputRecord.method === "notifications/cancelled" && id === undefined
+    const isStatelessRequest = claim.present || ((!isInitialize || stateful === undefined) &&
+      statelessProtocol !== undefined &&
+      (protocolVersion === statelessProtocol.protocolVersion ||
+        (stateful === undefined && inputRecord?.jsonrpc === "2.0" &&
+          typeof inputRecord.method === "string" && (typeof id === "string" || typeof id === "number"))))
+    if (isStatelessRequest) {
+      if (protocolVersion === undefined) {
+        return headerMismatch("MCP-Protocol-Version header is required")
+      }
+      if (!isCancellationNotification && (metadata === undefined || typeof claim.value !== "string")) {
+        return {
+          _tag: "Rejected",
+          status: 400,
+          error: {
+            code: PublicMcpSchema.INVALID_PARAMS_ERROR_CODE,
+            message: "Required request metadata is missing"
+          }
+        }
+      }
+      if ((!isCancellationNotification || claim.present) && claim.value !== protocolVersion) {
+        return headerMismatch("MCP-Protocol-Version header does not match request metadata")
+      }
+      if (!isCancellationNotification && asRecord(metadata?.[CLIENT_CAPABILITIES_METADATA_KEY]) === undefined) {
+        return {
+          _tag: "Rejected",
+          status: 400,
+          error: {
+            code: PublicMcpSchema.INVALID_PARAMS_ERROR_CODE,
+            message: `${CLIENT_CAPABILITIES_METADATA_KEY} request metadata is required`
+          }
+        }
+      }
+      if (statelessProtocol === undefined || protocolVersion !== statelessProtocol.protocolVersion) {
+        return {
+          _tag: "Rejected",
+          status: 400,
+          error: {
+            code: UNSUPPORTED_PROTOCOL_VERSION_ERROR_CODE,
+            message: `Unsupported protocol version '${protocolVersion}'`,
+            data: {
+              supported: protocolVersions,
+              requested: protocolVersion
+            }
+          }
+        }
+      }
+      const method = inputRecord?.method
+      if (typeof method !== "string" || headers[MCP_METHOD_HEADER] !== method) {
+        return headerMismatch("Mcp-Method header does not match request method")
+      }
+      const nameKey = routingNameKey(method)
+      if (nameKey !== undefined) {
+        const name = asRecord(inputRecord?.params)?.[nameKey]
+        const header = headers[MCP_NAME_HEADER]
+        if (typeof name !== "string" || header === undefined || McpProtocol.decodeRoutingHeader(header) !== name) {
+          return headerMismatch("Mcp-Name header does not match request parameters")
+        }
+      }
+      return { _tag: "Accepted", binding: undefined, protocol: statelessProtocol }
+    }
+    const binding = sessionId === undefined ? undefined : stateful?.resolveSessionId(sessionId)
+    if (sessionId !== undefined && binding === undefined) {
+      return { _tag: "Rejected", status: 404 }
+    }
+    if (
+      !isInitialize &&
+      protocolVersion !== undefined &&
+      !registry.protocols.some((protocol) => protocol.protocolVersion === protocolVersion)
+    ) {
+      return { _tag: "Rejected", status: 400 }
+    }
+    if (
+      !isInitialize &&
+      binding?.protocol.runtime.transport.http.requiresVersionHeader === true &&
+      protocolVersion !== binding.protocol.protocolVersion
+    ) {
+      return { _tag: "Rejected", status: 400 }
+    }
+    return { _tag: "Accepted", binding, protocol: binding?.protocol }
+  }
+  return ServerRuntime.of({
+    protocols: registry.protocols,
+    clientRpcs: registry.clientRpcs,
+    selectProtocol: registry.select,
+    protocolForInternalTag: registry.protocolForInternalTag,
+    routeClientRequest: registry.routeClientRequest,
+    prepareRequest: Effect.fnUntraced(function*(clientId, headers, request) {
+      const metadata = asRecord(request.payload)?._meta
+      const claim = protocolVersionClaim(metadata)
+      const requestedVersion = typeof claim.value === "string" ? claim.value : undefined
+      const binding = claim.present ? undefined : stateful?.resolve(clientId, headers)
+      let protocol: PublicMcpProtocol.AnyProtocolAdapter
+      if (claim.present) {
+        protocol = registry.protocols.find((protocol) => protocol.protocolVersion === requestedVersion) ??
+          statelessProtocol ?? registry.protocols[0]
+      } else if (binding !== undefined) {
+        protocol = binding.protocol
+      } else if (request.tag === "initialize") {
+        const offeredVersion = (request.payload as any)?.protocolVersion
+        const selected = selectStatefulProtocol(registry.protocols, offeredVersion)
+        if (selected === undefined) {
+          return yield* new McpProtocol.ProtocolError({
+            code: UNSUPPORTED_PROTOCOL_VERSION_ERROR_CODE,
+            message: `initialize is not supported by the configured MCP protocols (requested '${offeredVersion}')`
+          })
+        }
+        protocol = selected
+      } else {
+        protocol = registry.protocols[0]
+      }
+      if (protocol.runtime._tag === "Stateful") {
+        return { protocol, binding }
+      }
+      if (request.isNotification && request.tag === "notifications/cancelled") {
+        return { protocol }
+      }
+      if (statelessDescriptor === undefined) {
+        return yield* Effect.die("MCP stateless runtime invariant failed")
+      }
+      if (requestedVersion !== undefined && requestedVersion !== protocol.protocolVersion) {
+        return yield* new McpProtocol.ProtocolError({
+          code: UNSUPPORTED_PROTOCOL_VERSION_ERROR_CODE,
+          message: `Unsupported protocol version '${requestedVersion}'`,
+          data: { supported: protocolVersions, requested: requestedVersion }
+        })
+      }
+      const decodedProfile = yield* statelessDescriptor.profileFromRequestMetadata(metadata)
+      const profile: McpCore.NegotiatedProtocolProfile<string> = {
+        protocolVersion: decodedProfile.protocolVersion,
+        clientCapabilities: decodedProfile.clientCapabilities,
+        clientInfo: decodedProfile.clientInfo,
+        requestMetadata: decodedProfile.requestMetadata
+      }
+      const requestContext = PublicMcpSchema.McpRequestContext.of({
+        clientId,
+        protocolVersion: profile.protocolVersion,
+        clientCapabilities: profile.clientCapabilities,
+        clientInfo: profile.clientInfo,
+        requestMetadata: profile.requestMetadata
+      })
+      return { protocol, profile, requestContext }
+    }),
+    resolveRequest: (clientId, headers) => stateful?.resolve(clientId, headers),
+    admitHttp: (headers, parsed) => {
+      const reject = (status: number, error?: unknown, id: string | number | null = null): HttpAdmission => ({
+        _tag: "Rejected",
+        response: error === undefined
+          ? HttpServerResponse.empty({ status })
+          : HttpServerResponse.jsonUnsafe({ jsonrpc: "2.0", id, error }, { status })
+      })
+      if (Result.isFailure(parsed)) {
+        const version = headers[MCP_PROTOCOL_VERSION_HEADER]
+        if (version !== undefined && !registry.protocols.some((protocol) => protocol.protocolVersion === version)) {
+          return reject(400)
+        }
+        const admission = selectHttpProtocol(headers, undefined)
+        return admission._tag === "Rejected" && admission.error === undefined
+          ? reject(admission.status)
+          : reject(200, new PublicMcpSchema.ParseError({ message: "Parse error" }))
+      }
+      const input = parsed.success
+      if (Array.isArray(input)) {
+        if (input.length === 0) {
+          return reject(400, new PublicMcpSchema.InvalidRequest({ message: "Invalid Request" }))
+        }
+        const admission = selectHttpProtocol(headers, input)
+        if (
+          admission._tag === "Rejected" ||
+          input.some(hasRequestProtocolVersion) ||
+          input.some((message) => Predicate.hasProperty(message, "method") && message.method === "initialize") ||
+          admission.binding?.protocol.runtime.transport.jsonRpc.acceptsBatches !== true
+        ) {
+          return reject(400)
+        }
+        return {
+          _tag: "Accepted",
+          acknowledge: !input.some((message) =>
+            Predicate.hasProperty(message, "method") && Predicate.hasProperty(message, "id")
+          ),
+          isSubscription: false
+        }
+      }
+      const hasId = Predicate.hasProperty(input, "id")
+      const id = hasId && (typeof input.id === "string" || typeof input.id === "number") ? input.id : null
+      const isJsonRpc = Predicate.hasProperty(input, "jsonrpc") && input.jsonrpc === "2.0"
+      const hasValidRequestId = !hasId || typeof input.id === "string" || typeof input.id === "number"
+      const isRequest = isJsonRpc && hasValidRequestId &&
+        Predicate.hasProperty(input, "method") && typeof input.method === "string"
+      const hasValidResponseId = hasId &&
+        (typeof input.id === "string" || typeof input.id === "number" || input.id === null)
+      const hasResult = Predicate.hasProperty(input, "result")
+      const hasError = Predicate.hasProperty(input, "error")
+      const isResponse = isJsonRpc && hasValidResponseId && hasResult !== hasError
+      const admission = selectHttpProtocol(headers, input)
+      if (admission._tag === "Rejected") {
+        return reject(admission.status, admission.error, id)
+      }
+      if (!isRequest && !isResponse) {
+        return reject(200, new PublicMcpSchema.InvalidRequest({ message: "Invalid Request" }), id)
+      }
+      const isInitialize = Predicate.hasProperty(input, "method") && input.method === "initialize"
+      const hasSession = headers[MCP_SESSION_ID_HEADER] !== undefined
+      if (isInitialize ? hasSession : !hasSession && admission.protocol?.runtime._tag !== "Stateless") {
+        return reject(400)
+      }
+      if (
+        isRequest && admission.protocol?.runtime._tag === "Stateless" &&
+        !((admission.protocol as unknown as McpProtocol.ProtocolAdapter).handlerRpcs?.requests.has(
+          input.method as string
+        ) ??
+          admission.protocol.clientRpcs.requests.has(input.method as string))
+      ) {
+        return reject(404, new PublicMcpSchema.MethodNotFound({ message: `Method not found: ${input.method}` }), id)
+      }
+      return {
+        _tag: "Accepted",
+        acknowledge: !isRequest || !hasId,
+        isSubscription: Predicate.hasProperty(input, "method") && input.method === "subscriptions/listen"
+      }
+    },
+    effectLogLevel: (clientId, headers, fallback) => stateful?.effectLogLevel(clientId, headers, fallback) ?? fallback,
+    disconnect: (clientId) => stateful?.disconnect(clientId),
+    deliveryClientIds: () => stateful?.initializedClientIds() ?? [],
+    canDeliver: (clientId, headers, notification, fallback) =>
+      stateful?.canDeliver(clientId, headers, notification, fallback) ?? true,
+    installHandlers: Effect.fnUntraced(function*(options) {
+      const contextMap = new Map<string, unknown>()
+      const installationContext: McpProtocol.HandlerInstallationContext = {
+        subscribeServerNotifications: options.subscribeServerNotifications,
+        ...(options.sendNotification === undefined ? {} : { sendNotification: options.sendNotification }),
+        ...(options.markSubscriptionCancelled === undefined
+          ? {}
+          : { markSubscriptionCancelled: options.markSubscriptionCancelled }),
+        ...(options.terminateSubscription === undefined
+          ? {}
+          : { terminateSubscription: options.terminateSubscription }),
+        supportedVersions: protocolVersions,
+        serverInfo: options.serverInfo,
+        registrationPresence: options.core.registrationPresence
+      }
+      const handlerTarget = registry.handlerTarget(contextMap, installationContext)
+      for (const protocol of registry.protocols) {
+        if (protocol.runtime._tag === "Stateless") {
+          yield* protocol.installHandlers(options.core, undefined, handlerTarget)
+          continue
+        }
+        if (stateful === undefined) {
+          return yield* Effect.die("MCP sessionful runtime invariant failed")
+        }
+        yield* handlerTarget.install(protocol, PingRpcs, PingRpcs.of({ ping: () => Effect.succeed({}) }))
+        const lifecycle: McpProtocol.LifecycleRuntime = {
+          initialize: Effect.fnUntraced(function*(protocolVersion, profile, clientId) {
+            const presence = yield* options.core.registrationPresence
+            return yield* Effect.withFiber((fiber) => {
+              const httpRequest = Context.getOrUndefined(fiber.context, HttpServerRequest.HttpServerRequest)
+              const capabilities: McpCore.CanonicalServerCapabilities = {
+                completions: true,
+                logging: true,
+                ...(presence.tools ? { tools: { listChanged: true } } : {}),
+                ...(presence.resources
+                  ? { resources: { listChanged: true, subscribe: httpRequest === undefined } }
+                  : {}),
+                ...(presence.prompts ? { prompts: { listChanged: true } } : {}),
+                ...(options.serverInfo.extensions ? { extensions: options.serverInfo.extensions } : {})
+              }
+              const initializePayload = PublicMcpSchema.Initialize.payloadSchema.make({
+                protocolVersion,
+                capabilities: profile.clientCapabilities,
+                clientInfo: profile.clientInfo!,
+                _meta: profile.requestMetadata
+              })
+              const registration: McpStatefulRuntime.Registration = {
+                initializePayload,
+                negotiatedProfile: profile,
+                protocol: protocol as PublicMcpProtocol.ProtocolAdapter,
+                supportsResourceSubscriptions: httpRequest === undefined &&
+                  capabilities.resources?.subscribe === true,
+                logLevel: options.defaultLogLevel
+              }
+              if (httpRequest !== undefined) {
+                const sessionId = crypto.randomUUID()
+                stateful.registerHttp(sessionId, registration)
+                appendPreResponseHandlerUnsafe(
+                  httpRequest,
+                  (_request, response) =>
+                    Effect.succeed(HttpServerResponse.setHeaders(response, {
+                      [MCP_SESSION_ID_HEADER]: sessionId,
+                      [MCP_PROTOCOL_VERSION_HEADER]: protocol.protocolVersion
+                    }))
+                )
+              } else {
+                stateful.registerConnection(clientId, registration)
+              }
+              return Effect.succeed({
+                capabilities,
+                instructions: options.serverInfo.instructions,
+                serverInfo: PublicMcpSchema.Implementation.make({
+                  name: options.serverInfo.name,
+                  version: options.serverInfo.version,
+                  description: options.serverInfo.description,
+                  websiteUrl: options.serverInfo.websiteUrl,
+                  icons: options.serverInfo.icons
+                })
+              })
+            })
+          }),
+          setLogLevel: stateful.setLogLevel,
+          subscribe: stateful.subscribe,
+          unsubscribe: stateful.unsubscribe,
+          clientNotification: Effect.fnUntraced(function*(notification, clientId) {
+            if (notification._tag === "Initialized") {
+              stateful.markInitialized(clientId)
+            }
+          })
+        }
+        yield* protocol.installHandlers(options.core, lifecycle, handlerTarget)
+      }
+      return Context.makeUnsafe(contextMap)
+    })
+  })
+})
+
+/** @internal */
+export const layer = (
+  protocols: NonEmptyReadonlyArray<PublicMcpProtocol.AnyProtocolAdapter>
+): Layer.Layer<ServerRuntime, Cause.IllegalArgumentError> => Layer.effect(ServerRuntime)(make(protocols))
diff --git a/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2024_11_05.ts b/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2024_11_05.ts
index ea4dc4742..dfa15eb7f 100644
--- a/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2024_11_05.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2024_11_05.ts
@@ -12,8 +12,10 @@ import * as SchemaGetter from "../../../../SchemaGetter.ts"
 import * as Rpc from "../../../rpc/Rpc.ts"
 import * as RpcGroup from "../../../rpc/RpcGroup.ts"
 
+/** @internal */
 export const protocolVersion = "2024-11-05"
 
+/** @internal */
 export const optional = <S extends Schema.Constraint>(
   schema: S
 ): Schema.decodeTo<Schema.optional<S>, Schema.optionalKey<S>> =>
@@ -25,9 +27,13 @@ export const optional = <S extends Schema.Constraint>(
   )
 const JsonObject = Schema.JsonObject
 
+/** @internal */
 export const RequestId = Schema.Union([Schema.String, Schema.Finite])
+/** @internal */
 export const ProgressToken = Schema.Union([Schema.String, Schema.Finite])
+/** @internal */
 export const Role = Schema.Literals(["user", "assistant"])
+/** @internal */
 export const LoggingLevel = Schema.Literals([
   "debug",
   "info",
@@ -39,35 +45,45 @@ export const LoggingLevel = Schema.Literals([
   "emergency"
 ])
 
+/** @internal */
 export const RequestMeta = Schema.Struct({
-  _meta: optional(Schema.Struct({
-    progressToken: optional(ProgressToken)
-  }))
+  _meta: optional(Schema.StructWithRest(
+    Schema.Struct({
+      progressToken: optional(ProgressToken)
+    }),
+    [Schema.JsonObject]
+  ))
 })
 
+/** @internal */
 export const NotificationMeta = Schema.Struct({
   _meta: optional(JsonObject)
 })
 
+/** @internal */
 export const ResultMeta = Schema.Struct({
   _meta: optional(JsonObject)
 })
 
+/** @internal */
 export const PaginatedRequest = Schema.Struct({
   ...RequestMeta.fields,
   cursor: optional(Schema.String)
 })
 
+/** @internal */
 export const PaginatedResult = Schema.Struct({
   ...ResultMeta.fields,
   nextCursor: optional(Schema.String)
 })
 
+/** @internal */
 export const Implementation = Schema.Struct({
   name: Schema.String,
   version: Schema.String
 })
 
+/** @internal */
 export const ClientCapabilities = Schema.Struct({
   experimental: optional(Schema.Record(Schema.String, JsonObject)),
   roots: optional(Schema.Struct({
@@ -76,6 +92,7 @@ export const ClientCapabilities = Schema.Struct({
   sampling: optional(JsonObject)
 })
 
+/** @internal */
 export const ServerCapabilities = Schema.Struct({
   experimental: optional(Schema.Record(Schema.String, JsonObject)),
   logging: optional(JsonObject),
@@ -91,41 +108,49 @@ export const ServerCapabilities = Schema.Struct({
   }))
 })
 
+/** @internal */
 export const McpError = Schema.Struct({
   code: Schema.Int,
   message: Schema.String,
   data: optional(Schema.Any)
 })
+/** @internal */
 export type McpError = typeof McpError.Type
 
+/** @internal */
 export const Annotation = Schema.Struct({
   audience: optional(Schema.Array(Role)),
   priority: optional(Schema.Finite.check(Schema.isBetween({ minimum: 0, maximum: 1 })))
 })
 
+/** @internal */
 export const TextResourceContents = Schema.Struct({
   uri: Schema.String,
   mimeType: optional(Schema.String),
   text: Schema.String
 })
 
+/** @internal */
 export const BlobResourceContents = Schema.Struct({
   uri: Schema.String,
   mimeType: optional(Schema.String),
   blob: Schema.String
 })
 
+/** @internal */
 export const ResourceContents = Schema.Union([
   TextResourceContents,
   BlobResourceContents
 ])
 
+/** @internal */
 export const TextContent = Schema.Struct({
   type: Schema.Literal("text"),
   text: Schema.String,
   annotations: optional(Annotation)
 })
 
+/** @internal */
 export const ImageContent = Schema.Struct({
   type: Schema.Literal("image"),
   data: Schema.String,
@@ -133,23 +158,27 @@ export const ImageContent = Schema.Struct({
   annotations: optional(Annotation)
 })
 
+/** @internal */
 export const EmbeddedResource = Schema.Struct({
   type: Schema.Literal("resource"),
   resource: ResourceContents,
   annotations: optional(Annotation)
 })
 
+/** @internal */
 export const PromptOrToolContent = Schema.Union([
   TextContent,
   ImageContent,
   EmbeddedResource
 ])
 
+/** @internal */
 export const SamplingContent = Schema.Union([
   TextContent,
   ImageContent
 ])
 
+/** @internal */
 export const Resource = Schema.Struct({
   uri: Schema.String,
   name: Schema.String,
@@ -159,6 +188,7 @@ export const Resource = Schema.Struct({
   annotations: optional(Annotation)
 })
 
+/** @internal */
 export const ResourceTemplate = Schema.Struct({
   uriTemplate: Schema.String,
   name: Schema.String,
@@ -167,39 +197,46 @@ export const ResourceTemplate = Schema.Struct({
   annotations: optional(Annotation)
 })
 
+/** @internal */
 export const PromptArgument = Schema.Struct({
   name: Schema.String,
   description: optional(Schema.String),
   required: optional(Schema.Boolean)
 })
 
+/** @internal */
 export const Prompt = Schema.Struct({
   name: Schema.String,
   description: optional(Schema.String),
   arguments: optional(Schema.Array(PromptArgument))
 })
 
+/** @internal */
 export const PromptMessage = Schema.Struct({
   role: Role,
   content: PromptOrToolContent
 })
 
+/** @internal */
 export const ToolInputSchema = Schema.Struct({
   type: Schema.Literal("object"),
   properties: optional(Schema.Record(Schema.String, JsonObject)),
   required: optional(Schema.Array(Schema.String))
 })
 
+/** @internal */
 export const Tool = Schema.Struct({
   name: Schema.String,
   description: optional(Schema.String),
   inputSchema: ToolInputSchema
 })
 
+/** @internal */
 export const ModelHint = Schema.Struct({
   name: optional(Schema.String)
 })
 
+/** @internal */
 export const ModelPreferences = Schema.Struct({
   hints: optional(Schema.Array(ModelHint)),
   costPriority: optional(Schema.Finite.check(Schema.isBetween({ minimum: 0, maximum: 1 }))),
@@ -207,26 +244,31 @@ export const ModelPreferences = Schema.Struct({
   intelligencePriority: optional(Schema.Finite.check(Schema.isBetween({ minimum: 0, maximum: 1 })))
 })
 
+/** @internal */
 export const SamplingMessage = Schema.Struct({
   role: Role,
   content: SamplingContent
 })
 
+/** @internal */
 export const ResourceReference = Schema.Struct({
   type: Schema.Literal("ref/resource"),
   uri: Schema.String
 })
 
+/** @internal */
 export const PromptReference = Schema.Struct({
   type: Schema.Literal("ref/prompt"),
   name: Schema.String
 })
 
+/** @internal */
 export const Root = Schema.Struct({
   uri: Schema.String,
   name: optional(Schema.String)
 })
 
+/** @internal */
 export const InitializeResult = Schema.Struct({
   ...ResultMeta.fields,
   protocolVersion: Schema.String,
@@ -235,43 +277,51 @@ export const InitializeResult = Schema.Struct({
   instructions: optional(Schema.String)
 })
 
+/** @internal */
 export const ListResourcesResult = Schema.Struct({
   ...PaginatedResult.fields,
   resources: Schema.Array(Resource)
 })
 
+/** @internal */
 export const ListResourceTemplatesResult = Schema.Struct({
   ...PaginatedResult.fields,
   resourceTemplates: Schema.Array(ResourceTemplate)
 })
 
+/** @internal */
 export const ReadResourceResult = Schema.Struct({
   ...ResultMeta.fields,
   contents: Schema.Array(ResourceContents)
 })
 
+/** @internal */
 export const ListPromptsResult = Schema.Struct({
   ...PaginatedResult.fields,
   prompts: Schema.Array(Prompt)
 })
 
+/** @internal */
 export const GetPromptResult = Schema.Struct({
   ...ResultMeta.fields,
   description: optional(Schema.String),
   messages: Schema.Array(PromptMessage)
 })
 
+/** @internal */
 export const ListToolsResult = Schema.Struct({
   ...PaginatedResult.fields,
   tools: Schema.Array(Tool)
 })
 
+/** @internal */
 export const CallToolResult = Schema.Struct({
   ...ResultMeta.fields,
   content: Schema.Array(PromptOrToolContent),
   isError: optional(Schema.Boolean)
 })
 
+/** @internal */
 export const CreateMessageResult = Schema.Struct({
   ...ResultMeta.fields,
   role: Role,
@@ -280,6 +330,7 @@ export const CreateMessageResult = Schema.Struct({
   stopReason: optional(Schema.String)
 })
 
+/** @internal */
 export const CompleteResult = Schema.Struct({
   ...ResultMeta.fields,
   completion: Schema.Struct({
@@ -289,17 +340,20 @@ export const CompleteResult = Schema.Struct({
   })
 })
 
+/** @internal */
 export const ListRootsResult = Schema.Struct({
   ...ResultMeta.fields,
   roots: Schema.Array(Root)
 })
 
+/** @internal */
 export class Ping extends Rpc.make("ping", {
   success: ResultMeta,
   error: McpError,
   payload: Schema.UndefinedOr(RequestMeta)
 }) {}
 
+/** @internal */
 export class Initialize extends Rpc.make("initialize", {
   success: InitializeResult,
   error: McpError,
@@ -311,6 +365,7 @@ export class Initialize extends Rpc.make("initialize", {
   }
 }) {}
 
+/** @internal */
 export class Complete extends Rpc.make("completion/complete", {
   success: CompleteResult,
   error: McpError,
@@ -324,6 +379,7 @@ export class Complete extends Rpc.make("completion/complete", {
   }
 }) {}
 
+/** @internal */
 export class SetLevel extends Rpc.make("logging/setLevel", {
   success: ResultMeta,
   error: McpError,
@@ -333,6 +389,7 @@ export class SetLevel extends Rpc.make("logging/setLevel", {
   }
 }) {}
 
+/** @internal */
 export class GetPrompt extends Rpc.make("prompts/get", {
   success: GetPromptResult,
   error: McpError,
@@ -343,24 +400,28 @@ export class GetPrompt extends Rpc.make("prompts/get", {
   }
 }) {}
 
+/** @internal */
 export class ListPrompts extends Rpc.make("prompts/list", {
   success: ListPromptsResult,
   error: McpError,
   payload: Schema.UndefinedOr(PaginatedRequest)
 }) {}
 
+/** @internal */
 export class ListResources extends Rpc.make("resources/list", {
   success: ListResourcesResult,
   error: McpError,
   payload: Schema.UndefinedOr(PaginatedRequest)
 }) {}
 
+/** @internal */
 export class ListResourceTemplates extends Rpc.make("resources/templates/list", {
   success: ListResourceTemplatesResult,
   error: McpError,
   payload: Schema.UndefinedOr(PaginatedRequest)
 }) {}
 
+/** @internal */
 export class ReadResource extends Rpc.make("resources/read", {
   success: ReadResourceResult,
   error: McpError,
@@ -370,6 +431,7 @@ export class ReadResource extends Rpc.make("resources/read", {
   }
 }) {}
 
+/** @internal */
 export class Subscribe extends Rpc.make("resources/subscribe", {
   success: ResultMeta,
   error: McpError,
@@ -379,6 +441,7 @@ export class Subscribe extends Rpc.make("resources/subscribe", {
   }
 }) {}
 
+/** @internal */
 export class Unsubscribe extends Rpc.make("resources/unsubscribe", {
   success: ResultMeta,
   error: McpError,
@@ -388,6 +451,7 @@ export class Unsubscribe extends Rpc.make("resources/unsubscribe", {
   }
 }) {}
 
+/** @internal */
 export class CallTool extends Rpc.make("tools/call", {
   success: CallToolResult,
   error: McpError,
@@ -398,12 +462,14 @@ export class CallTool extends Rpc.make("tools/call", {
   }
 }) {}
 
+/** @internal */
 export class ListTools extends Rpc.make("tools/list", {
   success: ListToolsResult,
   error: McpError,
   payload: Schema.UndefinedOr(PaginatedRequest)
 }) {}
 
+/** @internal */
 export class CreateMessage extends Rpc.make("sampling/createMessage", {
   success: CreateMessageResult,
   error: McpError,
@@ -420,12 +486,14 @@ export class CreateMessage extends Rpc.make("sampling/createMessage", {
   }
 }) {}
 
+/** @internal */
 export class ListRoots extends Rpc.make("roots/list", {
   success: ListRootsResult,
   error: McpError,
   payload: Schema.UndefinedOr(RequestMeta)
 }) {}
 
+/** @internal */
 export class CancelledNotification extends Rpc.make("notifications/cancelled", {
   payload: {
     ...NotificationMeta.fields,
@@ -434,6 +502,7 @@ export class CancelledNotification extends Rpc.make("notifications/cancelled", {
   }
 }) {}
 
+/** @internal */
 export class ProgressNotification extends Rpc.make("notifications/progress", {
   payload: {
     ...NotificationMeta.fields,
@@ -443,14 +512,17 @@ export class ProgressNotification extends Rpc.make("notifications/progress", {
   }
 }) {}
 
+/** @internal */
 export class InitializedNotification extends Rpc.make("notifications/initialized", {
   payload: Schema.UndefinedOr(NotificationMeta)
 }) {}
 
+/** @internal */
 export class RootsListChangedNotification extends Rpc.make("notifications/roots/list_changed", {
   payload: Schema.UndefinedOr(NotificationMeta)
 }) {}
 
+/** @internal */
 export class LoggingMessageNotification extends Rpc.make("notifications/message", {
   payload: {
     ...NotificationMeta.fields,
@@ -460,6 +532,7 @@ export class LoggingMessageNotification extends Rpc.make("notifications/message"
   }
 }) {}
 
+/** @internal */
 export class ResourceUpdatedNotification extends Rpc.make("notifications/resources/updated", {
   payload: {
     ...NotificationMeta.fields,
@@ -467,18 +540,22 @@ export class ResourceUpdatedNotification extends Rpc.make("notifications/resourc
   }
 }) {}
 
+/** @internal */
 export class ResourceListChangedNotification extends Rpc.make("notifications/resources/list_changed", {
   payload: Schema.UndefinedOr(NotificationMeta)
 }) {}
 
+/** @internal */
 export class ToolListChangedNotification extends Rpc.make("notifications/tools/list_changed", {
   payload: Schema.UndefinedOr(NotificationMeta)
 }) {}
 
+/** @internal */
 export class PromptListChangedNotification extends Rpc.make("notifications/prompts/list_changed", {
   payload: Schema.UndefinedOr(NotificationMeta)
 }) {}
 
+/** @internal */
 export class ClientRequestRpcs extends RpcGroup.make(
   Ping,
   Initialize,
@@ -495,6 +572,7 @@ export class ClientRequestRpcs extends RpcGroup.make(
   ListTools
 ) {}
 
+/** @internal */
 export class ClientNotificationRpcs extends RpcGroup.make(
   CancelledNotification,
   ProgressNotification,
@@ -502,14 +580,14 @@ export class ClientNotificationRpcs extends RpcGroup.make(
   RootsListChangedNotification
 ) {}
 
-export class ClientRpcs extends ClientRequestRpcs.merge(ClientNotificationRpcs) {}
-
+/** @internal */
 export class ServerRequestRpcs extends RpcGroup.make(
   Ping,
   CreateMessage,
   ListRoots
 ) {}
 
+/** @internal */
 export class ServerNotificationRpcs extends RpcGroup.make(
   CancelledNotification,
   ProgressNotification,
diff --git a/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2025_03_26.ts b/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2025_03_26.ts
index 64b4bdbd8..e537d85e2 100644
--- a/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2025_03_26.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2025_03_26.ts
@@ -14,15 +14,18 @@ import * as Previous from "./v2024_11_05.ts"
 
 export * from "./v2024_11_05.ts"
 
+/** @internal */
 export const protocolVersion = "2025-03-26"
 
 const optional = Previous.optional
 
+/** @internal */
 export const ServerCapabilities = Schema.Struct({
   ...Previous.ServerCapabilities.fields,
   completions: optional(Schema.Struct({}))
 })
 
+/** @internal */
 export const AudioContent = Schema.Struct({
   type: Schema.Literal("audio"),
   data: Schema.String,
@@ -30,6 +33,7 @@ export const AudioContent = Schema.Struct({
   annotations: optional(Previous.Annotation)
 })
 
+/** @internal */
 export const PromptOrToolContent = Schema.Union([
   Previous.TextContent,
   Previous.ImageContent,
@@ -37,22 +41,26 @@ export const PromptOrToolContent = Schema.Union([
   Previous.EmbeddedResource
 ])
 
+/** @internal */
 export const SamplingContent = Schema.Union([
   Previous.TextContent,
   Previous.ImageContent,
   AudioContent
 ])
 
+/** @internal */
 export const PromptMessage = Schema.Struct({
   role: Previous.Role,
   content: PromptOrToolContent
 })
 
+/** @internal */
 export const SamplingMessage = Schema.Struct({
   role: Previous.Role,
   content: SamplingContent
 })
 
+/** @internal */
 export const ToolAnnotations = Schema.Struct({
   title: optional(Schema.String),
   readOnlyHint: optional(Schema.Boolean),
@@ -61,11 +69,13 @@ export const ToolAnnotations = Schema.Struct({
   openWorldHint: optional(Schema.Boolean)
 })
 
+/** @internal */
 export const Tool = Schema.Struct({
   ...Previous.Tool.fields,
   annotations: optional(ToolAnnotations)
 })
 
+/** @internal */
 export const InitializeResult = Schema.Struct({
   ...Previous.ResultMeta.fields,
   protocolVersion: Schema.String,
@@ -74,23 +84,27 @@ export const InitializeResult = Schema.Struct({
   instructions: optional(Schema.String)
 })
 
+/** @internal */
 export const GetPromptResult = Schema.Struct({
   ...Previous.ResultMeta.fields,
   description: optional(Schema.String),
   messages: Schema.Array(PromptMessage)
 })
 
+/** @internal */
 export const ListToolsResult = Schema.Struct({
   ...Previous.PaginatedResult.fields,
   tools: Schema.Array(Tool)
 })
 
+/** @internal */
 export const CallToolResult = Schema.Struct({
   ...Previous.ResultMeta.fields,
   content: Schema.Array(PromptOrToolContent),
   isError: optional(Schema.Boolean)
 })
 
+/** @internal */
 export const CreateMessageResult = Schema.Struct({
   ...Previous.ResultMeta.fields,
   role: Previous.Role,
@@ -99,6 +113,7 @@ export const CreateMessageResult = Schema.Struct({
   stopReason: optional(Schema.String)
 })
 
+/** @internal */
 export class Initialize extends Rpc.make("initialize", {
   success: InitializeResult,
   error: Previous.McpError,
@@ -110,6 +125,7 @@ export class Initialize extends Rpc.make("initialize", {
   }
 }) {}
 
+/** @internal */
 export class GetPrompt extends Rpc.make("prompts/get", {
   success: GetPromptResult,
   error: Previous.McpError,
@@ -120,12 +136,14 @@ export class GetPrompt extends Rpc.make("prompts/get", {
   }
 }) {}
 
+/** @internal */
 export class ListTools extends Rpc.make("tools/list", {
   success: ListToolsResult,
   error: Previous.McpError,
   payload: Schema.UndefinedOr(Previous.PaginatedRequest)
 }) {}
 
+/** @internal */
 export class CallTool extends Rpc.make("tools/call", {
   success: CallToolResult,
   error: Previous.McpError,
@@ -136,6 +154,7 @@ export class CallTool extends Rpc.make("tools/call", {
   }
 }) {}
 
+/** @internal */
 export class CreateMessage extends Rpc.make("sampling/createMessage", {
   success: CreateMessageResult,
   error: Previous.McpError,
@@ -152,6 +171,7 @@ export class CreateMessage extends Rpc.make("sampling/createMessage", {
   }
 }) {}
 
+/** @internal */
 export class ProgressNotification extends Rpc.make("notifications/progress", {
   payload: {
     ...Previous.NotificationMeta.fields,
@@ -162,6 +182,7 @@ export class ProgressNotification extends Rpc.make("notifications/progress", {
   }
 }) {}
 
+/** @internal */
 export class ClientRequestRpcs extends RpcGroup.make(
   Previous.Ping,
   Initialize,
@@ -178,6 +199,7 @@ export class ClientRequestRpcs extends RpcGroup.make(
   ListTools
 ) {}
 
+/** @internal */
 export class ClientNotificationRpcs extends RpcGroup.make(
   Previous.CancelledNotification,
   ProgressNotification,
@@ -185,14 +207,14 @@ export class ClientNotificationRpcs extends RpcGroup.make(
   Previous.RootsListChangedNotification
 ) {}
 
-export class ClientRpcs extends ClientRequestRpcs.merge(ClientNotificationRpcs) {}
-
+/** @internal */
 export class ServerRequestRpcs extends RpcGroup.make(
   Previous.Ping,
   CreateMessage,
   Previous.ListRoots
 ) {}
 
+/** @internal */
 export class ServerNotificationRpcs extends RpcGroup.make(
   Previous.CancelledNotification,
   ProgressNotification,
diff --git a/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2025_06_18.ts b/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2025_06_18.ts
index e741e868a..d0de43588 100644
--- a/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2025_06_18.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2025_06_18.ts
@@ -13,28 +13,33 @@ import * as Previous from "./v2025_03_26.ts"
 
 export * from "./v2025_03_26.ts"
 
+/** @internal */
 export const protocolVersion = "2025-06-18"
 
 const optional = Previous.optional
 const JsonObject = Schema.JsonObject
 const Meta = optional(JsonObject)
 
+/** @internal */
 export const Implementation = Schema.Struct({
   name: Schema.String,
   title: optional(Schema.String),
   version: Schema.String
 })
 
+/** @internal */
 export const ClientCapabilities = Schema.Struct({
   ...Previous.ClientCapabilities.fields,
   elicitation: optional(Schema.Struct({}))
 })
 
+/** @internal */
 export const Annotations = Schema.Struct({
   audience: optional(Schema.Array(Previous.Role)),
   priority: optional(Schema.Finite.check(Schema.isBetween({ minimum: 0, maximum: 1 })))
 })
 
+/** @internal */
 export const Resource = Schema.Struct({
   ...Previous.Resource.fields,
   title: optional(Schema.String),
@@ -42,6 +47,7 @@ export const Resource = Schema.Struct({
   _meta: Meta
 })
 
+/** @internal */
 export const ResourceTemplate = Schema.Struct({
   ...Previous.ResourceTemplate.fields,
   title: optional(Schema.String),
@@ -49,23 +55,28 @@ export const ResourceTemplate = Schema.Struct({
   _meta: Meta
 })
 
+/** @internal */
 export const TextResourceContents = Schema.Struct({
   ...Previous.TextResourceContents.fields,
   _meta: Meta
 })
 
+/** @internal */
 export const BlobResourceContents = Schema.Struct({
   ...Previous.BlobResourceContents.fields,
   _meta: Meta
 })
 
+/** @internal */
 export const ResourceContents = Schema.Union([TextResourceContents, BlobResourceContents])
 
+/** @internal */
 export const PromptArgument = Schema.Struct({
   ...Previous.PromptArgument.fields,
   title: optional(Schema.String)
 })
 
+/** @internal */
 export const Prompt = Schema.Struct({
   ...Previous.Prompt.fields,
   title: optional(Schema.String),
@@ -73,6 +84,7 @@ export const Prompt = Schema.Struct({
   _meta: Meta
 })
 
+/** @internal */
 export const EmbeddedResource = Schema.Struct({
   type: Schema.Literal("resource"),
   resource: ResourceContents,
@@ -80,29 +92,34 @@ export const EmbeddedResource = Schema.Struct({
   _meta: Meta
 })
 
+/** @internal */
 export const ResourceLink = Schema.Struct({
   ...Resource.fields,
   type: Schema.Literal("resource_link")
 })
 
+/** @internal */
 export const TextContent = Schema.Struct({
   ...Previous.TextContent.fields,
   annotations: optional(Annotations),
   _meta: Meta
 })
 
+/** @internal */
 export const ImageContent = Schema.Struct({
   ...Previous.ImageContent.fields,
   annotations: optional(Annotations),
   _meta: Meta
 })
 
+/** @internal */
 export const AudioContent = Schema.Struct({
   ...Previous.AudioContent.fields,
   annotations: optional(Annotations),
   _meta: Meta
 })
 
+/** @internal */
 export const ContentBlock = Schema.Union([
   TextContent,
   ImageContent,
@@ -111,22 +128,27 @@ export const ContentBlock = Schema.Union([
   ResourceLink
 ])
 
+/** @internal */
 export const SamplingContent = Schema.Union([TextContent, ImageContent, AudioContent])
 
+/** @internal */
 export const PromptMessage = Schema.Struct({
   role: Previous.Role,
   content: ContentBlock
 })
 
+/** @internal */
 export const SamplingMessage = Schema.Struct({
   role: Previous.Role,
   content: SamplingContent
 })
 
+/** @internal */
 export const ServerCapabilities = Schema.Struct({
   ...Previous.ServerCapabilities.fields
 })
 
+/** @internal */
 export const InitializeResult = Schema.Struct({
   ...Previous.ResultMeta.fields,
   protocolVersion: Schema.String,
@@ -135,6 +157,7 @@ export const InitializeResult = Schema.Struct({
   instructions: optional(Schema.String)
 })
 
+/** @internal */
 export class Initialize extends Rpc.make("initialize", {
   success: InitializeResult,
   error: Previous.McpError,
@@ -155,6 +178,7 @@ const ToolJsonSchema = Schema.StructWithRest(
   [Schema.JsonObject]
 )
 
+/** @internal */
 export const Tool = Schema.Struct({
   name: Schema.String,
   title: optional(Schema.String),
@@ -165,6 +189,7 @@ export const Tool = Schema.Struct({
   _meta: Meta
 })
 
+/** @internal */
 export const CallToolResult = Schema.Struct({
   ...Previous.ResultMeta.fields,
   content: Schema.Array(ContentBlock),
@@ -172,6 +197,7 @@ export const CallToolResult = Schema.Struct({
   isError: optional(Schema.Boolean)
 })
 
+/** @internal */
 export const CreateMessageResult = Schema.Struct({
   ...Previous.ResultMeta.fields,
   role: Previous.Role,
@@ -180,6 +206,7 @@ export const CreateMessageResult = Schema.Struct({
   stopReason: optional(Schema.String)
 })
 
+/** @internal */
 export class CreateMessage extends Rpc.make("sampling/createMessage", {
   success: CreateMessageResult,
   error: Previous.McpError,
@@ -196,18 +223,22 @@ export class CreateMessage extends Rpc.make("sampling/createMessage", {
   }
 }) {}
 
+/** @internal */
 export const PromptReference = Schema.Struct({
   ...Previous.PromptReference.fields,
   title: optional(Schema.String)
 })
 
+/** @internal */
 export const ResourceTemplateReference = Schema.Struct({
   type: Schema.Literal("ref/resource"),
   uri: Schema.String
 })
 
+/** @internal */
 export const CompleteResult = Previous.CompleteResult
 
+/** @internal */
 export class Complete extends Rpc.make("completion/complete", {
   success: CompleteResult,
   error: Previous.McpError,
@@ -224,61 +255,72 @@ export class Complete extends Rpc.make("completion/complete", {
   }
 }) {}
 
+/** @internal */
 export const ListResourcesResult = Schema.Struct({
   ...Previous.PaginatedResult.fields,
   resources: Schema.Array(Resource)
 })
 
+/** @internal */
 export const ListResourceTemplatesResult = Schema.Struct({
   ...Previous.PaginatedResult.fields,
   resourceTemplates: Schema.Array(ResourceTemplate)
 })
 
+/** @internal */
 export const ReadResourceResult = Schema.Struct({
   ...Previous.ResultMeta.fields,
   contents: Schema.Array(ResourceContents)
 })
 
+/** @internal */
 export const ListPromptsResult = Schema.Struct({
   ...Previous.PaginatedResult.fields,
   prompts: Schema.Array(Prompt)
 })
 
+/** @internal */
 export const GetPromptResult = Schema.Struct({
   ...Previous.ResultMeta.fields,
   description: optional(Schema.String),
   messages: Schema.Array(PromptMessage)
 })
 
+/** @internal */
 export const ListToolsResult = Schema.Struct({
   ...Previous.PaginatedResult.fields,
   tools: Schema.Array(Tool)
 })
 
+/** @internal */
 export class ListResources extends Rpc.make("resources/list", {
   success: ListResourcesResult,
   error: Previous.McpError,
   payload: Schema.UndefinedOr(Previous.PaginatedRequest)
 }) {}
 
+/** @internal */
 export class ListResourceTemplates extends Rpc.make("resources/templates/list", {
   success: ListResourceTemplatesResult,
   error: Previous.McpError,
   payload: Schema.UndefinedOr(Previous.PaginatedRequest)
 }) {}
 
+/** @internal */
 export class ReadResource extends Rpc.make("resources/read", {
   success: ReadResourceResult,
   error: Previous.McpError,
   payload: { ...Previous.RequestMeta.fields, uri: Schema.String }
 }) {}
 
+/** @internal */
 export class ListPrompts extends Rpc.make("prompts/list", {
   success: ListPromptsResult,
   error: Previous.McpError,
   payload: Schema.UndefinedOr(Previous.PaginatedRequest)
 }) {}
 
+/** @internal */
 export class GetPrompt extends Rpc.make("prompts/get", {
   success: GetPromptResult,
   error: Previous.McpError,
@@ -289,12 +331,14 @@ export class GetPrompt extends Rpc.make("prompts/get", {
   }
 }) {}
 
+/** @internal */
 export class ListTools extends Rpc.make("tools/list", {
   success: ListToolsResult,
   error: Previous.McpError,
   payload: Schema.UndefinedOr(Previous.PaginatedRequest)
 }) {}
 
+/** @internal */
 export class CallTool extends Rpc.make("tools/call", {
   success: CallToolResult,
   error: Previous.McpError,
@@ -305,6 +349,7 @@ export class CallTool extends Rpc.make("tools/call", {
   }
 }) {}
 
+/** @internal */
 export const ElicitResult = Schema.Struct({
   ...Previous.ResultMeta.fields,
   action: Schema.Literals(["accept", "decline", "cancel"]),
@@ -351,6 +396,7 @@ const RequestedSchema = Schema.Struct({
   required: optional(Schema.Array(Schema.String))
 })
 
+/** @internal */
 export class Elicit extends Rpc.make("elicitation/create", {
   success: ElicitResult,
   error: Previous.McpError,
@@ -361,6 +407,7 @@ export class Elicit extends Rpc.make("elicitation/create", {
   }
 }) {}
 
+/** @internal */
 export class ClientRequestRpcs extends RpcGroup.make(
   Previous.Ping,
   Initialize,
@@ -377,6 +424,7 @@ export class ClientRequestRpcs extends RpcGroup.make(
   ListTools
 ) {}
 
+/** @internal */
 export class ClientNotificationRpcs extends RpcGroup.make(
   Previous.CancelledNotification,
   Previous.ProgressNotification,
@@ -384,8 +432,7 @@ export class ClientNotificationRpcs extends RpcGroup.make(
   Previous.RootsListChangedNotification
 ) {}
 
-export class ClientRpcs extends ClientRequestRpcs.merge(ClientNotificationRpcs) {}
-
+/** @internal */
 export class ServerRequestRpcs extends RpcGroup.make(
   Previous.Ping,
   CreateMessage,
@@ -393,6 +440,7 @@ export class ServerRequestRpcs extends RpcGroup.make(
   Elicit
 ) {}
 
+/** @internal */
 export class ServerNotificationRpcs extends RpcGroup.make(
   Previous.CancelledNotification,
   Previous.ProgressNotification,
diff --git a/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2025_11_25.ts b/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2025_11_25.ts
index fbbce3562..e56cc61b6 100644
--- a/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2025_11_25.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2025_11_25.ts
@@ -13,12 +13,14 @@ import * as Previous from "./v2025_06_18.ts"
 
 export * from "./v2025_06_18.ts"
 
+/** @internal */
 export const protocolVersion = "2025-11-25"
 
 const optional = Previous.optional
 const JsonObject = Schema.JsonObject
 const Meta = optional(JsonObject)
 
+/** @internal */
 export const Icon = Schema.Struct({
   src: Schema.String,
   mimeType: optional(Schema.String),
@@ -26,6 +28,7 @@ export const Icon = Schema.Struct({
   theme: optional(Schema.Literals(["light", "dark"]))
 })
 
+/** @internal */
 export const Implementation = Schema.Struct({
   ...Previous.Implementation.fields,
   description: optional(Schema.String),
@@ -33,6 +36,7 @@ export const Implementation = Schema.Struct({
   icons: optional(Schema.Array(Icon))
 })
 
+/** @internal */
 export const ClientCapabilities = Schema.Struct({
   ...Previous.ClientCapabilities.fields,
   sampling: optional(Schema.Struct({
@@ -45,53 +49,63 @@ export const ClientCapabilities = Schema.Struct({
   }))
 })
 
+/** @internal */
 export const Annotations = Schema.Struct({
   ...Previous.Annotations.fields,
   lastModified: optional(Schema.String)
 })
 
+/** @internal */
 export const Resource = Schema.Struct({
   ...Previous.Resource.fields,
   annotations: optional(Annotations),
   icons: optional(Schema.Array(Icon))
 })
 
+/** @internal */
 export const ResourceTemplate = Schema.Struct({
   ...Previous.ResourceTemplate.fields,
   annotations: optional(Annotations),
   icons: optional(Schema.Array(Icon))
 })
 
+/** @internal */
 export const Prompt = Schema.Struct({
   ...Previous.Prompt.fields,
   icons: optional(Schema.Array(Icon))
 })
 
+/** @internal */
 export const TextContent = Schema.Struct({
   ...Previous.TextContent.fields,
   annotations: optional(Annotations)
 })
 
+/** @internal */
 export const ImageContent = Schema.Struct({
   ...Previous.ImageContent.fields,
   annotations: optional(Annotations)
 })
 
+/** @internal */
 export const AudioContent = Schema.Struct({
   ...Previous.AudioContent.fields,
   annotations: optional(Annotations)
 })
 
+/** @internal */
 export const EmbeddedResource = Schema.Struct({
   ...Previous.EmbeddedResource.fields,
   annotations: optional(Annotations)
 })
 
+/** @internal */
 export const ResourceLink = Schema.Struct({
   ...Resource.fields,
   type: Schema.Literal("resource_link")
 })
 
+/** @internal */
 export const ContentBlock = Schema.Union([
   TextContent,
   ImageContent,
@@ -100,27 +114,32 @@ export const ContentBlock = Schema.Union([
   EmbeddedResource
 ])
 
+/** @internal */
 export const PromptMessage = Schema.Struct({
   role: Previous.Role,
   content: ContentBlock
 })
 
+/** @internal */
 export const Tool = Schema.Struct({
   ...Previous.Tool.fields,
   icons: optional(Schema.Array(Icon))
 })
 
+/** @internal */
 export const CallToolResult = Schema.Struct({
   ...Previous.CallToolResult.fields,
   content: Schema.Array(ContentBlock)
 })
 
+/** @internal */
 export class CallTool extends Rpc.make("tools/call", {
   success: CallToolResult,
   error: Previous.McpError,
   payload: Previous.CallTool.payloadSchema
 }) {}
 
+/** @internal */
 export const ToolUseContent = Schema.Struct({
   type: Schema.Literal("tool_use"),
   id: Schema.String,
@@ -129,6 +148,7 @@ export const ToolUseContent = Schema.Struct({
   _meta: Meta
 })
 
+/** @internal */
 export const ToolResultContent = Schema.Struct({
   type: Schema.Literal("tool_result"),
   toolUseId: Schema.String,
@@ -138,6 +158,7 @@ export const ToolResultContent = Schema.Struct({
   _meta: Meta
 })
 
+/** @internal */
 export const SamplingMessageContentBlock = Schema.Union([
   TextContent,
   ImageContent,
@@ -146,6 +167,7 @@ export const SamplingMessageContentBlock = Schema.Union([
   ToolResultContent
 ])
 
+/** @internal */
 export const SamplingMessage = Schema.Struct({
   role: Previous.Role,
   content: Schema.Union([
@@ -155,10 +177,12 @@ export const SamplingMessage = Schema.Struct({
   _meta: Meta
 })
 
+/** @internal */
 export const ToolChoice = Schema.Struct({
   mode: optional(Schema.Literals(["auto", "required", "none"]))
 })
 
+/** @internal */
 export const CreateMessageResult = Schema.Struct({
   ...Previous.ResultMeta.fields,
   ...SamplingMessage.fields,
@@ -166,6 +190,7 @@ export const CreateMessageResult = Schema.Struct({
   stopReason: optional(Schema.String)
 })
 
+/** @internal */
 export class CreateMessage extends Rpc.make("sampling/createMessage", {
   success: CreateMessageResult,
   error: Previous.McpError,
@@ -178,22 +203,26 @@ export class CreateMessage extends Rpc.make("sampling/createMessage", {
   }
 }) {}
 
+/** @internal */
 export const Root = Schema.Struct({
   ...Previous.Root.fields,
   _meta: Meta
 })
 
+/** @internal */
 export const ListRootsResult = Schema.Struct({
   ...Previous.ResultMeta.fields,
   roots: Schema.Array(Root)
 })
 
+/** @internal */
 export class ListRoots extends Rpc.make("roots/list", {
   success: ListRootsResult,
   error: Previous.McpError,
   payload: Schema.UndefinedOr(Previous.RequestMeta)
 }) {}
 
+/** @internal */
 export const StringSchema = Schema.Struct({
   type: Schema.Literal("string"),
   title: optional(Schema.String),
@@ -204,6 +233,7 @@ export const StringSchema = Schema.Struct({
   default: optional(Schema.String)
 })
 
+/** @internal */
 export const NumberSchema = Schema.Struct({
   type: Schema.Literals(["number", "integer"]),
   title: optional(Schema.String),
@@ -213,6 +243,7 @@ export const NumberSchema = Schema.Struct({
   default: optional(Schema.Finite)
 })
 
+/** @internal */
 export const BooleanSchema = Schema.Struct({
   type: Schema.Literal("boolean"),
   title: optional(Schema.String),
@@ -225,6 +256,7 @@ const EnumOption = Schema.Struct({
   title: Schema.String
 })
 
+/** @internal */
 export const UntitledSingleSelectEnumSchema = Schema.Struct({
   type: Schema.Literal("string"),
   title: optional(Schema.String),
@@ -233,6 +265,7 @@ export const UntitledSingleSelectEnumSchema = Schema.Struct({
   default: optional(Schema.String)
 })
 
+/** @internal */
 export const TitledSingleSelectEnumSchema = Schema.Struct({
   type: Schema.Literal("string"),
   title: optional(Schema.String),
@@ -241,11 +274,13 @@ export const TitledSingleSelectEnumSchema = Schema.Struct({
   default: optional(Schema.String)
 })
 
+/** @internal */
 export const SingleSelectEnumSchema = Schema.Union([
   UntitledSingleSelectEnumSchema,
   TitledSingleSelectEnumSchema
 ])
 
+/** @internal */
 export const UntitledMultiSelectEnumSchema = Schema.Struct({
   type: Schema.Literal("array"),
   title: optional(Schema.String),
@@ -259,6 +294,7 @@ export const UntitledMultiSelectEnumSchema = Schema.Struct({
   default: optional(Schema.Array(Schema.String))
 })
 
+/** @internal */
 export const TitledMultiSelectEnumSchema = Schema.Struct({
   type: Schema.Literal("array"),
   title: optional(Schema.String),
@@ -271,11 +307,13 @@ export const TitledMultiSelectEnumSchema = Schema.Struct({
   default: optional(Schema.Array(Schema.String))
 })
 
+/** @internal */
 export const MultiSelectEnumSchema = Schema.Union([
   UntitledMultiSelectEnumSchema,
   TitledMultiSelectEnumSchema
 ])
 
+/** @internal */
 export const LegacyTitledEnumSchema = Schema.Struct({
   type: Schema.Literal("string"),
   title: optional(Schema.String),
@@ -285,19 +323,22 @@ export const LegacyTitledEnumSchema = Schema.Struct({
   default: optional(Schema.String)
 })
 
+/** @internal */
 export const EnumSchema = Schema.Union([
+  LegacyTitledEnumSchema,
   SingleSelectEnumSchema,
-  MultiSelectEnumSchema,
-  LegacyTitledEnumSchema
+  MultiSelectEnumSchema
 ])
 
+/** @internal */
 export const PrimitiveSchemaDefinition = Schema.Union([
+  EnumSchema,
   StringSchema,
   NumberSchema,
-  BooleanSchema,
-  EnumSchema
+  BooleanSchema
 ])
 
+/** @internal */
 export const RequestedSchema = Schema.Struct({
   $schema: optional(Schema.String),
   type: Schema.Literal("object"),
@@ -305,6 +346,7 @@ export const RequestedSchema = Schema.Struct({
   required: optional(Schema.Array(Schema.String))
 })
 
+/** @internal */
 export const ElicitRequestFormParams = Schema.Struct({
   ...Previous.RequestMeta.fields,
   mode: optional(Schema.Literal("form")),
@@ -312,6 +354,7 @@ export const ElicitRequestFormParams = Schema.Struct({
   requestedSchema: RequestedSchema
 })
 
+/** @internal */
 export const ElicitRequestURLParams = Schema.Struct({
   ...Previous.RequestMeta.fields,
   mode: Schema.Literal("url"),
@@ -320,28 +363,13 @@ export const ElicitRequestURLParams = Schema.Struct({
   url: Schema.String
 })
 
+/** @internal */
 export const ElicitRequestParams = Schema.Union([
   ElicitRequestFormParams,
   ElicitRequestURLParams
 ])
 
-export const URL_ELICITATION_REQUIRED = -32042
-
-export const URLElicitationRequiredError = Schema.Struct({
-  jsonrpc: Schema.Literal("2.0"),
-  id: optional(Previous.RequestId),
-  error: Schema.Struct({
-    code: Schema.Literal(URL_ELICITATION_REQUIRED),
-    message: Schema.String,
-    data: Schema.StructWithRest(
-      Schema.Struct({
-        elicitations: Schema.Array(ElicitRequestURLParams)
-      }),
-      [Schema.JsonObject]
-    )
-  })
-})
-
+/** @internal */
 export const ElicitResult = Schema.Struct({
   ...Previous.ResultMeta.fields,
   action: Schema.Literals(["accept", "decline", "cancel"]),
@@ -351,23 +379,27 @@ export const ElicitResult = Schema.Struct({
   ))
 })
 
+/** @internal */
 export class Elicit extends Rpc.make("elicitation/create", {
   success: ElicitResult,
   error: Previous.McpError,
   payload: ElicitRequestParams
 }) {}
 
+/** @internal */
 export class ElicitationCompleteNotification extends Rpc.make("notifications/elicitation/complete", {
   payload: {
     elicitationId: Schema.String
   }
 }) {}
 
+/** @internal */
 export const InitializeResult = Schema.Struct({
   ...Previous.InitializeResult.fields,
   serverInfo: Implementation
 })
 
+/** @internal */
 export class Initialize extends Rpc.make("initialize", {
   success: InitializeResult,
   error: Previous.McpError,
@@ -378,49 +410,58 @@ export class Initialize extends Rpc.make("initialize", {
   }
 }) {}
 
+/** @internal */
 export const ListResourcesResult = Schema.Struct({
   ...Previous.PaginatedResult.fields,
   resources: Schema.Array(Resource)
 })
 
+/** @internal */
 export const ListResourceTemplatesResult = Schema.Struct({
   ...Previous.PaginatedResult.fields,
   resourceTemplates: Schema.Array(ResourceTemplate)
 })
 
+/** @internal */
 export const ListPromptsResult = Schema.Struct({
   ...Previous.PaginatedResult.fields,
   prompts: Schema.Array(Prompt)
 })
 
+/** @internal */
 export const GetPromptResult = Schema.Struct({
   ...Previous.GetPromptResult.fields,
   messages: Schema.Array(PromptMessage)
 })
 
+/** @internal */
 export const ListToolsResult = Schema.Struct({
   ...Previous.PaginatedResult.fields,
   tools: Schema.Array(Tool)
 })
 
+/** @internal */
 export class ListResources extends Rpc.make("resources/list", {
   success: ListResourcesResult,
   error: Previous.McpError,
   payload: Schema.UndefinedOr(Previous.PaginatedRequest)
 }) {}
 
+/** @internal */
 export class ListResourceTemplates extends Rpc.make("resources/templates/list", {
   success: ListResourceTemplatesResult,
   error: Previous.McpError,
   payload: Schema.UndefinedOr(Previous.PaginatedRequest)
 }) {}
 
+/** @internal */
 export class ListPrompts extends Rpc.make("prompts/list", {
   success: ListPromptsResult,
   error: Previous.McpError,
   payload: Schema.UndefinedOr(Previous.PaginatedRequest)
 }) {}
 
+/** @internal */
 export class GetPrompt extends Rpc.make("prompts/get", {
   success: GetPromptResult,
   error: Previous.McpError,
@@ -431,12 +472,14 @@ export class GetPrompt extends Rpc.make("prompts/get", {
   }
 }) {}
 
+/** @internal */
 export class ListTools extends Rpc.make("tools/list", {
   success: ListToolsResult,
   error: Previous.McpError,
   payload: Schema.UndefinedOr(Previous.PaginatedRequest)
 }) {}
 
+/** @internal */
 export class ClientRequestRpcs extends RpcGroup.make(
   Previous.Ping,
   Initialize,
@@ -453,6 +496,7 @@ export class ClientRequestRpcs extends RpcGroup.make(
   ListTools
 ) {}
 
+/** @internal */
 export class ClientNotificationRpcs extends RpcGroup.make(
   Previous.CancelledNotification,
   Previous.ProgressNotification,
@@ -460,8 +504,7 @@ export class ClientNotificationRpcs extends RpcGroup.make(
   Previous.RootsListChangedNotification
 ) {}
 
-export class ClientRpcs extends ClientRequestRpcs.merge(ClientNotificationRpcs) {}
-
+/** @internal */
 export class ServerRequestRpcs extends RpcGroup.make(
   Previous.Ping,
   CreateMessage,
@@ -469,6 +512,7 @@ export class ServerRequestRpcs extends RpcGroup.make(
   Elicit
 ) {}
 
+/** @internal */
 export class ServerNotificationRpcs extends RpcGroup.make(
   Previous.CancelledNotification,
   Previous.ProgressNotification,
diff --git a/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2026_07_28.ts b/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2026_07_28.ts
new file mode 100644
index 000000000..9345bc69d
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/ai/internal/mcpSchema/v2026_07_28.ts
@@ -0,0 +1,647 @@
+/**
+ * MCP v2026-07-28 wire schemas.
+ *
+ * @internal
+ */
+import * as Schema from "../../../../Schema.ts"
+import * as Rpc from "../../../rpc/Rpc.ts"
+import * as RpcGroup from "../../../rpc/RpcGroup.ts"
+import * as Previous from "./v2025_11_25.ts"
+
+export * from "./v2025_11_25.ts"
+
+/** @internal */
+export const protocolVersion = "2026-07-28"
+
+const optional = Previous.optional
+const Meta = optional(Schema.JsonObject)
+
+/** @internal */
+export const RequestId = Schema.Union([Schema.String, Schema.Int])
+/** @internal */
+export const ProgressToken = RequestId
+/** @internal */
+export const Role = Previous.Role
+/** @internal */
+export const LoggingLevel = Previous.LoggingLevel
+/** @internal */
+export const Implementation = Previous.Implementation
+
+/** @internal */
+export const ClientCapabilities = Schema.StructWithRest(
+  Schema.Struct({
+    experimental: optional(Schema.Record(Schema.String, Schema.JsonObject)),
+    roots: optional(Schema.Struct({})),
+    sampling: optional(Schema.Struct({
+      context: optional(Schema.JsonObject),
+      tools: optional(Schema.JsonObject)
+    })),
+    elicitation: optional(Schema.Struct({
+      form: optional(Schema.JsonObject),
+      url: optional(Schema.JsonObject)
+    })),
+    extensions: optional(Schema.Record(Schema.String, Schema.JsonObject))
+  }),
+  [Schema.JsonObject]
+)
+
+/** @internal */
+export const ServerCapabilities = Schema.StructWithRest(
+  Schema.Struct({
+    experimental: optional(Schema.Record(Schema.String, Schema.JsonObject)),
+    logging: optional(Schema.JsonObject),
+    completions: optional(Schema.JsonObject),
+    prompts: optional(Schema.Struct({ listChanged: optional(Schema.Boolean) })),
+    resources: optional(Schema.Struct({
+      subscribe: optional(Schema.Boolean),
+      listChanged: optional(Schema.Boolean)
+    })),
+    tools: optional(Schema.Struct({ listChanged: optional(Schema.Boolean) })),
+    extensions: optional(Schema.Record(Schema.String, Schema.JsonObject))
+  }),
+  [Schema.JsonObject]
+)
+
+/** @internal */
+export const RequestMetaObject = Schema.StructWithRest(
+  Schema.Struct({
+    progressToken: optional(ProgressToken),
+    "io.modelcontextprotocol/protocolVersion": Schema.String,
+    "io.modelcontextprotocol/clientInfo": optional(Implementation),
+    "io.modelcontextprotocol/clientCapabilities": ClientCapabilities,
+    "io.modelcontextprotocol/logLevel": optional(LoggingLevel)
+  }),
+  [Schema.JsonObject]
+)
+
+/** @internal */
+export const RequestParams = Schema.Struct({ _meta: RequestMetaObject })
+
+/** @internal */
+export const NotificationMetaObject = Schema.StructWithRest(
+  Schema.Struct({
+    "io.modelcontextprotocol/subscriptionId": optional(RequestId)
+  }),
+  [Schema.JsonObject]
+)
+/** @internal */
+export const NotificationParams = Schema.Struct({ _meta: optional(NotificationMetaObject) })
+
+/** @internal */
+export const ResultMetaObject = Schema.StructWithRest(
+  Schema.Struct({
+    "io.modelcontextprotocol/serverInfo": Implementation
+  }),
+  [Schema.JsonObject]
+)
+/** @internal */
+export const ResultMeta = {
+  _meta: ResultMetaObject,
+  resultType: Schema.Literal("complete")
+}
+/** @internal */
+export const McpError = Schema.Struct({
+  code: Schema.Int,
+  message: Schema.String,
+  data: optional(Schema.Json)
+})
+/** @internal */
+export type McpError = typeof McpError.Type
+
+/** @internal */
+export const METHOD_NOT_FOUND = -32601
+/** @internal */
+export const INVALID_PARAMS = -32602
+/** @internal */
+export const MISSING_REQUIRED_CLIENT_CAPABILITY = -32021
+
+/** @internal */
+export const Annotations = Previous.Annotations
+
+/** @internal */
+export const Resource = Schema.Struct({
+  ...Previous.Resource.fields,
+  size: optional(Schema.Int),
+  annotations: optional(Annotations)
+})
+
+/** @internal */
+export const ResourceTemplate = Previous.ResourceTemplate
+/** @internal */
+export const ResourceContents = Previous.ResourceContents
+/** @internal */
+export const TextContent = Previous.TextContent
+/** @internal */
+export const ImageContent = Previous.ImageContent
+/** @internal */
+export const AudioContent = Previous.AudioContent
+/** @internal */
+export const ResourceLink = Schema.Struct({ ...Resource.fields, type: Schema.Literal("resource_link") })
+/** @internal */
+export const EmbeddedResource = Previous.EmbeddedResource
+/** @internal */
+export const ContentBlock = Schema.Union([
+  TextContent,
+  ImageContent,
+  AudioContent,
+  ResourceLink,
+  EmbeddedResource
+])
+
+/** @internal */
+export const Prompt = Previous.Prompt
+/** @internal */
+export const PromptMessage = Schema.Struct({ role: Role, content: ContentBlock })
+
+const ToolInputSchema = Schema.StructWithRest(
+  Schema.Struct({
+    $schema: optional(Schema.String),
+    type: Schema.Literal("object")
+  }),
+  [Schema.JsonObject]
+)
+const ToolOutputSchema = Schema.StructWithRest(
+  Schema.Struct({ $schema: optional(Schema.String) }),
+  [Schema.JsonObject]
+)
+/** @internal */
+export const ToolAnnotations = Previous.ToolAnnotations
+/** @internal */
+export const Tool = Schema.Struct({
+  ...Previous.Tool.fields,
+  inputSchema: ToolInputSchema,
+  outputSchema: optional(ToolOutputSchema),
+  annotations: optional(ToolAnnotations)
+})
+
+/** @internal */
+export const ToolUseContent = Previous.ToolUseContent
+/** @internal */
+export const ToolResultContent = Schema.Struct({
+  type: Schema.Literal("tool_result"),
+  toolUseId: Schema.String,
+  content: Schema.Array(ContentBlock),
+  structuredContent: optional(Schema.Json),
+  isError: optional(Schema.Boolean),
+  _meta: Meta
+})
+/** @internal */
+export const SamplingMessageContentBlock = Schema.Union([
+  TextContent,
+  ImageContent,
+  AudioContent,
+  ToolUseContent,
+  ToolResultContent
+])
+/** @internal */
+export const SamplingMessage = Schema.Struct({
+  role: Role,
+  content: Schema.Union([SamplingMessageContentBlock, Schema.Array(SamplingMessageContentBlock)]),
+  _meta: Meta
+})
+/** @internal */
+export const ModelHint = Schema.StructWithRest(
+  Schema.Struct({ name: optional(Schema.String) }),
+  [Schema.JsonObject]
+)
+const ModelPriority = Schema.Finite.check(Schema.isBetween({ minimum: 0, maximum: 1 }))
+/** @internal */
+export const ModelPreferences = Schema.Struct({
+  ...Previous.ModelPreferences.fields,
+  hints: optional(Schema.Array(ModelHint)),
+  costPriority: optional(ModelPriority),
+  speedPriority: optional(ModelPriority),
+  intelligencePriority: optional(ModelPriority)
+})
+/** @internal */
+export const ToolChoice = Previous.ToolChoice
+
+/** @internal */
+export const CreateMessageRequest = Schema.Struct({
+  method: Schema.Literal("sampling/createMessage"),
+  params: Schema.Struct({
+    messages: Schema.Array(SamplingMessage),
+    modelPreferences: optional(ModelPreferences),
+    systemPrompt: optional(Schema.String),
+    includeContext: optional(Schema.Literals(["none", "thisServer", "allServers"])),
+    temperature: optional(Schema.Finite),
+    maxTokens: Schema.Int,
+    stopSequences: optional(Schema.Array(Schema.String)),
+    metadata: optional(Schema.JsonObject),
+    tools: optional(Schema.Array(Tool)),
+    toolChoice: optional(ToolChoice)
+  })
+})
+/** @internal */
+export const CreateMessageResult = Schema.Struct({
+  ...SamplingMessage.fields,
+  model: Schema.String,
+  stopReason: optional(Schema.String)
+})
+
+/** @internal */
+export const Root = Previous.Root
+/** @internal */
+export const ListRootsRequest = Schema.Struct({
+  method: Schema.Literal("roots/list"),
+  params: optional(Schema.Struct({ _meta: Meta }))
+})
+/** @internal */
+export const ListRootsResult = Schema.Struct({ roots: Schema.Array(Root) })
+
+/** @internal */
+export const StringSchema = Previous.StringSchema
+/** @internal */
+export const NumberSchema = Previous.NumberSchema
+/** @internal */
+export const BooleanSchema = Previous.BooleanSchema
+/** @internal */
+export const SingleSelectEnumSchema = Previous.SingleSelectEnumSchema
+/** @internal */
+export const MultiSelectEnumSchema = Previous.MultiSelectEnumSchema
+/** @internal */
+export const LegacyTitledEnumSchema = Previous.LegacyTitledEnumSchema
+/** @internal */
+export const EnumSchema = Schema.Union([
+  LegacyTitledEnumSchema,
+  SingleSelectEnumSchema,
+  MultiSelectEnumSchema
+])
+/** @internal */
+export const PrimitiveSchemaDefinition = Schema.Union([
+  EnumSchema,
+  StringSchema,
+  NumberSchema,
+  BooleanSchema
+])
+/** @internal */
+export const RequestedSchema = Schema.Struct({
+  $schema: optional(Schema.String),
+  type: Schema.Literal("object"),
+  properties: Schema.Record(Schema.String, PrimitiveSchemaDefinition),
+  required: optional(Schema.Array(Schema.String))
+})
+/** @internal */
+export const ElicitRequestFormParams = Schema.Struct({
+  mode: optional(Schema.Literal("form")),
+  message: Schema.String,
+  requestedSchema: RequestedSchema
+})
+/** @internal */
+export const ElicitRequestURLParams = Schema.Struct({
+  mode: Schema.Literal("url"),
+  message: Schema.String,
+  url: Schema.String
+})
+/** @internal */
+export const ElicitRequestParams = Schema.Union([ElicitRequestFormParams, ElicitRequestURLParams])
+/** @internal */
+export const ElicitRequest = Schema.Struct({
+  method: Schema.Literal("elicitation/create"),
+  params: ElicitRequestParams
+})
+/** @internal */
+export const ElicitResult = Schema.Struct({
+  action: Schema.Literals(["accept", "decline", "cancel"]),
+  content: optional(Schema.Record(
+    Schema.String,
+    Schema.Union([Schema.String, Schema.Finite, Schema.Boolean, Schema.Array(Schema.String)])
+  ))
+})
+
+/** @internal */
+export const InputRequest = Schema.Union([CreateMessageRequest, ListRootsRequest, ElicitRequest])
+/** @internal */
+export const InputResponse = Schema.Union([CreateMessageResult, ListRootsResult, ElicitResult])
+/** @internal */
+export const InputRequests = Schema.Record(Schema.String, InputRequest)
+/** @internal */
+export const InputResponses = Schema.Record(Schema.String, InputResponse)
+const InputRequiredResultMeta = {
+  _meta: ResultMetaObject,
+  resultType: Schema.Literal("input_required")
+}
+/** @internal */
+export const InputRequiredResult = Schema.Union([
+  Schema.StructWithRest(
+    Schema.Struct({
+      ...InputRequiredResultMeta,
+      inputRequests: InputRequests,
+      requestState: optional(Schema.String)
+    }),
+    [Schema.JsonObject]
+  ),
+  Schema.StructWithRest(
+    Schema.Struct({
+      ...InputRequiredResultMeta,
+      inputRequests: optional(InputRequests),
+      requestState: Schema.String
+    }),
+    [Schema.JsonObject]
+  )
+])
+/** @internal */
+export const InputResponseRequestParams = {
+  ...RequestParams.fields,
+  inputResponses: optional(InputResponses),
+  requestState: optional(Schema.String)
+}
+
+/** @internal */
+export const CacheableResult = {
+  ...ResultMeta,
+  ttlMs: Schema.Int.check(Schema.isGreaterThanOrEqualTo(0)),
+  cacheScope: Schema.Literals(["public", "private"])
+}
+/** @internal */
+export const PaginatedRequestParams = {
+  ...RequestParams.fields,
+  cursor: optional(Schema.String)
+}
+/** @internal */
+export const PaginatedResult = {
+  ...ResultMeta,
+  nextCursor: optional(Schema.String)
+}
+
+/** @internal */
+export const DiscoverResult = Schema.StructWithRest(
+  Schema.Struct({
+    ...CacheableResult,
+    supportedVersions: Schema.Array(Schema.String),
+    capabilities: ServerCapabilities,
+    instructions: optional(Schema.String)
+  }),
+  [Schema.JsonObject]
+)
+/** @internal */
+export class Discover extends Rpc.make("server/discover", {
+  success: DiscoverResult,
+  error: McpError,
+  payload: RequestParams
+}) {}
+
+/** @internal */
+export const ListResourcesResult = Schema.StructWithRest(
+  Schema.Struct({
+    ...PaginatedResult,
+    ...CacheableResult,
+    resources: Schema.Array(Resource)
+  }),
+  [Schema.JsonObject]
+)
+/** @internal */
+export class ListResources extends Rpc.make("resources/list", {
+  success: ListResourcesResult,
+  error: McpError,
+  payload: PaginatedRequestParams
+}) {}
+
+/** @internal */
+export const ListResourceTemplatesResult = Schema.StructWithRest(
+  Schema.Struct({
+    ...PaginatedResult,
+    ...CacheableResult,
+    resourceTemplates: Schema.Array(ResourceTemplate)
+  }),
+  [Schema.JsonObject]
+)
+/** @internal */
+export class ListResourceTemplates extends Rpc.make("resources/templates/list", {
+  success: ListResourceTemplatesResult,
+  error: McpError,
+  payload: PaginatedRequestParams
+}) {}
+
+/** @internal */
+export const ReadResourceResult = Schema.StructWithRest(
+  Schema.Struct({
+    ...CacheableResult,
+    contents: Schema.Array(ResourceContents)
+  }),
+  [Schema.JsonObject]
+)
+/** @internal */
+export class ReadResource extends Rpc.make("resources/read", {
+  success: Schema.Union([ReadResourceResult, InputRequiredResult]),
+  error: McpError,
+  payload: { ...InputResponseRequestParams, uri: Schema.String }
+}) {}
+
+/** @internal */
+export const ListPromptsResult = Schema.StructWithRest(
+  Schema.Struct({
+    ...PaginatedResult,
+    ...CacheableResult,
+    prompts: Schema.Array(Prompt)
+  }),
+  [Schema.JsonObject]
+)
+/** @internal */
+export class ListPrompts extends Rpc.make("prompts/list", {
+  success: ListPromptsResult,
+  error: McpError,
+  payload: PaginatedRequestParams
+}) {}
+
+/** @internal */
+export const GetPromptResult = Schema.StructWithRest(
+  Schema.Struct({
+    ...ResultMeta,
+    description: optional(Schema.String),
+    messages: Schema.Array(PromptMessage)
+  }),
+  [Schema.JsonObject]
+)
+/** @internal */
+export class GetPrompt extends Rpc.make("prompts/get", {
+  success: Schema.Union([GetPromptResult, InputRequiredResult]),
+  error: McpError,
+  payload: {
+    ...InputResponseRequestParams,
+    name: Schema.String,
+    arguments: optional(Schema.Record(Schema.String, Schema.String))
+  }
+}) {}
+
+/** @internal */
+export const ListToolsResult = Schema.StructWithRest(
+  Schema.Struct({
+    ...PaginatedResult,
+    ...CacheableResult,
+    tools: Schema.Array(Tool)
+  }),
+  [Schema.JsonObject]
+)
+/** @internal */
+export class ListTools extends Rpc.make("tools/list", {
+  success: ListToolsResult,
+  error: McpError,
+  payload: PaginatedRequestParams
+}) {}
+
+/** @internal */
+export const CallToolResult = Schema.StructWithRest(
+  Schema.Struct({
+    ...ResultMeta,
+    content: Schema.Array(ContentBlock),
+    structuredContent: optional(Schema.Json),
+    isError: optional(Schema.Boolean)
+  }),
+  [Schema.JsonObject]
+)
+/** @internal */
+export class CallTool extends Rpc.make("tools/call", {
+  success: Schema.Union([CallToolResult, InputRequiredResult]),
+  error: McpError,
+  payload: {
+    ...InputResponseRequestParams,
+    name: Schema.String,
+    arguments: optional(Schema.JsonObject)
+  }
+}) {}
+
+/** @internal */
+export const PromptReference = Previous.PromptReference
+/** @internal */
+export const ResourceTemplateReference = Previous.ResourceTemplateReference
+/** @internal */
+export const CompleteResult = Schema.StructWithRest(
+  Schema.Struct({
+    ...ResultMeta,
+    completion: Schema.Struct({
+      values: Schema.Array(Schema.String).check(Schema.isMaxLength(100)),
+      total: optional(Schema.Int),
+      hasMore: optional(Schema.Boolean)
+    })
+  }),
+  [Schema.JsonObject]
+)
+/** @internal */
+export class Complete extends Rpc.make("completion/complete", {
+  success: CompleteResult,
+  error: McpError,
+  payload: {
+    ...RequestParams.fields,
+    ref: Schema.Union([PromptReference, ResourceTemplateReference]),
+    argument: Schema.Struct({ name: Schema.String, value: Schema.String }),
+    context: optional(Schema.Struct({
+      arguments: optional(Schema.Record(Schema.String, Schema.String))
+    }))
+  }
+}) {}
+
+/** @internal */
+export const SubscriptionFilter = Schema.Struct({
+  toolsListChanged: optional(Schema.Boolean),
+  promptsListChanged: optional(Schema.Boolean),
+  resourcesListChanged: optional(Schema.Boolean),
+  resourceSubscriptions: optional(Schema.Array(Schema.String))
+})
+/** @internal */
+export const SubscriptionsListenResultMetaObject = Schema.StructWithRest(
+  Schema.Struct({
+    "io.modelcontextprotocol/serverInfo": Implementation,
+    "io.modelcontextprotocol/subscriptionId": RequestId
+  }),
+  [Schema.JsonObject]
+)
+/** @internal */
+export const SubscriptionsListenResult = Schema.StructWithRest(
+  Schema.Struct({
+    _meta: SubscriptionsListenResultMetaObject,
+    resultType: Schema.Literal("complete")
+  }),
+  [Schema.JsonObject]
+)
+/** @internal */
+export class SubscriptionsListen extends Rpc.make("subscriptions/listen", {
+  success: SubscriptionsListenResult,
+  error: McpError,
+  payload: { ...RequestParams.fields, notifications: SubscriptionFilter }
+}) {}
+
+/** @internal */
+export class CancelledNotification extends Rpc.make("notifications/cancelled", {
+  payload: {
+    ...NotificationParams.fields,
+    requestId: RequestId,
+    reason: optional(Schema.String)
+  }
+}) {}
+/** @internal */
+export class ProgressNotification extends Rpc.make("notifications/progress", {
+  payload: {
+    ...NotificationParams.fields,
+    progressToken: ProgressToken,
+    progress: Schema.Finite,
+    total: optional(Schema.Finite),
+    message: optional(Schema.String)
+  }
+}) {}
+/** @internal */
+export class LoggingMessageNotification extends Rpc.make("notifications/message", {
+  payload: {
+    ...NotificationParams.fields,
+    level: LoggingLevel,
+    logger: optional(Schema.String),
+    data: Schema.Json
+  }
+}) {}
+/** @internal */
+export class ResourceUpdatedNotification extends Rpc.make("notifications/resources/updated", {
+  payload: { ...NotificationParams.fields, uri: Schema.String }
+}) {}
+/** @internal */
+export class ResourceListChangedNotification extends Rpc.make("notifications/resources/list_changed", {
+  payload: Schema.UndefinedOr(NotificationParams)
+}) {}
+/** @internal */
+export class ToolListChangedNotification extends Rpc.make("notifications/tools/list_changed", {
+  payload: Schema.UndefinedOr(NotificationParams)
+}) {}
+/** @internal */
+export class PromptListChangedNotification extends Rpc.make("notifications/prompts/list_changed", {
+  payload: Schema.UndefinedOr(NotificationParams)
+}) {}
+/** @internal */
+export class SubscriptionsAcknowledgedNotification extends Rpc.make(
+  "notifications/subscriptions/acknowledged",
+  { payload: { ...NotificationParams.fields, notifications: SubscriptionFilter } }
+) {}
+
+/** @internal */
+export class ClientRequestRpcs extends RpcGroup.make(
+  Discover,
+  Complete,
+  GetPrompt,
+  ListPrompts,
+  ListResources,
+  ListResourceTemplates,
+  ReadResource,
+  SubscriptionsListen,
+  CallTool,
+  ListTools
+) {}
+
+/** @internal */
+export class ClientNotificationRpcs extends RpcGroup.make(CancelledNotification) {}
+/** @internal */
+export class ClientRpcs extends ClientRequestRpcs.merge(ClientNotificationRpcs) {}
+
+// In v2026-07-28 these requests are embedded in InputRequiredResult rather than
+// being sent as independent JSON-RPC requests.
+/** @internal */
+export class ServerRequestRpcs extends RpcGroup.make() {}
+
+/** @internal */
+export class ServerNotificationRpcs extends RpcGroup.make(
+  CancelledNotification,
+  ProgressNotification,
+  LoggingMessageNotification,
+  ResourceUpdatedNotification,
+  ResourceListChangedNotification,
+  ToolListChangedNotification,
+  PromptListChangedNotification,
+  SubscriptionsAcknowledgedNotification
+) {}
diff --git a/repos/effect/packages/effect/src/unstable/ai/internal/mcpStatefulRuntime.ts b/repos/effect/packages/effect/src/unstable/ai/internal/mcpStatefulRuntime.ts
new file mode 100644
index 000000000..be78dc0f0
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/ai/internal/mcpStatefulRuntime.ts
@@ -0,0 +1,172 @@
+/**
+ * Stateful lifecycle storage for MCP revisions before v2026-07-28.
+ *
+ * @internal
+ */
+import * as Effect from "../../../Effect.ts"
+import * as LogLevel from "../../../LogLevel.ts"
+import type * as Headers from "../../http/Headers.ts"
+import type * as PublicMcpProtocol from "../McpProtocol.ts"
+import * as PublicMcpSchema from "../McpSchema.ts"
+import type * as McpCore from "./mcpCore.ts"
+import * as McpProtocol from "./mcpProtocol.ts"
+
+const MCP_SESSION_ID_HEADER = "mcp-session-id"
+
+type SessionLogLevel =
+  | { readonly _tag: "Effect"; readonly level: LogLevel.LogLevel }
+  | { readonly _tag: "Mcp"; readonly level: PublicMcpSchema.LoggingLevel }
+
+/** @internal */
+export interface Binding {
+  readonly initializePayload: typeof PublicMcpSchema.Initialize.payloadSchema.Type
+  readonly negotiatedProfile: McpCore.NegotiatedProtocolProfile
+  readonly protocol: PublicMcpProtocol.ProtocolAdapter
+}
+
+interface Session extends Binding {
+  readonly resourceSubscriptions: Set<string> | undefined
+  logLevel: SessionLogLevel
+}
+
+/** @internal */
+export interface Registration extends Binding {
+  readonly supportsResourceSubscriptions: boolean
+  readonly logLevel: LogLevel.LogLevel
+}
+
+/** @internal */
+export interface StatefulRuntime {
+  readonly registerHttp: (sessionId: string, registration: Registration) => Binding
+  readonly registerConnection: (clientId: number, registration: Registration) => Binding
+  readonly resolve: (clientId: number, headers: Headers.Headers) => Binding | undefined
+  readonly resolveSessionId: (sessionId: string) => Binding | undefined
+  readonly setLogLevel: (
+    level: PublicMcpSchema.LoggingLevel,
+    clientId: number,
+    headers: Headers.Headers
+  ) => Effect.Effect<void>
+  readonly subscribe: (
+    uri: string,
+    clientId: number,
+    headers: Headers.Headers
+  ) => Effect.Effect<void, McpProtocol.ProtocolError>
+  readonly unsubscribe: (
+    uri: string,
+    clientId: number,
+    headers: Headers.Headers
+  ) => Effect.Effect<void, McpProtocol.ProtocolError>
+  readonly canDeliver: (
+    clientId: number,
+    headers: Headers.Headers,
+    notification: McpCore.ServerNotification,
+    fallbackLogLevel: LogLevel.LogLevel
+  ) => boolean
+  readonly effectLogLevel: (
+    clientId: number,
+    headers: Headers.Headers,
+    fallback: LogLevel.LogLevel
+  ) => LogLevel.LogLevel
+  readonly markInitialized: (clientId: number) => void
+  readonly initializedClientIds: () => Iterable<number>
+  readonly disconnect: (clientId: number) => void
+}
+
+const makeSession = (registration: Registration): Session => ({
+  initializePayload: registration.initializePayload,
+  negotiatedProfile: registration.negotiatedProfile,
+  protocol: registration.protocol,
+  resourceSubscriptions: registration.supportsResourceSubscriptions ? new Set() : undefined,
+  logLevel: { _tag: "Effect", level: registration.logLevel }
+})
+
+/** @internal */
+export const make = (): StatefulRuntime => {
+  const bySessionId = new Map<string, Session>()
+  const byClientId = new Map<number, Session>()
+  const initializedClientIds = new Set<number>()
+
+  const resolveSession = (clientId: number, headers: Headers.Headers): Session | undefined => {
+    const sessionId = headers[MCP_SESSION_ID_HEADER]
+    return sessionId === undefined ? byClientId.get(clientId) : bySessionId.get(sessionId)
+  }
+
+  const effectLogLevel = (
+    clientId: number,
+    headers: Headers.Headers,
+    fallback: LogLevel.LogLevel
+  ): LogLevel.LogLevel => {
+    const session = resolveSession(clientId, headers)
+    return session?.logLevel._tag === "Mcp"
+      ? McpProtocol.mcpLogLevels[session.logLevel.level].effect
+      : session?.logLevel.level ?? fallback
+  }
+
+  return {
+    registerHttp: (sessionId, registration) => {
+      const session = makeSession(registration)
+      bySessionId.set(sessionId, session)
+      return session
+    },
+    registerConnection: (clientId, registration) => {
+      const session = makeSession(registration)
+      byClientId.set(clientId, session)
+      return session
+    },
+    resolve: resolveSession,
+    resolveSessionId: (sessionId) => bySessionId.get(sessionId),
+    setLogLevel: (level, clientId, headers) =>
+      Effect.sync(() => {
+        const session = resolveSession(clientId, headers)
+        if (session !== undefined) {
+          session.logLevel = { _tag: "Mcp", level }
+        }
+      }),
+    subscribe: (uri, clientId, headers) => {
+      const subscriptions = resolveSession(clientId, headers)?.resourceSubscriptions
+      if (subscriptions === undefined) {
+        return Effect.fail(
+          new McpProtocol.ProtocolError({
+            code: PublicMcpSchema.METHOD_NOT_FOUND_ERROR_CODE,
+            message: "Resource subscriptions are not supported"
+          })
+        )
+      }
+      return Effect.sync(() => subscriptions.add(uri)).pipe(Effect.asVoid)
+    },
+    unsubscribe: (uri, clientId, headers) => {
+      const subscriptions = resolveSession(clientId, headers)?.resourceSubscriptions
+      if (subscriptions === undefined) {
+        return Effect.fail(
+          new McpProtocol.ProtocolError({
+            code: PublicMcpSchema.METHOD_NOT_FOUND_ERROR_CODE,
+            message: "Resource subscriptions are not supported"
+          })
+        )
+      }
+      return Effect.sync(() => subscriptions.delete(uri)).pipe(Effect.asVoid)
+    },
+    effectLogLevel,
+    canDeliver: (clientId, headers, notification, fallbackLogLevel) => {
+      const session = resolveSession(clientId, headers)
+      if (notification._tag === "LoggingMessage") {
+        const minimum = session?.logLevel
+        return minimum?._tag === "Mcp"
+          ? McpProtocol.mcpLogLevels[notification.level].order >= McpProtocol.mcpLogLevels[minimum.level].order
+          : LogLevel.isGreaterThanOrEqualTo(
+            McpProtocol.mcpLogLevels[notification.level].effect,
+            minimum?.level ?? fallbackLogLevel
+          )
+      }
+      return notification._tag !== "ResourceUpdated" || session?.resourceSubscriptions?.has(notification.uri) === true
+    },
+    markInitialized: (clientId) => {
+      initializedClientIds.add(clientId)
+    },
+    initializedClientIds: () => initializedClientIds.values(),
+    disconnect: (clientId) => {
+      byClientId.delete(clientId)
+      initializedClientIds.delete(clientId)
+    }
+  }
+}
diff --git a/repos/effect/packages/effect/src/unstable/ai/internal/structured-output.ts b/repos/effect/packages/effect/src/unstable/ai/internal/structured-output.ts
index 6a3cf8db9..984e209e3 100644
--- a/repos/effect/packages/effect/src/unstable/ai/internal/structured-output.ts
+++ b/repos/effect/packages/effect/src/unstable/ai/internal/structured-output.ts
@@ -64,11 +64,11 @@ function transform(root: SchemaAST.AST): SchemaAST.AST {
       case "Union": {
         const types = SchemaAST.mapOrSame(ast.types, recur)
         const checks = prepareChecks(ast.checks)
-        const mode = ast.mode === "oneOf" ? "anyOf" : ast.mode
-        if (types === ast.types && checks === ast.checks && mode === ast.mode) return ast
+        const options = ast.options?.mode === "oneOf" ? { ...ast.options, mode: "anyOf" as const } : ast.options
+        if (types === ast.types && checks === ast.checks && options === ast.options) return ast
         return new SchemaAST.Union(
           types,
-          mode,
+          options,
           ast.annotations,
           checks,
           ast.encoding,
@@ -254,7 +254,7 @@ function objectToEntries(
 function unionOrSingle(types: ReadonlyArray<SchemaAST.AST>): SchemaAST.AST {
   if (types.length === 1) return types[0]
   const unique = Array.from(new Set(types))
-  return unique.length === 1 ? unique[0] : new SchemaAST.Union(unique, "anyOf")
+  return unique.length === 1 ? unique[0] : new SchemaAST.Union(unique)
 }
 
 function combineChecks(
@@ -300,7 +300,7 @@ function compilerAnnotations(
 
 function optionalToNullable(type: SchemaAST.AST): SchemaAST.AST {
   return SchemaAST.decodeTo(
-    new SchemaAST.Union([type, SchemaAST.null], "anyOf"),
+    new SchemaAST.Union([type, SchemaAST.null]),
     SchemaAST.optionalKey(type),
     SchemaTransformation.transformOptional({
       decode: Option.filter(Predicate.isNotNull),
diff --git a/repos/effect/packages/effect/src/unstable/arbitrary/Arbitrary.ts b/repos/effect/packages/effect/src/unstable/arbitrary/Arbitrary.ts
index 14c0a7582..6abc983f8 100644
--- a/repos/effect/packages/effect/src/unstable/arbitrary/Arbitrary.ts
+++ b/repos/effect/packages/effect/src/unstable/arbitrary/Arbitrary.ts
@@ -68,6 +68,22 @@ export interface SchemaOptions<A> {
   readonly shrink?: ((value: A) => ReadonlyArray<A>) | undefined
 }
 
+/**
+ * Configures the lengths generated and preserved during shrinking by {@link array}.
+ *
+ * **Details**
+ *
+ * `minLength` defaults to zero. Generation grows with `size`, honors `minLength` even at size zero, and is capped by
+ * `maxLength` when provided. Both bounds must be integers between zero and 4294967295, with `minLength <= maxLength`.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface ArrayOptions {
+  readonly minLength?: number | undefined
+  readonly maxLength?: number | undefined
+}
+
 /**
  * Checks whether a value is an `Arbitrary`.
  *
@@ -369,6 +385,55 @@ export function Constant<const A>(value: A): Arbitrary<A> {
   return Internal.constant(value)
 }
 
+/**
+ * Generates variable-length arrays from an existing element `Arbitrary`.
+ *
+ * **When to use**
+ *
+ * Use when generating command sequences or collections whose elements are built with Arbitrary composition.
+ *
+ * **Details**
+ *
+ * Shrinking tries removing blocks, including prefixes and interior blocks, while preserving the order and values of
+ * retained elements. It also tries the elements' own shrink candidates. Length bounds remain valid during shrinking,
+ * and elements share the generation budget for recursion.
+ *
+ * **Gotchas**
+ *
+ * Invalid length bounds throw a `RangeError` when this function is called. Retained objects are not cloned, so
+ * properties must not mutate generated values. Bounded shrinking does not guarantee a globally minimal failure.
+ *
+ * **Example** (Removing irrelevant commands)
+ *
+ * ```ts import.meta.vitest
+ * import { Effect, Schema } from "effect"
+ * import { Arbitrary } from "effect/unstable/arbitrary"
+ *
+ * const command = Arbitrary.schema(Schema.Literals(["Add", "Reset", "Stop"]))
+ * const commands = Arbitrary.array(command, { maxLength: 50 })
+ * const result = await Effect.runPromise(
+ *   Arbitrary.checkEffect(commands, (values) => {
+ *     // The state machine fails when Reset occurs before a later Stop.
+ *     const reset = values.indexOf("Reset")
+ *     return reset === -1 || !values.slice(reset + 1).includes("Stop")
+ *   }, { runs: 1, size: 4, seed: 0 })
+ * )
+ *
+ * result._tag // => "Falsified"
+ * if (result._tag === "Falsified") {
+ *   result.initialInput // => ["Add", "Add", "Reset", "Stop"]
+ *   result.shrunkInput // => ["Reset", "Stop"]
+ * }
+ * ```
+ *
+ * @see {@link ArrayOptions} for length bounds
+ * @see {@link all} for fixed tuples and records of Arbitraries
+ * @see {@link schema} for deriving arrays described by Schema
+ * @category constructors
+ * @since 4.0.0
+ */
+export const array: <A>(item: Arbitrary<A>, options?: ArrayOptions) => Arbitrary<Array<A>> = Internal.array
+
 /**
  * Transforms every generated value and its shrink candidates.
  *
@@ -479,6 +544,7 @@ export const flatMap: {
  * Iterable inputs are consumed when `all` is called. If any member discards a generated root, the complete generated
  * value is discarded.
  *
+ * @see {@link array} for variable-length arrays that shrink by removing elements
  * @category constructors
  * @since 4.0.0
  */
diff --git a/repos/effect/packages/effect/src/unstable/cli/Argument.ts b/repos/effect/packages/effect/src/unstable/cli/Argument.ts
index 67ba24486..47dd9b1d2 100644
--- a/repos/effect/packages/effect/src/unstable/cli/Argument.ts
+++ b/repos/effect/packages/effect/src/unstable/cli/Argument.ts
@@ -13,7 +13,7 @@ import type * as Config from "../../Config.ts"
 import type * as Effect from "../../Effect.ts"
 import { dual, type LazyArg } from "../../Function.ts"
 import type * as Option from "../../Option.ts"
-import type * as Redacted from "../../Redacted.ts"
+import type * as Redacted_ from "../../Redacted.ts"
 import type * as Result from "../../Result.ts"
 import type * as Schema from "../../Schema.ts"
 import type * as CliError from "./CliError.ts"
@@ -30,10 +30,7 @@ import type * as Primitive from "./Primitive.ts"
  *
  * **Gotchas**
  *
- * `boolean` is intentionally omitted from Argument constructors. Positional
- * boolean arguments are ambiguous in CLI design since there is no flag name to
- * negate (for example, `--no-verbose`). Use Flag.boolean instead, or use
- * Argument.choice with explicit "true" / "false" strings if needed.
+ * For booleans, use `Flag.Boolean` or `Argument.Literals` with "true" and "false".
  *
  * @category models
  * @since 4.0.0
@@ -52,14 +49,14 @@ export interface Argument<A> extends Param.Param<typeof Param.argumentKind, A> {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const filename = Argument.string("filename")
+ * const filename = Argument.String("filename")
  * filename.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const string = (name: string): Argument<string> => Param.string(Param.argumentKind, name)
+export const String = (name: string): Argument<string> => Param.String(Param.argumentKind, name)
 
 /**
  * Creates a positional integer argument.
@@ -69,14 +66,14 @@ export const string = (name: string): Argument<string> => Param.string(Param.arg
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const count = Argument.integer("count")
+ * const count = Argument.Int("count")
  * count.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const integer = (name: string): Argument<number> => Param.integer(Param.argumentKind, name)
+export const Int = (name: string): Argument<number> => Param.Int(Param.argumentKind, name)
 
 /**
  * Creates a positional file path argument.
@@ -86,17 +83,17 @@ export const integer = (name: string): Argument<number> => Param.integer(Param.a
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const inputFile = Argument.file("input", { mustExist: true }) // Must exist
- * const outputFile = Argument.file("output", { mustExist: false }) // Must not exist
+ * const inputFile = Argument.File("input", { mustExist: true }) // Must exist
+ * const outputFile = Argument.File("output", { mustExist: false }) // Must not exist
  * const kinds = [inputFile.kind, outputFile.kind] // => ["argument", "argument"]
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const file = (name: string, options?: {
+export const File = (name: string, options?: {
   readonly mustExist?: boolean | undefined
-}): Argument<string> => Param.file(Param.argumentKind, name, options)
+}): Argument<string> => Param.File(Param.argumentKind, name, options)
 
 /**
  * Creates a positional directory path argument.
@@ -106,33 +103,33 @@ export const file = (name: string, options?: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const workspace = Argument.directory("workspace", { mustExist: true }) // Must exist
+ * const workspace = Argument.Directory("workspace", { mustExist: true }) // Must exist
  * workspace.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const directory = (name: string, options?: {
+export const Directory = (name: string, options?: {
   readonly mustExist?: boolean | undefined
-}): Argument<string> => Param.directory(Param.argumentKind, name, options)
+}): Argument<string> => Param.Directory(Param.argumentKind, name, options)
 
 /**
- * Creates a positional float argument.
+ * Creates a positional argument that parses finite numbers.
  *
- * **Example** (Creating a float argument)
+ * **Example** (Parsing a finite number)
  *
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const ratio = Argument.float("ratio")
+ * const ratio = Argument.Finite("ratio")
  * ratio.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const float = (name: string): Argument<number> => Param.float(Param.argumentKind, name)
+export const Finite = (name: string): Argument<number> => Param.Finite(Param.argumentKind, name)
 
 /**
  * Creates a positional date argument.
@@ -142,14 +139,14 @@ export const float = (name: string): Argument<number> => Param.float(Param.argum
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const startDate = Argument.date("start-date")
+ * const startDate = Argument.Date("start-date")
  * startDate.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const date = (name: string): Argument<Date> => Param.date(Param.argumentKind, name)
+export const Date = (name: string): Argument<globalThis.Date> => Param.Date(Param.argumentKind, name)
 
 /**
  * Creates a positional choice argument.
@@ -159,17 +156,17 @@ export const date = (name: string): Argument<Date> => Param.date(Param.argumentK
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const environment = Argument.choice("environment", ["dev", "staging", "prod"])
+ * const environment = Argument.Literals("environment", ["dev", "staging", "prod"])
  * environment.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const choice = <const Choices extends ReadonlyArray<string>>(
+export const Literals = <const Choices extends ReadonlyArray<string>>(
   name: string,
   choices: Choices
-): Argument<Choices[number]> => Param.choice(Param.argumentKind, name, choices)
+): Argument<Choices[number]> => Param.Literals(Param.argumentKind, name, choices)
 
 /**
  * Creates a positional path argument.
@@ -179,17 +176,17 @@ export const choice = <const Choices extends ReadonlyArray<string>>(
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const configPath = Argument.path("config")
+ * const configPath = Argument.Path("config")
  * configPath.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const path = (name: string, options?: {
+export const Path = (name: string, options?: {
   pathType?: "file" | "directory" | "either"
   mustExist?: boolean
-}): Argument<string> => Param.path(Param.argumentKind, name, options)
+}): Argument<string> => Param.Path(Param.argumentKind, name, options)
 
 /**
  * Creates a positional redacted argument that obscures its value.
@@ -199,14 +196,14 @@ export const path = (name: string, options?: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const secret = Argument.redacted("secret")
+ * const secret = Argument.Redacted("secret")
  * secret.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const redacted = (name: string): Argument<Redacted.Redacted<string>> => Param.redacted(Param.argumentKind, name)
+export const Redacted = (name: string): Argument<Redacted_.Redacted<string>> => Param.Redacted(Param.argumentKind, name)
 
 /**
  * Creates a positional argument that reads file content as a string.
@@ -216,14 +213,14 @@ export const redacted = (name: string): Argument<Redacted.Redacted<string>> => P
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const config = Argument.fileText("config-file")
+ * const config = Argument.FileText("config-file")
  * config.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const fileText = (name: string): Argument<string> => Param.fileText(Param.argumentKind, name)
+export const FileText = (name: string): Argument<string> => Param.FileText(Param.argumentKind, name)
 
 /**
  * Creates a positional argument that reads a file and parses its content.
@@ -239,17 +236,17 @@ export const fileText = (name: string): Argument<string> => Param.fileText(Param
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const config = Argument.fileParse("config", { format: "json" })
+ * const config = Argument.FileParse("config", { format: "json" })
  * config.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const fileParse = (
+export const FileParse = (
   name: string,
   options?: Primitive.FileParseOptions | undefined
-): Argument<unknown> => Param.fileParse(Param.argumentKind, name, options)
+): Argument<unknown> => Param.FileParse(Param.argumentKind, name, options)
 
 /**
  * Creates a positional argument that reads and validates file content using a schema.
@@ -265,36 +262,35 @@ export const fileParse = (
  *   host: Schema.String
  * })
  *
- * const config = Argument.fileSchema("config", ConfigSchema)
+ * const config = Argument.FileSchema("config", ConfigSchema)
  * config.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const fileSchema = <A>(
+export const FileSchema = <A>(
   name: string,
   schema: Schema.ConstraintDecoder<A, Environment>,
   options?: Primitive.FileSchemaOptions | undefined
-): Argument<A> => Param.fileSchema(Param.argumentKind, name, schema, options)
+): Argument<A> => Param.FileSchema(Param.argumentKind, name, schema, options)
 
 /**
- * Creates an empty sentinel argument that always fails to parse.
+ * An argument that always fails to parse.
  *
  * **Example** (Creating a sentinel argument)
  *
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * // Used as a placeholder or default in combinators
- * const noArg = Argument.none
+ * const noArg = Argument.Never
  * noArg.kind // => "argument"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const none: Argument<never> = Param.none(Param.argumentKind)
+export const Never: Argument<never> = Param.Never(Param.argumentKind)
 
 // -------------------------------------------------------------------------------------
 // combinators
@@ -308,7 +304,7 @@ export const none: Argument<never> = Param.none(Param.argumentKind)
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const optionalVersion = Argument.string("version").pipe(Argument.optional)
+ * const optionalVersion = Argument.String("version").pipe(Argument.optional)
  * optionalVersion.kind // => "argument"
  * ```
  *
@@ -325,7 +321,7 @@ export const optional = <A>(arg: Argument<A>): Argument<Option.Option<A>> => Par
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const filename = Argument.string("filename").pipe(
+ * const filename = Argument.String("filename").pipe(
  *   Argument.withDescription("The input file to process")
  * )
  * filename.kind // => "argument"
@@ -347,7 +343,7 @@ export const withDescription: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const port = Argument.integer("port").pipe(Argument.withDefault(8080))
+ * const port = Argument.Int("port").pipe(Argument.withDefault(8080))
  * port.kind // => "argument"
  * ```
  *
@@ -373,7 +369,7 @@ export const withDefault: {
  * import { Config } from "effect"
  * import { Argument } from "effect/unstable/cli"
  *
- * const repository = Argument.string("repository").pipe(
+ * const repository = Argument.String("repository").pipe(
  *   Argument.withFallbackConfig(Config.String("REPOSITORY"))
  * )
  * repository.kind // => "argument"
@@ -395,8 +391,8 @@ export const withFallbackConfig: {
  * ```ts import.meta.vitest
  * import { Argument, Prompt } from "effect/unstable/cli"
  *
- * const filename = Argument.string("filename").pipe(
- *   Argument.withFallbackPrompt(Prompt.text({ message: "Filename" }))
+ * const filename = Argument.String("filename").pipe(
+ *   Argument.withFallbackPrompt(Prompt.String({ message: "Filename" }))
  * )
  * filename.kind // => "argument"
  * ```
@@ -418,15 +414,15 @@ export const withFallbackPrompt: {
  * import { Argument } from "effect/unstable/cli"
  *
  * // Accept any number of files
- * const anyFiles = Argument.string("files").pipe(Argument.variadic)
+ * const anyFiles = Argument.String("files").pipe(Argument.variadic)
  *
  * // Accept at least 1 file
- * const atLeastOneFile = Argument.string("files").pipe(
+ * const atLeastOneFile = Argument.String("files").pipe(
  *   Argument.variadic({ min: 1 })
  * )
  *
  * // Accept between 1 and 5 files
- * const limitedFiles = Argument.string("files").pipe(
+ * const limitedFiles = Argument.String("files").pipe(
  *   Argument.variadic({ min: 1, max: 5 })
  * )
  *
@@ -452,7 +448,7 @@ export const variadic: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const port = Argument.integer("port").pipe(
+ * const port = Argument.Int("port").pipe(
  *   Argument.map((p) => ({ port: p, url: `http://localhost:${p}` }))
  * )
  * port.kind // => "argument"
@@ -493,7 +489,7 @@ export const map: {
  *   )
  * )
  *
- * const files = Argument.string("files").pipe(
+ * const files = Argument.String("files").pipe(
  *   Argument.mapEffect((file) =>
  *     file.endsWith(".txt")
  *       ? Effect.succeed(file)
@@ -555,7 +551,7 @@ export const mapEffect: {
  *   )
  * )
  *
- * const json = Argument.string("data").pipe(
+ * const json = Argument.String("data").pipe(
  *   Argument.mapTryCatch(
  *     (str) => JSON.parse(str),
  *     (error) =>
@@ -592,7 +588,7 @@ export const mapTryCatch: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const files = Argument.string("files").pipe(Argument.atLeast(1))
+ * const files = Argument.String("files").pipe(Argument.atLeast(1))
  * files.kind // => "argument"
  * ```
  *
@@ -612,7 +608,7 @@ export const atLeast: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const files = Argument.string("files").pipe(Argument.atMost(5))
+ * const files = Argument.String("files").pipe(Argument.atMost(5))
  * files.kind // => "argument"
  * ```
  *
@@ -632,7 +628,7 @@ export const atMost: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const files = Argument.string("files").pipe(Argument.between(1, 5))
+ * const files = Argument.String("files").pipe(Argument.between(1, 5))
  * files.kind // => "argument"
  * ```
  *
@@ -653,7 +649,7 @@ export const between: {
  * import { Schema } from "effect"
  * import { Argument } from "effect/unstable/cli"
  *
- * const input = Argument.string("input").pipe(
+ * const input = Argument.String("input").pipe(
  *   Argument.withSchema(Schema.NonEmptyString)
  * )
  * input.kind // => "argument"
@@ -679,7 +675,7 @@ export const withSchema: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const logLevel = Argument.choiceWithValue("level", [
+ * const logLevel = Argument.ChoiceWithValue("level", [
  *   ["debug", 0],
  *   ["info", 1],
  *   ["warn", 2],
@@ -691,10 +687,10 @@ export const withSchema: {
  * @category constructors
  * @since 4.0.0
  */
-export const choiceWithValue = <const Choices extends ReadonlyArray<readonly [string, any]>>(
+export const ChoiceWithValue = <const Choices extends ReadonlyArray<readonly [string, any]>>(
   name: string,
   choices: Choices
-): Argument<Choices[number][1]> => Param.choiceWithValue(Param.argumentKind, name, choices)
+): Argument<Choices[number][1]> => Param.ChoiceWithValue(Param.argumentKind, name, choices)
 
 // -------------------------------------------------------------------------------------
 // metadata
@@ -713,7 +709,7 @@ export const choiceWithValue = <const Choices extends ReadonlyArray<readonly [st
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const port = Argument.integer("port").pipe(
+ * const port = Argument.Int("port").pipe(
  *   Argument.withMetavar("PORT")
  * )
  * port.kind // => "argument"
@@ -735,7 +731,7 @@ export const withMetavar: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const positiveInt = Argument.integer("count").pipe(
+ * const positiveInt = Argument.Int("count").pipe(
  *   Argument.filter(
  *     (n) => n > 0,
  *     (n) => `Expected positive integer, got ${n}`
@@ -766,7 +762,7 @@ export const filter: {
  * import { Option } from "effect"
  * import { Argument } from "effect/unstable/cli"
  *
- * const positiveInt = Argument.integer("count").pipe(
+ * const positiveInt = Argument.Int("count").pipe(
  *   Argument.filterMap(
  *     (n) => n > 0 ? Option.some(n) : Option.none(),
  *     (n) => `Expected positive integer, got ${n}`
@@ -795,8 +791,8 @@ export const filterMap: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const value = Argument.integer("value").pipe(
- *   Argument.orElse(() => Argument.string("value"))
+ * const value = Argument.Int("value").pipe(
+ *   Argument.orElse(() => Argument.String("value"))
  * )
  * value.kind // => "argument"
  * ```
@@ -817,8 +813,8 @@ export const orElse: {
  * ```ts import.meta.vitest
  * import { Argument } from "effect/unstable/cli"
  *
- * const source = Argument.file("source").pipe(
- *   Argument.orElseResult(() => Argument.string("url"))
+ * const source = Argument.File("source").pipe(
+ *   Argument.orElseResult(() => Argument.String("url"))
  * )
  * // Returns Result<string, string>
  * source.kind // => "argument"
diff --git a/repos/effect/packages/effect/src/unstable/cli/CliOutput.ts b/repos/effect/packages/effect/src/unstable/cli/CliOutput.ts
index 7ff323572..bdceb7bb7 100644
--- a/repos/effect/packages/effect/src/unstable/cli/CliOutput.ts
+++ b/repos/effect/packages/effect/src/unstable/cli/CliOutput.ts
@@ -306,7 +306,7 @@ export const defaultFormatter = (options?: { colors?: boolean }): Formatter => {
       typeof globalProcess.stdout === "object" &&
       globalProcess.stdout !== null &&
       globalProcess.stdout.isTTY === true &&
-      globalProcess.env?.NO_COLOR !== "1")
+      !globalProcess.env?.NO_COLOR)
 
   // Color palette using ANSI escape codes
   const colors = useColor
@@ -380,10 +380,47 @@ const stripAnsi = (text: string): string => {
 }
 
 /**
- * Gets the visual length of a string (excluding ANSI codes).
+ * Gets the terminal display width of a string (excluding ANSI codes).
  * @internal
  */
-const visualLength = (text: string): number => stripAnsi(text).length
+const graphemeSegmenter = new Intl.Segmenter(undefined, { granularity: "grapheme" })
+
+const zeroWidthCodePoints = /[\p{Mark}\p{Control}\p{Default_Ignorable_Code_Point}]/gu
+const emojiPresentation = /\p{Emoji_Presentation}/u
+
+const isFullWidthCodePoint = (codePoint: number): boolean => {
+  if (codePoint < 0x1100) return false
+
+  return codePoint <= 0x115f ||
+    codePoint === 0x2329 ||
+    codePoint === 0x232a ||
+    (codePoint >= 0x2e80 && codePoint <= 0x303e) ||
+    (codePoint >= 0x3040 && codePoint <= 0xa4cf) ||
+    (codePoint >= 0xac00 && codePoint <= 0xd7a3) ||
+    (codePoint >= 0xf900 && codePoint <= 0xfaff) ||
+    (codePoint >= 0xfe10 && codePoint <= 0xfe19) ||
+    (codePoint >= 0xfe30 && codePoint <= 0xfe6f) ||
+    (codePoint >= 0xff00 && codePoint <= 0xff60) ||
+    (codePoint >= 0xffe0 && codePoint <= 0xffe6) ||
+    (codePoint >= 0x1b000 && codePoint <= 0x1b2ff) ||
+    (codePoint >= 0x1f200 && codePoint <= 0x1f251) ||
+    (codePoint >= 0x20000 && codePoint <= 0x3fffd)
+}
+
+const graphemeWidth = (grapheme: string): number => {
+  const visible = grapheme.replace(zeroWidthCodePoints, "")
+  if (visible.length === 0) return 0
+  if (emojiPresentation.test(grapheme) || grapheme.includes("\uFE0F")) return 2
+  return isFullWidthCodePoint(visible.codePointAt(0)!) ? 2 : 1
+}
+
+const visualLength = (text: string): number => {
+  let length = 0
+  for (const { segment } of graphemeSegmenter.segment(stripAnsi(text))) {
+    length += graphemeWidth(segment)
+  }
+  return length
+}
 
 /**
  * Helper function to pad strings to a specified width.
diff --git a/repos/effect/packages/effect/src/unstable/cli/Command.ts b/repos/effect/packages/effect/src/unstable/cli/Command.ts
index 41e6bada0..e932f3bba 100644
--- a/repos/effect/packages/effect/src/unstable/cli/Command.ts
+++ b/repos/effect/packages/effect/src/unstable/cli/Command.ts
@@ -97,15 +97,15 @@ import * as Prompt from "./Prompt.ts"
  *   never,
  *   never
  * > = Command.make("deploy", {
- *   env: Flag.string("env"),
- *   force: Flag.boolean("force").pipe(Flag.withDefault(false)),
- *   files: Argument.string("files").pipe(Argument.variadic())
+ *   env: Flag.String("env"),
+ *   force: Flag.Boolean("force").pipe(Flag.withDefault(false)),
+ *   files: Argument.String("files").pipe(Argument.variadic())
  * })
  *
  * // Command with handler
  * const output: Array<string> = []
  * const greet = Command.make("greet", {
- *   name: Flag.string("name")
+ *   name: Flag.String("name")
  * }, (config) => Effect.sync(() => output.push(`Hello, ${config.name}!`)).pipe(Effect.asVoid))
  *
  * await Effect.runPromise(
@@ -225,20 +225,20 @@ export declare namespace Command {
    *
    * // Simple flat configuration
    * const simpleConfig = {
-   *   name: Flag.string("name"),
-   *   age: Flag.integer("age"),
-   *   file: Argument.string("file")
+   *   name: Flag.String("name"),
+   *   age: Flag.Int("age"),
+   *   file: Argument.String("file")
    * } satisfies CliCommand.Command.Config
    *
    * // Nested configuration for organization
    * const nestedConfig = {
    *   user: {
-   *     name: Flag.string("name"),
-   *     email: Flag.string("email")
+   *     name: Flag.String("name"),
+   *     email: Flag.String("email")
    *   },
    *   server: {
-   *     host: Flag.string("host"),
-   *     port: Flag.integer("port")
+   *     host: Flag.String("host"),
+   *     port: Flag.Int("port")
    *   }
    * } satisfies CliCommand.Command.Config
    *
@@ -293,10 +293,10 @@ export declare namespace Command {
      * import type { Command as CliCommand } from "effect/unstable/cli"
      *
      * const config = {
-     *   name: Flag.string("name"),
+     *   name: Flag.String("name"),
      *   server: {
-     *     host: Flag.string("host"),
-     *     port: Flag.integer("port")
+     *     host: Flag.String("host"),
+     *     port: Flag.Int("port")
      *   }
      * } as const
      *
@@ -456,14 +456,14 @@ export type Services<C> = C extends Command<
  *
  * const parent = Command.make("app").pipe(
  *   Command.withSharedFlags({
- *     verbose: Flag.boolean("verbose").pipe(Flag.withDefault(false)),
- *     config: Flag.string("config")
+ *     verbose: Flag.Boolean("verbose").pipe(Flag.withDefault(false)),
+ *     config: Flag.String("config")
  *   })
  * )
  *
  * const output: Array<string> = []
  * const child = Command.make("deploy", {
- *   target: Flag.string("target")
+ *   target: Flag.String("target")
  * }, (config) =>
  *   Effect.gen(function*() {
  *     // Access parent's config by yielding the parent command
@@ -568,21 +568,21 @@ export const isCommand = (u: unknown): u is Command.Any => Predicate.hasProperty
  *
  * // Command with simple flags
  * const greet = Command.make("greet", {
- *   name: Flag.string("name"),
- *   count: Flag.integer("count").pipe(Flag.withDefault(1))
+ *   name: Flag.String("name"),
+ *   count: Flag.Int("count").pipe(Flag.withDefault(1))
  * })
  *
  * // Command with nested configuration
  * const deploy = Command.make("deploy", {
- *   environment: Flag.string("env").pipe(
+ *   environment: Flag.String("env").pipe(
  *     Flag.withDescription("Target environment")
  *   ),
  *   server: {
- *     host: Flag.string("host").pipe(Flag.withDefault("localhost")),
- *     port: Flag.integer("port").pipe(Flag.withDefault(3000))
+ *     host: Flag.String("host").pipe(Flag.withDefault("localhost")),
+ *     port: Flag.Int("port").pipe(Flag.withDefault(3000))
  *   },
- *   files: Argument.string("files").pipe(Argument.variadic),
- *   force: Flag.boolean("force").pipe(
+ *   files: Argument.String("files").pipe(Argument.variadic),
+ *   force: Flag.Boolean("force").pipe(
  *     Flag.withDescription("Force deployment"),
  *     Flag.withDefault(false)
  *   )
@@ -591,8 +591,8 @@ export const isCommand = (u: unknown): u is Command.Any => Predicate.hasProperty
  * // Command with handler
  * const output: Array<string> = []
  * const deployWithHandler = Command.make("deploy", {
- *   environment: Flag.string("env"),
- *   force: Flag.boolean("force").pipe(Flag.withDefault(false))
+ *   environment: Flag.String("env"),
+ *   force: Flag.Boolean("force").pipe(Flag.withDefault(false))
  * }, (config) =>
  *   Effect.gen(function*() {
  *     yield* Effect.sync(() => output.push(`Starting deployment to ${config.environment}`))
@@ -676,7 +676,7 @@ export const make: {
  *
  * // Command without initial handler
  * const greet = Command.make("greet", {
- *   name: Flag.string("name")
+ *   name: Flag.String("name")
  * })
  *
  * // Add handler later
@@ -801,14 +801,14 @@ const normalizeSubcommandEntries = (
  * // Parent command with shared flags
  * const git = Command.make("git").pipe(
  *   Command.withSharedFlags({
- *     verbose: Flag.boolean("verbose").pipe(Flag.withDefault(false))
+ *     verbose: Flag.Boolean("verbose").pipe(Flag.withDefault(false))
  *   })
  * )
  *
  * // Subcommand that accesses parent config
  * const output: Array<string> = []
  * const clone = Command.make("clone", {
- *   repository: Flag.string("repo")
+ *   repository: Flag.String("repo")
  * }, (config) =>
  *   Effect.gen(function*() {
  *     const parent = yield* git // Access parent's parsed config
@@ -1134,7 +1134,7 @@ type ExtractSubcommandContext<T extends ReadonlyArray<Command.SubcommandEntry>>
  *
  * const output: Array<string> = []
  * const deploy = Command.make("deploy", {
- *   environment: Flag.string("env")
+ *   environment: Flag.String("env")
  * }, (config) =>
  *   Effect.gen(function*() {
  *     yield* Effect.sync(() => output.push(`Deploying to ${config.environment}`))
@@ -1414,7 +1414,7 @@ const mapHandler = <Name extends string, Input, E, R, ContextInput, E2, R2>(
  *
  * const output: Array<string> = []
  * const deploy = Command.make("deploy", {
- *   env: Flag.string("env")
+ *   env: Flag.String("env")
  * }, (config) =>
  *   Effect.gen(function*() {
  *     const fs = yield* FileSystem.FileSystem
@@ -1731,7 +1731,7 @@ const showUserError = (error: CliError.UserError): Effect.Effect<void> =>
  *
  * const output: Array<string> = []
  * const greetCommand = Command.make("greet", {
- *   name: Flag.string("name")
+ *   name: Flag.String("name")
  * }, (config) =>
  *   Effect.gen(function*() {
  *     yield* Effect.sync(() => output.push(`Hello, ${config.name}!`))
@@ -1818,8 +1818,8 @@ export const run: {
  *
  * const output: Array<string> = []
  * const greet = Command.make("greet", {
- *   name: Flag.string("name"),
- *   count: Flag.integer("count").pipe(Flag.withDefault(1))
+ *   name: Flag.String("name"),
+ *   count: Flag.Int("count").pipe(Flag.withDefault(1))
  * }, (config) =>
  *   Effect.gen(function*() {
  *     for (let i = 0; i < config.count; i++) {
@@ -1904,7 +1904,7 @@ export const runWith = <const Name extends string, Input, E, R, ContextInput>(
             ]
             const wizardResult = yield* Wizard.run(command, { commandPath, prefix })
             yield* Console.log(Wizard.renderCompletion(wizardResult.displayArgs))
-            const shouldRun = yield* Prompt.run(Prompt.toggle({
+            const shouldRun = yield* Prompt.run(Prompt.Toggle({
               message: "Run this command?",
               initial: true,
               active: "yes",
diff --git a/repos/effect/packages/effect/src/unstable/cli/Completions.ts b/repos/effect/packages/effect/src/unstable/cli/Completions.ts
index 839575143..e2b32b022 100644
--- a/repos/effect/packages/effect/src/unstable/cli/Completions.ts
+++ b/repos/effect/packages/effect/src/unstable/cli/Completions.ts
@@ -54,8 +54,8 @@ export interface FlagDescriptor {
 export type FlagType =
   | { readonly _tag: "Boolean" }
   | { readonly _tag: "String" }
-  | { readonly _tag: "Integer" }
-  | { readonly _tag: "Float" }
+  | { readonly _tag: "Int" }
+  | { readonly _tag: "Finite" }
   | { readonly _tag: "Date" }
   | { readonly _tag: "Choice"; readonly values: ReadonlyArray<string> }
   | { readonly _tag: "Path"; readonly pathType: "file" | "directory" | "either" }
@@ -82,8 +82,8 @@ export interface ArgumentDescriptor {
  */
 export type ArgumentType =
   | { readonly _tag: "String" }
-  | { readonly _tag: "Integer" }
-  | { readonly _tag: "Float" }
+  | { readonly _tag: "Int" }
+  | { readonly _tag: "Finite" }
   | { readonly _tag: "Date" }
   | { readonly _tag: "Choice"; readonly values: ReadonlyArray<string> }
   | { readonly _tag: "Path"; readonly pathType: "file" | "directory" | "either" }
diff --git a/repos/effect/packages/effect/src/unstable/cli/Flag.ts b/repos/effect/packages/effect/src/unstable/cli/Flag.ts
index 3169b4862..f5aa25bcc 100644
--- a/repos/effect/packages/effect/src/unstable/cli/Flag.ts
+++ b/repos/effect/packages/effect/src/unstable/cli/Flag.ts
@@ -14,7 +14,7 @@ import type * as Config from "../../Config.ts"
 import type * as Effect from "../../Effect.ts"
 import { dual, type LazyArg } from "../../Function.ts"
 import type * as Option from "../../Option.ts"
-import type * as Redacted from "../../Redacted.ts"
+import type * as Redacted_ from "../../Redacted.ts"
 import type * as Result from "../../Result.ts"
 import type * as Schema from "../../Schema.ts"
 import type * as CliError from "./CliError.ts"
@@ -46,7 +46,7 @@ export interface Flag<A> extends Param.Param<typeof Param.flagKind, A> {}
  * ```ts import.meta.vitest
  * import { Flag } from "effect/unstable/cli"
  *
- * const nameFlag = Flag.string("name")
+ * const nameFlag = Flag.String("name")
  * // Usage: --name "John Doe"
  * nameFlag.kind // => "flag"
  * ```
@@ -54,7 +54,7 @@ export interface Flag<A> extends Param.Param<typeof Param.flagKind, A> {}
  * @category constructors
  * @since 4.0.0
  */
-export const string = (name: string): Flag<string> => Param.string(Param.flagKind, name)
+export const String = (name: string): Flag<string> => Param.String(Param.flagKind, name)
 
 /**
  * Creates a boolean flag that can be enabled or disabled.
@@ -64,7 +64,7 @@ export const string = (name: string): Flag<string> => Param.string(Param.flagKin
  * ```ts import.meta.vitest
  * import { Flag } from "effect/unstable/cli"
  *
- * const verboseFlag = Flag.boolean("verbose")
+ * const verboseFlag = Flag.Boolean("verbose")
  * // Usage: --verbose (true) or --no-verbose (false)
  * // Omission fails unless the flag is made optional or given a fallback.
  * verboseFlag.kind // => "flag"
@@ -73,7 +73,7 @@ export const string = (name: string): Flag<string> => Param.string(Param.flagKin
  * @category constructors
  * @since 4.0.0
  */
-export const boolean = (name: string): Flag<boolean> => Param.boolean(Param.flagKind, name)
+export const Boolean = (name: string): Flag<boolean> => Param.Boolean(Param.flagKind, name)
 
 /**
  * Creates an integer flag that accepts whole number input.
@@ -83,7 +83,7 @@ export const boolean = (name: string): Flag<boolean> => Param.boolean(Param.flag
  * ```ts import.meta.vitest
  * import { Flag } from "effect/unstable/cli"
  *
- * const portFlag = Flag.integer("port")
+ * const portFlag = Flag.Int("port")
  * // Usage: --port 8080
  * portFlag.kind // => "flag"
  * ```
@@ -91,7 +91,7 @@ export const boolean = (name: string): Flag<boolean> => Param.boolean(Param.flag
  * @category constructors
  * @since 4.0.0
  */
-export const integer = (name: string): Flag<number> => Param.integer(Param.flagKind, name)
+export const Int = (name: string): Flag<number> => Param.Int(Param.flagKind, name)
 
 /**
  * Creates a float flag that accepts decimal number input.
@@ -101,7 +101,7 @@ export const integer = (name: string): Flag<number> => Param.integer(Param.flagK
  * ```ts import.meta.vitest
  * import { Flag } from "effect/unstable/cli"
  *
- * const rateFlag = Flag.float("rate")
+ * const rateFlag = Flag.Finite("rate")
  * // Usage: --rate 3.14
  * rateFlag.kind // => "flag"
  * ```
@@ -109,7 +109,7 @@ export const integer = (name: string): Flag<number> => Param.integer(Param.flagK
  * @category constructors
  * @since 4.0.0
  */
-export const float = (name: string): Flag<number> => Param.float(Param.flagKind, name)
+export const Finite = (name: string): Flag<number> => Param.Finite(Param.flagKind, name)
 
 /**
  * Creates a date flag that accepts date input in ISO format.
@@ -119,7 +119,7 @@ export const float = (name: string): Flag<number> => Param.float(Param.flagKind,
  * ```ts import.meta.vitest
  * import { Flag } from "effect/unstable/cli"
  *
- * const startDateFlag = Flag.date("start-date")
+ * const startDateFlag = Flag.Date("start-date")
  * // Usage: --start-date 2023-12-25
  * startDateFlag.kind // => "flag"
  * ```
@@ -127,7 +127,7 @@ export const float = (name: string): Flag<number> => Param.float(Param.flagKind,
  * @category constructors
  * @since 4.0.0
  */
-export const date = (name: string): Flag<Date> => Param.date(Param.flagKind, name)
+export const Date = (name: string): Flag<globalThis.Date> => Param.Date(Param.flagKind, name)
 
 /**
  * Constructs option parameters that represent a choice between several inputs.
@@ -139,10 +139,10 @@ export const date = (name: string): Flag<Date> => Param.date(Param.flagKind, nam
  * import { Flag } from "effect/unstable/cli"
  *
  * // simple enum like choice mapping directly to string union
- * const color = Flag.choice("color", ["red", "green", "blue"])
+ * const color = Flag.Literals("color", ["red", "green", "blue"])
  *
  * // choice with custom value mapping
- * const logLevel = Flag.choiceWithValue("log-level", [
+ * const logLevel = Flag.ChoiceWithValue("log-level", [
  *   ["debug", "Debug" as const],
  *   ["info", "Info" as const],
  *   ["error", "Error" as const]
@@ -153,33 +153,23 @@ export const date = (name: string): Flag<Date> => Param.date(Param.flagKind, nam
  * @category constructors
  * @since 4.0.0
  */
-export const choiceWithValue = <const Choice extends ReadonlyArray<readonly [string, any]>>(
+export const ChoiceWithValue = <const Choice extends ReadonlyArray<readonly [string, any]>>(
   name: string,
   choices: Choice
-): Flag<Choice[number][1]> => Param.choiceWithValue(Param.flagKind, name, choices)
+): Flag<Choice[number][1]> => Param.ChoiceWithValue(Param.flagKind, name, choices)
 
 /**
- * Creates a flag that accepts one of the provided string choices and returns
- * the selected string.
+ * Accepts one of the provided strings. An empty array rejects all input.
  *
- * **When to use**
- *
- * Use when you need to define a named CLI flag with fixed string choices and no
- * custom value mapping.
- *
- * **Gotchas**
- *
- * An empty choices array compiles, but no input value can parse successfully.
- *
- * @see {@link choiceWithValue} for mapping accepted strings to different typed values
+ * @see {@link ChoiceWithValue} for mapping accepted strings to different typed values
  *
  * @category constructors
  * @since 4.0.0
  */
-export const choice = <const Choices extends ReadonlyArray<string>>(
+export const Literals = <const Literals extends ReadonlyArray<string>>(
   name: string,
-  choices: Choices
-): Flag<Choices[number]> => Param.choice(Param.flagKind, name, choices)
+  literals: Literals
+): Flag<Literals[number]> => Param.Literals(Param.flagKind, name, literals)
 
 /**
  * Creates a path flag that accepts file system path input with validation options.
@@ -190,16 +180,16 @@ export const choice = <const Choices extends ReadonlyArray<string>>(
  * import { Flag } from "effect/unstable/cli"
  *
  * // Basic path flag
- * const pathFlag = Flag.path("config-path")
+ * const pathFlag = Flag.Path("config-path")
  *
  * // File-only path that must exist
- * const fileFlag = Flag.path("input-file", {
+ * const fileFlag = Flag.Path("input-file", {
  *   pathType: "file",
  *   mustExist: true
  * })
  *
  * // Directory path with custom type name
- * const dirFlag = Flag.path("output-dir", {
+ * const dirFlag = Flag.Path("output-dir", {
  *   pathType: "directory",
  *   typeName: "OUTPUT_DIRECTORY"
  * })
@@ -209,11 +199,11 @@ export const choice = <const Choices extends ReadonlyArray<string>>(
  * @category constructors
  * @since 4.0.0
  */
-export const path = (name: string, options?: {
+export const Path = (name: string, options?: {
   readonly pathType?: "file" | "directory" | "either" | undefined
   readonly mustExist?: boolean | undefined
   readonly typeName?: string | undefined
-}): Flag<string> => Param.path(Param.flagKind, name, options)
+}): Flag<string> => Param.Path(Param.flagKind, name, options)
 
 /**
  * Creates a file path flag that accepts file paths with optional existence validation.
@@ -224,11 +214,11 @@ export const path = (name: string, options?: {
  * import { Flag } from "effect/unstable/cli"
  *
  * // Basic file flag
- * const inputFlag = Flag.file("input")
+ * const inputFlag = Flag.File("input")
  * // Usage: --input ./data.json
  *
  * // File that must exist
- * const configFlag = Flag.file("config", { mustExist: true })
+ * const configFlag = Flag.File("config", { mustExist: true })
  * // Usage: --config ./config.yaml (file must exist)
  * const kinds = [inputFlag.kind, configFlag.kind] // => ["flag", "flag"]
  * ```
@@ -236,9 +226,9 @@ export const path = (name: string, options?: {
  * @category constructors
  * @since 4.0.0
  */
-export const file = (name: string, options?: {
+export const File = (name: string, options?: {
   readonly mustExist?: boolean | undefined
-}): Flag<string> => Param.file(Param.flagKind, name, options)
+}): Flag<string> => Param.File(Param.flagKind, name, options)
 
 /**
  * Creates a directory path flag that accepts directory paths with optional existence validation.
@@ -249,11 +239,11 @@ export const file = (name: string, options?: {
  * import { Flag } from "effect/unstable/cli"
  *
  * // Basic directory flag
- * const outputFlag = Flag.directory("output")
+ * const outputFlag = Flag.Directory("output")
  * // Usage: --output ./build
  *
  * // Directory that must exist
- * const sourceFlag = Flag.directory("source", { mustExist: true })
+ * const sourceFlag = Flag.Directory("source", { mustExist: true })
  * // Usage: --source ./src (directory must exist)
  * const kinds = [outputFlag.kind, sourceFlag.kind] // => ["flag", "flag"]
  * ```
@@ -261,9 +251,9 @@ export const file = (name: string, options?: {
  * @category constructors
  * @since 4.0.0
  */
-export const directory = (name: string, options?: {
+export const Directory = (name: string, options?: {
   readonly mustExist?: boolean | undefined
-}): Flag<string> => Param.directory(Param.flagKind, name, options)
+}): Flag<string> => Param.Directory(Param.flagKind, name, options)
 
 /**
  * Creates a string flag whose parsed value is wrapped in `Redacted.Redacted` so
@@ -298,7 +288,7 @@ export const directory = (name: string, options?: {
  *   )
  * )
  *
- * const passwordFlag = Flag.redacted("password")
+ * const passwordFlag = Flag.Redacted("password")
  *
  * const program = Effect.gen(function*() {
  *   const [, password] = yield* passwordFlag.parse({
@@ -314,7 +304,7 @@ export const directory = (name: string, options?: {
  * @category constructors
  * @since 4.0.0
  */
-export const redacted = (name: string): Flag<Redacted.Redacted<string>> => Param.redacted(Param.flagKind, name)
+export const Redacted = (name: string): Flag<Redacted_.Redacted<string>> => Param.Redacted(Param.flagKind, name)
 
 /**
  * Creates a flag that reads and returns file content as a string.
@@ -324,7 +314,7 @@ export const redacted = (name: string): Flag<Redacted.Redacted<string>> => Param
  * ```ts import.meta.vitest
  * import { Flag } from "effect/unstable/cli"
  *
- * const config = Flag.fileText("config-file")
+ * const config = Flag.FileText("config-file")
  * // --config-file ./app.json will read the file content
  * config.kind // => "flag"
  * ```
@@ -332,7 +322,7 @@ export const redacted = (name: string): Flag<Redacted.Redacted<string>> => Param
  * @category constructors
  * @since 4.0.0
  */
-export const fileText = (name: string): Flag<string> => Param.fileText(Param.flagKind, name)
+export const FileText = (name: string): Flag<string> => Param.FileText(Param.flagKind, name)
 
 /**
  * Creates a flag that reads and parses the content of the specified file.
@@ -349,20 +339,20 @@ export const fileText = (name: string): Flag<string> => Param.fileText(Param.fla
  *
  * // Will use the extension of the file passed on the command line to determine
  * // the parser to use
- * const config = Flag.fileParse("config")
+ * const config = Flag.FileParse("config")
  *
  * // Will use the JSON parser
- * const jsonConfig = Flag.fileParse("json-config", { format: "json" })
+ * const jsonConfig = Flag.FileParse("json-config", { format: "json" })
  * const kinds = [config.kind, jsonConfig.kind] // => ["flag", "flag"]
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const fileParse = (
+export const FileParse = (
   name: string,
   options?: Primitive.FileParseOptions | undefined
-): Flag<unknown> => Param.fileParse(Param.flagKind, name, options)
+): Flag<unknown> => Param.FileParse(Param.flagKind, name, options)
 
 /**
  * Creates a flag that reads and validates file content using the specified
@@ -379,18 +369,18 @@ export const fileParse = (
  *   host: Schema.String
  * })
  *
- * const config = Flag.fileSchema("config", ConfigSchema, { format: "json" })
+ * const config = Flag.FileSchema("config", ConfigSchema, { format: "json" })
  * config.kind // => "flag"
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const fileSchema = <A>(
+export const FileSchema = <A>(
   name: string,
   schema: Schema.ConstraintDecoder<A, Environment>,
   options?: Primitive.FileSchemaOptions | undefined
-): Flag<A> => Param.fileSchema(Param.flagKind, name, schema, options)
+): Flag<A> => Param.FileSchema(Param.flagKind, name, schema, options)
 
 /**
  * Creates a flag that parses key=value pairs.
@@ -410,7 +400,7 @@ export const fileSchema = <A>(
  * ```ts import.meta.vitest
  * import { Flag } from "effect/unstable/cli"
  *
- * const env = Flag.keyValuePair("env")
+ * const env = Flag.KeyValuePair("env")
  * // --env FOO=bar --env BAZ=qux will parse to { FOO: "bar", BAZ: "qux" }
  * env.kind // => "flag"
  * ```
@@ -418,11 +408,10 @@ export const fileSchema = <A>(
  * @category constructors
  * @since 4.0.0
  */
-export const keyValuePair = (name: string): Flag<Record<string, string>> => Param.keyValuePair(Param.flagKind, name)
+export const KeyValuePair = (name: string): Flag<Record<string, string>> => Param.KeyValuePair(Param.flagKind, name)
 
 /**
- * Creates an empty sentinel flag that always fails to parse.
- * This is useful for creating placeholder flags or for combinators.
+ * A flag that always fails to parse.
  *
  * **Example** (Creating sentinel flags)
  *
@@ -430,16 +419,16 @@ export const keyValuePair = (name: string): Flag<Record<string, string>> => Para
  * import { Flag } from "effect/unstable/cli"
  *
  * const makeValueFlag = (includeValue: boolean) =>
- *   includeValue ? Flag.string("value") : Flag.none
+ *   includeValue ? Flag.String("value") : Flag.Never
  *
- * makeValueFlag(true) === Flag.none // => false
- * makeValueFlag(false) === Flag.none // => true
+ * makeValueFlag(true) === Flag.Never // => false
+ * makeValueFlag(false) === Flag.Never // => true
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const none: Flag<never> = Param.none(Param.flagKind)
+export const Never: Flag<never> = Param.Never(Param.flagKind)
 
 // -------------------------------------------------------------------------------------
 // combinators
@@ -454,12 +443,12 @@ export const none: Flag<never> = Param.none(Param.flagKind)
  * import { Flag } from "effect/unstable/cli"
  *
  * // Flag can be used as both --verbose and -v
- * const verboseFlag = Flag.boolean("verbose").pipe(
+ * const verboseFlag = Flag.Boolean("verbose").pipe(
  *   Flag.withAlias("v")
  * )
  *
  * // Multiple aliases can be chained
- * const helpFlag = Flag.boolean("help").pipe(
+ * const helpFlag = Flag.Boolean("help").pipe(
  *   Flag.withAlias("h"),
  *   Flag.withAlias("?")
  * )
@@ -482,11 +471,11 @@ export const withAlias: {
  * ```ts import.meta.vitest
  * import { Flag } from "effect/unstable/cli"
  *
- * const portFlag = Flag.integer("port").pipe(
+ * const portFlag = Flag.Int("port").pipe(
  *   Flag.withDescription("The port number to listen on")
  * )
  *
- * const configFlag = Flag.file("config").pipe(
+ * const configFlag = Flag.File("config").pipe(
  *   Flag.withDescription("Path to the configuration file")
  * )
  * const kinds = [portFlag.kind, configFlag.kind] // => ["flag", "flag"]
@@ -517,13 +506,13 @@ export const withDescription: {
  * ```ts import.meta.vitest
  * import { Flag } from "effect/unstable/cli"
  *
- * const databaseFlag = Flag.string("database-url").pipe(
+ * const databaseFlag = Flag.String("database-url").pipe(
  *   Flag.withMetavar("URL"),
  *   Flag.withDescription("Database connection URL")
  * )
  * // In help: --database-url URL
  *
- * const timeoutFlag = Flag.integer("timeout").pipe(
+ * const timeoutFlag = Flag.Int("timeout").pipe(
  *   Flag.withMetavar("SECONDS")
  * )
  * // In help: --timeout SECONDS
@@ -554,7 +543,7 @@ export const withMetavar: {
  * import { Flag } from "effect/unstable/cli"
  *
  * // Flag still parses --experimental-foo, but it does not appear in --help.
- * const experimental = Flag.boolean("experimental-foo").pipe(
+ * const experimental = Flag.Boolean("experimental-foo").pipe(
  *   Flag.withHidden
  * )
  * experimental.kind // => "flag"
@@ -592,7 +581,7 @@ export const withHidden = <A>(self: Flag<A>): Flag<A> => Param.withHidden(self)
  *   )
  * )
  *
- * const optionalPort = Flag.optional(Flag.integer("port"))
+ * const optionalPort = Flag.optional(Flag.Int("port"))
  *
  * const program = Effect.gen(function*() {
  *   const [, port] = yield* optionalPort.parse({
@@ -618,12 +607,12 @@ export const optional = <A>(param: Flag<A>): Flag<Option.Option<A>> => Param.opt
  * ```ts import.meta.vitest
  * import { Flag } from "effect/unstable/cli"
  *
- * const portFlag = Flag.integer("port").pipe(
+ * const portFlag = Flag.Int("port").pipe(
  *   Flag.withDefault(8080)
  * )
  * // If --port is not provided, defaults to 8080
  *
- * const hostFlag = Flag.string("host").pipe(
+ * const hostFlag = Flag.String("host").pipe(
  *   Flag.withDefault("localhost")
  * )
  * // If --host is not provided, defaults to "localhost"
@@ -647,7 +636,7 @@ export const withDefault: {
  * import { Config } from "effect"
  * import { Flag } from "effect/unstable/cli"
  *
- * const verbose = Flag.boolean("verbose").pipe(
+ * const verbose = Flag.Boolean("verbose").pipe(
  *   Flag.withFallbackConfig(Config.Boolean("VERBOSE"))
  * )
  * verbose.kind // => "flag"
@@ -669,8 +658,8 @@ export const withFallbackConfig: {
  * ```ts import.meta.vitest
  * import { Flag, Prompt } from "effect/unstable/cli"
  *
- * const name = Flag.string("name").pipe(
- *   Flag.withFallbackPrompt(Prompt.text({ message: "Name" }))
+ * const name = Flag.String("name").pipe(
+ *   Flag.withFallbackPrompt(Prompt.String({ message: "Name" }))
  * )
  * name.kind // => "flag"
  * ```
@@ -692,12 +681,12 @@ export const withFallbackPrompt: {
  * import { Flag } from "effect/unstable/cli"
  *
  * // Convert string to uppercase
- * const nameFlag = Flag.string("name").pipe(
+ * const nameFlag = Flag.String("name").pipe(
  *   Flag.map((name) => name.toUpperCase())
  * )
  *
  * // Convert port to URL
- * const urlFlag = Flag.integer("port").pipe(
+ * const urlFlag = Flag.Int("port").pipe(
  *   Flag.map((port) => `http://localhost:${port}`)
  * )
  * const kinds = [nameFlag.kind, urlFlag.kind] // => ["flag", "flag"]
@@ -738,7 +727,7 @@ export const map: {
  *   )
  * )
  *
- * const upperName = Flag.string("name").pipe(
+ * const upperName = Flag.String("name").pipe(
  *   Flag.mapEffect((name) => Effect.succeed(name.toUpperCase()))
  * )
  *
@@ -795,7 +784,7 @@ export const mapEffect: {
  * )
  *
  * // Parse JSON string with error handling
- * const jsonFlag = Flag.string("config").pipe(
+ * const jsonFlag = Flag.String("config").pipe(
  *   Flag.mapTryCatch(
  *     (json) => JSON.parse(json),
  *     (error) => `Invalid JSON: ${error}`
@@ -803,7 +792,7 @@ export const mapEffect: {
  * )
  *
  * // Parse URL with error handling
- * const urlFlag = Flag.string("url").pipe(
+ * const urlFlag = Flag.String("url").pipe(
  *   Flag.mapTryCatch(
  *     (url) => new URL(url),
  *     (error) => `Invalid URL: ${error}`
@@ -839,11 +828,11 @@ export const mapTryCatch: {
  * ```ts import.meta.vitest
  * import { Flag } from "effect/unstable/cli"
  *
- * const sourceFlag = Flag.atLeast(Flag.file("source"), 2)
+ * const sourceFlag = Flag.atLeast(Flag.File("source"), 2)
  * // Requires at least 2 source files
  * // Usage: --source file1.ts --source file2.ts
  *
- * const tagFlag = Flag.string("tag").pipe(
+ * const tagFlag = Flag.String("tag").pipe(
  *   Flag.atLeast(1)
  * )
  * // Requires at least 1 tag
@@ -866,11 +855,11 @@ export const atLeast: {
  * ```ts import.meta.vitest
  * import { Flag } from "effect/unstable/cli"
  *
- * const warningFlag = Flag.atMost(Flag.string("warning"), 3)
+ * const warningFlag = Flag.atMost(Flag.String("warning"), 3)
  * // Allows up to 3 warning flags
  * // Usage: --warning w1 --warning w2 --warning w3
  *
- * const debugFlag = Flag.string("debug").pipe(
+ * const debugFlag = Flag.String("debug").pipe(
  *   Flag.atMost(1)
  * )
  * // Allows at most 1 debug flag
@@ -893,11 +882,11 @@ export const atMost: {
  * ```ts import.meta.vitest
  * import { Flag } from "effect/unstable/cli"
  *
- * const hostFlag = Flag.between(Flag.string("host"), 1, 3)
+ * const hostFlag = Flag.between(Flag.String("host"), 1, 3)
  * // Requires 1-3 host flags
  * // Usage: --host host1 --host host2
  *
- * const excludeFlag = Flag.string("exclude").pipe(
+ * const excludeFlag = Flag.String("exclude").pipe(
  *   Flag.between(0, 5)
  * )
  * // Allows 0-5 exclude patterns
@@ -922,7 +911,7 @@ export const between: {
  * import { Flag } from "effect/unstable/cli"
  *
  * // Parse positive integers only
- * const positiveInt = Flag.integer("count").pipe(
+ * const positiveInt = Flag.Int("count").pipe(
  *   Flag.filterMap(
  *     (n) => n > 0 ? Option.some(n) : Option.none(),
  *     (n) => `Expected positive integer, got ${n}`
@@ -930,7 +919,7 @@ export const between: {
  * )
  *
  * // Parse valid email addresses
- * const emailFlag = Flag.string("email").pipe(
+ * const emailFlag = Flag.String("email").pipe(
  *   Flag.filterMap(
  *     (email) => email.includes("@") ? Option.some(email) : Option.none(),
  *     (email) => `Invalid email address: ${email}`
@@ -960,7 +949,7 @@ export const filterMap: {
  * import { Flag } from "effect/unstable/cli"
  *
  * // Ensure port is in valid range
- * const portFlag = Flag.integer("port").pipe(
+ * const portFlag = Flag.Int("port").pipe(
  *   Flag.filter(
  *     (port) => port >= 1 && port <= 65535,
  *     (port) => `Port ${port} is out of range (1-65535)`
@@ -968,7 +957,7 @@ export const filterMap: {
  * )
  *
  * // Ensure non-empty string
- * const nameFlag = Flag.string("name").pipe(
+ * const nameFlag = Flag.String("name").pipe(
  *   Flag.filter(
  *     (name) => name.trim().length > 0,
  *     () => "Name cannot be empty"
@@ -999,14 +988,14 @@ export const filter: {
  *
  * // Try parsing as integer, fallback to string
  * const valueFlag = Flag.orElse(
- *   Flag.integer("value"),
- *   () => Flag.string("value")
+ *   Flag.Int("value"),
+ *   () => Flag.String("value")
  * )
  *
  * // Multiple input sources with fallback
  * const configFlag = Flag.orElse(
- *   Flag.file("config"),
- *   () => Flag.string("config-url")
+ *   Flag.File("config"),
+ *   () => Flag.String("config-url")
  * )
  * const kinds = [valueFlag.kind, configFlag.kind] // => ["flag", "flag"]
  * ```
@@ -1047,8 +1036,8 @@ export const orElse: {
  * )
  *
  * const sourceFlag = Flag.orElseResult(
- *   Flag.string("source"),
- *   () => Flag.string("source-url")
+ *   Flag.String("source"),
+ *   () => Flag.String("source-url")
  * )
  *
  * const program = Effect.gen(function*() {
@@ -1088,7 +1077,7 @@ export const orElseResult: {
  *   Schema.check(isEmail)
  * )
  *
- * const emailFlag = Flag.string("email").pipe(
+ * const emailFlag = Flag.String("email").pipe(
  *   Flag.withSchema(EmailSchema)
  * )
  *
@@ -1099,7 +1088,7 @@ export const orElseResult: {
  *   ssl: Schema.optional(Schema.Boolean)
  * }).pipe(Schema.fromJsonString)
  *
- * const configFlag = Flag.string("config").pipe(
+ * const configFlag = Flag.String("config").pipe(
  *   Flag.withSchema(ConfigSchema)
  * )
  * const kinds = [emailFlag.kind, configFlag.kind] // => ["flag", "flag"]
diff --git a/repos/effect/packages/effect/src/unstable/cli/GlobalFlag.ts b/repos/effect/packages/effect/src/unstable/cli/GlobalFlag.ts
index d0c0a3475..cee0615b3 100644
--- a/repos/effect/packages/effect/src/unstable/cli/GlobalFlag.ts
+++ b/repos/effect/packages/effect/src/unstable/cli/GlobalFlag.ts
@@ -101,7 +101,7 @@ export type GlobalFlag<A> = Action<A> | Setting<any, A>
  * @category constructors
  * @since 4.0.0
  */
-export const action = <A>(options: {
+export const Action = <A>(options: {
   readonly flag: Flag.Flag<A>
   readonly run: (
     value: A,
@@ -119,7 +119,7 @@ export const action = <A>(options: {
  * @category constructors
  * @since 4.0.0
  */
-export const setting = <const Id extends string>(
+export const Setting = <const Id extends string>(
   id: Id
 ) =>
 <A>(options: {
@@ -147,13 +147,13 @@ let settingIdCounter = 0
  * active command path.
  *
  * @see {@link BuiltIns} for the default list containing this flag
- * @see {@link action} for defining custom action global flags
+ * @see {@link Action} for defining custom action global flags
  *
  * @category references
  * @since 4.0.0
  */
-export const Help: Action<boolean> = action({
-  flag: Flag.boolean("help").pipe(
+export const Help: Action<boolean> = Action({
+  flag: Flag.Boolean("help").pipe(
     Flag.withAlias("h"),
     Flag.withDescription("Show help information"),
     Flag.withDefault(false)
@@ -175,8 +175,8 @@ export const Help: Action<boolean> = action({
  * @category references
  * @since 4.0.0
  */
-export const Version: Action<boolean> = action({
-  flag: Flag.boolean("version").pipe(
+export const Version: Action<boolean> = Action({
+  flag: Flag.Boolean("version").pipe(
     Flag.withAlias("v"),
     Flag.withDescription("Show version information"),
     Flag.withDefault(false)
@@ -198,8 +198,8 @@ export const Version: Action<boolean> = action({
  * @category references
  * @since 4.0.0
  */
-export const Wizard: Action<boolean> = action({
-  flag: Flag.boolean("wizard").pipe(
+export const Wizard: Action<boolean> = Action({
+  flag: Flag.Boolean("wizard").pipe(
     Flag.withDescription("Start wizard mode for a command"),
     Flag.withDefault(false)
   ),
@@ -218,8 +218,8 @@ export const Wizard: Action<boolean> = action({
  * @category references
  * @since 4.0.0
  */
-export const Completions: Action<Option.Option<"bash" | "zsh" | "fish">> = action({
-  flag: Flag.choice("completions", ["bash", "zsh", "fish", "sh"] as const)
+export const Completions: Action<Option.Option<"bash" | "zsh" | "fish">> = Action({
+  flag: Flag.Literals("completions", ["bash", "zsh", "fish", "sh"] as const)
     .pipe(
       Flag.optional,
       Flag.map((v) => Option.map(v, (s) => s === "sh" ? "bash" : s)),
@@ -246,8 +246,8 @@ export const Completions: Action<Option.Option<"bash" | "zsh" | "fish">> = actio
  * @category references
  * @since 4.0.0
  */
-export const LogLevel: Setting<"log-level", Option.Option<LogLevelType>> = setting("log-level")({
-  flag: Flag.choiceWithValue(
+export const LogLevel: Setting<"log-level", Option.Option<LogLevelType>> = Setting("log-level")({
+  flag: Flag.ChoiceWithValue(
     "log-level",
     [
       ["all", "All"],
diff --git a/repos/effect/packages/effect/src/unstable/cli/Param.ts b/repos/effect/packages/effect/src/unstable/cli/Param.ts
index 710856d21..59d7d62df 100644
--- a/repos/effect/packages/effect/src/unstable/cli/Param.ts
+++ b/repos/effect/packages/effect/src/unstable/cli/Param.ts
@@ -16,7 +16,7 @@ import { dual, identity, type LazyArg } from "../../Function.ts"
 import * as Option from "../../Option.ts"
 import { type Pipeable, pipeArguments } from "../../Pipeable.ts"
 import * as Predicate from "../../Predicate.ts"
-import type * as Redacted from "../../Redacted.ts"
+import type * as Redacted_ from "../../Redacted.ts"
 import * as Result from "../../Result.ts"
 import * as Schema from "../../Schema.ts"
 import type { Covariant } from "../../Types.ts"
@@ -279,7 +279,7 @@ const Proto = {
  * ```ts import.meta.vitest
  * import { Param } from "effect/unstable/cli"
  *
- * const maybeParam = Param.string(Param.flagKind, "name")
+ * const maybeParam = Param.String(Param.flagKind, "name")
  *
  * Param.isParam(maybeParam) // => true
  * ```
@@ -297,7 +297,7 @@ export const isParam = (u: unknown): u is Param<any, ParamKind> => Predicate.has
  * ```ts import.meta.vitest
  * import { Param } from "effect/unstable/cli"
  *
- * const nameParam = Param.string(Param.flagKind, "name")
+ * const nameParam = Param.String(Param.flagKind, "name")
  * const optionalParam = Param.optional(nameParam)
  *
  * Param.isSingle(nameParam) // => true
@@ -364,10 +364,10 @@ export const makeSingle = <const Kind extends ParamKind, A>(params: {
  * import { Param } from "effect/unstable/cli"
  *
  * // Create a string flag
- * const nameFlag = Param.string(Param.flagKind, "name")
+ * const nameFlag = Param.String(Param.flagKind, "name")
  *
  * // Create a string argument
- * const fileArg = Param.string(Param.argumentKind, "file")
+ * const fileArg = Param.String(Param.argumentKind, "file")
  *
  * // Usage in CLI: --name "John Doe" or as positional argument
  * const kinds = [nameFlag.kind, fileArg.kind] // => ["flag", "argument"]
@@ -376,13 +376,13 @@ export const makeSingle = <const Kind extends ParamKind, A>(params: {
  * @category constructors
  * @since 4.0.0
  */
-export const string = <const Kind extends ParamKind>(
+export const String = <const Kind extends ParamKind>(
   kind: Kind,
   name: string
 ): Param<Kind, string> =>
   makeSingle({
     name,
-    primitiveType: Primitive.string,
+    primitiveType: Primitive.String,
     kind
   })
 
@@ -395,10 +395,10 @@ export const string = <const Kind extends ParamKind>(
  * import { Param } from "effect/unstable/cli"
  *
  * // Create a boolean flag
- * const verboseFlag = Param.boolean(Param.flagKind, "verbose")
+ * const verboseFlag = Param.Boolean(Param.flagKind, "verbose")
  *
  * // Create a boolean argument
- * const enableArg = Param.boolean(Param.argumentKind, "enable")
+ * const enableArg = Param.Boolean(Param.argumentKind, "enable")
  *
  * // Usage in CLI: --verbose (true) or --no-verbose (false).
  * // The flag is required unless made optional or given a fallback.
@@ -409,13 +409,13 @@ export const string = <const Kind extends ParamKind>(
  * @category constructors
  * @since 4.0.0
  */
-export const boolean = <const Kind extends ParamKind>(
+export const Boolean = <const Kind extends ParamKind>(
   kind: Kind,
   name: string
 ): Param<Kind, boolean> =>
   makeSingle({
     name,
-    primitiveType: Primitive.boolean,
+    primitiveType: Primitive.Boolean,
     kind
   })
 
@@ -428,10 +428,10 @@ export const boolean = <const Kind extends ParamKind>(
  * import { Param } from "effect/unstable/cli"
  *
  * // Create an integer flag
- * const portFlag = Param.integer(Param.flagKind, "port")
+ * const portFlag = Param.Int(Param.flagKind, "port")
  *
  * // Create an integer argument
- * const countArg = Param.integer(Param.argumentKind, "count")
+ * const countArg = Param.Int(Param.argumentKind, "count")
  *
  * // Usage in CLI: --port 8080 or as positional argument: 42
  * const kinds = [portFlag.kind, countArg.kind] // => ["flag", "argument"]
@@ -440,44 +440,41 @@ export const boolean = <const Kind extends ParamKind>(
  * @category constructors
  * @since 4.0.0
  */
-export const integer = <const Kind extends ParamKind>(
+export const Int = <const Kind extends ParamKind>(
   kind: Kind,
   name: string
 ): Param<Kind, number> =>
   makeSingle({
     name,
-    primitiveType: Primitive.integer,
+    primitiveType: Primitive.Int,
     kind
   })
 
 /**
- * Creates a floating-point number parameter.
+ * Creates a finite number parameter.
  *
- * **Example** (Creating float parameters)
+ * **Example** (Creating finite number parameters)
  *
  * ```ts import.meta.vitest
  * import { Param } from "effect/unstable/cli"
  *
- * // Create a float flag
- * const rateFlag = Param.float(Param.flagKind, "rate")
+ * const rateFlag = Param.Finite(Param.flagKind, "rate")
  *
- * // Create a float argument
- * const thresholdArg = Param.float(Param.argumentKind, "threshold")
+ * const thresholdArg = Param.Finite(Param.argumentKind, "threshold")
  *
- * // Usage in CLI: --rate 0.95 or as positional argument: 3.14159
  * const kinds = [rateFlag.kind, thresholdArg.kind] // => ["flag", "argument"]
  * ```
  *
  * @category constructors
  * @since 4.0.0
  */
-export const float = <const Kind extends ParamKind>(
+export const Finite = <const Kind extends ParamKind>(
   kind: Kind,
   name: string
 ): Param<Kind, number> =>
   makeSingle({
     name,
-    primitiveType: Primitive.float,
+    primitiveType: Primitive.Finite,
     kind
   })
 
@@ -490,10 +487,10 @@ export const float = <const Kind extends ParamKind>(
  * import { Param } from "effect/unstable/cli"
  *
  * // Create a date flag
- * const startFlag = Param.date(Param.flagKind, "start-date")
+ * const startFlag = Param.Date(Param.flagKind, "start-date")
  *
  * // Create a date argument
- * const dueDateArg = Param.date(Param.argumentKind, "due-date")
+ * const dueDateArg = Param.Date(Param.argumentKind, "due-date")
  *
  * // Usage in CLI: --start-date "2023-12-25" or as positional: "2023-01-01"
  * // Parses to JavaScript Date object
@@ -503,13 +500,13 @@ export const float = <const Kind extends ParamKind>(
  * @category constructors
  * @since 4.0.0
  */
-export const date = <const Kind extends ParamKind>(
+export const Date = <const Kind extends ParamKind>(
   kind: Kind,
   name: string
-): Param<Kind, Date> =>
+): Param<Kind, globalThis.Date> =>
   makeSingle({
     name,
-    primitiveType: Primitive.date,
+    primitiveType: Primitive.Date,
     kind
   })
 
@@ -532,7 +529,7 @@ export const date = <const Kind extends ParamKind>(
  *   readonly _tag: "Cat"
  * }
  *
- * const animal = Param.choiceWithValue(Param.flagKind, "animal", [
+ * const animal = Param.ChoiceWithValue(Param.flagKind, "animal", [
  *   ["dog", { _tag: "Dog" }],
  *   ["cat", { _tag: "Cat" }]
  * ])
@@ -542,13 +539,13 @@ export const date = <const Kind extends ParamKind>(
  * @category constructors
  * @since 4.0.0
  */
-export const choiceWithValue = <
+export const ChoiceWithValue = <
   const Kind extends ParamKind,
   const Choices extends ReadonlyArray<readonly [string, any]>
 >(kind: Kind, name: string, choices: Choices): Param<Kind, Choices[number][1]> =>
   makeSingle({
     name,
-    primitiveType: Primitive.choice(choices),
+    primitiveType: Primitive.Choice(choices),
     kind
   })
 
@@ -561,7 +558,7 @@ export const choiceWithValue = <
  * ```ts import.meta.vitest
  * import { Param } from "effect/unstable/cli"
  *
- * const logLevel = Param.choice(Param.flagKind, "log-level", [
+ * const logLevel = Param.Literals(Param.flagKind, "log-level", [
  *   "debug",
  *   "info",
  *   "warn",
@@ -573,12 +570,12 @@ export const choiceWithValue = <
  * @category constructors
  * @since 4.0.0
  */
-export const choice = <
+export const Literals = <
   const Kind extends ParamKind,
   const Choices extends ReadonlyArray<string>
 >(kind: Kind, name: string, choices: Choices): Param<Kind, Choices[number]> => {
   const mappedChoices = choices.map((value) => [value, value] as const)
-  return choiceWithValue(kind, name, mappedChoices)
+  return ChoiceWithValue(kind, name, mappedChoices)
 }
 
 /**
@@ -590,13 +587,13 @@ export const choice = <
  * import { Param } from "effect/unstable/cli"
  *
  * // Basic path parameter
- * const outputPath = Param.path(Param.flagKind, "output")
+ * const outputPath = Param.Path(Param.flagKind, "output")
  *
  * // Path that must exist
- * const inputPath = Param.path(Param.flagKind, "input", { mustExist: true })
+ * const inputPath = Param.Path(Param.flagKind, "input", { mustExist: true })
  *
  * // File-only path
- * const configFile = Param.path(Param.flagKind, "config", {
+ * const configFile = Param.Path(Param.flagKind, "config", {
  *   pathType: "file",
  *   mustExist: true,
  *   typeName: "config-file"
@@ -607,7 +604,7 @@ export const choice = <
  * @category constructors
  * @since 4.0.0
  */
-export const path = <Kind extends ParamKind>(
+export const Path = <Kind extends ParamKind>(
   kind: Kind,
   name: string,
   options?: {
@@ -619,7 +616,7 @@ export const path = <Kind extends ParamKind>(
   makeSingle({
     name,
     kind,
-    primitiveType: Primitive.path(options?.pathType ?? "either", options?.mustExist),
+    primitiveType: Primitive.Path(options?.pathType ?? "either", options?.mustExist),
     typeName: options?.typeName
   })
 
@@ -637,10 +634,10 @@ export const path = <Kind extends ParamKind>(
  * import { Param } from "effect/unstable/cli"
  *
  * // Basic directory parameter
- * const outputDir = Param.directory(Param.flagKind, "output-dir")
+ * const outputDir = Param.Directory(Param.flagKind, "output-dir")
  *
  * // Directory that must exist
- * const sourceDir = Param.directory(Param.flagKind, "source", { mustExist: true })
+ * const sourceDir = Param.Directory(Param.flagKind, "source", { mustExist: true })
  *
  * // Usage: --output-dir /path/to/dir --source /existing/dir
  * const kinds = [outputDir.kind, sourceDir.kind] // => ["flag", "flag"]
@@ -649,14 +646,14 @@ export const path = <Kind extends ParamKind>(
  * @category constructors
  * @since 4.0.0
  */
-export const directory = <Kind extends ParamKind>(
+export const Directory = <Kind extends ParamKind>(
   kind: Kind,
   name: string,
   options?: {
     readonly mustExist?: boolean | undefined
   }
 ): Param<Kind, string> =>
-  path(kind, name, {
+  Path(kind, name, {
     pathType: "directory",
     typeName: "directory",
     mustExist: options?.mustExist
@@ -676,10 +673,10 @@ export const directory = <Kind extends ParamKind>(
  * import { Param } from "effect/unstable/cli"
  *
  * // Basic file parameter
- * const outputFile = Param.file(Param.flagKind, "output")
+ * const outputFile = Param.File(Param.flagKind, "output")
  *
  * // File that must exist
- * const inputFile = Param.file(Param.flagKind, "input", { mustExist: true })
+ * const inputFile = Param.File(Param.flagKind, "input", { mustExist: true })
  *
  * // Usage: --output result.txt --input existing-file.txt
  * const kinds = [outputFile.kind, inputFile.kind] // => ["flag", "flag"]
@@ -688,14 +685,14 @@ export const directory = <Kind extends ParamKind>(
  * @category constructors
  * @since 4.0.0
  */
-export const file = <Kind extends ParamKind>(
+export const File = <Kind extends ParamKind>(
   kind: Kind,
   name: string,
   options?: {
     readonly mustExist?: boolean | undefined
   }
 ): Param<Kind, string> =>
-  path(kind, name, {
+  Path(kind, name, {
     pathType: "file",
     typeName: "file",
     mustExist: options?.mustExist
@@ -711,10 +708,10 @@ export const file = <Kind extends ParamKind>(
  * import { Param } from "effect/unstable/cli"
  *
  * // Create a password parameter
- * const password = Param.redacted(Param.flagKind, "password")
+ * const password = Param.Redacted(Param.flagKind, "password")
  *
  * // Create an API key argument
- * const apiKey = Param.redacted(Param.argumentKind, "api-key")
+ * const apiKey = Param.Redacted(Param.argumentKind, "api-key")
  *
  * // Usage: --password (value will be hidden in help/logs)
  * const kinds = [password.kind, apiKey.kind] // => ["flag", "argument"]
@@ -723,13 +720,13 @@ export const file = <Kind extends ParamKind>(
  * @category constructors
  * @since 4.0.0
  */
-export const redacted = <Kind extends ParamKind>(
+export const Redacted = <Kind extends ParamKind>(
   kind: Kind,
   name: string
-): Param<Kind, Redacted.Redacted<string>> =>
+): Param<Kind, Redacted_.Redacted<string>> =>
   makeSingle({
     name,
-    primitiveType: Primitive.redacted,
+    primitiveType: Primitive.Redacted,
     kind
   })
 
@@ -742,10 +739,10 @@ export const redacted = <Kind extends ParamKind>(
  * import { Param } from "effect/unstable/cli"
  *
  * // Read a config file as string
- * const configContent = Param.fileText(Param.flagKind, "config")
+ * const configContent = Param.FileText(Param.flagKind, "config")
  *
  * // Read a template file as argument
- * const templateContent = Param.fileText(Param.argumentKind, "template")
+ * const templateContent = Param.FileText(Param.argumentKind, "template")
  *
  * // Usage: --config config.txt (reads file content into string)
  * const kinds = [configContent.kind, templateContent.kind] // => ["flag", "argument"]
@@ -754,10 +751,10 @@ export const redacted = <Kind extends ParamKind>(
  * @category constructors
  * @since 4.0.0
  */
-export const fileText = <Kind extends ParamKind>(kind: Kind, name: string): Param<Kind, string> =>
+export const FileText = <Kind extends ParamKind>(kind: Kind, name: string): Param<Kind, string> =>
   makeSingle({
     name,
-    primitiveType: Primitive.fileText,
+    primitiveType: Primitive.FileText,
     kind
   })
 
@@ -776,10 +773,10 @@ export const fileText = <Kind extends ParamKind>(kind: Kind, name: string): Para
  *
  * // Will use the extension of the file passed on the command line to determine
  * // the parser to use
- * const config = Param.fileParse(Param.flagKind, "config")
+ * const config = Param.FileParse(Param.flagKind, "config")
  *
  * // Will use the JSON parser
- * const jsonConfig = Param.fileParse(Param.flagKind, "json-config", {
+ * const jsonConfig = Param.FileParse(Param.flagKind, "json-config", {
  *   format: "json"
  * })
  * const kinds = [config.kind, jsonConfig.kind] // => ["flag", "flag"]
@@ -788,14 +785,14 @@ export const fileText = <Kind extends ParamKind>(kind: Kind, name: string): Para
  * @category constructors
  * @since 4.0.0
  */
-export const fileParse = <Kind extends ParamKind>(
+export const FileParse = <Kind extends ParamKind>(
   kind: Kind,
   name: string,
   options?: Primitive.FileParseOptions | undefined
 ): Param<Kind, unknown> =>
   makeSingle({
     name,
-    primitiveType: Primitive.fileParse(options),
+    primitiveType: Primitive.FileParse(options),
     kind
   })
 
@@ -813,12 +810,12 @@ export const fileParse = <Kind extends ParamKind>(
  *   host: Schema.String
  * })
  *
- * const config = Param.fileSchema(Param.flagKind, "config", configSchema, {
+ * const config = Param.FileSchema(Param.flagKind, "config", configSchema, {
  *   format: "json"
  * })
  *
  * // Parse YAML file
- * const yamlConfig = Param.fileSchema(Param.flagKind, "config", configSchema, {
+ * const yamlConfig = Param.FileSchema(Param.flagKind, "config", configSchema, {
  *   format: "yaml"
  * })
  *
@@ -829,7 +826,7 @@ export const fileParse = <Kind extends ParamKind>(
  * @category constructors
  * @since 4.0.0
  */
-export const fileSchema = <Kind extends ParamKind, A>(
+export const FileSchema = <Kind extends ParamKind, A>(
   kind: Kind,
   name: string,
   schema: Schema.ConstraintDecoder<A, Environment>,
@@ -837,7 +834,7 @@ export const fileSchema = <Kind extends ParamKind, A>(
 ): Param<Kind, A> =>
   makeSingle({
     name,
-    primitiveType: Primitive.fileSchema(schema, options),
+    primitiveType: Primitive.FileSchema(schema, options),
     kind
   })
 
@@ -859,10 +856,10 @@ export const fileSchema = <Kind extends ParamKind, A>(
  * ```ts import.meta.vitest
  * import { Param } from "effect/unstable/cli"
  *
- * const env = Param.keyValuePair(Param.flagKind, "env")
+ * const env = Param.KeyValuePair(Param.flagKind, "env")
  * // --env FOO=bar --env BAZ=qux will parse to { FOO: "bar", BAZ: "qux" }
  *
- * const props = Param.keyValuePair(Param.flagKind, "property")
+ * const props = Param.KeyValuePair(Param.flagKind, "property")
  * // --property name=value --property debug=true
  * const kinds = [env.kind, props.kind] // => ["flag", "flag"]
  * ```
@@ -870,7 +867,7 @@ export const fileSchema = <Kind extends ParamKind, A>(
  * @category constructors
  * @since 4.0.0
  */
-export const keyValuePair = <Kind extends ParamKind>(
+export const KeyValuePair = <Kind extends ParamKind>(
   kind: Kind,
   name: string
 ): Param<Kind, Record<string, string>> =>
@@ -878,7 +875,7 @@ export const keyValuePair = <Kind extends ParamKind>(
     variadic(
       makeSingle({
         name,
-        primitiveType: Primitive.keyValuePair,
+        primitiveType: Primitive.KeyValuePair,
         kind
       }),
       { min: 1 }
@@ -887,22 +884,17 @@ export const keyValuePair = <Kind extends ParamKind>(
   )
 
 /**
- * Creates an empty sentinel parameter that always fails to parse.
- *
- * **When to use**
- *
- * Use when you need an empty CLI parameter sentinel for optional parameter
- * construction or internal combinators.
+ * A parameter that always fails to parse.
  *
  * **Example** (Creating sentinel parameters)
  *
  * ```ts import.meta.vitest
  * import { Param } from "effect/unstable/cli"
  *
- * const disabledDebugParam = Param.none(Param.flagKind)
+ * const disabledDebugParam = Param.Never(Param.flagKind)
  *
  * const makeDebugParam = (enableDebug: boolean) =>
- *   enableDebug ? Param.string(Param.flagKind, "debug") : disabledDebugParam
+ *   enableDebug ? Param.String(Param.flagKind, "debug") : disabledDebugParam
  *
  * makeDebugParam(true) === disabledDebugParam // => false
  * makeDebugParam(false) === disabledDebugParam // => true
@@ -911,10 +903,10 @@ export const keyValuePair = <Kind extends ParamKind>(
  * @category constructors
  * @since 4.0.0
  */
-export const none = <Kind extends ParamKind>(kind: Kind): Param<Kind, never> =>
+export const Never = <Kind extends ParamKind>(kind: Kind): Param<Kind, never> =>
   makeSingle({
-    name: "__none__",
-    primitiveType: Primitive.none,
+    name: "__never__",
+    primitiveType: Primitive.Never,
     kind
   })
 
@@ -938,13 +930,13 @@ const FLAG_DASH_REGEXP = /^-+/
  * ```ts import.meta.vitest
  * import { Param } from "effect/unstable/cli"
  *
- * const force = Param.boolean(Param.flagKind, "force").pipe(
+ * const force = Param.Boolean(Param.flagKind, "force").pipe(
  *   Param.withAlias("-f"),
  *   Param.withAlias("-F")
  * )
  *
  * // Also works on composed params:
- * const count = Param.integer(Param.flagKind, "count").pipe(
+ * const count = Param.Int(Param.flagKind, "count").pipe(
  *   Param.optional,
  *   Param.withAlias("-c") // finds the underlying Single and adds alias
  * )
@@ -978,7 +970,7 @@ export const withAlias: {
  * ```ts import.meta.vitest
  * import { Param } from "effect/unstable/cli"
  *
- * const verbose = Param.boolean(Param.flagKind, "verbose").pipe(
+ * const verbose = Param.Boolean(Param.flagKind, "verbose").pipe(
  *   Param.withAlias("-v"),
  *   Param.withDescription("Enable verbose output")
  * )
@@ -1013,7 +1005,7 @@ export const withDescription: {
  * ```ts import.meta.vitest
  * import { Param } from "effect/unstable/cli"
  *
- * const experimental = Param.boolean(Param.flagKind, "experimental-foo").pipe(
+ * const experimental = Param.Boolean(Param.flagKind, "experimental-foo").pipe(
  *   Param.withHidden
  * )
  * experimental.kind // => "flag"
@@ -1037,7 +1029,7 @@ export const withHidden = <Kind extends ParamKind, A>(self: Param<Kind, A>): Par
  * ```ts import.meta.vitest
  * import { Param } from "effect/unstable/cli"
  *
- * const port = Param.integer(Param.flagKind, "port").pipe(
+ * const port = Param.Int(Param.flagKind, "port").pipe(
  *   Param.map((n) => ({ port: n, url: `http://localhost:${n}` }))
  * )
  * port.kind // => "flag"
@@ -1110,7 +1102,7 @@ const transform = <Kind extends ParamKind, A, B>(
  *   )
  * )
  *
- * const validatedEmail = Param.string(Param.flagKind, "email").pipe(
+ * const validatedEmail = Param.String(Param.flagKind, "email").pipe(
  *   Param.mapEffect((email) =>
  *     email.includes("@")
  *       ? Effect.succeed(email)
@@ -1186,7 +1178,7 @@ export const mapEffect: {
  *   )
  * )
  *
- * const parsedJson = Param.string(Param.flagKind, "config").pipe(
+ * const parsedJson = Param.String(Param.flagKind, "config").pipe(
  *   Param.mapTryCatch(
  *     (str) => JSON.parse(str),
  *     (error) =>
@@ -1235,7 +1227,7 @@ export const mapTryCatch: {
             (error) =>
               new CliError.InvalidValue({
                 option: single.name,
-                value: String(a),
+                value: globalThis.String(a),
                 expected: error,
                 kind: single.kind
               })
@@ -1262,7 +1254,7 @@ export const mapTryCatch: {
  * // Create an optional port option
  * // - When not provided: returns Option.none()
  * // - When provided: returns Option.some(parsedValue)
- * const port = Param.optional(Param.integer(Param.flagKind, "port"))
+ * const port = Param.optional(Param.Int(Param.flagKind, "port"))
  * port.kind // => "flag"
  * ```
  *
@@ -1272,10 +1264,8 @@ export const mapTryCatch: {
 export const optional = <Kind extends ParamKind, A>(
   param: Param<Kind, A>
 ): Param<Kind, Option.Option<A>> => {
-  const parse: Parse<Option.Option<A>> = Effect.fnUntraced(function*(args) {
-    getUnderlyingSingleOrThrow(param)
-
-    return yield* param.parse(args).pipe(
+  const parse: Parse<Option.Option<A>> = (args) =>
+    param.parse(args).pipe(
       Effect.map(([leftover, value]) => [leftover, Option.some(value)] as const),
       // Catch both MissingOption (for flags) and MissingArgument (for positional arguments)
       Effect.catchTags({
@@ -1283,7 +1273,6 @@ export const optional = <Kind extends ParamKind, A>(
         MissingArgument: () => Effect.succeed([args.arguments, Option.none()] as const)
       })
     )
-  })
   return Object.assign(Object.create(Proto), {
     _tag: "Optional",
     kind: param.kind,
@@ -1306,12 +1295,12 @@ export const optional = <Kind extends ParamKind, A>(
  * import { Param } from "effect/unstable/cli"
  *
  * // Using the pipe operator to make an option optional
- * const port = Param.integer(Param.flagKind, "port").pipe(
+ * const port = Param.Int(Param.flagKind, "port").pipe(
  *   Param.withDefault(8080)
  * )
  *
  * // Can also be used with other combinators
- * const verbose = Param.boolean(Param.flagKind, "verbose").pipe(
+ * const verbose = Param.Boolean(Param.flagKind, "verbose").pipe(
  *   Param.withAlias("-v"),
  *   Param.withDescription("Enable verbose output"),
  *   Param.withDefault(false)
@@ -1482,16 +1471,16 @@ export type VariadicParamOptions = {
  * import { Param } from "effect/unstable/cli"
  *
  * // Basic variadic parameter (0 to infinity)
- * const tags = Param.variadic(Param.string(Param.flagKind, "tag"))
+ * const tags = Param.variadic(Param.String(Param.flagKind, "tag"))
  *
  * // Variadic with minimum count
  * const inputs = Param.variadic(
- *   Param.string(Param.flagKind, "input"),
+ *   Param.String(Param.flagKind, "input"),
  *   { min: 1 } // at least 1 required
  * )
  *
  * // Variadic with both min and max
- * const limited = Param.variadic(Param.string(Param.flagKind, "item"), {
+ * const limited = Param.variadic(Param.String(Param.flagKind, "item"), {
  *   min: 2, // at least 2 times
  *   max: 2 // at most 2 times
  * })
@@ -1537,7 +1526,7 @@ export const variadic = <Kind extends ParamKind, A>(
  * import { Param } from "effect/unstable/cli"
  *
  * // Allow 1-3 file inputs
- * const files = Param.string(Param.flagKind, "file").pipe(
+ * const files = Param.String(Param.flagKind, "file").pipe(
  *   Param.between(1, 3),
  *   Param.withAlias("-f")
  * )
@@ -1546,7 +1535,7 @@ export const variadic = <Kind extends ParamKind, A>(
  * // Result: ["a.txt", "b.txt"]
  *
  * // Allow 0 or more tags
- * const tags = Param.string(Param.flagKind, "tag").pipe(
+ * const tags = Param.String(Param.flagKind, "tag").pipe(
  *   Param.between(0, Number.MAX_SAFE_INTEGER)
  * )
  *
@@ -1586,7 +1575,7 @@ export const between: {
  * import { Param } from "effect/unstable/cli"
  *
  * // Allow at most 3 warning suppressions
- * const suppressions = Param.string(Param.flagKind, "suppress").pipe(
+ * const suppressions = Param.String(Param.flagKind, "suppress").pipe(
  *   Param.atMost(3)
  * )
  *
@@ -1622,7 +1611,7 @@ export const atMost: {
  * import { Param } from "effect/unstable/cli"
  *
  * // Require at least 2 input files
- * const inputs = Param.string(Param.flagKind, "input").pipe(
+ * const inputs = Param.String(Param.flagKind, "input").pipe(
  *   Param.atLeast(2),
  *   Param.withAlias("-i")
  * )
@@ -1659,7 +1648,7 @@ export const atLeast: {
  * ```ts import.meta.vitest
  * import { Option } from "effect"
  * import { Param } from "effect/unstable/cli"
- * const positiveInt = Param.integer(Param.flagKind, "count").pipe(
+ * const positiveInt = Param.Int(Param.flagKind, "count").pipe(
  *   Param.filterMap(
  *     (n) => n > 0 ? Option.some(n) : Option.none(),
  *     (n) => `Expected positive integer, got ${n}`
@@ -1696,7 +1685,7 @@ export const filterMap: {
       const single = getUnderlyingSingleOrThrow(self)
       return yield* new CliError.InvalidValue({
         option: single.name,
-        value: String(a),
+        value: globalThis.String(a),
         expected: onNone(a),
         kind: single.kind
       })
@@ -1711,7 +1700,7 @@ export const filterMap: {
  * ```ts import.meta.vitest
  * import { Param } from "effect/unstable/cli"
  *
- * const evenNumber = Param.integer(Param.flagKind, "num").pipe(
+ * const evenNumber = Param.Int(Param.flagKind, "num").pipe(
  *   Param.filter(
  *     (n) => n % 2 === 0,
  *     (n) => `Expected even number, got ${n}`
@@ -1752,7 +1741,7 @@ export const filter: {
  * ```ts import.meta.vitest
  * import { Param } from "effect/unstable/cli"
  *
- * const port = Param.integer(Param.flagKind, "port").pipe(
+ * const port = Param.Int(Param.flagKind, "port").pipe(
  *   Param.withMetavar("PORT"),
  *   Param.filter(
  *     (p) => p >= 1 && p <= 65535,
@@ -1792,7 +1781,7 @@ export const withMetavar: {
  *   Schema.check(isEmail)
  * )
  *
- * const email = Param.string(Param.flagKind, "email").pipe(
+ * const email = Param.String(Param.flagKind, "email").pipe(
  *   Param.withSchema(Email)
  * )
  * email.kind // => "flag"
@@ -1821,7 +1810,7 @@ export const withSchema: {
       const single = getUnderlyingSingleOrThrow(self)
       return new CliError.InvalidValue({
         option: single.name,
-        value: String(value),
+        value: globalThis.String(value),
         expected: `Schema validation failed: ${error.message}`,
         kind: single.kind
       })
@@ -1836,8 +1825,8 @@ export const withSchema: {
  * ```ts import.meta.vitest
  * import { Param } from "effect/unstable/cli"
  *
- * const config = Param.file(Param.flagKind, "config").pipe(
- *   Param.orElse(() => Param.string(Param.flagKind, "config-url"))
+ * const config = Param.File(Param.flagKind, "config").pipe(
+ *   Param.orElse(() => Param.String(Param.flagKind, "config-url"))
  * )
  * config.kind // => "flag"
  * ```
@@ -1876,8 +1865,8 @@ export const orElse: {
  * ```ts import.meta.vitest
  * import { Param } from "effect/unstable/cli"
  *
- * const configSource = Param.file(Param.flagKind, "config").pipe(
- *   Param.orElseResult(() => Param.string(Param.flagKind, "config-url"))
+ * const configSource = Param.File(Param.flagKind, "config").pipe(
+ *   Param.orElseResult(() => Param.String(Param.flagKind, "config-url"))
  * )
  * // Returns Result<string, string>
  * configSource.kind // => "flag"
@@ -2008,12 +1997,14 @@ const parsePositionalVariadic: <Kind extends ParamKind, A>(
   }
 
   if (count < minValue) {
-    return yield* new CliError.InvalidValue({
-      option: single.name,
-      value: `${count} values`,
-      expected: `at least ${minValue} value${minValue === 1 ? "" : "s"}`,
-      kind: single.kind
-    })
+    return yield* count === 0
+      ? new CliError.MissingArgument({ argument: single.name })
+      : new CliError.InvalidValue({
+        option: single.name,
+        value: `${count} values`,
+        expected: `at least ${minValue} value${minValue === 1 ? "" : "s"}`,
+        kind: single.kind
+      })
   }
 
   return [currentArgs, results] as const
diff --git a/repos/effect/packages/effect/src/unstable/cli/Primitive.ts b/repos/effect/packages/effect/src/unstable/cli/Primitive.ts
index b02e71255..ff1cfb504 100644
--- a/repos/effect/packages/effect/src/unstable/cli/Primitive.ts
+++ b/repos/effect/packages/effect/src/unstable/cli/Primitive.ts
@@ -14,9 +14,8 @@ import * as Effect from "../../Effect.ts"
 import * as FileSystem from "../../FileSystem.ts"
 import { format } from "../../Formatter.ts"
 import { identity } from "../../Function.ts"
-import * as InternalConfig from "../../internal/config.ts"
-import * as Path from "../../Path.ts"
-import * as Redacted from "../../Redacted.ts"
+import * as Path_ from "../../Path.ts"
+import * as Redacted_ from "../../Redacted.ts"
 import * as Schema from "../../Schema.ts"
 import type { Formatter } from "../../SchemaIssue.ts"
 import type * as Struct from "../../Struct.ts"
@@ -56,9 +55,9 @@ const TypeId = "~effect/cli/Primitive"
  * )
  *
  * const program = Effect.gen(function*() {
- *   const stringResult = yield* Primitive.string.parse("hello")
- *   const numberResult = yield* Primitive.integer.parse("42")
- *   const boolResult = yield* Primitive.boolean.parse("true")
+ *   const stringResult = yield* Primitive.String.parse("hello")
+ *   const numberResult = yield* Primitive.Int.parse("42")
+ *   const boolResult = yield* Primitive.Boolean.parse("true")
  *   return [stringResult, numberResult, boolResult] as const
  * })
  *
@@ -99,10 +98,10 @@ const Proto = {
 }
 
 /** @internal */
-export const isTrueValue = Schema.is(InternalConfig.trueValues)
+export const isTrueLiteral = Schema.is(Schema.TrueLiterals)
 
 /** @internal */
-export const isFalseValue = Schema.is(InternalConfig.falseValues)
+export const isFalseLiteral = Schema.is(Schema.FalseLiterals)
 
 /** @internal */
 export const isBoolean = (p: Primitive<unknown>): p is Primitive<boolean> => p._tag === "Boolean"
@@ -159,10 +158,10 @@ const makeSchemaPrimitive = <T>(
  * )
  *
  * const parseBoolean = Effect.all([
- *   Primitive.boolean.parse("true"),
- *   Primitive.boolean.parse("yes"),
- *   Primitive.boolean.parse("false"),
- *   Primitive.boolean.parse("0")
+ *   Primitive.Boolean.parse("true"),
+ *   Primitive.Boolean.parse("yes"),
+ *   Primitive.Boolean.parse("false"),
+ *   Primitive.Boolean.parse("0")
  * ])
  *
  * await Effect.runPromise(parseBoolean.pipe(Effect.provide(CliTestLayer))) // => [true, true, false, false]
@@ -171,15 +170,15 @@ const makeSchemaPrimitive = <T>(
  * @category constructors
  * @since 4.0.0
  */
-export const boolean: Primitive<boolean> = makeSchemaPrimitive(
+export const Boolean: Primitive<boolean> = makeSchemaPrimitive(
   "Boolean",
-  InternalConfig.boolean
+  Schema.BooleanLiterals
 )
 
 /**
- * Creates a primitive that parses floating-point numbers from string input.
+ * Creates a primitive that parses finite numbers from string input.
  *
- * **Example** (Parsing floating-point numbers)
+ * **Example** (Parsing finite numbers)
  *
  * ```ts import.meta.vitest
  * import { Effect, FileSystem, Layer, Path, Stdio, Terminal } from "effect"
@@ -204,9 +203,9 @@ export const boolean: Primitive<boolean> = makeSchemaPrimitive(
  * )
  *
  * const parseFloat = Effect.all([
- *   Primitive.float.parse("3.14"),
- *   Primitive.float.parse("-42.5"),
- *   Primitive.float.parse("0")
+ *   Primitive.Finite.parse("3.14"),
+ *   Primitive.Finite.parse("-42.5"),
+ *   Primitive.Finite.parse("0")
  * ])
  *
  * await Effect.runPromise(parseFloat.pipe(Effect.provide(CliTestLayer))) // => [3.14, -42.5, 0]
@@ -215,8 +214,8 @@ export const boolean: Primitive<boolean> = makeSchemaPrimitive(
  * @category constructors
  * @since 4.0.0
  */
-export const float: Primitive<number> = makeSchemaPrimitive(
-  "Float",
+export const Finite: Primitive<number> = makeSchemaPrimitive(
+  "Finite",
   Schema.Finite
 )
 
@@ -248,9 +247,9 @@ export const float: Primitive<number> = makeSchemaPrimitive(
  * )
  *
  * const parseInteger = Effect.all([
- *   Primitive.integer.parse("42"),
- *   Primitive.integer.parse("-123"),
- *   Primitive.integer.parse("0")
+ *   Primitive.Int.parse("42"),
+ *   Primitive.Int.parse("-123"),
+ *   Primitive.Int.parse("0")
  * ])
  *
  * await Effect.runPromise(parseInteger.pipe(Effect.provide(CliTestLayer))) // => [42, -123, 0]
@@ -259,8 +258,8 @@ export const float: Primitive<number> = makeSchemaPrimitive(
  * @category constructors
  * @since 4.0.0
  */
-export const integer: Primitive<number> = makeSchemaPrimitive(
-  "Integer",
+export const Int: Primitive<number> = makeSchemaPrimitive(
+  "Int",
   Schema.Int
 )
 
@@ -292,7 +291,7 @@ export const integer: Primitive<number> = makeSchemaPrimitive(
  * )
  *
  * const parseDate = Effect.gen(function*() {
- *   const result = yield* Primitive.date.parse("2023-12-25")
+ *   const result = yield* Primitive.Date.parse("2023-12-25")
  *   return result.toISOString()
  * })
  *
@@ -302,7 +301,7 @@ export const integer: Primitive<number> = makeSchemaPrimitive(
  * @category constructors
  * @since 4.0.0
  */
-export const date: Primitive<Date> = makeSchemaPrimitive(
+export const Date: Primitive<globalThis.Date> = makeSchemaPrimitive(
   "Date",
   Schema.Date
 )
@@ -335,9 +334,9 @@ export const date: Primitive<Date> = makeSchemaPrimitive(
  * )
  *
  * const parseString = Effect.all([
- *   Primitive.string.parse("hello world"),
- *   Primitive.string.parse(""),
- *   Primitive.string.parse("123")
+ *   Primitive.String.parse("hello world"),
+ *   Primitive.String.parse(""),
+ *   Primitive.String.parse("123")
  * ])
  *
  * await Effect.runPromise(parseString.pipe(Effect.provide(CliTestLayer))) // => ["hello world", "", "123"]
@@ -346,7 +345,7 @@ export const date: Primitive<Date> = makeSchemaPrimitive(
  * @category constructors
  * @since 4.0.0
  */
-export const string: Primitive<string> = makePrimitive("String", (value) => Effect.succeed(value))
+export const String: Primitive<string> = makePrimitive("String", (value) => Effect.succeed(value))
 
 /**
  * Creates a primitive that accepts only specific choice values mapped to custom types.
@@ -377,7 +376,7 @@ export const string: Primitive<string> = makePrimitive("String", (value) => Effe
  *
  * type LogLevel = "debug" | "info" | "warn" | "error"
  *
- * const logLevelPrimitive = Primitive.choice<LogLevel>([
+ * const logLevelPrimitive = Primitive.Choice<LogLevel>([
  *   ["debug", "debug"],
  *   ["info", "info"],
  *   ["warn", "warn"],
@@ -395,7 +394,7 @@ export const string: Primitive<string> = makePrimitive("String", (value) => Effe
  * @category constructors
  * @since 4.0.0
  */
-export const choice = <A>(
+export const Choice = <A>(
   choices: ReadonlyArray<readonly [string, A]>
 ): Primitive<A> => {
   const choiceMap = new Map(choices)
@@ -418,13 +417,13 @@ export const choice = <A>(
  * import { Primitive } from "effect/unstable/cli"
  *
  * // Only accept files
- * const filePath = Primitive.path("file", true)
+ * const filePath = Primitive.Path("file", true)
  *
  * // Only accept directories
- * const dirPath = Primitive.path("directory", true)
+ * const dirPath = Primitive.Path("directory", true)
  *
  * // Accept either files or directories
- * const anyPath = Primitive.path("either", false)
+ * const anyPath = Primitive.Path("either", false)
  *
  * const tags = [filePath._tag, dirPath._tag, anyPath._tag] // => ["Path", "Path", "Path"]
  * ```
@@ -465,7 +464,7 @@ export type PathType = "file" | "directory" | "either"
  * )
  *
  * const program = Effect.gen(function*() {
- *   const filePrimitive = Primitive.path("file", true)
+ *   const filePrimitive = Primitive.Path("file", true)
  *   const filePath = yield* filePrimitive.parse("./package.json")
  *   return filePath.endsWith("/package.json")
  * }).pipe(Effect.provide(services))
@@ -476,7 +475,7 @@ export type PathType = "file" | "directory" | "either"
  * @category constructors
  * @since 4.0.0
  */
-export const path = (
+export const Path = (
   pathType: PathType,
   mustExist?: boolean
 ): Primitive<string> => {
@@ -484,7 +483,7 @@ export const path = (
     "Path",
     Effect.fnUntraced(function*(value) {
       const fs = yield* FileSystem.FileSystem
-      const path = yield* Path.Path
+      const path = yield* Path_.Path
 
       // Resolve the path to absolute
       const absolutePath = path.isAbsolute(value) ? value : path.resolve(value)
@@ -554,7 +553,7 @@ export const path = (
  * )
  *
  * const parseRedacted = Effect.gen(function*() {
- *   const result = yield* Primitive.redacted.parse("secret-password")
+ *   const result = yield* Primitive.Redacted.parse("secret-password")
  *   return [Redacted.value(result), String(result)] as const
  * })
  *
@@ -564,9 +563,9 @@ export const path = (
  * @category constructors
  * @since 4.0.0
  */
-export const redacted: Primitive<Redacted.Redacted<string>> = makePrimitive(
+export const Redacted: Primitive<Redacted_.Redacted<string>> = makePrimitive(
   "Redacted",
-  (value) => Effect.succeed(Redacted.make(value))
+  (value) => Effect.succeed(Redacted_.make(value))
 )
 
 /**
@@ -601,7 +600,7 @@ export const redacted: Primitive<Redacted.Redacted<string>> = makePrimitive(
  * )
  *
  * const readConfigFile = Effect.gen(function*() {
- *   const content = yield* Primitive.fileText.parse("./package.json")
+ *   const content = yield* Primitive.FileText.parse("./package.json")
  *   return JSON.parse(content) as { private: boolean }
  * }).pipe(Effect.provide(services))
  *
@@ -611,11 +610,11 @@ export const redacted: Primitive<Redacted.Redacted<string>> = makePrimitive(
  * @category constructors
  * @since 4.0.0
  */
-export const fileText: Primitive<string> = makePrimitive(
+export const FileText: Primitive<string> = makePrimitive(
   "FileText",
   Effect.fnUntraced(function*(filePath) {
     const fs = yield* FileSystem.FileSystem
-    const path = yield* Path.Path
+    const path = yield* Path_.Path
 
     // Resolve to absolute path
     const absolutePath = path.isAbsolute(filePath)
@@ -708,7 +707,7 @@ const fileParsers: Record<string, (content: string) => unknown> = {
  *   )
  * )
  *
- * const jsonFilePrimitive = Primitive.fileParse({ format: "json" })
+ * const jsonFilePrimitive = Primitive.FileParse({ format: "json" })
  *
  * const loadConfig = Effect.gen(function*() {
  *   const config = yield* jsonFilePrimitive.parse("./package.json")
@@ -721,7 +720,7 @@ const fileParsers: Record<string, (content: string) => unknown> = {
  * @category constructors
  * @since 4.0.0
  */
-export const fileParse = (options?: FileParseOptions): Primitive<unknown> => {
+export const FileParse = (options?: FileParseOptions): Primitive<unknown> => {
   return makePrimitive(
     "FileParse",
     Effect.fnUntraced(function*(filePath) {
@@ -730,7 +729,7 @@ export const fileParse = (options?: FileParseOptions): Primitive<unknown> => {
       if (parser === undefined) {
         return yield* Effect.fail(`Unsupported file format: ${fileFormat}`)
       }
-      const content = yield* fileText.parse(filePath)
+      const content = yield* FileText.parse(filePath)
       return yield* Effect.try({
         try: () => parser(content),
         catch: (error) => `Failed to parse '.${fileFormat}' file content: ${error}`
@@ -787,7 +786,7 @@ export type FileSchemaOptions = Struct.Simplify<
  *   private: Schema.Boolean
  * })
  *
- * const jsonConfigPrimitive = Primitive.fileSchema(ConfigSchema, {
+ * const jsonConfigPrimitive = Primitive.FileSchema(ConfigSchema, {
  *   format: "json"
  * })
  *
@@ -801,7 +800,7 @@ export type FileSchemaOptions = Struct.Simplify<
  * @category constructors
  * @since 4.0.0
  */
-export const fileSchema = <A>(
+export const FileSchema = <A>(
   schema: Schema.ConstraintDecoder<A, Environment>,
   options?: FileSchemaOptions | undefined
 ): Primitive<A> => {
@@ -809,7 +808,7 @@ export const fileSchema = <A>(
   return makePrimitive(
     "FileSchema",
     Effect.fnUntraced(function*(filePath) {
-      const content = yield* fileParse(options).parse(filePath)
+      const content = yield* FileParse(options).parse(filePath)
       return yield* Effect.mapError(
         decode(content),
         (error) => options?.errorFormatter?.(error.issue) ?? error.toString()
@@ -821,6 +820,10 @@ export const fileSchema = <A>(
 /**
  * Parses a single `key=value` pair into a record object.
  *
+ * **Details**
+ *
+ * Splits at the first `=`. Keys and values must be non-empty; values may contain `=`.
+ *
  * **Example** (Parsing key-value pairs)
  *
  * ```ts import.meta.vitest
@@ -846,9 +849,9 @@ export const fileSchema = <A>(
  * )
  *
  * const parseKeyValue = Effect.all([
- *   Primitive.keyValuePair.parse("name=john"),
- *   Primitive.keyValuePair.parse("port=3000"),
- *   Primitive.keyValuePair.parse("debug=true")
+ *   Primitive.KeyValuePair.parse("name=john"),
+ *   Primitive.KeyValuePair.parse("port=3000"),
+ *   Primitive.KeyValuePair.parse("debug=true")
  * ])
  *
  * const result = await Effect.runPromise(parseKeyValue.pipe(Effect.provide(CliTestLayer)))
@@ -858,16 +861,17 @@ export const fileSchema = <A>(
  * @category constructors
  * @since 4.0.0
  */
-export const keyValuePair: Primitive<Record<string, string>> = makePrimitive(
+export const KeyValuePair: Primitive<Record<string, string>> = makePrimitive(
   "KeyValuePair",
   Effect.fnUntraced(function*(value) {
-    const parts = value.split("=")
-    if (parts.length !== 2) {
+    const separator = value.indexOf("=")
+    if (separator === -1) {
       return yield* Effect.fail(
         `Invalid key=value format. Expected format: key=value, got: ${value}`
       )
     }
-    const [key, val] = parts
+    const key = value.slice(0, separator)
+    const val = value.slice(separator + 1)
     if (!key || !val) {
       return yield* Effect.fail(
         `Invalid key=value format. Both key and value must be non-empty. Got: ${value}`
@@ -878,11 +882,7 @@ export const keyValuePair: Primitive<Record<string, string>> = makePrimitive(
 )
 
 /**
- * Creates a sentinel primitive that always fails to parse a value.
- *
- * **When to use**
- *
- * Use when you need a CLI primitive for flags that do not accept values.
+ * A primitive that always fails to parse.
  *
  * **Example** (Rejecting option values)
  *
@@ -909,8 +909,7 @@ export const keyValuePair: Primitive<Record<string, string>> = makePrimitive(
  * )
  *
  * const program = Effect.gen(function*() {
- *   // This will always fail - useful for boolean flags
- *   return yield* Primitive.none.parse("any-value")
+ *   return yield* Primitive.Never.parse("any-value")
  * })
  *
  * await Effect.runPromise(Effect.flip(program).pipe(Effect.provide(CliTestLayer))) // => "This option does not accept values"
@@ -919,7 +918,7 @@ export const keyValuePair: Primitive<Record<string, string>> = makePrimitive(
  * @category constructors
  * @since 4.0.0
  */
-export const none: Primitive<never> = makePrimitive("None", () => Effect.fail("This option does not accept values"))
+export const Never: Primitive<never> = makePrimitive("Never", () => Effect.fail("This option does not accept values"))
 
 /**
  * Gets a human-readable type name for a primitive.
@@ -934,13 +933,13 @@ export const none: Primitive<never> = makePrimitive("None", () => Effect.fail("T
  * ```ts import.meta.vitest
  * import { Primitive } from "effect/unstable/cli"
  *
- * Primitive.getTypeName(Primitive.string) // => "string"
- * Primitive.getTypeName(Primitive.integer) // => "integer"
- * Primitive.getTypeName(Primitive.boolean) // => "boolean"
- * Primitive.getTypeName(Primitive.date) // => "date"
- * Primitive.getTypeName(Primitive.keyValuePair) // => "key=value"
+ * Primitive.getTypeName(Primitive.String) // => "string"
+ * Primitive.getTypeName(Primitive.Int) // => "integer"
+ * Primitive.getTypeName(Primitive.Boolean) // => "boolean"
+ * Primitive.getTypeName(Primitive.Date) // => "date"
+ * Primitive.getTypeName(Primitive.KeyValuePair) // => "key=value"
  *
- * const logLevelChoice = Primitive.choice([
+ * const logLevelChoice = Primitive.Choice([
  *   ["debug", "debug"],
  *   ["info", "info"]
  * ])
@@ -956,9 +955,9 @@ export const getTypeName = <A>(primitive: Primitive<A>): string => {
       return "boolean"
     case "String":
       return "string"
-    case "Integer":
+    case "Int":
       return "integer"
-    case "Float":
+    case "Finite":
       return "number"
     case "Date":
       return "date"
@@ -976,7 +975,7 @@ export const getTypeName = <A>(primitive: Primitive<A>): string => {
       return "file"
     case "KeyValuePair":
       return "key=value"
-    case "None":
+    case "Never":
       return "none"
     default:
       return "value"
diff --git a/repos/effect/packages/effect/src/unstable/cli/Prompt.ts b/repos/effect/packages/effect/src/unstable/cli/Prompt.ts
index 370df88ae..fae49369c 100644
--- a/repos/effect/packages/effect/src/unstable/cli/Prompt.ts
+++ b/repos/effect/packages/effect/src/unstable/cli/Prompt.ts
@@ -337,7 +337,7 @@ export interface DateOptions extends ThemeOptions {
  * @category options
  * @since 4.0.0
  */
-export interface IntegerOptions extends ThemeOptions {
+export interface IntOptions extends ThemeOptions {
   /**
    * The message to display in the prompt.
    */
@@ -372,17 +372,12 @@ export interface IntegerOptions extends ThemeOptions {
 }
 
 /**
- * Options for a floating-point number prompt.
- *
- * **Details**
- *
- * In addition to the numeric bounds and step settings from `IntegerOptions`,
- * the prompt can be configured with a display precision.
+ * Options for `Number`, extending `IntOptions` with display precision.
  *
  * @category options
  * @since 4.0.0
  */
-export interface FloatOptions extends IntegerOptions {
+export interface NumberOptions extends IntOptions {
   /**
    * The precision to use for the floating point value (defaults to `2`).
    */
@@ -452,9 +447,9 @@ export interface FileOptions extends ThemeOptions {
  */
 export interface SelectOptions<A> extends ThemeOptions {
   /**
-   * The message to display in the prompt.
+   * The prompt message. Omit to display only the choices.
    */
-  readonly message: string
+  readonly message?: string | undefined
   /**
    * The choices to display to the user.
    */
@@ -473,6 +468,10 @@ export interface SelectOptions<A> extends ThemeOptions {
  * @since 4.0.0
  */
 export interface AutoCompleteOptions<A> extends SelectOptions<A> {
+  /**
+   * The required prompt message.
+   */
+  readonly message: string
   /**
    * The label used for the filter display (defaults to "filter").
    */
@@ -832,12 +831,12 @@ const renderPagingPrefix = (theme: Theme, showArrowUp: boolean, showArrowDown: b
  * `initial` defaults to `false`. Enter submits the current default, yes-style
  * input submits `true`, no-style input submits `false`, and other input beeps.
  *
- * @see {@link toggle} for an interactive switch-before-submit boolean prompt
+ * @see {@link Toggle} for an interactive switch-before-submit boolean prompt
  *
  * @category constructors
  * @since 4.0.0
  */
-export const confirm = (options: ConfirmOptions): Prompt<boolean> => {
+export const Confirm = (options: ConfirmOptions): Prompt<boolean> => {
   const opts: ConfirmOptionsReq = {
     initial: false,
     ...options,
@@ -853,7 +852,7 @@ export const confirm = (options: ConfirmOptions): Prompt<boolean> => {
     }
   }
   const initialState: ConfirmState = { value: opts.initial }
-  return custom(initialState, {
+  return Custom(initialState, {
     render: handleConfirmRender(opts),
     process: (input) => handleConfirmProcess(input, opts.initial),
     clear: handleConfirmClear(opts)
@@ -882,7 +881,7 @@ export const confirm = (options: ConfirmOptions): Prompt<boolean> => {
  * @category constructors
  * @since 4.0.0
  */
-export const custom: {
+export const Custom: {
   <State, Output>(
     initialState: State | Effect.Effect<State, never, Environment>,
     handlers: Handlers<State, Output>
@@ -932,9 +931,9 @@ export const custom: {
  * @category constructors
  * @since 4.0.0
  */
-export const date = (options: DateOptions): Prompt<Date> => {
+export const Date = (options: DateOptions): Prompt<globalThis.Date> => {
   const opts: DateOptionsReq = {
-    initial: new Date(),
+    initial: new globalThis.Date(),
     dateMask: "YYYY-MM-DD HH:mm:ss",
     validate: Effect.succeed,
     ...options,
@@ -952,7 +951,7 @@ export const date = (options: DateOptions): Prompt<Date> => {
     value: opts.initial,
     error: Option.none()
   }
-  return custom(initialState, {
+  return Custom(initialState, {
     render: handleDateRender(opts),
     process: handleDateProcess(opts),
     clear: handleDateClear(opts)
@@ -975,7 +974,7 @@ export const date = (options: DateOptions): Prompt<Date> => {
  * @category constructors
  * @since 4.0.0
  */
-export const file = (options: FileOptions = {}): Prompt<string> => {
+export const File = (options: FileOptions = {}): Prompt<string> => {
   const opts: FileOptionsReq = {
     ...options,
     type: options.type ?? "file",
@@ -1005,10 +1004,10 @@ export const file = (options: FileOptions = {}): Prompt<string> => {
         return index === -1 ? 0 : index
       }
     })
-    const confirm = Confirm.Hide()
+    const confirm = FileConfirm.Hide()
     return { cursor, files, allFiles: files, query: "", path: Option.map(defaultPath, path.dirname), confirm }
   })
-  return custom(initialState, {
+  return Custom(initialState, {
     render: handleFileRender(opts),
     process: handleFileProcess(opts),
     clear: handleFileClear(opts)
@@ -1051,11 +1050,11 @@ export const flatMap: {
  * @category constructors
  * @since 4.0.0
  */
-export const float = (options: FloatOptions): Prompt<number> => {
-  const opts: FloatOptionsReq = {
+export const Number = (options: NumberOptions): Prompt<number> => {
+  const opts: NumberOptionsReq = {
     default: 0,
-    min: Number.NEGATIVE_INFINITY,
-    max: Number.POSITIVE_INFINITY,
+    min: globalThis.Number.NEGATIVE_INFINITY,
+    max: globalThis.Number.POSITIVE_INFINITY,
     incrementBy: 1,
     decrementBy: 1,
     precision: 2,
@@ -1076,7 +1075,7 @@ export const float = (options: FloatOptions): Prompt<number> => {
     value: initialValue,
     error: Option.none()
   }
-  return custom(initialState, {
+  return Custom(initialState, {
     render: handleRenderFloat(opts),
     process: handleProcessFloat(opts),
     clear: handleNumberClear(opts)
@@ -1089,7 +1088,7 @@ export const float = (options: FloatOptions): Prompt<number> => {
  * @category constructors
  * @since 4.0.0
  */
-export const hidden = (
+export const Hidden = (
   options: TextOptions
 ): Prompt<Redacted.Redacted> => basePrompt(options, "hidden").pipe(map(Redacted.make))
 
@@ -1104,11 +1103,11 @@ export const hidden = (
  * @category constructors
  * @since 4.0.0
  */
-export const integer = (options: IntegerOptions): Prompt<number> => {
-  const opts: IntegerOptionsReq = {
+export const Int = (options: IntOptions): Prompt<number> => {
+  const opts: IntOptionsReq = {
     default: 0,
-    min: Number.NEGATIVE_INFINITY,
-    max: Number.POSITIVE_INFINITY,
+    min: globalThis.Number.NEGATIVE_INFINITY,
+    max: globalThis.Number.POSITIVE_INFINITY,
     incrementBy: 1,
     decrementBy: 1,
     validate: (n) => {
@@ -1128,7 +1127,7 @@ export const integer = (options: IntegerOptions): Prompt<number> => {
     value: initialValue,
     error: Option.none()
   }
-  return custom(initialState, {
+  return Custom(initialState, {
     render: handleRenderInteger(opts),
     process: handleProcessInteger(opts),
     clear: handleNumberClear(opts)
@@ -1142,8 +1141,8 @@ export const integer = (options: IntegerOptions): Prompt<number> => {
  * @category constructors
  * @since 4.0.0
  */
-export const list = (options: ListOptions): Prompt<Array<string>> =>
-  text(options).pipe(
+export const List = (options: ListOptions): Prompt<Array<string>> =>
+  String(options).pipe(
     map((output) => output.split(options.delimiter || ","))
   )
 
@@ -1173,7 +1172,7 @@ export const map: {
  * @category constructors
  * @since 4.0.0
  */
-export const password = (
+export const Password = (
   options: TextOptions
 ): Prompt<Redacted.Redacted> => basePrompt(options, "password").pipe(map(Redacted.make))
 
@@ -1212,7 +1211,7 @@ const getSelectInitialIndex = <A>(choices: ReadonlyArray<SelectChoice<A>>): numb
     const choice = choices[i] as SelectChoice<A>
     if (choice.selected === true) {
       if (seenSelected !== -1) {
-        throw new Error("InvalidArgumentException: only a single choice can be selected by default for Prompt.select")
+        throw new Error("InvalidArgumentException: only a single choice can be selected by default for Prompt.Select")
       }
       seenSelected = i
     }
@@ -1234,13 +1233,13 @@ const getSelectInitialIndex = <A>(choices: ReadonlyArray<SelectChoice<A>>): numb
  * @category constructors
  * @since 4.0.0
  */
-export const select = <const A>(options: SelectOptions<A>): Prompt<A> => {
+export const Select = <const A>(options: SelectOptions<A>): Prompt<A> => {
   const opts: SelectOptionsReq<A> = {
     maxPerPage: 10,
     ...options
   }
   const initialIndex = getSelectInitialIndex(opts.choices)
-  return custom(initialIndex, {
+  return Custom(initialIndex, {
     render: handleSelectRender(opts),
     process: handleSelectProcess(opts),
     clear: handleSelectClear(opts)
@@ -1261,7 +1260,7 @@ export const select = <const A>(options: SelectOptions<A>): Prompt<A> => {
  * ```ts import.meta.vitest
  * import { Prompt } from "effect/unstable/cli"
  *
- * const language = Prompt.autoComplete({
+ * const language = Prompt.AutoComplete({
  *   message: "Choose a language",
  *   choices: [
  *     { title: "TypeScript", value: "ts" },
@@ -1276,7 +1275,7 @@ export const select = <const A>(options: SelectOptions<A>): Prompt<A> => {
  * @category constructors
  * @since 4.0.0
  */
-export const autoComplete = <const A>(options: AutoCompleteOptions<A>): Prompt<A> => {
+export const AutoComplete = <const A>(options: AutoCompleteOptions<A>): Prompt<A> => {
   const opts: AutoCompleteOptionsReq<A> = {
     maxPerPage: 10,
     filterLabel: "filter",
@@ -1296,7 +1295,7 @@ export const autoComplete = <const A>(options: AutoCompleteOptions<A>): Prompt<A
     index,
     filtered
   }
-  return custom(initialState, {
+  return Custom(initialState, {
     render: handleAutoCompleteRender(opts),
     process: handleAutoCompleteProcess(opts),
     clear: handleAutoCompleteClear(opts)
@@ -1315,7 +1314,7 @@ export const autoComplete = <const A>(options: AutoCompleteOptions<A>): Prompt<A
  * @category constructors
  * @since 4.0.0
  */
-export const multiSelect = <const A>(
+export const MultiSelect = <const A>(
   options: SelectOptions<A> & MultiSelectOptions
 ): Prompt<Array<A>> => {
   const opts: SelectOptionsReq<A> & MultiSelectOptionsReq = {
@@ -1331,7 +1330,7 @@ export const multiSelect = <const A>(
     }
   }
   const initialState: MultiSelectState = { index: 0, selectedIndices: initialSelected, error: Option.none() }
-  return custom(initialState, {
+  return Custom(initialState, {
     render: handleMultiSelectRender(opts),
     process: handleMultiSelectProcess(opts),
     clear: handleMultiSelectClear(opts)
@@ -1363,7 +1362,7 @@ export const succeed = <A>(value: A): Prompt<A> => {
  * @category constructors
  * @since 4.0.0
  */
-export const text = (
+export const String = (
   options: TextOptions
 ): Prompt<string> => basePrompt(options, "text")
 
@@ -1374,14 +1373,14 @@ export const text = (
  * @category constructors
  * @since 4.0.0
  */
-export const toggle = (options: ToggleOptions): Prompt<boolean> => {
+export const Toggle = (options: ToggleOptions): Prompt<boolean> => {
   const opts: ToggleOptionsReq = {
     initial: false,
     active: "on",
     inactive: "off",
     ...options
   }
-  return custom(opts.initial, {
+  return Custom(opts.initial, {
     render: handleToggleRender(opts),
     process: handleToggleProcess,
     clear: () => handleToggleClear(opts)
@@ -1483,9 +1482,11 @@ const runLoop = Effect.fnUntraced(
   ) {
     let state = Effect.isEffect(loop.initialState) ? yield* loop.initialState : loop.initialState
     let action: Action<unknown, unknown> = Action.NextFrame({ state })
+    let clear = ""
     while (true) {
       const msg = yield* loop.render(state, action)
-      yield* Effect.orDie(terminal.display(msg))
+      yield* Effect.orDie(terminal.display(clear + msg))
+      clear = ""
       if (loop.events) {
         const takeInput = Queue.take(input).pipe(
           Effect.map((input) => ({ _tag: "Input" as const, input }))
@@ -1503,14 +1504,14 @@ const runLoop = Effect.fnUntraced(
         case "Beep":
           continue
         case "NextFrame": {
-          yield* Effect.orDie(terminal.display(yield* loop.clear(state, action)))
+          clear = yield* loop.clear(state, action)
           state = action.state
           continue
         }
         case "Submit": {
-          yield* Effect.orDie(terminal.display(yield* loop.clear(state, action)))
+          clear = yield* loop.clear(state, action)
           const msg = yield* loop.render(state, action)
-          yield* Effect.orDie(terminal.display(msg))
+          yield* Effect.orDie(terminal.display(clear + msg))
           return action.value
         }
       }
@@ -1777,7 +1778,7 @@ const processDateNext = (state: DateState) => {
     onSome: (next) => state.dateParts.indexOf(next)
   })
   return Action.NextFrame({
-    state: { ...state, cursor }
+    state: { ...state, typed: "", cursor }
   })
 }
 
@@ -1924,7 +1925,7 @@ abstract class DatePart {
   constructor(params: DatePartParams) {
     this.token = params.token
     this.locales = params.locales
-    this.date = params.date || new Date()
+    this.date = params.date || new globalThis.Date()
     this.parts = params.parts || [this]
   }
 
@@ -1970,7 +1971,7 @@ abstract class DatePart {
   }
 
   toString() {
-    return String(this.date)
+    return globalThis.String(this.date)
   }
 }
 
@@ -2002,7 +2003,7 @@ class Milliseconds extends DatePart {
   }
 
   setValue(value: string): void {
-    this.date.setMilliseconds(Number.parseInt(value.slice(-this.token.length)))
+    this.date.setMilliseconds(globalThis.Number.parseInt(value.slice(-this.token.length)))
   }
 
   override toString() {
@@ -2021,7 +2022,7 @@ class Seconds extends DatePart {
   }
 
   setValue(value: string): void {
-    this.date.setSeconds(Number.parseInt(value.slice(-2)))
+    this.date.setSeconds(globalThis.Number.parseInt(value.slice(-2)))
   }
 
   override toString() {
@@ -2042,7 +2043,7 @@ class Minutes extends DatePart {
   }
 
   setValue(value: string): void {
-    this.date.setMinutes(Number.parseInt(value.slice(-2)))
+    this.date.setMinutes(globalThis.Number.parseInt(value.slice(-2)))
   }
 
   override toString() {
@@ -2063,7 +2064,7 @@ class Hours extends DatePart {
   }
 
   setValue(value: string): void {
-    this.date.setHours(Number.parseInt(value.slice(-2)))
+    this.date.setHours(globalThis.Number.parseInt(value.slice(-2)))
   }
 
   override toString() {
@@ -2086,7 +2087,7 @@ class Day extends DatePart {
   }
 
   setValue(value: string): void {
-    this.date.setDate(Number.parseInt(value.slice(-2)))
+    this.date.setDate(globalThis.Number.parseInt(value.slice(-2)))
   }
 
   override toString() {
@@ -2135,7 +2136,7 @@ class Month extends DatePart {
   }
 
   setValue(value: string): void {
-    const month = Number.parseInt(value.slice(-2)) - 1
+    const month = globalThis.Number.parseInt(value.slice(-2)) - 1
     this.date.setMonth(month < 0 ? 0 : month)
   }
 
@@ -2164,7 +2165,7 @@ class Year extends DatePart {
   }
 
   setValue(value: string): void {
-    this.date.setFullYear(Number.parseInt(value.slice(-4)))
+    this.date.setFullYear(globalThis.Number.parseInt(value.slice(-4)))
   }
 
   override toString() {
@@ -2205,20 +2206,20 @@ interface FileState {
   readonly allFiles: ReadonlyArray<string>
   readonly query: string
   readonly path: Option.Option<string>
-  readonly confirm: Confirm
+  readonly confirm: FileConfirm
 }
 
 const CONFIRM_MESSAGE = "The selected directory contains files. Would you like to traverse the selected directory?"
 const FILE_FILTER_LABEL = "filter"
 const FILE_FILTER_PLACEHOLDER = "type to filter"
 const FILE_EMPTY_MESSAGE = "No matches"
-type Confirm = Data.TaggedEnum<{
+type FileConfirm = Data.TaggedEnum<{
   readonly Show: {}
   readonly Hide: {}
 }>
-const Confirm = Data.taggedEnum<Confirm>()
+const FileConfirm = Data.taggedEnum<FileConfirm>()
 
-const showConfirmation = Confirm.$is("Show")
+const showConfirmation = FileConfirm.$is("Show")
 
 const resolveCurrentPath = (
   path: Option.Option<string>,
@@ -2543,7 +2544,7 @@ const processSelection = Effect.fnUntraced(function*(state: FileState, options:
         ? Action.Submit({ value: resolvedPath })
         // Directory has contents - show confirmation to user
         : Action.NextFrame({
-          state: { ...state, confirm: Confirm.Show() }
+          state: { ...state, confirm: FileConfirm.Show() }
         })
     }
     return Action.NextFrame({
@@ -2553,7 +2554,7 @@ const processSelection = Effect.fnUntraced(function*(state: FileState, options:
         allFiles: files,
         query: "",
         path: Option.some(resolvedPath),
-        confirm: Confirm.Hide()
+        confirm: FileConfirm.Hide()
       }
     })
   }
@@ -2617,7 +2618,7 @@ const handleFileProcess = (options: FileOptionsReq) => {
               allFiles: files,
               query: "",
               path: Option.some(resolvedPath),
-              confirm: Confirm.Hide()
+              confirm: FileConfirm.Hide()
             }
           })
         }
@@ -2644,7 +2645,9 @@ const handleFileProcess = (options: FileOptionsReq) => {
   })
 }
 
-interface SelectOptionsReq<A> extends OptionsReq<SelectOptions<A>> {}
+interface SelectOptionsReq<A> extends SelectOptions<A> {
+  readonly maxPerPage: number
+}
 interface MultiSelectOptionsReq extends MultiSelectOptions {}
 
 type MultiSelectState = {
@@ -2771,7 +2774,7 @@ const renderMultiSelectNextFrame = Effect.fnUntraced(
     const trailingSymbol = annotateSymbol(figures.pointerSmall, figures.mutedColor)
     const promptMsg = renderSelectOutput(leadingSymbol, trailingSymbol, options)
     const error = renderMultiSelectError(state, figures.pointer, figures)
-    return Ansi.cursorHide + promptMsg + "\n" + choices + error
+    return Ansi.cursorHide + withSelectHeader(promptMsg, choices) + error
   }
 )
 
@@ -2784,7 +2787,7 @@ const renderMultiSelectSubmission = Effect.fnUntraced(
     const selectedText = selectedChoices.join(", ")
     const leadingSymbol = annotateSymbol(figures.tick, figures.successColor)
     const trailingSymbol = annotateSymbol(figures.ellipsis, figures.mutedColor)
-    const promptMsg = renderSelectOutput(leadingSymbol, trailingSymbol, options)
+    const promptMsg = renderSelectOutput(leadingSymbol, trailingSymbol, options) ?? leadingSymbol
     return promptMsg + " " + Ansi.annotate(selectedText, figures.submittedColor) + "\n"
   }
 )
@@ -2846,7 +2849,7 @@ const handleMultiSelectClear = <A>(options: SelectOptionsReq<A>) =>
     const promptText = renderSelectOutput(figures.prefix, figures.pointerSmall, options, { plain: true })
     const choicesText = renderMultiSelectChoices(state, options, figures, { plain: true })
     const errorText = renderMultiSelectError(state, figures.pointer, figures, { plain: true })
-    const clearOutput = clearOutputWithError(`${promptText}\n${choicesText}`, columns, errorText)
+    const clearOutput = clearOutputWithError(withSelectHeader(promptText, choicesText), columns, errorText)
     return clearOutput + clearPrompt
   })
 
@@ -2900,8 +2903,8 @@ const handleMultiSelectRender = <A>(options: SelectOptionsReq<A>) => {
   }
 }
 
-interface IntegerOptionsReq extends OptionsReq<IntegerOptions> {}
-interface FloatOptionsReq extends OptionsReq<FloatOptions> {}
+interface IntOptionsReq extends OptionsReq<IntOptions> {}
+interface NumberOptionsReq extends OptionsReq<NumberOptions> {}
 
 interface NumberState {
   readonly cursor: number
@@ -2909,7 +2912,7 @@ interface NumberState {
   readonly error: Option.Option<string>
 }
 
-const handleNumberClear = (options: IntegerOptionsReq) => {
+const handleNumberClear = (options: IntOptionsReq) => {
   return Effect.fnUntraced(function*(state: NumberState, _: Action<NumberState, number>) {
     const terminal = yield* Terminal.Terminal
     const columns = yield* terminal.columns
@@ -2966,7 +2969,7 @@ const renderNumberOutput = (
   state: NumberState,
   leadingSymbol: string,
   trailingSymbol: string,
-  options: IntegerOptionsReq,
+  options: IntOptionsReq,
   theme: Theme,
   renderOptions?: RenderOptions | undefined,
   submitted: boolean = false
@@ -2975,7 +2978,7 @@ const renderNumberOutput = (
   return renderPrompt(value, options.message, leadingSymbol, trailingSymbol, renderOptions)
 }
 
-const renderNumberNextFrame = Effect.fnUntraced(function*(state: NumberState, options: IntegerOptionsReq) {
+const renderNumberNextFrame = Effect.fnUntraced(function*(state: NumberState, options: IntOptionsReq) {
   const figures = yield* getTheme(options)
   const leadingSymbol = annotateSymbol(figures.prefix, figures.primaryColor)
   const trailingSymbol = annotateSymbol(figures.pointerSmall, figures.mutedColor)
@@ -2984,7 +2987,7 @@ const renderNumberNextFrame = Effect.fnUntraced(function*(state: NumberState, op
   return promptMsg + errorMsg
 })
 
-const renderNumberSubmission = Effect.fnUntraced(function*(nextState: NumberState, options: IntegerOptionsReq) {
+const renderNumberSubmission = Effect.fnUntraced(function*(nextState: NumberState, options: IntOptionsReq) {
   const figures = yield* getTheme(options)
   const leadingSymbol = annotateSymbol(figures.tick, figures.successColor)
   const trailingSymbol = annotateSymbol(figures.ellipsis, figures.mutedColor)
@@ -3014,8 +3017,8 @@ const defaultIntProcessor = (input: string, state: NumberState) => {
     }))
   }
 
-  const parsed = Number.parseInt(state.value + input)
-  if (Number.isNaN(parsed)) {
+  const parsed = globalThis.Number.parseInt(state.value + input)
+  if (globalThis.Number.isNaN(parsed)) {
     return Effect.succeed(Action.Beep())
   } else {
     return Effect.succeed(Action.NextFrame({
@@ -3034,8 +3037,8 @@ const defaultFloatProcessor = (input: string, state: NumberState) => {
     }))
   }
 
-  const parsed = Number.parseFloat(state.value + input)
-  if (Number.isNaN(parsed)) {
+  const parsed = globalThis.Number.parseFloat(state.value + input)
+  if (globalThis.Number.isNaN(parsed)) {
     return Effect.succeed(Action.Beep())
   } else {
     return Effect.succeed(Action.NextFrame({
@@ -3052,7 +3055,7 @@ const defaultFloatProcessor = (input: string, state: NumberState) => {
   }
 }
 
-const handleRenderInteger = (options: IntegerOptionsReq) => {
+const handleRenderInteger = (options: IntOptionsReq) => {
   return (state: NumberState, action: Action<NumberState, number>) => {
     return Action.$match(action, {
       Beep: () => Effect.succeed(renderBeep),
@@ -3062,7 +3065,7 @@ const handleRenderInteger = (options: IntegerOptionsReq) => {
   }
 }
 
-const handleProcessInteger = (options: IntegerOptionsReq) => {
+const handleProcessInteger = (options: IntOptionsReq) => {
   return (input: Terminal.UserInput, state: NumberState) => {
     if (input.key.ctrl && input.key.name === "u") {
       return processNumberClear(state)
@@ -3078,7 +3081,7 @@ const handleProcessInteger = (options: IntegerOptionsReq) => {
             ...state,
             value: state.value === "" || state.value === "-"
               ? `${options.incrementBy}`
-              : `${Number.parseInt(state.value) + options.incrementBy}`,
+              : `${globalThis.Number.parseInt(state.value) + options.incrementBy}`,
             error: Option.none()
           }
         }))
@@ -3090,15 +3093,15 @@ const handleProcessInteger = (options: IntegerOptionsReq) => {
             ...state,
             value: state.value === "" || state.value === "-"
               ? `-${options.decrementBy}`
-              : `${Number.parseInt(state.value) - options.decrementBy}`,
+              : `${globalThis.Number.parseInt(state.value) - options.decrementBy}`,
             error: Option.none()
           }
         }))
       }
       case "enter":
       case "return": {
-        const parsed = Number.parseInt(state.value)
-        if (Number.isNaN(parsed)) {
+        const parsed = globalThis.Number.parseInt(state.value)
+        if (globalThis.Number.isNaN(parsed)) {
           return Effect.succeed(Action.NextFrame({
             state: {
               ...state,
@@ -3125,7 +3128,7 @@ const handleProcessInteger = (options: IntegerOptionsReq) => {
   }
 }
 
-const handleRenderFloat = (options: FloatOptionsReq) => {
+const handleRenderFloat = (options: NumberOptionsReq) => {
   return (state: NumberState, action: Action<NumberState, number>) => {
     return Action.$match(action, {
       Beep: () => Effect.succeed(renderBeep),
@@ -3135,7 +3138,7 @@ const handleRenderFloat = (options: FloatOptionsReq) => {
   }
 }
 
-const handleProcessFloat = (options: FloatOptionsReq) => {
+const handleProcessFloat = (options: NumberOptionsReq) => {
   return (input: Terminal.UserInput, state: NumberState) => {
     if (input.key.ctrl && input.key.name === "u") {
       return processNumberClear(state)
@@ -3151,7 +3154,7 @@ const handleProcessFloat = (options: FloatOptionsReq) => {
             ...state,
             value: state.value === "" || state.value === "-"
               ? `${options.incrementBy}`
-              : `${Number.parseFloat(state.value) + options.incrementBy}`,
+              : `${globalThis.Number.parseFloat(state.value) + options.incrementBy}`,
             error: Option.none()
           }
         }))
@@ -3163,15 +3166,15 @@ const handleProcessFloat = (options: FloatOptionsReq) => {
             ...state,
             value: state.value === "" || state.value === "-"
               ? `-${options.decrementBy}`
-              : `${Number.parseFloat(state.value) - options.decrementBy}`,
+              : `${globalThis.Number.parseFloat(state.value) - options.decrementBy}`,
             error: Option.none()
           }
         }))
       }
       case "enter":
       case "return": {
-        const parsed = Number.parseFloat(state.value)
-        if (Number.isNaN(parsed)) {
+        const parsed = globalThis.Number.parseFloat(state.value)
+        if (globalThis.Number.isNaN(parsed)) {
           return Effect.succeed(Action.NextFrame({
             state: {
               ...state,
@@ -3210,7 +3213,6 @@ type AutoCompleteState = {
   readonly filtered: ReadonlyArray<number>
 }
 
-interface SelectOptionsReq<A> extends OptionsReq<SelectOptions<A>> {}
 interface AutoCompleteOptionsReq<A> extends OptionsReq<AutoCompleteOptions<A>> {}
 
 const filterAutoCompleteChoices = <A>(choices: ReadonlyArray<SelectChoice<A>>, query: string) => {
@@ -3247,7 +3249,13 @@ const renderSelectOutput = <A>(
   trailingSymbol: string,
   options: SelectOptionsReq<A>,
   renderOptions?: RenderOptions | undefined
-) => renderPrompt("", options.message, leadingSymbol, trailingSymbol, renderOptions)
+): string | undefined =>
+  options.message === undefined
+    ? undefined
+    : renderPrompt("", options.message, leadingSymbol, trailingSymbol, renderOptions)
+
+const withSelectHeader = (header: string | undefined, body: string): string =>
+  header === undefined ? body : header + "\n" + body
 
 const renderAutoCompleteFilter = <A>(
   state: AutoCompleteState,
@@ -3409,7 +3417,7 @@ const renderSelectNextFrame = Effect.fnUntraced(function*<A>(state: SelectState,
   const leadingSymbol = annotateSymbol(figures.prefix, figures.primaryColor)
   const trailingSymbol = annotateSymbol(figures.pointerSmall, figures.mutedColor)
   const promptMsg = renderSelectOutput(leadingSymbol, trailingSymbol, options)
-  return Ansi.cursorHide + promptMsg + "\n" + choices
+  return Ansi.cursorHide + withSelectHeader(promptMsg, choices)
 })
 
 const renderAutoCompleteNextFrame = Effect.fnUntraced(function*<A>(
@@ -3429,7 +3437,7 @@ const renderSelectSubmission = Effect.fnUntraced(function*<A>(state: SelectState
   const selected = options.choices[state].title
   const leadingSymbol = annotateSymbol(figures.tick, figures.successColor)
   const trailingSymbol = annotateSymbol(figures.ellipsis, figures.mutedColor)
-  const promptMsg = renderSelectOutput(leadingSymbol, trailingSymbol, options)
+  const promptMsg = renderSelectOutput(leadingSymbol, trailingSymbol, options) ?? leadingSymbol
   return promptMsg + " " + Ansi.annotate(selected, figures.submittedColor) + "\n"
 })
 
@@ -3530,7 +3538,7 @@ const handleSelectClear = <A>(options: SelectOptionsReq<A>) =>
     const clearPrompt = Ansi.eraseLine + Ansi.cursorLeft
     const promptText = renderSelectOutput(figures.prefix, figures.pointerSmall, options, { plain: true })
     const choicesText = renderSelectChoices(state, options, figures, { plain: true })
-    const clearOutput = eraseText(`${promptText}\n${choicesText}`, columns)
+    const clearOutput = eraseText(withSelectHeader(promptText, choicesText), columns)
     return clearOutput + clearPrompt
   })
 
@@ -3933,7 +3941,7 @@ const basePrompt = (
     value: opts.default,
     error: Option.none()
   }
-  return custom(initialState, {
+  return Custom(initialState, {
     render: handleTextRender(opts),
     process: handleTextProcess(opts),
     clear: handleTextClear(opts)
diff --git a/repos/effect/packages/effect/src/unstable/cli/internal/command.ts b/repos/effect/packages/effect/src/unstable/cli/internal/command.ts
index 543f283d6..a71fc7a89 100644
--- a/repos/effect/packages/effect/src/unstable/cli/internal/command.ts
+++ b/repos/effect/packages/effect/src/unstable/cli/internal/command.ts
@@ -234,6 +234,8 @@ export const makeCommand = <const Name extends string, Input, E, R, ContextInput
 
 /**
  * Converts a single flag param into a FlagDoc for help display.
+ *
+ * @internal
  */
 export const toFlagDoc = (
   single: Param.Single<typeof Param.flagKind, unknown>,
diff --git a/repos/effect/packages/effect/src/unstable/cli/internal/completions/descriptor.ts b/repos/effect/packages/effect/src/unstable/cli/internal/completions/descriptor.ts
index db244afe2..f591ca215 100644
--- a/repos/effect/packages/effect/src/unstable/cli/internal/completions/descriptor.ts
+++ b/repos/effect/packages/effect/src/unstable/cli/internal/completions/descriptor.ts
@@ -20,10 +20,10 @@ const toFlagType = (single: Param.Single<"flag", unknown>): Completions.FlagType
   switch (tag) {
     case "Boolean":
       return { _tag: "Boolean" }
-    case "Integer":
-      return { _tag: "Integer" }
-    case "Float":
-      return { _tag: "Float" }
+    case "Int":
+      return { _tag: "Int" }
+    case "Finite":
+      return { _tag: "Finite" }
     case "Date":
       return { _tag: "Date" }
     case "Choice": {
@@ -44,10 +44,10 @@ const toFlagType = (single: Param.Single<"flag", unknown>): Completions.FlagType
 const toArgumentType = (single: Param.Single<"argument", unknown>): Completions.ArgumentType => {
   const tag = single.primitiveType._tag
   switch (tag) {
-    case "Integer":
-      return { _tag: "Integer" }
-    case "Float":
-      return { _tag: "Float" }
+    case "Int":
+      return { _tag: "Int" }
+    case "Finite":
+      return { _tag: "Finite" }
     case "Date":
       return { _tag: "Date" }
     case "Choice": {
@@ -70,18 +70,25 @@ const toArgumentType = (single: Param.Single<"argument", unknown>): Completions.
 // ---------------------------------------------------------------------------
 
 /** @internal */
-export const fromCommand = (cmd: Command.Any): Completions.CommandDescriptor => {
+export const fromCommand = (
+  cmd: Command.Any,
+  inheritedFlags: ReadonlyArray<Param.AnyFlag> = []
+): Completions.CommandDescriptor => {
   const impl = toImpl(cmd)
   const config = impl.config
 
   const flags: Array<Completions.FlagDescriptor> = []
-  for (const flag of config.flags) {
+  const seen = new Set<string>()
+  // Match help's precedence: local flags first, then ancestors root to leaf.
+  for (const [index, flag] of [...config.flags, ...inheritedFlags].entries()) {
     const singles = Param.extractSingleParams(flag)
     for (const single of singles) {
       if (single.kind !== "flag") continue
       // Omit hidden flags from completion scripts so tab-completion in the
       // shell does not advertise flags that are absent from --help.
       if (single.hidden) continue
+      if (index >= config.flags.length && seen.has(single.name)) continue
+      seen.add(single.name)
       flags.push({
         name: single.name,
         aliases: single.aliases,
@@ -108,12 +115,17 @@ export const fromCommand = (cmd: Command.Any): Completions.CommandDescriptor =>
   }
 
   const subcommands: Array<Completions.CommandDescriptor> = []
+  const sharedFlags = [...inheritedFlags, ...impl.contextConfig.flags]
   for (const group of cmd.subcommands) {
     for (const subcommand of group.commands) {
       // Omit unlisted subcommands from completion scripts so tab-completion in
       // the shell does not advertise commands that are absent from --help.
       if (subcommand.unlisted) continue
-      subcommands.push(fromCommand(subcommand))
+      const descriptor = fromCommand(subcommand, sharedFlags)
+      subcommands.push(descriptor)
+      if (subcommand.alias && subcommand.alias !== subcommand.name) {
+        subcommands.push({ ...descriptor, name: subcommand.alias })
+      }
     }
   }
 
diff --git a/repos/effect/packages/effect/src/unstable/cli/internal/completions/zsh.ts b/repos/effect/packages/effect/src/unstable/cli/internal/completions/zsh.ts
index dd4a14d67..ab26d64be 100644
--- a/repos/effect/packages/effect/src/unstable/cli/internal/completions/zsh.ts
+++ b/repos/effect/packages/effect/src/unstable/cli/internal/completions/zsh.ts
@@ -41,9 +41,9 @@ const valueAction = (type: Completions.FlagType): string => {
       return `:value:(${type.values.map(escapeZshChoice).join(" ")})`
     case "Path":
       return type.pathType === "directory" ? `:directory:_directories` : `:file:_files`
-    case "Integer":
+    case "Int":
       return `:integer:`
-    case "Float":
+    case "Finite":
       return `:float:`
     case "Date":
       return `:date:`
diff --git a/repos/effect/packages/effect/src/unstable/cli/internal/config.ts b/repos/effect/packages/effect/src/unstable/cli/internal/config.ts
index 62cbc6792..8556a9fe2 100644
--- a/repos/effect/packages/effect/src/unstable/cli/internal/config.ts
+++ b/repos/effect/packages/effect/src/unstable/cli/internal/config.ts
@@ -15,12 +15,12 @@
  * ```ts
  * // User declares:
  * const config = {
- *   verbose: Flag.boolean("verbose").pipe(Flag.withDefault(false)),
+ *   verbose: Flag.Boolean("verbose").pipe(Flag.withDefault(false)),
  *   server: {
- *     host: Flag.string("host"),
- *     port: Flag.integer("port")
+ *     host: Flag.String("host"),
+ *     port: Flag.Int("port")
  *   },
- *   files: Argument.string("files").pipe(Argument.variadic)
+ *   files: Argument.String("files").pipe(Argument.variadic)
  * }
  *
  * // Becomes Config.Internal:
diff --git a/repos/effect/packages/effect/src/unstable/cli/internal/parser.ts b/repos/effect/packages/effect/src/unstable/cli/internal/parser.ts
index 5e00b9f1c..cfec25bfe 100644
--- a/repos/effect/packages/effect/src/unstable/cli/internal/parser.ts
+++ b/repos/effect/packages/effect/src/unstable/cli/internal/parser.ts
@@ -408,7 +408,7 @@ const missingFlagValue = (spec: FlagParam): CliError.InvalidValue => {
  * Recognizes: true/false, yes/no, on/off, 1/0
  */
 const asBooleanLiteral = (token: Token | undefined): string | undefined =>
-  token?._tag === "Value" && (Primitive.isTrueValue(token.value) || Primitive.isFalseValue(token.value))
+  token?._tag === "Value" && (Primitive.isTrueLiteral(token.value) || Primitive.isFalseLiteral(token.value))
     ? token.value
     : undefined
 
diff --git a/repos/effect/packages/effect/src/unstable/cli/internal/wizard.ts b/repos/effect/packages/effect/src/unstable/cli/internal/wizard.ts
index 34bc185f0..d34123e89 100644
--- a/repos/effect/packages/effect/src/unstable/cli/internal/wizard.ts
+++ b/repos/effect/packages/effect/src/unstable/cli/internal/wizard.ts
@@ -94,7 +94,7 @@ const promptCommand: (
       return
     }
 
-    const child = yield* Prompt.run(Prompt.select({
+    const child = yield* Prompt.run(Prompt.Select({
       message: "Command",
       choices: visibleSubcommands.map((command) => ({
         title: command.name,
@@ -130,7 +130,7 @@ const promptParam = Effect.fnUntraced(
     const metadata = Param.getParamMetadata(param)
 
     if (metadata.isOptional) {
-      const include = yield* Prompt.run(Prompt.confirm({
+      const include = yield* Prompt.run(Prompt.Confirm({
         message: `Set ${renderParamLabel(single)}?`,
         initial: false
       }))
@@ -142,7 +142,7 @@ const promptParam = Effect.fnUntraced(
 
     const count = !metadata.isVariadic
       ? 1
-      : yield* Prompt.run(Prompt.integer({
+      : yield* Prompt.run(Prompt.Int({
         message: `${renderParamLabel(single)} count`,
         default: Option.getOrElse(metadata.variadicMin, () => 0),
         min: Option.getOrElse(metadata.variadicMin, () => 0),
@@ -168,7 +168,12 @@ const promptParam = Effect.fnUntraced(
     if (single.kind === Param.argumentKind) {
       return values
     }
-    return values.flatMap((value) => [commandLineArg(`--${single.name}`), value])
+    // Inline option-looking values so the lexer cannot interpret them as flags or the -- delimiter.
+    return values.flatMap((value) =>
+      value.value.startsWith("-") && value.value.length > 1
+        ? [commandLineArg(`--${single.name}=${value.value}`, `--${single.name}=${value.displayValue}`)]
+        : [commandLineArg(`--${single.name}`), value]
+    )
   }
 )
 
@@ -179,7 +184,7 @@ const promptSingle = (
   switch (single.primitiveType._tag) {
     case "Boolean":
       return Effect.map(
-        Prompt.run(Prompt.confirm({
+        Prompt.run(Prompt.Confirm({
           message,
           label: {
             confirm: "true",
@@ -195,7 +200,7 @@ const promptSingle = (
     case "Choice": {
       const choices = Primitive.getChoiceKeys(single.primitiveType) ?? []
       return Effect.map(
-        Prompt.run(Prompt.select({
+        Prompt.run(Prompt.Select({
           message,
           choices: choices.map((choice) => ({ title: choice, value: choice }))
         })),
@@ -203,18 +208,18 @@ const promptSingle = (
       )
     }
     case "Date":
-      return Effect.map(Prompt.run(Prompt.date({ message })), (date) => commandLineArg(date.toISOString()))
-    case "Float":
-      return Effect.map(Prompt.run(Prompt.float({ message })), (value) => commandLineArg(String(value)))
-    case "Integer":
-      return Effect.map(Prompt.run(Prompt.integer({ message })), (value) => commandLineArg(String(value)))
+      return Effect.map(Prompt.run(Prompt.Date({ message })), (date) => commandLineArg(date.toISOString()))
+    case "Finite":
+      return Effect.map(Prompt.run(Prompt.Number({ message })), (value) => commandLineArg(String(value)))
+    case "Int":
+      return Effect.map(Prompt.run(Prompt.Int({ message })), (value) => commandLineArg(String(value)))
     case "Redacted":
       return Effect.map(
-        Prompt.run(Prompt.password({ message })),
+        Prompt.run(Prompt.Password({ message })),
         (value) => commandLineArg(Redacted.value(value), "<redacted>")
       )
     default:
-      return Effect.map(Prompt.run(Prompt.text({ message })), commandLineArg)
+      return Effect.map(Prompt.run(Prompt.String({ message })), commandLineArg)
   }
 }
 
diff --git a/repos/effect/packages/effect/src/unstable/cluster/ClusterWorkflowEngine.ts b/repos/effect/packages/effect/src/unstable/cluster/ClusterWorkflowEngine.ts
index 7b454f1b5..2d0dad519 100644
--- a/repos/effect/packages/effect/src/unstable/cluster/ClusterWorkflowEngine.ts
+++ b/repos/effect/packages/effect/src/unstable/cluster/ClusterWorkflowEngine.ts
@@ -8,6 +8,7 @@
  */
 import * as Context from "../../Context.ts"
 import * as DateTime from "../../DateTime.ts"
+import * as Deferred from "../../Deferred.ts"
 import * as Duration from "../../Duration.ts"
 import * as Effect from "../../Effect.ts"
 import * as Exit from "../../Exit.ts"
@@ -21,6 +22,7 @@ import type * as Record from "../../Record.ts"
 import * as Schedule from "../../Schedule.ts"
 import * as Schema from "../../Schema.ts"
 import type * as Scope from "../../Scope.ts"
+import * as Semaphore from "../../Semaphore.ts"
 import * as Headers from "../http/Headers.ts"
 import * as Rpc from "../rpc/Rpc.ts"
 import { ClientAbort } from "../rpc/RpcSchema.ts"
@@ -37,6 +39,7 @@ import * as EntityId from "./EntityId.ts"
 import * as EntityType from "./EntityType.ts"
 import * as Envelope from "./Envelope.ts"
 import * as ClusterAbandon from "./internal/clusterAbandon.ts"
+import { CurrentActivationScope } from "./internal/entityActivation.ts"
 import * as Message from "./Message.ts"
 import { MessageStorage } from "./MessageStorage.ts"
 import type { WithExitEncoded } from "./Reply.ts"
@@ -88,7 +91,7 @@ export const make = Effect.gen(function*() {
         >,
         Schema.declare<Workflow.Result<any, any>>
       >
-      | Rpc.Rpc<"resume", Schema.Struct<{}>>
+      | typeof ResumeRpc
     >
   >()
   const partialEntities = new Map<
@@ -101,7 +104,7 @@ export const make = Effect.gen(function*() {
         Schema.Struct<{ name: typeof Schema.String; attempt: typeof Schema.Int }>,
         Schema.declare<Workflow.Result<any, any>>
       >
-      | Rpc.Rpc<"resume">
+      | typeof ResumeRpc
     >
   >()
   const ensureEntity = (workflow: Workflow.Any) => {
@@ -129,6 +132,14 @@ export const make = Effect.gen(function*() {
   const interruptedActivities = new Set<string>()
   const activityLatches = new Map<string, Latch.Latch>()
   const deferredState = WorkflowEngine.makeDeferredState()
+  // Rebuilds share an activation; overlapping activations have separate results.
+  // Weak keys do not retain scopes, but contexts captured by clients, activities,
+  // or finalizers can keep a closed scope (and its results) reachable until later.
+  const pendingByActivation = new WeakMap<Scope.Scope, {
+    readonly workflowName: string
+    readonly executionId: string
+    readonly results: Map<string, Exit.Exit<unknown, unknown>>
+  }>()
   const clients = yield* RcMap.make({
     lookup: Effect.fnUntraced(function*(workflowName: string) {
       const entity = entities.get(workflowName)
@@ -293,23 +304,45 @@ export const make = Effect.gen(function*() {
   const sendResumeParent = Effect.fnUntraced(function*(options: {
     readonly workflowName: string
     readonly executionId: string
-  }) {
+  }, childExecutionId: string) {
     const requestId = yield* requestIdFor({
       workflow: workflows.get(options.workflowName)!,
       entityType: `Workflow/${options.workflowName}`,
       executionId: options.executionId,
       tag: "resume",
-      id: ""
+      id: childExecutionId
     })
     if (Option.isNone(requestId)) {
       const client = (yield* RcMap.get(clientsPartial, options.workflowName))(options.executionId)
-      return yield* client.resume({} as any, { discard: true })
+      return yield* client.resume({ childExecutionId }, { discard: true })
     }
     const reply = yield* replyForRequestId(requestId.value)
     if (Option.isNone(reply)) return
     yield* sharding.reset(requestId.value)
   }, Effect.scoped)
 
+  // A child or deferred may complete while a run is still unwinding. Subscribe
+  // to the run's reply before reading storage so the wake cannot fall between
+  // the run's last read and its suspended reply.
+  const waitForRunReply = Effect.fnUntraced(function*(workflow: Workflow.Any, request: Entity.Request<any>) {
+    const waiter = yield* storage.registerReplyHandler(
+      new Message.OutgoingRequest<any>({
+        envelope: request,
+        context: Context.empty() as Context.Context<any>,
+        rpc: ensureEntity(workflow).protocol.requests.get("run")!,
+        lastReceivedReply: Option.none(),
+        respond: () => Effect.void,
+        annotations: Context.empty()
+      })
+    ).pipe(Effect.forkScoped({ startImmediately: true }))
+    const reply = yield* replyForRequestId(request.requestId)
+    if (Option.isSome(reply)) return
+    yield* Fiber.join(waiter).pipe(
+      Effect.catchTag("EntityNotAssignedToRunner", () => ClusterAbandon.interrupt),
+      Effect.catchCause((cause) => ClusterAbandon.isCause(cause) ? ClusterAbandon.interrupt : Effect.failCause(cause))
+    )
+  }, Effect.scoped)
+
   const interrupt = Effect.fnUntraced(
     function*(workflow: Workflow.Any, executionId: string) {
       ensureEntity(workflow)
@@ -352,15 +385,41 @@ export const make = Effect.gen(function*() {
 
   const engine = WorkflowEngine.makeUnsafe({
     register: (workflow, execute) =>
-      Effect.suspend(() =>
-        sharding.registerEntity(
+      Effect.suspend(() => {
+        const existing = workflows.get(workflow._tag)
+        const registration = sharding.registerEntity(
           ensureEntity(workflow),
           Effect.gen(function*() {
             const address = yield* Entity.CurrentAddress
             const executionId = address.entityId
+            const activation = yield* CurrentActivationScope
+            let pending = pendingByActivation.get(activation)
+            if (!pending) {
+              pending = { workflowName: workflow._tag, executionId, results: new Map() }
+              pendingByActivation.set(activation, pending)
+            }
+            // Retain awaited names through reply persistence, including suspension.
+            // Replays reuse the request id but track a fresh set of awaits.
+            let currentRun: {
+              readonly request: Entity.Request<any>
+              readonly awaitedDeferreds: ReadonlySet<string>
+            } | undefined
+            // Concurrent wakes share one wait for the current run to publish its reply.
+            const resumeGate = Semaphore.makeUnsafe(1)
+            const resumeCurrentRun = Effect.suspend(() =>
+              resumeGate.withPermitsIfAvailable(1)(
+                currentRun ? waitForRunReply(workflow, currentRun.request) : Effect.void
+              )
+            ).pipe(
+              // Release the gate before reset can start another run, so later
+              // completions can wake that replay.
+              Effect.flatMap((waited) => Option.isSome(waited) ? resume(workflow, executionId) : Effect.void),
+              ensureSuccess
+            )
             return {
               run: (request: Entity.Request<any>) => {
                 const instance = WorkflowEngine.WorkflowInstance.initial(workflow, executionId)
+                currentRun = { request, awaitedDeferreds: instance.awaitedDeferreds }
                 const parent = (request.payload as any)[payloadParentKey] as
                   | { workflowName: string; executionId: string }
                   | undefined
@@ -379,7 +438,7 @@ export const make = Effect.gen(function*() {
                       !instance.abandoned &&
                       !(suspendOnFailure && exit._tag === "Failure")
                     ) {
-                      return parent ? ensureSuccess(sendResumeParent(parent)) : Effect.void
+                      return parent ? ensureSuccess(sendResumeParent(parent, executionId)) : Effect.void
                     }
                     return engine.deferredResult(InterruptSignal).pipe(
                       Effect.flatMap((maybeExit) => {
@@ -397,7 +456,9 @@ export const make = Effect.gen(function*() {
                     )
                   }),
                   Workflow.intoResult,
-                  (effect) => deferredState.trackRun(instance, effect)
+                  (effect) => deferredState.trackRun(instance, effect),
+                  // Request middleware and local callers may carry another entity's context.
+                  Effect.provideService(CurrentActivationScope, activation)
                 ) as any
               },
 
@@ -416,6 +477,7 @@ export const make = Effect.gen(function*() {
                   }
                   const context = entry.context.pipe(
                     Context.add(WorkflowEngine.WorkflowInstance, instance),
+                    Context.add(CurrentActivationScope, activation),
                     Context.add(Activity.CurrentAttempt, payload.attempt)
                   )
                   return yield* entry.activity.executeEncoded.pipe(
@@ -444,20 +506,47 @@ export const make = Effect.gen(function*() {
                 )
               },
 
-              deferred: Effect.fnUntraced(function*(request: Entity.Request<any>) {
+              deferred: (request: Entity.Request<any>) => {
                 const payload = request.payload as any
-                yield* deferredState.deferredDone(executionId, payload.name, payload.exit)
-                yield* ensureSuccess(resume(workflow, executionId))
-                return payload.exit
-              }),
+                pending.results.set(payload.name, payload.exit)
+                // Await registers before reading the cache. If this run has not
+                // registered yet, a later await will see the result just stored.
+                // Check when the wake runs and skip preemption too: interrupting
+                // a later await would require waiting for its reply before reset.
+                const wake = Effect.suspend(() =>
+                  currentRun && !currentRun.awaitedDeferreds.has(payload.name)
+                    ? ensureSuccess(resume(workflow, executionId))
+                    : deferredState.deferredDone(executionId, payload.name).pipe(Effect.andThen(resumeCurrentRun))
+                )
+                // An asynchronous reply releases the RPC concurrency permit while
+                // the wake waits; the pending request still occupies mailbox capacity.
+                // The activation owns the wake so it survives handler rebuilds,
+                // but activation shutdown still interrupts it for durable redelivery.
+                const reply = Deferred.makeUnsafe<Exit.Exit<unknown, unknown>>()
+                return wake.pipe(
+                  Effect.as(payload.exit),
+                  Deferred.into(reply),
+                  Effect.forkIn(activation, { startImmediately: true }),
+                  Effect.as(reply)
+                )
+              },
 
-              resume: () => ensureSuccess(resume(workflow, executionId))
+              resume: () => resumeCurrentRun.pipe(Rpc.wrap({ fork: true, uninterruptible: true }))
             }
           }),
-          // Reserve a slot for deferred completions to wake the active run.
+          // Alongside the run, let deferred handlers briefly acquire a permit to
+          // fork their wake and return an asynchronous reply.
           { concurrency: 2, maxIdleTime: entityMaxIdleTime }
         ) as Effect.Effect<void, never, Scope.Scope>
-      ),
+        if (existing === undefined || existing === workflow) return registration
+        return Effect.logWarning(
+          `Workflow "${workflow._tag}" is already registered with payload shape ${
+            payloadShape(
+              existing
+            )
+          }; ignoring duplicate definition with payload shape ${payloadShape(workflow)}`
+        ).pipe(Effect.andThen(registration))
+      }),
 
     execute: (workflow, { discard, executionId, parent, payload }) => {
       ensureEntity(workflow)
@@ -564,12 +653,18 @@ export const make = Effect.gen(function*() {
 
     deferredResult: (deferred) =>
       WorkflowEngine.WorkflowInstance.pipe(
-        Effect.flatMap((instance) => {
-          const exit = deferredState.pendingResult(instance.executionId, deferred.name)
+        Effect.flatMap(Effect.fnUntraced(function*(instance) {
+          const activation = yield* Effect.serviceOption(CurrentActivationScope)
+          const pending = Option.isSome(activation) ? pendingByActivation.get(activation.value) : undefined
+          // Captured contexts can cross workflow boundaries. Never use another
+          // execution's completion, even if its deferred has the same name.
+          const exit = pending?.workflowName === instance.workflow._tag && pending.executionId === instance.executionId
+            ? pending.results.get(deferred.name)
+            : undefined
           if (exit) {
-            return Effect.succeedSome(exit)
+            return Option.some(exit)
           }
-          return requestReply({
+          return yield* requestReply({
             workflow: instance.workflow,
             entityType: `Workflow/${instance.workflow._tag}`,
             executionId: instance.executionId,
@@ -588,7 +683,7 @@ export const make = Effect.gen(function*() {
               )
             })
           )
-        }),
+        })),
         Effect.retry({
           while: (e) => e._tag === "PersistenceError",
           times: 3,
@@ -705,8 +800,11 @@ const DeferredRpc = Rpc.make("deferred", {
 const decodeDeferredWithExit = Schema.decodeSync(Schema.toCodecJson(Reply.WithExit.schema(DeferredRpc)))
 
 const ResumeRpc = Rpc.make("resume", {
-  payload: {},
-  primaryKey: () => ""
+  // Older persisted resume envelopes have an empty payload and use the empty key.
+  payload: { childExecutionId: Schema.optional(Schema.String) },
+  // Different children must not share an in-flight wake: the parent may have
+  // already started another run when the next child finishes.
+  primaryKey: ({ childExecutionId }) => childExecutionId ?? ""
 })
   .annotate(ClusterSchema.Persisted, true)
   .annotate(ClusterSchema.Uninterruptible, "server")
@@ -814,3 +912,12 @@ export const layer: Layer.Layer<
 > = ClockEntityLayer.pipe(
   Layer.provideMerge(Layer.effect(WorkflowEngine.WorkflowEngine)(make))
 )
+
+const payloadShape = (workflow: Workflow.Any): string => {
+  try {
+    const { definitions, schema } = Schema.toJsonSchemaDocument(workflow.payloadSchema)
+    return JSON.stringify(Object.keys(definitions).length === 0 ? schema : { ...schema, $defs: definitions })
+  } catch {
+    return "<unavailable>"
+  }
+}
diff --git a/repos/effect/packages/effect/src/unstable/cluster/Entity.ts b/repos/effect/packages/effect/src/unstable/cluster/Entity.ts
index 0e4847dcd..274fd88af 100644
--- a/repos/effect/packages/effect/src/unstable/cluster/Entity.ts
+++ b/repos/effect/packages/effect/src/unstable/cluster/Entity.ts
@@ -45,6 +45,7 @@ import { EntityAddress } from "./EntityAddress.ts"
 import type { EntityId } from "./EntityId.ts"
 import { EntityType } from "./EntityType.ts"
 import * as Envelope from "./Envelope.ts"
+import { CurrentActivationScope } from "./internal/entityActivation.ts"
 import { hashString } from "./internal/hash.ts"
 import { ResourceMap } from "./internal/resourceMap.ts"
 import * as Message from "./Message.ts"
@@ -623,6 +624,7 @@ export const makeTestClient: <Type extends string, Rpcs extends Rpc.Any, LA, LE,
       Rpc.ServicesClient<Rpcs> | Rpc.ServicesServer<Rpcs> | Rpc.Middleware<Rpcs> | LR
     >
     readonly concurrency: number | "unbounded"
+    readonly disableFatalDefects: boolean | undefined
     readonly build: Effect.Effect<Context.Context<Rpc.ToHandler<Rpcs>>>
   }>()
   const sharding = shardingTag.of({
@@ -632,6 +634,7 @@ export const makeTestClient: <Type extends string, Rpcs extends Rpc.Any, LA, LE,
         entityMap.set(entity.type, {
           context: context as any,
           concurrency: options?.concurrency ?? 1,
+          disableFatalDefects: options?.disableFatalDefects,
           build: entity.protocol.toHandlers(handlers as any) as any
         })
         return Effect.void
@@ -653,6 +656,7 @@ export const makeTestClient: <Type extends string, Rpcs extends Rpc.Any, LA, LE,
     const handlerContext = entityEntry.context.pipe(
       Context.add(CurrentRunnerAddress, runnerAddress),
       Context.add(CurrentAddress, address),
+      Context.add(CurrentActivationScope, scope),
       Context.add(Scope, scope)
     )
     const handlers = yield* entityEntry.build.pipe(
@@ -663,6 +667,7 @@ export const makeTestClient: <Type extends string, Rpcs extends Rpc.Any, LA, LE,
     let client!: Effect.Success<ReturnType<typeof RpcClient.makeNoSerialization<Rpcs, never>>>
     const server = yield* RpcServer.makeNoSerialization(entity.protocol, {
       concurrency: entityEntry.concurrency,
+      disableFatalDefects: entityEntry.disableFatalDefects,
       onFromServer(response) {
         return client.write(response)
       }
diff --git a/repos/effect/packages/effect/src/unstable/cluster/EntityProxyServer.ts b/repos/effect/packages/effect/src/unstable/cluster/EntityProxyServer.ts
index f3e6c71de..ac3706973 100644
--- a/repos/effect/packages/effect/src/unstable/cluster/EntityProxyServer.ts
+++ b/repos/effect/packages/effect/src/unstable/cluster/EntityProxyServer.ts
@@ -42,7 +42,11 @@ export const layerHttpApi = <
   api: HttpApi.HttpApi<ApiId, Groups>,
   identifier: Identifier,
   entity: Entity.Entity<Type, Rpcs>
-): Layer.Layer<HttpApiGroup.Service<ApiId, Identifier>, never, Sharding | Rpc.ServicesServer<Rpcs>> =>
+): Layer.Layer<
+  HttpApiGroup.Service<ApiId, Identifier>,
+  never,
+  Sharding | Rpc.ServicesServer<Rpcs> | Rpc.ServicesClient<Rpcs>
+> =>
   HttpApiBuilder.group(
     api,
     identifier,
@@ -102,7 +106,7 @@ export const layerRpcHandlers = <
   Rpcs extends Rpc.Any
 >(
   entity: Entity.Entity<Type, Rpcs>
-): Layer.Layer<RpcHandlers<Rpcs, Type>, never, Sharding | Rpc.ServicesServer<Rpcs>> =>
+): Layer.Layer<RpcHandlers<Rpcs, Type>, never, Sharding | Rpc.ServicesServer<Rpcs> | Rpc.ServicesClient<Rpcs>> =>
   Layer.effectContext(Effect.gen(function*() {
     const context = yield* Effect.context<never>()
     const client = yield* entity.client
diff --git a/repos/effect/packages/effect/src/unstable/cluster/Envelope.ts b/repos/effect/packages/effect/src/unstable/cluster/Envelope.ts
index 0d6406328..2f60b5c95 100644
--- a/repos/effect/packages/effect/src/unstable/cluster/Envelope.ts
+++ b/repos/effect/packages/effect/src/unstable/cluster/Envelope.ts
@@ -14,7 +14,7 @@ import * as PrimaryKey from "../../PrimaryKey.ts"
 import type { ReadonlyRecord } from "../../Record.ts"
 import * as Schema from "../../Schema.ts"
 import * as SchemaTransformation from "../../SchemaTransformation.ts"
-import * as Headers from "../http/Headers.ts"
+import type * as Headers from "../http/Headers.ts"
 import type * as Rpc from "../rpc/Rpc.ts"
 import { EntityAddress } from "./EntityAddress.ts"
 import { type Snowflake, SnowflakeFromBigInt } from "./Snowflake.ts"
@@ -133,7 +133,7 @@ export class PartialRequest extends Schema.Opaque<PartialRequest>()(Schema.Struc
   address: EntityAddress,
   tag: Schema.String,
   payload: OpaqueHole,
-  headers: Headers.HeadersSchema,
+  headers: Schema.Headers,
   traceId: Schema.optional(Schema.String),
   spanId: Schema.optional(Schema.String),
   sampled: Schema.optional(Schema.Boolean)
diff --git a/repos/effect/packages/effect/src/unstable/cluster/HttpRunner.ts b/repos/effect/packages/effect/src/unstable/cluster/HttpRunner.ts
index d4c0a2f55..570d463de 100644
--- a/repos/effect/packages/effect/src/unstable/cluster/HttpRunner.ts
+++ b/repos/effect/packages/effect/src/unstable/cluster/HttpRunner.ts
@@ -18,6 +18,7 @@ import * as HttpRouter from "../http/HttpRouter.ts"
 import type * as HttpServer from "../http/HttpServer.ts"
 import type { HttpServerRequest } from "../http/HttpServerRequest.ts"
 import type { HttpServerResponse } from "../http/HttpServerResponse.ts"
+import * as NetAddress from "../net/NetAddress.ts"
 import * as RpcClient from "../rpc/RpcClient.ts"
 import * as RpcSerialization from "../rpc/RpcSerialization.ts"
 import * as RpcServer from "../rpc/RpcServer.ts"
@@ -56,12 +57,15 @@ export const layerClientProtocolHttp = (options: {
       const serialization = yield* RpcSerialization.RpcSerialization
       const client = yield* HttpClient.HttpClient
       const https = options.https ?? false
+      const path = options.path.startsWith("/") ? options.path : `/${options.path}`
       return {
         codecFor: serialization.codecFor,
         make: (address) => {
           const clientWithUrl = HttpClient.mapRequest(
             client,
-            HttpClientRequest.prependUrl(`http${https ? "s" : ""}://${address.host}:${address.port}/${options.path}`)
+            HttpClientRequest.prependUrl(
+              `http${https ? "s" : ""}://${NetAddress.formatUrlHostString(address.host)}:${address.port}${path}`
+            )
           )
           return RpcClient.makeProtocolHttp(clientWithUrl).pipe(
             Effect.provideService(RpcSerialization.RpcSerialization, serialization)
@@ -107,12 +111,13 @@ export const layerClientProtocolWebsocket = (options: {
     Effect.gen(function*() {
       const serialization = yield* RpcSerialization.RpcSerialization
       const https = options.https ?? false
+      const path = options.path.startsWith("/") ? options.path : `/${options.path}`
       const constructor = yield* Socket.WebSocketConstructor
       return {
         codecFor: serialization.codecFor,
         make: Effect.fnUntraced(function*(address) {
           const socket = yield* Socket.makeWebSocket(
-            `ws${https ? "s" : ""}://${address.host}:${address.port}/${options.path}`
+            `ws${https ? "s" : ""}://${NetAddress.formatUrlHostString(address.host)}:${address.port}${path}`
           ).pipe(
             Effect.provideService(Socket.WebSocketConstructor, constructor)
           )
diff --git a/repos/effect/packages/effect/src/unstable/cluster/Message.ts b/repos/effect/packages/effect/src/unstable/cluster/Message.ts
index 05c98186f..9d6d02d2c 100644
--- a/repos/effect/packages/effect/src/unstable/cluster/Message.ts
+++ b/repos/effect/packages/effect/src/unstable/cluster/Message.ts
@@ -14,6 +14,7 @@ import * as Data from "../../Data.ts"
 import * as Effect from "../../Effect.ts"
 import * as Option from "../../Option.ts"
 import * as Schema from "../../Schema.ts"
+import type * as Scope from "../../Scope.ts"
 import * as Rpc from "../rpc/Rpc.ts"
 import type * as RpcSerialization from "../rpc/RpcSerialization.ts"
 import type { PersistenceError } from "./ClusterError.ts"
@@ -98,6 +99,12 @@ export class IncomingRequest<R extends Rpc.Any> extends Data.TaggedClass("Incomi
    * server sets it to the codec of its transport.
    */
   readonly codecFor: RpcSerialization.CodecFor
+  /**
+   * Scope that cancels interruptible, non-persisted requests when closed.
+   *
+   * @since 4.0.0
+   */
+  readonly callerScope?: Scope.Scope | undefined
 }> {}
 
 /**
@@ -116,6 +123,12 @@ export class IncomingRequestLocal<R extends Rpc.Any> extends Data.TaggedClass("I
   readonly lastSentReply: Option.Option<Reply.Reply<R>>
   readonly respond: (reply: Reply.Reply<R>) => Effect.Effect<void, MalformedMessage | PersistenceError>
   readonly annotations: Context.Context<never>
+  /**
+   * Scope that cancels interruptible, non-persisted requests when closed.
+   *
+   * @since 4.0.0
+   */
+  readonly callerScope?: Scope.Scope | undefined
 }> {}
 
 /**
diff --git a/repos/effect/packages/effect/src/unstable/cluster/MessageStorage.ts b/repos/effect/packages/effect/src/unstable/cluster/MessageStorage.ts
index e3850dd0d..be9200afc 100644
--- a/repos/effect/packages/effect/src/unstable/cluster/MessageStorage.ts
+++ b/repos/effect/packages/effect/src/unstable/cluster/MessageStorage.ts
@@ -178,6 +178,11 @@ export class MessageStorage extends Context.Service<MessageStorage, {
     address: EntityAddress
   ) => Effect.Effect<void, PersistenceError>
 
+  /** Release request claims without changing replies or processed state. */
+  readonly resetRequests: (
+    requestIds: ReadonlyArray<Snowflake.Snowflake>
+  ) => Effect.Effect<void, PersistenceError>
+
   /**
    * Reset the mailbox state for the provided addresses.
    */
@@ -412,6 +417,11 @@ export type Encoded = {
     PersistenceError
   >
 
+  /** Release request claims without changing replies or processed state. */
+  readonly resetRequests: (
+    requestIds: ReadonlyArray<Snowflake.Snowflake>
+  ) => Effect.Effect<void, PersistenceError>
+
   /**
    * Reset the mailbox state for the provided addresses.
    */
@@ -716,6 +726,7 @@ export const makeEncoded: (encoded: Encoded) => Effect.Effect<
       )
     },
     resetAddress: (address) => encoded.resetAddresses([address]),
+    resetRequests: (requestIds) => requestIds.length === 0 ? Effect.void : encoded.resetRequests(requestIds),
     resetAddresses: (addresses) => addresses.length === 0 ? Effect.void : encoded.resetAddresses(addresses),
     clearAddress: encoded.clearAddress,
     resetShards: (shardIds) => {
@@ -846,6 +857,7 @@ export const noop: MessageStorage["Service"] = Effect.runSync(make({
   unprocessedMessages: () => Effect.succeed([]),
   unprocessedMessagesById: () => Effect.succeed([]),
   resetAddress: () => Effect.void,
+  resetRequests: () => Effect.void,
   resetAddresses: () => Effect.void,
   clearAddress: () => Effect.void,
   resetShards: () => Effect.void,
@@ -1067,6 +1079,7 @@ export class MemoryDriver extends Context.Service<MemoryDriver>()("effect/cluste
               if (claimedAt !== undefined && claimedAt > now - claimExpirationMillis) {
                 continue
               }
+              // Memory storage models claim expiry, but not SQL reply filtering or transactions.
               messages.push({
                 envelope,
                 lastSentReply: Option.fromNullishOr(entry.replies[entry.replies.length - 1])
@@ -1091,6 +1104,13 @@ export class MemoryDriver extends Context.Service<MemoryDriver>()("effect/cluste
           return unprocessedWith((envelope) => envelopeIds.has(envelope.requestId))
         }),
       resetAddresses,
+      resetRequests: (requestIds) =>
+        Effect.sync(() => {
+          for (const id of requestIds) {
+            const entry = requests.get(String(id))
+            if (entry) lastRead.delete(entry.envelope)
+          }
+        }),
       clearAddress: (address) =>
         Effect.sync(() => {
           for (const [primaryKey, entry] of requestsByPrimaryKey) {
@@ -1105,12 +1125,14 @@ export class MemoryDriver extends Context.Service<MemoryDriver>()("effect/cluste
             const envelope = journal[i]
             const sameAddress = address.entityType === envelope.address.entityType &&
               address.entityId === envelope.address.entityId
-            if (!sameAddress || envelope._tag !== "Request") {
+            if (!sameAddress) {
               continue
             }
             unprocessed.delete(envelope)
             lastRead.delete(envelope)
-            requests.delete(envelope.requestId)
+            if (envelope._tag === "Request") {
+              requests.delete(envelope.requestId)
+            }
             journal.splice(i, 1)
           }
         }),
diff --git a/repos/effect/packages/effect/src/unstable/cluster/Reply.ts b/repos/effect/packages/effect/src/unstable/cluster/Reply.ts
index 0df5ab949..d8ace50c6 100644
--- a/repos/effect/packages/effect/src/unstable/cluster/Reply.ts
+++ b/repos/effect/packages/effect/src/unstable/cluster/Reply.ts
@@ -407,8 +407,8 @@ export const Reply = <R extends Rpc.Any>(
 ): Schema.Codec<
   WithExit<R> | Chunk<R>,
   Encoded,
-  Rpc.ServicesServer<R>,
-  Rpc.ServicesClient<R>
+  Rpc.ServicesClient<R>,
+  Rpc.ServicesServer<R>
 > => {
   let schemaCache = schemaCaches.get(codecFor)
   if (schemaCache === undefined) {
diff --git a/repos/effect/packages/effect/src/unstable/cluster/RunnerServer.ts b/repos/effect/packages/effect/src/unstable/cluster/RunnerServer.ts
index 3b5790699..9a749ed7f 100644
--- a/repos/effect/packages/effect/src/unstable/cluster/RunnerServer.ts
+++ b/repos/effect/packages/effect/src/unstable/cluster/RunnerServer.ts
@@ -71,7 +71,8 @@ export const layerHandlers = Runners.Rpcs.toLayer(Effect.gen(function*() {
         : new Message.IncomingEnvelope({ envelope })
       return persisted ? sharding.notify(message) : sharding.send(message)
     },
-    Effect: ({ persisted, request }) => {
+    Effect: Effect.fnUntraced(function*({ persisted, request }) {
+      const callerScope = yield* Effect.scope
       let replyEncoded: Option.Option<Effect.Effect<Reply.Encoded, ClusterError.EntityNotAssignedToRunner>> = Option
         .none()
       let resume = (reply: Effect.Effect<Reply.Encoded, ClusterError.EntityNotAssignedToRunner>) => {
@@ -81,13 +82,14 @@ export const layerHandlers = Runners.Rpcs.toLayer(Effect.gen(function*() {
         envelope: request,
         lastSentReply: Option.none(),
         codecFor,
+        callerScope,
         respond(reply) {
           resume(Reply.serializeOrDefect(reply, codecFor))
           return Effect.void
         }
       })
       if (persisted) {
-        return Effect.callback<
+        return yield* Effect.callback<
           Reply.Encoded,
           ClusterError.EntityNotAssignedToRunner
         >((resume_) => {
@@ -114,60 +116,56 @@ export const layerHandlers = Runners.Rpcs.toLayer(Effect.gen(function*() {
           return Fiber.interrupt(fiber)
         })
       }
-      return Effect.andThen(
-        sharding.send(message),
-        Effect.callback<Reply.Encoded, ClusterError.EntityNotAssignedToRunner>((resume_) => {
-          if (Option.isSome(replyEncoded)) {
-            resume_(replyEncoded.value)
-          } else {
-            resume = resume_
-          }
-        })
-      )
-    },
-    Stream: ({ persisted, request }) =>
-      Effect.flatMap(
-        Queue.make<Reply.Encoded, ClusterError.EntityNotAssignedToRunner | Cause.Done>(),
-        (queue) => {
-          const message = new Message.IncomingRequest({
-            envelope: request,
-            lastSentReply: Option.none(),
-            codecFor,
-            respond(reply) {
-              return Reply.serialize(reply, codecFor).pipe(
-                Effect.flatMap((reply) => {
+      yield* sharding.send(message)
+      return yield* Effect.callback<Reply.Encoded, ClusterError.EntityNotAssignedToRunner>((resume_) => {
+        if (Option.isSome(replyEncoded)) {
+          resume_(replyEncoded.value)
+        } else {
+          resume = resume_
+        }
+      })
+    }),
+    Stream: Effect.fnUntraced(function*({ persisted, request }) {
+      const callerScope = yield* Effect.scope
+      const queue = yield* Queue.make<Reply.Encoded, ClusterError.EntityNotAssignedToRunner | Cause.Done>()
+      const message = new Message.IncomingRequest({
+        envelope: request,
+        lastSentReply: Option.none(),
+        codecFor,
+        callerScope,
+        respond(reply) {
+          return Reply.serialize(reply, codecFor).pipe(
+            Effect.flatMap((reply) => {
+              Queue.offerUnsafe(queue, reply)
+              if (reply._tag === "WithExit") {
+                Queue.endUnsafe(queue)
+              }
+              return Effect.void
+            }),
+            Effect.catchTag(
+              "MalformedMessage",
+              (error) =>
+                Effect.flatMap(serializeDefectReply(reply, error, codecFor), (reply) => {
+                  // the fallback defect reply is terminal, so end the stream
                   Queue.offerUnsafe(queue, reply)
-                  if (reply._tag === "WithExit") {
-                    Queue.endUnsafe(queue)
-                  }
+                  Queue.endUnsafe(queue)
                   return Effect.void
-                }),
-                Effect.catchTag("MalformedMessage", (error) =>
-                  Effect.flatMap(serializeDefectReply(reply, error, codecFor), (reply) => {
-                    // the fallback defect reply is terminal, so end the stream
-                    Queue.offerUnsafe(queue, reply)
-                    Queue.endUnsafe(queue)
-                    return Effect.void
-                  }))
-              )
-            }
-          })
-          return Effect.as(
-            persisted ?
-              Effect.andThen(
-                storage.registerReplyHandler(message).pipe(
-                  Effect.onError((cause) =>
-                    Queue.failCause(queue, cause)
-                  ),
-                  Effect.forkScoped
-                ),
-                sharding.notify(message, constWaitUntilRead)
-              ) :
-              sharding.send(message),
-            queue
+                })
+            )
           )
         }
-      ),
+      })
+      if (persisted) {
+        yield* storage.registerReplyHandler(message).pipe(
+          Effect.onError((cause) => Queue.failCause(queue, cause)),
+          Effect.forkScoped
+        )
+        yield* sharding.notify(message, constWaitUntilRead)
+      } else {
+        yield* sharding.send(message)
+      }
+      return queue
+    }),
     Envelope: ({ envelope }) => sharding.send(new Message.IncomingEnvelope({ envelope }))
   }
 }))
diff --git a/repos/effect/packages/effect/src/unstable/cluster/Sharding.ts b/repos/effect/packages/effect/src/unstable/cluster/Sharding.ts
index a58522076..f7a4d4ec0 100644
--- a/repos/effect/packages/effect/src/unstable/cluster/Sharding.ts
+++ b/repos/effect/packages/effect/src/unstable/cluster/Sharding.ts
@@ -243,6 +243,25 @@ const make = Effect.gen(function*() {
   const entityManagers = new Map<string, EntityManagerState>()
   let entityRegistrationStartMillis: number | undefined
   let entityRegistrationFallbackStartMillis: number | undefined
+  const entityRegistrationTimeoutMillis = Duration.toMillis(
+    Duration.fromInputUnsafe(config.entityRegistrationTimeout)
+  )
+  const entityRegistrationTimeRemaining = () => {
+    const now = clock.currentTimeMillisUnsafe()
+    const registrationStarted = entityRegistrationStartMillis !== undefined
+    // The first missing entity observed by either the storage read loop or a
+    // local send starts the shared fallback registration window.
+    const timeoutStartMillis = entityRegistrationStartMillis ??
+      (entityRegistrationFallbackStartMillis ??= now)
+    // If registration never starts, allow two intervals from the first missing
+    // entity before failing.
+    const timeoutMillis = registrationStarted
+      ? entityRegistrationTimeoutMillis
+      : entityRegistrationTimeoutMillis * 2
+    return Math.max(0, timeoutMillis - (now - timeoutStartMillis))
+  }
+  const entityNotRegistered = (entityType: string) =>
+    Effect.die(new Error(`Entity type '${entityType}' not registered`))
 
   const shardAssignments = MutableHashMap.empty<ShardId, RunnerAddress>()
   const selfShards = MutableHashSet.empty<ShardId>()
@@ -624,9 +643,6 @@ const make = Effect.gen(function*() {
 
   if (storageEnabled && initialRunnerAddress) {
     const selfAddress = initialRunnerAddress
-    const entityRegistrationTimeoutMillis = Duration.toMillis(
-      Duration.fromInputUnsafe(config.entityRegistrationTimeout)
-    )
 
     yield* Effect.gen(function*() {
       yield* Effect.logDebug("Starting")
@@ -637,12 +653,22 @@ const make = Effect.gen(function*() {
       let deliveredThisRead = false
       const removableNotifications = new Set<PendingNotification>()
       const resetAddresses = MutableHashSet.empty<EntityAddress>()
+      const resetRequestIds: Array<Snowflake.Snowflake> = []
       const cappedAddresses = MutableHashSet.empty<EntityAddress>()
 
       const markDelivered = Effect.sync(() => {
         deliveredThisRead = true
       })
 
+      // A completed request may remain deduplicated after storage claims its reset.
+      // Release the claim so the reset can be redelivered immediately.
+      const releaseCompletedClaim = (message: Message.Incoming<any>) => {
+        const state = entityManagers.get(message.envelope.address.entityType)
+        if (!state?.manager.isProcessingFor(message, { excludeCompleted: true })) {
+          resetRequestIds.push(message.envelope.requestId)
+        }
+      }
+
       const processMessages = Effect.whileLoop({
         while: () => index < messages.length,
         step: () => index++,
@@ -668,21 +694,13 @@ const make = Effect.gen(function*() {
           }
           const state = entityManagers.get(address.entityType)
           if (!state) {
-            const now = clock.currentTimeMillisUnsafe()
-            const registrationStarted = entityRegistrationStartMillis !== undefined
-            const timeoutStartMillis = entityRegistrationStartMillis ??
-              (entityRegistrationFallbackStartMillis ??= now)
-            // If registration never starts, allow two intervals from the first missing read before failing.
-            const timeoutMillis = registrationStarted
-              ? entityRegistrationTimeoutMillis
-              : entityRegistrationTimeoutMillis * 2
-            if (now - timeoutStartMillis < timeoutMillis) {
+            if (entityRegistrationTimeRemaining() > 0) {
               // reset address in the case that the entity is slow to register
               MutableHashSet.add(resetAddresses, address)
               return Effect.void
             }
             // if the entity did not register in time, we save a defect reply
-            return Effect.die(new Error(`Entity type '${address.entityType}' not registered`))
+            return entityNotRegistered(address.entityType)
           } else if (state.status === "closed") {
             return Effect.void
           }
@@ -696,6 +714,7 @@ const make = Effect.gen(function*() {
           } else if (isProcessing || state.status === "closing") {
             // If the request is already processing, we skip it.
             // Or if the entity is closing, we skip all incoming messages.
+            if (isProcessing) releaseCompletedClaim(message)
             return Effect.void
           } else if (message._tag === "IncomingRequest" && pendingNotifications.has(message.envelope.requestId)) {
             const entry = pendingNotifications.get(message.envelope.requestId)!
@@ -738,6 +757,11 @@ const make = Effect.gen(function*() {
               defect: Cause.squash(cause)
             }))
           }
+          if (error.success._tag === "AlreadyProcessingMessage") {
+            // Completion raced with decoding.
+            releaseCompletedClaim(message)
+            return Effect.void
+          }
           if (error.success._tag === "MailboxFull") {
             const address = message.envelope.address
             const state = entityManagers.get(address.entityType)
@@ -850,6 +874,11 @@ const make = Effect.gen(function*() {
         // let the resuming entities check if they are done
         yield* storageReadLock.release(1)
 
+        if (resetRequestIds.length > 0) {
+          yield* Effect.ignore(storage.resetRequests(resetRequestIds))
+          resetRequestIds.length = 0
+        }
+
         if (cappedAddressesToReset !== undefined) {
           yield* Effect.ignore(storage.resetAddresses(cappedAddressesToReset))
         }
@@ -1613,6 +1642,7 @@ const make = Effect.gen(function*() {
       const runnerAddress = getRunnerAddress()
       if (!runnerAddress || entityManagers.has(entity.type)) return
       const scope = yield* Effect.scope
+      const registrationContext = yield* Effect.context<never>()
       yield* Scope.addFinalizer(
         scope,
         Effect.sync(() => {
@@ -1627,6 +1657,10 @@ const make = Effect.gen(function*() {
         sharding
       }).pipe(
         Effect.provideContext(services.pipe(
+          // Registration overrides construction fallbacks, except for runner-owned services.
+          Context.merge(registrationContext),
+          Context.add(ShardingConfig, config),
+          Context.add(Clock, clock),
           Context.add(EntityReaper, reaper),
           Context.add(Scope.Scope, scope),
           Context.add(Snowflake.Generator, snowflakeGen)
@@ -1663,13 +1697,23 @@ const make = Effect.gen(function*() {
     }
   )
 
+  // Sleeps until the registration deadline shared with the storage read loop,
+  // re-checking once in case registration started and moved the deadline.
+  const awaitRegistrationDeadline = (entityType: string): Effect.Effect<never> =>
+    Effect.suspend(() => {
+      const remaining = entityRegistrationTimeRemaining()
+      return remaining > 0
+        ? Effect.flatMap(Effect.sleep(remaining), () => awaitRegistrationDeadline(entityType))
+        : entityNotRegistered(entityType)
+    })
+
   const waitForEntityManager = (entityType: string) => {
     let latch = entityManagerLatches.get(entityType)
     if (!latch) {
       latch = Latch.makeUnsafe()
       entityManagerLatches.set(entityType, latch)
     }
-    return latch.await
+    return Effect.raceFirst(latch.await, awaitRegistrationDeadline(entityType))
   }
 
   // --- Runner health checks ---
diff --git a/repos/effect/packages/effect/src/unstable/cluster/SocketRunner.ts b/repos/effect/packages/effect/src/unstable/cluster/SocketRunner.ts
index 5ffcc1e75..968fd0f95 100644
--- a/repos/effect/packages/effect/src/unstable/cluster/SocketRunner.ts
+++ b/repos/effect/packages/effect/src/unstable/cluster/SocketRunner.ts
@@ -11,6 +11,7 @@
  */
 import * as Effect from "../../Effect.ts"
 import * as Layer from "../../Layer.ts"
+import * as NetAddress from "../net/NetAddress.ts"
 import type * as RpcSerialization from "../rpc/RpcSerialization.ts"
 import * as RpcServer from "../rpc/RpcServer.ts"
 import { SocketServer } from "../socket/SocketServer.ts"
@@ -25,9 +26,9 @@ import type { ShardingConfig } from "./ShardingConfig.ts"
 const withLogAddress = <A, E, R>(layer: Layer.Layer<A, E, R>): Layer.Layer<A, E, R | SocketServer> =>
   Layer.effectDiscard(Effect.gen(function*() {
     const server = yield* SocketServer
-    const address = server.address._tag === "UnixAddress"
+    const address = server.address._tag === "UnixPathAddress"
       ? server.address.path
-      : `${server.address.hostname}:${server.address.port}`
+      : NetAddress.formatInet(server.address)
     yield* Effect.annotateLogs(Effect.logInfo(`Listening on: ${address}`), {
       package: "@effect/cluster",
       service: "Runner"
@@ -46,8 +47,8 @@ const withLogAddress = <A, E, R>(layer: Layer.Layer<A, E, R>): Layer.Layer<A, E,
  *
  * **Details**
  *
- * It logs the bound `SocketServer.address` when the layer starts, formatting TCP
- * addresses as `hostname:port` and Unix socket addresses as their filesystem
+ * It logs the bound `SocketServer.address` when the layer starts, formatting internet
+ * addresses as numeric socket addresses and Unix socket addresses as their filesystem
  * path.
  *
  * **Gotchas**
diff --git a/repos/effect/packages/effect/src/unstable/cluster/SqlMessageStorage.ts b/repos/effect/packages/effect/src/unstable/cluster/SqlMessageStorage.ts
index 90316c2ca..4cc2bbc98 100644
--- a/repos/effect/packages/effect/src/unstable/cluster/SqlMessageStorage.ts
+++ b/repos/effect/packages/effect/src/unstable/cluster/SqlMessageStorage.ts
@@ -666,7 +666,7 @@ export const makeEncoded: (options?: {
     unprocessedMessagesById(ids, now) {
       const idArr = Array.from(ids, (id) => String(id))
       return sql<MessageRow & ReplyJoinRow>`
-        SELECT m.*, r.id as reply_id, r.kind as reply_kind, r.payload as reply_payload, r.sequence as reply_sequence
+        SELECT m.*, r.id as reply_reply_id, r.kind as reply_kind, r.payload as reply_payload, r.sequence as reply_sequence
         FROM ${messagesTableSql} m
         LEFT JOIN ${repliesTableSql} r ON r.id = m.last_reply_id
         WHERE m.id IN (${sql.literal(idArr.join(","))})
@@ -686,6 +686,20 @@ export const makeEncoded: (options?: {
       )
     },
 
+    resetRequests: (requestIds) =>
+      requestIds.length === 0
+        ? Effect.void
+        : sql`
+        UPDATE ${messagesTableSql}
+        SET last_read = NULL
+        WHERE processed = ${sqlFalse}
+        AND ${sql.in("id", requestIds.map(String))}
+        `.pipe(
+          Effect.asVoid,
+          PersistenceError.refail,
+          withTracerDisabled
+        ),
+
     resetAddresses: (addresses) =>
       addresses.length === 0
         ? Effect.void
diff --git a/repos/effect/packages/effect/src/unstable/cluster/SqlRunnerStorage.ts b/repos/effect/packages/effect/src/unstable/cluster/SqlRunnerStorage.ts
index b32477d67..9fdd3caa2 100644
--- a/repos/effect/packages/effect/src/unstable/cluster/SqlRunnerStorage.ts
+++ b/repos/effect/packages/effect/src/unstable/cluster/SqlRunnerStorage.ts
@@ -427,7 +427,7 @@ export const make = Effect.fnUntraced(function*(options: {
         )
         for (let i = 0; i < takenLocks.length; i++) {
           const lockNum = takenLocks[i][0] as number
-          const shardId = lockNumbersReverse.get(lockNum)
+          const shardId = toAcquire.get(lockNum)
           if (shardId === undefined) continue
           acquiredShardIds.push(shardId)
           toAcquire.delete(lockNum)
@@ -530,7 +530,6 @@ export const make = Effect.fnUntraced(function*(options: {
   })
 
   const lockNumbers = new Map<string, number>()
-  const lockNumbersReverse = new Map<number, string>()
   for (let i = 0; i < availableShardGroups.length; i++) {
     const group = availableShardGroups[i]
     const base = (i + 1) * 1000000
@@ -538,7 +537,6 @@ export const make = Effect.fnUntraced(function*(options: {
       const shardId = ShardId.make(group, shard).toString()
       const lockNum = base + shard
       lockNumbers.set(shardId, lockNum)
-      lockNumbersReverse.set(lockNum, shardId)
     }
   }
 
diff --git a/repos/effect/packages/effect/src/unstable/cluster/internal/entityActivation.ts b/repos/effect/packages/effect/src/unstable/cluster/internal/entityActivation.ts
new file mode 100644
index 000000000..897881468
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/cluster/internal/entityActivation.ts
@@ -0,0 +1,7 @@
+import * as Context from "../../../Context.ts"
+import type * as Scope from "../../../Scope.ts"
+
+/** The entity lifetime, shared by all handler rebuilds within an activation. @internal */
+export class CurrentActivationScope extends Context.Service<CurrentActivationScope, Scope.Scope>()(
+  "effect/cluster/internal/CurrentActivationScope"
+) {}
diff --git a/repos/effect/packages/effect/src/unstable/cluster/internal/entityManager.ts b/repos/effect/packages/effect/src/unstable/cluster/internal/entityManager.ts
index 75c9b49db..3b752a412 100644
--- a/repos/effect/packages/effect/src/unstable/cluster/internal/entityManager.ts
+++ b/repos/effect/packages/effect/src/unstable/cluster/internal/entityManager.ts
@@ -9,6 +9,7 @@ import * as Equal from "../../../Equal.ts"
 import * as Exit from "../../../Exit.ts"
 import * as Fiber from "../../../Fiber.ts"
 import { identity } from "../../../Function.ts"
+import { scopeAddFinalizerUnsafe, scopeRemoveFinalizerUnsafe } from "../../../internal/effect.ts"
 import * as Latch from "../../../Latch.ts"
 import * as Metric from "../../../Metric.ts"
 import * as Option from "../../../Option.ts"
@@ -36,6 +37,7 @@ import type { ShardId } from "../ShardId.ts"
 import type { Sharding } from "../Sharding.ts"
 import { ShardingConfig } from "../ShardingConfig.ts"
 import * as Snowflake from "../Snowflake.ts"
+import { CurrentActivationScope } from "./entityActivation.ts"
 import { EntityReaper } from "./entityReaper.ts"
 import { acquireEntity, releaseEntity } from "./interruptors.ts"
 import { ResourceMap } from "./resourceMap.ts"
@@ -53,6 +55,7 @@ export interface EntityManager {
 
   readonly isProcessingFor: (message: Message.Incoming<any>, options?: {
     readonly excludeReplies?: boolean
+    readonly excludeCompleted?: boolean
   }) => boolean
   readonly clearProcessed: () => void
 
@@ -88,8 +91,11 @@ export type EntityState = {
     readonly rpc: Rpc.AnyWithProps
     readonly message: Message.IncomingRequestLocal<any>
     sentReply: boolean
+    sentExit: boolean
     lastSentChunk: Option.Option<Reply.Chunk<Rpc.Any>>
     sequence: number
+    /** Set when the request should not outlive its caller. */
+    callerScope?: Scope.Scope | undefined
   }>
   lastActiveCheck: number
   write: RpcServer.RpcServer<any>["write"]
@@ -193,14 +199,15 @@ export const make = Effect.fnUntraced(function*<
     // swap the server without losing the active requests
     const writeRef = yield* ResourceRef.from(
       scope,
-      Effect.fnUntraced(function*(scope) {
+      Effect.fnUntraced(function*(handlerScope) {
         let isShuttingDown = false
 
         const handlerContext = context.pipe(
           Context.add(CurrentAddress, address),
           Context.add(CurrentRunnerAddress, options.runnerAddress),
           Context.add(KeepAliveLatch, keepAliveLatch),
-          Context.add(Scope.Scope, scope),
+          Context.add(CurrentActivationScope, scope),
+          Context.add(Scope.Scope, handlerScope),
           Context.add(CurrentLogAnnotations, {})
         )
 
@@ -228,6 +235,7 @@ export const make = Effect.fnUntraced(function*<
                 if (!request) return Effect.void
 
                 request.sentReply = true
+                request.sentExit = true
 
                 if (
                   isShuttingDown &&
@@ -248,6 +256,7 @@ export const make = Effect.fnUntraced(function*<
                   (isShuttingDown || isUninterruptibleForServer(request.message.annotations))
                 ) {
                   if (!isShuttingDown) {
+                    request.sentExit = false
                     return server.write(
                       0,
                       {
@@ -259,11 +268,9 @@ export const make = Effect.fnUntraced(function*<
                           lastSentChunk: request.lastSentChunk
                         } as any) as any
                       },
-                      Context.get(request.rpc.annotations, WithTransaction)
-                        ? { onRequest: options.storage.withTransaction }
-                        : undefined
+                      requestWriteOptions(request)
                     ).pipe(
-                      Effect.forkIn(scope)
+                      Effect.forkIn(handlerScope)
                     )
                   }
                   activeRequests.delete(Snowflake.Snowflake(response.requestId))
@@ -327,12 +334,12 @@ export const make = Effect.fnUntraced(function*<
             }
           }
         }).pipe(
-          Scope.provide(scope),
+          Scope.provide(handlerScope),
           Effect.setContext(Context.merge(handlerContext, handlers))
         )
 
         yield* Scope.addFinalizer(
-          scope,
+          handlerScope,
           Effect.sync(() => {
             isShuttingDown = true
           })
@@ -342,7 +349,8 @@ export const make = Effect.fnUntraced(function*<
           for (const id of defectRequestIds) {
             const request = activeRequests.get(id)
             if (!request) continue
-            const { lastSentChunk, message, rpc } = request
+            const { lastSentChunk, message } = request
+            request.sentExit = false
             yield* server.write(
               0,
               {
@@ -354,9 +362,7 @@ export const make = Effect.fnUntraced(function*<
                   lastSentChunk
                 } as any) as any
               },
-              Context.get(rpc.annotations, WithTransaction)
-                ? { onRequest: options.storage.withTransaction }
-                : undefined
+              requestWriteOptions(request)
             )
           }
           defectRequestIds.clear()
@@ -517,10 +523,19 @@ export const make = Effect.fnUntraced(function*<
                 return Effect.fail(new MailboxFull({ address: message.envelope.address }))
               }
 
+              const callerScope = message.callerScope !== undefined &&
+                  !Context.get(message.annotations, Persisted) &&
+                  Context.get(message.annotations, ClusterSchema.Uninterruptible) === false
+                ? message.callerScope
+                : undefined
+              if (callerScope?.state._tag === "Closed") {
+                return Effect.void
+              }
               entry = {
                 rpc,
                 message,
                 sentReply: false,
+                sentExit: false,
                 lastSentChunk: Option.filter(
                   message.lastSentReply,
                   (reply): reply is Reply.Chunk<Rpc.Any> => reply._tag === "Chunk"
@@ -528,9 +543,19 @@ export const make = Effect.fnUntraced(function*<
                 sequence: Option.match(message.lastSentReply, {
                   onNone: () => 0,
                   onSome: (reply) => reply._tag === "Chunk" ? reply.sequence + 1 : 0
-                })
+                }),
+                callerScope
               }
               server.activeRequests.set(message.envelope.requestId, entry)
+              if (callerScope !== undefined) {
+                // Register cleanup atomically with admission, including requests awaiting delivery.
+                scopeAddFinalizerUnsafe(callerScope, {}, () =>
+                  Effect.sync(() => {
+                    if (server.activeRequests.delete(message.envelope.requestId) && server.activeRequests.size === 0) {
+                      server.lastActiveCheck = clock.currentTimeMillisUnsafe()
+                    }
+                  }))
+              }
               return server.write(
                 0,
                 {
@@ -544,9 +569,7 @@ export const make = Effect.fnUntraced(function*<
                     )
                   })
                 },
-                Context.get(message.annotations, WithTransaction)
-                  ? { onRequest: options.storage.withTransaction }
-                  : undefined
+                requestWriteOptions(entry)
               )
             }
             case "IncomingEnvelope": {
@@ -579,6 +602,26 @@ export const make = Effect.fnUntraced(function*<
     )
   }
 
+  // Bind each handler fiber, including replays, before its body runs.
+  const bindToCaller = (callerScope: Scope.Scope) => <A, E, R>(effect: Effect.Effect<A, E, R>) =>
+    Effect.withFiber<A, E, R>((fiber) => {
+      if (callerScope.state._tag === "Closed") return Effect.interrupt
+      const key = {}
+      scopeAddFinalizerUnsafe(callerScope, key, () => Effect.sync(() => fiber.interruptUnsafe(fiber.id)))
+      return Effect.ensuring(effect, Effect.sync(() => scopeRemoveFinalizerUnsafe(callerScope, key)))
+    })
+
+  const requestWriteOptions = (
+    entry: { readonly message: Message.IncomingRequestLocal<any>; readonly callerScope?: Scope.Scope | undefined }
+  ): Parameters<EntityState["write"]>[2] => {
+    const onTransaction = Context.get(entry.message.annotations, WithTransaction)
+      ? options.storage.withTransaction
+      : undefined
+    const onCaller = entry.callerScope && bindToCaller(entry.callerScope)
+    if (!onCaller) return onTransaction && { onRequest: onTransaction }
+    return { onRequest: onTransaction ? (effect) => onCaller(onTransaction(effect)) : onCaller }
+  }
+
   const decodeMessage = makeMessageDecode(entityRpcs)
 
   const runFork = Effect.runForkWith(context)
@@ -608,7 +651,10 @@ export const make = Effect.fnUntraced(function*<
         return Effect.flatMap(Fiber.joinAll(fibers), loop)
       }),
     isProcessingFor(message, options) {
-      if (options?.excludeReplies !== true && processedRequestIds.has(message.envelope.requestId)) {
+      if (
+        options?.excludeReplies !== true && options?.excludeCompleted !== true &&
+        processedRequestIds.has(message.envelope.requestId)
+      ) {
         return true
       }
       const state = activeServers.get(message.envelope.address.entityId)
@@ -618,6 +664,8 @@ export const make = Effect.fnUntraced(function*<
         return false
       } else if (options?.excludeReplies && request.sentReply) {
         return false
+      } else if (options?.excludeCompleted && request.sentExit) {
+        return false
       }
       return true
     },
@@ -648,9 +696,7 @@ export const make = Effect.fnUntraced(function*<
           },
           onSuccess: (decoded) => {
             if (decoded._tag === "IncomingEnvelope") {
-              return sendLocal(
-                new Message.IncomingEnvelope(decoded)
-              )
+              return sendLocal(decoded)
             }
             const request = message as Message.IncomingRequest<any>
             const rpc = entityRpcs.get(decoded.envelope.tag)!
@@ -662,6 +708,7 @@ export const make = Effect.fnUntraced(function*<
                 ),
                 envelope: decoded.envelope,
                 lastSentReply: decoded.lastSentReply,
+                callerScope: request.callerScope,
                 respond: (reply) =>
                   request.respond(
                     new Reply.ReplyWithContext({
@@ -710,10 +757,7 @@ const makeMessageDecode = <Rpcs extends Rpc.Any>(entityRpcs: Map<string, Rpcs>)
       readonly _tag: "IncomingRequest"
       readonly envelope: Envelope.Request.Any
       readonly lastSentReply: Option.Option<Reply.Reply<Rpcs>>
-    } | {
-      readonly _tag: "IncomingEnvelope"
-      readonly envelope: Envelope.AckChunk | Envelope.Interrupt
-    },
+    } | Message.IncomingEnvelope,
     Schema.SchemaError,
     Rpc.ServicesServer<Rpcs>
   > => {
diff --git a/repos/effect/packages/effect/src/unstable/devtools/DevToolsClient.ts b/repos/effect/packages/effect/src/unstable/devtools/DevToolsClient.ts
index 84bf14adc..c351e8c19 100644
--- a/repos/effect/packages/effect/src/unstable/devtools/DevToolsClient.ts
+++ b/repos/effect/packages/effect/src/unstable/devtools/DevToolsClient.ts
@@ -177,6 +177,17 @@ export const make: Effect.Effect<
  */
 export const layer: Layer.Layer<DevToolsClient, never, Socket.Socket> = Layer.effect(DevToolsClient, make)
 
+const spanSnapshot = (span: Tracer.Span): DevToolsSchema.Span => ({
+  _tag: "Span",
+  spanId: span.spanId,
+  traceId: span.traceId,
+  name: span.name,
+  sampled: span.sampled,
+  attributes: new Map(span.attributes),
+  status: span.status,
+  parent: span.parent
+})
+
 const makeTracerEffect = Effect.gen(function*() {
   const client = yield* DevToolsClient
   const currentTracer = yield* Effect.tracer
@@ -184,8 +195,7 @@ const makeTracerEffect = Effect.gen(function*() {
   return Tracer.make({
     span(options) {
       const span = currentTracer.span(options)
-      // the span is mutated in place, so send a snapshot of its current state
-      client.sendUnsafe({ ...span })
+      client.sendUnsafe(spanSnapshot(span))
       const oldEvent = span.event
       span.event = function(this: Tracer.Span, name, startTime, attributes) {
         client.sendUnsafe({
@@ -202,7 +212,7 @@ const makeTracerEffect = Effect.gen(function*() {
       const oldEnd = span.end
       span.end = function(this: Tracer.Span, endTime, exit) {
         oldEnd.call(this, endTime, exit)
-        client.sendUnsafe({ ...span })
+        client.sendUnsafe(spanSnapshot(span))
       }
 
       return span
diff --git a/repos/effect/packages/effect/src/unstable/encoding/SchemaBinary.ts b/repos/effect/packages/effect/src/unstable/encoding/SchemaBinary.ts
index 421a82fc0..48d7a75f5 100644
--- a/repos/effect/packages/effect/src/unstable/encoding/SchemaBinary.ts
+++ b/repos/effect/packages/effect/src/unstable/encoding/SchemaBinary.ts
@@ -23,7 +23,7 @@ import { dual, memoize } from "../../Function.ts"
 import * as HashMap from "../../HashMap.ts"
 import * as HashSet from "../../HashSet.ts"
 import { assignProperty } from "../../internal/record.ts"
-import * as InternalParser from "../../internal/schema/parser.ts"
+import * as InternalParserProtocol from "../../internal/schema/parser.ts"
 import * as Option from "../../Option.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Pull from "../../Pull.ts"
@@ -921,7 +921,7 @@ const BIGINT_U32_MASK = BigInt(0xFFFFFFFF)
 const BIGINT_THIRTY_TWO = BigInt(32)
 
 const utf8Encode = new TextEncoder()
-const utf8DecodeFatal = new TextDecoder("utf-8", { fatal: true })
+const utf8DecodeFatal = new TextDecoder("utf-8", { fatal: true, ignoreBOM: true })
 
 // General numbers use up to seven varint bytes, a varint mantissa with a
 // decimal scale byte, or an eight-byte f64.
@@ -2112,8 +2112,7 @@ function resolveSuspend(ast: SchemaAST.AST): SchemaAST.AST {
 
 function enumsToLiterals(ast: SchemaAST.Enum): SchemaAST.Union<SchemaAST.Literal> {
   return new SchemaAST.Union(
-    ast.enums.map((e) => new SchemaAST.Literal(e[1], { title: e[0] })),
-    "anyOf"
+    ast.enums.map((e) => new SchemaAST.Literal(e[1], { title: e[0] }))
   )
 }
 
@@ -2625,8 +2624,7 @@ function isExact(root: SchemaAST.AST): boolean {
   const exact = (ast: SchemaAST.AST): boolean => {
     if (
       ast.encoding !== undefined || ast.checks !== undefined ||
-      (ast as { readonly encodingChecks?: SchemaAST.Checks }).encodingChecks !== undefined ||
-      ast.annotations?.parseOptions !== undefined
+      (ast as { readonly encodingChecks?: SchemaAST.Checks }).encodingChecks !== undefined
     ) {
       return false
     }
@@ -2660,7 +2658,7 @@ function isExact(root: SchemaAST.AST): boolean {
             signature.parameter._tag === "String" && exact(signature.parameter) && exact(signature.type)
           )
       case "Union":
-        return ast.mode === "anyOf" && ast.types.every(exact)
+        return (ast.options?.mode ?? "anyOf") === "anyOf" && ast.types.every(exact)
       // The layout compiles straight through a suspend, so the binary layer
       // validates whatever the thunk returns. Only decoding gets to act on
       // this: encoding a recursive schema still needs the cycle walk, which is
@@ -2693,7 +2691,6 @@ function isExitWithExactSuccess(root: SchemaAST.AST): boolean {
   return root._tag === "Declaration" &&
     root.encoding === undefined && root.checks === undefined &&
     (root as { readonly encodingChecks?: SchemaAST.Checks }).encodingChecks === undefined &&
-    root.annotations?.parseOptions === undefined &&
     representationId(root) === "effect/schema/Exit" &&
     isExact(root.typeParameters[0])
 }
@@ -5080,7 +5077,7 @@ function makeTransformation(
   trusted: Trusted | undefined,
   successOnly = false
 ): SchemaTransformation.Transformation<unknown, Uint8Array<ArrayBuffer>> {
-  return SchemaTransformation.transformOrFail({
+  return SchemaTransformation.transformEffect({
     decode: (bytes: Uint8Array<ArrayBuffer>, options) => {
       try {
         const value = decodeOneShot(layout, bytes, options, mode)
@@ -5159,9 +5156,9 @@ function bypassPass(
   // says without allocating one per call.
   const run = (
     accept: (input: unknown, options: SchemaAST.ParseOptions) => boolean
-  ): SchemaAST.DeclarationRun =>
+  ): SchemaAST.Declaration["run"] =>
   () =>
-  (input, _ast, options) => accept(input, options) ? InternalParser.sameExit : parse(input, options)
+  (input, _ast, options) => accept(input, options) ? InternalParserProtocol.sameExit : parse(input, options)
   return Schema.make(
     new SchemaAST.Declaration(
       [type.ast],
diff --git a/repos/effect/packages/effect/src/unstable/encoding/Sse.ts b/repos/effect/packages/effect/src/unstable/encoding/Sse.ts
index 6c0c0fde0..239423654 100644
--- a/repos/effect/packages/effect/src/unstable/encoding/Sse.ts
+++ b/repos/effect/packages/effect/src/unstable/encoding/Sse.ts
@@ -20,6 +20,7 @@ import { hasProperty } from "../../Predicate.ts"
 import * as Pull from "../../Pull.ts"
 import * as Result from "../../Result.ts"
 import * as Schema from "../../Schema.ts"
+import type * as SchemaAST from "../../SchemaAST.ts"
 import * as SchemaTransformation from "../../SchemaTransformation.ts"
 
 const SseErrorTypeId = "~effect/encoding/Sse/SseError"
@@ -166,8 +167,12 @@ export interface EventCodec extends
  *
  * **Details**
  *
- * The schema receives the untagged event shape containing `id`, `event`, and
- * string `data`.
+ * The schema receives `{ event, data, id? }`, with string `data`. Absent IDs are
+ * omitted, even with default options: use `Schema.optional(Schema.String)`, not
+ * `Schema.UndefinedOr(Schema.String)`, to accept events without an ID.
+ *
+ * With `onExcessProperty: "error"`, declare `event` (default: `"message"`) and
+ * `id` if the stream carries IDs, including inherited IDs.
  *
  * @category decoding
  * @since 4.0.0
@@ -178,7 +183,8 @@ export const decodeSchema = <
   Done
 >(
   schema: S,
-  options?: DecodeOptions
+  options?: DecodeOptions,
+  parseOptions?: SchemaAST.ParseOptions
 ): Channel.Channel<
   NonEmptyReadonlyArray<S["Type"]>,
   IE | Retry | SseError | Schema.SchemaError,
@@ -190,9 +196,12 @@ export const decodeSchema = <
 > =>
   Channel.pipeTo(
     decode<IE, Done>(options),
-    ChannelSchema.decode(EventEncoded.pipe(
-      Schema.decodeTo(schema)
-    ))()
+    ChannelSchema.decode(
+      Event.pipe(
+        Schema.decodeTo(schema, transformEvent)
+      ),
+      parseOptions
+    )()
   )
 
 /**
@@ -311,7 +320,7 @@ export function makeParser(onParse: (event: AnyEvent) => void, options?: DecodeO
       let fieldLength = startingFieldLength
       let character: string
 
-      for (let index = startingPosition; lineLength < 0 && index < length; ++index) {
+      for (let index = position + startingPosition; lineLength < 0 && index < length; ++index) {
         character = buffer[index]
         if (character === ":" && fieldLength < 0) {
           fieldLength = index - position
@@ -561,7 +570,10 @@ export const transformEvent = SchemaTransformation.transform<{
   readonly event: string
   readonly data: string
 }>({
-  decode: (event) => event,
+  decode: (event) =>
+    event.id === undefined
+      ? { event: event.event, data: event.data }
+      : { id: event.id, event: event.event, data: event.data },
   encode: (event) => ({
     _tag: "Event",
     id: event.id,
diff --git a/repos/effect/packages/effect/src/unstable/encoding/Toml.ts b/repos/effect/packages/effect/src/unstable/encoding/Toml.ts
index c408e0ffb..04395e2e2 100644
--- a/repos/effect/packages/effect/src/unstable/encoding/Toml.ts
+++ b/repos/effect/packages/effect/src/unstable/encoding/Toml.ts
@@ -45,7 +45,7 @@ class TomlParser {
   private index = 0
   private line = 1
   private column = 1
-  private readonly explicitTables = new Set<string>()
+  private readonly explicitTables = new Set<Table>()
 
   constructor(input: string) {
     this.input = input
@@ -85,14 +85,14 @@ class TomlParser {
     }
     this.finishStatement()
 
-    const pathKey = JSON.stringify(path)
-    if (!array && this.explicitTables.has(pathKey)) {
+    const table = this.resolveTable(path, array)
+    if (!array && this.explicitTables.has(table)) {
       this.fail(`Cannot redefine table '${path.join(".")}'`)
     }
     if (!array) {
-      this.explicitTables.add(pathKey)
+      this.explicitTables.add(table)
     }
-    this.current = this.resolveTable(path, array)
+    this.current = table
   }
 
   private resolveTable(path: ReadonlyArray<string>, array: boolean): Table {
diff --git a/repos/effect/packages/effect/src/unstable/encoding/Yaml.ts b/repos/effect/packages/effect/src/unstable/encoding/Yaml.ts
index 52c2136a0..4a0d1a421 100644
--- a/repos/effect/packages/effect/src/unstable/encoding/Yaml.ts
+++ b/repos/effect/packages/effect/src/unstable/encoding/Yaml.ts
@@ -1,8 +1,12 @@
 /**
  * Parses YAML configuration files.
  *
- * This is a focused YAML 1.2 configuration parser. It supports block and flow
- * collections, quoted and block scalars, anchors, and aliases.
+ * Supports YAML 1.2 block and flow collections, indentless sequence values,
+ * multiline plain and quoted scalars, block scalars, anchors, and aliases.
+ *
+ * Unsupported: compact nested block sequences (`- - value` on one line),
+ * multiline flow collections, explicit complex keys, tag/directive processing,
+ * recursive aliases, and document streams. Mapping keys are JavaScript strings.
  *
  * @since 4.0.0
  */
@@ -45,60 +49,72 @@ const setProperty = (record: YamlRecord, key: string, value: unknown): void => {
   })
 }
 
-const stripComment = (input: string): string => {
-  let quote: "'" | "\"" | undefined
-  let escaped = false
-  for (let index = 0; index < input.length; index++) {
+const closingQuote = (input: string, quote: string, start: number): number => {
+  for (let index = start; index < input.length; index++) {
     const character = input[index]
-    if (quote === "\"") {
-      if (escaped) {
-        escaped = false
-      } else if (character === "\\") {
-        escaped = true
-      } else if (character === quote) {
-        quote = undefined
-      }
-    } else if (quote === "'") {
-      if (character === quote && input[index + 1] === quote) {
-        index++
-      } else if (character === quote) {
-        quote = undefined
-      }
-    } else if (character === "'" || character === "\"") {
-      quote = character
-    } else if (character === "#" && (index === 0 || /\s/.test(input[index - 1]))) {
-      return input.slice(0, index).trimEnd()
+    if (quote === "\"" && character === "\\") {
+      index++
+    } else if (character === quote) {
+      if (quote === "'" && input[index + 1] === quote) index++
+      else return index
     }
   }
-  return input.trimEnd()
+  return -1
 }
 
-const mappingSeparator = (input: string): number => {
-  let quote: "'" | "\"" | undefined
-  let escaped = false
+const findIndicator = (input: string, indicator: ":" | "#"): number => {
   let depth = 0
+  let tokenStart = true
   for (let index = 0; index < input.length; index++) {
     const character = input[index]
-    if (quote === "\"") {
-      if (escaped) escaped = false
-      else if (character === "\\") escaped = true
-      else if (character === quote) quote = undefined
-    } else if (quote === "'") {
-      if (character === quote && input[index + 1] === quote) index++
-      else if (character === quote) quote = undefined
-    } else if (character === "'" || character === "\"") {
-      quote = character
-    } else if (character === "[" || character === "{") {
+    if (tokenStart && (character === "'" || character === "\"")) {
+      index = closingQuote(input, character, index + 1)
+      if (index === -1) return -1
+      tokenStart = false
+    } else if (tokenStart && character === "&") {
+      while (index + 1 < input.length && !/[\s,[\]{}]/.test(input[index + 1])) index++
+    } else if (character === "#" && (index === 0 || /\s/.test(input[index - 1]))) {
+      return indicator === "#" ? index : -1
+    } else if (tokenStart && (character === "[" || character === "{")) {
       depth++
-    } else if (character === "]" || character === "}") {
+    } else if (depth > 0 && (character === "]" || character === "}")) {
       depth--
-    } else if (character === ":" && depth === 0 && (input[index + 1] === undefined || /\s/.test(input[index + 1]))) {
-      return index
+      tokenStart = false
+    } else if (depth > 0 && character === ",") {
+      tokenStart = true
+    } else if (character === ":" && (depth > 0 || input[index + 1] === undefined || /\s/.test(input[index + 1]))) {
+      if (depth === 0 && indicator === ":") return index
+      tokenStart = true
+    } else if (tokenStart && character === "-" && /\s/.test(input[index + 1] ?? "")) {
+      continue
+    } else if (!/\s/.test(character)) {
+      tokenStart = false
     }
   }
   return -1
 }
 
+const stripComment = (input: string): string => {
+  const index = findIndicator(input, "#")
+  return index === -1 ? input : input.slice(0, index).trimEnd()
+}
+
+const mappingSeparator = (input: string): number => findIndicator(input, ":")
+
+const isSequenceEntry = (text: string): boolean => text === "-" || text.startsWith("- ")
+
+const foldLineBreak = (blankLines: number): string => blankLines === 0 ? " " : "\n".repeat(blankLines)
+
+const endsWithEscape = (text: string): boolean => /\\*$/.exec(text)![0].length % 2 === 1
+
+// Escaped trailing spaces are content, not folding whitespace.
+const trimFoldedEnd = (line: string, quote: string): string => {
+  const trailing = /[ \t]+$/.exec(line)
+  if (trailing === null) return line
+  const escaped = quote === "\"" && endsWithEscape(line.slice(0, trailing.index))
+  return line.slice(0, trailing.index + (escaped ? 1 : 0))
+}
+
 const parseDoubleQuoted = (input: string): string => {
   if (!input.endsWith("\"") || input.length < 2) {
     throw new SyntaxError("Unterminated double-quoted YAML string")
@@ -283,16 +299,11 @@ class FlowParser {
   }
 
   private readQuoted(quote: string): string {
-    const start = this.index++
-    let escaped = false
-    while (this.index < this.input.length) {
-      const character = this.input[this.index++]
-      if (quote === "\"" && escaped) escaped = false
-      else if (quote === "\"" && character === "\\") escaped = true
-      else if (quote === "'" && character === quote && this.input[this.index] === quote) this.index++
-      else if (character === quote) return this.input.slice(start, this.index)
-    }
-    this.fail("Unterminated quoted scalar")
+    const start = this.index
+    const end = closingQuote(this.input, quote, start + 1)
+    if (end === -1) this.fail("Unterminated quoted scalar")
+    this.index = end + 1
+    return this.input.slice(start, this.index)
   }
 
   private readUntil(stop: RegExp): string {
@@ -322,6 +333,7 @@ class FlowParser {
 class YamlParser {
   private readonly lines: ReadonlyArray<Line>
   private index = 0
+  private documentStarted = false
   private readonly anchors = new Map<string, unknown>()
 
   constructor(lines: ReadonlyArray<Line>) {
@@ -331,6 +343,7 @@ class YamlParser {
   parse(): unknown {
     this.skipIgnored()
     if (this.index >= this.lines.length) return null
+    this.documentStarted = true
     const value = this.parseNode(this.lines[this.index].indent)
     this.skipIgnored()
     if (this.index < this.lines.length) {
@@ -339,19 +352,18 @@ class YamlParser {
     return value
   }
 
-  private parseNode(indent: number): unknown {
+  private parseNode(indent: number, parentIndent = indent - 1): unknown {
     this.skipIgnored()
     const line = this.lines[this.index]
     if (line === undefined) return null
     if (line.indent !== indent) this.fail(line, `Expected indentation of ${indent} spaces`)
-    if (line.text === "-" || line.text.startsWith("- ")) return this.parseSequence(indent)
+    if (isSequenceEntry(line.text)) return this.parseSequence(indent)
     if (mappingSeparator(line.text) !== -1) return this.parseMapping(indent)
     this.index++
-    return this.parseInlineValue(line.text)
+    return this.parseNodeValue(line.text, parentIndent)
   }
 
-  private parseMapping(indent: number): YamlRecord {
-    const output: YamlRecord = {}
+  private parseMapping(indent: number, output: YamlRecord = {}): YamlRecord {
     while (true) {
       this.skipIgnored()
       const line = this.lines[this.index]
@@ -372,8 +384,8 @@ class YamlParser {
     line: Line
   ): void {
     const key = parseKey(text.slice(0, separator).trim())
-    const rawValue = text.slice(separator + 1).trim()
-    const value = this.parseNodeValue(rawValue, indent)
+    const rawValue = text.slice(separator + 1).trimStart()
+    const value = this.parseNodeValue(rawValue, indent, true)
     if (hasOwn.call(output, key)) this.fail(line, `Duplicate key '${key}'`)
     setProperty(output, key, value)
   }
@@ -385,66 +397,100 @@ class YamlParser {
       const line = this.lines[this.index]
       if (line === undefined || line.indent < indent) return output
       if (line.indent > indent) this.fail(line, `Unexpected indentation of ${line.indent} spaces`)
-      if (line.text !== "-" && !line.text.startsWith("- ")) return output
+      if (!isSequenceEntry(line.text)) return output
       this.index++
       const item = line.text.slice(1).trimStart()
+      if (isSequenceEntry(item)) this.fail(line, "Compact nested block sequences are not supported")
       const separator = mappingSeparator(item)
       if (separator === -1) {
         output.push(this.parseNodeValue(item, indent))
-        continue
-      }
-
-      const mapping: YamlRecord = {}
-      this.parseMappingEntry(mapping, item, separator, indent + 2, line)
-      while (true) {
-        this.skipIgnored()
-        const continuation = this.lines[this.index]
-        if (continuation === undefined || continuation.indent <= indent) break
-        if (continuation.indent !== indent + 2) {
-          this.fail(continuation, `Expected indentation of ${indent + 2} spaces`)
-        }
-        const nextSeparator = mappingSeparator(continuation.text)
-        if (nextSeparator === -1) this.fail(continuation, "Expected a mapping entry")
-        this.index++
-        this.parseMappingEntry(mapping, continuation.text, nextSeparator, indent + 2, continuation)
+      } else {
+        const mapping: YamlRecord = {}
+        this.parseMappingEntry(mapping, item, separator, indent + 2, line)
+        output.push(this.parseMapping(indent + 2, mapping))
       }
-      output.push(mapping)
     }
   }
 
-  private parseNodeValue(rawValue: string, parentIndent: number): unknown {
-    let value = rawValue
-    let anchor: string | undefined
-    const anchorMatch = /^&([^\s,[\]{}]+)(?:\s+(.*))?$/.exec(value)
-    if (anchorMatch !== null) {
-      anchor = anchorMatch[1]
-      value = anchorMatch[2] ?? ""
-    }
+  private parseNodeValue(rawValue: string, parentIndent: number, allowIndentless = false): unknown {
+    const anchor = /^&([^\s,[\]{}]+)(?:\s+(.*))?$/.exec(rawValue)
+    if (anchor === null) return this.parseValue(rawValue, parentIndent, allowIndentless)
+    const value = this.parseValue(anchor[2] ?? "", parentIndent, allowIndentless)
+    this.anchors.set(anchor[1], value)
+    return value
+  }
 
-    let parsed: unknown
-    if (value.length === 0) {
+  private parseValue(value: string, parentIndent: number, allowIndentless: boolean): unknown {
+    const text = value.trimEnd()
+    if (text.length === 0) {
       this.skipIgnored()
       const next = this.lines[this.index]
-      parsed = next !== undefined && next.indent > parentIndent ? this.parseNode(next.indent) : null
-    } else if (/^[|>](?:[1-9]?[+-]?|[+-]?[1-9]?)$/.test(value)) {
-      parsed = this.parseBlockScalar(value, parentIndent)
-    } else {
-      parsed = this.parseInlineValue(value)
+      if (next === undefined) return null
+      if (next.indent > parentIndent) return this.parseNode(next.indent, parentIndent)
+      if (allowIndentless && next.indent === parentIndent && isSequenceEntry(next.text)) {
+        return this.parseSequence(parentIndent)
+      }
+      return null
     }
-    if (anchor !== undefined) this.anchors.set(anchor, parsed)
-    return parsed
-  }
-
-  private parseInlineValue(value: string): unknown {
-    if (value.startsWith("*")) {
-      const name = value.slice(1).trim()
+    if (/^[|>](?:[1-9]?[+-]?|[+-]?[1-9]?)$/.test(text)) return this.parseBlockScalar(text, parentIndent)
+    // Keep escaped trailing whitespace in quoted values.
+    if (value.startsWith("\"") || value.startsWith("'")) return this.parseQuotedValue(value, parentIndent)
+    if (text.startsWith("*")) {
+      const name = text.slice(1).trim()
       if (!this.anchors.has(name)) throw new SyntaxError(`Unknown YAML alias '*${name}'`)
       return this.anchors.get(name)
     }
-    if (value.startsWith("[") || value.startsWith("{")) {
-      return new FlowParser(value, this.anchors).parse()
+    if (text.startsWith("[") || text.startsWith("{")) return new FlowParser(text, this.anchors).parse()
+    return this.parsePlainValue(text, parentIndent)
+  }
+
+  private parsePlainValue(value: string, parentIndent: number): unknown {
+    const first = this.lines[this.index - 1]
+    if (/:(?:\s|$)/.test(value)) this.fail(first, "Invalid colon in plain scalar")
+    let output = value
+    let terminated = findIndicator(first.raw, "#") !== -1
+    while (!terminated) {
+      const blankLines = this.skipBlankLines()
+      const next = this.lines[this.index]
+      if (next === undefined || next.indent <= parentIndent) break
+      // Quotes in plain continuations are literal.
+      const content = next.raw.slice(next.indent)
+      const comment = content.search(/(?:^|[ \t])#/)
+      const text = (comment === -1 ? content : content.slice(0, comment)).trimEnd()
+      if (text.length === 0 || (next.indent === 0 && /^(?:---|\.\.\.)(?:\s|$)/.test(text))) break
+      if (/:(?:\s|$)/.test(text)) this.fail(next, "Invalid colon in plain scalar")
+      output += foldLineBreak(blankLines) + text
+      this.index++
+      terminated = comment !== -1
+    }
+    return parseScalar(output)
+  }
+
+  private parseQuotedValue(value: string, parentIndent: number): unknown {
+    const quote = value[0]
+    let output = quote
+    let line = value.slice(1)
+    while (true) {
+      const end = closingQuote(line, quote, 0)
+      if (end !== -1) {
+        const rest = line.slice(end + 1)
+        if (rest.trim().length > 0 && !/^[ \t]+#/.test(rest)) {
+          throw new SyntaxError("Unexpected content after quoted YAML scalar")
+        }
+        return parseScalar(output + line.slice(0, end + 1))
+      }
+      if (quote === "\"" && endsWithEscape(line)) {
+        output += line.slice(0, -1)
+      } else {
+        output += trimFoldedEnd(line, quote) + foldLineBreak(this.skipBlankLines())
+      }
+      const next = this.lines[this.index++]
+      if (next === undefined) throw new SyntaxError("Unterminated quoted YAML scalar")
+      if (next.raw.trim().length > 0 && next.indent <= parentIndent) {
+        this.fail(next, "Invalid quoted scalar indentation")
+      }
+      line = next.raw.trimStart()
     }
-    return parseScalar(value)
   }
 
   private parseBlockScalar(indicator: string, parentIndent: number): string {
@@ -480,26 +526,48 @@ class YamlParser {
     if (style === "|") {
       output = content.join("\n")
     } else {
-      for (let index = 0; index < content.length; index++) {
-        output += content[index]
-        if (index < content.length - 1) {
-          output += content[index].length === 0 || content[index + 1].length === 0 ? "\n" : " "
+      let blankLines = 0
+      let previousMoreIndented: boolean | undefined
+      for (const line of content) {
+        if (line.length === 0) {
+          blankLines++
+        } else {
+          const moreIndented = line.startsWith(" ")
+          const hardBreak = moreIndented || previousMoreIndented === true
+          if (previousMoreIndented === undefined) output += "\n".repeat(blankLines)
+          else if (blankLines === 0) output += hardBreak ? "\n" : " "
+          else output += "\n".repeat(blankLines + (hardBreak ? 1 : 0))
+          output += line
+          blankLines = 0
+          previousMoreIndented = moreIndented
         }
       }
+      output += "\n".repeat(blankLines)
     }
-    if (chomp === "keep") return `${output}\n`
+    if (chomp === "keep") return output.endsWith("\n") ? output : `${output}\n`
     output = output.replace(/\n+$/, "")
     return chomp === "strip" ? output : `${output}\n`
   }
 
+  private skipBlankLines(): number {
+    const start = this.index
+    while (this.index < this.lines.length && this.lines[this.index].raw.trim().length === 0) this.index++
+    return this.index - start
+  }
+
   private skipIgnored(): void {
     while (this.index < this.lines.length) {
       const line = this.lines[this.index]
-      if (line.text.length === 0 || line.text.startsWith("%") || line.text === "---") {
+      const text = line.text.trimEnd()
+      if (text.length === 0 || text.startsWith("%")) {
+        this.index++
+      } else if (line.indent === 0 && text === "---") {
+        if (this.documentStarted) this.fail(line, "Multiple YAML documents are not supported")
+        this.documentStarted = true
         this.index++
-      } else if (line.text === "...") {
+      } else if (line.indent === 0 && text === "...") {
         this.index++
-        while (this.index < this.lines.length && this.lines[this.index].text.length === 0) this.index++
+        while (this.index < this.lines.length && this.lines[this.index].text.trimEnd().length === 0) this.index++
         if (this.index < this.lines.length) {
           this.fail(this.lines[this.index], "Multiple YAML documents are not supported")
         }
diff --git a/repos/effect/packages/effect/src/unstable/eventlog/EventLog.ts b/repos/effect/packages/effect/src/unstable/eventlog/EventLog.ts
index 6a85344c1..3b887ff92 100644
--- a/repos/effect/packages/effect/src/unstable/eventlog/EventLog.ts
+++ b/repos/effect/packages/effect/src/unstable/eventlog/EventLog.ts
@@ -702,7 +702,7 @@ export const makeReplayFromRemote = (options: {
   readonly handlers: ReadonlyMap<string, Handlers.Item<any>>
   readonly storeId: StoreId
   readonly identity: Identity["Service"]
-  readonly reactivity: Reactivity["Service"]
+  readonly reactivity: Reactivity
   readonly reactivityKeys: Record<string, ReadonlyArray<string>>
   readonly logAnnotations: {
     readonly service: string
diff --git a/repos/effect/packages/effect/src/unstable/eventlog/EventLogMessage.ts b/repos/effect/packages/effect/src/unstable/eventlog/EventLogMessage.ts
index e35a2d533..08e738b51 100644
--- a/repos/effect/packages/effect/src/unstable/eventlog/EventLogMessage.ts
+++ b/repos/effect/packages/effect/src/unstable/eventlog/EventLogMessage.ts
@@ -10,6 +10,7 @@
  */
 import type { NonEmptyArray, NonEmptyReadonlyArray } from "../../Array.ts"
 import type { Brand } from "../../Brand.ts"
+import * as Predicate from "../../Predicate.ts"
 import * as Schema from "../../Schema.ts"
 import * as SchemaBinary from "../encoding/SchemaBinary.ts"
 import * as Rpc from "../rpc/Rpc.ts"
@@ -71,7 +72,16 @@ export class EventLogProtocolError extends Schema.TaggedError<EventLogProtocolEr
   storeId: Schema.optional(StoreId),
   code: Schema.Literals(["Unauthorized", "Forbidden", "NotFound", "InvalidRequest", "InternalServerError"]),
   message: Schema.String
-}) {}
+}) {
+  /**
+   * Returns `true` when the value is an `EventLogProtocolError`.
+   *
+   * @since 4.0.0
+   */
+  static is(u: unknown): u is EventLogProtocolError {
+    return Predicate.isTagged(u, "EventLogProtocolError")
+  }
+}
 
 /**
  * RPC middleware that authenticates event-log requests and provides the client
@@ -188,7 +198,7 @@ export class ChunkedMessage
    * @since 4.0.0
    */
   static split(id: number, data: Uint8Array): NonEmptyReadonlyArray<ChunkedMessage> {
-    const parts = Math.ceil(data.byteLength / ChunkedMessage.chunkSize)
+    const parts = Math.max(1, Math.ceil(data.byteLength / ChunkedMessage.chunkSize))
     const result: NonEmptyArray<ChunkedMessage> = new Array(parts) as any
     for (let i = 0; i < parts; i++) {
       const start = i * ChunkedMessage.chunkSize
diff --git a/repos/effect/packages/effect/src/unstable/eventlog/EventLogRemote.ts b/repos/effect/packages/effect/src/unstable/eventlog/EventLogRemote.ts
index dc76e650e..3c07d731d 100644
--- a/repos/effect/packages/effect/src/unstable/eventlog/EventLogRemote.ts
+++ b/repos/effect/packages/effect/src/unstable/eventlog/EventLogRemote.ts
@@ -30,7 +30,7 @@ import {
   Authenticate,
   ChangesRpc,
   ChunkedMessage,
-  type EventLogProtocolError,
+  EventLogProtocolError,
   EventLogRemoteRpcs,
   type HelloResponse,
   type StoreId,
@@ -83,7 +83,16 @@ export class EventLogRemote extends Context.Service<EventLogRemote, {
 export class EventLogRemoteError extends Data.TaggedError("EventLogRemoteError")<{
   readonly method: string
   readonly cause: unknown
-}> {}
+}> {
+  /**
+   * Returns `true` when the value is an `EventLogRemoteError`.
+   *
+   * @since 4.0.0
+   */
+  static is(u: unknown): u is EventLogRemoteError {
+    return Predicate.isTagged(u, "EventLogRemoteError")
+  }
+}
 
 const getIdentityRootSecretMaterial = makeGetIdentityRootSecretMaterial(globalThis.crypto)
 
@@ -206,8 +215,10 @@ export const makeWith = Effect.fnUntraced(function*({ encodeWrite, decodeChanges
     Effect.retry(effect, {
       while(e) {
         hello = null
-        const isForbidden = Predicate.isTagged(e, "EventLogProtocolError") &&
-          (e as any as EventLogProtocolError).code === "Forbidden"
+        const error = EventLogRemoteError.is(e) && e.method === "authenticate"
+          ? e.cause
+          : e
+        const isForbidden = EventLogProtocolError.is(error) && error.code === "Forbidden"
         return Cache.invalidate(authCache, options.identity.publicKey).pipe(
           Effect.as(isForbidden)
         )
diff --git a/repos/effect/packages/effect/src/unstable/eventlog/SqlEventJournal.ts b/repos/effect/packages/effect/src/unstable/eventlog/SqlEventJournal.ts
index c4b8ef11c..2daab429e 100644
--- a/repos/effect/packages/effect/src/unstable/eventlog/SqlEventJournal.ts
+++ b/repos/effect/packages/effect/src/unstable/eventlog/SqlEventJournal.ts
@@ -226,13 +226,16 @@ export const make = (options?: {
           }, { disableChecks: true })
           return yield* Effect.uninterruptibleMask((restore) =>
             restore(effect(entry)).pipe(
-              Effect.tap(insertEntry(toEntryRow(entry))),
+              Effect.tap(
+                insertEntry(toEntryRow(entry)).pipe(
+                  Effect.mapError((cause) => new EventJournal.EventJournalError({ cause, method: "write" }))
+                )
+              ),
               Effect.tap(PubSub.publish(pubsub, entry))
             )
           )
         },
-        withTracerDisabled,
-        Effect.mapError((cause) => new EventJournal.EventJournalError({ cause, method: "write" }))
+        withTracerDisabled
       ),
       writeFromRemote: (options) =>
         writeFromRemote(options).pipe(
@@ -251,13 +254,13 @@ export const make = (options?: {
             ORDER BY timestamp ASC
           `.pipe(
             Effect.flatMap(decodeEntryRows),
-            Effect.map(toEntries)
+            Effect.map(toEntries),
+            Effect.mapError((cause) => new EventJournal.EventJournalError({ cause, method: "withRemoteUncommited" }))
           )
           if (!Arr.isReadonlyArrayNonEmpty(entries)) return yield* Effect.succeedNone
           return yield* Effect.asSome(f(entries))
         },
-        withTracerDisabled,
-        Effect.mapError((cause) => new EventJournal.EventJournalError({ cause, method: "withRemoteUncommited" }))
+        withTracerDisabled
       ),
       nextRemoteSequence: (remoteId) =>
         sql<{ max: number | null }>`SELECT MAX(sequence) AS max FROM ${remotesTableSql} WHERE remote_id = ${remoteId}`
diff --git a/repos/effect/packages/effect/src/unstable/http/Cookies.ts b/repos/effect/packages/effect/src/unstable/http/Cookies.ts
index 453b802c4..91e3b086e 100644
--- a/repos/effect/packages/effect/src/unstable/http/Cookies.ts
+++ b/repos/effect/packages/effect/src/unstable/http/Cookies.ts
@@ -19,8 +19,6 @@ import { type Pipeable, pipeArguments } from "../../Pipeable.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Record from "../../Record.ts"
 import * as Result from "../../Result.ts"
-import * as Schema from "../../Schema.ts"
-import * as SchemaTransformation from "../../SchemaTransformation.ts"
 import type * as Types from "../../Types.ts"
 
 const TypeId = "~effect/http/Cookies"
@@ -44,57 +42,6 @@ export interface Cookies extends Pipeable, Inspectable.Inspectable {
   readonly cookies: Record.ReadonlyRecord<string, Cookie>
 }
 
-/**
- * Schema interface for validating and encoding `Cookies` collections.
- *
- * @category schemas
- * @since 4.0.0
- */
-export interface CookiesSchema extends Schema.declare<Cookies, Record.ReadonlyRecord<string, Cookie>> {}
-
-/**
- * Schema for `Cookies` collections.
- *
- * **Details**
- *
- * JSON encoding uses `Set-Cookie` header strings, while isomorphic encoding uses
- * a readonly record of cookie values.
- *
- * @category schemas
- * @since 4.0.0
- */
-export const CookiesSchema: CookiesSchema = Schema.declare(
-  isCookies,
-  {
-    representation: {
-      id: "effect/http/Cookies",
-      payload: null
-    },
-    toCode: () => ({
-      runtime: "Cookies.CookiesSchema",
-      Type: "Cookies.Cookies",
-      importDeclarations: [`import * as Cookies from "effect/unstable/http/Cookies"`]
-    }),
-    expected: "Cookies",
-    toCodecJson: () =>
-      Schema.link<Cookies>()(
-        Schema.Array(Schema.String),
-        SchemaTransformation.transform({
-          decode: (input) => fromSetCookie(input),
-          encode: (cookies) => toSetCookieHeaders(cookies)
-        })
-      ),
-    toCodecIso: () =>
-      Schema.link<Cookies>()(
-        Schema.Record(Schema.String, CookieSchema),
-        SchemaTransformation.transform({
-          decode: (input) => fromReadonlyRecord(input),
-          encode: (cookies) => cookies.cookies
-        })
-      )
-  }
-)
-
 const CookieTypeId = "~effect/http/Cookies/Cookie"
 
 /**
@@ -130,36 +77,6 @@ export interface Cookie extends Inspectable.Inspectable {
  */
 export const isCookie = (u: unknown): u is Cookie => Predicate.hasProperty(u, CookieTypeId)
 
-/**
- * Schema interface for validating `Cookie` values.
- *
- * @category schemas
- * @since 4.0.0
- */
-export interface CookieSchema extends Schema.declare<Cookie> {}
-
-/**
- * Schema for `Cookie` values.
- *
- * @category schemas
- * @since 4.0.0
- */
-export const CookieSchema: CookieSchema = Schema.declare(
-  isCookie,
-  {
-    representation: {
-      id: "effect/http/Cookie",
-      payload: null
-    },
-    toCode: () => ({
-      runtime: "Cookies.CookieSchema",
-      Type: "Cookies.Cookie",
-      importDeclarations: [`import * as Cookies from "effect/unstable/http/Cookies"`]
-    }),
-    expected: "Cookie"
-  }
-)
-
 const CookieErrorTypeId = "~effect/http/Cookies/CookieError"
 
 /**
@@ -189,7 +106,7 @@ export class CookiesErrorReason extends Data.Error<{
  * @category errors
  * @since 4.0.0
  */
-export class CookiesError extends Data.TaggedError("CookieError")<{
+export class CookiesError extends Data.TaggedError("CookiesError")<{
   readonly reason: CookiesErrorReason
 }> {
   /**
@@ -887,23 +804,6 @@ export const toRecord = (self: Cookies): Record<string, string> => {
   return record
 }
 
-/**
- * Schema for transforming `Cookies` into records of decoded string values keyed
- * by cookie name.
- *
- * @category schemas
- * @since 4.0.0
- */
-export const schemaRecord = CookiesSchema.pipe(
-  Schema.decodeTo(
-    Schema.Record(Schema.String, Schema.String),
-    SchemaTransformation.transform({
-      decode: toRecord,
-      encode: (self) => fromIterable(Object.entries(self).map(([name, value]) => makeCookieUnsafe(name, value)))
-    })
-  )
-)
-
 /**
  * Serializes a `Cookies` collection into an array of `Set-Cookie` header values.
  *
diff --git a/repos/effect/packages/effect/src/unstable/http/FetchHttpClient.ts b/repos/effect/packages/effect/src/unstable/http/FetchHttpClient.ts
index 2176499eb..279cd35d0 100644
--- a/repos/effect/packages/effect/src/unstable/http/FetchHttpClient.ts
+++ b/repos/effect/packages/effect/src/unstable/http/FetchHttpClient.ts
@@ -68,7 +68,7 @@ const fetch: HttpClient.HttpClient = HttpClient.make((request, url, signal, fibe
             method: request.method,
             headers,
             body,
-            duplex: request.body._tag === "Stream" ? "half" : undefined,
+            duplex: typeof ReadableStream !== "undefined" && body instanceof ReadableStream ? "half" : undefined,
             signal
           } as any),
         catch: (cause) =>
diff --git a/repos/effect/packages/effect/src/unstable/http/FindMyWay/internal/router.ts b/repos/effect/packages/effect/src/unstable/http/FindMyWay/internal/router.ts
index 8008f9f5f..66f6aa2ad 100644
--- a/repos/effect/packages/effect/src/unstable/http/FindMyWay/internal/router.ts
+++ b/repos/effect/packages/effect/src/unstable/http/FindMyWay/internal/router.ts
@@ -28,6 +28,12 @@ import * as QS from "./queryString.ts"
 const FULL_PATH_REGEXP = /^https?:\/\/.*?\//
 const OPTIONAL_PARAM_REGEXP = /(\/:[^/()]*?)\?(\/?)/
 
+const emptyParamsArray: ReadonlyArray<string> = []
+
+// Matches one terminal parameter without wildcard, regex, or static suffix syntax.
+const CLEAN_SINGLE_PARAM_REGEXP = /^[^:*(]*\/:[^/:*(.-]+$/
+const isCleanSingleTrailingParam = (path: string): boolean => CLEAN_SINGLE_PARAM_REGEXP.test(path)
+
 interface Route<A = unknown> {
   readonly method: string
   readonly path: Router.PathInput
@@ -55,6 +61,11 @@ class RouterImpl<A> implements Router.Router<A> {
   readonly options: Router.RouterConfig
   routes: Array<Route> = []
   trees: Record<string, StaticNode> = Object.create(null)
+  staticRoutes: Record<string, Map<string, Handler>> = Object.create(null)
+  singleParamRoutes: Record<string, Map<string, Handler>> = Object.create(null)
+  singleParamDisabled: Record<string, boolean> = Object.create(null)
+  readonly brothersNodesStack: Array<BrotherNode> = []
+  readonly singleParamArray: Array<string> = [""]
 
   on(
     method: string | Iterable<string>,
@@ -253,6 +264,32 @@ class RouterImpl<A> implements Router.Router<A> {
     const route = { method, path, pattern, params, handler }
     this.routes.push(route)
     currentNode.addRoute(route)
+
+    // Cache static routes by normalized path for direct lookup.
+    if (params.length === 0) {
+      const staticKey = pattern.split("::").join(":").split("%").join("%25")
+      const store = this.staticRoutes[method] ??= new Map()
+      if (!store.has(staticKey)) {
+        store.set(staticKey, currentNode.handlerStorage!.unconstrainedHandler!)
+      }
+    } else if (isCleanSingleTrailingParam(path)) {
+      // Cache "/prefix/:param" routes for direct prefix matching.
+      if (this.singleParamDisabled[method] !== true) {
+        let prefix = path.slice(0, path.indexOf(":"))
+        if (!this.options.caseSensitive) {
+          prefix = prefix.toLowerCase()
+        }
+        prefix = prefix.split("%").join("%25")
+        const store = this.singleParamRoutes[method] ??= new Map()
+        if (!store.has(prefix)) {
+          store.set(prefix, currentNode.handlerStorage!.unconstrainedHandler!)
+        }
+      }
+    } else if (/[(*]|[^/]:|:[^/]*[-.]/.test(path)) {
+      // Complex parameters may shadow a cached single-parameter route.
+      this.singleParamDisabled[method] = true
+      delete this.singleParamRoutes[method]
+    }
   }
 
   has(method: string, path: string): boolean {
@@ -273,48 +310,101 @@ class RouterImpl<A> implements Router.Router<A> {
     let currentNode: Node | undefined = this.trees[method]
     if (currentNode === undefined) return undefined
 
-    if (path.charCodeAt(0) !== 47) {
-      // 47 is '/'
-      path = path.replace(FULL_PATH_REGEXP, "/")
+    let querystring = ""
+    let shouldDecodeParam = false
+
+    // Skip normalization for canonical lowercase paths.
+    let clean = path.charCodeAt(0) === 47 &&
+      (path.length === 1 || path.charCodeAt(path.length - 1) !== 47)
+    if (clean) {
+      for (let i = 1; i < path.length; i++) {
+        const code = path.charCodeAt(i)
+        if (
+          code === 37 || code === 63 || code === 59 || code === 35 ||
+          (code >= 65 && code <= 90) ||
+          (code === 47 && path.charCodeAt(i - 1) === 47)
+        ) {
+          clean = false
+          break
+        }
+      }
     }
 
-    // This must be run before sanitizeUrl as the resulting function
-    // .sliceParameter must be constructed with same URL string used
-    // throughout the rest of this function.
-    if (this.options.ignoreDuplicateSlashes) {
-      path = removeDuplicateSlashes(path)
-    }
+    if (!clean) {
+      if (path.charCodeAt(0) !== 47) {
+        // 47 is '/'
+        path = path.replace(FULL_PATH_REGEXP, "/")
+      }
 
-    let sanitizedUrl
-    let querystring
-    let shouldDecodeParam
+      // This must be run before sanitizeUrl as the resulting function
+      // .sliceParameter must be constructed with same URL string used
+      // throughout the rest of this function.
+      if (this.options.ignoreDuplicateSlashes) {
+        path = removeDuplicateSlashes(path)
+      }
 
-    try {
-      sanitizedUrl = safeDecodeURI(path)
-      path = sanitizedUrl.path
-      querystring = sanitizedUrl.querystring
-      shouldDecodeParam = sanitizedUrl.shouldDecodeParam
-    } catch (error) {
-      return undefined
-    }
+      let sanitizedUrl
+      try {
+        sanitizedUrl = safeDecodeURI(path)
+        path = sanitizedUrl.path
+        querystring = sanitizedUrl.querystring
+        shouldDecodeParam = sanitizedUrl.shouldDecodeParam
+      } catch (error) {
+        return undefined
+      }
 
-    if (this.options.ignoreTrailingSlash) {
-      path = trimLastSlash(path)
+      if (this.options.ignoreTrailingSlash) {
+        path = trimLastSlash(path)
+      }
     }
 
     const originPath = path
 
-    if (this.options.caseSensitive === false) {
+    if (!clean && this.options.caseSensitive === false) {
       path = path.toLowerCase()
     }
 
     const maxParamLength = this.options.maxParamLength
 
+    const staticStore = this.staticRoutes[method]
+    if (staticStore !== undefined) {
+      const handle = staticStore.get(path)
+      if (handle !== undefined) {
+        return {
+          handler: handle.handler as A,
+          params: handle.createParams(emptyParamsArray),
+          searchParams: QS.parse(querystring)
+        } as const
+      }
+    }
+
+    const singleParamStore = this.singleParamRoutes[method]
+    if (singleParamStore !== undefined) {
+      const prefixLength = path.lastIndexOf("/") + 1
+      const handle = singleParamStore.get(path.slice(0, prefixLength))
+      if (handle !== undefined && path.length > prefixLength) {
+        let param = originPath.slice(prefixLength)
+        if (shouldDecodeParam) {
+          param = safeDecodeURIComponent(param)
+        }
+        if (param.length <= maxParamLength) {
+          this.singleParamArray[0] = param
+          return {
+            handler: handle.handler as A,
+            params: handle.createParams(this.singleParamArray),
+            searchParams: QS.parse(querystring)
+          } as const
+        }
+      }
+    }
+
     let pathIndex = (currentNode as StaticNode).prefix.length
     const params = []
     const pathLen = path.length
 
-    const brothersNodesStack: Array<BrotherNode> = []
+    // Reuse this router's synchronous backtracking stack.
+    const brothersNodesStack = this.brothersNodesStack
+    brothersNodesStack.length = 0
 
     while (true) {
       if (pathIndex === pathLen && currentNode.isLeafNode) {
@@ -577,18 +667,12 @@ class StaticNode extends ParentNode {
   private setPrefix(prefix: string) {
     this.prefix = prefix
 
+    // Child selection already matched the first character.
     if (prefix.length === 1) {
       this.matchPrefix = (_path, _pathIndex) => true
     } else {
-      const len = prefix.length
-      this.matchPrefix = function(path, pathIndex) {
-        for (let i = 1; i < len; i++) {
-          if (path.charCodeAt(pathIndex + i) !== this.prefix.charCodeAt(i)) {
-            return false
-          }
-        }
-        return true
-      }
+      const tail = prefix.slice(1)
+      this.matchPrefix = (path, pathIndex) => path.startsWith(tail, pathIndex + 1)
     }
   }
 
@@ -745,6 +829,9 @@ const assert: Assert = (condition, message) => {
 }
 
 function removeDuplicateSlashes(path: string): Router.PathInput {
+  if (path.indexOf("//") === -1) {
+    return path as Router.PathInput
+  }
   return path.replace(/\/\/+/g, "/") as Router.PathInput
 }
 
@@ -755,10 +842,29 @@ function trimLastSlash(path: string): Router.PathInput {
   return path as Router.PathInput
 }
 
+// Compile safe, unique parameter names into a stable null-prototype shape.
+// Other names and codegen-restricted runtimes use assignment.
+const safeParamName = /^[A-Za-z_$][A-Za-z0-9_$]*$/
+const isCompilableParamName = (name: string): boolean => name !== "__proto__" && safeParamName.test(name)
+
 function compileCreateParams(
   params: ReadonlyArray<string>
 ): (paramsArray: ReadonlyArray<string>) => Record<string, string> {
   const len = params.length
+  if (len === 0) {
+    return () => Object.create(null)
+  }
+  if (params.every(isCompilableParamName) && new Set(params).size === len) {
+    try {
+      // eslint-disable-next-line no-new-func
+      return new Function(
+        "a",
+        `return {__proto__:null,${params.map((name, i) => `${name}:a[${i}]`).join(",")}}`
+      ) as (paramsArray: ReadonlyArray<string>) => Record<string, string>
+    } catch {
+      // Use assignment when CSP blocks Function construction.
+    }
+  }
   return function(paramsArray) {
     const paramsObject: Record<string, string> = Object.create(null)
     for (let i = 0; i < len; i++) {
diff --git a/repos/effect/packages/effect/src/unstable/http/Headers.ts b/repos/effect/packages/effect/src/unstable/http/Headers.ts
index 3005bdd3a..893a30540 100644
--- a/repos/effect/packages/effect/src/unstable/http/Headers.ts
+++ b/repos/effect/packages/effect/src/unstable/http/Headers.ts
@@ -19,8 +19,6 @@ import * as Predicate from "../../Predicate.ts"
 import * as Record from "../../Record.ts"
 import * as Redactable from "../../Redactable.ts"
 import * as Redacted from "../../Redacted.ts"
-import * as Schema from "../../Schema.ts"
-import * as SchemaTransformation from "../../SchemaTransformation.ts"
 import type { Mutable } from "../../Types.ts"
 
 /**
@@ -109,49 +107,6 @@ const make = (input: Record.ReadonlyRecord<string, string>): Mutable<Headers> =>
  */
 export const Equivalence: Equ.Equivalence<Headers> = Record.makeEquivalence(Equ.strictEqual<string>())
 
-/**
- * Schema interface for `Headers` values encoded as records of string header values.
- *
- * @category schemas
- * @since 4.0.0
- */
-export interface HeadersSchema extends Schema.declare<Headers, { readonly [x: string]: string }> {}
-
-/**
- * Schema for `Headers` values encoded as records of string header values.
- *
- * **Details**
- *
- * Decoding normalizes header names through `fromInput`; encoding returns a plain record.
- *
- * @category schemas
- * @since 4.0.0
- */
-export const HeadersSchema: HeadersSchema = Schema.declare(
-  isHeaders,
-  {
-    representation: {
-      id: "effect/http/Headers",
-      payload: null
-    },
-    toCode: () => ({
-      runtime: "Headers.HeadersSchema",
-      Type: "Headers.Headers",
-      importDeclarations: [`import * as Headers from "effect/unstable/http/Headers"`]
-    }),
-    expected: "Headers",
-    toEquivalence: () => Equivalence,
-    toCodec: () =>
-      Schema.link<Headers>()(
-        Schema.Record(Schema.String, Schema.String),
-        SchemaTransformation.transform({
-          decode: (input) => fromInput(input),
-          encode: (headers) => ({ ...headers })
-        })
-      )
-  }
-)
-
 /**
  * Input accepted when constructing headers.
  *
@@ -399,7 +354,7 @@ export const redact: {
         }
       } else {
         for (const name in self) {
-          if (key.test(name)) {
+          if (name.search(key) !== -1) {
             out[name] = Redacted.make(self[name])
           }
         }
@@ -435,10 +390,10 @@ export const isRedactedName = (
   for (let i = 0; i < patterns.length; i++) {
     const pattern = patterns[i]
     if (typeof pattern === "string") {
-      if (pattern.toLowerCase() === name) {
+      if (pattern.toLowerCase() === name.toLowerCase()) {
         return true
       }
-    } else if (pattern.test(name)) {
+    } else if (name.search(pattern) !== -1) {
       return true
     }
   }
diff --git a/repos/effect/packages/effect/src/unstable/http/HttpBody.ts b/repos/effect/packages/effect/src/unstable/http/HttpBody.ts
index ae9db9374..d9f85e4ba 100644
--- a/repos/effect/packages/effect/src/unstable/http/HttpBody.ts
+++ b/repos/effect/packages/effect/src/unstable/http/HttpBody.ts
@@ -11,12 +11,14 @@
  *
  * @since 4.0.0
  */
+import * as ByteSize from "../../ByteSize.ts"
 import * as Data from "../../Data.ts"
 import * as Effect from "../../Effect.ts"
 import * as FileSystem from "../../FileSystem.ts"
 import { format } from "../../Formatter.ts"
 import * as Inspectable from "../../Inspectable.ts"
-import type * as PlatformError from "../../PlatformError.ts"
+import * as Option from "../../Option.ts"
+import * as PlatformError from "../../PlatformError.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Schema from "../../Schema.ts"
 import type { ParseOptions } from "../../SchemaAST.ts"
@@ -224,20 +226,27 @@ export const raw = (
  */
 export class Uint8Array extends Proto {
   readonly _tag = "Uint8Array"
-  readonly body: globalThis.Uint8Array
   readonly contentType: string
   readonly contentLength: number
+  /** Original text retained for adapters that can skip encoding. */
+  readonly text: string | undefined
+  private _body: globalThis.Uint8Array | undefined
 
   constructor(
-    body: globalThis.Uint8Array,
+    body: globalThis.Uint8Array | undefined,
     contentType: string,
-    contentLength: number
+    contentLength: number,
+    text?: string
   ) {
     super()
-    this.body = body
+    this._body = body
+    this.text = text
     this.contentType = contentType
     this.contentLength = contentLength
   }
+  get body(): globalThis.Uint8Array {
+    return this._body ??= encodeText(this.text!)
+  }
   toJSON(): unknown {
     const toString = this.contentType.startsWith("text/") || this.contentType.endsWith("json")
     return {
@@ -265,18 +274,38 @@ export const uint8Array = (body: globalThis.Uint8Array, contentType?: string): U
 
 const encoder = new TextEncoder()
 
+// Buffer encodes UTF-8 faster than TextEncoder when available.
+const buffer = (globalThis as {
+  readonly Buffer?: {
+    readonly from: (body: string, encoding: "utf8") => globalThis.Uint8Array
+    readonly byteLength: (body: string, encoding: "utf8") => number
+  }
+}).Buffer
+const encodeText: (body: string) => globalThis.Uint8Array = buffer !== undefined
+  ? (body) => buffer.from(body, "utf8")
+  : (body) => encoder.encode(body)
+
 /**
  * Creates a UTF-8 encoded text HTTP body.
  *
  * **Details**
  *
- * The content type defaults to `text/plain`.
+ * The content type defaults to `text/plain`. Text bodies are encoded lazily.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const text = (body: string, contentType?: string): Uint8Array =>
-  uint8Array(encoder.encode(body), contentType ?? "text/plain")
+export const text = (body: string, contentType?: string): Uint8Array => {
+  if (typeof body !== "string") {
+    // Preserve untyped callers that relied on TextEncoder coercion.
+    body = body === undefined ? "" : String(body)
+  }
+  if (buffer !== undefined) {
+    return new Uint8Array(undefined, contentType ?? "text/plain", buffer.byteLength(body, "utf8"), body)
+  }
+  const bytes = encoder.encode(body)
+  return new Uint8Array(bytes, contentType ?? "text/plain", bytes.length, body)
+}
 
 /**
  * Creates a JSON HTTP body using `JSON.stringify`, throwing if serialization fails.
@@ -484,18 +513,44 @@ export const stream = (
   contentLength?: number
 ): Stream => new Stream(body, contentType ?? "application/octet-stream", contentLength)
 
-const fileContentLength = (
-  size: FileSystem.SizeInput,
+const fileRangeSize = (
+  input: ByteSize.Input,
+  field: string,
+  method: string
+): Effect.Effect<ByteSize.ByteSize, PlatformError.PlatformError> => {
+  const size = ByteSize.fromInput(input)
+  return Option.isSome(size)
+    ? Effect.succeed(size.value)
+    : Effect.fail(PlatformError.badArgument({
+      module: "HttpBody",
+      method,
+      description: `Invalid ${field}: ${input}`
+    }))
+}
+
+const fileContentLength = Effect.fnUntraced(function*(
+  size: ByteSize.ByteSize,
+  method: string,
   options?: {
-    readonly bytesToRead?: FileSystem.SizeInput | undefined
-    readonly offset?: FileSystem.SizeInput | undefined
+    readonly bytesToRead?: ByteSize.Input | undefined
+    readonly offset?: ByteSize.Input | undefined
   }
-): number => {
-  const available = Math.max(0, Number(size) - Number(options?.offset ?? 0))
-  return options?.bytesToRead === undefined
-    ? available
-    : Math.min(available, Math.max(0, Number(options.bytesToRead)))
-}
+): Effect.fn.Return<number, PlatformError.PlatformError> {
+  const offset = options?.offset === undefined ? ByteSize.zero : yield* fileRangeSize(options.offset, "offset", method)
+  const bytesToRead = options?.bytesToRead === undefined
+    ? undefined
+    : yield* fileRangeSize(options.bytesToRead, "bytesToRead", method)
+  const available = offset >= size ? BigInt("0") : size - offset
+  const length = bytesToRead === undefined || bytesToRead > available ? available : bytesToRead
+  if (length > BigInt(Number.MAX_SAFE_INTEGER)) {
+    return yield* Effect.fail(PlatformError.badArgument({
+      module: "HttpBody",
+      method,
+      description: `Content length exceeds Number.MAX_SAFE_INTEGER: ${length}`
+    }))
+  }
+  return Number(length)
+})
 
 /**
  * Creates a streaming HTTP body for a file path.
@@ -505,27 +560,37 @@ const fileContentLength = (
  * The effect requires `FileSystem`, stats the file to set the selected content length, and can fail with
  * `PlatformError`.
  *
+ * Range validation and file access are deferred until the effect runs. Numeric range inputs must be
+ * non-negative safe integers; bigint and byte-size strings can represent larger values. Malformed strings,
+ * negative values, and non-finite, fractional, or unsafe numbers fail with `PlatformError` / `BadArgument`.
+ *
+ * The selected length is calculated exactly with bigint arithmetic and clamped to the bytes available after
+ * `offset` (zero at or past EOF). Since `Stream.contentLength` is a number, a final length above
+ * `Number.MAX_SAFE_INTEGER` fails with `BadArgument`. Larger sizes, offsets, and byte counts are valid when
+ * the final clamped length is representable; the resulting Content-Length header preserves that exact length.
+ *
  * @category constructors
  * @since 4.0.0
  */
 export const file = (
   path: string,
   options?: {
-    readonly bytesToRead?: FileSystem.SizeInput | undefined
-    readonly chunkSize?: FileSystem.SizeInput | undefined
-    readonly offset?: FileSystem.SizeInput | undefined
+    readonly bytesToRead?: ByteSize.Input | undefined
+    readonly chunkSize?: number | undefined
+    readonly offset?: ByteSize.Input | undefined
     readonly contentType?: string | undefined
   }
 ): Effect.Effect<Stream, PlatformError.PlatformError, FileSystem.FileSystem> =>
   Effect.flatMap(
     FileSystem.FileSystem,
     (fs) =>
-      Effect.map(fs.stat(path), (info) =>
-        stream(
-          fs.stream(path, options),
-          options?.contentType,
-          fileContentLength(info.size, options)
-        ))
+      Effect.flatMap(fs.stat(path), (info) =>
+        Effect.map(fileContentLength(info.size, "file", options), (contentLength) =>
+          stream(
+            fs.stream(path, options),
+            options?.contentType,
+            contentLength
+          )))
   )
 
 /**
@@ -536,6 +601,11 @@ export const file = (
  * The effect requires `FileSystem`, uses the provided file size to determine the selected content length, and can
  * fail with `PlatformError`.
  *
+ * Like {@link file}, this constructor validates ranges lazily and calculates the EOF-clamped length with exact
+ * bigint arithmetic. Invalid range inputs and final lengths above `Number.MAX_SAFE_INTEGER` fail with
+ * `PlatformError` / `BadArgument`. Larger sizes, offsets, and byte counts remain valid when the final length
+ * is representable as a safe integer, preserving the exact Content-Length header.
+ *
  * @category constructors
  * @since 4.0.0
  */
@@ -543,18 +613,19 @@ export const fileFromInfo = (
   path: string,
   info: FileSystem.File.Info,
   options?: {
-    readonly bytesToRead?: FileSystem.SizeInput | undefined
-    readonly chunkSize?: FileSystem.SizeInput | undefined
-    readonly offset?: FileSystem.SizeInput | undefined
+    readonly bytesToRead?: ByteSize.Input | undefined
+    readonly chunkSize?: number | undefined
+    readonly offset?: ByteSize.Input | undefined
     readonly contentType?: string | undefined
   }
 ): Effect.Effect<Stream, PlatformError.PlatformError, FileSystem.FileSystem> =>
-  Effect.map(
+  Effect.flatMap(
     FileSystem.FileSystem,
     (fs) =>
-      stream(
-        fs.stream(path, options),
-        options?.contentType,
-        fileContentLength(info.size, options)
-      )
+      Effect.map(fileContentLength(info.size, "fileFromInfo", options), (contentLength) =>
+        stream(
+          fs.stream(path, options),
+          options?.contentType,
+          contentLength
+        ))
   )
diff --git a/repos/effect/packages/effect/src/unstable/http/HttpClient.ts b/repos/effect/packages/effect/src/unstable/http/HttpClient.ts
index fb736c201..a8878fc0f 100644
--- a/repos/effect/packages/effect/src/unstable/http/HttpClient.ts
+++ b/repos/effect/packages/effect/src/unstable/http/HttpClient.ts
@@ -89,6 +89,10 @@ export declare namespace HttpClient {
       url: string | URL,
       options?: HttpClientRequest.Options.NoUrl
     ) => Effect.Effect<HttpClientResponse.HttpClientResponse, E, R>
+    readonly query: (
+      url: string | URL,
+      options?: HttpClientRequest.Options.NoUrl
+    ) => Effect.Effect<HttpClientResponse.HttpClientResponse, E, R>
     readonly head: (
       url: string | URL,
       options?: HttpClientRequest.Options.NoUrl
@@ -179,6 +183,18 @@ export const get: (url: string | URL, options?: HttpClientRequest.Options.NoUrl
   HttpClient
 > = accessor("get")
 
+/**
+ * Executes a `QUERY` request using the `HttpClient` service from the environment.
+ *
+ * @category accessors
+ * @since 4.0.0
+ */
+export const query: (url: string | URL, options?: HttpClientRequest.Options.NoUrl | undefined) => Effect.Effect<
+  HttpClientResponse.HttpClientResponse,
+  Error.HttpClientError,
+  HttpClient
+> = accessor("query")
+
 /**
  * Executes a `HEAD` request using the `HttpClient` service from the environment.
  *
@@ -316,9 +332,9 @@ const catch_: {
   <E, E2, R2>(
     f: (e: E) => Effect.Effect<HttpClientResponse.HttpClientResponse, E2, R2>
   ): <R>(self: HttpClient.With<E, R>) => HttpClient.With<E2, R2 | R>
-  <E, R, A2, E2, R2>(
+  <E, R, E2, R2>(
     self: HttpClient.With<E, R>,
-    f: (e: E) => Effect.Effect<A2, E2, R2>
+    f: (e: E) => Effect.Effect<HttpClientResponse.HttpClientResponse, E2, R2>
   ): HttpClient.With<E2, R | R2>
 } = dual(
   2,
@@ -1548,36 +1564,43 @@ export const followRedirects: {
   makeWith(
     (request) => {
       const loop = (
-        request: HttpClientRequest.HttpClientRequest,
+        request: Effect.Effect<HttpClientRequest.HttpClientRequest, E, R>,
         redirects: number
       ): Effect.Effect<HttpClientResponse.HttpClientResponse, E, R> =>
-        Effect.flatMap(
-          self.postprocess(Effect.succeed(request)),
-          (response) => {
-            if (
-              response.status < 300 || response.status >= 400 || !response.headers.location ||
-              redirects >= (maxRedirects ?? 10)
-            ) {
-              return Effect.succeed(response)
-            }
-            const url = new URL(response.headers.location, response.request.url)
-            let nextRequest = request
-            if (
-              ((response.status === 301 || response.status === 302) && request.method === "POST") ||
-              (response.status === 303 && request.method !== "GET" && request.method !== "HEAD")
-            ) {
-              nextRequest = HttpClientRequest.setMethod(nextRequest, "GET")
-              nextRequest = HttpClientRequest.setBody(nextRequest, HttpBody.empty)
-            }
-            if (url.origin !== new URL(response.request.url).origin) {
-              nextRequest = HttpClientRequest.removeHeader(nextRequest, "authorization")
-              nextRequest = HttpClientRequest.removeHeader(nextRequest, "proxy-authorization")
-              nextRequest = HttpClientRequest.removeHeader(nextRequest, "cookie")
+        Effect.suspend(() => {
+          let currentRequest: HttpClientRequest.HttpClientRequest | undefined
+          return Effect.flatMap(
+            self.postprocess(Effect.map(request, (request) => {
+              currentRequest = request
+              return request
+            })),
+            (response) => {
+              if (
+                response.status < 300 || response.status >= 400 || !response.headers.location ||
+                redirects >= (maxRedirects ?? 10)
+              ) {
+                return Effect.succeed(response)
+              }
+              const url = new URL(response.headers.location, response.request.url)
+              const request = currentRequest ?? response.request
+              let nextRequest = request
+              if (
+                ((response.status === 301 || response.status === 302) && request.method === "POST") ||
+                (response.status === 303 && request.method !== "GET" && request.method !== "HEAD")
+              ) {
+                nextRequest = HttpClientRequest.setMethod(nextRequest, "GET")
+                nextRequest = HttpClientRequest.setBody(nextRequest, HttpBody.empty)
+              }
+              if (url.origin !== new URL(response.request.url).origin) {
+                nextRequest = HttpClientRequest.removeHeader(nextRequest, "authorization")
+                nextRequest = HttpClientRequest.removeHeader(nextRequest, "proxy-authorization")
+                nextRequest = HttpClientRequest.removeHeader(nextRequest, "cookie")
+              }
+              return loop(Effect.succeed(HttpClientRequest.setUrl(nextRequest, url)), redirects + 1)
             }
-            return loop(HttpClientRequest.setUrl(nextRequest, url), redirects + 1)
-          }
-        )
-      return Effect.flatMap(request, (request) => loop(request, 0))
+          )
+        })
+      return loop(request, 0)
     },
     self.preprocess
   ))
@@ -1612,7 +1635,7 @@ export const TracerHeaderFilter = Context.Reference<
  * @category services
  * @since 4.0.0
  */
-export const TracerPropagationEnabled = Context.Reference<boolean>("effect/HttpClient/TracerPropagationEnabled", {
+export const TracerPropagationEnabled = Context.Reference<boolean>("effect/http/HttpClient/TracerPropagationEnabled", {
   defaultValue: constTrue
 })
 
@@ -1714,6 +1737,10 @@ class InterruptibleResponse implements HttpClientResponse.HttpClientResponse, Pi
     return this.original.request
   }
 
+  get url() {
+    return this.original.url
+  }
+
   get status() {
     return this.original.status
   }
diff --git a/repos/effect/packages/effect/src/unstable/http/HttpClientRequest.ts b/repos/effect/packages/effect/src/unstable/http/HttpClientRequest.ts
index 52886643a..fb1c490b5 100644
--- a/repos/effect/packages/effect/src/unstable/http/HttpClientRequest.ts
+++ b/repos/effect/packages/effect/src/unstable/http/HttpClientRequest.ts
@@ -9,6 +9,7 @@
  *
  * @since 4.0.0
  */
+import type * as ByteSize from "../../ByteSize.ts"
 import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import type * as FileSystem from "../../FileSystem.ts"
@@ -175,6 +176,14 @@ export const make = <M extends HttpMethod>(
  */
 export const get: (url: string | URL, options?: Options.NoUrl) => HttpClientRequest = make("GET")
 
+/**
+ * Creates a `QUERY` request for the specified URL.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const query: (url: string | URL, options?: Options.NoUrl) => HttpClientRequest = make("QUERY")
+
 /**
  * Creates a `POST` request for the specified URL.
  *
@@ -829,6 +838,13 @@ export const bodyStream: {
 /**
  * Creates a file-backed request body from a filesystem path and sets it on the request.
  *
+ * **Details**
+ *
+ * Uses {@link HttpBody.file} to validate ranges lazily and calculate the EOF-clamped content length with exact
+ * bigint arithmetic. Invalid range inputs or a final length above `Number.MAX_SAFE_INTEGER` fail with
+ * `PlatformError` / `BadArgument`. Larger sizes, offsets, and byte counts are valid when the final length is
+ * representable as a safe integer. The request's Content-Length header contains that exact length.
+ *
  * @category combinators
  * @since 4.0.0
  */
@@ -836,9 +852,9 @@ export const bodyFile: {
   (
     path: string,
     options?: {
-      readonly bytesToRead?: FileSystem.SizeInput | undefined
-      readonly chunkSize?: FileSystem.SizeInput | undefined
-      readonly offset?: FileSystem.SizeInput | undefined
+      readonly bytesToRead?: ByteSize.Input | undefined
+      readonly chunkSize?: number | undefined
+      readonly offset?: ByteSize.Input | undefined
       readonly contentType?: string
     }
   ): (self: HttpClientRequest) => Effect.Effect<HttpClientRequest, PlatformError.PlatformError, FileSystem.FileSystem>
@@ -846,9 +862,9 @@ export const bodyFile: {
     self: HttpClientRequest,
     path: string,
     options?: {
-      readonly bytesToRead?: FileSystem.SizeInput | undefined
-      readonly chunkSize?: FileSystem.SizeInput | undefined
-      readonly offset?: FileSystem.SizeInput | undefined
+      readonly bytesToRead?: ByteSize.Input | undefined
+      readonly chunkSize?: number | undefined
+      readonly offset?: ByteSize.Input | undefined
       readonly contentType?: string
     }
   ): Effect.Effect<HttpClientRequest, PlatformError.PlatformError, FileSystem.FileSystem>
@@ -858,9 +874,9 @@ export const bodyFile: {
     self: HttpClientRequest,
     path: string,
     options?: {
-      readonly bytesToRead?: FileSystem.SizeInput | undefined
-      readonly chunkSize?: FileSystem.SizeInput | undefined
-      readonly offset?: FileSystem.SizeInput | undefined
+      readonly bytesToRead?: ByteSize.Input | undefined
+      readonly chunkSize?: number | undefined
+      readonly offset?: ByteSize.Input | undefined
       readonly contentType?: string
     }
   ): Effect.Effect<HttpClientRequest, PlatformError.PlatformError, FileSystem.FileSystem> =>
diff --git a/repos/effect/packages/effect/src/unstable/http/HttpClientResponse.ts b/repos/effect/packages/effect/src/unstable/http/HttpClientResponse.ts
index 5bd5aed55..487bf29fc 100644
--- a/repos/effect/packages/effect/src/unstable/http/HttpClientResponse.ts
+++ b/repos/effect/packages/effect/src/unstable/http/HttpClientResponse.ts
@@ -21,7 +21,7 @@ import type { Unify } from "../../Unify.ts"
 import * as Cookies from "./Cookies.ts"
 import * as Headers from "./Headers.ts"
 import * as Error from "./HttpClientError.ts"
-import type * as HttpClientRequest from "./HttpClientRequest.ts"
+import * as HttpClientRequest from "./HttpClientRequest.ts"
 import * as HttpIncomingMessage from "./HttpIncomingMessage.ts"
 import * as UrlParams from "./UrlParams.ts"
 
@@ -66,6 +66,11 @@ export const TypeId = "~effect/http/HttpClientResponse"
 export interface HttpClientResponse extends HttpIncomingMessage.HttpIncomingMessage<Error.HttpClientError>, Pipeable {
   readonly [TypeId]: typeof TypeId
   readonly request: HttpClientRequest.HttpClientRequest
+  /**
+   * The resolved URL, including query parameters and excluding the hash.
+   * Uses the final URL when redirects are followed. Empty if unknown.
+   */
+  readonly url: string
   readonly status: number
   readonly cookies: Cookies.Cookies
   readonly formData: Effect.Effect<FormData, Error.HttpClientError>
@@ -98,7 +103,7 @@ export const schemaJson = <
   schema: Schema.ConstraintCodec<A, I, RD, unknown>,
   options?: (ParseOptions & HttpIncomingMessage.JsonOptions) | undefined
 ) => {
-  const decode = Schema.decodeEffect(Schema.toCodecJson(schema).annotate({ options }))
+  const decode = Schema.decodeEffect(Schema.toCodecJson(schema), options)
   const decodeBody = HttpIncomingMessage.schemaBodyJson(Schema.Unknown, options)
   return (
     self: HttpClientResponse
@@ -129,7 +134,7 @@ export const schemaNoBody = <
   schema: Schema.Codec<A, I, RD, RE>,
   options?: ParseOptions | undefined
 ) => {
-  const decode = Schema.decodeEffect(schema.annotate({ options }))
+  const decode = Schema.decodeEffect(schema, options)
   return (self: HttpClientResponse): Effect.Effect<A, Schema.SchemaError, RD> =>
     decode({
       status: self.status,
@@ -277,6 +282,14 @@ class WebHttpClientResponse extends Inspectable.Class implements HttpClientRespo
     return this.source.status
   }
 
+  get url(): string {
+    if (this.source.url) return this.source.url.split("#")[0]
+    const url = HttpClientRequest.toUrl(this.request)
+    if (Option.isNone(url)) return ""
+    url.value.hash = ""
+    return url.value.href
+  }
+
   get headers(): Headers.Headers {
     return Headers.fromInput(this.source.headers)
   }
diff --git a/repos/effect/packages/effect/src/unstable/http/HttpEffect.ts b/repos/effect/packages/effect/src/unstable/http/HttpEffect.ts
index 013e7d3f7..fbbf7a3d7 100644
--- a/repos/effect/packages/effect/src/unstable/http/HttpEffect.ts
+++ b/repos/effect/packages/effect/src/unstable/http/HttpEffect.ts
@@ -13,13 +13,15 @@ import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import * as Exit from "../../Exit.ts"
 import * as Fiber from "../../Fiber.ts"
-import { dual } from "../../Function.ts"
-import { reportCauseUnsafe } from "../../internal/effect.ts"
+import { constVoid, dual } from "../../Function.ts"
+import { contA, contE } from "../../internal/core.ts"
+import { effectIsExit, fiberEnterUninterruptibleUnsafe, reportCauseUnsafe } from "../../internal/effect.ts"
 import * as Layer from "../../Layer.ts"
 import * as Scope from "../../Scope.ts"
 import * as Stream from "../../Stream.ts"
+import { nativeTracer } from "../../Tracer.ts"
 import * as HttpBody from "./HttpBody.ts"
-import { type HttpMiddleware, tracer } from "./HttpMiddleware.ts"
+import { type HttpMiddleware, isTracerDisabledUnsafe, tracer } from "./HttpMiddleware.ts"
 import { causeResponse, ClientAbort, HttpServerError, InternalError } from "./HttpServerError.ts"
 import { HttpServerRequest } from "./HttpServerRequest.ts"
 import * as Request from "./HttpServerRequest.ts"
@@ -41,11 +43,10 @@ export const toHandled = <E, R, EH, RH>(
   ) => Effect.Effect<unknown, EH, RH>,
   middleware?: HttpMiddleware | undefined
 ): Effect.Effect<void, never, Exclude<R | RH | HttpServerRequest, Scope.Scope>> => {
-  const handleCause = (cause: Cause.Cause<E | EH | HttpServerError>) =>
+  const handleCause = (request: HttpServerRequest, cause: Cause.Cause<E | EH | HttpServerError>) =>
     Effect.flatMapEager(causeResponse(cause), ([response, cause]) => {
       const fiber = Fiber.getCurrent()!
       reportCauseUnsafe(fiber, cause)
-      const request = Context.getUnsafe(fiber.context, HttpServerRequest)
       const handler = preResponseHandler.requestPreResponseHandlers.get(request.source)
       const cont = cause.reasons.length === 0 ? Effect.succeed(response) : Effect.failCause(cause)
       if (handler === undefined) {
@@ -65,52 +66,117 @@ export const toHandled = <E, R, EH, RH>(
       )
     })
 
-  const responded = Effect.matchCauseEffect(self, {
-    onSuccess: (response) => {
-      const fiber = Fiber.getCurrent()!
-      const request = Context.getUnsafe(fiber.context, HttpServerRequest)
-      const handler = preResponseHandler.requestPreResponseHandlers.get(request.source)
-      if (handler === undefined) {
-        ;(request as any)[handledSymbol] = true
-        return Effect.mapEager(handleResponse(request, response), () => response)
-      }
-      return Effect.flatMapEager(handler(request, response), (sentResponse) => {
-        ;(request as any)[handledSymbol] = true
-        return Effect.mapEager(handleResponse(request, sentResponse), () => response)
-      })
-    },
-    onFailure: handleCause
-  })
+  // Writes the response, applying any registered pre-response handler first.
+  // Returns an `Exit` when the write completes synchronously.
+  const sendResponse = (
+    request: HttpServerRequest,
+    response: HttpServerResponse
+  ): Effect.Effect<HttpServerResponse, EH | HttpServerError, RH> => {
+    const handler = preResponseHandler.requestPreResponseHandlers.get(request.source)
+    if (handler === undefined) {
+      ;(request as any)[handledSymbol] = true
+      return Effect.mapEager(handleResponse(request, response), () => response)
+    }
+    return Effect.flatMapEager(handler(request, response), (sentResponse) => {
+      ;(request as any)[handledSymbol] = true
+      return Effect.mapEager(handleResponse(request, sentResponse), () => response)
+    })
+  }
 
-  const withMiddleware: Effect.Effect<
+  const withMiddleware = (request: HttpServerRequest): Effect.Effect<
     unknown,
     E | EH | HttpServerError,
     HttpServerRequest | R | RH
-  > = middleware === undefined ?
-    tracer(responded) :
-    Effect.matchCauseEffect(tracer(middleware(responded)), {
-      onFailure(cause): Effect.Effect<void, EH, RH> {
-        const fiber = Fiber.getCurrent()!
-        reportCauseUnsafe(fiber, cause)
-        const request = Context.getUnsafe(fiber.context, HttpServerRequest)
-        if (handledSymbol in request) return Effect.void
-        return Effect.matchCauseEffectEager(causeResponse(cause), {
-          onFailure(_) {
-            return handleResponse(request, Response.empty({ status: 500 }))
-          },
-          onSuccess([response]) {
-            return handleResponse(request, response)
-          }
-        })
-      },
-      onSuccess(response): Effect.Effect<void, EH, RH> {
-        const fiber = Fiber.getCurrent()!
-        const request = Context.getUnsafe(fiber.context, Request.HttpServerRequest)
-        return handledSymbol in request ? Effect.void : handleResponse(request, response)
-      }
+  > => {
+    const responded = Effect.matchCauseEffect(self, {
+      onSuccess: (response) => sendResponse(request, response),
+      onFailure: (cause) => handleCause(request, cause)
     })
+    return middleware === undefined ?
+      responded :
+      Effect.matchCauseEffect(tracer(middleware(responded)), {
+        onFailure(cause): Effect.Effect<void, EH, RH> {
+          reportCauseUnsafe(Fiber.getCurrent()!, cause)
+          if (handledSymbol in request) return Effect.void
+          return Effect.matchCauseEffectEager(causeResponse(cause), {
+            onFailure(_) {
+              return handleResponse(request, Response.empty({ status: 500 }))
+            },
+            onSuccess([response]) {
+              return handleResponse(request, response)
+            }
+          })
+        },
+        onSuccess(response): Effect.Effect<void, EH, RH> {
+          return handledSymbol in request ? Effect.void : handleResponse(request, response)
+        }
+      })
+  }
+
+  // Apply tracing lazily so disabled requests can use the single-frame path.
+  const traced = (request: HttpServerRequest) =>
+    tracer(
+      withMiddleware(request) as Effect.Effect<
+        HttpServerResponse,
+        E | EH | HttpServerError,
+        HttpServerRequest | R | RH
+      >
+    )
+
+  // Handle untraced requests without middleware in one continuation frame.
+  // Effectful writes use `finishAfter` to restore state and close the scope.
+  const finishAfter = (
+    frame: RequestFrame,
+    fiber: Fiber.Fiber<unknown, unknown>,
+    effect: Effect.Effect<unknown, unknown, unknown>
+  ) =>
+    Effect.onExitPrimitive(effect, (exit) => {
+      fiber.setContext(frame.prev)
+      if (scopeEjected in frame.scope) return undefined
+      return Scope.closeUnsafe(frame.scope, exit)
+    }, true)
 
-  return Effect.uninterruptible(scoped(withMiddleware)) as any
+  class RequestFrame {
+    readonly scope: Scope.Closeable
+    readonly prev: Context.Context<never>
+    readonly request: HttpServerRequest
+    constructor(scope: Scope.Closeable, prev: Context.Context<never>, request: HttpServerRequest) {
+      this.scope = scope
+      this.prev = prev
+      this.request = request
+    }
+    [contA](response: HttpServerResponse, fiber: Fiber.Fiber<unknown, unknown>) {
+      const sent = sendResponse(this.request, response)
+      // Most response writes complete synchronously.
+      if (effectIsExit(sent) && sent._tag === "Success") {
+        fiber.setContext(this.prev)
+        if (scopeEjected in this.scope) return sent
+        const closed = Scope.closeUnsafe(this.scope, sent)
+        return closed === undefined ? sent : Effect.flatMap(closed, () => sent)
+      }
+      return finishAfter(this, fiber, sent)
+    }
+    [contE](cause: Cause.Cause<E | EH | HttpServerError>, fiber: Fiber.Fiber<unknown, unknown>) {
+      return finishAfter(this, fiber, handleCause(this.request, cause))
+    }
+  }
+
+  return Effect.withFiber((fiber) => {
+    fiberEnterUninterruptibleUnsafe(fiber)
+    const scope = Scope.makeUnsafe()
+    const frame = new RequestFrame(scope, fiber.context, Context.getUnsafe(fiber.context, HttpServerRequest))
+    fiber.setContext(Context.add(frame.prev, Scope.Scope, scope))
+    // The native tracer has no backend, so its spans are unobservable.
+    const currentTracer = fiber.cache.tracer
+    if (
+      middleware === undefined &&
+      (currentTracer === undefined || currentTracer === nativeTracer || isTracerDisabledUnsafe(fiber, frame.request))
+    ) {
+      ;(fiber as any)._stack.push(frame)
+      return self
+    }
+    return finishAfter(frame, fiber, middleware === undefined ? traced(frame.request) : withMiddleware(frame.request))
+  }) as any
 }
 
 const handledSymbol = Symbol.for("effect/http/HttpEffect/handled")
@@ -145,7 +211,7 @@ export const scopeTransferToStream = (
   const fiber = Fiber.getCurrent()!
   const scope = Context.getUnsafe(fiber.context, Scope.Scope) as Scope.Closeable
   scopeDisableClose(scope)
-  return Response.setBody(
+  return Response.setBodyKeepHeaders(
     response,
     HttpBody.stream(
       Stream.onExit(response.body.stream, (exit) => Scope.close(scope, exit)),
@@ -157,18 +223,6 @@ export const scopeTransferToStream = (
 
 const scopeEjected = Symbol.for("effect/http/HttpEffect/scopeEjected")
 
-const scoped = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
-  Effect.withFiber((fiber) => {
-    const scope = Scope.makeUnsafe()
-    const prevServices = fiber.context
-    fiber.setContext(Context.add(fiber.context, Scope.Scope, scope))
-    return Effect.onExitPrimitive(effect, (exit) => {
-      fiber.setContext(prevServices)
-      if (scopeEjected in scope) return undefined
-      return Scope.closeUnsafe(scope, exit)
-    }, true)
-  })
-
 /**
  * Function run with the current request and response just before the response is sent, allowing the response to be replaced or failing with `HttpServerError`.
  *
@@ -241,9 +295,12 @@ export const toWebHandlerWith = <Provided, R = never, ReqR = Exclude<R, Provided
 {
   const resolveSymbol = Symbol.for("@effect/platform/HttpApp/resolve")
   const httpApp = toHandled(self, (request, response) => {
-    response = scopeTransferToStream(response)
+    const withoutBody = request.method === "HEAD"
+    if (!Response.omitsBody(response, withoutBody)) {
+      response = scopeTransferToStream(response)
+    }
     ;(request as any)[resolveSymbol](
-      Response.toWeb(response, { withoutBody: request.method === "HEAD", context })
+      Response.toWeb(response, { withoutBody, context })
     )
     return Effect.void
   }, middleware)
@@ -259,9 +316,11 @@ export const toWebHandlerWith = <Provided, R = never, ReqR = Exclude<R, Provided
       reqContext = Context.add(reqContext, HttpServerRequest, httpServerRequest)
       ;(httpServerRequest as any)[resolveSymbol] = resolve
       const fiber = Effect.runForkWith(reqContext)(httpApp as any)
-      request.signal?.addEventListener("abort", () => {
-        fiber.interruptUnsafe(undefined, ClientAbort.annotation)
-      }, { once: true })
+      if (fiber.pollUnsafe() === undefined) {
+        request.signal?.addEventListener("abort", () => {
+          fiber.interruptUnsafe(undefined, ClientAbort.annotation)
+        }, { once: true })
+      }
     })
 }
 
@@ -280,6 +339,14 @@ export const toWebHandler: <E>(
 /**
  * Builds a Web `Request` handler from a layer and handler factory, returning the handler with a `dispose` function for the layer scope.
  *
+ * **Details**
+ *
+ * The layer is built immediately, so the cost is paid when the handler is
+ * created rather than on the first request. A layer that performs asynchronous
+ * work while building may still be in progress when the first request arrives,
+ * in which case that request waits for the build to finish. If the build fails,
+ * every request rejects with the build error.
+ *
  * @category converting
  * @since 4.0.0
  */
@@ -315,9 +382,18 @@ export const toWebHandlerLayerWith = <
   let handlerCache:
     | ((request: Request, context?: Context.Context<ReqR> | undefined) => Promise<globalThis.Response>)
     | undefined
-  let handlerPromise:
-    | Promise<(request: Request, context?: Context.Context<ReqR> | undefined) => Promise<globalThis.Response>>
-    | undefined
+  const handlerPromise = Effect.runPromise(Effect.gen(function*() {
+    const context = yield* (options.memoMap
+      ? Layer.buildWithMemoMap(layer, options.memoMap, scope)
+      : Layer.buildWithScope(layer, scope))
+    return handlerCache = toWebHandlerWith<Provided, R>(context)(
+      yield* options.toHandler(context),
+      options.middleware
+    ) as any
+  }))
+  // A failed build must not become an unhandled rejection at startup. Every
+  // request still rejects with the build error below.
+  handlerPromise.catch(constVoid)
   function handler(
     request: Request,
     context?: Context.Context<ReqR> | undefined
@@ -325,15 +401,6 @@ export const toWebHandlerLayerWith = <
     if (handlerCache) {
       return handlerCache(request, context)
     }
-    handlerPromise ??= Effect.runPromise(Effect.gen(function*() {
-      const context = yield* (options.memoMap
-        ? Layer.buildWithMemoMap(layer, options.memoMap, scope)
-        : Layer.buildWithScope(layer, scope))
-      return handlerCache = toWebHandlerWith<Provided, R>(context)(
-        yield* options.toHandler(context),
-        options.middleware
-      ) as any
-    }))
     return handlerPromise.then((f) => f(request, context))
   }
   return { dispose, handler: handler as any } as const
@@ -342,6 +409,14 @@ export const toWebHandlerLayerWith = <
 /**
  * Builds a Web `Request` handler for an HTTP server effect using a layer to provide its services, returning the handler with a `dispose` function.
  *
+ * **Details**
+ *
+ * The layer is built immediately, so the cost is paid when the handler is
+ * created rather than on the first request. A layer that performs asynchronous
+ * work while building may still be in progress when the first request arrives,
+ * in which case that request waits for the build to finish. If the build fails,
+ * every request rejects with the build error.
+ *
  * @category converting
  * @since 4.0.0
  */
diff --git a/repos/effect/packages/effect/src/unstable/http/HttpIncomingMessage.ts b/repos/effect/packages/effect/src/unstable/http/HttpIncomingMessage.ts
index 1b915334f..c2420bdeb 100644
--- a/repos/effect/packages/effect/src/unstable/http/HttpIncomingMessage.ts
+++ b/repos/effect/packages/effect/src/unstable/http/HttpIncomingMessage.ts
@@ -9,9 +9,9 @@
  *
  * @since 4.0.0
  */
+import type * as ByteSize from "../../ByteSize.ts"
 import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
-import type * as FileSystem from "../../FileSystem.ts"
 import type * as Inspectable from "../../Inspectable.ts"
 import type * as Option from "../../Option.ts"
 import { hasProperty } from "../../Predicate.ts"
@@ -20,7 +20,7 @@ import * as Schema from "../../Schema.ts"
 import type { ParseOptions } from "../../SchemaAST.ts"
 import type * as Stream from "../../Stream.ts"
 import type * as Headers from "./Headers.ts"
-import * as UrlParams from "./UrlParams.ts"
+import type * as UrlParams from "./UrlParams.ts"
 
 /**
  * Type identifier for `HttpIncomingMessage` values.
@@ -102,7 +102,7 @@ export const schemaBodyUrlParams = <
   schema: Schema.ConstraintCodec<A, I, RD, unknown>,
   options?: ParseOptions | undefined
 ) => {
-  const decode = UrlParams.schemaRecord.pipe(
+  const decode = Schema.RecordFromUrlParams.pipe(
     Schema.decodeTo(schema),
     Schema.decodeEffect
   )
@@ -130,7 +130,7 @@ export const schemaHeaders = <A, I extends Readonly<Record<string, string | unde
  * @category references
  * @since 4.0.0
  */
-export const MaxBodySize = Context.Reference<FileSystem.Size | undefined>(
+export const MaxBodySize = Context.Reference<ByteSize.ByteSize | undefined>(
   "effect/http/HttpIncomingMessage/MaxBodySize",
   { defaultValue: () => undefined }
 )
diff --git a/repos/effect/packages/effect/src/unstable/http/HttpMethod.ts b/repos/effect/packages/effect/src/unstable/http/HttpMethod.ts
index 0b87104ec..4352c55a2 100644
--- a/repos/effect/packages/effect/src/unstable/http/HttpMethod.ts
+++ b/repos/effect/packages/effect/src/unstable/http/HttpMethod.ts
@@ -24,6 +24,7 @@ export type HttpMethod =
   | "HEAD"
   | "OPTIONS"
   | "TRACE"
+  | "QUERY"
 
 /**
  * Namespace containing subtype helpers associated with `HttpMethod`.
@@ -76,7 +77,8 @@ export const all: ReadonlySet<HttpMethod> = new Set([
   "PATCH",
   "HEAD",
   "OPTIONS",
-  "TRACE"
+  "TRACE",
+  "QUERY"
 ])
 
 /**
@@ -99,7 +101,8 @@ export const allShort = [
   ["PATCH", "patch"],
   ["HEAD", "head"],
   ["OPTIONS", "options"],
-  ["TRACE", "trace"]
+  ["TRACE", "trace"],
+  ["QUERY", "query"]
 ] as const
 
 /**
diff --git a/repos/effect/packages/effect/src/unstable/http/HttpMiddleware.ts b/repos/effect/packages/effect/src/unstable/http/HttpMiddleware.ts
index 37b547ac5..54afad311 100644
--- a/repos/effect/packages/effect/src/unstable/http/HttpMiddleware.ts
+++ b/repos/effect/packages/effect/src/unstable/http/HttpMiddleware.ts
@@ -14,14 +14,14 @@ import { Clock } from "../../Clock.ts"
 import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import * as Exit from "../../Exit.ts"
+import type * as Fiber from "../../Fiber.ts"
 import { constant, constFalse } from "../../Function.ts"
 import * as internalEffect from "../../internal/effect.ts"
 import * as Layer from "../../Layer.ts"
 import * as Option from "../../Option.ts"
 import type { Predicate } from "../../Predicate.ts"
 import type { ReadonlyRecord } from "../../Record.ts"
-import { TracerEnabled } from "../../References.ts"
-import { ParentSpan } from "../../Tracer.ts"
+import { nativeTracer, ParentSpan, Tracer } from "../../Tracer.ts"
 import * as Headers from "./Headers.ts"
 import type { CompressionAlgorithm } from "./HttpPlatform.ts"
 import { HttpPlatform } from "./HttpPlatform.ts"
@@ -171,6 +171,12 @@ export const logger: <E, R>(
   })
 )
 
+/** @internal */
+export const isTracerDisabledUnsafe = (
+  fiber: Fiber.Fiber<unknown, unknown>,
+  request: HttpServerRequest
+): boolean => !fiber.cache.tracerEnabled || fiber.getRef(TracerDisabledWhen)(request)
+
 /**
  * Middleware that creates a server trace span for each request and records request and response HTTP attributes.
  *
@@ -182,8 +188,7 @@ export const tracer: <E, R>(
 ) => Effect.Effect<HttpServerResponse, E, HttpServerRequest | R> = make((httpApp) =>
   Effect.withFiber((fiber) => {
     const request = Context.getUnsafe(fiber.context, HttpServerRequest)
-    const disabled = !fiber.getRef(TracerEnabled) || fiber.getRef(TracerDisabledWhen)(request)
-    if (disabled) {
+    if (isTracerDisabledUnsafe(fiber, request)) {
       return httpApp
     }
     const nameGenerator = fiber.getRef(SpanNameGenerator)
@@ -196,6 +201,11 @@ export const tracer: <E, R>(
     return Effect.onExitPrimitive(httpApp, (exit) => {
       fiber.setContext(prevServices)
       const endTime = fiber.getRef(Clock).currentTimeNanosUnsafe()
+      if (Exit.isSuccess(exit) && (!span.sampled || fiber.getRef(Tracer) === nativeTracer)) {
+        span.end(endTime, exit)
+        return undefined
+      }
+      const redactedHeaderNames = fiber.getRef(Headers.CurrentRedactedNames)
       fiber.currentDispatcher.scheduleTask(() => {
         let response: HttpServerResponse
         let spanExit = exit
@@ -207,7 +217,6 @@ export const tracer: <E, R>(
           response = exit.value
         }
         if (span.sampled) {
-          const redactedHeaderNames = fiber.getRef(Headers.CurrentRedactedNames)
           span.attribute("http.request.method", request.method)
           if (request.url.startsWith("/")) {
             const host = request.headers.host ?? "localhost"
@@ -336,8 +345,8 @@ export const cors = (options?: {
     : (origin: string) => (opts.allowedOrigins as ReadonlyArray<string>).includes(origin)
 
   const allowOrigin = typeof opts.allowedOrigins === "function" || opts.allowedOrigins.length > 1
-    ? ((originHeader: string) => {
-      if (!isAllowedOrigin(originHeader)) return undefined
+    ? ((originHeader: string): ReadonlyRecord<string, string> => {
+      if (!isAllowedOrigin(originHeader)) return { vary: "Origin" }
       return {
         "access-control-allow-origin": originHeader,
         vary: "Origin"
@@ -399,18 +408,36 @@ export const cors = (options?: {
   const headersFromRequestOptions = (request: HttpServerRequest) => {
     const origin = request.headers["origin"]
     const accessControlRequestHeaders = request.headers["access-control-request-headers"]
-    return Headers.fromRecordUnsafe({
+    const headers = Headers.fromRecordUnsafe({
       ...allowOrigin(origin),
       ...allowCredentials,
       ...exposeHeaders,
       ...allowMethods,
-      ...allowHeaders(accessControlRequestHeaders),
       ...maxAge
     })
+    const accessControlHeaders = allowHeaders(accessControlRequestHeaders)
+    if (accessControlHeaders === undefined) return headers
+    const vary = accessControlHeaders["vary"]
+    return Headers.setAll(
+      headers,
+      vary === undefined
+        ? accessControlHeaders
+        : {
+          ...accessControlHeaders,
+          vary: compressionInternal.varyWith(headers, vary)
+        }
+    )
   }
 
-  const preResponseHandler = (request: HttpServerRequest, response: HttpServerResponse) =>
-    Effect.succeed(Response.setHeaders(response, headersFromRequest(request)))
+  const preResponseHandler = (request: HttpServerRequest, response: HttpServerResponse) => {
+    const headers = headersFromRequest(request)
+    return Effect.succeed(Response.setHeaders(
+      response,
+      headers["vary"] === undefined
+        ? headers
+        : Headers.set(headers, "vary", compressionInternal.varyWith(response.headers, "Origin"))
+    ))
+  }
 
   return <E, R>(
     httpApp: Effect.Effect<HttpServerResponse, E, R>
@@ -562,8 +589,8 @@ export const compression = (
 }
 
 const withVary = (response: HttpServerResponse): HttpServerResponse => {
-  const vary = compressionInternal.varyAcceptEncoding(response.headers)
-  return vary === undefined ? response : Response.setHeader(response, "vary", vary)
+  const vary = compressionInternal.varyWith(response.headers, "Accept-Encoding")
+  return Response.setHeader(response, "vary", vary)
 }
 
 const defaultAlgorithms: ReadonlyArray<CompressionAlgorithm> = ["br", "gzip", "deflate"]
diff --git a/repos/effect/packages/effect/src/unstable/http/HttpPlatform.ts b/repos/effect/packages/effect/src/unstable/http/HttpPlatform.ts
index 7c687888f..e220397c6 100644
--- a/repos/effect/packages/effect/src/unstable/http/HttpPlatform.ts
+++ b/repos/effect/packages/effect/src/unstable/http/HttpPlatform.ts
@@ -9,19 +9,21 @@
  *
  * @since 4.0.0
  */
+import * as ByteSize from "../../ByteSize.ts"
 import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import * as FileSystem from "../../FileSystem.ts"
 import { identity } from "../../Function.ts"
 import * as Layer from "../../Layer.ts"
 import * as Option from "../../Option.ts"
-import type { PlatformError } from "../../PlatformError.ts"
+import { badArgument, type PlatformError } from "../../PlatformError.ts"
 import * as Stream from "../../Stream.ts"
 import * as Etag from "./Etag.ts"
 import * as Headers from "./Headers.ts"
 import type * as Body from "./HttpBody.ts"
 import * as Response from "./HttpServerResponse.ts"
 import * as internal from "./internal/compression.ts"
+import * as Mime from "./Mime.ts"
 
 /**
  * Service for platform-specific HTTP response helpers, including file-backed server responses.
@@ -34,18 +36,18 @@ export class HttpPlatform extends Context.Service<HttpPlatform, {
   readonly compression: Compression
   readonly fileResponse: (
     path: string,
-    options?: Response.Options.WithContent & {
-      readonly bytesToRead?: FileSystem.SizeInput | undefined
-      readonly chunkSize?: FileSystem.SizeInput | undefined
-      readonly offset?: FileSystem.SizeInput | undefined
+    options?: Response.Options.WithContentType & {
+      readonly bytesToRead?: ByteSize.Input | undefined
+      readonly chunkSize?: number | undefined
+      readonly offset?: ByteSize.Input | undefined
     }
   ) => Effect.Effect<Response.HttpServerResponse, PlatformError>
   readonly fileWebResponse: (
     file: Body.HttpBody.FileLike,
-    options?: Response.Options.WithContent & {
-      readonly bytesToRead?: FileSystem.SizeInput | undefined
-      readonly chunkSize?: FileSystem.SizeInput | undefined
-      readonly offset?: FileSystem.SizeInput | undefined
+    options?: Response.Options.WithContentType & {
+      readonly bytesToRead?: number | undefined
+      readonly chunkSize?: number | undefined
+      readonly offset?: number | undefined
     }
   ) => Effect.Effect<Response.HttpServerResponse>
 }>()("effect/http/HttpPlatform") {}
@@ -66,7 +68,7 @@ export const make: (impl: {
     headers: Headers.Headers,
     start: number,
     end: number | undefined,
-    contentLength: number
+    contentLength: bigint
   ) => Response.HttpServerResponse
   readonly fileWebResponse: (
     file: Body.HttpBody.FileLike,
@@ -74,9 +76,9 @@ export const make: (impl: {
     statusText: string | undefined,
     headers: Headers.Headers,
     options?: {
-      readonly bytesToRead?: FileSystem.SizeInput | undefined
-      readonly chunkSize?: FileSystem.SizeInput | undefined
-      readonly offset?: FileSystem.SizeInput | undefined
+      readonly bytesToRead?: number | undefined
+      readonly chunkSize?: number | undefined
+      readonly offset?: number | undefined
     }
   ) => Response.HttpServerResponse
 }) => Effect.Effect<
@@ -93,17 +95,22 @@ export const make: (impl: {
     fileResponse: Effect.fnUntraced(function*(path, options) {
       const info = yield* fs.stat(path)
       const etag = yield* etagGen.fromFileInfo(info)
-      const start = Number(options?.offset ?? 0)
-      const end = options?.bytesToRead !== undefined ? start + Number(options.bytesToRead) : undefined
-      const headers = Headers.set(
-        options?.headers ? Headers.fromInput(options.headers) : Headers.empty,
-        "etag",
-        Etag.toString(etag)
-      )
+      const requestedOffset = options?.offset === undefined
+        ? ByteSize.zero
+        : yield* fileResponseSize(options.offset, "offset")
+      const offset = requestedOffset > info.size ? info.size : requestedOffset
+      const available = info.size - offset
+      const bytesToRead = options?.bytesToRead !== undefined
+        ? yield* fileResponseSize(options.bytesToRead, "bytesToRead")
+        : undefined
+      const contentLength = bytesToRead === undefined || bytesToRead > available ? available : bytesToRead
+      const limit = bytesToRead === undefined ? undefined : offset + contentLength
+      const start = yield* fileResponseNumber(offset, "offset")
+      const end = limit === undefined ? undefined : yield* fileResponseNumber(limit, "end")
+      const headers = Headers.set(optionHeaders(options), "etag", Etag.toString(etag))
       if (Option.isSome(info.mtime)) {
         ;(headers as any)["last-modified"] = info.mtime.value.toUTCString()
       }
-      const contentLength = end !== undefined ? end - start : Number(info.size) - start
       return impl.fileResponse(
         path,
         options?.status ?? 200,
@@ -117,7 +124,7 @@ export const make: (impl: {
     fileWebResponse(file, options) {
       return Effect.map(etagGen.fromFileWeb(file), (etag) => {
         const headers = Headers.merge(
-          options?.headers ? Headers.fromInput(options.headers) : Headers.empty,
+          optionHeaders(options),
           Headers.fromRecordUnsafe({
             etag: Etag.toString(etag),
             "last-modified": new Date(file.lastModified).toUTCString()
@@ -135,6 +142,33 @@ export const make: (impl: {
   })
 })
 
+const optionHeaders = (options: Response.Options.WithContentType | undefined): Headers.Headers => {
+  const headers = options?.headers ? Headers.fromInput(options.headers) : Headers.empty
+  return options?.contentType ? Headers.set(headers, "content-type", options.contentType) : headers
+}
+
+const fileResponseSize = (input: ByteSize.Input, field: string): Effect.Effect<ByteSize.ByteSize, PlatformError> => {
+  const size = ByteSize.fromInput(input)
+  return Option.isSome(size)
+    ? Effect.succeed(size.value)
+    : Effect.fail(badArgument({
+      module: "HttpPlatform",
+      method: "fileResponse",
+      description: `Invalid ${field}: ${input}`
+    }))
+}
+
+const fileResponseNumber = (value: bigint, field: string): Effect.Effect<number, PlatformError> => {
+  const number = Number(value)
+  return Number.isSafeInteger(number)
+    ? Effect.succeed(number)
+    : Effect.fail(badArgument({
+      module: "HttpPlatform",
+      method: "fileResponse",
+      description: `${field} exceeds the safe integer range: ${value}`
+    }))
+}
+
 /**
  * Provides the default `HttpPlatform` implementation for serving file paths and
  * `File`-like values as streamed HTTP responses.
@@ -142,7 +176,8 @@ export const make: (impl: {
  * **Details**
  *
  * The layer uses the `FileSystem` and weak ETag services to add file metadata
- * headers such as `etag` and `last-modified`.
+ * headers such as `etag` and `last-modified`. Missing content types are inferred
+ * from the file extension.
  *
  * @category layers
  * @since 4.0.0
@@ -153,19 +188,30 @@ export const layer = Layer.effect(HttpPlatform)(
       platform: "web",
       compression: internal.compressionWeb,
       fileResponse(path, status, statusText, headers, start, end, contentLength) {
+        const length = Number(contentLength)
         return Response.stream(
           fs.stream(path, {
             offset: start,
             bytesToRead: end !== undefined ? end - start : undefined
           }),
-          { contentLength, headers, status, statusText }
+          {
+            contentType: headers["content-type"] ?? mimeType(path),
+            // Omit unsafe numeric metadata so it cannot overwrite the exact header.
+            contentLength: Number.isSafeInteger(length) ? length : undefined,
+            headers: Headers.set(headers, "content-length", contentLength.toString()),
+            status,
+            statusText
+          }
         )
       },
       fileWebResponse(file, status, statusText, headers, options) {
-        const offset = Number(options?.offset ?? 0)
-        const bytesToRead = options?.bytesToRead !== undefined ? Number(options.bytesToRead) : undefined
-        const chunkSize = options?.chunkSize !== undefined ? Math.max(1, Number(options.chunkSize)) : Infinity
-        const end = offset + (bytesToRead ?? Infinity)
+        const offset = Math.min(Math.max(options?.offset ?? 0, 0), file.size)
+        const available = file.size - offset
+        const contentLength = options?.bytesToRead === undefined
+          ? available
+          : Math.min(Math.max(options.bytesToRead, 0), available)
+        const chunkSize = options?.chunkSize !== undefined ? Math.max(1, options.chunkSize) : Infinity
+        const end = offset + contentLength
         const stream = end <= offset
           ? Stream.empty
           : Stream.fromReadableStream({
@@ -192,7 +238,8 @@ export const layer = Layer.effect(HttpPlatform)(
             Stream.map((chunk) => chunk.bytes)
           )
         return Response.stream(stream, {
-          contentLength: bytesToRead ?? file.size - offset,
+          contentType: headers["content-type"] ?? (file.type === "" ? mimeType(file.name) : file.type),
+          contentLength,
           headers,
           status,
           statusText
@@ -201,6 +248,8 @@ export const layer = Layer.effect(HttpPlatform)(
     }))
 ).pipe(Layer.provide(Etag.layerWeak))
 
+const mimeType = (path: string): string => Option.getOrElse(Mime.getType(path), () => "application/octet-stream")
+
 /**
  * Content codings that HTTP response compression can apply.
  *
diff --git a/repos/effect/packages/effect/src/unstable/http/HttpRouter.ts b/repos/effect/packages/effect/src/unstable/http/HttpRouter.ts
index 9d976ed27..14f346f26 100644
--- a/repos/effect/packages/effect/src/unstable/http/HttpRouter.ts
+++ b/repos/effect/packages/effect/src/unstable/http/HttpRouter.ts
@@ -13,6 +13,7 @@ import * as Arr from "../../Array.ts"
 import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import { compose, dual, identity } from "../../Function.ts"
+import { fiberEnterInterruptibleUnsafe } from "../../internal/effect.ts"
 import * as Layer from "../../Layer.ts"
 import * as Option from "../../Option.ts"
 import type { ReadonlyRecord } from "../../Record.ts"
@@ -51,7 +52,7 @@ export interface HttpRouter {
   readonly prefixed: (prefix: string) => HttpRouter
 
   readonly add: <E = never, R = never>(
-    method: "*" | "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "OPTIONS",
+    method: "*" | "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "OPTIONS" | "QUERY",
     path: PathInput,
     handler:
       | HttpServerResponse.HttpServerResponse
@@ -163,9 +164,10 @@ export const make = Effect.gen(function*() {
   return HttpRouter.of({
     [TypeId]: TypeId,
     prefixed(this: HttpRouter, prefix: string) {
+      prefix = removeTrailingSlash(prefix as PathInput)
       return HttpRouter.of({
         ...this,
-        prefixed: (newPrefix: string) => this.prefixed(prefixPath(prefix, newPrefix)),
+        prefixed: (newPrefix: string) => this.prefixed(prefixPath(newPrefix, prefix)),
         addAll: (routes) => addAll(routes.map(prefixRoute(prefix))) as any,
         add: (method, path, handler, options) =>
           addAll([
@@ -218,19 +220,22 @@ export const make = Effect.gen(function*() {
           params: result.params
         })
 
-        const span = Context.getOrUndefined(context, Tracer.ParentSpan)
-        if (span && span._tag === "Span") {
-          span.attribute("http.route", route.path)
+        if (fiber.getRef(Tracer.Tracer) !== Tracer.nativeTracer) {
+          const span = Context.getOrUndefined(context, Tracer.ParentSpan)
+          if (span !== undefined && span._tag === "Span" && span.sampled) {
+            span.attribute("http.route", route.path)
+          }
+        }
+        // The enclosing request restores the fiber context on exit.
+        fiber.setContext(context)
+        if (!route.uninterruptible) {
+          const interrupted = fiberEnterInterruptibleUnsafe(fiber)
+          if (interrupted !== undefined) return interrupted
         }
-        return Effect.updateContext(
-          (route.uninterruptible ?
-            route.handler :
-            Effect.interruptible(route.handler)) as Effect.Effect<
-              HttpServerResponse.HttpServerResponse,
-              unknown
-            >,
-          () => context
-        )
+        return route.handler as Effect.Effect<
+          HttpServerResponse.HttpServerResponse,
+          unknown
+        >
       })
       if (middleware.size === 0) return handler
       for (const fn of Arr.reverse(middleware)) {
@@ -293,7 +298,9 @@ export const params: Effect.Effect<
   ReadonlyRecord<string, string | undefined>,
   never,
   RouteContext
-> = Effect.map(RouteContext, (_) => _.params)
+> = Effect.withFiberSucceed((fiber) =>
+  Context.getUnsafe(fiber.context as Context.Context<RouteContext>, RouteContext).params
+)
 
 /**
  * Decodes a schema from the current request and its JSON body.
@@ -502,7 +509,7 @@ export const use = <A, E, R>(
  * @since 4.0.0
  */
 export const add = <E = never, R = never>(
-  method: "*" | "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "OPTIONS",
+  method: "*" | "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "OPTIONS" | "QUERY",
   path: PathInput,
   handler:
     | HttpServerResponse.HttpServerResponse
@@ -745,7 +752,7 @@ export const prefixRoute: {
     ...self,
     path: prefixPath(self.path, prefix) as PathInput,
     prefix: Option.match(self.prefix, {
-      onNone: () => prefix as string,
+      onNone: () => removeTrailingSlash(prefix as PathInput),
       onSome: (existingPrefix) => prefixPath(existingPrefix, prefix) as string
     })
   }))
@@ -1281,7 +1288,11 @@ export const serve = <A, E, R, HE, HR = Request.Only<"Requires", R> | Request.On
  *
  * The result contains a `handler` function that converts Web `Request` values to
  * Web `Response` values and a `dispose` function for releasing the layer
- * resources.
+ * resources. The layer is built immediately, so the cost is paid when the
+ * handler is created rather than on the first request. A layer that performs
+ * asynchronous work while building may still be in progress when the first
+ * request arrives, in which case that request waits for the build to finish.
+ * If the build fails, every request rejects with the build error.
  *
  * @category converting
  * @since 4.0.0
diff --git a/repos/effect/packages/effect/src/unstable/http/HttpServer.ts b/repos/effect/packages/effect/src/unstable/http/HttpServer.ts
index f8de5dbb3..c516efceb 100644
--- a/repos/effect/packages/effect/src/unstable/http/HttpServer.ts
+++ b/repos/effect/packages/effect/src/unstable/http/HttpServer.ts
@@ -16,6 +16,7 @@ import { dual } from "../../Function.ts"
 import * as Layer from "../../Layer.ts"
 import * as Path from "../../Path.ts"
 import type * as Scope from "../../Scope.ts"
+import * as NetAddress from "../net/NetAddress.ts"
 import * as Etag from "./Etag.ts"
 import * as HttpClient from "./HttpClient.ts"
 import * as ClientRequest from "./HttpClientRequest.ts"
@@ -52,44 +53,9 @@ export class HttpServer extends Context.Service<HttpServer, {
     >
   }
 
-  readonly address: Address
+  readonly address: NetAddress.SocketAddress
 }>()("effect/http/HttpServer") {}
 
-/**
- * Address where an HTTP server is listening.
- *
- * **Details**
- *
- * The address is either a TCP host and port or a Unix domain socket path.
- *
- * @category models
- * @since 4.0.0
- */
-export type Address = UnixAddress | TcpAddress
-
-/**
- * TCP address for an HTTP server, identified by hostname and port.
- *
- * @category models
- * @since 4.0.0
- */
-export interface TcpAddress {
-  readonly _tag: "TcpAddress"
-  readonly hostname: string
-  readonly port: number
-}
-
-/**
- * Unix domain socket address for an HTTP server.
- *
- * @category models
- * @since 4.0.0
- */
-export interface UnixAddress {
-  readonly _tag: "UnixAddress"
-  readonly path: string
-}
-
 /**
  * Constructs an `HttpServer` service from a serving implementation and listening
  * address.
@@ -103,7 +69,7 @@ export const make = (
       httpEffect: Effect.Effect<HttpServerResponse, unknown, HttpServerRequest | Scope.Scope>,
       middleware?: Middleware.HttpMiddleware
     ) => Effect.Effect<void, never, Scope.Scope>
-    readonly address: Address
+    readonly address: NetAddress.SocketAddress
   }
 ): HttpServer["Service"] => options
 
@@ -203,24 +169,17 @@ export const serveEffect: {
 > => HttpServer.use((server) => server.serve(effect, middleware!)) as any)
 
 /**
- * Formats a server address as a display string.
+ * Formats a server address as a display string using {@link NetAddress.formatUrlUnsafe}.
  *
- * **Details**
+ * **Gotchas**
  *
- * TCP addresses are formatted as `http://host:port`; Unix socket addresses are
- * formatted as `unix://path`.
+ * Throws a `NetAddressError` when URL conversion fails, including for scoped
+ * IPv6 addresses. Unix socket paths are displayed with a `unix://` prefix.
  *
  * @category converting
  * @since 4.0.0
  */
-export const formatAddress = (address: Address): string => {
-  switch (address._tag) {
-    case "UnixAddress":
-      return `unix://${address.path}`
-    case "TcpAddress":
-      return `http://${address.hostname}:${address.port}`
-  }
-}
+export const formatAddress: (address: NetAddress.SocketAddress) => string = NetAddress.formatUrlUnsafe
 
 /**
  * Reads the current server address, formats it with `formatAddress`, and passes
@@ -265,12 +224,12 @@ export const withLogAddress = <A, E, R>(
  *
  * **Details**
  *
- * For TCP servers, requests are prefixed with the server URL and `0.0.0.0` is
- * rewritten to `127.0.0.1`.
+ * For internet servers, requests are prefixed with the server URL and unspecified
+ * addresses are replaced by IPv4 loopback, including dual-stack `::` listeners.
  *
  * **Gotchas**
  *
- * Unix socket addresses are not supported.
+ * Unix socket addresses and scoped IPv6 addresses are not supported.
  *
  * @category testing
  * @since 4.0.0
@@ -283,12 +242,14 @@ export const makeTestClient: Effect.Effect<
   const server = yield* HttpServer
   const client = yield* HttpClient.HttpClient
   const address = server.address
-  if (address._tag === "UnixAddress") {
-    return yield* Effect.die(new Error("HttpServer.layerTestClient: UnixAddress not supported"))
+  if (NetAddress.isUnixPathAddress(address)) {
+    return yield* Effect.die(new Error("HttpServer.layerTestClient: UnixPathAddress not supported"))
+  }
+  const url = yield* Effect.fromResult(NetAddress.toUrl(address)).pipe(Effect.orDie)
+  if (NetAddress.isUnspecified(address.address)) {
+    url.hostname = NetAddress.formatIp(NetAddress.ipv4Loopback)
   }
-  const host = address.hostname === "0.0.0.0" ? "127.0.0.1" : address.hostname
-  const url = `http://${host}:${address.port}`
-  return HttpClient.mapRequest(client, ClientRequest.prependUrl(url))
+  return HttpClient.mapRequest(client, ClientRequest.prependUrl(url.origin))
 })
 
 /**
diff --git a/repos/effect/packages/effect/src/unstable/http/HttpServerRequest.ts b/repos/effect/packages/effect/src/unstable/http/HttpServerRequest.ts
index 0fa6521ef..2fc44e965 100644
--- a/repos/effect/packages/effect/src/unstable/http/HttpServerRequest.ts
+++ b/repos/effect/packages/effect/src/unstable/http/HttpServerRequest.ts
@@ -351,7 +351,7 @@ export const schemaBodyFormJson = <A, RD>(
 ) => {
   const parseMultipart = Multipart.schemaJson(schema, options)
   return (field: string) => {
-    const parseUrlParams = UrlParams.schemaJsonField(field, options).pipe(
+    const parseUrlParams = Schema.JsonFromUrlParamsField(field, options).pipe(
       Schema.decodeTo(schema),
       Schema.decodeEffect
     )
@@ -840,7 +840,11 @@ class ClientRequestImpl extends Inspectable.Class implements HttpServerRequest {
   }
 
   get arrayBuffer(): Effect.Effect<ArrayBuffer, HttpServerError> {
-    return Effect.map(this.bytes, (bytes) => bytes.slice().buffer)
+    return Effect.map(
+      this.bytes,
+      // Copy this view because Buffer views may share a larger ArrayBuffer.
+      (bytes) => bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength) as ArrayBuffer
+    )
   }
 
   get upgrade(): Effect.Effect<Socket.Socket, HttpServerError> {
diff --git a/repos/effect/packages/effect/src/unstable/http/HttpServerRespondable.ts b/repos/effect/packages/effect/src/unstable/http/HttpServerRespondable.ts
index 3a377d075..627d61f81 100644
--- a/repos/effect/packages/effect/src/unstable/http/HttpServerRespondable.ts
+++ b/repos/effect/packages/effect/src/unstable/http/HttpServerRespondable.ts
@@ -10,8 +10,8 @@
  */
 import * as Cause from "../../Cause.ts"
 import * as Effect from "../../Effect.ts"
+import * as Schema from "../../internal/schemaError.ts"
 import { hasProperty } from "../../Predicate.ts"
-import * as Schema from "../../Schema.ts"
 import type { HttpServerResponse } from "./HttpServerResponse.ts"
 import * as Response from "./HttpServerResponse.ts"
 
diff --git a/repos/effect/packages/effect/src/unstable/http/HttpServerResponse.ts b/repos/effect/packages/effect/src/unstable/http/HttpServerResponse.ts
index 2df3595be..f03c22aad 100644
--- a/repos/effect/packages/effect/src/unstable/http/HttpServerResponse.ts
+++ b/repos/effect/packages/effect/src/unstable/http/HttpServerResponse.ts
@@ -10,11 +10,11 @@
  *
  * @since 4.0.0
  */
+import type * as ByteSize from "../../ByteSize.ts"
 import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import * as ErrorReporter from "../../ErrorReporter.ts"
-import type * as FileSystem from "../../FileSystem.ts"
-import { dual } from "../../Function.ts"
+import { constVoid, dual } from "../../Function.ts"
 import * as Inspectable from "../../Inspectable.ts"
 import { PipeInspectableProto } from "../../internal/core.ts"
 import * as Option from "../../Option.ts"
@@ -34,6 +34,7 @@ import * as HttpClientRequest from "./HttpClientRequest.ts"
 import * as HttpClientResponse from "./HttpClientResponse.ts"
 import * as HttpIncomingMessage from "./HttpIncomingMessage.ts"
 import type { HttpPlatform } from "./HttpPlatform.ts"
+import * as headersInternal from "./internal/headers.ts"
 import * as bodyInternal from "./internal/httpBody.ts"
 import * as Template from "./Template.ts"
 import * as UrlParams from "./UrlParams.ts"
@@ -476,7 +477,7 @@ const HttpPlatformKey = Context.Service<
  * **Details**
  *
  * The effect requires `HttpPlatform`, can fail with a platform error, and supports
- * options for status, headers, offset, and byte range.
+ * options for status, headers, content type, offset, and byte range.
  *
  * @category constructors
  * @since 4.0.0
@@ -484,10 +485,10 @@ const HttpPlatformKey = Context.Service<
 export const file = (
   path: string,
   options?:
-    | (Options & {
-      readonly bytesToRead?: FileSystem.SizeInput | undefined
-      readonly chunkSize?: FileSystem.SizeInput | undefined
-      readonly offset?: FileSystem.SizeInput | undefined
+    | (Options.WithContentType & {
+      readonly bytesToRead?: ByteSize.Input | undefined
+      readonly chunkSize?: number | undefined
+      readonly offset?: ByteSize.Input | undefined
     })
     | undefined
 ): Effect.Effect<HttpServerResponse, PlatformError, HttpPlatform> =>
@@ -499,7 +500,7 @@ export const file = (
  * **Details**
  *
  * The effect requires `HttpPlatform` and supports options for status, headers,
- * offset, and byte range.
+ * content type, offset, and byte range.
  *
  * @category constructors
  * @since 4.0.0
@@ -507,10 +508,10 @@ export const file = (
 export const fileWeb = (
   file: Body.HttpBody.FileLike,
   options?:
-    | (Options.WithContent & {
-      readonly bytesToRead?: FileSystem.SizeInput | undefined
-      readonly chunkSize?: FileSystem.SizeInput | undefined
-      readonly offset?: FileSystem.SizeInput | undefined
+    | (Options.WithContentType & {
+      readonly bytesToRead?: number | undefined
+      readonly chunkSize?: number | undefined
+      readonly offset?: number | undefined
     })
     | undefined
 ): Effect.Effect<HttpServerResponse, never, HttpPlatform> =>
@@ -531,10 +532,7 @@ export const setHeader: {
 } = dual(
   3,
   (self: HttpServerResponse, key: string, value: string): HttpServerResponse =>
-    makeResponse({
-      ...self,
-      headers: Headers.set(self.headers, key, value)
-    }, true)
+    makeResponse(self, Headers.set(self.headers, key, value))
 )
 
 /**
@@ -567,10 +565,7 @@ export const setHeaders: {
 } = dual(
   2,
   (self: HttpServerResponse, input: Headers.Input): HttpServerResponse =>
-    makeResponse({
-      ...self,
-      headers: Headers.setAll(self.headers, input)
-    }, true)
+    makeResponse(self, Headers.setAll(self.headers, input))
 )
 
 /**
@@ -933,9 +928,24 @@ export const setBody: {
 } = dual(
   2,
   (self: HttpServerResponse, body: Body.HttpBody): HttpServerResponse =>
-    makeResponse({ ...self, headers: bodyInternal.updateHeaders(self.headers, body), body })
+    makeResponse({ ...self, body }, bodyInternal.updateHeaders(self.headers, body))
 )
 
+/**
+ * Replaces the body without updating headers. Use when content metadata is unchanged.
+ *
+ * @internal
+ */
+export const setBodyKeepHeaders = (self: HttpServerResponse, body: Body.HttpBody): HttpServerResponse => {
+  const response = Object.create(Proto) as Mutable<HttpServerResponse>
+  response.status = self.status
+  response.statusText = self.statusText
+  response.headers = self.headers
+  response.cookies = self.cookies
+  response.body = body
+  return response
+}
+
 /**
  * Sets the HTTP status code of an `HttpServerResponse`.
  *
@@ -970,14 +980,33 @@ export const setStatus: {
     })
 )
 
+/**
+ * Returns whether a response must omit its body because its status is 204, 205,
+ * or 304, or `withoutBody` is true.
+ *
+ * @category predicates
+ * @since 4.0.0
+ */
+export const omitsBody = (response: HttpServerResponse, withoutBody = false): boolean =>
+  withoutBody || response.status === 204 || response.status === 205 || response.status === 304
+
 /**
  * Converts an `HttpServerResponse` to a Web `Response`.
  *
  * **Details**
  *
  * Cookies are appended as `Set-Cookie` headers. Stream bodies are converted using
- * the supplied context, and `withoutBody` can be used for responses such as HEAD
- * responses.
+ * the supplied context.
+ *
+ * Bodies are omitted for statuses 204, 205, and 304, or when `withoutBody` is true
+ * (for example, for HEAD responses). Omitted raw `ReadableStream` bodies are
+ * cancelled without awaiting completion, and cancellation errors are ignored.
+ *
+ * A raw `Response` body is returned as-is after the outer headers are merged
+ * into it: outer headers replace native ones, and cookies are appended. When
+ * its body is omitted, the bodyless `Response` keeps those merged headers and
+ * uses the outer status for 204, 205 and 304, or the raw `Response` status
+ * otherwise.
  *
  * @category converting
  * @since 4.0.0
@@ -996,14 +1025,40 @@ export const toWeb = (
       headers.append("set-cookie", header)
     }
   }
-  if (options?.withoutBody) {
+  const body = response.body
+  const outerOmitsBody = omitsBody(response)
+  const withoutBody = outerOmitsBody || options?.withoutBody === true
+  if (body._tag === "Raw" && body.body instanceof Response) {
+    const raw = body.body
+    for (const [key, value] of headers as any) {
+      if (key === "set-cookie") {
+        raw.headers.append(key, value)
+      } else {
+        raw.headers.set(key, value)
+      }
+    }
+    if (!withoutBody) {
+      return raw
+    }
+    // A bodyless outer status is what the caller chose to send; otherwise the
+    // body is only omitted for HEAD and the raw Response describes the resource.
+    const source = outerOmitsBody ? response : raw
+    return new Response(undefined, {
+      status: source.status,
+      statusText: source.statusText as string,
+      headers: raw.headers
+    })
+  }
+  if (withoutBody) {
+    if (body._tag === "Raw" && isReadableStream(body.body)) {
+      body.body.cancel().catch(constVoid)
+    }
     return new Response(undefined, {
       status: response.status,
       statusText: response.statusText as string,
       headers
     })
   }
-  const body = response.body
   switch (body._tag) {
     case "Empty": {
       return new Response(undefined, {
@@ -1012,14 +1067,14 @@ export const toWeb = (
         headers
       })
     }
-    case "Uint8Array":
+    case "Uint8Array": {
+      return new Response(body.text ?? body.body as any, {
+        status: response.status,
+        statusText: response.statusText!,
+        headers
+      })
+    }
     case "Raw": {
-      if (body.body instanceof Response) {
-        for (const [key, value] of headers as any) {
-          body.body.headers.set(key, value)
-        }
-        return body.body
-      }
       return new Response(body.body as any, {
         status: response.status,
         statusText: response.statusText!,
@@ -1050,12 +1105,8 @@ export const toWeb = (
 }
 
 /**
- * Wraps an `HttpServerResponse` as an `HttpClientResponse`.
- *
- * **Details**
- *
- * An optional request can be supplied for client-response metadata and decode
- * errors.
+ * Wraps an `HttpServerResponse` as an `HttpClientResponse`, using the optional
+ * request for metadata and decode errors. Without a request, `url` is empty.
  *
  * @category converting
  * @since 4.0.0
@@ -1101,6 +1152,14 @@ class ServerHttpClientResponse extends Inspectable.Class implements HttpClientRe
     return this.response.status
   }
 
+  get url(): string {
+    if (this.request === HttpClientRequest.empty) return ""
+    const url = HttpClientRequest.toUrl(this.request)
+    if (Option.isNone(url)) return ""
+    url.value.hash = ""
+    return url.value.href
+  }
+
   private cachedHeaders?: Headers.Headers
   get headers(): Headers.Headers {
     return this.cachedHeaders ??= this.response.body._tag === "FormData"
@@ -1193,7 +1252,7 @@ class ServerHttpClientResponse extends Inspectable.Class implements HttpClientRe
         const rawBody = body.body
         if (rawBody instanceof Response) {
           return Effect.tryPromise({
-            try: () => rawBody.arrayBuffer().then((buffer) => new Uint8Array(buffer)),
+            try: () => rawBody.clone().arrayBuffer().then((buffer) => new Uint8Array(buffer)),
             catch: (cause) => this.decodeError(cause)
           })
         }
@@ -1245,7 +1304,11 @@ class ServerHttpClientResponse extends Inspectable.Class implements HttpClientRe
   }
 
   get arrayBuffer(): Effect.Effect<ArrayBuffer, HttpClientError.HttpClientError> {
-    return Effect.map(this.bytes, (bytes) => bytes.slice().buffer)
+    return Effect.map(
+      this.bytes,
+      // Copy this view because Buffer views may share a larger ArrayBuffer.
+      (bytes) => bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength) as ArrayBuffer
+    )
   }
 
   private decodeError(cause: unknown): HttpClientError.HttpClientError {
@@ -1330,7 +1393,10 @@ const makeResponse = (options: {
   readonly headers?: Headers.Headers | undefined
   readonly cookies?: Cookies.Cookies | undefined
   readonly body?: Body.HttpBody | undefined
-}, preferHeaders = false) => {
+}, ownedHeaders?: Headers.Headers) => {
+  // ownedHeaders is a freshly created map that nothing else references, so it
+  // can be completed in place instead of copied. It supersedes options.headers,
+  // and explicit content headers in it take precedence over body-derived ones.
   const self = Object.create(Proto) as Mutable<HttpServerResponse>
   self.status = options.status
   self.statusText = options.statusText
@@ -1340,16 +1406,21 @@ const makeResponse = (options: {
     self.body._tag !== "Empty" &&
     (self.body.contentType || self.body.contentLength !== undefined)
   ) {
-    const newHeaders = Headers.fromRecordUnsafe({ ...options.headers }) as any
-    if (self.body.contentType && (!preferHeaders || newHeaders["content-type"] === undefined)) {
+    const owned = ownedHeaders !== undefined
+    const newHeaders = owned
+      ? ownedHeaders as any
+      : options.headers === undefined || options.headers === Headers.empty
+      ? headersInternal.emptyMutableUnsafe() as any
+      : Headers.fromRecordUnsafe({ ...options.headers }) as any
+    if (self.body.contentType && (!owned || newHeaders["content-type"] === undefined)) {
       newHeaders["content-type"] = self.body.contentType
     }
-    if (self.body.contentLength !== undefined && (!preferHeaders || newHeaders["content-length"] === undefined)) {
+    if (self.body.contentLength !== undefined && (!owned || newHeaders["content-length"] === undefined)) {
       newHeaders["content-length"] = self.body.contentLength.toString()
     }
     self.headers = newHeaders
   } else {
-    self.headers = options.headers ?? Headers.empty
+    self.headers = ownedHeaders ?? options.headers ?? Headers.empty
   }
   return self
 }
@@ -1384,7 +1455,8 @@ export const fromWeb = (response: Response): HttpServerResponse => {
           evaluate: () => response.body!,
           onError: (e) => e
         }),
-        contentType ?? undefined
+        contentType ?? undefined,
+        bodyInternal.parseContentLength(response.headers.get("content-length"))
       )
     )
   }
diff --git a/repos/effect/packages/effect/src/unstable/http/HttpStaticServer.ts b/repos/effect/packages/effect/src/unstable/http/HttpStaticServer.ts
index b1f047634..665a0b62e 100644
--- a/repos/effect/packages/effect/src/unstable/http/HttpStaticServer.ts
+++ b/repos/effect/packages/effect/src/unstable/http/HttpStaticServer.ts
@@ -27,7 +27,7 @@ import * as HttpServerResponse from "./HttpServerResponse.ts"
  * **Example** (Serving files from a directory)
  *
  * ```ts import.meta.vitest
- * import { Effect, FileSystem, Layer, Path } from "effect"
+ * import { ByteSize, Effect, FileSystem, Layer, Path } from "effect"
  * import {
  *   HttpEffect,
  *   HttpPlatform,
@@ -39,7 +39,7 @@ import * as HttpServerResponse from "./HttpServerResponse.ts"
  *   stat: () =>
  *     Effect.succeed({
  *       type: "File",
- *       size: FileSystem.Size(20)
+ *       size: ByteSize.bytes(20)
  *     } as FileSystem.File.Info)
  * })
  * const TestHttpPlatform = Layer.succeed(
@@ -111,35 +111,38 @@ export const make: (options: {
   const serveFile: (
     request: HttpServerRequest.HttpServerRequest,
     filePath: string,
-    fileSize?: number
+    fileSize?: bigint
   ) => Effect.Effect<HttpServerResponse.HttpServerResponse, HttpServerError.HttpServerError> = Effect.fnUntraced(
     function*(request, filePath, fileSize) {
-      const rangeHeader = request.headers["range"]
+      const rangeHeader = request.method === "GET" ? request.headers["range"] : undefined
       const shouldEvaluateConditionals = request.headers["if-none-match"] !== undefined ||
         request.headers["if-modified-since"] !== undefined
 
       let fullResponse: HttpServerResponse.HttpServerResponse | undefined
+      const getFullResponse = () =>
+        fullResponse === undefined
+          ? Effect.map(
+            handlePlatformError(request, platform.fileResponse(filePath)),
+            (response) => setFileHeaders(response, filePath)
+          )
+          : Effect.succeed(fullResponse)
       if (shouldEvaluateConditionals) {
-        fullResponse = setFileHeaders(yield* handlePlatformError(request, platform.fileResponse(filePath)), filePath)
+        fullResponse = yield* getFullResponse()
         const conditionalResponse = evaluateConditionalRequest(request, fullResponse)
         if (conditionalResponse !== undefined) {
           return conditionalResponse
         }
-        if (rangeHeader === undefined) {
-          return fullResponse
-        }
       }
 
-      const resolvedFileSize = rangeHeader === undefined
-        ? undefined
-        : fileSize ?? Number((yield* handlePlatformError(request, fileSystem.stat(filePath))).size)
-      const parsedRange = rangeHeader === undefined || resolvedFileSize === undefined
-        ? undefined
-        : parseRange(rangeHeader, resolvedFileSize)
+      if (rangeHeader === undefined) {
+        return yield* getFullResponse()
+      }
+
+      const resolvedFileSize = fileSize ?? (yield* handlePlatformError(request, fileSystem.stat(filePath))).size
+      const parsedRange = parseRange(rangeHeader, resolvedFileSize)
 
       if (parsedRange === undefined) {
-        return fullResponse ??
-          setFileHeaders(yield* handlePlatformError(request, platform.fileResponse(filePath)), filePath)
+        return yield* getFullResponse()
       }
 
       if (parsedRange === "unsatisfiable") {
@@ -157,7 +160,7 @@ export const make: (options: {
           platform.fileResponse(filePath, {
             status: 206,
             offset: parsedRange.start,
-            bytesToRead: parsedRange.end - parsedRange.start + 1
+            bytesToRead: parsedRange.end - parsedRange.start + BigInt(1)
           })
         ),
         filePath
@@ -190,7 +193,7 @@ export const make: (options: {
           : Effect.fail(toInternalServerError(request, error)),
       onSuccess(info) {
         if (info.type === "File") {
-          return serveFile(request, resolvedPath, Number(info.size))
+          return serveFile(request, resolvedPath, info.size)
         }
         if (info.type === "Directory" && index !== undefined) {
           return serveFile(request, path.join(resolvedPath, index))
@@ -302,19 +305,18 @@ const resolveMimeType = (path: Path.Path, filePath: string, mimeTypes: Record<st
   return mimeTypes[extension.slice(1)] ?? "application/octet-stream"
 }
 
-const parseInteger = (value: string): number | undefined => {
+const parseInteger = (value: string): bigint | undefined => {
   if (!/^\d+$/.test(value)) {
     return undefined
   }
-  const parsed = Number(value)
-  return Number.isSafeInteger(parsed) ? parsed : undefined
+  return BigInt(value)
 }
 
 const parseRange = (
   header: string,
-  fileSize: number
+  fileSize: bigint
 ):
-  | { readonly start: number; readonly end: number }
+  | { readonly start: bigint; readonly end: bigint }
   | "unsatisfiable"
   | undefined =>
 {
@@ -340,12 +342,12 @@ const parseRange = (
     if (suffixLength === undefined) {
       return undefined
     }
-    if (suffixLength === 0 || fileSize === 0) {
+    if (suffixLength === BigInt(0) || fileSize === BigInt(0)) {
       return "unsatisfiable"
     }
     return {
-      start: Math.max(fileSize - suffixLength, 0),
-      end: fileSize - 1
+      start: fileSize > suffixLength ? fileSize - suffixLength : BigInt(0),
+      end: fileSize - BigInt(1)
     }
   }
   const start = parseInteger(startPart)
@@ -358,7 +360,7 @@ const parseRange = (
     }
     return {
       start,
-      end: fileSize - 1
+      end: fileSize - BigInt(1)
     }
   }
   const end = parseInteger(endPart)
@@ -370,7 +372,7 @@ const parseRange = (
   }
   return {
     start,
-    end: Math.min(end, fileSize - 1)
+    end: end < fileSize ? end : fileSize - BigInt(1)
   }
 }
 
diff --git a/repos/effect/packages/effect/src/unstable/http/Mime.ts b/repos/effect/packages/effect/src/unstable/http/Mime.ts
index d224041a6..a760cd0e5 100644
--- a/repos/effect/packages/effect/src/unstable/http/Mime.ts
+++ b/repos/effect/packages/effect/src/unstable/http/Mime.ts
@@ -72,5 +72,5 @@ export const getAllExtensions = (type: string): Option.Option<ReadonlySet<string
   if (typeof type !== "string") {
     return Option.none()
   }
-  return Option.fromUndefinedOr(typeToExtensions.get(type.toLowerCase()))
+  return Option.fromUndefinedOr(typeToExtensions.get(type.split(";")[0].trim().toLowerCase()))
 }
diff --git a/repos/effect/packages/effect/src/unstable/http/Multipart.ts b/repos/effect/packages/effect/src/unstable/http/Multipart.ts
index 240406c41..9735b07fd 100644
--- a/repos/effect/packages/effect/src/unstable/http/Multipart.ts
+++ b/repos/effect/packages/effect/src/unstable/http/Multipart.ts
@@ -11,6 +11,7 @@
  * @since 4.0.0
  */
 import * as Arr from "../../Array.ts"
+import * as ByteSize from "../../ByteSize.ts"
 import * as Cause from "../../Cause.ts"
 import * as Channel from "../../Channel.ts"
 import * as Context from "../../Context.ts"
@@ -30,7 +31,6 @@ import type { ParseOptions } from "../../SchemaAST.ts"
 import * as SchemaTransformation from "../../SchemaTransformation.ts"
 import type * as Scope from "../../Scope.ts"
 import * as Stream from "../../Stream.ts"
-import * as UndefinedOr from "../../UndefinedOr.ts"
 import * as IncomingMessage from "./HttpIncomingMessage.ts"
 import * as HttpServerRespondable from "./HttpServerRespondable.ts"
 import * as HttpServerResponse from "./HttpServerResponse.ts"
@@ -98,13 +98,26 @@ export interface Field extends Part.Proto {
 }
 
 /**
- * Returns `true` when a value is a multipart `Part`.
+ * Returns `true` when a value has the multipart part type identifier.
+ *
+ * **Details**
+ *
+ * This includes `Field`, `File`, and `PersistedFile` values. Use
+ * `isStreamPart` to identify only parsed, streamed parts.
  *
  * @category guards
  * @since 4.0.0
  */
 export const isPart = (u: unknown): u is Part => Predicate.hasProperty(u, TypeId)
 
+/**
+ * Returns `true` when a value is a multipart text `Field` or streamed `File`.
+ *
+ * @category guards
+ * @since 4.0.0
+ */
+export const isStreamPart = (u: unknown): u is Part => isPart(u) && (u._tag === "Field" || u._tag === "File")
+
 /**
  * Returns `true` when a value is a multipart text `Field`.
  *
@@ -186,6 +199,11 @@ export interface Persisted {
 
 const MultipartErrorTypeId = "~effect/http/Multipart/MultipartError"
 
+const toMultipartError = (cause: unknown): MultipartError =>
+  Predicate.hasProperty(cause, MultipartErrorTypeId)
+    ? cause as MultipartError
+    : MultipartError.fromReason("InternalError", cause)
+
 /**
  * Error reason carried by a `MultipartError`.
  *
@@ -422,9 +440,9 @@ export const makeConfig = (
     return Effect.succeed<MP.BaseConfig>({
       headers,
       maxParts: fiber.getRef(MaxParts),
-      maxFieldSize: Number(fiber.getRef(MaxFieldSize)),
-      maxPartSize: UndefinedOr.map(fiber.getRef(MaxFileSize), Number),
-      maxTotalSize: UndefinedOr.map(fiber.getRef(IncomingMessage.MaxBodySize), Number),
+      maxFieldSize: fiber.getRef(MaxFieldSize),
+      maxPartSize: fiber.getRef(MaxFileSize),
+      maxTotalSize: fiber.getRef(IncomingMessage.MaxBodySize),
       isFile: mimeTypes.length === 0 ? undefined : (info: MP.PartInfo): boolean =>
         !mimeTypes.some(
           (_) => info.contentType.includes(_)
@@ -467,16 +485,24 @@ export const makeChannel = <IE>(headers: Record<string, string>): Channel.Channe
           let chunks: Array<Uint8Array> = []
           let finished = false
           const pullChunks = Channel.fromPull(
-            Effect.succeed(Effect.suspend(function loop(): Pull.Pull<Arr.NonEmptyReadonlyArray<Uint8Array>> {
-              if (!Arr.isReadonlyArrayNonEmpty(chunks)) {
-                return finished ? Cause.done() : Effect.flatMap(pump, loop)
-              }
-              const chunk = chunks
-              chunks = []
-              return Effect.succeed(chunk)
-            }))
+            Effect.succeed(
+              Effect.suspend(function loop(): Pull.Pull<Arr.NonEmptyReadonlyArray<Uint8Array>, IE | MultipartError> {
+                if (!Arr.isReadonlyArrayNonEmpty(chunks)) {
+                  if (finished) {
+                    return Cause.done()
+                  }
+                  if (Option.isSome(exit)) {
+                    return exit.value
+                  }
+                  return Effect.flatMap(pump, loop)
+                }
+                const chunk = chunks
+                chunks = []
+                return Effect.succeed(chunk)
+              })
+            )
           )
-          partsBuffer.push(new FileImpl(info, pullChunks))
+          partsBuffer.push(new FileImpl(info, Channel.mapError(pullChunks, toMultipartError)))
           return function(chunk) {
             if (chunk === null) {
               finished = true
@@ -601,17 +627,14 @@ class FileImpl extends PartBase implements File {
 
   constructor(
     info: MP.PartInfo,
-    channel: Channel.Channel<Arr.NonEmptyReadonlyArray<Uint8Array>>
+    channel: Channel.Channel<Arr.NonEmptyReadonlyArray<Uint8Array>, MultipartError>
   ) {
     super()
     this.key = info.name
     this.name = info.filename ?? info.name
     this.contentType = info.contentType
     this.content = Stream.fromChannel(channel)
-    this.contentEffect = channel.pipe(
-      Channel.mkUint8Array,
-      Effect.mapError((cause) => MultipartError.fromReason("InternalError", cause))
-    )
+    this.contentEffect = Channel.mkUint8Array(channel)
   }
 
   toJSON(): unknown {
@@ -628,11 +651,7 @@ class FileImpl extends PartBase implements File {
 const defaultWriteFile = (path: string, file: File) =>
   Effect.flatMap(
     FileSystem.FileSystem,
-    (fs) =>
-      Effect.mapError(
-        Stream.run(file.content, fs.sink(path)),
-        (cause) => MultipartError.fromReason("InternalError", cause)
-      )
+    (fs) => Effect.mapError(Stream.run(file.content, fs.sink(path)), toMultipartError)
   )
 
 /**
@@ -761,9 +780,9 @@ class PersistedFileImpl extends PartBase implements PersistedFile {
  */
 export const limitsServices = (options: {
   readonly maxParts?: number | undefined
-  readonly maxFieldSize?: FileSystem.SizeInput | undefined
-  readonly maxFileSize?: FileSystem.SizeInput | undefined
-  readonly maxTotalSize?: FileSystem.SizeInput | undefined
+  readonly maxFieldSize?: ByteSize.Input | undefined
+  readonly maxFileSize?: ByteSize.Input | undefined
+  readonly maxTotalSize?: ByteSize.Input | undefined
   readonly fieldMimeTypes?: ReadonlyArray<string> | undefined
 }): Context.Context<never> => {
   const map = new Map<string, unknown>()
@@ -771,13 +790,13 @@ export const limitsServices = (options: {
     map.set(MaxParts.key, options.maxParts)
   }
   if (options.maxFieldSize !== undefined) {
-    map.set(MaxFieldSize.key, FileSystem.Size(options.maxFieldSize))
+    map.set(MaxFieldSize.key, ByteSize.fromInputUnsafe(options.maxFieldSize))
   }
   if (options.maxFileSize !== undefined) {
-    map.set(MaxFileSize.key, UndefinedOr.map(options.maxFileSize, FileSystem.Size))
+    map.set(MaxFileSize.key, ByteSize.fromInputUnsafe(options.maxFileSize))
   }
   if (options.maxTotalSize !== undefined) {
-    map.set(IncomingMessage.MaxBodySize.key, UndefinedOr.map(options.maxTotalSize, FileSystem.Size))
+    map.set(IncomingMessage.MaxBodySize.key, ByteSize.fromInputUnsafe(options.maxTotalSize))
   }
   if (options.fieldMimeTypes !== undefined) {
     map.set(FieldMimeTypes.key, options.fieldMimeTypes)
@@ -804,9 +823,9 @@ export declare namespace withLimits {
    */
   export type Options = {
     readonly maxParts?: number | undefined
-    readonly maxFieldSize?: FileSystem.SizeInput | undefined
-    readonly maxFileSize?: FileSystem.SizeInput | undefined
-    readonly maxTotalSize?: FileSystem.SizeInput | undefined
+    readonly maxFieldSize?: ByteSize.Input | undefined
+    readonly maxFileSize?: ByteSize.Input | undefined
+    readonly maxTotalSize?: ByteSize.Input | undefined
     readonly fieldMimeTypes?: ReadonlyArray<string> | undefined
   }
 }
@@ -835,8 +854,8 @@ export const MaxParts = Context.Reference<number | undefined>("effect/http/Multi
  * @category services
  * @since 4.0.0
  */
-export const MaxFieldSize = Context.Reference<FileSystem.SizeInput>("effect/http/Multipart/MaxFieldSize", {
-  defaultValue: constant(FileSystem.Size(10 * 1024 * 1024))
+export const MaxFieldSize = Context.Reference<ByteSize.ByteSize>("effect/http/Multipart/MaxFieldSize", {
+  defaultValue: constant(ByteSize.mebibytes(10))
 })
 
 /**
@@ -849,7 +868,7 @@ export const MaxFieldSize = Context.Reference<FileSystem.SizeInput>("effect/http
  * @category services
  * @since 4.0.0
  */
-export const MaxFileSize = Context.Reference<FileSystem.SizeInput | undefined>(
+export const MaxFileSize = Context.Reference<ByteSize.ByteSize | undefined>(
   "effect/http/Multipart/MaxFileSize",
   { defaultValue: () => undefined }
 )
diff --git a/repos/effect/packages/effect/src/unstable/http/MultipartParser.ts b/repos/effect/packages/effect/src/unstable/http/MultipartParser.ts
index 01cf7d1c5..1baf3bd93 100644
--- a/repos/effect/packages/effect/src/unstable/http/MultipartParser.ts
+++ b/repos/effect/packages/effect/src/unstable/http/MultipartParser.ts
@@ -3,6 +3,7 @@
  *
  * @since 4.0.0
  */
+import type * as ByteSize from "../../ByteSize.ts"
 import type * as HeadersParser from "./MultipartParser/HeadersParser.ts"
 import * as internal from "./MultipartParser/internal/multipart.ts"
 
@@ -61,9 +62,9 @@ export type BaseConfig = {
   readonly headers: Record<string, string>
   readonly isFile?: ((info: PartInfo) => boolean) | undefined
   readonly maxParts?: number | undefined
-  readonly maxTotalSize?: number | undefined
-  readonly maxPartSize?: number | undefined
-  readonly maxFieldSize?: number | undefined
+  readonly maxTotalSize?: ByteSize.Input | undefined
+  readonly maxPartSize?: ByteSize.Input | undefined
+  readonly maxFieldSize?: ByteSize.Input | undefined
 }
 
 /**
diff --git a/repos/effect/packages/effect/src/unstable/http/MultipartParser/internal/multipart.ts b/repos/effect/packages/effect/src/unstable/http/MultipartParser/internal/multipart.ts
index 78d7fb077..36b0a232b 100644
--- a/repos/effect/packages/effect/src/unstable/http/MultipartParser/internal/multipart.ts
+++ b/repos/effect/packages/effect/src/unstable/http/MultipartParser/internal/multipart.ts
@@ -1,3 +1,4 @@
+import * as ByteSize from "../../../../ByteSize.ts"
 import type { Config, MultipartError, PartInfo } from "../../MultipartParser.ts"
 import * as CT from "./contentType.ts"
 import * as HP from "./headers.ts"
@@ -41,6 +42,9 @@ function parseBoundary(headers: Record<string, string>) {
 
 function noopOnChunk(_chunk: Uint8Array | null) {}
 
+const toLimit = (input: ByteSize.Input): number =>
+  input === Infinity ? Infinity : Number(ByteSize.fromInputUnsafe(input))
+
 export function make({
   headers,
   onFile: onPart,
@@ -49,10 +53,13 @@ export function make({
   onDone,
   isFile = defaultIsFile,
   maxParts = Infinity,
-  maxTotalSize = Infinity,
-  maxPartSize = Infinity,
-  maxFieldSize = 1024 * 1024
+  maxTotalSize: maxTotalSizeInput = Infinity,
+  maxPartSize: maxPartSizeInput = Infinity,
+  maxFieldSize: maxFieldSizeInput = 1024 * 1024
 }: Config) {
+  const maxTotalSize = toLimit(maxTotalSizeInput)
+  const maxPartSize = toLimit(maxPartSizeInput)
+  const maxFieldSize = toLimit(maxFieldSizeInput)
   const boundary = parseBoundary(headers)
   if (boundary === undefined) {
     onError({ _tag: "InvalidBoundary" })
diff --git a/repos/effect/packages/effect/src/unstable/http/UrlParams.ts b/repos/effect/packages/effect/src/unstable/http/UrlParams.ts
index da716fd38..e077a5516 100644
--- a/repos/effect/packages/effect/src/unstable/http/UrlParams.ts
+++ b/repos/effect/packages/effect/src/unstable/http/UrlParams.ts
@@ -9,7 +9,6 @@
  * @since 4.0.0
  */
 import * as Arr from "../../Array.ts"
-import * as Effect from "../../Effect.ts"
 import * as Equal from "../../Equal.ts"
 import * as Equ from "../../Equivalence.ts"
 import { dual } from "../../Function.ts"
@@ -21,11 +20,7 @@ import * as Option from "../../Option.ts"
 import type { Pipeable } from "../../Pipeable.ts"
 import { hasProperty } from "../../Predicate.ts"
 import type { ReadonlyRecord } from "../../Record.ts"
-import * as Schema from "../../Schema.ts"
-import * as SchemaIssue from "../../SchemaIssue.ts"
-import * as SchemaTransformation from "../../SchemaTransformation.ts"
 import * as Tuple from "../../Tuple.ts"
-import type { JsonOptions } from "./HttpIncomingMessage.ts"
 
 const TypeId = "~effect/http/UrlParams"
 
@@ -186,7 +181,7 @@ const fromInputNested = (input: Input): Array<[string | Array<string>, any]> =>
           out.push([key, String(value[i])])
         }
       }
-    } else if (typeof value === "object") {
+    } else if (value !== null && typeof value === "object") {
       const nested = fromInputNested(value as CoercibleRecord)
       for (const [k, v] of nested) {
         out.push([[key, ...(typeof k === "string" ? [k] : k)], v])
@@ -217,49 +212,6 @@ const arrayEquivalence = Arr.makeEquivalence(
   Tuple.makeEquivalence([Equ.strictEqual<string>(), Equ.strictEqual<string>()])
 )
 
-/**
- * Schema type for `UrlParams`.
- *
- * @category schemas
- * @since 4.0.0
- */
-export interface UrlParamsSchema extends Schema.declare<UrlParams, ReadonlyArray<readonly [string, string]>> {}
-
-/**
- * Schema for `UrlParams`.
- *
- * **Details**
- *
- * The encoded representation is an array of string key-value tuples.
- *
- * @category schemas
- * @since 4.0.0
- */
-export const UrlParamsSchema: UrlParamsSchema = Schema.declare(
-  isUrlParams,
-  {
-    representation: {
-      id: "effect/http/UrlParams",
-      payload: null
-    },
-    toCode: () => ({
-      runtime: "UrlParams.UrlParamsSchema",
-      Type: "UrlParams.UrlParams",
-      importDeclarations: [`import * as UrlParams from "effect/unstable/http/UrlParams"`]
-    }),
-    expected: "UrlParams",
-    toEquivalence: () => Equivalence,
-    toCodec: () =>
-      Schema.link<UrlParams>()(
-        Schema.Array(Schema.Tuple([Schema.String, Schema.String])),
-        SchemaTransformation.transform({
-          decode: make,
-          encode: (self) => self.params
-        })
-      )
-  }
-)
-
 /**
  * An empty `UrlParams` value.
  *
@@ -396,8 +348,7 @@ export const setAll: {
   (input: Input): (self: UrlParams) => UrlParams
   (self: UrlParams, input: Input): UrlParams
 } = dual(2, (self: UrlParams, input: Input): UrlParams => {
-  const out = fromInput(input)
-  const params = out.params as Array<readonly [string, string]>
+  const params = fromInput(input).params.slice()
   const keys = new Set()
   for (let i = 0; i < params.length; i++) {
     keys.add(params[i][0])
@@ -406,7 +357,7 @@ export const setAll: {
     if (keys.has(self.params[i][0])) continue
     params.push(self.params[i])
   }
-  return out
+  return make(params)
 })
 
 /**
@@ -510,112 +461,3 @@ export const toRecord = (self: UrlParams): Record<string, string | Arr.NonEmptyA
  */
 export const toReadonlyRecord: (self: UrlParams) => ReadonlyRecord<string, string | Arr.NonEmptyReadonlyArray<string>> =
   toRecord as any
-
-/**
- * Schema type for decoding one URL parameter field as JSON.
- *
- * @category schemas
- * @since 4.0.0
- */
-export interface schemaJsonField extends Schema.decodeTo<Schema.fromJsonString<Schema.Unknown>, UrlParamsSchema> {}
-
-/**
- * Extracts a JSON value from the first occurrence of the given `field` in the
- * `UrlParams`.
- *
- * **Example** (Decoding JSON parameter fields)
- *
- * ```ts import.meta.vitest
- * import { Schema } from "effect"
- * import { UrlParams } from "effect/unstable/http"
- *
- * const extractFoo = UrlParams.schemaJsonField("foo").pipe(
- *   Schema.decodeTo(Schema.Struct({
- *     some: Schema.String,
- *     number: Schema.Number
- *   }))
- * )
- *
- * const decoded = Schema.decodeSync(extractFoo)(UrlParams.fromInput({
- *     foo: `{"some":"bar","number":42}`,
- *     baz: "qux"
- *   }))
- * const result = [decoded.some, decoded.number] // => ["bar", 42]
- * ```
- *
- * @category schemas
- * @since 4.0.0
- */
-export const schemaJsonField = (field: string, options?: JsonOptions | undefined): schemaJsonField =>
-  UrlParamsSchema.pipe(
-    Schema.decodeTo(
-      Schema.fromJsonString(Schema.Unknown, options),
-      SchemaTransformation.transformOrFail({
-        decode: (params) =>
-          Option.match(getFirst(params, field), {
-            onNone: () => Effect.fail(new SchemaIssue.Pointer([field], new SchemaIssue.MissingKey(undefined))),
-            onSome: Effect.succeed
-          }),
-        encode: (value) => Effect.succeed(make([[field, value]]))
-      })
-    )
-  )
-
-/**
- * Extract a record of key-value pairs from the `UrlParams`.
- *
- * @category schemas
- * @since 4.0.0
- */
-export interface schemaRecord extends
-  Schema.decodeTo<
-    Schema.$Record<Schema.String, Schema.Union<readonly [Schema.String, Schema.NonEmptyArray<Schema.String>]>>,
-    UrlParamsSchema,
-    never,
-    never
-  >
-{}
-
-/**
- * Schema that decodes `UrlParams` into a record of key-value pairs.
- *
- * **Details**
- *
- * Keys with one value decode to a string, and keys with multiple values decode to
- * a non-empty readonly array of strings.
- *
- * **Example** (Decoding URL parameters to a record)
- *
- * ```ts import.meta.vitest
- * import { Schema } from "effect"
- * import { UrlParams } from "effect/unstable/http"
- *
- * const toStruct = UrlParams.schemaRecord.pipe(
- *   Schema.decodeTo(Schema.Struct({
- *     some: Schema.String,
- *     number: Schema.FiniteFromString
- *   }))
- * )
- *
- * const decoded = Schema.decodeSync(toStruct)(UrlParams.fromInput({
- *     some: "value",
- *     number: 42
- *   }))
- * const result = [decoded.some, decoded.number] // => ["value", 42]
- * ```
- *
- * @category schemas
- * @since 4.0.0
- */
-export const schemaRecord: schemaRecord = UrlParamsSchema.pipe(
-  Schema.decodeTo(
-    Schema.Record(
-      Schema.String,
-      Schema.Union([Schema.String, Schema.NonEmptyArray(Schema.String)])
-    ),
-    SchemaTransformation.transform({
-      decode: toReadonlyRecord,
-      encode: fromInput
-    })
-  )
-)
diff --git a/repos/effect/packages/effect/src/unstable/http/internal/compression.ts b/repos/effect/packages/effect/src/unstable/http/internal/compression.ts
index 0dcdf222b..bd03c916c 100644
--- a/repos/effect/packages/effect/src/unstable/http/internal/compression.ts
+++ b/repos/effect/packages/effect/src/unstable/http/internal/compression.ts
@@ -7,15 +7,13 @@ import type { Compression, CompressionAlgorithm, CompressionOptions } from "../H
 import * as Response from "../HttpServerResponse.ts"
 
 /** @internal */
-export const varyAcceptEncoding = (headers: Headers.Headers): string | undefined => {
+export const varyWith = (headers: Headers.Headers, dimension: string): string => {
   const vary = headers["vary"]
   if (vary === undefined) {
-    return "Accept-Encoding"
+    return dimension
   }
   const members = vary.split(",").map((member) => member.trim().toLowerCase())
-  return members.includes("*") || members.includes("accept-encoding")
-    ? undefined
-    : `${vary}, Accept-Encoding`
+  return members.includes("*") || members.includes(dimension.toLowerCase()) ? vary : `${vary}, ${dimension}`
 }
 
 /** @internal */
@@ -26,10 +24,9 @@ export const wrapCompression = (impl: Compression): Compression => ({
       if (compressed === response) {
         return response
       }
-      const headers: Record<string, string> = { "content-encoding": algorithm }
-      const vary = varyAcceptEncoding(compressed.headers)
-      if (vary !== undefined) {
-        headers["vary"] = vary
+      const headers: Record<string, string> = {
+        "content-encoding": algorithm,
+        vary: varyWith(compressed.headers, "Accept-Encoding")
       }
       const etag = compressed.headers["etag"]
       if (etag !== undefined && !etag.startsWith("W/")) {
@@ -70,7 +67,7 @@ export const makeCompressionWeb = (options: {
         return Effect.succeed(streamBody(
           response,
           () => options.transform(algorithm, opts)(singleChunkStream(data)),
-          body.contentType
+          response.headers["content-type"] ?? body.contentType
         ))
       }
       case "Stream": {
@@ -78,7 +75,7 @@ export const makeCompressionWeb = (options: {
         return Effect.succeed(streamBody(
           response,
           () => options.transform(algorithm, opts)(Stream.toReadableStream(stream)),
-          body.contentType
+          response.headers["content-type"] ?? body.contentType
         ))
       }
       case "Raw": {
@@ -88,7 +85,9 @@ export const makeCompressionWeb = (options: {
         }
         return Effect.succeed(setBodyWithoutLength(
           response,
-          HttpBody.raw(options.transform(algorithm, opts)(readable), { contentType: body.contentType })
+          HttpBody.raw(options.transform(algorithm, opts)(readable), {
+            contentType: response.headers["content-type"] ?? body.contentType
+          })
         ))
       }
       default: {
diff --git a/repos/effect/packages/effect/src/unstable/http/internal/headers.ts b/repos/effect/packages/effect/src/unstable/http/internal/headers.ts
new file mode 100644
index 000000000..826791012
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/http/internal/headers.ts
@@ -0,0 +1,7 @@
+import type { Mutable } from "../../../Types.ts"
+import * as Headers from "../Headers.ts"
+
+const Proto = Object.getPrototypeOf(Headers.empty)
+
+/** @internal */
+export const emptyMutableUnsafe = (): Mutable<Headers.Headers> => Object.create(Proto)
diff --git a/repos/effect/packages/effect/src/unstable/httpapi/HttpApi.ts b/repos/effect/packages/effect/src/unstable/httpapi/HttpApi.ts
index ab23c6e88..eed6bd050 100644
--- a/repos/effect/packages/effect/src/unstable/httpapi/HttpApi.ts
+++ b/repos/effect/packages/effect/src/unstable/httpapi/HttpApi.ts
@@ -15,6 +15,7 @@ import { type Pipeable, pipeArguments } from "../../Pipeable.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Record from "../../Record.ts"
 import type * as Schema from "../../Schema.ts"
+import type * as SchemaAST from "../../SchemaAST.ts"
 import type { PathInput } from "../http/HttpRouter.ts"
 import * as HttpApiEndpoint from "./HttpApiEndpoint.ts"
 import type * as HttpApiGroup from "./HttpApiGroup.ts"
@@ -336,3 +337,24 @@ export class AdditionalSchemas extends Context.Service<
   AdditionalSchemas,
   ReadonlyArray<Schema.Constraint>
 >()("effect/httpapi/HttpApi/AdditionalSchemas") {}
+
+/**
+ * Schema parse options for server and client codecs, set on an API, group, or
+ * endpoint.
+ *
+ * **Details**
+ *
+ * Endpoint options override group options, which override API options. Objects
+ * are replaced, not merged. Without an annotation, Schema defaults apply.
+ *
+ * Header codecs receive all HTTP headers, so `onExcessProperty: "error"` rejects
+ * undeclared headers such as `content-type`. Annotate the API before passing it
+ * to `HttpApiBuilder.group` or `HttpApiBuilder.endpoint`.
+ *
+ * @category services
+ * @since 4.0.0
+ */
+export class ParseOptions extends Context.Service<
+  ParseOptions,
+  SchemaAST.ParseOptions
+>()("effect/httpapi/HttpApi/ParseOptions") {}
diff --git a/repos/effect/packages/effect/src/unstable/httpapi/HttpApiBuilder.ts b/repos/effect/packages/effect/src/unstable/httpapi/HttpApiBuilder.ts
index 72bddab7c..74dd1feed 100644
--- a/repos/effect/packages/effect/src/unstable/httpapi/HttpApiBuilder.ts
+++ b/repos/effect/packages/effect/src/unstable/httpapi/HttpApiBuilder.ts
@@ -44,7 +44,7 @@ import * as Response from "../http/HttpServerResponse.ts"
 import type { HttpServerResponse } from "../http/HttpServerResponse.ts"
 import * as Multipart from "../http/Multipart.ts"
 import * as UrlParams from "../http/UrlParams.ts"
-import type * as HttpApi from "./HttpApi.ts"
+import * as HttpApi from "./HttpApi.ts"
 import * as HttpApiEndpoint from "./HttpApiEndpoint.ts"
 import { HttpApiSchemaError } from "./HttpApiError.ts"
 import type * as HttpApiGroup from "./HttpApiGroup.ts"
@@ -52,6 +52,7 @@ import * as HttpApiMiddleware from "./HttpApiMiddleware.ts"
 import * as HttpApiSchema from "./HttpApiSchema.ts"
 import type * as HttpApiSecurity from "./HttpApiSecurity.ts"
 import * as MediaType from "./internal/mediaType.ts"
+import * as HttpApiPath from "./internal/path.ts"
 import * as OpenApi from "./OpenApi.ts"
 
 /**
@@ -150,7 +151,7 @@ export const group = <
       : result
     const routes: Array<HttpRouter.Route<any, any>> = []
     for (const item of handlers.handlers.values()) {
-      routes.push(handlerToRoute(group as any, item, services))
+      routes.push(handlerToRoute(api, group as any, item, services))
     }
     return Context.makeUnsafe(
       new Map([[group.key, {
@@ -160,6 +161,51 @@ export const group = <
     )
   })) as any
 
+/**
+ * Creates a reusable handler for a single endpoint in an API group.
+ *
+ * **Details**
+ *
+ * Returns the supplied callback unchanged, with its request, success, and error
+ * types inferred from the endpoint, preserving the callback's service
+ * requirements. Pass the result to `handlers.handle` when implementing the group.
+ *
+ * @category handlers
+ * @since 4.0.0
+ */
+export const handler = <
+  ApiId extends string,
+  Groups extends HttpApiGroup.Constraint,
+  const GroupIdentifier extends HttpApiGroup.Identifier<Groups>,
+  const EndpointIdentifier extends HttpApiGroup.EndpointsWithIdentifier<Groups, GroupIdentifier>["identifier"],
+  R
+>(
+  _api: HttpApi.HttpApi<ApiId, Groups>,
+  _groupIdentifier: GroupIdentifier,
+  _endpointIdentifier: EndpointIdentifier,
+  f: HttpApiEndpoint.HandlerWithIdentifier<
+    HttpApiGroup.EndpointsWithIdentifier<Groups, GroupIdentifier>,
+    EndpointIdentifier,
+    HttpApiEndpoint.MiddlewareError<
+      HttpApiEndpoint.WithIdentifier<
+        HttpApiGroup.EndpointsWithIdentifier<Groups, GroupIdentifier>,
+        EndpointIdentifier
+      >
+    >,
+    R
+  >
+): HttpApiEndpoint.HandlerWithIdentifier<
+  HttpApiGroup.EndpointsWithIdentifier<Groups, GroupIdentifier>,
+  EndpointIdentifier,
+  HttpApiEndpoint.MiddlewareError<
+    HttpApiEndpoint.WithIdentifier<
+      HttpApiGroup.EndpointsWithIdentifier<Groups, GroupIdentifier>,
+      EndpointIdentifier
+    >
+  >,
+  R
+> => f
+
 const HandlersTypeId = "~effect/httpapi/HttpApiBuilder/Handlers"
 
 type EndpointMap<Endpoints extends HttpApiEndpoint.Constraint> = {
@@ -463,6 +509,7 @@ export const endpoint = <
     const group = api.groups[groupIdentifier] as unknown as HttpApiGroup.Top
     const endpoint = group.endpoints[endpointIdentifier]
     return Effect.succeed(handlerToHttpEffect(
+      api,
       group,
       endpoint,
       Context.omit(Scope.Scope)(context),
@@ -675,11 +722,12 @@ type PayloadDecoder =
   }
 
 function buildPayloadDecoders(
-  payloadMap: HttpApiEndpoint.PayloadMap
+  payloadMap: HttpApiEndpoint.PayloadMap,
+  options: SchemaAST.ParseOptions | undefined
 ): Map<string, PayloadDecoder> {
   const result = new Map<string, PayloadDecoder>()
   payloadMap.forEach(({ encoding, schemas }, contentType) => {
-    const decode = Schema.decodeUnknownEffect(Schema.Union(schemas))
+    const decode = Schema.decodeUnknownEffect(Schema.Union(schemas), options)
     if (encoding._tag === "Multipart") {
       result.set(contentType, { _tag: "Multipart", mode: encoding.mode, limits: encoding.limits, decode })
     } else {
@@ -754,25 +802,29 @@ function decodePayload(
 }
 
 function handlerToHttpEffect(
+  api: Pick<HttpApi.Top, "annotations">,
   group: HttpApiGroup.Top,
   endpoint: HttpApiEndpoint.Top,
   context: Context.Context<any>,
   handler: HttpApiEndpoint.Handler<HttpApiEndpoint.Constraint, any, any>,
   isRaw: boolean
 ) {
-  const encodeSuccess = Schema.encodeUnknownEffect(makeSuccessSchema(endpoint))
-  const encodeError = Schema.encodeUnknownEffect(makeErrorSchema(endpoint))
-  const decodeParams = UndefinedOr.map(endpoint.params, Schema.decodeUnknownEffect)
-  const decodeHeaders = UndefinedOr.map(endpoint.headers, Schema.decodeUnknownEffect)
+  const annotations = Context.merge(Context.merge(api.annotations, group.annotations), endpoint.annotations)
+  const options = Context.getOrUndefined(annotations, HttpApi.ParseOptions)
+  const decodeUnknownEffect = <S extends Schema.Constraint>(schema: S) => Schema.decodeUnknownEffect(schema, options)
+  const encodeSuccess = Schema.encodeUnknownEffect(makeSuccessSchema(endpoint), options)
+  const encodeError = Schema.encodeUnknownEffect(makeErrorSchema(endpoint), options)
+  const decodeParams = UndefinedOr.map(endpoint.params, decodeUnknownEffect)
+  const decodeHeaders = UndefinedOr.map(endpoint.headers, decodeUnknownEffect)
   const decodeQuery = UndefinedOr.map(
     endpoint.query,
-    (schema) => Schema.decodeUnknownEffect(Schema.toCodecArrayFromSingle(schema))
+    (schema) => decodeUnknownEffect(Schema.toCodecArrayFromSingle(schema))
   )
-  const encodeStream = makeStreamEncoder(endpoint)
-  const encodeWithHeaders = makeWithHeadersEncoder(endpoint)
+  const encodeStream = makeStreamEncoder(endpoint, options)
+  const encodeWithHeaders = makeWithHeadersEncoder(endpoint, options)
 
   const shouldParsePayload = endpoint.payload.size > 0 && !isRaw
-  const payloadBy = shouldParsePayload ? buildPayloadDecoders(endpoint.payload) : undefined
+  const payloadBy = shouldParsePayload ? buildPayloadDecoders(endpoint.payload, options) : undefined
 
   return applyMiddleware(
     group,
@@ -840,6 +892,7 @@ function handlerToHttpEffect(
 
 /** @internal */
 export function handlerToRoute(
+  api: Pick<HttpApi.Top, "annotations">,
   group: HttpApiGroup.Top,
   handler: HandlerRuntime,
   context: Context.Context<any>
@@ -847,8 +900,8 @@ export function handlerToRoute(
   const endpoint = handler.endpoint
   return HttpRouter.route(
     endpoint.method,
-    endpoint.path as HttpRouter.PathInput,
-    handlerToHttpEffect(group, endpoint, context, handler.handler, handler.isRaw),
+    HttpApiPath.toRouterPath(endpoint.path, endpoint.params) as HttpRouter.PathInput,
+    handlerToHttpEffect(api, group, endpoint, context, handler.handler, handler.isRaw),
     { uninterruptible: handler.uninterruptible }
   )
 }
@@ -946,12 +999,15 @@ interface WithHeadersEncoders {
   readonly encodeHeaders: ReadonlyMap<number, WithHeadersEncoder>
 }
 
-function makeWithHeadersEncoder(endpoint: HttpApiEndpoint.Top): WithHeadersEncoders | undefined {
+function makeWithHeadersEncoder(
+  endpoint: HttpApiEndpoint.Top,
+  options: SchemaAST.ParseOptions | undefined
+): WithHeadersEncoders | undefined {
   const encodeHeaders = new Map<number, WithHeadersEncoder>()
   const bodySchemas: Array<Schema.ConstraintEncoder<HttpServerResponse, unknown>> = []
   for (const schema of endpoint.success) {
     if (!HttpApiSchema.isWithHeaders(schema)) continue
-    encodeHeaders.set(HttpApiSchema.getStatusSuccessSchema(schema), Schema.encodeUnknownEffect(schema.headers))
+    encodeHeaders.set(HttpApiSchema.getStatusSuccessSchema(schema), Schema.encodeUnknownEffect(schema.headers, options))
     if (!HttpApiSchema.isStreamSchema(schema.schema)) {
       bodySchemas.push(toResponseSuccessSchema(schema))
     }
@@ -965,19 +1021,23 @@ function makeWithHeadersEncoder(endpoint: HttpApiEndpoint.Top): WithHeadersEncod
     ? bodySchemas[0]
     : Schema.Union(bodySchemas)
   return {
-    encodeBody: Schema.encodeUnknownEffect(bodySchema),
+    encodeBody: Schema.encodeUnknownEffect(bodySchema, options),
     encodeHeaders
   }
 }
 
-function makeStreamEncoder(endpoint: HttpApiEndpoint.Top): StreamEncoder | undefined {
-  const streamSchema = getStreamSuccessSchema(endpoint)
-  if (streamSchema === undefined) {
+function makeStreamEncoder(
+  endpoint: HttpApiEndpoint.Top,
+  options: SchemaAST.ParseOptions | undefined
+): StreamEncoder | undefined {
+  const successSchema = getStreamSuccessSchema(endpoint)
+  if (successSchema === undefined) {
     return undefined
   }
 
+  const streamSchema = successSchema.body
   const hasBuffered = hasBufferedSuccess(endpoint)
-  const status = HttpApiSchema.getStatusStream(streamSchema)
+  const status = HttpApiSchema.getStatusSuccessSchema(successSchema.schema)
   const contentType = streamSchema.contentType
 
   if (HttpApiSchema.isStreamUint8Array(streamSchema)) {
@@ -998,7 +1058,7 @@ function makeStreamEncoder(endpoint: HttpApiEndpoint.Top): StreamEncoder | undef
     }
   }
 
-  const sseEncoder = makeSseEncoder(streamSchema)
+  const sseEncoder = makeSseEncoder(streamSchema, options)
 
   return (response, context) => {
     if (!Stream.isStream(response)) {
@@ -1021,7 +1081,7 @@ function getStreamSuccessSchema(endpoint: HttpApiEndpoint.Top) {
   for (const schema of endpoint.success) {
     const body = HttpApiSchema.isWithHeaders(schema) ? schema.schema : schema
     if (HttpApiSchema.isStreamSchema(body)) {
-      return body
+      return { schema, body }
     }
   }
 }
@@ -1043,13 +1103,14 @@ interface SseStreamEncoder {
 }
 
 function makeSseEncoder<Events extends Sse.EventCodec, Error extends Schema.Constraint>(
-  streamSchema: HttpApiSchema.StreamSse<Events, Error, unknown>
+  streamSchema: HttpApiSchema.StreamSse<Events, Error, unknown>,
+  options: SchemaAST.ParseOptions | undefined
 ): SseStreamEncoder {
   const CauseSchema = Schema.toCodecJson(Schema.Cause(streamSchema.error, Schema.Defect()))
   return {
     sseMode: streamSchema.sseMode,
-    encodeEvents: Schema.encodeUnknownEffect(Schema.Array(streamSchema.events)) as any,
-    encodeCause: Schema.encodeUnknownEffect(Schema.fromJsonString(CauseSchema))
+    encodeEvents: Schema.encodeUnknownEffect(Schema.Array(streamSchema.events), options) as any,
+    encodeCause: Schema.encodeUnknownEffect(Schema.fromJsonString(CauseSchema), options)
   }
 }
 
@@ -1175,7 +1236,7 @@ function getResponseTransformation(
     HttpApiSchema.isNoContent(bodySchema.ast)
   )
 
-  return SchemaTransformation.transformOrFail({
+  return SchemaTransformation.transformEffect({
     decode: (input, options) =>
       Effect.fail(
         new SchemaIssue.Forbidden({ message: "Encode only schema" }, input, options)
@@ -1194,7 +1255,7 @@ function withHeadersTransformation<T = unknown>(
     options?: SchemaAST.ParseOptions
   ) => Effect.Effect<unknown, Schema.SchemaError, unknown>
 ): SchemaTransformation.Transformation<T, Response.HttpServerResponse, never, unknown> {
-  return SchemaTransformation.transformOrFail<T, Response.HttpServerResponse, never, unknown>({
+  return SchemaTransformation.transformEffect<T, Response.HttpServerResponse, never, unknown>({
     decode: (input, options) =>
       Effect.fail(
         new SchemaIssue.Forbidden({ message: "Encode only schema" }, input, options)
diff --git a/repos/effect/packages/effect/src/unstable/httpapi/HttpApiClient.ts b/repos/effect/packages/effect/src/unstable/httpapi/HttpApiClient.ts
index 365329af4..87493b507 100644
--- a/repos/effect/packages/effect/src/unstable/httpapi/HttpApiClient.ts
+++ b/repos/effect/packages/effect/src/unstable/httpapi/HttpApiClient.ts
@@ -12,7 +12,7 @@
  */
 import * as Arr from "../../Array.ts"
 import * as Cause from "../../Cause.ts"
-import type * as Context from "../../Context.ts"
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import { identity } from "../../Function.ts"
 import * as InternalRecord from "../../internal/record.ts"
@@ -29,7 +29,7 @@ import * as HttpBody from "../http/HttpBody.ts"
 import * as HttpClient from "../http/HttpClient.ts"
 import * as HttpClientError from "../http/HttpClientError.ts"
 import * as HttpClientRequest from "../http/HttpClientRequest.ts"
-import * as HttpClientResponse from "../http/HttpClientResponse.ts"
+import type * as HttpClientResponse from "../http/HttpClientResponse.ts"
 import * as HttpMethod from "../http/HttpMethod.ts"
 import * as UrlParams from "../http/UrlParams.ts"
 import * as HttpApi from "./HttpApi.ts"
@@ -38,6 +38,7 @@ import type * as HttpApiGroup from "./HttpApiGroup.ts"
 import type * as HttpApiMiddleware from "./HttpApiMiddleware.ts"
 import * as HttpApiSchema from "./HttpApiSchema.ts"
 import * as MediaType from "./internal/mediaType.ts"
+import * as HttpApiPath from "./internal/path.ts"
 
 /**
  * The type-safe client shape generated from HTTP API groups, with non-top-level
@@ -164,8 +165,9 @@ export declare namespace Client {
 
   /**
    * The typed function generated for an endpoint, accepting the endpoint request
-   * shape and returning an effect whose success, error, and service channels reflect
-   * the endpoint schemas, middleware, and selected response mode.
+   * shape, including optional per-call SSE decoding options. The returned effect's success,
+   * error, and service channels reflect the endpoint schemas, middleware, and
+   * selected response mode.
    *
    * @category models
    * @since 4.0.0
@@ -328,18 +330,15 @@ export const makeClient = <ApiId extends string, Groups extends HttpApiGroup.Con
         options.onGroup?.(onGroupOptions)
       },
       onEndpoint(onEndpointOptions) {
-        const { group, endpoint, errors, successes } = onEndpointOptions
-        const makeUrl = compilePath(endpoint.path)
-        const decodeMap: Record<
-          number | "orElse",
-          (response: HttpClientResponse.HttpClientResponse) => Effect.Effect<unknown, unknown, unknown>
-        > = { orElse: statusOrElse }
-        const decodeResponse = HttpClientResponse.matchStatus(decodeMap)
+        const { group, endpoint, errors, successes, mergedAnnotations } = onEndpointOptions
+        const parseOptions = Context.getOrUndefined(mergedAnnotations, HttpApi.ParseOptions)
+        const makeUrl = compilePath(endpoint.path, endpoint.params)
+        const decodeMap: Record<number | "orElse", ResponseDecoder> = { orElse: statusOrElse }
         const errorAlternatives = new Map<number, Array<ResponseAlternative>>()
         for (const [status, schemas] of errors.entries()) {
           const grouped = groupSchemasByContentType(schemas)
           for (const [contentType, schemas] of grouped.entries()) {
-            addResponseAlternative(errorAlternatives, status, contentType, schemasToResponse(schemas))
+            addResponseAlternative(errorAlternatives, status, contentType, schemasToResponse(schemas, parseOptions))
           }
         }
         for (const [status, alternatives] of errorAlternatives.entries()) {
@@ -366,7 +365,7 @@ export const makeClient = <ApiId extends string, Groups extends HttpApiGroup.Con
         for (const [status, schemas] of successes.entries()) {
           const grouped = groupSchemasByContentType(schemas)
           for (const [contentType, schemas] of grouped.entries()) {
-            addResponseAlternative(successAlternatives, status, contentType, schemasToResponse(schemas))
+            addResponseAlternative(successAlternatives, status, contentType, schemasToResponse(schemas, parseOptions))
           }
         }
         for (const streamSuccess of getStreamSuccessSchemas(endpoint)) {
@@ -375,25 +374,26 @@ export const makeClient = <ApiId extends string, Groups extends HttpApiGroup.Con
             successAlternatives,
             HttpApiSchema.getStatusSuccessSchema(streamSuccess),
             streamSchema.contentType,
-            streamToResponse(streamSuccess)
+            streamToResponse(streamSuccess, parseOptions)
           )
         }
         for (const [status, alternatives] of successAlternatives.entries()) {
           decodeMap[status] = makeResponseDecoder(alternatives)
         }
 
-        // encoders
-        const encodeParams = UndefinedOr.map(endpoint.params, Schema.encodeUnknownEffect)
+        const encodeUnknownEffect = <S extends Schema.Constraint>(schema: S) =>
+          Schema.encodeUnknownEffect(schema, parseOptions)
+        const encodeParams = UndefinedOr.map(endpoint.params, encodeUnknownEffect)
 
         const payloadSchemas = HttpApiEndpoint.getPayloadSchemas(endpoint)
         const encodePayload = Arr.isArrayNonEmpty(payloadSchemas) ?
           HttpMethod.hasBody(endpoint.method)
-            ? Schema.encodeUnknownEffect(getEncodePayloadSchema(payloadSchemas, endpoint.method))
-            : Schema.encodeUnknownEffect(Schema.Union(payloadSchemas)) :
+            ? encodeUnknownEffect(getEncodePayloadSchema(payloadSchemas, endpoint.method))
+            : encodeUnknownEffect(Schema.Union(payloadSchemas)) :
           undefined
 
-        const encodeHeaders = UndefinedOr.map(endpoint.headers, Schema.encodeUnknownEffect)
-        const encodeQuery = UndefinedOr.map(endpoint.query, Schema.encodeUnknownEffect)
+        const encodeHeaders = UndefinedOr.map(endpoint.headers, encodeUnknownEffect)
+        const encodeQuery = UndefinedOr.map(endpoint.query, encodeUnknownEffect)
 
         const middlewareKeys = Array.from(onEndpointOptions.middleware, (tag) => `${tag.key}/Client`)
 
@@ -404,6 +404,7 @@ export const makeClient = <ApiId extends string, Groups extends HttpApiGroup.Con
             readonly payload: unknown
             readonly headers: Record<string, string> | undefined
             readonly responseMode?: HttpApiEndpoint.ClientResponseMode
+            readonly sseOptions?: Sse.DecodeOptions | undefined
           } | undefined
         ) {
           let httpRequest = HttpClientRequest.make(endpoint.method)(endpoint.path)
@@ -455,9 +456,10 @@ export const makeClient = <ApiId extends string, Groups extends HttpApiGroup.Con
             return response
           }
 
+          const decoded = (decodeMap[response.status] ?? decodeMap.orElse)(response, request?.sseOptions)
           const value = yield* (options.transformResponse === undefined
-            ? decodeResponse(response)
-            : options.transformResponse(decodeResponse(response)))
+            ? decoded
+            : options.transformResponse(decoded))
 
           return request?.responseMode === "decoded-and-response" ? [value, response] : value
         })
@@ -667,14 +669,15 @@ export const urlBuilder = <Api extends HttpApi.Constraint>(api: Api, options?: {
       if (group.topLevel) return
       InternalRecord.assignProperty(builder, group.identifier, {})
     },
-    onEndpoint({ group, endpoint }) {
-      const makeUrl = compilePath(endpoint.path)
+    onEndpoint({ group, endpoint, mergedAnnotations }) {
+      const parseOptions = Context.getOrUndefined(mergedAnnotations, HttpApi.ParseOptions)
+      const makeUrl = compilePath(endpoint.path, endpoint.params)
       const encodeParams = endpoint.params === undefined
         ? undefined
-        : Schema.encodeSync(endpoint.params as unknown as Schema.ConstraintEncoder<unknown>)
+        : Schema.encodeSync(endpoint.params as unknown as Schema.ConstraintEncoder<unknown>, parseOptions)
       const encodeQuery = endpoint.query === undefined
         ? undefined
-        : Schema.encodeSync(endpoint.query as unknown as Schema.ConstraintEncoder<unknown>)
+        : Schema.encodeSync(endpoint.query as unknown as Schema.ConstraintEncoder<unknown>, parseOptions)
 
       const endpointBuilder = (request?: {
         readonly params?: unknown
@@ -687,9 +690,20 @@ export const urlBuilder = <Api extends HttpApi.Constraint>(api: Api, options?: {
         const queryInput = request?.query === undefined
           ? undefined
           : (encodeQuery === undefined ? request.query : encodeQuery(request.query)) as UrlParams.Input
-        const query = queryInput === undefined ? "" : UrlParams.toString(UrlParams.fromInput(queryInput))
-        const url = query === "" ? path : `${path}?${query}`
-        return options?.baseUrl === undefined ? url : new URL(url, options.baseUrl.toString()).toString()
+        const urlParams = queryInput === undefined ? UrlParams.empty : UrlParams.fromInput(queryInput)
+        if (options?.baseUrl === undefined) {
+          const query = UrlParams.toString(urlParams)
+          return query === "" ? path : `${path}?${query}`
+        }
+        const url = new URL(
+          HttpClientRequest.prependUrl(HttpClientRequest.get(path), options.baseUrl.toString()).url
+        )
+        for (const [key, value] of urlParams.params) {
+          if (value !== undefined) {
+            url.searchParams.append(key, value)
+          }
+        }
+        return url.toString()
       }
       InternalRecord.assignProperty(
         group.topLevel ? builder : builder[group.identifier],
@@ -706,14 +720,16 @@ export const urlBuilder = <Api extends HttpApi.Constraint>(api: Api, options?: {
 
 const paramsRegExp = /(\/?):(\w+)(\?)?/g
 
-const compilePath = (path: string) => {
-  if (!paramsRegExp.test(path)) {
+const compilePath = (path: string, schema: Schema.Top | undefined) => {
+  if (schema === undefined || !path.includes(":")) {
     return (_: any) => path
   }
-  paramsRegExp.lastIndex = 0
+  const paramNames = HttpApiPath.getParamNames(schema)
   return (params: Record<string, string | undefined>) => {
-    paramsRegExp.lastIndex = 0
-    return path.replace(paramsRegExp, (_, slash: string, key: string, optional: string | undefined) => {
+    return path.replace(paramsRegExp, (match, slash: string, key: string, optional: string | undefined) => {
+      if (paramNames !== undefined && !paramNames.has(key)) {
+        return match
+      }
       const value = params[key]
       if (value === undefined) {
         if (optional !== undefined) {
@@ -726,14 +742,17 @@ const compilePath = (path: string) => {
   }
 }
 
-function schemasToResponse(schemas: readonly [Schema.Constraint, ...Array<Schema.Constraint>]) {
+function schemasToResponse(
+  schemas: readonly [Schema.Constraint, ...Array<Schema.Constraint>],
+  options: SchemaAST.ParseOptions | undefined
+) {
   const hasWithHeaders = schemas.some((schema) =>
     HttpApiSchema.isWithHeaders(schema) || HttpApiSchema.getWithHeadersAnnotation(schema.ast) !== undefined
   )
   const codec = hasWithHeaders
     ? Schema.Union(schemas.map(toCodecArrayBufferWithHeaders))
     : toCodecArrayBuffer(schemas)
-  const decode = Schema.decodeEffect(codec)
+  const decode = Schema.decodeEffect(codec, options)
   return (response: HttpClientResponse.HttpClientResponse) =>
     Effect.flatMap(
       response.arrayBuffer,
@@ -767,7 +786,10 @@ function toCodecArrayBufferWithHeaders(schema: Schema.Constraint): Schema.Top {
   )
 }
 
-type ResponseDecoder = (response: HttpClientResponse.HttpClientResponse) => Effect.Effect<unknown, unknown, unknown>
+type ResponseDecoder = (
+  response: HttpClientResponse.HttpClientResponse,
+  sseOptions?: Sse.DecodeOptions
+) => Effect.Effect<unknown, unknown, unknown>
 
 interface ResponseAlternative {
   readonly contentType: string
@@ -794,12 +816,12 @@ function makeResponseDecoder(alternatives: ReadonlyArray<ResponseAlternative>):
   if (alternatives.length === 1 && first !== undefined) {
     return first.decode
   }
-  return (response) => {
+  return (response, sseOptions) => {
     const contentType = MediaType.normalize(response.headers["content-type"] ?? "")
     const alternative = alternatives.find((alternative) => alternative.contentType === contentType)
     return alternative === undefined
       ? failUnsupportedContentType(response, contentType, alternatives)
-      : alternative.decode(response)
+      : alternative.decode(response, sseOptions)
   }
 }
 
@@ -862,50 +884,54 @@ function getStreamSuccessSchemas(endpoint: HttpApiEndpoint.Top): Array<StreamSuc
   return schemas
 }
 
-function streamToResponse(successSchema: StreamSuccessSchema) {
+function streamToResponse(successSchema: StreamSuccessSchema, options: SchemaAST.ParseOptions | undefined) {
   const isWithHeaders = isWithHeadersStreamSuccess(successSchema)
   const streamSchema = isWithHeaders ? successSchema.schema : successSchema
   const sse = HttpApiSchema.isStreamUint8Array(streamSchema)
     ? undefined
     : {
       declaration: streamSchema,
-      decoder: makeSseDecoder(streamSchema)
+      decoder: makeSseDecoder(streamSchema, options)
     }
-  const toStream = (response: HttpClientResponse.HttpClientResponse) =>
+  const toStream: ResponseDecoder = (response, sseOptions) =>
     Effect.map(Effect.context<never>(), (context) =>
       Stream.provideContext(
         sse === undefined ?
           response.stream :
-          decodeSseStream(response.stream, sse.declaration, sse.decoder),
+          decodeSseStream(response.stream, sse.declaration, sse.decoder(sseOptions)),
         context as Context.Context<unknown>
       ))
   if (!isWithHeaders) return toStream
 
-  const decodeHeaders = Schema.decodeUnknownEffect(successSchema.headers)
-  return (response: HttpClientResponse.HttpClientResponse) =>
+  const decodeHeaders = Schema.decodeUnknownEffect(successSchema.headers, options)
+  return (response: HttpClientResponse.HttpClientResponse, sseOptions?: Sse.DecodeOptions) =>
     Effect.flatMap(
       decodeHeaders(response.headers),
-      (headers) => Effect.map(toStream(response), (body) => HttpApiSchema.withHeaders({ body, headers }))
+      (headers) => Effect.map(toStream(response, sseOptions), (body) => HttpApiSchema.withHeaders({ body, headers }))
     )
 }
 
 function makeSseDecoder(
-  declaration: HttpApiSchema.StreamSse<Sse.EventCodec, Schema.Constraint, unknown>
+  declaration: HttpApiSchema.StreamSse<Sse.EventCodec, Schema.Constraint, unknown>,
+  parseOptions: SchemaAST.ParseOptions | undefined
 ) {
   const Event = Schema.Union([
     Schema.Struct({
+      id: Schema.optional(Schema.String),
       event: Schema.Literal(reservedStreamFailureEvent),
       data: Schema.fromJsonString(Schema.toCodecJson(Schema.Cause(declaration.error, Schema.Defect())))
     }),
     declaration.events
   ])
-  return Sse.decodeSchema(Event)
+  const defaultDecoder = Sse.decodeSchema(Event, undefined, parseOptions)
+  return (options?: Sse.DecodeOptions) =>
+    options === undefined ? defaultDecoder : Sse.decodeSchema(Event, options, parseOptions)
 }
 
 function decodeSseStream(
   stream: Stream.Stream<Uint8Array, HttpClientError.HttpClientError>,
   declaration: HttpApiSchema.StreamSse<Sse.EventCodec, Schema.Constraint, unknown>,
-  decoder: ReturnType<typeof makeSseDecoder>
+  decoder: ReturnType<ReturnType<typeof makeSseDecoder>>
 ): Stream.Stream<unknown, unknown, unknown> {
   const events = Stream.transformPull(
     stream.pipe(
@@ -1023,7 +1049,13 @@ function fromArrayBuffer(schema: Schema.Constraint): Schema.Top {
         : UnknownFromArrayBuffer
     }
     case "FormUrlEncoded":
-      return StringFromArrayBuffer.pipe(Schema.decodeTo(UrlParams.schemaRecord))
+      return StringFromArrayBuffer.pipe(Schema.decodeTo(
+        Schema.RecordFromUrlParams,
+        SchemaTransformation.transform({
+          decode: (text) => UrlParams.fromInput(new URLSearchParams(text)),
+          encode: UrlParams.toString
+        })
+      ))
     case "Uint8Array":
       return Uint8ArrayFromArrayBuffer
     case "Text":
@@ -1064,7 +1096,7 @@ function getEncodePayloadSchemaFromBody(
   const encoding = HttpApiSchema.getPayloadEncoding(ast, method)
   const out = $HttpBody.pipe(Schema.decodeTo(
     schema,
-    SchemaTransformation.transformOrFail<unknown, HttpBody.HttpBody>({
+    SchemaTransformation.transformEffect<unknown, HttpBody.HttpBody>({
       decode(input, options) {
         return Effect.fail(
           new SchemaIssue.Forbidden({ message: "Encode only schema" }, input, options)
diff --git a/repos/effect/packages/effect/src/unstable/httpapi/HttpApiEndpoint.ts b/repos/effect/packages/effect/src/unstable/httpapi/HttpApiEndpoint.ts
index 331b4ff84..3fc9406fe 100644
--- a/repos/effect/packages/effect/src/unstable/httpapi/HttpApiEndpoint.ts
+++ b/repos/effect/packages/effect/src/unstable/httpapi/HttpApiEndpoint.ts
@@ -15,7 +15,7 @@ import * as Arr from "../../Array.ts"
 import type { Brand } from "../../Brand.ts"
 import * as Context from "../../Context.ts"
 import type { Effect } from "../../Effect.ts"
-import { identity } from "../../Function.ts"
+import { identity, memoize } from "../../Function.ts"
 import { type Pipeable, pipeArguments } from "../../Pipeable.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Schema from "../../Schema.ts"
@@ -23,6 +23,7 @@ import * as AST from "../../SchemaAST.ts"
 import type * as Stream from "../../Stream.ts"
 import type { Simplify } from "../../Struct.ts"
 import type * as Types from "../../Types.ts"
+import type * as Sse from "../encoding/Sse.ts"
 import type { HttpMethod } from "../http/HttpMethod.ts"
 import * as HttpRouter from "../http/HttpRouter.ts"
 import type { HttpServerRequest } from "../http/HttpServerRequest.ts"
@@ -187,6 +188,7 @@ export interface HttpApiEndpoint<
   readonly error: ReadonlySet<Schema.Top>
   readonly annotations: Context.Context<never>
   readonly middlewares: ReadonlySet<Context.Key<Middleware, any>>
+  readonly disableCodecs: boolean
 
   /**
    * Add a prefix to the path of the endpoint.
@@ -282,10 +284,11 @@ export function getSuccessSchemas(endpoint: Top): [Schema.Top, ...Array<Schema.T
 /** @internal */
 export function getErrorSchemas(endpoint: Top): Array<Schema.Top> {
   const schemas = new Set<Schema.Top>(endpoint.error)
+  const transform = endpoint.disableCodecs ? identity : transformResponseSchema
   for (const middleware of endpoint.middlewares) {
     const key = middleware as any as HttpApiMiddleware.AnyService
     for (const schema of key.error) {
-      schemas.add(schema)
+      schemas.add(transform(schema))
     }
   }
   return Array.from(schemas)
@@ -484,9 +487,10 @@ export type RequestRaw<Endpoint> = Endpoint extends ConstraintRequest ? Endpoint
   : {}
 
 /**
- * Builds the request object accepted by a generated client method, including only
- * the params, query, headers, payload, and response mode fields required by the
- * endpoint. Multipart payloads are supplied as `FormData`.
+ * Builds the request object accepted by a generated client method, including the
+ * params, query, headers, and payload required by the endpoint, plus optional
+ * response mode and SSE decoding options. Multipart payloads are supplied as
+ * `FormData`.
  *
  * @category utility types
  * @since 4.0.0
@@ -507,8 +511,14 @@ export type ClientRequest<
         ? { readonly payload: FormData }
       : { readonly payload: Payload["Type"] }
     : { readonly payload: Payload["Type"] })
-) extends infer Req ? keyof Req extends never ? (void | { readonly responseMode?: ResponseMode }) :
-  Req & { readonly responseMode?: ResponseMode } :
+) extends infer Req ? keyof Req extends never ? (void | {
+      readonly responseMode?: ResponseMode
+      readonly sseOptions?: Sse.DecodeOptions | undefined
+    }) :
+  Req & {
+    readonly responseMode?: ResponseMode
+    readonly sseOptions?: Sse.DecodeOptions | undefined
+  } :
   void
 
 /**
@@ -833,7 +843,8 @@ const optionsFromEndpoint = (endpoint: Top) => ({
   success: endpoint.success,
   error: endpoint.error,
   annotations: endpoint.annotations,
-  middlewares: endpoint.middlewares
+  middlewares: endpoint.middlewares,
+  disableCodecs: endpoint.disableCodecs
 })
 
 function makeProto<
@@ -860,6 +871,7 @@ function makeProto<
   readonly error: ReadonlySet<Schema.Top>
   readonly annotations: Context.Context<never>
   readonly middlewares: ReadonlySet<Context.Key<Middleware, any>>
+  readonly disableCodecs: boolean
 }): HttpApiEndpoint<
   Identifier,
   Method,
@@ -1090,7 +1102,8 @@ export const make = <Method extends HttpMethod>(method: Method): {
     success: getSuccessResponse(options?.success, method, disableCodecs),
     error: getErrorResponse(options?.error, disableCodecs),
     annotations: Context.empty(),
-    middlewares: new Set()
+    middlewares: new Set(),
+    disableCodecs
   })
 }
 
@@ -1157,7 +1170,7 @@ function getSuccessResponse(
   return new Set(disableCodecs ? schemas : schemas.map(transformResponseSchema))
 }
 
-function transformResponseSchema(schema: Schema.Top): Schema.Top {
+const transformResponseSchema = memoize((schema: Schema.Top): Schema.Top => {
   if (HttpApiSchema.isStreamSchema(schema)) return schema
   if (HttpApiSchema.isWithHeaders(schema)) {
     const inner = HttpApiSchema.isStreamSchema(schema.schema)
@@ -1166,7 +1179,7 @@ function transformResponseSchema(schema: Schema.Top): Schema.Top {
     return HttpApiSchema.rebuildWithHeaders(schema, inner, Schema.toCodecStringTree(schema.headers))
   }
   return transformResponse(schema)
-}
+})
 
 function getErrorResponse(
   error: Schema.Top | ReadonlyArray<Schema.Top> | undefined,
@@ -1396,6 +1409,14 @@ function transformPayload(schema: Schema.Top, method: HttpMethod): Schema.Top {
  */
 export const get = make("GET")
 
+/**
+ * Creates a `QUERY` endpoint declaration.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const query = make("QUERY")
+
 /**
  * Creates a `POST` endpoint declaration.
  *
diff --git a/repos/effect/packages/effect/src/unstable/httpapi/HttpApiError.ts b/repos/effect/packages/effect/src/unstable/httpapi/HttpApiError.ts
index 20f90066d..48654e87d 100644
--- a/repos/effect/packages/effect/src/unstable/httpapi/HttpApiError.ts
+++ b/repos/effect/packages/effect/src/unstable/httpapi/HttpApiError.ts
@@ -458,7 +458,9 @@ export class HttpApiSchemaError extends Data.TaggedClass("HttpApiSchemaError")<{
     kind: HttpApiSchemaError["kind"],
     effect: Effect.Effect<A, Schema.SchemaError, R>
   ): Effect.Effect<A, HttpApiSchemaError, R> {
-    return Effect.mapError(effect, (error) => new HttpApiSchemaError({ kind, cause: error }))
+    // Decoders return completed Exit values for synchronous results, so map
+    // eagerly and skip the error wrapper when nothing remains to run.
+    return Effect.mapErrorEager(effect, (error) => new HttpApiSchemaError({ kind, cause: error }))
   }
 
   readonly name = "HttpApiSchemaError"
diff --git a/repos/effect/packages/effect/src/unstable/httpapi/HttpApiMiddleware.ts b/repos/effect/packages/effect/src/unstable/httpapi/HttpApiMiddleware.ts
index 24b3f0fb6..bcdcd9f86 100644
--- a/repos/effect/packages/effect/src/unstable/httpapi/HttpApiMiddleware.ts
+++ b/repos/effect/packages/effect/src/unstable/httpapi/HttpApiMiddleware.ts
@@ -352,17 +352,19 @@ export const Service = <
     readonly requiredForClient?: boolean | undefined
   } | undefined
 ) => {
-  const Err = globalThis.Error as any
   const limit = getStackTraceLimit()
-  setStackTraceLimit(2)
-  const creationError = new Err()
-  setStackTraceLimit(limit)
+  let creationError: globalThis.Error | undefined
+  if (limit !== 0) {
+    setStackTraceLimit(2)
+    creationError = new globalThis.Error()
+    setStackTraceLimit(limit)
+  }
 
   class Service extends Context.Service<Self, any>()(id) {}
   const self = Service as any
   Object.defineProperty(Service, "stack", {
     get() {
-      return creationError.stack
+      return creationError?.stack
     }
   })
   self[TypeId] = TypeId
diff --git a/repos/effect/packages/effect/src/unstable/httpapi/HttpApiSchema.ts b/repos/effect/packages/effect/src/unstable/httpapi/HttpApiSchema.ts
index b98581567..a111b6921 100644
--- a/repos/effect/packages/effect/src/unstable/httpapi/HttpApiSchema.ts
+++ b/repos/effect/packages/effect/src/unstable/httpapi/HttpApiSchema.ts
@@ -15,7 +15,7 @@ import * as Schema from "../../Schema.ts"
 import * as SchemaAST from "../../SchemaAST.ts"
 import * as SchemaTransformation from "../../SchemaTransformation.ts"
 import * as Stream from "../../Stream.ts"
-import type * as Sse from "../encoding/Sse.ts"
+import * as Sse from "../encoding/Sse.ts"
 import { hasBody, type HttpMethod } from "../http/HttpMethod.ts"
 import * as HttpStatus from "../http/HttpStatus.ts"
 import type * as Multipart_ from "../http/Multipart.ts"
@@ -288,7 +288,7 @@ export interface StreamSse<
 export interface SseEventFromData<Data extends Schema.Constraint> extends
   Schema.ConstraintCodec<
     {
-      readonly id: string | undefined
+      readonly id?: string | undefined
       readonly event: string
       readonly data: Data["Type"]
     },
@@ -365,8 +365,7 @@ export const StreamSse: {
   readonly error?: Schema.Constraint | undefined
 }): StreamSse<Sse.EventCodec, Schema.Top, unknown> => {
   const events = options.events ?? (options.data === undefined ? undefined : Schema.Struct({
-    id: Schema.UndefinedOr(Schema.String),
-    event: Schema.String,
+    ...Sse.EventEncoded.fields,
     data: Schema.fromJsonString(options.data)
   }))
   if (events === undefined) {
@@ -735,8 +734,8 @@ export function encodeToWithHeaders<
       )
     ).annotate({
       "~httpApiWithHeaders": { body, headers, headersCodec: Schema.toEncoded(headers) },
-      ...(status !== undefined ? { httpApiStatus: status } : undefined),
-      ...(encoding !== undefined ? { "~httpApiEncoding": encoding } : undefined)
+      httpApiStatus: status,
+      "~httpApiEncoding": encoding
     })
   }
 }
@@ -996,11 +995,6 @@ export function getResponseEncodingSchema(schema: Schema.Constraint): ResponseEn
   return getResponseEncoding(schema.ast)
 }
 
-/** @internal */
-export function getStatusStream(self: StreamSchema): number {
-  return getStatusSuccess(self.ast)
-}
-
 /** @internal */
 export function getStatusError(self: SchemaAST.AST): number {
   return resolveHttpApiStatus(self) ?? 500
diff --git a/repos/effect/packages/effect/src/unstable/httpapi/HttpApiTest.ts b/repos/effect/packages/effect/src/unstable/httpapi/HttpApiTest.ts
index e2562030a..5a9b7b344 100644
--- a/repos/effect/packages/effect/src/unstable/httpapi/HttpApiTest.ts
+++ b/repos/effect/packages/effect/src/unstable/httpapi/HttpApiTest.ts
@@ -20,6 +20,7 @@ import type { HttpPlatform } from "../http/HttpPlatform.ts"
 import * as HttpRouter from "../http/HttpRouter.ts"
 import * as HttpServerRequest from "../http/HttpServerRequest.ts"
 import * as HttpServerResponse from "../http/HttpServerResponse.ts"
+import * as preResponseHandler from "../http/internal/preResponseHandler.ts"
 import type * as HttpApi from "./HttpApi.ts"
 import type { HandlerRuntime } from "./HttpApiBuilder.ts"
 import * as HttpApiBuilder from "./HttpApiBuilder.ts"
@@ -80,7 +81,7 @@ export const groups = Effect.fnUntraced(function*<
         uninterruptible: false
       }
       handlers.set(endpointIdentifier, handler)
-      routes.push(HttpApiBuilder.handlerToRoute(group as any, handler, context))
+      routes.push(HttpApiBuilder.handlerToRoute(api, group as any, handler, context))
     }
     context = Context.add(context, group as any, { handlers, routes })
   }
@@ -100,10 +101,14 @@ export const groups = Effect.fnUntraced(function*<
   const httpClient = HttpClient.make(Effect.fnUntraced(function*(request) {
     const serverRequest = HttpServerRequest.fromClientRequest(request)
     const response = yield* handler.pipe(
+      Effect.flatMap((response) => {
+        const preResponse = preResponseHandler.requestPreResponseHandlers.get(serverRequest.source)
+        return preResponse === undefined ? Effect.succeed(response) : preResponse(serverRequest, response)
+      }),
       Effect.provideService(HttpServerRequest.HttpServerRequest, serverRequest),
       Effect.orDie
     )
-    return HttpServerResponse.toClientResponse(response)
+    return HttpServerResponse.toClientResponse(response, { request })
   }, Effect.scoped))
 
   return yield* HttpApiClient.makeWith(api, {
diff --git a/repos/effect/packages/effect/src/unstable/httpapi/OpenApi.ts b/repos/effect/packages/effect/src/unstable/httpapi/OpenApi.ts
index a4dc20075..9ccd49440 100644
--- a/repos/effect/packages/effect/src/unstable/httpapi/OpenApi.ts
+++ b/repos/effect/packages/effect/src/unstable/httpapi/OpenApi.ts
@@ -14,6 +14,7 @@ import * as Context from "../../Context.ts"
 import * as Equal from "../../Equal.ts"
 import { constFalse } from "../../Function.ts"
 import * as InternalRecord from "../../internal/record.ts"
+import * as InternalToCodec from "../../internal/schema/toCodec.ts"
 import * as InternalToJsonSchemaDocument from "../../internal/schema/toJsonSchemaDocument.ts"
 import * as InternalToRepresentation from "../../internal/schema/toRepresentation.ts"
 import * as JsonPatch from "../../JsonPatch.ts"
@@ -30,6 +31,7 @@ import type * as HttpApiGroup from "./HttpApiGroup.ts"
 import * as HttpApiMiddleware from "./HttpApiMiddleware.ts"
 import * as HttpApiSchema from "./HttpApiSchema.ts"
 import type { HttpApiSecurity } from "./HttpApiSecurity.ts"
+import * as HttpApiPath from "./internal/path.ts"
 
 /**
  * OpenAPI annotation for overriding generated identifiers, including operation ids.
@@ -328,6 +330,7 @@ function makeOpenApi<Id extends string, Groups extends HttpApiGroup.Constraint>(
   > = []
   const pathOperations = new Set<string>()
   const operationIds = new Set<string>()
+  const finalizeOperations: Array<() => void> = []
 
   processAnnotation(api.annotations, Title, (title) => {
     spec.info.title = title
@@ -378,7 +381,7 @@ function makeOpenApi<Id extends string, Groups extends HttpApiGroup.Constraint>(
       if (Context.get(mergedAnnotations, Exclude)) {
         return
       }
-      let op: OpenAPISpecOperation = {
+      const op: OpenAPISpecOperation = {
         tags: [Context.getOrElse(group.annotations, Title, () => group.identifier)],
         operationId: Context.getOrElse(
           endpoint.annotations,
@@ -390,8 +393,17 @@ function makeOpenApi<Id extends string, Groups extends HttpApiGroup.Constraint>(
         responses: {}
       }
 
-      const path = endpoint.path.replace(/:(\w+)\??/g, "{$1}")
-      const method = endpoint.method.toLowerCase() as OpenAPISpecMethodName
+      const paramNames = HttpApiPath.getParamNames(endpoint.params)
+      const path = endpoint.path.replace(
+        /:(\w+)\??/g,
+        (match, key: string) => paramNames === undefined || paramNames.has(key) ? `{${key}}` : match
+      )
+      const method = endpoint.method.toLowerCase() as Lowercase<HttpMethod.HttpMethod>
+      const isQuery = method === "query"
+      const operationKey = isQuery ? "QUERY" : method
+      const operationPath = isQuery
+        ? ["paths", path, "x-oai-additionalOperations", operationKey]
+        : ["paths", path, operationKey]
 
       function processResponseBodies(bodies: ResponseBodies, defaultDescription: () => string) {
         for (const [status, { content, descriptions, headers, streamContent }] of bodies) {
@@ -413,7 +425,7 @@ function makeOpenApi<Id extends string, Groups extends HttpApiGroup.Constraint>(
                 pathOps.push({
                   _tag: "parameter",
                   ast: ps.type,
-                  path: ["paths", path, method, "responses", String(status), "headers", name, "schema"]
+                  path: [...operationPath, "responses", String(status), "headers", name, "schema"]
                 })
               }
             }
@@ -422,12 +434,12 @@ function makeOpenApi<Id extends string, Groups extends HttpApiGroup.Constraint>(
             content.forEach((map, encoding) => {
               map.forEach((schemas, contentType) => {
                 const asts = Array.from(schemas, SchemaAST.getAST)
-                const ast = asts.length === 1 ? asts[0] : new SchemaAST.Union(asts, "anyOf")
+                const ast = asts.length === 1 ? asts[0] : new SchemaAST.Union(asts)
 
                 pathOps.push({
                   _tag: "schema",
                   ast: toEncodingAST(ast, encoding),
-                  path: ["paths", path, method, "responses", String(status), "content", contentType, "schema"]
+                  path: [...operationPath, "responses", String(status), "content", contentType, "schema"]
                 })
                 op.responses[status].content ??= {}
                 InternalRecord.assignProperty(op.responses[status].content, contentType, {
@@ -443,15 +455,13 @@ function makeOpenApi<Id extends string, Groups extends HttpApiGroup.Constraint>(
                 pathOps.push({
                   _tag: "schema",
                   ast: SchemaAST.getAST(stream.events),
-                  path: ["paths", path, method, "responses", String(status), "content", contentType, "schema"]
+                  path: [...operationPath, "responses", String(status), "content", contentType, "schema"]
                 })
                 pathOps.push({
                   _tag: "schema",
                   ast: SchemaAST.getAST(Schema.toCodecJson(Schema.Cause(stream.error, Schema.Defect()))),
                   path: [
-                    "paths",
-                    path,
-                    method,
+                    ...operationPath,
                     "responses",
                     String(status),
                     "content",
@@ -464,9 +474,7 @@ function makeOpenApi<Id extends string, Groups extends HttpApiGroup.Constraint>(
                   _tag: "schema",
                   ast: SchemaAST.getAST(stream.error),
                   path: [
-                    "paths",
-                    path,
-                    method,
+                    ...operationPath,
                     "responses",
                     String(status),
                     "content",
@@ -514,7 +522,7 @@ function makeOpenApi<Id extends string, Groups extends HttpApiGroup.Constraint>(
               pathOps.push({
                 _tag: "parameter",
                 ast: ps.type,
-                path: ["paths", path, method, "parameters", String(op.parameters.length - 1), "schema"]
+                path: [...operationPath, "parameters", String(op.parameters.length - 1), "schema"]
               })
             }
           }
@@ -583,11 +591,11 @@ function makeOpenApi<Id extends string, Groups extends HttpApiGroup.Constraint>(
           const content: OpenApiSpecContent = {}
           for (const [contentType, { encoding, schemas }] of schemasByContentType) {
             const asts = schemas.map(SchemaAST.getAST)
-            const ast = asts.length === 1 ? asts[0] : new SchemaAST.Union(asts, "anyOf")
+            const ast = asts.length === 1 ? asts[0] : new SchemaAST.Union(asts)
             pathOps.push({
               _tag: "schema",
               ast: toEncodingAST(ast, encoding._tag),
-              path: ["paths", path, method, "requestBody", "content", contentType, "schema"]
+              path: [...operationPath, "requestBody", "content", contentType, "schema"]
             })
             InternalRecord.assignProperty(content, contentType, {
               schema: {}
@@ -618,32 +626,40 @@ function makeOpenApi<Id extends string, Groups extends HttpApiGroup.Constraint>(
         () => "Error"
       )
 
-      processAnnotation(endpoint.annotations, Override, (override) => {
-        // OpenAPI documents are JSON, so symbol keys are intentionally ignored.
-        for (const [key, value] of Object.entries(override)) {
-          InternalRecord.assignProperty(op as any, key, value)
-        }
-      })
-      processAnnotation(endpoint.annotations, Transform, (transformFn) => {
-        op = transformFn(op) as OpenAPISpecOperation
-      })
-
       const pathOperation = `${method} ${path.replace(/\{[^}]+\}/g, "{}")}`
       if (pathOperations.has(pathOperation)) {
         throw new globalThis.Error(`Duplicate OpenAPI operation for ${endpoint.method} ${path}`)
       }
-      const operationId = op.operationId
-      if (operationId !== undefined) {
-        if (operationIds.has(operationId)) {
-          throw new globalThis.Error(`Duplicate OpenAPI operationId: ${operationId}`)
-        }
-        operationIds.add(operationId)
-      }
       pathOperations.add(pathOperation)
       if (!Object.hasOwn(spec.paths, path)) {
         InternalRecord.assignProperty(spec.paths, path, {})
       }
-      spec.paths[path][method] = op
+      const getOperations = (): Partial<Record<OpenAPISpecMethodName | "QUERY", OpenAPISpecOperation>> => {
+        const pathItem = spec.paths[path]
+        return isQuery ? (pathItem["x-oai-additionalOperations"] ??= {}) : pathItem
+      }
+      getOperations()[operationKey] = op
+      finalizeOperations.push(() => {
+        const operations = getOperations()
+        let op = operations[operationKey]!
+        processAnnotation(endpoint.annotations, Override, (override) => {
+          // OpenAPI documents are JSON, so symbol keys are intentionally ignored.
+          for (const [key, value] of Object.entries(override)) {
+            InternalRecord.assignProperty(op as any, key, value)
+          }
+        })
+        processAnnotation(endpoint.annotations, Transform, (transformFn) => {
+          op = transformFn(op) as OpenAPISpecOperation
+        })
+        const operationId = op.operationId
+        if (operationId !== undefined) {
+          if (operationIds.has(operationId)) {
+            throw new globalThis.Error(`Duplicate OpenAPI operationId: ${operationId}`)
+          }
+          operationIds.add(operationId)
+        }
+        operations[operationKey] = op
+      })
     }
   })
 
@@ -672,9 +688,10 @@ function makeOpenApi<Id extends string, Groups extends HttpApiGroup.Constraint>(
     const jsonSchemaMultiDocument = JsonSchema.toMultiDocumentOpenApi3_1(
       InternalToJsonSchemaDocument.toJsonSchemaMultiDocument(
         InternalToRepresentation.toRepresentations(
-          Arr.map(pathOps, (op) => Schema.toCodecJsonAST(op.ast)),
+          Arr.map(pathOps, (op) => InternalToCodec.toCodecJsonAST(op.ast)),
           options
-        )
+        ),
+        { onExcessProperty: "error" }
       )
     )
     const patchOps: Array<JsonPatch.JsonPatchOperation> = pathOps.map((op, i) => {
@@ -698,6 +715,10 @@ function makeOpenApi<Id extends string, Groups extends HttpApiGroup.Constraint>(
     spec = JsonPatch.apply(patchOps, spec as any) as any
   }
 
+  for (const finalize of finalizeOperations) {
+    finalize()
+  }
+
   Object.keys(spec.components.schemas).forEach((key) => {
     if (!JsonSchema.VALID_OPEN_API_COMPONENTS_SCHEMAS_KEY_REGEXP.test(key)) {
       throw new globalThis.Error(`Invalid component schema key: ${key}`)
@@ -1065,6 +1086,7 @@ export type OpenAPISpecMethodName =
 /**
  * Generated OpenAPI path item mapping HTTP methods to operations for a single route path.
  * Parameters declared here are shared by every operation on the path.
+ * `QUERY` operations are emitted under `x-oai-additionalOperations`.
  *
  * @category models
  * @since 4.0.0
@@ -1075,6 +1097,7 @@ export type OpenAPISpecPathItem =
   }
   & {
     parameters?: Array<OpenAPISpecParameter>
+    "x-oai-additionalOperations"?: Partial<Record<HttpMethod.HttpMethod, OpenAPISpecOperation>>
   }
 
 /**
diff --git a/repos/effect/packages/effect/src/unstable/httpapi/internal/path.ts b/repos/effect/packages/effect/src/unstable/httpapi/internal/path.ts
new file mode 100644
index 000000000..d2849d002
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/httpapi/internal/path.ts
@@ -0,0 +1,57 @@
+import type * as Schema from "../../../Schema.ts"
+import * as SchemaAST from "../../../SchemaAST.ts"
+
+const emptyParamNames: ReadonlySet<string> = new Set()
+
+/** @internal */
+export function getParamNames(schema: Schema.Constraint | undefined): ReadonlySet<string> | undefined {
+  if (schema === undefined) return emptyParamNames
+  const ast = SchemaAST.getLastEncoding(schema.ast)
+  return SchemaAST.isObjects(ast) && ast.indexSignatures.length === 0
+    ? new Set(ast.propertySignatures.map((ps) => String(ps.name)))
+    : undefined
+}
+
+/** @internal */
+export function toRouterPath(path: string, schema: Schema.Constraint | undefined): string {
+  // Preserve undeclared params for raw RouteContext consumers.
+  if (schema === undefined || !path.includes(":")) return path
+  const paramNames = getParamNames(schema)
+  if (paramNames === undefined) return path
+
+  let out = ""
+  let depth = 0
+  let regexStart = -1
+  for (let i = 0; i < path.length; i++) {
+    const char = path[i]
+    if (depth > 0 || i === regexStart) {
+      out += char
+      if (char === "\\") out += path[++i] ?? ""
+      else if (char === "(") depth++
+      else if (char === ")") depth--
+      continue
+    }
+    if (char !== ":") {
+      out += char
+      continue
+    }
+    if (path[i + 1] === ":") {
+      out += "::"
+      i++
+      continue
+    }
+
+    const param = /^:(\w+)/.exec(path.slice(i))
+    if (param !== null && paramNames.has(param[1])) {
+      out += param[0]
+      i += param[0].length - 1
+      const next = path[i + 1]
+      if (next === "(") regexStart = i + 1
+      // FindMyWay needs a regex to end the parameter name here.
+      else if (next !== undefined && !"/.-?".includes(next)) out += "(.*?)"
+    } else {
+      out += "::"
+    }
+  }
+  return out
+}
diff --git a/repos/effect/packages/effect/src/unstable/net/IpInterface.ts b/repos/effect/packages/effect/src/unstable/net/IpInterface.ts
new file mode 100644
index 000000000..7fec60918
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/net/IpInterface.ts
@@ -0,0 +1,245 @@
+/**
+ * IPv4 and IPv6 interface addresses that preserve host bits alongside a prefix length.
+ *
+ * @since 4.0.0
+ */
+import * as Equal from "../../Equal.ts"
+import * as Hash from "../../Hash.ts"
+import { NodeInspectSymbol } from "../../Inspectable.ts"
+import { hasProperty } from "../../Predicate.ts"
+import * as Result from "../../Result.ts"
+import * as NetAddress from "./NetAddress.ts"
+
+const TypeId = "~effect/net/IpInterface" as const
+
+/**
+ * An IP host address and prefix length. Host bits and any verified address
+ * refinements are preserved because the address is retained unchanged. Code
+ * that computes different address bits must widen to the IPv4 or IPv6 family,
+ * or validate the resulting address before treating it as refined.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface IpInterface<out A extends NetAddress.IpAddress = NetAddress.IpAddress> extends Equal.Equal, Hash.Hash {
+  readonly _tag: "IpInterface"
+  readonly address: A
+  readonly prefixLength: number
+  readonly [TypeId]: typeof TypeId
+  toString(): string
+  toJSON(): string
+}
+
+/**
+ * An IPv4 host address and prefix length.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type Ipv4Interface = IpInterface<NetAddress.Ipv4Address>
+
+/**
+ * An IPv6 host address and prefix length.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type Ipv6Interface = IpInterface<NetAddress.Ipv6Address>
+
+/**
+ * Companion types for parsing IP interface addresses.
+ *
+ * @since 4.0.0
+ */
+export declare namespace IpInterface {
+  /**
+   * Controls whether the input must contain an explicit prefix. Prefixes are
+   * optional by default and use the address width when omitted.
+   *
+   * @category models
+   * @since 4.0.0
+   */
+  export interface ParseOptions {
+    readonly prefix?: "required" | "optional"
+  }
+}
+
+/**
+ * Returns `true` when a value is an IPv4 interface address.
+ *
+ * @category guards
+ * @since 4.0.0
+ */
+export const isIpv4Interface = (u: unknown): u is Ipv4Interface =>
+  isIpInterface(u) && NetAddress.isIpv4Address(u.address)
+
+/**
+ * Returns `true` when a value is an IPv6 interface address.
+ *
+ * @category guards
+ * @since 4.0.0
+ */
+export const isIpv6Interface = (u: unknown): u is Ipv6Interface =>
+  isIpInterface(u) && NetAddress.isIpv6Address(u.address)
+
+/**
+ * Returns `true` when a value is an IP interface address.
+ *
+ * @category guards
+ * @since 4.0.0
+ */
+export const isIpInterface = (u: unknown): u is IpInterface => hasProperty(u, TypeId)
+
+const IpInterfaceProto = {
+  _tag: "IpInterface",
+  [TypeId]: TypeId,
+  [Equal.symbol](this: IpInterface, that: Equal.Equal): boolean {
+    return isIpInterface(that) &&
+      this.prefixLength === that.prefixLength &&
+      Equal.equals(this.address, that.address)
+  },
+  [Hash.symbol](this: IpInterface): number {
+    return Hash.combine(Hash.hash(this.address), Hash.number(this.prefixLength))
+  },
+  toString(this: IpInterface): string {
+    return format(this)
+  },
+  toJSON(this: IpInterface): string {
+    return this.toString()
+  },
+  [NodeInspectSymbol](this: IpInterface): string {
+    return this.toJSON()
+  }
+}
+
+const interfaceError = (input: unknown, message: string): Result.Result<never, NetAddress.NetAddressError> =>
+  Result.fail(new NetAddress.NetAddressError({ input, message }))
+
+/**
+ * Creates an interface address while preserving all address bits.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const make = <A extends NetAddress.IpAddress>(
+  address: A,
+  prefixLength: number
+): Result.Result<IpInterface<A>, NetAddress.NetAddressError> => {
+  const max = NetAddress.width(address)
+  if (!Number.isInteger(prefixLength) || prefixLength < 0 || prefixLength > max) {
+    return interfaceError(address, `prefix length must be an integer from 0 through ${max}`)
+  }
+  const self = Object.assign(Object.create(IpInterfaceProto), { address, prefixLength })
+  return Result.succeed(Object.freeze(self))
+}
+
+const parseAddressWithPrefix = (
+  input: string,
+  options?: IpInterface.ParseOptions
+): Result.Result<
+  { readonly address: string; readonly prefixLength: number | undefined },
+  NetAddress.NetAddressError
+> => {
+  const slash = input.indexOf("/")
+  if (slash === -1 && options?.prefix !== "required") {
+    return Result.succeed({ address: input, prefixLength: undefined })
+  }
+  if (slash <= 0 || slash !== input.lastIndexOf("/") || slash === input.length - 1) {
+    return interfaceError(input, "expected an address and prefix length separated by one slash")
+  }
+  const prefix = input.slice(slash + 1)
+  if (!/^(0|[1-9][0-9]*)$/.test(prefix)) {
+    return interfaceError(input, "prefix length must be an unpadded ASCII decimal integer")
+  }
+  return Result.succeed({ address: input.slice(0, slash), prefixLength: Number(prefix) })
+}
+
+/**
+ * Parses an IPv4 interface address while preserving host bits.
+ *
+ * **Details**
+ *
+ * A missing prefix defaults to 32. Use `prefix: "required"` to require one.
+ *
+ * @category decoding
+ * @since 4.0.0
+ */
+export const ipv4FromString = (
+  input: string,
+  options?: IpInterface.ParseOptions
+): Result.Result<Ipv4Interface, NetAddress.NetAddressError> =>
+  Result.flatMap(
+    parseAddressWithPrefix(input, options),
+    (parts) =>
+      Result.flatMap(NetAddress.ipv4FromString(parts.address), (address) =>
+        make(address, parts.prefixLength ?? NetAddress.width(address)))
+  )
+
+/**
+ * Parses an IPv6 interface address while preserving host bits.
+ *
+ * **Details**
+ *
+ * A missing prefix defaults to 128. Use `prefix: "required"` to require one.
+ *
+ * @category decoding
+ * @since 4.0.0
+ */
+export const ipv6FromString = (
+  input: string,
+  options?: IpInterface.ParseOptions
+): Result.Result<Ipv6Interface, NetAddress.NetAddressError> =>
+  Result.flatMap(
+    parseAddressWithPrefix(input, options),
+    (parts) =>
+      Result.flatMap(NetAddress.ipv6FromString(parts.address), (address) =>
+        make(address, parts.prefixLength ?? NetAddress.width(address)))
+  )
+
+/**
+ * Parses an IP interface address while preserving host bits.
+ *
+ * **Details**
+ *
+ * A missing prefix defaults to the address width. Use `prefix: "required"` to
+ * require one.
+ *
+ * @category decoding
+ * @since 4.0.0
+ */
+export const fromString = (
+  input: string,
+  options?: IpInterface.ParseOptions
+): Result.Result<IpInterface, NetAddress.NetAddressError> =>
+  Result.flatMap(
+    parseAddressWithPrefix(input, options),
+    (parts) =>
+      Result.flatMap(NetAddress.ipFromString(parts.address), (address) =>
+        make(address, parts.prefixLength ?? NetAddress.width(address)))
+  )
+
+/**
+ * Creates a trusted interface address, throwing when its prefix length is invalid.
+ *
+ * @category unsafe
+ * @since 4.0.0
+ */
+export const makeUnsafe = <A extends NetAddress.IpAddress>(address: A, prefixLength: number): IpInterface<A> =>
+  Result.getOrThrow(make(address, prefixLength))
+
+/**
+ * Parses a trusted interface address, throwing on failure.
+ *
+ * @category unsafe
+ * @since 4.0.0
+ */
+export const fromStringUnsafe = (input: string, options?: IpInterface.ParseOptions): IpInterface =>
+  Result.getOrThrow(fromString(input, options))
+
+/**
+ * Formats an interface address using canonical address text and its decimal prefix length.
+ *
+ * @category encoding
+ * @since 4.0.0
+ */
+export const format = (self: IpInterface): string => `${NetAddress.formatIp(self.address)}/${self.prefixLength}`
diff --git a/repos/effect/packages/effect/src/unstable/net/IpNetwork.ts b/repos/effect/packages/effect/src/unstable/net/IpNetwork.ts
new file mode 100644
index 000000000..07117cf34
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/net/IpNetwork.ts
@@ -0,0 +1,341 @@
+/**
+ * Pure, canonical IPv4 and IPv6 network prefixes using CIDR notation.
+ *
+ * @since 4.0.0
+ */
+import * as Equal from "../../Equal.ts"
+import { dual } from "../../Function.ts"
+import * as Hash from "../../Hash.ts"
+import { NodeInspectSymbol } from "../../Inspectable.ts"
+import { hasProperty } from "../../Predicate.ts"
+import * as Result from "../../Result.ts"
+import * as IpInterface from "./IpInterface.ts"
+import * as NetAddress from "./NetAddress.ts"
+
+const TypeId = "~effect/net/IpNetwork" as const
+
+/**
+ * An immutable canonical IP network prefix. Constructors that retain the exact
+ * input address also retain its verified refinements. Operations that derive a
+ * different address return only its IPv4 or IPv6 family; revalidate the result
+ * before treating it as refined.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface IpNetwork<out A extends NetAddress.IpAddress = NetAddress.IpAddress> extends Equal.Equal, Hash.Hash {
+  readonly _tag: "IpNetwork"
+  readonly address: A
+  readonly prefixLength: number
+  readonly [TypeId]: typeof TypeId
+  toString(): string
+  toJSON(): string
+}
+
+/**
+ * An immutable canonical IPv4 network prefix.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type Ipv4Network = IpNetwork<NetAddress.Ipv4Address>
+
+/**
+ * An immutable canonical IPv6 network prefix.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type Ipv6Network = IpNetwork<NetAddress.Ipv6Address>
+
+/**
+ * Returns `true` when a value is an IPv4 network prefix.
+ *
+ * @category guards
+ * @since 4.0.0
+ */
+export const isIpv4Network = (u: unknown): u is Ipv4Network => isIpNetwork(u) && NetAddress.isIpv4Address(u.address)
+
+/**
+ * Returns `true` when a value is an IPv6 network prefix.
+ *
+ * @category guards
+ * @since 4.0.0
+ */
+export const isIpv6Network = (u: unknown): u is Ipv6Network => isIpNetwork(u) && NetAddress.isIpv6Address(u.address)
+
+/**
+ * Returns `true` when a value is an IPv4 or IPv6 network prefix.
+ *
+ * @category guards
+ * @since 4.0.0
+ */
+export const isIpNetwork = (u: unknown): u is IpNetwork => hasProperty(u, TypeId)
+
+const IpNetworkProto = {
+  _tag: "IpNetwork",
+  [TypeId]: TypeId,
+  [Equal.symbol](this: IpNetwork, that: Equal.Equal): boolean {
+    return isIpNetwork(that) && this.prefixLength === that.prefixLength && Equal.equals(this.address, that.address)
+  },
+  [Hash.symbol](this: IpNetwork): number {
+    return Hash.combine(Hash.hash(this.address), Hash.number(this.prefixLength))
+  },
+  toString(this: IpNetwork): string {
+    return format(this)
+  },
+  toJSON(this: IpNetwork): string {
+    return this.toString()
+  },
+  [NodeInspectSymbol](this: IpNetwork): string {
+    return this.toJSON()
+  }
+}
+
+const fromInterfaceValue = <A extends NetAddress.IpAddress>(value: IpInterface.IpInterface<A>): IpNetwork<A> => {
+  const self = Object.assign(Object.create(IpNetworkProto), {
+    address: value.address,
+    prefixLength: value.prefixLength
+  })
+  return Object.freeze(self)
+}
+
+const toBytes = (address: NetAddress.IpAddress): ReadonlyArray<number> =>
+  NetAddress.isIpv4Address(address) ? NetAddress.ipv4ToOctets(address) : NetAddress.ipv6ToOctets(address)
+
+type IpAddressFamily<A extends NetAddress.IpAddress> = A extends NetAddress.Ipv4Address ? NetAddress.Ipv4Address
+  : A extends NetAddress.Ipv6Address ? NetAddress.Ipv6Address
+  : never
+
+const fromBytes = <A extends NetAddress.IpAddress>(
+  address: A,
+  bytes: ReadonlyArray<number>
+): IpAddressFamily<A> => {
+  const array = new Uint8Array(bytes)
+  return (NetAddress.isIpv4Address(address)
+    ? NetAddress.ipv4FromBytesUnsafe(array)
+    : NetAddress.ipv6FromBytesUnsafe(array)) as IpAddressFamily<A>
+}
+
+const maskBytes = (bytes: ReadonlyArray<number>, prefixLength: number): Array<number> => {
+  const wholeBytes = Math.floor(prefixLength / 8)
+  const partialBits = prefixLength % 8
+  return bytes.map((byte, index) => {
+    if (index < wholeBytes) return byte
+    if (index === wholeBytes && partialBits !== 0) return byte & ((0xff << (8 - partialBits)) & 0xff)
+    return 0
+  })
+}
+
+/**
+ * Creates a network prefix when the address has no host bits set.
+ *
+ * **Gotchas**
+ *
+ * Use {@link fromAddress} when a host address should be truncated to its containing network.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const make = <A extends NetAddress.IpAddress>(
+  address: A,
+  prefixLength: number
+): Result.Result<IpNetwork<A>, NetAddress.NetAddressError> => {
+  return Result.flatMap(IpInterface.make(address, prefixLength), (value) => {
+    const bytes = toBytes(address)
+    const masked = maskBytes(bytes, prefixLength)
+    if (bytes.some((byte, index) => byte !== masked[index])) {
+      return Result.fail(
+        new NetAddress.NetAddressError({ input: address, message: "address has non-zero host bits" })
+      )
+    }
+    return Result.succeed(fromInterfaceValue(value))
+  })
+}
+
+/**
+ * Creates the canonical network containing an address by clearing its host bits.
+ *
+ * **Gotchas**
+ *
+ * The returned network's address can differ from the input address.
+ * Its type therefore retains the IPv4 or IPv6 family but not refinements on
+ * the input address. Revalidate the derived address to recover a refinement.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const fromAddress = <A extends NetAddress.IpAddress>(
+  address: A,
+  prefixLength: number
+): Result.Result<IpNetwork<IpAddressFamily<A>>, NetAddress.NetAddressError> => {
+  return Result.map(IpInterface.make(address, prefixLength), (value) => {
+    const masked = fromBytes(address, maskBytes(toBytes(address), prefixLength))
+    return fromInterfaceValue(IpInterface.makeUnsafe(masked, value.prefixLength))
+  })
+}
+
+/**
+ * Returns the canonical network containing an interface address. The derived
+ * address retains its IPv4 or IPv6 family but not refinements on the input.
+ *
+ * @category conversions
+ * @since 4.0.0
+ */
+export const fromInterface = <A extends NetAddress.IpAddress>(
+  self: IpInterface.IpInterface<A>
+): IpNetwork<IpAddressFamily<A>> => fromAddressUnsafe(self.address, self.prefixLength)
+
+/**
+ * Parses a strict IPv4 network prefix in CIDR notation.
+ *
+ * @category decoding
+ * @since 4.0.0
+ */
+export const ipv4FromString = (input: string): Result.Result<Ipv4Network, NetAddress.NetAddressError> => {
+  return Result.flatMap(
+    IpInterface.ipv4FromString(input, { prefix: "required" }),
+    (value) => make(value.address, value.prefixLength)
+  )
+}
+
+/**
+ * Parses a strict IPv6 network prefix in CIDR notation.
+ *
+ * @category decoding
+ * @since 4.0.0
+ */
+export const ipv6FromString = (input: string): Result.Result<Ipv6Network, NetAddress.NetAddressError> => {
+  return Result.flatMap(
+    IpInterface.ipv6FromString(input, { prefix: "required" }),
+    (value) => make(value.address, value.prefixLength)
+  )
+}
+
+/**
+ * Parses a strict IPv4 or IPv6 network prefix in CIDR notation.
+ *
+ * @category decoding
+ * @since 4.0.0
+ */
+export const fromString = (input: string): Result.Result<IpNetwork, NetAddress.NetAddressError> => {
+  return Result.flatMap(
+    IpInterface.fromString(input, { prefix: "required" }),
+    (value) => make(value.address, value.prefixLength)
+  )
+}
+
+/**
+ * Creates a trusted network prefix, throwing when its address or prefix is invalid.
+ *
+ * @category unsafe
+ * @since 4.0.0
+ */
+export const makeUnsafe = <A extends NetAddress.IpAddress>(address: A, prefixLength: number): IpNetwork<A> =>
+  Result.getOrThrow(make(address, prefixLength))
+
+/**
+ * Creates the network containing a trusted address, throwing when its prefix is invalid.
+ * The derived address retains its IPv4 or IPv6 family but not refinements on
+ * the input address.
+ *
+ * @category unsafe
+ * @since 4.0.0
+ */
+export const fromAddressUnsafe = <A extends NetAddress.IpAddress>(
+  address: A,
+  prefixLength: number
+): IpNetwork<IpAddressFamily<A>> => Result.getOrThrow(fromAddress(address, prefixLength))
+
+/**
+ * Parses a trusted network prefix in CIDR notation, throwing on failure.
+ *
+ * @category unsafe
+ * @since 4.0.0
+ */
+export const fromStringUnsafe = (input: string): IpNetwork => Result.getOrThrow(fromString(input))
+
+/**
+ * Formats a network prefix using canonical address text and its decimal prefix length.
+ *
+ * @category encoding
+ * @since 4.0.0
+ */
+export const format = (self: IpNetwork): string => `${NetAddress.formatIp(self.address)}/${self.prefixLength}`
+
+/**
+ * Returns the lowest address in a network prefix.
+ *
+ * @category getters
+ * @since 4.0.0
+ */
+export const firstAddress = <A extends NetAddress.IpAddress>(self: IpNetwork<A>): A => self.address
+
+/**
+ * Returns the numerically greatest address in a network prefix. The derived
+ * address retains its IPv4 or IPv6 family but not refinements on the network
+ * address.
+ *
+ * @category getters
+ * @since 4.0.0
+ */
+export const lastAddress = <A extends NetAddress.IpAddress>(self: IpNetwork<A>): IpAddressFamily<A> => {
+  const bytes = toBytes(self.address)
+  const networkMask = maskBytes(bytes.map(() => 0xff), self.prefixLength)
+  return fromBytes(self.address, bytes.map((byte, index) => byte | (networkMask[index] ^ 0xff)))
+}
+
+/**
+ * Returns the exact number of addresses in a network prefix.
+ *
+ * @category getters
+ * @since 4.0.0
+ */
+export const addressCount = (self: IpNetwork): bigint =>
+  BigInt(1) << BigInt(NetAddress.width(self.address) - self.prefixLength)
+
+const containsBytes = (self: IpNetwork, address: NetAddress.IpAddress): boolean => {
+  if (NetAddress.isIpv4Address(self.address) !== NetAddress.isIpv4Address(address)) return false
+  const expected = toBytes(self.address)
+  const actual = maskBytes(toBytes(address), self.prefixLength)
+  return expected.every((byte, index) => byte === actual[index])
+}
+
+/**
+ * Returns `true` when a network prefix contains an IP address.
+ *
+ * @category predicates
+ * @since 4.0.0
+ */
+export const contains: {
+  (address: NetAddress.IpAddress): (self: IpNetwork) => boolean
+  (self: IpNetwork, address: NetAddress.IpAddress): boolean
+} = dual(2, containsBytes)
+
+/**
+ * Returns `true` when a network prefix contains every address in another network prefix.
+ *
+ * @category predicates
+ * @since 4.0.0
+ */
+export const containsNetwork: {
+  (other: IpNetwork): (self: IpNetwork) => boolean
+  (self: IpNetwork, other: IpNetwork): boolean
+} = dual(2, (self: IpNetwork, other: IpNetwork): boolean => {
+  return self.prefixLength <= other.prefixLength && containsBytes(self, other.address)
+})
+
+/**
+ * Returns `true` when two network prefixes contain at least one common address.
+ *
+ * @category predicates
+ * @since 4.0.0
+ */
+export const overlaps: {
+  (other: IpNetwork): (self: IpNetwork) => boolean
+  (self: IpNetwork, other: IpNetwork): boolean
+} = dual(2, (self: IpNetwork, other: IpNetwork): boolean => {
+  return self.prefixLength <= other.prefixLength
+    ? containsBytes(self, other.address)
+    : containsBytes(other, self.address)
+})
diff --git a/repos/effect/packages/effect/src/unstable/net/NetAddress.ts b/repos/effect/packages/effect/src/unstable/net/NetAddress.ts
new file mode 100644
index 000000000..f806224ae
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/net/NetAddress.ts
@@ -0,0 +1,1610 @@
+/**
+ * Pure, platform-neutral values for MAC, IP, internet socket, and Unix path addresses.
+ *
+ * @since 4.0.0
+ */
+import type * as Brand from "../../Brand.ts"
+import * as Data from "../../Data.ts"
+import * as Equal from "../../Equal.ts"
+import { dual } from "../../Function.ts"
+import * as Hash from "../../Hash.ts"
+import { NodeInspectSymbol } from "../../Inspectable.ts"
+import * as Option from "../../Option.ts"
+import { hasProperty } from "../../Predicate.ts"
+import * as Result from "../../Result.ts"
+
+const TypeId = "~effect/net/NetAddress" as const
+
+/**
+ * An immutable 32-bit IPv4 address.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface Ipv4Address extends Equal.Equal, Hash.Hash {
+  readonly _tag: "Ipv4Address"
+  readonly [TypeId]: typeof TypeId
+  toString(): string
+  toJSON(): string
+}
+
+/**
+ * An immutable 128-bit IPv6 address without socket scope metadata.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface Ipv6Address extends Equal.Equal, Hash.Hash {
+  readonly _tag: "Ipv6Address"
+  readonly [TypeId]: typeof TypeId
+  toString(): string
+  toJSON(): string
+}
+
+/**
+ * A numeric IPv4 or IPv6 address.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type IpAddress = Ipv4Address | Ipv6Address
+
+/**
+ * An immutable 48-bit IEEE 802 MAC address.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface MacAddress extends Equal.Equal, Hash.Hash {
+  readonly _tag: "MacAddress"
+  readonly [TypeId]: typeof TypeId
+  toString(): string
+  toJSON(): string
+}
+
+const MulticastTypeId = "~effect/net/NetAddress/MulticastAddress" as const
+const UnicastTypeId = "~effect/net/NetAddress/UnicastAddress" as const
+const BroadcastTypeId = "~effect/net/NetAddress/BroadcastAddress" as const
+const LoopbackTypeId = "~effect/net/NetAddress/LoopbackAddress" as const
+const LinkLocalTypeId = "~effect/net/NetAddress/LinkLocalAddress" as const
+const UnspecifiedTypeId = "~effect/net/NetAddress/UnspecifiedAddress" as const
+const PrivateTypeId = "~effect/net/NetAddress/PrivateAddress" as const
+const UniqueLocalTypeId = "~effect/net/NetAddress/UniqueLocalAddress" as const
+const LocallyAdministeredTypeId = "~effect/net/NetAddress/LocallyAdministeredAddress" as const
+const UniversallyAdministeredTypeId = "~effect/net/NetAddress/UniversallyAdministeredAddress" as const
+
+/**
+ * An IP or MAC address proven to be multicast (IPv4 `224.0.0.0/4`, IPv6
+ * `ff00::/8`, or a MAC address with the IEEE group bit set).
+ *
+ * **Details**
+ *
+ * This is a branded refinement of the underlying address. Construction returns
+ * the same runtime value, preserving identity, equality, hashing, and formatting.
+ * The MAC all-ones broadcast address has the group bit set and is therefore
+ * multicast; use {@link isMacBroadcast} to distinguish it. The IPv4 limited
+ * broadcast address `255.255.255.255` is not multicast.
+ *
+ * The default type argument remains `IpAddress`; specify `MacAddress` or an
+ * explicit IP/MAC union when accepting those wider address families.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type MulticastAddress<A extends IpAddress | MacAddress = IpAddress> = Brand.Branded<
+  A,
+  typeof MulticastTypeId
+>
+
+/**
+ * An IP or MAC address proven to be syntactically unicast.
+ *
+ * **Details**
+ *
+ * For IP addresses this excludes multicast, unspecified, and the IPv4 limited
+ * broadcast address. Reserved and special-purpose addresses may still satisfy
+ * this refinement, as may an IPv4 directed broadcast whose network prefix is
+ * unknown. It does not promise reachability or destination usability. For MAC
+ * addresses it means that the IEEE individual/group bit is clear.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type UnicastAddress<A extends IpAddress | MacAddress = IpAddress | MacAddress> = Brand.Branded<
+  A,
+  typeof UnicastTypeId
+>
+
+/**
+ * An IPv4 limited-broadcast or MAC all-ones broadcast address.
+ *
+ * **Details**
+ *
+ * MAC broadcast is also multicast because its IEEE group bit is set. IPv4
+ * limited broadcast is not multicast. Directed IPv4 broadcast requires network
+ * prefix context and is intentionally not represented by this refinement.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type BroadcastAddress<A extends Ipv4Address | MacAddress = Ipv4Address | MacAddress> = A extends MacAddress
+  ? Brand.Branded<MulticastAddress<A>, typeof BroadcastTypeId>
+  : Brand.Branded<A, typeof BroadcastTypeId>
+
+/**
+ * An IP address proven to be loopback.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type LoopbackAddress<A extends IpAddress = IpAddress> = Brand.Branded<A, typeof LoopbackTypeId>
+
+/**
+ * An IP address proven to be link-local.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type LinkLocalAddress<A extends IpAddress = IpAddress> = Brand.Branded<A, typeof LinkLocalTypeId>
+
+/**
+ * An all-zero IPv4 or IPv6 address.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type UnspecifiedAddress<A extends IpAddress = IpAddress> = Brand.Branded<A, typeof UnspecifiedTypeId>
+
+/**
+ * An IPv4 private-use address in an RFC 1918 range.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type PrivateAddress<A extends Ipv4Address = Ipv4Address> = Brand.Branded<A, typeof PrivateTypeId>
+
+/**
+ * An IPv6 unique-local address in `fc00::/7`.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type UniqueLocalAddress<A extends Ipv6Address = Ipv6Address> = Brand.Branded<A, typeof UniqueLocalTypeId>
+
+/**
+ * A MAC address whose IEEE universal/local bit marks it as locally administered.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type LocallyAdministeredAddress<A extends MacAddress = MacAddress> = Brand.Branded<
+  A,
+  typeof LocallyAdministeredTypeId
+>
+
+/**
+ * A MAC address whose IEEE universal/local bit marks it as universally administered.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type UniversallyAdministeredAddress<A extends MacAddress = MacAddress> = Brand.Branded<
+  A,
+  typeof UniversallyAdministeredTypeId
+>
+
+const getBytes = (self: IpAddress | MacAddress): Uint8Array => (self as any).bytes
+
+/**
+ * A resolved IPv4 internet address and port.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface InetAddressV4 extends Equal.Equal, Hash.Hash {
+  readonly _tag: "InetAddressV4"
+  readonly address: Ipv4Address
+  readonly port: number
+  readonly [TypeId]: typeof TypeId
+  toString(): string
+  toJSON(): string
+}
+
+/**
+ * A resolved IPv6 internet address, port, and scope identifier.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface InetAddressV6 extends Equal.Equal, Hash.Hash {
+  readonly _tag: "InetAddressV6"
+  readonly address: Ipv6Address
+  readonly port: number
+  readonly scopeId: number
+  readonly [TypeId]: typeof TypeId
+  toString(): string
+  toJSON(): string
+}
+
+/**
+ * A resolved IPv4 or IPv6 internet address and port.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type InetAddress = InetAddressV4 | InetAddressV6
+
+/**
+ * An opaque Unix-domain filesystem socket path.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface UnixPathAddress extends Equal.Equal, Hash.Hash {
+  readonly _tag: "UnixPathAddress"
+  readonly path: string
+  readonly [TypeId]: typeof TypeId
+  toString(): string
+  toJSON(): string
+}
+
+/**
+ * A portable concrete internet or Unix-domain filesystem address.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type SocketAddress = InetAddress | UnixPathAddress
+
+/**
+ * Companion types for constructing socket addresses.
+ *
+ * @since 4.0.0
+ */
+export declare namespace SocketAddress {
+  /**
+   * Input that can be converted to a concrete `SocketAddress` without hostname
+   * resolution.
+   *
+   * **Details**
+   *
+   * String inputs must use `IPv4:port` or `[IPv6]:port` notation. Address
+   * properties must be numeric IPv4 or IPv6 literals.
+   *
+   * @category models
+   * @since 4.0.0
+   */
+  export type Input =
+    | SocketAddress
+    | string
+    | { readonly address: IpAddress | string; readonly port: number }
+    | { readonly path: string }
+}
+
+/**
+ * A checked network-address operation failure retaining the address or supplied input.
+ *
+ * **Details**
+ *
+ * Address-based operations retain the address value. Parsing and numeric
+ * construction retain the supplied string or array. Composed operations forward
+ * errors from the failing operation unchanged. Failures from external operations
+ * retain the original exception in `cause` when available.
+ *
+ * @category errors
+ * @since 4.0.0
+ */
+export class NetAddressError extends Data.TaggedError("NetAddressError")<{
+  readonly message: string
+  readonly input: unknown
+  readonly cause?: unknown
+}> {}
+
+const isAddress = (u: unknown): u is IpAddress | MacAddress | SocketAddress => hasProperty(u, TypeId)
+
+/**
+ * Returns `true` when a value is an IPv4 address.
+ *
+ * @category guards
+ * @since 4.0.0
+ */
+export const isIpv4Address = (u: unknown): u is Ipv4Address => isAddress(u) && u._tag === "Ipv4Address"
+
+/**
+ * Returns `true` when a value is an IPv6 address.
+ *
+ * @category guards
+ * @since 4.0.0
+ */
+export const isIpv6Address = (u: unknown): u is Ipv6Address => isAddress(u) && u._tag === "Ipv6Address"
+
+/**
+ * Returns `true` when a value is an IPv4 or IPv6 address.
+ *
+ * @category guards
+ * @since 4.0.0
+ */
+export const isIpAddress = (u: unknown): u is IpAddress => isIpv4Address(u) || isIpv6Address(u)
+
+/**
+ * Returns the bit width of an IP address.
+ *
+ * @category getters
+ * @since 4.0.0
+ */
+export const width = (address: IpAddress): 32 | 128 => isIpv4Address(address) ? 32 : 128
+
+/**
+ * Returns `true` when a value is a MAC address.
+ *
+ * @category guards
+ * @since 4.0.0
+ */
+export const isMacAddress = (u: unknown): u is MacAddress => isAddress(u) && u._tag === "MacAddress"
+
+/**
+ * Returns `true` when a value is a resolved IPv4 internet address.
+ *
+ * @category guards
+ * @since 4.0.0
+ */
+export const isInetAddressV4 = (u: unknown): u is InetAddressV4 => isAddress(u) && u._tag === "InetAddressV4"
+
+/**
+ * Returns `true` when a value is a resolved IPv6 internet address.
+ *
+ * @category guards
+ * @since 4.0.0
+ */
+export const isInetAddressV6 = (u: unknown): u is InetAddressV6 => isAddress(u) && u._tag === "InetAddressV6"
+
+/**
+ * Returns `true` when a value is a resolved internet address.
+ *
+ * @category guards
+ * @since 4.0.0
+ */
+export const isInetAddress = (u: unknown): u is InetAddress => isInetAddressV4(u) || isInetAddressV6(u)
+
+/**
+ * Returns `true` when a value is a Unix-domain filesystem address.
+ *
+ * @category guards
+ * @since 4.0.0
+ */
+export const isUnixPathAddress = (u: unknown): u is UnixPathAddress => isAddress(u) && u._tag === "UnixPathAddress"
+
+/**
+ * Returns `true` when a value is a portable concrete socket address.
+ *
+ * @category guards
+ * @since 4.0.0
+ */
+export const isSocketAddress = (u: unknown): u is SocketAddress => isInetAddress(u) || isUnixPathAddress(u)
+
+const Ipv4Proto = {
+  _tag: "Ipv4Address",
+  [TypeId]: TypeId,
+  [Equal.symbol](this: Ipv4Address, that: Equal.Equal): boolean {
+    return isIpv4Address(that) && bytesEqual(getBytes(this), getBytes(that))
+  },
+  [Hash.symbol](this: Ipv4Address): number {
+    return hashBytes("Ipv4Address", getBytes(this))
+  },
+  toString(this: Ipv4Address): string {
+    return formatIp(this)
+  },
+  toJSON(this: Ipv4Address): string {
+    return this.toString()
+  },
+  [NodeInspectSymbol](this: Ipv4Address): string {
+    return this.toJSON()
+  }
+}
+
+const Ipv6Proto = {
+  _tag: "Ipv6Address",
+  [TypeId]: TypeId,
+  [Equal.symbol](this: Ipv6Address, that: Equal.Equal): boolean {
+    return isIpv6Address(that) && bytesEqual(getBytes(this), getBytes(that))
+  },
+  [Hash.symbol](this: Ipv6Address): number {
+    return hashBytes("Ipv6Address", getBytes(this))
+  },
+  toString(this: Ipv6Address): string {
+    return formatIp(this)
+  },
+  toJSON(this: Ipv6Address): string {
+    return this.toString()
+  },
+  [NodeInspectSymbol](this: Ipv6Address): string {
+    return this.toJSON()
+  }
+}
+
+const MacProto = {
+  _tag: "MacAddress",
+  [TypeId]: TypeId,
+  [Equal.symbol](this: MacAddress, that: Equal.Equal): boolean {
+    return isMacAddress(that) && bytesEqual(getBytes(this), getBytes(that))
+  },
+  [Hash.symbol](this: MacAddress): number {
+    return hashBytes("MacAddress", getBytes(this))
+  },
+  toString(this: MacAddress): string {
+    return formatMacAddress(this)
+  },
+  toJSON(this: MacAddress): string {
+    return this.toString()
+  },
+  [NodeInspectSymbol](this: MacAddress): string {
+    return this.toJSON()
+  }
+}
+
+const bytesEqual = (self: Uint8Array, that: Uint8Array): boolean => {
+  if (self.length !== that.length) return false
+  for (let index = 0; index < self.length; index++) {
+    if (self[index] !== that[index]) return false
+  }
+  return true
+}
+
+const hashBytes = (tag: string, bytes: Uint8Array): number => {
+  return Hash.combine(Hash.string(tag), Hash.array(bytes))
+}
+
+const makeIpv4 = (bytes: Uint8Array): Ipv4Address => {
+  const self = Object.assign(Object.create(Ipv4Proto), { bytes: new Uint8Array(bytes) })
+  return Object.freeze(self)
+}
+
+const makeIpv6 = (bytes: Uint8Array): Ipv6Address => {
+  const self = Object.assign(Object.create(Ipv6Proto), { bytes: new Uint8Array(bytes) })
+  return Object.freeze(self)
+}
+
+const makeMac = (bytes: Uint8Array): MacAddress => {
+  const self = Object.assign(Object.create(MacProto), { bytes: new Uint8Array(bytes) })
+  return Object.freeze(self)
+}
+
+/**
+ * Creates an IPv4 address from trusted network-order bytes without validation.
+ *
+ * @category unsafe
+ * @since 4.0.0
+ */
+export const ipv4FromBytesUnsafe = (bytes: Uint8Array): Ipv4Address => makeIpv4(bytes)
+
+/**
+ * Creates an IPv6 address from trusted network-order bytes without validation.
+ *
+ * @category unsafe
+ * @since 4.0.0
+ */
+export const ipv6FromBytesUnsafe = (bytes: Uint8Array): Ipv6Address => makeIpv6(bytes)
+
+/**
+ * The IPv4 loopback address `127.0.0.1`.
+ *
+ * @category constants
+ * @since 4.0.0
+ */
+export const ipv4Loopback: Ipv4Address = makeIpv4(new Uint8Array([127, 0, 0, 1]))
+
+/**
+ * The IPv6 loopback address `::1`.
+ *
+ * @category constants
+ * @since 4.0.0
+ */
+export const ipv6Loopback: Ipv6Address = makeIpv6(
+  new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1])
+)
+
+/**
+ * The unspecified IPv4 address `0.0.0.0`.
+ *
+ * @category constants
+ * @since 4.0.0
+ */
+export const ipv4Unspecified: Ipv4Address = makeIpv4(new Uint8Array(4))
+
+/**
+ * The unspecified IPv6 address `::`.
+ *
+ * @category constants
+ * @since 4.0.0
+ */
+export const ipv6Unspecified: Ipv6Address = makeIpv6(new Uint8Array(16))
+
+/**
+ * The IPv4 broadcast address `255.255.255.255`.
+ *
+ * @category constants
+ * @since 4.0.0
+ */
+export const ipv4Broadcast: Ipv4Address = makeIpv4(new Uint8Array([255, 255, 255, 255]))
+
+const addressError = (input: unknown, message: string): Result.Result<never, NetAddressError> =>
+  Result.fail(new NetAddressError({ input, message }))
+
+/**
+ * Creates an IPv4 address from four checked octets.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const ipv4FromOctets = (
+  octets: readonly [number, number, number, number]
+): Result.Result<Ipv4Address, NetAddressError> => {
+  if (!octets.every((n) => Number.isInteger(n) && n >= 0 && n <= 255)) {
+    return addressError(octets, "octets must be integers from 0 through 255")
+  }
+  return Result.succeed(makeIpv4(new Uint8Array(octets)))
+}
+
+/**
+ * Creates an IPv6 address from eight checked 16-bit segments.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const ipv6FromSegments = (
+  segments: readonly [number, number, number, number, number, number, number, number]
+): Result.Result<Ipv6Address, NetAddressError> => {
+  if (!segments.every((n) => Number.isInteger(n) && n >= 0 && n <= 0xffff)) {
+    return addressError(segments, "segments must be integers from 0 through 65535")
+  }
+  const bytes = new Uint8Array(16)
+  for (let index = 0; index < 8; index++) {
+    bytes[index * 2] = segments[index] >> 8
+    bytes[index * 2 + 1] = segments[index]
+  }
+  return Result.succeed(makeIpv6(bytes))
+}
+
+/**
+ * Creates a MAC address from six checked octets.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const macAddressFromOctets = (
+  octets: readonly [number, number, number, number, number, number]
+): Result.Result<MacAddress, NetAddressError> => {
+  if (!octets.every((n) => Number.isInteger(n) && n >= 0 && n <= 255)) {
+    return addressError(octets, "octets must be integers from 0 through 255")
+  }
+  return Result.succeed(makeMac(new Uint8Array(octets)))
+}
+
+/**
+ * Parses a colon-separated MAC address containing six two-digit hexadecimal octets.
+ *
+ * @category decoding
+ * @since 4.0.0
+ */
+export const macAddressFromString = (input: string): Result.Result<MacAddress, NetAddressError> => {
+  if (!/^(?:[0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}$/.test(input)) {
+    return addressError(input, "expected six two-digit hexadecimal octets separated by colons")
+  }
+  return Result.succeed(makeMac(new Uint8Array(input.split(":").map((part) => Number.parseInt(part, 16)))))
+}
+
+/**
+ * Parses a trusted colon-separated MAC address, throwing on failure.
+ *
+ * @category unsafe
+ * @since 4.0.0
+ */
+export const macAddressFromStringUnsafe = (input: string): MacAddress => Result.getOrThrow(macAddressFromString(input))
+
+/**
+ * Parses a strict dotted-decimal IPv4 address.
+ *
+ * **Details**
+ *
+ * Multi-digit octets with a leading zero are rejected to avoid octal ambiguity.
+ *
+ * @category decoding
+ * @since 4.0.0
+ */
+export const ipv4FromString = (input: string): Result.Result<Ipv4Address, NetAddressError> => {
+  const parts = input.split(".")
+  if (parts.length !== 4 || parts.some((part) => !/^\d{1,3}$/.test(part))) {
+    return addressError(input, "expected exactly four decimal octets")
+  }
+  if (parts.some((part) => part.length > 1 && part[0] === "0")) {
+    return addressError(input, "leading zeroes are not allowed")
+  }
+  const octets = parts.map(Number)
+  if (octets.some((part) => part > 255)) {
+    return addressError(input, "octets must be at most 255")
+  }
+  return ipv4FromOctets([octets[0], octets[1], octets[2], octets[3]])
+}
+
+const parseIpv6Segments = (input: string): Result.Result<ReadonlyArray<number>, NetAddressError> => {
+  if (input.includes("[") || input.includes("]") || input.includes("%")) {
+    return addressError(input, "brackets and zone identifiers are not valid in a bare IPv6 address")
+  }
+  const halves = input.split("::")
+  if (halves.length > 2) return addressError(input, "only one compression marker is allowed")
+  const head = halves[0] === "" ? [] : halves[0].split(":")
+  const tail = halves.length === 2 && halves[1] !== "" ? halves[1].split(":") : []
+  if (head.some((part) => part === "") || tail.some((part) => part === "")) {
+    return addressError(input, "empty segments are only valid in the compression marker")
+  }
+  const trailing = tail.length > 0 ? tail[tail.length - 1] : head.length > 0 ? head[head.length - 1] : ""
+  let embedded: ReadonlyArray<number> | undefined
+  if (trailing.includes(".")) {
+    if (halves.length === 2 && tail.length === 0) {
+      return addressError(input, "embedded IPv4 syntax must be trailing")
+    }
+    const parsed = Result.map(ipv4FromString(trailing), (address) => {
+      const octets = ipv4ToOctets(address)
+      return [octets[0] * 256 + octets[1], octets[2] * 256 + octets[3]]
+    })
+    if (Result.isFailure(parsed)) return parsed
+    embedded = parsed.success
+    if (tail.length > 0) tail.pop()
+    else head.pop()
+  }
+  const explicit = head.length + tail.length + (embedded ? 2 : 0)
+  if (halves.length === 1 ? explicit !== 8 : explicit >= 8) {
+    return addressError(
+      input,
+      halves.length === 1 ? "expected eight segments" : "compression must replace at least one segment"
+    )
+  }
+  const parse = (part: string): number | undefined =>
+    /^[0-9a-fA-F]{1,4}$/.test(part) ? Number.parseInt(part, 16) : undefined
+  const parsedHead = head.map(parse)
+  const parsedTail = tail.map(parse)
+  if (parsedHead.some((part) => part === undefined) || parsedTail.some((part) => part === undefined)) {
+    return addressError(input, "segments must contain one through four hexadecimal digits")
+  }
+  return Result.succeed([
+    ...parsedHead as ReadonlyArray<number>,
+    ...Array(8 - explicit).fill(0),
+    ...parsedTail as ReadonlyArray<number>,
+    ...(embedded ?? [])
+  ])
+}
+
+/**
+ * Parses an IPv6 address with optional compression and trailing embedded IPv4.
+ *
+ * @category decoding
+ * @since 4.0.0
+ */
+export const ipv6FromString = (input: string): Result.Result<Ipv6Address, NetAddressError> => {
+  return Result.flatMap(
+    parseIpv6Segments(input),
+    (segments) =>
+      ipv6FromSegments(
+        segments as unknown as readonly [
+          number,
+          number,
+          number,
+          number,
+          number,
+          number,
+          number,
+          number
+        ]
+      )
+  )
+}
+
+/**
+ * Parses a bare numeric IPv4 or IPv6 address.
+ *
+ * @category decoding
+ * @since 4.0.0
+ */
+export const ipFromString = (input: string): Result.Result<IpAddress, NetAddressError> => {
+  const result: Result.Result<IpAddress, NetAddressError> = input.includes(":")
+    ? ipv6FromString(input)
+    : ipv4FromString(input)
+  return result
+}
+
+/**
+ * Parses a trusted bare numeric IPv4 or IPv6 address, throwing on failure.
+ *
+ * @category unsafe
+ * @since 4.0.0
+ */
+export const ipFromStringUnsafe = (input: string): IpAddress => Result.getOrThrow(ipFromString(input))
+
+/**
+ * Returns the four numeric octets of an IPv4 address in a fresh tuple.
+ *
+ * @category getters
+ * @since 4.0.0
+ */
+export const ipv4ToOctets = (self: Ipv4Address): readonly [number, number, number, number] => {
+  const bytes = getBytes(self)
+  return [bytes[0], bytes[1], bytes[2], bytes[3]]
+}
+
+/**
+ * Returns the eight numeric segments of an IPv6 address in a fresh tuple.
+ *
+ * @category getters
+ * @since 4.0.0
+ */
+export const ipv6ToSegments = (
+  self: Ipv6Address
+): readonly [number, number, number, number, number, number, number, number] => {
+  const bytes = getBytes(self)
+  const output = Array<number>(8)
+  for (let index = 0; index < 8; index++) {
+    output[index] = bytes[index * 2] * 256 + bytes[index * 2 + 1]
+  }
+  return output as any
+}
+
+/**
+ * Returns the sixteen numeric octets of an IPv6 address in a fresh array.
+ *
+ * @category getters
+ * @since 4.0.0
+ */
+export const ipv6ToOctets = (
+  self: Ipv6Address
+): ReadonlyArray<number> => Array.from(getBytes(self))
+
+/**
+ * Returns the six numeric octets of a MAC address in a fresh tuple.
+ *
+ * @category getters
+ * @since 4.0.0
+ */
+export const macAddressToOctets = (
+  self: MacAddress
+): readonly [number, number, number, number, number, number] => {
+  const bytes = getBytes(self)
+  return [bytes[0], bytes[1], bytes[2], bytes[3], bytes[4], bytes[5]]
+}
+
+/**
+ * Formats a MAC address as six lowercase hexadecimal octets separated by colons.
+ *
+ * @category encoding
+ * @since 4.0.0
+ */
+export const formatMacAddress = (self: MacAddress): string =>
+  Array.from(getBytes(self), (byte) => byte.toString(16).padStart(2, "0")).join(":")
+
+/**
+ * Returns `true` when the MAC address is the all-ones broadcast address.
+ *
+ * @category predicates
+ * @since 4.0.0
+ */
+export const isMacBroadcast = <A extends MacAddress>(self: A): self is BroadcastAddress<A> =>
+  getBytes(self).every((byte) => byte === 0xff)
+
+/**
+ * Returns `true` when the MAC address has the IEEE group-address bit set.
+ *
+ * @category predicates
+ * @since 4.0.0
+ */
+export const isMacMulticast = <A extends MacAddress>(self: A): self is MulticastAddress<A> =>
+  (getBytes(self)[0] & 1) !== 0
+
+/**
+ * Returns `true` when the MAC address has the IEEE group-address bit clear.
+ *
+ * @category predicates
+ * @since 4.0.0
+ */
+export const isMacUnicast = <A extends MacAddress>(self: A): self is UnicastAddress<A> => (getBytes(self)[0] & 1) === 0
+
+/**
+ * Returns `true` when the MAC address has the IEEE local-administration bit set.
+ *
+ * @category predicates
+ * @since 4.0.0
+ */
+export const isMacLocallyAdministered = <A extends MacAddress>(
+  self: A
+): self is LocallyAdministeredAddress<A> => (getBytes(self)[0] & 2) !== 0
+
+/**
+ * Returns `true` when the MAC address has the IEEE local-administration bit clear.
+ *
+ * @category predicates
+ * @since 4.0.0
+ */
+export const isMacUniversallyAdministered = <A extends MacAddress>(
+  self: A
+): self is UniversallyAdministeredAddress<A> => (getBytes(self)[0] & 2) === 0
+
+/**
+ * Folds an IP address by its numeric version.
+ *
+ * @category pattern matching
+ * @since 4.0.0
+ */
+export const match: {
+  <A, B>(options: {
+    readonly onIpv4: (address: Ipv4Address) => A
+    readonly onIpv6: (address: Ipv6Address) => B
+  }): (self: IpAddress) => A | B
+  <A, B>(self: IpAddress, options: {
+    readonly onIpv4: (address: Ipv4Address) => A
+    readonly onIpv6: (address: Ipv6Address) => B
+  }): A | B
+} = dual(2, <A, B>(self: IpAddress, options: {
+  readonly onIpv4: (address: Ipv4Address) => A
+  readonly onIpv6: (address: Ipv6Address) => B
+}): A | B => isIpv4Address(self) ? options.onIpv4(self) : options.onIpv6(self))
+
+/**
+ * Formats an IP address in canonical numeric form.
+ *
+ * @category encoding
+ * @since 4.0.0
+ */
+export const formatIp = (self: IpAddress): string => {
+  if (isIpv4Address(self)) return ipv4ToOctets(self).join(".")
+  const segments = ipv6ToSegments(self)
+  if (isIpv4Mapped(self)) {
+    return `::ffff:${segments[6] >> 8}.${segments[6] & 0xff}.${segments[7] >> 8}.${segments[7] & 0xff}`
+  }
+  let bestStart = -1
+  let bestLength = 0
+  let start = -1
+  for (let index = 0; index <= 8; index++) {
+    if (index < 8 && segments[index] === 0) {
+      if (start === -1) start = index
+    } else if (start !== -1) {
+      if (index - start > bestLength) {
+        bestStart = start
+        bestLength = index - start
+      }
+      start = -1
+    }
+  }
+  if (bestLength < 2) return segments.map((segment) => segment.toString(16)).join(":")
+  const head = segments.slice(0, bestStart).map((segment) => segment.toString(16)).join(":")
+  const tail = segments.slice(bestStart + bestLength).map((segment) => segment.toString(16)).join(":")
+  return `${head}::${tail}`
+}
+
+/**
+ * Returns `true` for the all-zero address of either IP version.
+ *
+ * @category predicates
+ * @since 4.0.0
+ */
+export const isUnspecified = <A extends IpAddress>(self: A): self is UnspecifiedAddress<A> =>
+  getBytes(self).every((byte) => byte === 0)
+
+/**
+ * Returns `true` for IPv4 `127.0.0.0/8` or IPv6 `::1`.
+ *
+ * @category predicates
+ * @since 4.0.0
+ */
+export const isLoopback = <A extends IpAddress>(self: A): self is LoopbackAddress<A> => {
+  if (isIpv4Address(self)) return getBytes(self)[0] === 127
+  const bytes = getBytes(self)
+  for (let index = 0; index < 15; index++) {
+    if (bytes[index] !== 0) return false
+  }
+  return bytes[15] === 1
+}
+
+/**
+ * Returns `true` for IPv4 `224.0.0.0/4`, IPv6 `ff00::/8`, or a MAC address with
+ * the IEEE group bit set, refining the value while preserving its address type.
+ *
+ * **Details**
+ *
+ * The MAC all-ones broadcast address has the group bit set and is multicast;
+ * the IPv4 limited broadcast address `255.255.255.255` is not. Use
+ * {@link isMacBroadcast} or {@link isBroadcast} to distinguish broadcast.
+ *
+ * **Example** (Classifying IP and MAC group addresses)
+ *
+ * ```ts import.meta.vitest
+ * import { assert } from "@effect/vitest"
+ * import { NetAddress } from "effect/unstable/net"
+ *
+ * const ip = NetAddress.ipFromStringUnsafe("239.255.0.1")
+ * const mac = NetAddress.macAddressFromStringUnsafe("ff:ff:ff:ff:ff:ff")
+ *
+ * assert.isTrue(NetAddress.isMulticast(ip))
+ * assert.isTrue(NetAddress.isMulticast(mac))
+ * assert.isTrue(NetAddress.isBroadcast(mac))
+ * assert.isFalse(NetAddress.isMulticast(NetAddress.ipv4Broadcast))
+ * ```
+ *
+ * @category predicates
+ * @since 4.0.0
+ */
+export const isMulticast = <A extends IpAddress | MacAddress>(self: A): self is MulticastAddress<A> => {
+  if (isMacAddress(self)) return isMacMulticast(self)
+  if (isIpv4Address(self)) return (getBytes(self)[0] >> 4) === 0xe
+  return getBytes(self)[0] === 0xff
+}
+
+/**
+ * Returns `true` for the IPv4 limited broadcast address `255.255.255.255` or
+ * the MAC all-ones broadcast address.
+ *
+ * **Details**
+ *
+ * MAC broadcast is also multicast because its IEEE group bit is set. IPv4
+ * limited broadcast is not multicast. Directed IPv4 broadcast cannot be
+ * determined without a network prefix and is not classified here.
+ *
+ * @category predicates
+ * @since 4.0.0
+ */
+export const isBroadcast = <A extends Ipv4Address | MacAddress>(self: A): self is BroadcastAddress<A> =>
+  isMacAddress(self) ? isMacBroadcast(self) : getBytes(self).every((byte) => byte === 0xff)
+
+/**
+ * Returns `true` when an address is syntactically unicast.
+ *
+ * **Details**
+ *
+ * IP addresses exclude multicast, unspecified, and IPv4 limited broadcast.
+ * This does not exclude reserved ranges, prefix-relative directed broadcast,
+ * or addresses that are unusable or unreachable in a particular deployment.
+ * MAC addresses are unicast when their IEEE individual/group bit is clear.
+ *
+ * @category predicates
+ * @since 4.0.0
+ */
+export const isUnicast = <A extends IpAddress | MacAddress>(self: A): self is UnicastAddress<A> => {
+  if (isMacAddress(self)) return isMacUnicast(self)
+  return !isMulticast(self) && !isUnspecified(self) && (!isIpv4Address(self) || !isBroadcast(self))
+}
+
+/**
+ * Returns `true` for IPv4 `169.254.0.0/16` or IPv6 `fe80::/10`.
+ *
+ * @category predicates
+ * @since 4.0.0
+ */
+export const isLinkLocal = <A extends IpAddress>(self: A): self is LinkLocalAddress<A> => {
+  if (isIpv4Address(self)) {
+    const bytes = getBytes(self)
+    return bytes[0] === 0xa9 && bytes[1] === 0xfe
+  }
+  const bytes = getBytes(self)
+  return bytes[0] === 0xfe && (bytes[1] & 0xc0) === 0x80
+}
+
+/**
+ * Returns `true` for IPv4 private-use ranges defined by RFC 1918.
+ *
+ * @category predicates
+ * @since 4.0.0
+ */
+export const isPrivate = <A extends Ipv4Address>(self: A): self is PrivateAddress<A> => {
+  const bytes = getBytes(self)
+  return bytes[0] === 10 || (bytes[0] === 172 && (bytes[1] & 0xf0) === 16) ||
+    (bytes[0] === 192 && bytes[1] === 168)
+}
+
+/**
+ * Returns `true` for IPv6 unique-local addresses in `fc00::/7`.
+ *
+ * @category predicates
+ * @since 4.0.0
+ */
+export const isUniqueLocal = <A extends Ipv6Address>(self: A): self is UniqueLocalAddress<A> =>
+  (getBytes(self)[0] & 0xfe) === 0xfc
+
+/**
+ * Returns `true` when an IPv6 address is in the `::ffff:0:0/96` mapped range.
+ *
+ * @category predicates
+ * @since 4.0.0
+ */
+export const isIpv4Mapped = (self: Ipv6Address): boolean => {
+  const bytes = getBytes(self)
+  for (let index = 0; index < 10; index++) {
+    if (bytes[index] !== 0) return false
+  }
+  return bytes[10] === 0xff && bytes[11] === 0xff
+}
+
+/**
+ * Converts an IPv4 address to its IPv4-mapped IPv6 representation.
+ *
+ * @category converting
+ * @since 4.0.0
+ */
+export const toIpv4Mapped = (self: Ipv4Address): Ipv6Address => {
+  const bytes = new Uint8Array(16)
+  bytes[10] = 0xff
+  bytes[11] = 0xff
+  bytes.set(getBytes(self), 12)
+  return makeIpv6(bytes)
+}
+
+/**
+ * Extracts the IPv4 value from an IPv4-mapped IPv6 address.
+ *
+ * @category converting
+ * @since 4.0.0
+ */
+export const fromIpv4Mapped = (self: Ipv6Address): Option.Option<Ipv4Address> =>
+  isIpv4Mapped(self) ? Option.some(makeIpv4(getBytes(self).slice(12))) : Option.none()
+
+/**
+ * Converts IPv4-mapped IPv6 addresses to IPv4, including the IP component of internet addresses.
+ *
+ * **Details**
+ *
+ * Internet addresses retain their port. Addresses that need no conversion are
+ * returned unchanged, preserving their identity and any IPv6 scope identifier.
+ * Converted internet addresses are IPv4 values without IPv6 scope metadata.
+ *
+ * @category converting
+ * @since 4.0.0
+ */
+export function toCanonical(self: IpAddress): IpAddress
+export function toCanonical(self: InetAddress): InetAddress
+export function toCanonical(self: IpAddress | InetAddress): IpAddress | InetAddress {
+  if (isInetAddress(self)) {
+    const address = toCanonical(self.address)
+    return address === self.address ? self : inetAddressUnsafe(address, self.port)
+  }
+  return isIpv6Address(self) ? Option.getOrElse(fromIpv4Mapped(self), () => self) : self
+}
+
+const InetV4Proto = {
+  _tag: "InetAddressV4",
+  [TypeId]: TypeId,
+  [Equal.symbol](this: InetAddressV4, that: Equal.Equal): boolean {
+    return isInetAddressV4(that) && this.port === that.port && Equal.equals(this.address, that.address)
+  },
+  [Hash.symbol](this: InetAddressV4): number {
+    return Hash.combine(Hash.hash(this.address), Hash.number(this.port))
+  },
+  toString(this: InetAddressV4): string {
+    return formatInet(this)
+  },
+  toJSON(this: InetAddressV4): string {
+    return this.toString()
+  },
+  [NodeInspectSymbol](this: InetAddressV4): string {
+    return this.toJSON()
+  }
+}
+
+const InetV6Proto = {
+  _tag: "InetAddressV6",
+  [TypeId]: TypeId,
+  [Equal.symbol](this: InetAddressV6, that: Equal.Equal): boolean {
+    return isInetAddressV6(that) && this.port === that.port && this.scopeId === that.scopeId &&
+      Equal.equals(this.address, that.address)
+  },
+  [Hash.symbol](this: InetAddressV6): number {
+    return Hash.combine(
+      Hash.combine(Hash.hash(this.address), Hash.number(this.port)),
+      Hash.number(this.scopeId)
+    )
+  },
+  toString(this: InetAddressV6): string {
+    return formatInet(this)
+  },
+  toJSON(this: InetAddressV6): string {
+    return this.toString()
+  },
+  [NodeInspectSymbol](this: InetAddressV6): string {
+    return this.toJSON()
+  }
+}
+
+const checkPort = (port: number): boolean => Number.isInteger(port) && port >= 0 && port <= 0xffff
+
+/**
+ * Creates a checked IPv4 internet address.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const inetAddressV4 = (address: Ipv4Address, port: number): Result.Result<InetAddressV4, NetAddressError> => {
+  if (!checkPort(port)) {
+    return addressError(address, "port must be an integer from 0 through 65535")
+  }
+  const self = Object.create(InetV4Proto)
+  self.address = address
+  self.port = port
+  return Result.succeed(Object.freeze(self))
+}
+
+/**
+ * Creates a checked IPv6 internet address with an optional scope identifier.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const inetAddressV6 = (
+  address: Ipv6Address,
+  port: number,
+  options?: { readonly scopeId?: number | undefined }
+): Result.Result<InetAddressV6, NetAddressError> => {
+  if (!checkPort(port)) {
+    return addressError(address, "port must be an integer from 0 through 65535")
+  }
+  const scopeId = options?.scopeId ?? 0
+  if (!Number.isInteger(scopeId) || scopeId < 0 || scopeId > 0xffffffff) {
+    return addressError(address, "scopeId must be an unsigned 32-bit integer")
+  }
+  const self = Object.create(InetV6Proto)
+  self.address = address
+  self.port = port
+  self.scopeId = scopeId
+  return Result.succeed(Object.freeze(self))
+}
+
+/**
+ * Creates a checked internet address for an IP address and port.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const inetAddress = (address: IpAddress, port: number): Result.Result<InetAddress, NetAddressError> =>
+  isIpv4Address(address) ? inetAddressV4(address, port) : inetAddressV6(address, port)
+
+/**
+ * Creates an internet address from a trusted IP address and port, throwing on failure.
+ *
+ * @category unsafe
+ * @since 4.0.0
+ */
+export const inetAddressUnsafe = (address: IpAddress, port: number): InetAddress =>
+  Result.getOrThrow(inetAddress(address, port))
+
+/**
+ * Creates a checked internet address from a numeric IP string and port.
+ *
+ * **Gotchas**
+ *
+ * The address must be a numeric IPv4 or IPv6 literal. This function does not
+ * resolve hostnames or accept IPv6 brackets.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const inetAddressFromIpString = (
+  address: string,
+  port: number
+): Result.Result<InetAddress, NetAddressError> => {
+  return Result.flatMap(ipFromString(address), (address) => inetAddress(address, port))
+}
+
+/**
+ * Creates an internet address from a trusted numeric IP string and port.
+ *
+ * **Gotchas**
+ *
+ * This function throws when either input is invalid. Use only when both values
+ * are already known to satisfy the checked constructor's requirements.
+ *
+ * @category unsafe
+ * @since 4.0.0
+ */
+export const inetAddressFromIpStringUnsafe = (address: string, port: number): InetAddress =>
+  Result.getOrThrow(inetAddressFromIpString(address, port))
+
+/**
+ * Parses an unbracketed numeric host and port, resolving named IPv6 zones using
+ * a supplied map of interface names to numeric scope IDs.
+ *
+ * **Details**
+ *
+ * IPv4, unscoped IPv6, and numeric IPv6 zones need no map. Named zones must have
+ * a matching map entry. This function performs no DNS or operating-system lookup.
+ *
+ * @see {@link formatHost} for formatting the host of an internet address
+ * @see {@link scopeIdsFromInterfaces} for building a scope map from interface entries
+ * @category decoding
+ * @since 4.0.0
+ */
+export const inetAddressFromHostString = (
+  host: string,
+  port: number,
+  scopeIds?: ReadonlyMap<string, number>
+): Result.Result<InetAddress, NetAddressError> => {
+  const separator = host.indexOf("%")
+  if (separator !== -1) {
+    const zone = host.slice(separator + 1)
+    if (zone.length === 0 || zone.includes("%")) {
+      return addressError(host, "invalid IPv6 scope identifier")
+    }
+    if (!/^\d+$/.test(zone)) {
+      const scopeId = scopeIds?.get(zone)
+      if (scopeId === undefined) {
+        return addressError(host, `unknown IPv6 interface: ${zone}`)
+      }
+      host = `${host.slice(0, separator)}%${scopeId}`
+    }
+  }
+  return inetAddressFromString(host.includes(":") ? `[${host}]:${port}` : `${host}:${port}`)
+}
+
+/**
+ * Network interface address metadata used to resolve IPv6 scope IDs.
+ *
+ * @see {@link scopeIdsFromInterfaces}
+ * @category models
+ * @since 4.0.0
+ */
+export interface NetworkInterfaceAddress {
+  readonly family: string
+  readonly scopeid?: number | undefined
+}
+
+/**
+ * Creates a map from interface names to IPv6 scope IDs using supplied interface
+ * entries.
+ *
+ * **Details**
+ *
+ * Each entry pairs an interface name with its addresses. The first IPv6 address
+ * with a positive scope ID supplies that interface's mapping. Accepts entries
+ * such as `Object.entries(os.networkInterfaces())` without performing any
+ * operating-system lookup itself. Later changes to the entries do not affect
+ * the map.
+ *
+ * @see {@link inetAddressFromHostString} for resolving named IPv6 zones with the map
+ * @category converting
+ * @since 4.0.0
+ */
+export const scopeIdsFromInterfaces = (
+  interfaces: Iterable<readonly [name: string, addresses: ReadonlyArray<NetworkInterfaceAddress> | undefined]>
+): Map<string, number> => {
+  const scopeIds = new Map<string, number>()
+  for (const [name, addresses] of interfaces) {
+    const address = addresses?.find((address) => address.family === "IPv6" && (address.scopeid ?? 0) > 0)
+    if (address?.scopeid !== undefined) scopeIds.set(name, address.scopeid)
+  }
+  return scopeIds
+}
+
+/**
+ * Parses `IPv4:port` or `[IPv6]:port` without DNS resolution.
+ *
+ * @category decoding
+ * @since 4.0.0
+ */
+export const inetAddressFromString = (input: string): Result.Result<InetAddress, NetAddressError> => {
+  let host: string
+  let portText: string
+  let scopeId = 0
+  const bracketed = input.startsWith("[")
+  if (bracketed) {
+    const end = input.indexOf("]")
+    if (end < 0 || input[end + 1] !== ":" || input.indexOf("]", end + 1) !== -1) {
+      return addressError(input, "expected [IPv6]:port")
+    }
+    host = input.slice(1, end)
+    portText = input.slice(end + 2)
+    const scopeSeparator = host.indexOf("%")
+    if (scopeSeparator !== -1) {
+      const scopeText = host.slice(scopeSeparator + 1)
+      if (host.indexOf("%", scopeSeparator + 1) !== -1 || !/^\d+$/.test(scopeText)) {
+        return addressError(input, "scope identifier must be decimal")
+      }
+      scopeId = Number(scopeText)
+      if (!Number.isInteger(scopeId) || scopeId > 0xffffffff) {
+        return addressError(input, "scope identifier must be an unsigned 32-bit integer")
+      }
+      host = host.slice(0, scopeSeparator)
+    }
+  } else {
+    const separator = input.lastIndexOf(":")
+    if (separator < 0) {
+      return addressError(input, "expected host:port or [IPv6]:port")
+    }
+    if (input.indexOf(":") !== separator) {
+      return addressError(input, "IPv6 addresses must be bracketed")
+    }
+    host = input.slice(0, separator)
+    portText = input.slice(separator + 1)
+  }
+  if (!/^(0|[1-9]\d*)$/.test(portText)) {
+    return addressError(input, "port must be an unpadded decimal integer")
+  }
+  return Result.flatMap(ipFromString(host), (address): Result.Result<InetAddress, NetAddressError> => {
+    if (bracketed !== isIpv6Address(address)) {
+      return addressError(input, "only IPv6 addresses use brackets")
+    }
+    return isIpv6Address(address)
+      ? inetAddressV6(address, Number(portText), { scopeId })
+      : inetAddressV4(address, Number(portText))
+  })
+}
+
+/**
+ * Parses a trusted numeric internet address and port, throwing on failure.
+ *
+ * @category unsafe
+ * @since 4.0.0
+ */
+export const inetAddressFromStringUnsafe = (input: string): InetAddress =>
+  Result.getOrThrow(inetAddressFromString(input))
+
+/**
+ * Formats the numeric host of an internet address without brackets or a port,
+ * preserving a nonzero IPv6 scope ID as a `%` suffix.
+ *
+ * **When to use**
+ *
+ * Use when the host and port are represented separately.
+ *
+ * @see {@link formatInet} for a complete socket address
+ * @see {@link formatUrlHost} for a bracketed URL authority host
+ * @category encoding
+ * @since 4.0.0
+ */
+export const formatHost = (self: InetAddress): string =>
+  formatIp(self.address) + (isInetAddressV6(self) && self.scopeId !== 0 ? `%${self.scopeId}` : "")
+
+/**
+ * Formats an internet address's host for a native socket API, without brackets
+ * or a port.
+ *
+ * **Details**
+ *
+ * On `"win32"`, IPv6 zones remain numeric. On other platforms, the first
+ * interface name matching the scope ID is used, falling back to the numeric ID
+ * when no name matches. Unscoped IPv6 and IPv4 hosts are unchanged.
+ *
+ * Supply a scope map from {@link scopeIdsFromInterfaces} and optionally a platform
+ * string. Omitting the platform uses non-Windows behavior. This function performs
+ * no operating-system lookups.
+ *
+ * @category encoding
+ * @since 4.0.0
+ */
+export const formatNativeHost = (
+  self: InetAddress,
+  scopeIds: ReadonlyMap<string, number>,
+  platform?: string
+): string => {
+  if (platform !== "win32" && isInetAddressV6(self) && self.scopeId !== 0) {
+    for (const [name, scopeId] of scopeIds) {
+      if (scopeId === self.scopeId) return `${formatIp(self.address)}%${name}`
+    }
+  }
+  return formatHost(self)
+}
+
+/**
+ * Formats an IPv4 address or IPv6 interface index for a native multicast API.
+ *
+ * **Details**
+ *
+ * IPv4 addresses are formatted as numeric IPs. An IPv6 index of zero produces
+ * `"::"`. Other indices produce `"::%index"` on `"win32"`, or `"::%name"` on
+ * other platforms using the first matching interface name, falling back to the
+ * numeric index when no name matches.
+ *
+ * Supply a scope map from {@link scopeIdsFromInterfaces} and optionally a platform
+ * string. Omitting the platform uses non-Windows behavior. This function performs
+ * no operating-system lookups.
+ *
+ * @category encoding
+ * @since 4.0.0
+ */
+export const formatMulticastInterface = (
+  networkInterface: Ipv4Address | number,
+  scopeIds: ReadonlyMap<string, number>,
+  platform?: string
+): string => {
+  if (typeof networkInterface !== "number") return formatIp(networkInterface)
+  if (networkInterface === 0) return "::"
+  if (platform !== "win32") {
+    for (const [name, scopeId] of scopeIds) {
+      if (scopeId === networkInterface) return `::%${name}`
+    }
+  }
+  return `::%${networkInterface}`
+}
+
+/**
+ * Formats a resolved internet address, bracketing IPv6 around its port.
+ *
+ * @category encoding
+ * @since 4.0.0
+ */
+export const formatInet = (self: InetAddress): string => {
+  const host = formatHost(self)
+  return isInetAddressV4(self) ? `${host}:${self.port}` : `[${host}]:${self.port}`
+}
+
+/**
+ * Formats an IP address for use as a URL authority host.
+ *
+ * @category encoding
+ * @since 4.0.0
+ */
+export const formatUrlHost = (self: IpAddress): string => isIpv4Address(self) ? formatIp(self) : `[${formatIp(self)}]`
+
+/**
+ * Converts an IP address or internet socket address to a WHATWG `URL`.
+ *
+ * **Details**
+ *
+ * Defaults to the HTTP scheme and uses standard URL normalization, including
+ * IPv6 brackets and omission of default ports. Bare IP addresses have no
+ * explicit port; internet socket addresses retain their port, including zero.
+ * Unspecified addresses are preserved.
+ *
+ * **Gotchas**
+ *
+ * Returns a `NetAddressError` for scoped IPv6 addresses or inputs that the URL
+ * constructor rejects. Supply the scheme without a trailing colon, for example
+ * `"https"`.
+ *
+ * @category conversions
+ * @since 4.0.0
+ */
+export const toUrl = (self: IpAddress | InetAddress, scheme: string = "http"): Result.Result<URL, NetAddressError> => {
+  if (self._tag === "InetAddressV6" && self.scopeId !== 0) {
+    return addressError(self, "scoped IPv6 addresses are not supported by WHATWG URLs")
+  }
+  return Result.try({
+    try: () => new URL(`${scheme}://${isInetAddress(self) ? formatInet(self) : formatUrlHost(self)}`),
+    catch: (cause) => new NetAddressError({ input: self, message: "failed to construct URL", cause })
+  })
+}
+
+/**
+ * Formats an IP or socket address as a URL display string.
+ *
+ * **Details**
+ *
+ * Defaults to HTTP, brackets IPv6 addresses, and omits default ports and the
+ * trailing slash. Custom schemes such as `"tcp"` retain their scheme and host.
+ * Unix socket addresses use {@link formatUnixPath}, preserving the raw path
+ * with a `unix://` prefix regardless of the supplied scheme.
+ *
+ * **Gotchas**
+ *
+ * Returns a `NetAddressError` when URL conversion fails, including for scoped
+ * IPv6 addresses.
+ *
+ * @category encoding
+ * @since 4.0.0
+ */
+export const formatUrl = (
+  self: IpAddress | SocketAddress,
+  scheme: string = "http"
+): Result.Result<string, NetAddressError> =>
+  isUnixPathAddress(self)
+    ? Result.succeed(formatUnixPath(self))
+    : Result.map(toUrl(self, scheme), (url) => `${url.protocol}//${url.host}`)
+
+/**
+ * Formats an IP or socket address as a URL display string,
+ * throwing a `NetAddressError` when conversion fails.
+ *
+ * @see {@link formatUrl} for the checked version and formatting behavior.
+ *
+ * @category unsafe
+ * @since 4.0.0
+ */
+export const formatUrlUnsafe = (self: IpAddress | SocketAddress, scheme: string = "http"): string =>
+  Result.getOrThrow(formatUrl(self, scheme))
+
+/**
+ * Formats a hostname or numeric IP address for use as a URL authority host.
+ *
+ * @category encoding
+ * @since 4.0.0
+ */
+export const formatUrlHostString = (host: string): string =>
+  host.includes(":") && !host.startsWith("[") ? `[${host}]` : host
+
+const UnixPathProto = {
+  _tag: "UnixPathAddress",
+  [TypeId]: TypeId,
+  [Equal.symbol](this: UnixPathAddress, that: Equal.Equal): boolean {
+    return isUnixPathAddress(that) && this.path === that.path
+  },
+  [Hash.symbol](this: UnixPathAddress): number {
+    return Hash.combine(Hash.string("UnixPathAddress"), Hash.string(this.path))
+  },
+  toString(this: UnixPathAddress): string {
+    return this.path
+  },
+  toJSON(this: UnixPathAddress): string {
+    return this.toString()
+  },
+  [NodeInspectSymbol](this: UnixPathAddress): string {
+    return this.toJSON()
+  }
+}
+
+/**
+ * Creates a Unix-domain filesystem address without normalizing its opaque path.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const unixPathAddress = (path: string): UnixPathAddress => {
+  const self = Object.create(UnixPathProto)
+  self.path = path
+  return Object.freeze(self)
+}
+
+/**
+ * Formats a Unix-domain socket path as a readable `unix://path` display string.
+ *
+ * **Details**
+ *
+ * Preserves the raw path without URL encoding or normalization. The resulting
+ * string is intended for display.
+ *
+ * @category encoding
+ * @since 4.0.0
+ */
+export const formatUnixPath = (self: UnixPathAddress): string => `unix://${self.path}`
+
+/**
+ * Converts a `SocketAddress.Input` to a concrete socket address.
+ *
+ * **Details**
+ *
+ * Numeric IP strings are parsed without hostname resolution. Invalid IP
+ * literals, ports, and input shapes return a `NetAddressError`.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const socketAddressFromInput = (
+  input: SocketAddress.Input
+): Result.Result<SocketAddress, NetAddressError> => {
+  if (isSocketAddress(input)) return Result.succeed(input)
+  if (typeof input === "string") return inetAddressFromString(input)
+  if (hasProperty(input, "path")) {
+    return typeof input.path === "string"
+      ? Result.succeed(unixPathAddress(input.path))
+      : addressError(input, "path must be a string")
+  }
+  if (!hasProperty(input, "address") || !hasProperty(input, "port")) {
+    return addressError(input, "expected an address and port or a Unix path")
+  }
+  const address = typeof input.address === "string"
+    ? ipFromString(input.address)
+    : isIpAddress(input.address)
+    ? Result.succeed(input.address)
+    : addressError(input, "address must be an IP address or numeric IP string")
+  return Result.flatMap(address, (address) => inetAddress(address, input.port as number))
+}
+
+/**
+ * Converts a trusted `SocketAddress.Input` to a concrete socket address,
+ * throwing on failure.
+ *
+ * @category unsafe
+ * @since 4.0.0
+ */
+export const socketAddressFromInputUnsafe = (input: SocketAddress.Input): SocketAddress =>
+  Result.getOrThrow(socketAddressFromInput(input))
+
+/**
+ * Formats a portable socket address for human-readable output.
+ *
+ * @category encoding
+ * @since 4.0.0
+ */
+export const formatSocketAddress = (self: SocketAddress): string =>
+  self._tag === "UnixPathAddress" ? self.path : formatInet(self)
diff --git a/repos/effect/packages/effect/src/unstable/net/index.ts b/repos/effect/packages/effect/src/unstable/net/index.ts
new file mode 100644
index 000000000..b50cdc229
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/net/index.ts
@@ -0,0 +1,20 @@
+/**
+ * @since 4.0.0
+ */
+
+// @barrel: Auto-generated exports. Do not edit manually.
+
+/**
+ * @since 4.0.0
+ */
+export * as IpInterface from "./IpInterface.ts"
+
+/**
+ * @since 4.0.0
+ */
+export * as IpNetwork from "./IpNetwork.ts"
+
+/**
+ * @since 4.0.0
+ */
+export * as NetAddress from "./NetAddress.ts"
diff --git a/repos/effect/packages/effect/src/unstable/observability/OtlpExporter.ts b/repos/effect/packages/effect/src/unstable/observability/OtlpExporter.ts
index 92b593080..31162c0cf 100644
--- a/repos/effect/packages/effect/src/unstable/observability/OtlpExporter.ts
+++ b/repos/effect/packages/effect/src/unstable/observability/OtlpExporter.ts
@@ -167,6 +167,7 @@ export const make: (
     readonly label: string
     readonly exportInterval: Duration.Input
     readonly maxBatchSize: number | "disabled"
+    readonly exportEmpty?: boolean | undefined
     readonly body: (data: Array<any>) => readonly [body: HttpBody, onSuccess: Effect.Effect<void>]
     readonly shutdownTimeout: Duration.Input
   }
@@ -201,13 +202,11 @@ export const make: (
     } else if (disabledUntil !== undefined) {
       disabledUntil = undefined
     }
-    const items = buffer
-    if (options.maxBatchSize !== "disabled") {
-      if (buffer.length === 0) {
-        return Effect.void
-      }
-      buffer = []
+    if (buffer.length === 0 && (options.maxBatchSize !== "disabled" || options.exportEmpty !== true)) {
+      return Effect.void
     }
+    const items = buffer
+    buffer = []
     const [body, onSuccess] = options.body(items)
     return client.execute(
       HttpClientRequest.setBody(request, body)
diff --git a/repos/effect/packages/effect/src/unstable/observability/OtlpLogger.ts b/repos/effect/packages/effect/src/unstable/observability/OtlpLogger.ts
index 227db9832..a70e9b14f 100644
--- a/repos/effect/packages/effect/src/unstable/observability/OtlpLogger.ts
+++ b/repos/effect/packages/effect/src/unstable/observability/OtlpLogger.ts
@@ -227,9 +227,9 @@ const makeLogRecord = (options: Logger.Options<unknown>, opts: {
     droppedAttributesCount: 0
   }
 
-  if (options.fiber.currentSpan) {
-    logRecord.traceId = options.fiber.currentSpan.traceId
-    logRecord.spanId = options.fiber.currentSpan.spanId
+  if (options.fiber.cache.span) {
+    logRecord.traceId = options.fiber.cache.span.traceId
+    logRecord.spanId = options.fiber.cache.span.spanId
   }
 
   return logRecord
diff --git a/repos/effect/packages/effect/src/unstable/observability/OtlpMetrics.ts b/repos/effect/packages/effect/src/unstable/observability/OtlpMetrics.ts
index 84442d6c2..881a6aed5 100644
--- a/repos/effect/packages/effect/src/unstable/observability/OtlpMetrics.ts
+++ b/repos/effect/packages/effect/src/unstable/observability/OtlpMetrics.ts
@@ -156,7 +156,7 @@ export const make: (options: {
               if (typeof currentCount === "bigint" && typeof previousCount === "bigint") {
                 reportValue = currentCount - previousCount
                 // Handle reset: if current < previous, report current value
-                if (reportValue < BigInt(0)) {
+                if (state.state.incremental && reportValue < BigInt(0)) {
                   reportValue = currentCount
                 }
               } else {
@@ -164,7 +164,7 @@ export const make: (options: {
                 const prev = Number(previousCount)
                 reportValue = curr - prev
                 // Handle reset
-                if (reportValue < 0) {
+                if (state.state.incremental && reportValue < 0) {
                   reportValue = curr
                 }
               }
@@ -461,6 +461,7 @@ export const make: (options: {
     url: options.url,
     headers: options.headers,
     maxBatchSize: "disabled",
+    exportEmpty: true,
     exportInterval: options.exportInterval ?? Duration.seconds(10),
     body: snapshot,
     shutdownTimeout: options.shutdownTimeout ?? Duration.seconds(3)
diff --git a/repos/effect/packages/effect/src/unstable/observability/OtlpTracer.ts b/repos/effect/packages/effect/src/unstable/observability/OtlpTracer.ts
index 8182e24c8..4da20f257 100644
--- a/repos/effect/packages/effect/src/unstable/observability/OtlpTracer.ts
+++ b/repos/effect/packages/effect/src/unstable/observability/OtlpTracer.ts
@@ -22,7 +22,7 @@ import * as Layer from "../../Layer.ts"
 import * as Option from "../../Option.ts"
 import type * as Scope from "../../Scope.ts"
 import * as Tracer from "../../Tracer.ts"
-import type { ExtractTag, Mutable } from "../../Types.ts"
+import type { ExtractTag } from "../../Types.ts"
 import type * as Headers from "../http/Headers.ts"
 import type * as HttpClient from "../http/HttpClient.ts"
 import * as OtlpEnv from "./internal/otlpEnv.ts"
@@ -96,22 +96,14 @@ export const make: (
 
   return Tracer.make({
     span(options) {
-      return makeSpan({
-        ...options,
-        status: {
-          _tag: "Started",
-          startTime: options.startTime
-        },
-        attributes: new Map(),
-        export: exportFn
-      })
+      return new SpanImpl(options, exportFn)
     },
     context: options.context ?
       function(primitive, fiber) {
-        if (fiber.currentSpan === undefined) {
+        if (fiber.cache.span === undefined) {
           return primitive["~effect/Effect/evaluate"](fiber)
         }
-        return options.context!(primitive, fiber.currentSpan)
+        return options.context!(primitive, fiber.cache.span)
       } :
       undefined
   })
@@ -196,17 +188,64 @@ export const layerFromConfig = (options?: {
 
 // internal
 
-interface SpanImpl extends Tracer.Span {
-  readonly export: (span: SpanImpl) => void
-  readonly attributes: Map<string, unknown>
+class SpanImpl implements Tracer.Span {
+  readonly _tag = "Span"
+  readonly name: string
+  readonly parent: Option.Option<Tracer.AnySpan>
+  readonly annotations: Context.Context<never>
   readonly links: Array<Tracer.SpanLink>
-  readonly events: Array<[name: string, startTime: bigint, attributes: Record<string, unknown> | undefined]>
+  readonly kind: Tracer.SpanKind
+  readonly sampled: boolean
+  readonly export: (span: SpanImpl) => void
   status: Tracer.SpanStatus
-}
+  _traceId: string | undefined = undefined
+  _spanId: string | undefined = undefined
+  _attributes: Map<string, unknown> | undefined = undefined
+  _events: Array<[name: string, startTime: bigint, attributes: Record<string, unknown> | undefined]> | undefined =
+    undefined
+
+  constructor(
+    options: {
+      readonly name: string
+      readonly parent: Option.Option<Tracer.AnySpan>
+      readonly annotations: Context.Context<never>
+      readonly links: Array<Tracer.SpanLink>
+      readonly startTime: bigint
+      readonly kind: Tracer.SpanKind
+      readonly sampled: boolean
+    },
+    exportFn: (span: SpanImpl) => void
+  ) {
+    this.name = options.name
+    this.parent = options.parent
+    this.annotations = options.annotations
+    this.links = options.links
+    this.kind = options.kind
+    this.sampled = options.sampled
+    this.export = exportFn
+    this.status = {
+      _tag: "Started",
+      startTime: options.startTime
+    }
+  }
+
+  get traceId(): string {
+    return this._traceId ??= Option.isSome(this.parent) ? this.parent.value.traceId : Encoding.randomHex(32)
+  }
+
+  get spanId(): string {
+    return this._spanId ??= Encoding.randomHex(16)
+  }
+
+  get attributes(): Map<string, unknown> {
+    return this._attributes ??= new Map()
+  }
 
-const SpanProto = {
-  _tag: "Span",
-  end(this: SpanImpl, endTime: bigint, exit: Exit.Exit<unknown, unknown>) {
+  get events(): Array<[name: string, startTime: bigint, attributes: Record<string, unknown> | undefined]> {
+    return this._events ??= []
+  }
+
+  end(endTime: bigint, exit: Exit.Exit<unknown, unknown>): void {
     this.status = {
       _tag: "Ended",
       startTime: this.status.startTime,
@@ -214,59 +253,43 @@ const SpanProto = {
       exit
     }
     this.export(this)
-  },
-  attribute(this: SpanImpl, key: string, value: unknown) {
+  }
+
+  attribute(key: string, value: unknown): void {
     this.attributes.set(key, value)
-  },
-  event(this: SpanImpl, name: string, startTime: bigint, attributes?: Record<string, unknown>) {
+  }
+
+  event(name: string, startTime: bigint, attributes?: Record<string, unknown>): void {
     this.events.push([name, startTime, attributes])
-  },
-  addLinks(this: SpanImpl, links: ReadonlyArray<Tracer.SpanLink>) {
-    this.links.push(...links)
   }
-}
-type RemainingSpanImpl = Omit<Tracer.Span, (keyof typeof SpanProto) | "traceId" | "spanId" | "events">
 
-const makeSpan = (options: {
-  readonly name: string
-  readonly parent: Option.Option<Tracer.AnySpan>
-  readonly annotations: Context.Context<never>
-  readonly status: Tracer.SpanStatus
-  readonly attributes: ReadonlyMap<string, unknown>
-  readonly links: ReadonlyArray<Tracer.SpanLink>
-  readonly kind: Tracer.SpanKind
-  readonly sampled: boolean
-  readonly export: (span: SpanImpl) => void
-}): SpanImpl => {
-  const self: Mutable<SpanImpl> = Object.assign(
-    Object.create(SpanProto),
-    options satisfies RemainingSpanImpl
-  )
-  if (Option.isSome(self.parent)) {
-    self.traceId = self.parent.value.traceId
-  } else {
-    self.traceId = Encoding.randomHex(32)
+  addLinks(links: ReadonlyArray<Tracer.SpanLink>): void {
+    // oxlint-disable-next-line no-restricted-syntax
+    this.links.push(...links)
   }
-  self.spanId = Encoding.randomHex(16)
-  self.events = []
-  return self
 }
 
 const makeOtlpSpan = (self: SpanImpl): OtlpSpan => {
   const status = self.status as ExtractTag<Tracer.SpanStatus, "Ended">
-  const attributes = entriesToAttributes(self.attributes.entries())
-  const events = self.events.map(([name, startTime, attributes]) => ({
-    name,
-    timeUnixNano: String(startTime),
-    attributes: attributes
-      ? entriesToAttributes(Object.entries(attributes))
-      : [],
-    droppedAttributesCount: 0
-  }))
+  const attributes = self._attributes === undefined ? [] : entriesToAttributes(self._attributes)
+  const events: Array<Event> = []
+  if (self._events !== undefined) {
+    for (let i = 0; i < self._events.length; i++) {
+      const [name, startTime, attributes] = self._events[i]
+      events.push({
+        name,
+        timeUnixNano: String(startTime),
+        attributes: attributes
+          ? entriesToAttributes(Object.entries(attributes))
+          : [],
+        droppedAttributesCount: 0
+      })
+    }
+  }
   let otelStatus: Status
 
   if (status.exit._tag === "Success") {
-    otelStatus = constOtelStatusSuccess
+    otelStatus = { code: StatusCode.Ok }
   } else if (Cause.hasInterruptsOnly(status.exit.cause)) {
     otelStatus = {
       code: StatusCode.Ok,
@@ -318,13 +341,21 @@ const makeOtlpSpan = (self: SpanImpl): OtlpSpan => {
     }
   }
 
+  const links: Array<Link> = []
+  for (let i = 0; i < self.links.length; i++) {
+    const link = self.links[i]
+    links.push({
+      traceId: link.span.traceId,
+      spanId: link.span.spanId,
+      attributes: entriesToAttributes(Object.entries(link.attributes)),
+      droppedAttributesCount: 0
+    })
+  }
+
   return {
     traceId: self.traceId,
     spanId: self.spanId,
-    parentSpanId: Option.match(self.parent, {
-      onNone: () => undefined,
-      onSome: (parent) => parent.spanId
-    }),
+    parentSpanId: Option.isSome(self.parent) ? self.parent.value.spanId : undefined,
     name: self.name,
     kind: SpanKind[self.kind],
     startTimeUnixNano: String(status.startTime),
@@ -334,12 +365,7 @@ const makeOtlpSpan = (self: SpanImpl): OtlpSpan => {
     events,
     droppedEventsCount: 0,
     status: otelStatus,
-    links: self.links.map((link) => ({
-      traceId: link.span.traceId,
-      spanId: link.span.spanId,
-      attributes: entriesToAttributes(Object.entries(link.attributes)),
-      droppedAttributesCount: 0
-    })),
+    links,
     droppedLinksCount: 0
   }
 }
@@ -434,7 +460,3 @@ const SpanKind = {
   producer: 4,
   consumer: 5
 } as const
-
-const constOtelStatusSuccess: Status = {
-  code: StatusCode.Ok
-}
diff --git a/repos/effect/packages/effect/src/unstable/persistence/PersistedCache.ts b/repos/effect/packages/effect/src/unstable/persistence/PersistedCache.ts
index b08cdc1ab..783945216 100644
--- a/repos/effect/packages/effect/src/unstable/persistence/PersistedCache.ts
+++ b/repos/effect/packages/effect/src/unstable/persistence/PersistedCache.ts
@@ -92,7 +92,7 @@ export const make: <
       if (exit) {
         return yield* exit
       }
-      const result = yield* Effect.exit(lookup(key))
+      const result = yield* Effect.exit(Effect.suspend(() => lookup(key)))
       yield* (store.set(key, result) as Effect.Effect<void>)
       return yield* result
     }),
diff --git a/repos/effect/packages/effect/src/unstable/persistence/Persistence.ts b/repos/effect/packages/effect/src/unstable/persistence/Persistence.ts
index 631df6ed7..0572e1bb0 100644
--- a/repos/effect/packages/effect/src/unstable/persistence/Persistence.ts
+++ b/repos/effect/packages/effect/src/unstable/persistence/Persistence.ts
@@ -385,11 +385,6 @@ export const layerBackingSqlMultiTable: Layer.Layer<
           `.unprepared
       })
 
-      const wrapString = sql.onDialectOrElse({
-        mssql: () => (s: string) => `N'${s}'`,
-        orElse: () => (s: string) => `'${s}'`
-      })
-
       return identity<BackingPersistenceStore>({
         get: (key) =>
           sql<
@@ -419,9 +414,9 @@ export const layerBackingSqlMultiTable: Layer.Layer<
               })
             ),
         getMany: (keys) =>
-          sql<{ id: string; value: string }>`SELECT id, value FROM ${table} WHERE id IN (${
-            sql.literal(keys.map(wrapString).join(", "))
-          }) AND (expires IS NULL OR expires > ${clock.currentTimeMillisUnsafe()})`.unprepared.pipe(
+          sql<{ id: string; value: string }>`SELECT id, value FROM ${table} WHERE ${
+            sql.in("id", keys)
+          } AND (expires IS NULL OR expires > ${clock.currentTimeMillisUnsafe()})`.unprepared.pipe(
             Effect.mapError((cause) =>
               new PersistenceError({
                 message: `Failed to getMany from backing store`,
@@ -726,11 +721,6 @@ export const layerBackingSql: Layer.Layer<
       `.unprepared
   })
 
-  const wrapString = sql.onDialectOrElse({
-    mssql: () => (s: string) => `N'${s}'`,
-    orElse: () => (s: string) => `'${s}'`
-  })
-
   return BackingPersistence.of({
     make: Effect.fnUntraced(function*(storeId) {
       const clock = yield* Clock.Clock
@@ -764,9 +754,9 @@ export const layerBackingSql: Layer.Layer<
               })
             ),
         getMany: (keys) =>
-          sql<{ id: string; value: string }>`SELECT id, value FROM ${table} WHERE store_id = ${storeId} AND id IN (${
-            sql.literal(keys.map(wrapString).join(", "))
-          }) AND (expires IS NULL OR expires > ${clock.currentTimeMillisUnsafe()})`.unprepared.pipe(
+          sql<{ id: string; value: string }>`SELECT id, value FROM ${table} WHERE store_id = ${storeId} AND ${
+            sql.in("id", keys)
+          } AND (expires IS NULL OR expires > ${clock.currentTimeMillisUnsafe()})`.unprepared.pipe(
             Effect.mapError((cause) =>
               new PersistenceError({
                 message: `Failed to getMany from backing store`,
diff --git a/repos/effect/packages/effect/src/unstable/persistence/RateLimiter.ts b/repos/effect/packages/effect/src/unstable/persistence/RateLimiter.ts
index e26f2c9f4..c33018236 100644
--- a/repos/effect/packages/effect/src/unstable/persistence/RateLimiter.ts
+++ b/repos/effect/packages/effect/src/unstable/persistence/RateLimiter.ts
@@ -162,7 +162,7 @@ export const make: Effect.Effect<
               delay,
               limit: options.limit,
               remaining: options.limit - count,
-              resetAfter: Duration.times(window, Math.ceil(ttl / windowMillis))
+              resetAfter: Duration.millis(ttl)
             })
           }
         )
@@ -176,40 +176,28 @@ export const make: Effect.Effect<
           refillRate,
           allowOverflow: onExceeded === "delay"
         }),
-        (remaining) => {
-          if (onExceeded === "fail") {
-            if (remaining < 0) {
-              return Effect.fail(
-                new RateLimiterError({
-                  reason: new RateLimitExceeded({
-                    key: options.key,
-                    retryAfter: Duration.times(refillRate, -remaining),
-                    limit: options.limit,
-                    remaining: 0
-                  })
+        ([remaining, elapsedMillis]) => {
+          const delay = Duration.millis(Math.max(0, Math.ceil(-remaining) * refillRateMillis - elapsedMillis))
+          const resetAfter = Duration.millis(
+            Math.max(0, Math.ceil(options.limit - remaining) * refillRateMillis - elapsedMillis)
+          )
+          if (onExceeded === "fail" && remaining < 0) {
+            return Effect.fail(
+              new RateLimiterError({
+                reason: new RateLimitExceeded({
+                  key: options.key,
+                  retryAfter: delay,
+                  limit: options.limit,
+                  remaining: 0
                 })
-              )
-            }
-            return Effect.succeed<ConsumeResult>({
-              delay: Duration.zero,
-              limit: options.limit,
-              remaining,
-              resetAfter: Duration.times(refillRate, options.limit - remaining)
-            })
-          }
-          if (remaining >= 0) {
-            return Effect.succeed<ConsumeResult>({
-              delay: Duration.zero,
-              limit: options.limit,
-              remaining,
-              resetAfter: Duration.times(refillRate, options.limit - remaining)
-            })
+              })
+            )
           }
           return Effect.succeed<ConsumeResult>({
-            delay: Duration.times(refillRate, -remaining),
+            delay,
             limit: options.limit,
             remaining,
-            resetAfter: Duration.times(refillRate, options.limit - remaining)
+            resetAfter
           })
         }
       )
@@ -505,6 +493,11 @@ export interface ConsumeResult {
 
   /**
    * The time until the rate limit fully resets.
+   *
+   * **Details**
+   *
+   * For token buckets, accounts for elapsed refill time and reserved debt,
+   * assuming no further consumption.
    */
   readonly resetAfter: Duration.Duration
 }
@@ -633,14 +626,18 @@ export class RateLimiterStore extends Context.Service<
     }) => Effect.Effect<readonly [count: number, ttl: number], RateLimiterError>
 
     /**
-     * Returns the current remaining tokens for the `key` after consuming the
-     * specified amount of tokens.
+     * Refills the bucket for `key`, attempts to consume `tokens`, and returns
+     * `[remaining, elapsedMillis]` from that single atomic operation.
      *
-     * If `allowOverflow` is true, the number of tokens can drop below zero.
+     * `remaining` is the token count after subtracting `tokens`. Fractional counts
+     * must retain their numeric precision. A negative count is only persisted
+     * when `allowOverflow` is true.
      *
-     * In the case of no overflow, the returned token count will only be
-     * negative if the requested tokens exceed the available tokens, but the
-     * real token count will not be persisted below zero.
+     * `elapsedMillis` is the time since the current refill interval started, in
+     * milliseconds (fractions preserved), always at least `0` and less than
+     * `Duration.toMillis(refillRate)`. It is `0` when the bucket is at capacity
+     * after refilling and before consuming. Otherwise the boundary advances by
+     * whole refill intervals and the interval never restarts.
      */
     readonly tokenBucket: (options: {
       readonly key: string
@@ -648,7 +645,7 @@ export class RateLimiterStore extends Context.Service<
       readonly limit: number
       readonly refillRate: Duration.Duration
       readonly allowOverflow: boolean
-    }) => Effect.Effect<number, RateLimiterError>
+    }) => Effect.Effect<readonly [remaining: number, elapsedMillis: number], RateLimiterError>
 
     /**
      * Consumes tokens from the adaptive rate-limit state for the `key`.
@@ -745,20 +742,21 @@ export const layerStoreMemory: Layer.Layer<
           if (!bucket) {
             bucket = { tokens: options.limit, lastRefill: now }
             tokenBuckets.set(options.key, bucket)
-          } else {
-            const elapsed = now - bucket.lastRefill
-            const tokensToAdd = Math.floor(elapsed / refillRateMillis)
-            if (tokensToAdd > 0) {
-              bucket.tokens = Math.min(options.limit, bucket.tokens + tokensToAdd)
-              bucket.lastRefill += tokensToAdd * refillRateMillis
-            }
+          }
+          const tokensToAdd = Math.floor((now - bucket.lastRefill) / refillRateMillis)
+          if (tokensToAdd > 0) {
+            bucket.tokens = Math.min(options.limit, bucket.tokens + tokensToAdd)
+            bucket.lastRefill += tokensToAdd * refillRateMillis
+          }
+          if (bucket.tokens >= options.limit) {
+            bucket.lastRefill = now
           }
 
           const newTokenCount = bucket.tokens - options.tokens
           if (options.allowOverflow || newTokenCount >= 0) {
             bucket.tokens = newTokenCount
           }
-          return newTokenCount
+          return [newTokenCount, Math.max(0, now - bucket.lastRefill)] as const
         })
       ),
     adaptiveConsume: (options) =>
@@ -945,14 +943,17 @@ export const makeStoreRedis = Effect.fnUntraced(function*(
       const refillMillis = Duration.toMillis(options.refillRate)
       return Effect.clockWith((clock) =>
         Effect.mapError(
-          tokenBucket(
-            key,
-            lastRefillKey,
-            options.tokens,
-            refillMillis,
-            options.limit,
-            clock.currentTimeMillisUnsafe(),
-            options.allowOverflow ? 1 : 0
+          Effect.map(
+            tokenBucket(
+              key,
+              lastRefillKey,
+              options.tokens,
+              refillMillis,
+              options.limit,
+              clock.currentTimeMillisUnsafe(),
+              options.allowOverflow ? 1 : 0
+            ),
+            ([remaining, elapsedMillis]) => [Number(remaining), Number(elapsedMillis)] as const
           ),
           (cause) =>
             new RateLimiterError({
@@ -1078,6 +1079,9 @@ if refill_amount > 0 then
   current = math.min(current + refill_amount, limit)
   last_refill = last_refill + (refill_amount * refill_ms)
 end
+if current >= limit then
+  last_refill = now
+end
 
 local next = current - tokens
 local stored = current
@@ -1085,14 +1089,16 @@ if next >= 0 or overflow then
   stored = next
 end
 
-local ttl = math.floor((limit - stored) * refill_ms)
+elapsed = math.max(0, now - last_refill)
+local ttl = math.ceil(math.ceil(limit - stored) * refill_ms - elapsed)
 if ttl < 1 then ttl = 1 end
 redis.call("SET", key, stored, "PX", ttl)
 redis.call("SET", last_refill_key, last_refill, "PX", ttl)
-return next
+-- Use 17 significant digits to round-trip both numbers.
+return { string.format("%.17g", next), string.format("%.17g", elapsed) }
 `
   }
-).withReturnType<number>()
+).withReturnType<readonly [remaining: string, elapsedMillis: string]>()
 
 const adaptiveConsumeScript = Redis.script(
   (key: string, tokens: number, fallbackWindowMillis: number, ttlGraceMillis: number) => [
diff --git a/repos/effect/packages/effect/src/unstable/process/ChildProcess.ts b/repos/effect/packages/effect/src/unstable/process/ChildProcess.ts
index b419c1b21..e92d27078 100644
--- a/repos/effect/packages/effect/src/unstable/process/ChildProcess.ts
+++ b/repos/effect/packages/effect/src/unstable/process/ChildProcess.ts
@@ -247,8 +247,12 @@ export interface KillOptions {
   /**
    * The duration of time to wait after the child process has been terminated
    * before forcefully killing the child process by sending it the `"SIGKILL"`
-   * signal. Defaults to `undefined`, which means that no timeout will be
-   * enforced by default.
+   * signal. Defaults to `undefined`, so `"SIGKILL"` is never sent.
+   *
+   * **Details**
+   *
+   * The spawner decides whether to terminate descendants and how long to wait.
+   * See its platform module documentation, such as `NodeChildProcessSpawner`.
    */
   readonly forceKillAfter?: Duration.Input | undefined
 }
@@ -1018,8 +1022,13 @@ const splitByWhitespaces = (template: string, rawTemplate: string): {
         rawIndex += 1
       } else if (nextRawCharacter === "u" && rawTemplate[rawIndex + 2] === "{") {
         // Handle variable-length unicode escape sequences (i.e. `\u{1F600}`) by:
+        // - Advancing the template index an extra code unit for astral code points
         // - Advancing the raw template index past the unicode escape sequence
-        rawIndex = rawTemplate.indexOf("}", rawIndex + 3)
+        const end = rawTemplate.indexOf("}", rawIndex + 3)
+        if (parseInt(rawTemplate.slice(rawIndex + 3, end), 16) > 0xffff) {
+          templateIndex += 1
+        }
+        rawIndex = end
       } else {
         // Advance raw template index past fixed-length escape sequences:
         // - \n    → 2 chars (backslash + n)
diff --git a/repos/effect/packages/effect/src/unstable/reactivity/Atom.ts b/repos/effect/packages/effect/src/unstable/reactivity/Atom.ts
index e31de5836..433f7c43a 100644
--- a/repos/effect/packages/effect/src/unstable/reactivity/Atom.ts
+++ b/repos/effect/packages/effect/src/unstable/reactivity/Atom.ts
@@ -22,6 +22,7 @@ import type { LazyArg } from "../../Function.ts"
 import { constant, constTrue, constVoid, dual, pipe } from "../../Function.ts"
 import type * as Inspectable from "../../Inspectable.ts"
 import { PipeInspectableProto } from "../../internal/core.ts"
+import { getStackTraceLimit } from "../../internal/stackTraceLimit.ts"
 import * as Layer from "../../Layer.ts"
 import * as MutableHashMap from "../../MutableHashMap.ts"
 import * as Option from "../../Option.ts"
@@ -1465,7 +1466,9 @@ export const withFallback: {
   return isWritable(self)
     ? writable(
       withFallback,
-      self.write,
+      function(ctx, value) {
+        ctx.set(self, value)
+      },
       self.refresh ?? function(refresh) {
         refresh(self)
       }
@@ -1585,7 +1588,7 @@ export const withLabel: {
 >(2, (self, name) =>
   Object.assign(Object.create(Object.getPrototypeOf(self)), {
     ...self,
-    label: [name, new Error().stack?.split("\n")[5] ?? ""]
+    label: [name, getStackTraceLimit() === 0 ? "" : new Error().stack?.split("\n")[5] ?? ""]
   }))
 
 /**
@@ -2515,7 +2518,7 @@ export const serializable: {
   const codecJson = Schema.toCodecJson(options.schema)
   return Object.assign(Object.create(Object.getPrototypeOf(self)), {
     ...self,
-    label: self.label ?? [options.key, new Error().stack?.split("\n")[5] ?? ""],
+    label: self.label ?? [options.key, getStackTraceLimit() === 0 ? "" : new Error().stack?.split("\n")[5] ?? ""],
     [SerializableTypeId]: {
       key: options.key,
       encode: Schema.encodeSync(codecJson),
diff --git a/repos/effect/packages/effect/src/unstable/reactivity/AtomHttpApi.ts b/repos/effect/packages/effect/src/unstable/reactivity/AtomHttpApi.ts
index 991d8db26..4494fc5d8 100644
--- a/repos/effect/packages/effect/src/unstable/reactivity/AtomHttpApi.ts
+++ b/repos/effect/packages/effect/src/unstable/reactivity/AtomHttpApi.ts
@@ -17,9 +17,9 @@ import type { ReadonlyRecord } from "../../Record.ts"
 import * as Schema from "../../Schema.ts"
 import type { SchemaError } from "../../Schema.ts"
 import type { Mutable, Simplify } from "../../Types.ts"
+import type * as Sse from "../encoding/Sse.ts"
 import type * as HttpClient from "../http/HttpClient.ts"
 import * as HttpClientError from "../http/HttpClientError.ts"
-import type { HttpClientResponse } from "../http/HttpClientResponse.ts"
 import type * as HttpApi from "../httpapi/HttpApi.ts"
 import * as HttpApiClient from "../httpapi/HttpApiClient.ts"
 import * as HttpApiEndpoint from "../httpapi/HttpApiEndpoint.ts"
@@ -82,7 +82,7 @@ export interface AtomHttpApiClient<Self, Id extends string, Groups extends HttpA
           readonly reactivityKeys?: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>> | undefined
         }
       >,
-      ResponseByMode<Extract<_Success, Schema.Top>["Type"], ResponseMode>,
+      ResponseByMode<Endpoint, ResponseMode>,
       ErrorByMode<_Error, _Middleware, ResponseMode>
     >
     : never
@@ -140,7 +140,7 @@ export interface AtomHttpApiClient<Self, Id extends string, Groups extends HttpA
     >
   ] ? Atom.Atom<
       AsyncResult.AsyncResult<
-        ResponseByMode<Extract<_Success, Schema.Top>["Type"], ResponseMode>,
+        ResponseByMode<Endpoint, ResponseMode>,
         ErrorByMode<_Error, _Middleware, ResponseMode>
       >
     >
@@ -223,11 +223,13 @@ export const Service =
         query: any
         headers: any
         payload: any
+        sseOptions?: Sse.DecodeOptions | undefined
         reactivityKeys?: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>> | undefined
       }>()(
         Effect.fnUntraced(function*(opts) {
           const client = (yield* self) as any
-          const effect = catchErrors(client[group][endpoint]({
+          const groupClient = groups[group].topLevel ? client : client[group]
+          const effect = catchErrors(groupClient[endpoint]({
             ...opts,
             responseMode
           }) as Effect.Effect<any>)
@@ -261,7 +263,8 @@ export const Service =
     const queryFamily = Atom.family((opts: QueryKey) => {
       let atom = self.runtime.atom(self.use((client_) => {
         const client = client_ as any
-        return catchErrors(client[opts.group][opts.endpoint](opts) as Effect.Effect<
+        const groupClient = groups[opts.group].topLevel ? client : client[opts.group]
+        return catchErrors(groupClient[opts.endpoint](opts) as Effect.Effect<
           any,
           HttpClientError.HttpClientError | SchemaError
         >)
@@ -296,6 +299,7 @@ export const Service =
         readonly payload?: any
         readonly headers?: any
         readonly responseMode?: HttpApiEndpoint.ClientResponseMode
+        readonly sseOptions?: Sse.DecodeOptions | undefined
         readonly reactivityKeys?: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>> | undefined
         readonly timeToLive?: Duration.Input | undefined
         readonly serializationKey?: string | undefined
@@ -309,8 +313,9 @@ export const Service =
         payload: request.payload,
         headers: request.headers,
         responseMode: request.responseMode ?? "decoded-only",
+        sseOptions: request.sseOptions,
         reactivityKeys: request.reactivityKeys,
-        timeToLive: request.timeToLive
+        timeToLive: request.timeToLive !== undefined
           ? Duration.fromInputUnsafe(request.timeToLive)
           : undefined,
         serializationKey: request.serializationKey
@@ -336,14 +341,20 @@ interface QueryKey {
   payload: any
   responseMode: HttpApiEndpoint.ClientResponseMode
   reactivityKeys: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>> | undefined
+  sseOptions: Sse.DecodeOptions | undefined
   timeToLive: Duration.Duration | undefined
   serializationKey: string | undefined
 }
 
-type ResponseByMode<Success, ResponseMode extends HttpApiEndpoint.ClientResponseMode> = [ResponseMode] extends
-  ["decoded-and-response"] ? [Success, HttpClientResponse]
-  : [ResponseMode] extends ["response-only"] ? HttpClientResponse
-  : Success
+type ResponseByMode<
+  Endpoint extends HttpApiEndpoint.Constraint,
+  ResponseMode extends HttpApiEndpoint.ClientResponseMode
+> = HttpApiClient.Client.Response<
+  Effect.Success<
+    ReturnType<HttpApiClient.Client.Method<Extract<Endpoint, HttpApiEndpoint.ConstraintRequest>, never, never>>
+  >,
+  ResponseMode
+>
 
 type ErrorByMode<
   Error extends Schema.Constraint,
diff --git a/repos/effect/packages/effect/src/unstable/reactivity/AtomRpc.ts b/repos/effect/packages/effect/src/unstable/reactivity/AtomRpc.ts
index 67b084824..d8d7f74cd 100644
--- a/repos/effect/packages/effect/src/unstable/reactivity/AtomRpc.ts
+++ b/repos/effect/packages/effect/src/unstable/reactivity/AtomRpc.ts
@@ -73,7 +73,7 @@ export interface AtomRpcClient<Self, Id extends string, Rpcs extends Rpc.Any> ex
         readonly headers?: Headers.Input | undefined
       },
       _Success["Type"],
-      _Error["Type"] | RpcClientError | _Middleware["error"]["Type"]
+      _Error["Type"] | RpcClientError | _Middleware["error"]["Type"] | _Middleware["~ClientError"]
     >
     : never
 
@@ -94,18 +94,19 @@ export interface AtomRpcClient<Self, Id extends string, Rpcs extends Rpc.Any> ex
     infer _Payload,
     infer _Success,
     infer _Error,
-    infer _Middleware
+    infer _Middleware,
+    infer _Requires
   > ? [_Success] extends [RpcSchema.Stream<infer _A, infer _E>] ? Atom.Writable<
         Atom.PullResult<
           _A["Type"],
-          _E["Type"] | _Error["Type"] | RpcClientError | _Middleware["error"]["Type"]
+          _E["Type"] | _Error["Type"] | RpcClientError | _Middleware["error"]["Type"] | _Middleware["~ClientError"]
         >,
         void
       >
     : Atom.Atom<
       AsyncResult.AsyncResult<
         _Success["Type"],
-        _Error["Type"] | RpcClientError | _Middleware["error"]["Type"]
+        _Error["Type"] | RpcClientError | _Middleware["error"]["Type"] | _Middleware["~ClientError"]
       >
     >
     : never
@@ -275,7 +276,7 @@ export const Service = <Self>() =>
         ? Headers.fromInput(options.headers)
         : undefined,
       reactivityKeys: options?.reactivityKeys,
-      timeToLive: options?.timeToLive
+      timeToLive: options?.timeToLive !== undefined
         ? Duration.fromInputUnsafe(options.timeToLive)
         : undefined,
       serializationKey: options?.serializationKey
diff --git a/repos/effect/packages/effect/src/unstable/reactivity/Hydration.ts b/repos/effect/packages/effect/src/unstable/reactivity/Hydration.ts
index a92dead9e..274f90be1 100644
--- a/repos/effect/packages/effect/src/unstable/reactivity/Hydration.ts
+++ b/repos/effect/packages/effect/src/unstable/reactivity/Hydration.ts
@@ -10,6 +10,7 @@
  *
  * @since 4.0.0
  */
+import * as Schema from "../../Schema.ts"
 import * as AsyncResult from "./AsyncResult.ts"
 import * as Atom from "./Atom.ts"
 import type * as AtomRegistry from "./AtomRegistry.ts"
@@ -43,15 +44,31 @@ export interface DehydratedAtomValue extends DehydratedAtom {
   readonly resultPromise?: Promise<unknown> | undefined
 }
 
+const Skipped = Symbol.for("effect/reactivity/Hydration/Skipped")
+
+const encodeOrSkip = (
+  atom: Atom.Atom<any> & Atom.Serializable<any>,
+  value: unknown
+): unknown => {
+  try {
+    return atom[Atom.SerializableTypeId].encode(value)
+  } catch (error) {
+    if (Schema.isSchemaError(error)) return Skipped
+    throw error
+  }
+}
+
 /**
  * Encodes the serializable atoms currently stored in a registry into dehydrated
  * state.
  *
  * **Details**
  *
- * Only atoms marked with `Atom.serializable` are included. `encodeInitialAs`
- * controls whether `AsyncResult.Initial` values are ignored, encoded as values, or
- * represented by promises that resolve when the atom leaves the initial state.
+ * Only atoms marked with `Atom.serializable` whose current values can be encoded
+ * are included. Atoms that fail schema encoding are skipped without throwing.
+ * `encodeInitialAs` controls whether `AsyncResult.Initial` values are ignored,
+ * encoded as values, or represented by promises that resolve when the atom
+ * leaves the initial state.
  *
  * @category dehydration
  * @since 4.0.0
@@ -74,7 +91,8 @@ export const dehydrate = (
     const value = node.value()
     const isInitial = AsyncResult.isAsyncResult(value) && AsyncResult.isInitial(value)
     if (encodeInitialResultMode === "ignore" && isInitial) return
-    const encodedValue = atom[Atom.SerializableTypeId].encode(value)
+    const encodedValue = encodeOrSkip(atom, value)
+    if (encodedValue === Skipped) return
 
     // Create a promise that resolves when the atom moves out of Initial state
     let resultPromise: Promise<unknown> | undefined
@@ -82,8 +100,8 @@ export const dehydrate = (
       resultPromise = new Promise((resolve) => {
         const unsubscribe = registry.subscribe(atom, (newValue) => {
           if (AsyncResult.isAsyncResult(newValue) && !AsyncResult.isInitial(newValue)) {
-            resolve(atom[Atom.SerializableTypeId].encode(newValue))
             unsubscribe()
+            resolve(encodeOrSkip(atom, newValue))
           }
         })
       })
@@ -136,6 +154,7 @@ export const hydrate = (
     // and we should wait for it to resolve to a non-Initial state, then update the registry
     if (!datom.resultPromise) continue
     datom.resultPromise.then((resolvedValue) => {
+      if (resolvedValue === Skipped) return
       // Try to update the existing node directly instead of using setSerializable
       const nodes = registry.getNodes()
       const node = nodes.get(datom.key)
diff --git a/repos/effect/packages/effect/src/unstable/reactivity/Reactivity.ts b/repos/effect/packages/effect/src/unstable/reactivity/Reactivity.ts
index 4b1e6df77..2130b60a0 100644
--- a/repos/effect/packages/effect/src/unstable/reactivity/Reactivity.ts
+++ b/repos/effect/packages/effect/src/unstable/reactivity/Reactivity.ts
@@ -22,48 +22,59 @@ import * as Scope from "../../Scope.ts"
 import * as Stream from "../../Stream.ts"
 
 /**
- * Service for key-based reactive invalidation.
+ * Brand type for `Reactivity`.
  *
- * **When to use**
- *
- * Use to provide the invalidation service that refreshes queries, streams, and
- * atoms when application keys change.
+ * @category type IDs
+ * @since 4.0.0
+ */
+export type TypeId = "~effect/reactivity/Reactivity"
+
+/**
+ * Brand for `Reactivity` implementations.
  *
- * **Details**
+ * @category type IDs
+ * @since 4.0.0
+ */
+export const TypeId: TypeId = "~effect/reactivity/Reactivity"
+
+/**
+ * Registers handlers and reruns queries when their keys are invalidated.
  *
- * The service can register handlers for keys, invalidate those keys, wrap
- * mutations so successful effects invalidate keys, and turn query effects into
- * queues or streams that rerun when keys are invalidated.
+ * @category models
+ * @since 4.0.0
+ */
+export interface Reactivity {
+  readonly [TypeId]: TypeId
+  readonly invalidateUnsafe: (keys: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>>) => void
+  readonly registerUnsafe: (
+    keys: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>>,
+    handler: () => void
+  ) => () => void
+  readonly invalidate: (
+    keys: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>>
+  ) => Effect.Effect<void>
+  readonly mutation: <A, E, R>(
+    keys: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>>,
+    effect: Effect.Effect<A, E, R>
+  ) => Effect.Effect<A, E, R>
+  readonly query: <A, E, R>(
+    keys: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>>,
+    effect: Effect.Effect<A, E, R>
+  ) => Effect.Effect<Queue.Dequeue<A, E>, never, R | Scope.Scope>
+  readonly stream: <A, E, R>(
+    keys: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>>,
+    effect: Effect.Effect<A, E, R>
+  ) => Stream.Stream<A, E, Exclude<R, Scope.Scope>>
+  readonly withBatch: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
+}
+
+/**
+ * Service key for reactive invalidation.
  *
  * @category services
  * @since 4.0.0
  */
-export class Reactivity extends Context.Service<
-  Reactivity,
-  {
-    readonly invalidateUnsafe: (keys: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>>) => void
-    readonly registerUnsafe: (
-      keys: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>>,
-      handler: () => void
-    ) => () => void
-    readonly invalidate: (
-      keys: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>>
-    ) => Effect.Effect<void>
-    readonly mutation: <A, E, R>(
-      keys: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>>,
-      effect: Effect.Effect<A, E, R>
-    ) => Effect.Effect<A, E, R>
-    readonly query: <A, E, R>(
-      keys: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>>,
-      effect: Effect.Effect<A, E, R>
-    ) => Effect.Effect<Queue.Dequeue<A, E>, never, R | Scope.Scope>
-    readonly stream: <A, E, R>(
-      keys: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>>,
-      effect: Effect.Effect<A, E, R>
-    ) => Stream.Stream<A, E, Exclude<R, Scope.Scope>>
-    readonly withBatch: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
-  }
->()("effect/reactivity/Reactivity") {}
+export const Reactivity: Context.Service<Reactivity, Reactivity> = Context.Service("effect/reactivity/Reactivity")
 
 /**
  * Creates an in-memory `Reactivity` service.
@@ -123,7 +134,8 @@ export const make = Effect.sync(() => {
     })
     return () => {
       for (let i = 0; i < resolvedKeys.length; i++) {
-        const set = handlers.get(resolvedKeys[i])!
+        const set = handlers.get(resolvedKeys[i])
+        if (set === undefined) continue
         set.delete(handler)
         if (set.size === 0) {
           handlers.delete(resolvedKeys[i])
@@ -201,6 +213,7 @@ export const make = Effect.sync(() => {
     })
 
   return Reactivity.of({
+    [TypeId]: TypeId,
     mutation,
     query,
     stream,
diff --git a/repos/effect/packages/effect/src/unstable/rpc/RpcClient.ts b/repos/effect/packages/effect/src/unstable/rpc/RpcClient.ts
index 6654dee2f..73a42b12a 100644
--- a/repos/effect/packages/effect/src/unstable/rpc/RpcClient.ts
+++ b/repos/effect/packages/effect/src/unstable/rpc/RpcClient.ts
@@ -494,7 +494,7 @@ export const makeNoSerialization: <Rpcs extends Rpc.Any, E, const Flatten extend
       }
     ).pipe(
       span ? Effect.withParentSpan(span, { captureStackTrace: false }) : identity,
-      Effect.catchCause((error) => Queue.failCause(queue, error)),
+      Effect.onError((cause) => Queue.failCause(queue, cause)),
       Effect.interruptible,
       Effect.forkIn(scope, { startImmediately: true })
     )
diff --git a/repos/effect/packages/effect/src/unstable/rpc/RpcMiddleware.ts b/repos/effect/packages/effect/src/unstable/rpc/RpcMiddleware.ts
index 1b7578038..0ec69eb14 100644
--- a/repos/effect/packages/effect/src/unstable/rpc/RpcMiddleware.ts
+++ b/repos/effect/packages/effect/src/unstable/rpc/RpcMiddleware.ts
@@ -292,11 +292,13 @@ export const Service = <
     readonly requiredForClient?: boolean | undefined
   }
 ) => {
-  const Err = globalThis.Error as any
   const limit = getStackTraceLimit()
-  setStackTraceLimit(2)
-  const creationError = new Err()
-  setStackTraceLimit(limit)
+  let creationError: globalThis.Error | undefined
+  if (limit !== 0) {
+    setStackTraceLimit(2)
+    creationError = new globalThis.Error()
+    setStackTraceLimit(limit)
+  }
 
   function ServiceClass() {}
   const ServiceClass_ = ServiceClass as any as Mutable<AnyService>
@@ -304,7 +306,7 @@ export const Service = <
   ServiceClass.key = id
   Object.defineProperty(ServiceClass, "stack", {
     get() {
-      return creationError.stack
+      return creationError?.stack
     }
   })
   ServiceClass_[TypeId] = TypeId
diff --git a/repos/effect/packages/effect/src/unstable/rpc/RpcSerialization.ts b/repos/effect/packages/effect/src/unstable/rpc/RpcSerialization.ts
index 0e149fc41..19651be58 100644
--- a/repos/effect/packages/effect/src/unstable/rpc/RpcSerialization.ts
+++ b/repos/effect/packages/effect/src/unstable/rpc/RpcSerialization.ts
@@ -38,6 +38,11 @@ export type CodecFor = <S extends Schema.Top>(
 
 const codecForJson = Schema.toCodecJson as CodecFor
 
+// shared by every parser that decodes whole frames, so creating a parser does
+// not pay for a native TextDecoder
+let sharedTextDecoder: TextDecoder | undefined
+const decodeText = (bytes: Uint8Array): string => (sharedTextDecoder ??= new TextDecoder()).decode(bytes)
+
 /**
  * Service that describes how RPC protocol messages are encoded and decoded,
  * including the content type and whether the serialization format provides
@@ -118,16 +123,13 @@ export const json: RpcSerialization["Service"] = RpcSerialization.of({
   contentType: "application/json",
   includesFraming: false,
   codecFor: codecForJson,
-  makeUnsafe: () => {
-    const decoder = new TextDecoder()
-    return {
-      decode: (bytes) => {
-        const decoded = JSON.parse(typeof bytes === "string" ? bytes : decoder.decode(bytes))
-        return Array.isArray(decoded) ? decoded : [decoded]
-      },
-      encode: (response) => JSON.stringify(response)
-    }
-  }
+  makeUnsafe: () => ({
+    decode: (bytes) => {
+      const decoded = JSON.parse(typeof bytes === "string" ? bytes : decodeText(bytes))
+      return Array.isArray(decoded) ? decoded : [decoded]
+    },
+    encode: (response) => JSON.stringify(response)
+  })
 })
 
 /**
@@ -144,7 +146,8 @@ export const makeNdjson = (options?: StreamOptions): RpcSerialization["Service"]
     includesFraming: true,
     codecFor: codecForJson,
     makeUnsafe: () => {
-      const decoder = new TextDecoder()
+      // lazily created: string transports never need byte decoding
+      let decoder: TextDecoder | undefined
       let buffer = ""
       const failMaxBufferSize = (maxBufferSize: number): never => {
         buffer = ""
@@ -152,7 +155,7 @@ export const makeNdjson = (options?: StreamOptions): RpcSerialization["Service"]
       }
       return ({
         decode: (bytes) => {
-          buffer += typeof bytes === "string" ? bytes : decoder.decode(bytes, { stream: true })
+          buffer += typeof bytes === "string" ? bytes : (decoder ??= new TextDecoder()).decode(bytes, { stream: true })
           let position = 0
           let nlIndex = buffer.indexOf("\n", position)
           const items: Array<unknown> = []
@@ -210,7 +213,6 @@ export const jsonRpc = (options?: {
     includesFraming: false,
     codecFor: codecForJson,
     makeUnsafe: () => {
-      const decoder = new TextDecoder()
       const batches = new Map<string | number, {
         readonly size: number
         readonly responses: Map<string | number, RpcMessage.FromServerEncoded>
@@ -218,7 +220,7 @@ export const jsonRpc = (options?: {
       return {
         decode: (bytes) => {
           const decoded: JsonRpcMessage | Array<JsonRpcMessage> = JSON.parse(
-            typeof bytes === "string" ? bytes : decoder.decode(bytes)
+            typeof bytes === "string" ? bytes : decodeText(bytes)
           )
           return decodeJsonRpcRaw(decoded, batches)
         },
@@ -304,7 +306,7 @@ function decodeJsonRpcMessage(decoded: JsonRpcMessage): RpcMessage.FromClientEnc
         | RpcMessage.FromServerEncoded["_tag"]
         | Exclude<RpcMessage.FromClientEncoded["_tag"], "Request">
       const requestId = (request as any).params?.requestId
-      return requestId ?
+      return requestId !== undefined ?
         {
           _tag: tag,
           requestId
@@ -350,8 +352,8 @@ function decodeJsonRpcMessage(decoded: JsonRpcMessage): RpcMessage.FromClientEnc
         cause: response.error._tag === "Cause" ?
           response.error.data as any :
           [{
-            _tag: "Die",
-            defect: response.error
+            _tag: "Fail",
+            error: response.error
           }]
       } :
       {
diff --git a/repos/effect/packages/effect/src/unstable/rpc/RpcServer.ts b/repos/effect/packages/effect/src/unstable/rpc/RpcServer.ts
index 90f893329..edc3e8a48 100644
--- a/repos/effect/packages/effect/src/unstable/rpc/RpcServer.ts
+++ b/repos/effect/packages/effect/src/unstable/rpc/RpcServer.ts
@@ -126,7 +126,8 @@ export const makeNoSerialization: <Rpcs extends Rpc.Any>(
 
   type Client = {
     readonly id: number
-    readonly latches: Map<RequestId, Latch.Latch>
+    // lazily created: only streaming requests with client acks use latches
+    latches: Map<RequestId, Latch.Latch> | undefined
     readonly fibers: Map<RequestId, Fiber.Fiber<unknown, any>>
     readonly serverClient: Rpc.ServerClient
     ended: boolean
@@ -175,13 +176,16 @@ export const makeNoSerialization: <Rpcs extends Rpc.Any>(
         if (!client) {
           client = {
             id: clientId,
-            latches: new Map(),
+            latches: undefined,
             fibers: new Map(),
             ended: false,
             serverClient: new Rpc.ServerClient(clientId)
           }
           clients.set(clientId, client)
-        } else if (client.ended) {
+        } else if (
+          client.ended &&
+          (message._tag !== "Interrupt" || !client.fibers.has(message.requestId))
+        ) {
           return Effect.interrupt
         }
 
@@ -190,7 +194,7 @@ export const makeNoSerialization: <Rpcs extends Rpc.Any>(
             return handleRequest(requestFiber, client, message, opts)
           }
           case "Ack": {
-            const latch = client.latches.get(message.requestId)
+            const latch = client.latches?.get(message.requestId)
             return latch ? latch.open : Effect.void
           }
           case "Interrupt": {
@@ -347,10 +351,9 @@ export const makeNoSerialization: <Rpcs extends Rpc.Any>(
     if (!isFork && concurrencySemaphore) {
       effect = concurrencySemaphore.withPermit(effect)
     }
-    const context = new Map(entry.context.mapUnsafe)
-    requestFiber.context.mapUnsafe.forEach((value, key) => context.set(key, value))
-    context.set(Scope.Scope.key, scope)
-    const runFork = Effect.runForkWith(Context.makeUnsafe(context))
+    const runFork = Effect.runForkWith(
+      Context.add(handlerContext(entry, requestFiber.context), Scope.Scope, scope)
+    )
     const fiber = trackFiber(
       runFork(
         effect,
@@ -385,7 +388,7 @@ export const makeNoSerialization: <Rpcs extends Rpc.Any>(
         )
       }
       client.fibers.delete(request.id)
-      client.latches.delete(request.id)
+      client.latches?.delete(request.id)
       if (client.ended && client.fibers.size === 0) {
         trackFiber(runFork(endClient(client)))
       }
@@ -400,10 +403,14 @@ export const makeNoSerialization: <Rpcs extends Rpc.Any>(
       | Stream.Stream<any, any>
       | Effect.Effect<Queue.Dequeue<any, any>, any, Scope.Scope>
   ) => {
-    let latch = client.latches.get(request.id)
-    if (supportsAck && !latch) {
-      latch = Latch.makeUnsafe(false)
-      client.latches.set(request.id, latch)
+    let latch: Latch.Latch | undefined
+    if (supportsAck) {
+      client.latches ??= new Map()
+      latch = client.latches.get(request.id)
+      if (!latch) {
+        latch = Latch.makeUnsafe(false)
+        client.latches.set(request.id, latch)
+      }
     }
     if (Effect.isEffect(stream)) {
       return stream.pipe(
@@ -461,6 +468,32 @@ export const makeNoSerialization: <Rpcs extends Rpc.Any>(
   })
 })
 
+// Merging the handler entry services with the request fiber services costs
+// O(services), so the merged context is cached per (entry, fiber context)
+// pair. Request fibers on persistent connections keep one context across
+// requests, leaving a single O(1) overlay per request for the request scope.
+const handlerContextCache = new WeakMap<
+  Rpc.Handler<any>,
+  WeakMap<Context.Context<never>, Context.Context<never>>
+>()
+
+const handlerContext = (
+  entry: Rpc.Handler<any>,
+  fiberContext: Context.Context<never>
+): Context.Context<never> => {
+  let cache = handlerContextCache.get(entry)
+  if (cache === undefined) {
+    cache = new WeakMap()
+    handlerContextCache.set(entry, cache)
+  }
+  let merged = cache.get(fiberContext)
+  if (merged === undefined) {
+    merged = Context.merge(entry.context, fiberContext)
+    cache.set(fiberContext, merged)
+  }
+  return merged
+}
+
 const applyMiddleware = <A, E, R>(
   context: Context.Context<never>,
   handler: Effect.Effect<A, E, R>,
@@ -544,10 +577,9 @@ export const make: <Rpcs extends Rpc.Any>(
           return handleEncode(
             client,
             response.requestId,
-            schemas.encodeDefect,
-            schemas.collector,
-            Effect.provideContext(schemas.encodeChunk(response.values), schemas.context),
-            (values) => ({ _tag: "Chunk", requestId: response.requestId, values })
+            schemas,
+            schemas.encodeChunk(response.values),
+            "Chunk"
           )
         }
         case "Exit": {
@@ -557,10 +589,9 @@ export const make: <Rpcs extends Rpc.Any>(
           return handleEncode(
             client,
             response.requestId,
-            schemas.encodeDefect,
-            schemas.collector,
-            Effect.provideContext(schemas.encodeExit(response.exit), schemas.context),
-            (exit) => ({ _tag: "Exit", requestId: response.requestId, exit })
+            schemas,
+            schemas.encodeExit(response.exit),
+            "Exit"
           )
         }
         case "Defect": {
@@ -627,25 +658,43 @@ export const make: <Rpcs extends Rpc.Any>(
   }
   const clients = new Map<number, Client>()
 
-  const handleEncode = <A, R>(
+  const responseEnvelope = (
+    requestId: RequestId,
+    tag: "Chunk" | "Exit",
+    value: unknown
+  ): FromServerEncoded =>
+    tag === "Chunk"
+      ? { _tag: "Chunk", requestId, values: value as NonEmptyReadonlyArray<unknown> }
+      : { _tag: "Exit", requestId, exit: value as ResponseExitEncoded["exit"] }
+
+  const handleEncode = (
     client: Client,
     requestId: RequestId,
-    encodeDefect: (u: unknown) => Effect.Effect<unknown, Schema.SchemaError>,
-    collector: Transferable.Collector["Service"] | undefined,
-    effect: Effect.Effect<A, Schema.SchemaError, R>,
-    onSuccess: (a: A) => FromServerEncoded
-  ) =>
-    (collector ? Effect.provideService(effect, Transferable.Collector, collector) : effect).pipe(
-      Effect.flatMap((a) => send(client.id, onSuccess(a), collector && collector.clearUnsafe())),
-      Effect.catchCause((cause) => {
-        client.schemas.delete(requestId)
-        const defect = Cause.squash(Cause.map(cause, (e) => SchemaIssue.defaultFormatter(e.issue)))
-        return Effect.andThen(
-          sendRequestDefect(client, requestId, encodeDefect, defect),
-          server.write(client.id, { _tag: "Interrupt", requestId, interruptors: [] })
-        )
-      })
-    )
+    schemas: Schemas,
+    effect: Effect.Effect<unknown, Schema.SchemaError>,
+    tag: "Chunk" | "Exit"
+  ) => {
+    const collector = schemas.collector
+    // The schema encoders evaluate eagerly, so an encode that needs no
+    // services is already a resolved success and can skip the effect wrappers.
+    const write = Exit.isExit(effect) && Exit.isSuccess(effect)
+      ? send(client.id, responseEnvelope(requestId, tag, effect.value), collector && collector.clearUnsafe())
+      : Effect.flatMap(
+        Effect.provideContext(
+          collector ? Effect.provideService(effect, Transferable.Collector, collector) : effect,
+          schemas.context
+        ),
+        (value) => send(client.id, responseEnvelope(requestId, tag, value), collector && collector.clearUnsafe())
+      )
+    return Effect.catchCause(write, (cause) => {
+      client.schemas.delete(requestId)
+      const defect = Cause.squash(Cause.map(cause, (e) => SchemaIssue.defaultFormatter(e.issue)))
+      return Effect.andThen(
+        sendRequestDefect(client, requestId, schemas.encodeDefect, defect),
+        server.write(client.id, { _tag: "Interrupt", requestId, interruptors: [] })
+      )
+    })
+  }
 
   const sendRequestDefect = (
     client: Client,
@@ -679,6 +728,31 @@ export const make: <Rpcs extends Rpc.Any>(
         })
     )
 
+  const writeDecodedRequest = (
+    client: Client,
+    requestId: RequestId,
+    schemas: Schemas,
+    request: RequestEncoded,
+    payload: unknown
+  ) => {
+    client.schemas.set(
+      requestId,
+      supportsTransferables
+        ? {
+          ...schemas,
+          collector: Transferable.makeCollectorUnsafe()
+        }
+        : schemas
+    )
+    // the envelope is owned by this protocol loop, so it is decoded in place
+    // instead of copied for every request
+    const decoded = request as Types.Mutable<RequestEncoded>
+    decoded.id = requestId
+    decoded.payload = payload
+    decoded.headers = Headers.fromInput(request.headers) as any
+    return server.write(client.id, decoded as any)
+  }
+
   // main server loop
   return yield* run((clientId, request) => {
     let client = clients.get(clientId)
@@ -709,28 +783,19 @@ export const make: <Rpcs extends Rpc.Any>(
           return sendRequestDefect(client, requestId, (defect) => Effect.succeed(defect), `Unknown request tag: ${tag}`)
         }
         const schemas = getSchemas(rpc as any)
+        const decoded = schemas.decode(request.payload)
+        // The schema decoders evaluate eagerly, so a decode that needs no
+        // services is already a resolved success and can skip the effect
+        // wrappers.
+        if (Exit.isExit(decoded) && Exit.isSuccess(decoded)) {
+          return writeDecodedRequest(client, requestId, schemas, request, decoded.value)
+        }
         return Effect.matchEffect(
-          Effect.provideContext(schemas.decode(request.payload), schemas.context),
+          Effect.provideContext(decoded, schemas.context),
           {
             onFailure: (error) =>
               sendRequestDefect(client, requestId, schemas.encodeDefect, SchemaIssue.defaultFormatter(error.issue)),
-            onSuccess: (payload) => {
-              client.schemas.set(
-                requestId,
-                supportsTransferables
-                  ? {
-                    ...schemas,
-                    collector: Transferable.makeCollectorUnsafe()
-                  }
-                  : schemas
-              )
-              return server.write(clientId, {
-                ...request,
-                id: requestId,
-                payload,
-                headers: Headers.fromInput(request.headers)
-              } as any)
-            }
+            onSuccess: (payload) => writeDecodedRequest(client, requestId, schemas, request, payload)
           }
         )
       }
@@ -741,10 +806,9 @@ export const make: <Rpcs extends Rpc.Any>(
         return server.write(clientId, request)
       }
       case "Ack": {
-        return server.write(clientId, {
-          ...request,
-          requestId: RequestId(request.requestId)
-        })
+        // the branded `RequestId` shares the runtime representation of the
+        // encoded id, so the message can be forwarded as-is
+        return server.write(clientId, request as FromClient<Rpcs>)
       }
       case "Interrupt": {
         return server.write(clientId, {
@@ -1065,10 +1129,13 @@ export const makeProtocolWithHttpEffect: (
       clientIds.delete(id)
       Queue.offerUnsafe(disconnects, id)
       if (queue.state._tag === "Done") return Effect.void
-      return Effect.forEach(
-        requestIds,
-        (requestId) => writeRequest(id, { _tag: "Interrupt", requestId }),
-        { discard: true }
+      return Effect.andThen(
+        Queue.shutdown(queue),
+        Effect.forEach(
+          requestIds,
+          (requestId) => writeRequest(id, { _tag: "Interrupt", requestId }),
+          { discard: true }
+        )
       )
     })
     clients.set(id, client)
@@ -1093,7 +1160,9 @@ export const makeProtocolWithHttpEffect: (
 
     if (!includesFraming) {
       const responses = yield* Queue.collect(queue)
-      return HttpServerResponse.text(parser.encode(responses) as string, {
+      // Notification-only batches encode without a response body.
+      const encoded = parser.encode(responses)
+      return HttpServerResponse.text(encoded === undefined ? "" : encoded as string, {
         contentType: serialization.contentType
       })
     }
@@ -1287,7 +1356,7 @@ export const makeProtocolStdio = Effect.gen(function*() {
   const serialization = yield* RpcSerialization.RpcSerialization
 
   return yield* Protocol.make(Effect.fnUntraced(function*(writeRequest) {
-    const queue = yield* Queue.make<Uint8Array | string, Cause.Done>()
+    const queue = yield* Queue.bounded<Uint8Array | string, Cause.Done>(8)
     const parser = serialization.makeUnsafe()
 
     yield* stdio.stdin.pipe(
diff --git a/repos/effect/packages/effect/src/unstable/schema/Model.ts b/repos/effect/packages/effect/src/unstable/schema/Model.ts
index fb787fd8d..f216d5cbf 100644
--- a/repos/effect/packages/effect/src/unstable/schema/Model.ts
+++ b/repos/effect/packages/effect/src/unstable/schema/Model.ts
@@ -20,6 +20,7 @@ import * as Predicate from "../../Predicate.ts"
 import * as Schema from "../../Schema.ts"
 import * as SchemaGetter from "../../SchemaGetter.ts"
 import * as SchemaTransformation from "../../SchemaTransformation.ts"
+import * as UndefinedOr from "../../UndefinedOr.ts"
 import * as VariantSchema from "./VariantSchema.ts"
 
 const {
@@ -366,13 +367,13 @@ export const FieldOption: <Field extends VariantSchema.Field<any> | Schema.Top>(
       }
     > :
   never = fieldEvolve({
-    select: Schema.OptionFromNullOr,
-    insert: Schema.OptionFromNullOr,
-    update: Schema.OptionFromNullOr,
-    json: optionalOption,
-    jsonCreate: optionalOption,
-    jsonUpdate: optionalOption
-  }) as any
+    select: UndefinedOr.map(Schema.OptionFromNullOr),
+    insert: UndefinedOr.map(Schema.OptionFromNullOr),
+    update: UndefinedOr.map(Schema.OptionFromNullOr),
+    json: UndefinedOr.map(optionalOption),
+    jsonCreate: UndefinedOr.map(optionalOption),
+    jsonUpdate: UndefinedOr.map(optionalOption)
+  } as any) as any
 
 /**
  * Variant field type for SQLite booleans stored as `0 | 1` in database variants
@@ -426,7 +427,7 @@ export interface Date extends Schema.decodeTo<Schema.instanceOf<DateTime.Utc>, S
  */
 export const Date: Date = Schema.String.pipe(
   Schema.decodeTo(Schema.DateTimeUtc, {
-    decode: SchemaGetter.dateTimeUtcFromInput().map(DateTime.removeTime),
+    decode: SchemaGetter.map(SchemaGetter.dateTimeUtcFromInput(), DateTime.removeTime),
     encode: SchemaGetter.transform(DateTime.formatIsoDate)
   })
 )
diff --git a/repos/effect/packages/effect/src/unstable/schema/SchemaAOTCompiler.ts b/repos/effect/packages/effect/src/unstable/schema/SchemaAOTCompiler.ts
new file mode 100644
index 000000000..2aeadca37
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/schema/SchemaAOTCompiler.ts
@@ -0,0 +1,242 @@
+/**
+ * Generates static JavaScript modules that install Schema decoders in the shared
+ * registry. Generated modules use the same runtime support as the JIT compiler,
+ * without importing source generation or constructing functions dynamically.
+ *
+ * @since 4.0.0
+ */
+import * as Codegen from "../../internal/schema/codegen.ts"
+import * as SchemaAST from "../../SchemaAST.ts"
+import type { runtime } from "./SchemaCompiler/runtime.ts"
+
+const helper = (name: keyof typeof runtime): string => `runtime.${name}`
+const decoderOperationOrder: ReadonlyArray<Codegen.DecoderOperation> = [
+  "is",
+  "decode",
+  "make",
+  "decodeEffect",
+  "makeEffect"
+]
+const operationOrder: ReadonlyArray<Operation> = ["decode", "is", "make"]
+
+const compiler = (sources: ReadonlyMap<Codegen.DecoderOperation, string>): string | undefined => {
+  const cases = decoderOperationOrder.flatMap((key) => {
+    const source = sources.get(key)
+    return source === undefined ? [] : [`case ${JSON.stringify(key)}:{${source}}`]
+  }).join("")
+  return cases.length === 0 ? undefined : `switch(operation){${cases}}`
+}
+
+/**
+ * A parser operation prepared by {@link compile}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type Operation = "decode" | "is" | "make"
+
+type PlannedOperation = Operation | "decodeEffect"
+
+/**
+ * An exact AST and the parser operations to prepare for it.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface Target {
+  /** The registry key installed by the generated module. */
+  readonly ast: SchemaAST.AST
+  /** The operations that should be compiled for this AST. */
+  readonly operations: ReadonlyArray<Operation>
+}
+
+/**
+ * Generates a JavaScript ES module exporting `install(asts): void` for an
+ * ordered array of compilation targets.
+ *
+ * **When to use**
+ *
+ * Use to prepare decoders at build time for environments that disallow dynamic
+ * function construction. Save the returned source as a JavaScript module, then
+ * call its `install` export with the target ASTs in the same order before using
+ * parsers. Use a one-element array for a single schema.
+ *
+ * **Details**
+ *
+ * Generation does not install decoders or execute checks and transformations.
+ * Installation uses the same registry as `SchemaCompiler.set`; normal
+ * `SchemaParser` functions consume those entries. Generated validators and
+ * Struct and homogeneous Array loops are static functions. They share diagnostic and
+ * asynchronous continuation helpers with the interpreter. A single synchronous
+ * transformation between supported leaf types can use generated orchestration.
+ * Other detailed traversals, transformations, and middleware use the interpreter
+ * with registry-resolved children. Transformations and middleware are not replayed.
+ * Only the requested operation families and their static dependencies are
+ * emitted. Installation registers roots and dependencies in the same registry;
+ * each generated operation initializes on first use. Missing operations retain
+ * the lazy interpreter fallback. Repeated ASTs and shared dependencies are
+ * installed once by identity. Fast paths can still inline dependency code into
+ * multiple parent decoders. An empty array generates a module whose installation
+ * does nothing.
+ * Construction uses independently lazy `make` and `makeEffect` operations.
+ * Pure fixed Struct and homogeneous Array constructors can use `make` for a
+ * synchronous fast path; failures delegate to `makeEffect` for detailed issues.
+ * Tuple, Record, Union, leaf, and Class constructors use the existing
+ * interpreter. Constructor defaults and Class source schemas are read from the
+ * supplied ASTs, not serialized or executed during generation. `make` is
+ * omitted whenever replay could repeat observable construction work.
+ *
+ * **Gotchas**
+ *
+ * Regenerate the module whenever the schema definition or Effect version
+ * changes. Installation trusts that the runtime array has the same length and
+ * target order, and its ASTs have the same definitions and sharing as at build
+ * time. Functions and symbols are read from those ASTs, not serialized.
+ * Suspend thunks are not evaluated during generation; their contents and other
+ * unsupported nodes use the interpreter.
+ * Installation replaces generated entries, but parsers that already captured
+ * older entries keep them. Type-side and flipped ASTs are separate registry
+ * keys; generate and install them separately when needed. Importing the
+ * generated module alone does not install anything.
+ * In particular, target `SchemaAST.toType(schema.ast)` with `make` to prepare
+ * construction when it differs from the encoded root. Target
+ * `SchemaAST.flip(schema.ast)` with `decode` to prepare encoding. Unsupported
+ * operations use the interpreter while statically installed children remain
+ * available.
+ *
+ * @category compilation
+ * @since 4.0.0
+ */
+export const compile = (targets: ReadonlyArray<Target>): string => {
+  interface PlannedNode {
+    readonly index: number
+    readonly name: string
+    readonly reference: string
+    readonly requested: Set<PlannedOperation>
+    readonly sources: Map<Codegen.DecoderOperation, string>
+    readonly attempted: Set<Codegen.DecoderOperation>
+    readonly compilable: boolean
+  }
+
+  const seen = new Map<SchemaAST.AST, PlannedNode>()
+  const bindings: Array<string> = []
+  const factories: Array<string> = []
+  const factoryNames = new Map<string, string>()
+  const installations: Array<string> = []
+
+  const addSource = (node: SchemaAST.AST, plan: PlannedNode, operation: Codegen.DecoderOperation): boolean => {
+    if (plan.attempted.has(operation)) return plan.sources.has(operation)
+    plan.attempted.add(operation)
+    if (!plan.compilable) return false
+    const source = Codegen.generate(node, operation)
+    if (source === undefined) return false
+    plan.sources.set(operation, source)
+    return true
+  }
+
+  const visitDependencies = (node: SchemaAST.AST, name: string, operation: PlannedOperation): void => {
+    switch (node._tag) {
+      case "Declaration":
+        node.typeParameters.forEach((child, index) => visit(child, `${name}.typeParameters[${index}]`, operation))
+        break
+      case "TemplateLiteral":
+        node.parts.forEach((child, index) => visit(child, `${name}.parts[${index}]`, operation))
+        break
+      case "Arrays":
+        node.elements.forEach((child, index) => visit(child, `${name}.elements[${index}]`, operation))
+        node.rest.forEach((child, index) => visit(child, `${name}.rest[${index}]`, operation))
+        break
+      case "Objects":
+        node.propertySignatures.forEach((property, index) =>
+          visit(property.type, `${name}.propertySignatures[${index}].type`, operation)
+        )
+        node.indexSignatures.forEach((signature, index) => {
+          visit(
+            SchemaAST.parameterFromPropertyKey(signature.parameter),
+            `${helper("parameterFromPropertyKey")}(${name}.indexSignatures[${index}].parameter)`,
+            operation
+          )
+          visit(signature.type, `${name}.indexSignatures[${index}].type`, operation)
+        })
+        break
+      case "Union":
+        node.types.forEach((child, index) => visit(child, `${name}.types[${index}]`, operation))
+        break
+    }
+    node.encoding?.forEach((link, index) => visit(link.to, `${name}.encoding[${index}].to`, operation))
+    if (operation === "make") {
+      const descriptor = SchemaAST.getConstructorDescriptor(node)
+      if (descriptor !== undefined) {
+        visit(descriptor.link.to, `${helper("getConstructorDescriptor")}(${name}).link.to`, operation)
+      }
+    }
+  }
+
+  function visit(node: SchemaAST.AST, reference: string, operation: PlannedOperation): void {
+    let plan = seen.get(node)
+    if (plan === undefined) {
+      const index = seen.size
+      plan = {
+        index,
+        name: `a${index}`,
+        reference,
+        requested: new Set(),
+        sources: new Map(),
+        attempted: new Set(),
+        compilable: Codegen.shouldCompileParser(node)
+      }
+      seen.set(node, plan)
+    }
+    if (plan.requested.has(operation)) return
+    plan.requested.add(operation)
+
+    switch (operation) {
+      case "decode":
+        addSource(node, plan, "decode")
+        visit(node, reference, "decodeEffect")
+        break
+      case "decodeEffect":
+        addSource(node, plan, "decodeEffect")
+        visitDependencies(node, plan.name, operation)
+        break
+      case "is":
+        if (!addSource(node, plan, "is")) visit(node, reference, "decode")
+        break
+      case "make":
+        addSource(node, plan, "make")
+        addSource(node, plan, "makeEffect")
+        visitDependencies(node, plan.name, operation)
+        break
+    }
+  }
+
+  targets.forEach((target, index) => {
+    for (const operation of operationOrder) {
+      if (target.operations.includes(operation)) visit(target.ast, `asts[${index}]`, operation)
+    }
+  })
+  for (const plan of seen.values()) {
+    bindings.push(`const ${plan.name}=${plan.reference};`)
+    const source = compiler(plan.sources)
+    if (source !== undefined) {
+      let factory = factoryNames.get(source)
+      if (factory === undefined) {
+        factory = `d${factoryNames.size}`
+        factoryNames.set(source, factory)
+        factories.push(`function ${factory}(ast,resolve,operation){const R=runtime;${source}}`)
+      }
+      installations.push(`${helper("setCompiler")}(${plan.name},${factory});`)
+    }
+  }
+  return [
+    "// Generated by SchemaAOTCompiler. Regenerate after schema or Effect changes.",
+    "import { runtime } from \"effect/unstable/schema/SchemaCompiler/runtime\";",
+    ...factories,
+    "/** @param {ReadonlyArray<import(\"effect/SchemaAST\").AST>} asts */",
+    "export function install(asts){",
+    ...bindings,
+    ...installations,
+    "}",
+    ""
+  ].join("\n")
+}
diff --git a/repos/effect/packages/effect/src/unstable/schema/SchemaAOTCompiler/Build.ts b/repos/effect/packages/effect/src/unstable/schema/SchemaAOTCompiler/Build.ts
new file mode 100644
index 000000000..10e167bbe
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/schema/SchemaAOTCompiler/Build.ts
@@ -0,0 +1,288 @@
+/**
+ * Builds self-installing modules from ahead-of-time compiled Schema decoders.
+ *
+ * @since 4.0.0
+ */
+import * as Data from "../../../Data.ts"
+import * as Effect from "../../../Effect.ts"
+import * as FileSystem from "../../../FileSystem.ts"
+import * as Path from "../../../Path.ts"
+import type * as PlatformError from "../../../PlatformError.ts"
+import * as Schema from "../../../Schema.ts"
+import * as SchemaAST from "../../../SchemaAST.ts"
+import * as SchemaAOTCompiler from "../SchemaAOTCompiler.ts"
+
+/**
+ * An operation whose root AST should be prepared by {@link build}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export type Operation = "decode" | "encode" | "is" | "make"
+
+/**
+ * Loads the exports of a schema module during a build.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface ModuleLoader {
+  (): PromiseLike<unknown>
+}
+
+/**
+ * Options for {@link build}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface BuildOptions {
+  /**
+   * Maps import specifiers relative to `baseUrl` to loaders for those same
+   * modules. Only directly exported Schema values are compiled.
+   */
+  readonly modules: Readonly<Record<string, ModuleLoader>>
+  /** The URL against which relative module specifiers are resolved. */
+  readonly baseUrl: string | URL
+  /** The file-system path of the generated module. */
+  readonly outFile: string
+  /** The parser operations to prepare. Defaults to decoding. */
+  readonly operations?: ReadonlyArray<Operation> | undefined
+}
+
+/**
+ * A summary of a completed {@link build}.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface BuildResult {
+  /** The absolute path written by the build. */
+  readonly outFile: string
+  /** The number of loaded modules containing at least one Schema export. */
+  readonly modules: number
+  /** The number of directly exported Schema values found in those modules. */
+  readonly schemas: number
+}
+
+/**
+ * An error raised while loading modules or generating an AOT module.
+ *
+ * @category errors
+ * @since 4.0.0
+ */
+export class BuildError extends Data.TaggedError("BuildError")<{
+  readonly _tag: "BuildError"
+  readonly cause: unknown
+  readonly kind: "Generate" | "InvalidModule" | "LoadModule" | "ResolveModule"
+  readonly message: string
+  readonly module?: string | undefined
+}> {}
+
+interface ExportedSchema {
+  readonly alias: string
+  readonly exportName: string
+  readonly schema: Schema.Top
+}
+
+const operationOrder: ReadonlyArray<Operation> = ["decode", "encode", "is", "make"]
+
+const importPath = (
+  path: Path.Path,
+  outFile: string,
+  baseUrl: string | URL,
+  specifier: string
+): Effect.Effect<string, BuildError> =>
+  Effect.gen(function*() {
+    const url = yield* Effect.try({
+      try: () => new URL(specifier, baseUrl),
+      catch: (cause) =>
+        new BuildError({
+          cause,
+          kind: "ResolveModule",
+          message: `Could not resolve schema module ${JSON.stringify(specifier)}`,
+          module: specifier
+        })
+    })
+    const sourcePath = yield* path.fromFileUrl(url).pipe(
+      Effect.mapError((cause) =>
+        new BuildError({
+          cause,
+          kind: "ResolveModule",
+          message: `Schema module ${JSON.stringify(specifier)} does not resolve to a file`,
+          module: specifier
+        })
+      )
+    )
+    const relative = path.relative(path.dirname(outFile), sourcePath)
+    if (path.isAbsolute(relative)) {
+      return yield* new BuildError({
+        cause: undefined,
+        kind: "ResolveModule",
+        message: `Schema module ${JSON.stringify(specifier)} cannot be imported relative to the output file`,
+        module: specifier
+      })
+    }
+    const normalized = path.sep === "/" ? relative : relative.split(path.sep).join("/")
+    return normalized.startsWith(".") ? normalized : `./${normalized}`
+  })
+
+const root = (
+  exported: ExportedSchema,
+  operation: Operation
+): readonly [
+  ast: SchemaAST.AST,
+  operation: SchemaAOTCompiler.Operation,
+  expression: string,
+  derived: boolean
+] => {
+  const expression = `${exported.alias}[${JSON.stringify(exported.exportName)}].ast`
+  switch (operation) {
+    case "decode":
+      return [exported.schema.ast, "decode", expression, false]
+    case "encode": {
+      const ast = SchemaAST.flip(exported.schema.ast)
+      return ast === exported.schema.ast
+        ? [ast, "decode", expression, false]
+        : [ast, "decode", `A.flip(${expression})`, true]
+    }
+    case "is":
+    case "make": {
+      const ast = SchemaAST.toType(exported.schema.ast)
+      return ast === exported.schema.ast
+        ? [ast, operation, expression, false]
+        : [ast, operation, `A.toType(${expression})`, true]
+    }
+  }
+}
+
+/**
+ * Writes a self-installing AOT module for Schema values exported by a set of
+ * modules.
+ *
+ * **When to use**
+ *
+ * Use when a build script should let an application install generated decoders
+ * by importing one generated module at startup.
+ *
+ * **Details**
+ *
+ * Module keys are import specifiers relative to `baseUrl`. Their loaders run
+ * sequentially during the build. The builder sorts module specifiers and export
+ * names, compiles direct Schema exports, and writes deterministic source using
+ * `FileSystem`. The generated module imports those exports and installs their
+ * decoders in the shared Schema parser registry as a module side effect. A lazy
+ * record returned by `import.meta.glob` can be passed as `modules` directly.
+ *
+ * Decoding is prepared by default. `is` and `make` prepare the type-side AST;
+ * `encode` prepares the flipped AST. Nested dependencies are discovered by the
+ * AOT compiler and do not need separate exports.
+ *
+ * **Gotchas**
+ *
+ * Loaders execute application modules during the build. Each loader must return
+ * the same module named by its key. The generated file must be rebuilt after a
+ * schema definition or Effect version changes. Unsupported operations retain
+ * the interpreter fallback. Build configurations that mark modules as
+ * side-effect free must retain the generated import.
+ *
+ * @category compilation
+ * @since 4.0.0
+ */
+export const build: (
+  options: BuildOptions
+) => Effect.Effect<
+  BuildResult,
+  BuildError | PlatformError.PlatformError,
+  FileSystem.FileSystem | Path.Path
+> = Effect.fnUntraced(function*(options) {
+  const fs = yield* FileSystem.FileSystem
+  const path = yield* Path.Path
+  const outFile = path.resolve(options.outFile)
+  const requested = new Set(options.operations ?? ["decode"])
+  const operations = operationOrder.filter((operation) => requested.has(operation))
+  const imports: Array<string> = []
+  const exportedSchemas: Array<ExportedSchema> = []
+
+  for (const specifier of Object.keys(options.modules).sort()) {
+    const loader = options.modules[specifier]!
+    const loaded = yield* Effect.tryPromise({
+      try: () => loader(),
+      catch: (cause) =>
+        new BuildError({
+          cause,
+          kind: "LoadModule",
+          message: `Could not load schema module ${JSON.stringify(specifier)}`,
+          module: specifier
+        })
+    })
+    if (typeof loaded !== "object" || loaded === null) {
+      return yield* new BuildError({
+        cause: loaded,
+        kind: "InvalidModule",
+        message: `Schema module ${JSON.stringify(specifier)} did not load a module namespace`,
+        module: specifier
+      })
+    }
+    const namespace = loaded as Readonly<Record<string, unknown>>
+    const exports = Object.keys(namespace).filter((name) => Schema.isSchema(namespace[name])).sort()
+    if (exports.length === 0) continue
+    const alias = `m${imports.length}`
+    const specifierFromOutput = yield* importPath(path, outFile, options.baseUrl, specifier)
+    imports.push(`import * as ${alias} from ${JSON.stringify(specifierFromOutput)};`)
+    for (const exportName of exports) {
+      exportedSchemas.push({
+        alias,
+        exportName,
+        schema: namespace[exportName] as Schema.Top
+      })
+    }
+  }
+
+  const source = yield* Effect.try({
+    try: () => {
+      const targets: Array<{
+        readonly ast: SchemaAST.AST
+        readonly operations: Array<SchemaAOTCompiler.Operation>
+        readonly expression: string
+      }> = []
+      const seen = new Map<SchemaAST.AST, number>()
+      let needsSchemaASTImport = false
+      for (const exported of exportedSchemas) {
+        for (const operation of operations) {
+          const [ast, targetOperation, expression, isDerived] = root(exported, operation)
+          const index = seen.get(ast)
+          if (index !== undefined) {
+            const targetOperations = targets[index].operations
+            if (!targetOperations.includes(targetOperation)) targetOperations.push(targetOperation)
+            continue
+          }
+          seen.set(ast, targets.length)
+          targets.push({ ast, operations: [targetOperation], expression })
+          needsSchemaASTImport ||= isDerived
+        }
+      }
+      return [
+        ...imports,
+        ...(needsSchemaASTImport ? ["import * as A from \"effect/SchemaAST\";"] : []),
+        SchemaAOTCompiler.compile(targets),
+        `install([${targets.map((target) => target.expression).join(",")}]);`,
+        ""
+      ].join("\n")
+    },
+    catch: (cause) =>
+      new BuildError({
+        cause,
+        kind: "Generate",
+        message: "Could not generate the Schema AOT module"
+      })
+  })
+
+  yield* fs.makeDirectory(path.dirname(outFile), { recursive: true })
+  yield* fs.writeFileString(outFile, source)
+  return {
+    outFile,
+    modules: imports.length,
+    schemas: exportedSchemas.length
+  }
+})
diff --git a/repos/effect/packages/effect/src/unstable/schema/SchemaCompiler.ts b/repos/effect/packages/effect/src/unstable/schema/SchemaCompiler.ts
new file mode 100644
index 000000000..b7f91131a
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/schema/SchemaCompiler.ts
@@ -0,0 +1,208 @@
+/**
+ * Provides the shared registry used by Schema decoder implementations. A
+ * decoder installed with {@link set} is consumed transparently by the normal
+ * `SchemaParser` APIs, allowing runtime and ahead-of-time compilers to use the
+ * same cache without introducing a compiled Schema type or a second parser API.
+ *
+ * The cache associates each exact AST with an entry containing decoder
+ * operations, never parsing results. The interpreter uses the same registry
+ * with lazy `decodeEffect` and constructor fallback; JIT, AOT, and manual
+ * installations may supply `makeEffect` and optional synchronous fast paths.
+ *
+ * @since 4.0.0
+ */
+import type * as Effect from "../../Effect.ts"
+import * as CompilerRegistry from "../../internal/schema/compilerRegistry.ts"
+import * as InternalParser from "../../internal/schema/parser.ts"
+import type * as SchemaAST from "../../SchemaAST.ts"
+import type * as SchemaIssue from "../../SchemaIssue.ts"
+
+/**
+ * The result returned by {@link Decode} or {@link Make} when the fast path fails.
+ *
+ * @category symbols
+ * @since 4.0.0
+ */
+export const invalid = CompilerRegistry.invalid
+
+/**
+ * The sentinel distinguishing an absent input from a present `undefined`.
+ * Decoders and constructors propagate it as a successful result when no value
+ * is produced. Parents omit optional fields or report missing required keys;
+ * public root adapters reject it rather than returning it to callers.
+ *
+ * @category symbols
+ * @since 4.0.0
+ */
+export const missing = InternalParser.missing
+
+/**
+ * A compiled boolean validator.
+ *
+ * **Details**
+ *
+ * This optional fast path avoids constructing output. Omit it when validation
+ * requires reconstructed values, such as a Struct check that must see the
+ * object after excess properties are removed. Type guards then use ordinary
+ * decoding, including `decode` and its diagnostic fallback when available.
+ * It must honor the supplied parse options; public `Schema.is` and
+ * `SchemaParser.is` use the defaults.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface Is {
+  (input: unknown, options: SchemaAST.ParseOptions): boolean
+}
+
+/**
+ * A compiled decoder that returns the decoded value without constructing
+ * diagnostic issues.
+ *
+ * **Details**
+ *
+ * This optional synchronous fast path lets valid inputs return their output
+ * without the detailed decoding pass. For decoding, the registry follows
+ * {@link invalid} with `decodeEffect` because the sentinel provides no error details
+ * and can also occur as a valid input value. Type guards without an `is` operation
+ * use this same fallback. Omit this operation
+ * when the fast path is unsupported or replay would be unsafe, including ASTs
+ * containing transformations or middleware.
+ *
+ * It must honor every supported `ParseOptions` value. Return {@link invalid}
+ * for invalid input, never for an unsupported optimization. The detailed decoder
+ * must also accept valid data that happens to equal this marker. Do not call
+ * the detailed decoder and discard its failure: decoding would run `decodeEffect`
+ * again after `invalid`. User checks may themselves construct issues.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface Decode {
+  (input: unknown, options: SchemaAST.ParseOptions): unknown | typeof invalid
+}
+
+/**
+ * A compiled constructor that returns the constructed value without detailed
+ * diagnostic issues.
+ *
+ * **Details**
+ *
+ * This optional synchronous fast path lets construction return directly when
+ * it succeeds. Return {@link invalid} to let `makeEffect` produce the normal
+ * detailed result. Implementations must be deterministic and free of side
+ * effects because a failed construction can be repeated by `makeEffect`.
+ *
+ * Omit this operation when construction can execute defaults, Class
+ * constructors, transformations, middleware, or other effects that cannot be
+ * replayed safely. The operation must honor the supplied parse options and
+ * propagate {@link missing} when no value is produced.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface Make {
+  (input: unknown, options: SchemaAST.ParseOptions): unknown | typeof invalid
+}
+
+/**
+ * A compiled decoder that returns detailed Schema issues on failure.
+ *
+ * **Details**
+ *
+ * This required operation implements complete decoding for its AST, including
+ * transformations, middleware, and asynchronous work when present. It makes
+ * every parser API usable without optional fast paths and provides diagnostics
+ * after `decode` returns `invalid`. The implementation can also be interpreted;
+ * invoking `decodeEffect` does not imply a switch from compiled to interpreted parsing.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface DecodeEffect {
+  (input: unknown, options: SchemaAST.ParseOptions): Effect.Effect<unknown, SchemaIssue.Issue, any>
+}
+
+/**
+ * A complete constructor that returns detailed Schema issues on failure.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface MakeEffect {
+  (input: unknown, options: SchemaAST.ParseOptions): Effect.Effect<unknown, SchemaIssue.Issue, any>
+}
+
+/**
+ * The operations installed for an AST in the shared Schema parser registry.
+ *
+ * **Details**
+ *
+ * `decodeEffect` is required for complete decoding and detailed failures. `decode`,
+ * `is`, and `make` are optional optimizations, not requirements for an AST to be usable.
+ * The interpreter supplies only `decodeEffect` in this same format.
+ * An optional `makeEffect` supplies complete node construction. Otherwise the
+ * registry prepares and caches the interpreted constructor, never the decoder,
+ * for that operation. Public makers resolve the schema's exact type-side AST.
+ *
+ * The registry wraps these operations in an internal entry.
+ * Decoding tries `decode` when present, returning its output on success or
+ * calling `decodeEffect` after `invalid`. Without `decode`, or for the {@link missing}
+ * sentinel, it calls `decodeEffect` directly. Type guards prefer `is`; otherwise
+ * they use ordinary decoding with the same fast-path/diagnostic fallback.
+ * A boolean `false` from `is` needs no diagnostic replay.
+ * Synchronous decoding and encoding share an adapter that returns successful
+ * `decode` output directly, without wrapping it in an intermediate Effect.
+ * Each operation is resolved lazily on first use, so unused fast paths need
+ * not be compiled.
+ * Synchronous construction tries `make` when present, returning its output on
+ * success or calling `makeEffect` after {@link invalid}. Compilers must omit
+ * `make` when replay could repeat observable construction work. Construction
+ * never uses `is` or `decode`. Field/element defaults belong to the parent
+ * occurrence, not to the root node or a Union member.
+ * Runtime options apply to construction too; Union candidate selection preserves
+ * the constructor's conservative handling of absent discriminants.
+ *
+ * @category models
+ * @since 4.0.0
+ */
+export interface CompiledDecoder {
+  readonly is?: Is | undefined
+  readonly decode?: Decode | undefined
+  readonly make?: Make | undefined
+  readonly decodeEffect: DecodeEffect
+  /**
+   * Constructs this node without replay, including Class construction and child
+   * defaults. Omit it to use the lazy interpreted constructor. This operation
+   * initializes independently from decoding and never applies its own root default.
+   * Propagate `missing` as a success when no value is produced; the parent handles
+   * optional omission or missing-key issues. A present `undefined` is not `missing`.
+   */
+  readonly makeEffect?: MakeEffect | undefined
+}
+
+/**
+ * Installs a compiled decoder for an exact AST in the shared Schema parser
+ * registry.
+ *
+ * **Details**
+ *
+ * A later call for the same AST replaces the previous entry. Parser functions
+ * that have already resolved and retained an earlier entry are not updated.
+ * This also applies when subsequent calls use different parse options.
+ * The decoder is trusted to implement the semantics of the supplied AST.
+ * Installation does not evaluate operation getters. Each operation, including
+ * an absent optional operation, is resolved once when first needed. Accessors
+ * retain the supplied decoder as their receiver. The supplied object is not
+ * mutated. JIT installation uses these same rules.
+ * Replacement includes construction: omitting `makeEffect` in the replacement
+ * selects interpreted detailed construction for new consumers, without merging
+ * the old operation into the new entry. An installed `make` can still handle
+ * synchronous successes. Already captured constructors keep their entry.
+ *
+ * @category registry
+ * @since 4.0.0
+ */
+export const set = (ast: SchemaAST.AST, decoder: CompiledDecoder): void => {
+  CompilerRegistry.set(ast, decoder)
+}
diff --git a/repos/effect/packages/effect/src/unstable/schema/SchemaCompiler/runtime.ts b/repos/effect/packages/effect/src/unstable/schema/SchemaCompiler/runtime.ts
new file mode 100644
index 000000000..7ade48b89
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/schema/SchemaCompiler/runtime.ts
@@ -0,0 +1,269 @@
+/**
+ * Runtime helpers used by generated schema modules. This module contains no
+ * source generator or dynamic function construction. Generated modules must
+ * use the same Effect version as their generator.
+ *
+ * @since 4.0.0
+ */
+import * as Effect from "../../../Effect.ts"
+import { effectIsExit, resolveConcurrency } from "../../../internal/effect.ts"
+import {
+  lazyParser,
+  type Resolve,
+  resolve,
+  setCompiler,
+  withDecode
+} from "../../../internal/schema/compilerRegistry.ts"
+import * as Interpreter from "../../../internal/schema/interpreter.ts"
+import * as InternalParser from "../../../internal/schema/parser.ts"
+import * as SchemaAST from "../../../SchemaAST.ts"
+import * as SchemaIssue from "../../../SchemaIssue.ts"
+import type { Compiler } from "../../../SchemaParser.ts"
+import { type Decode, invalid } from "../SchemaCompiler.ts"
+
+type SchemaIssueParser = ReturnType<typeof Interpreter.compile>
+type ObjectParserState = Parameters<typeof SchemaAST.stepProperty>[0]
+type ParsedProperty = Parameters<typeof SchemaAST.stepProperty>[1]
+type ArrayParserState = Parameters<typeof SchemaAST.stepArray>[0]
+type GenerateObject = (context: {
+  readonly ast: SchemaAST.Objects
+  readonly getProperties: () => ReadonlyArray<ParsedProperty>
+  readonly fallback: SchemaIssueParser
+  readonly resume: (
+    state: ObjectParserState,
+    index: number,
+    pending: Effect.Effect<unknown, SchemaIssue.Issue, any>
+  ) => Effect.Effect<unknown, SchemaIssue.Issue, any>
+  readonly step: typeof SchemaAST.stepProperty
+}) => SchemaIssueParser
+type GenerateArray = (context: {
+  readonly getElement: () => SchemaIssueParser
+  readonly step: typeof SchemaAST.stepArray
+  readonly resume: (
+    state: ArrayParserState,
+    item: unknown,
+    index: number,
+    pending: Effect.Effect<unknown, SchemaIssue.Issue, any>,
+    end: number
+  ) => Effect.Effect<void, SchemaIssue.Issue, any>
+}) => typeof SchemaAST.parseArray
+const makeObjectBase = (
+  ast: SchemaAST.Objects,
+  compile: Compiler,
+  compileField: Compiler,
+  generate: GenerateObject
+): SchemaIssueParser => {
+  let properties: Array<ParsedProperty> | undefined
+  const getProperties = (): Array<ParsedProperty> => {
+    if (properties !== undefined) return properties
+    const parsers = new Map<SchemaAST.AST, SchemaIssueParser>()
+    return properties = ast.propertySignatures.map((property) => {
+      let parser = parsers.get(property.type)
+      if (parser === undefined) {
+        parser = compileField(property.type)
+        parsers.set(property.type, parser)
+      }
+      return { parser, name: property.name, type: property.type }
+    })
+  }
+  let fallback: SchemaIssueParser | undefined
+  const runFallback: SchemaIssueParser = (input, options) =>
+    (fallback ??= ast.getParser(compile, compileField))(input, options)
+  const resume = (
+    state: ObjectParserState,
+    index: number,
+    pending: Effect.Effect<unknown, SchemaIssue.Issue, any>
+  ): Effect.Effect<unknown, SchemaIssue.Issue, any> => {
+    const property = properties![index]
+    return Effect.flatMap(Effect.exit(pending), (exit) => {
+      const terminal = SchemaAST.stepProperty(state, property, exit)
+      if (terminal) return terminal
+      const done = () => InternalParser.succeed(state.out)
+      const effect = SchemaAST.parseProperties(state, properties!.slice(index + 1))
+      return effect ? Effect.flatMapEager(effect, done) : done()
+    })
+  }
+  return generate({ ast, getProperties, fallback: runFallback, resume, step: SchemaAST.stepProperty })
+}
+
+const makeArrayBase = (
+  ast: SchemaAST.Arrays,
+  compile: Compiler,
+  compileField: Compiler,
+  generate: GenerateArray
+): SchemaIssueParser => {
+  let element: { readonly ast: SchemaAST.AST; readonly parser: SchemaIssueParser } | undefined
+  const getElement = () => (element ??= {
+    ast: ast.rest[0],
+    parser: compileField(ast.rest[0])
+  })
+  let fallback: SchemaIssueParser | undefined
+  const runFallback: SchemaIssueParser = (input, options) =>
+    (fallback ??= ast.getParser(compile, compileField))(input, options)
+  const run = generate({
+    getElement: () => getElement().parser,
+    step: SchemaAST.stepArray,
+    resume: (state, item, index, pending, end) =>
+      Effect.flatMap(
+        Effect.exit(pending),
+        (exit) =>
+          SchemaAST.stepArray(state, item, exit, index) ??
+            SchemaAST.parseArray(state, state.input, index + 1, end) ?? Effect.void
+      )
+  })
+  const specialized = Effect.fnUntracedEager(function*(input: unknown, options: SchemaAST.ParseOptions) {
+    if (input === InternalParser.missing) return InternalParser.missing
+    if (!Array.isArray(input)) {
+      return yield* Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
+    }
+    const descriptor = getElement()
+    const len = input.length
+    const state: ArrayParserState = {
+      ast,
+      getParser: () => descriptor,
+      input,
+      len,
+      tailThreshold: len,
+      output: new globalThis.Array(len),
+      issues: undefined,
+      options
+    }
+    const effect = run(state, input, 0, len)
+    if (effect) yield* effect
+    if (state.issues) {
+      return yield* Effect.fail(new SchemaIssue.Composite(ast, state.issues, input, options))
+    }
+    return state.output
+  })
+  return (input, options) =>
+    options.concurrency !== undefined && resolveConcurrency(options.concurrency) !== 1
+      ? runFallback(input, options)
+      : specialized(input, options)
+}
+
+const decode = (
+  ast: SchemaAST.AST,
+  resolve: Resolve,
+  generate?: GenerateObject,
+  detailed = false,
+  makeDecode?: () => Decode,
+  generateArray?: GenerateArray
+): SchemaIssueParser => {
+  const child = (ast: SchemaAST.AST) => lazyParser(resolve, ast, detailed ? "decodeEffect" : "parser")
+  const localChild = makeDecode === undefined
+    ? child
+    : (ast: SchemaAST.AST) => lazyParser(resolve, ast, "decodeEffect")
+  const base = ast._tag === "Objects" && generate !== undefined ?
+    makeObjectBase(ast, localChild, localChild, generate)
+    : ast._tag === "Arrays" && generateArray !== undefined
+    ? makeArrayBase(ast, localChild, localChild, generateArray)
+    : makeDecode !== undefined
+    ? ast.getParser(localChild)
+    : undefined
+  const specialize = makeDecode === undefined ? undefined : (local: SchemaIssueParser): SchemaIssueParser => {
+    try {
+      return withDecode(makeDecode(), () => local)
+    } catch {
+      // Initialization failure selects the local interpreter, without parsing again.
+      return local
+    }
+  }
+  return Interpreter.compile(ast, child, undefined, base, specialize)
+}
+
+const make = (
+  ast: SchemaAST.AST,
+  resolve: Resolve,
+  generate?: GenerateObject,
+  generateArray?: GenerateArray
+): SchemaIssueParser => {
+  const child = (ast: SchemaAST.AST) => lazyParser(resolve, ast, "makeEffect")
+  const field = (ast: SchemaAST.AST) => Interpreter.compileField(ast, child)
+  const base = generate !== undefined && ast._tag === "Objects" ?
+    makeObjectBase(ast, child, field, generate)
+    : generateArray !== undefined && ast._tag === "Arrays"
+    ? makeArrayBase(ast, child, field, generateArray)
+    : undefined
+  return Interpreter.compile(ast, child, field, base)
+}
+
+const getCheckIssues = (
+  ast: SchemaAST.AST,
+  value: unknown,
+  encoded: boolean,
+  options: SchemaAST.ParseOptions
+): ReturnType<typeof SchemaAST.collectIssues> => {
+  const checks = encoded ? "encodingChecks" in ast ? ast.encodingChecks : undefined : ast.checks
+  return !options.disableChecks && checks !== undefined
+    ? SchemaAST.collectIssues(checks, value, undefined, ast, options)
+    : undefined
+}
+
+const check = (
+  ast: SchemaAST.AST,
+  value: unknown,
+  options: SchemaAST.ParseOptions
+): Effect.Effect<unknown, SchemaIssue.Issue> => {
+  const issues = getCheckIssues(ast, value, false, options)
+  return issues === undefined
+    ? InternalParser.succeed(value)
+    : Effect.fail(new SchemaIssue.Composite(ast, issues, value, options))
+}
+
+const hasExcessProperties = (
+  ast: SchemaAST.Objects,
+  input: Record<PropertyKey, unknown>,
+  options: SchemaAST.ParseOptions
+): boolean => {
+  const covered = new Set<PropertyKey>(
+    ast.propertySignatures.map((p) => typeof p.name === "number" ? String(p.name) : p.name)
+  )
+  for (const index of ast.indexSignatures) {
+    for (const key of SchemaAST.getIndexSignatureKeys(input, index.parameter, options)) covered.add(key)
+  }
+  return Reflect.ownKeys(input).some((key) => !covered.has(key))
+}
+
+const invalidType = (ast: SchemaAST.AST, input: unknown, options: SchemaAST.ParseOptions) =>
+  Effect.fail(new SchemaIssue.InvalidType(ast, input, options))
+
+const invalidEncoding = (
+  ast: SchemaAST.AST & { readonly encoding: SchemaAST.Encoding },
+  index: number,
+  input: unknown,
+  value: unknown,
+  options: SchemaAST.ParseOptions
+) =>
+  index === 0
+    ? invalidType(ast, value, options)
+    : Interpreter.wrapEncoding(ast, input, options, invalidType(ast.encoding[index - 1].to, value, options))
+
+/** @internal */
+export const runtime = {
+  decode,
+  make,
+  resolve,
+  setCompiler,
+  invalid,
+  missing: InternalParser.missing,
+  missingExit: InternalParser.missingExit,
+  sameExit: InternalParser.sameExit,
+  args: InternalParser.args,
+  succeed: InternalParser.succeed,
+  effectIsExit,
+  die: Effect.die,
+  invalidType,
+  invalidEncoding,
+  getCheckIssues,
+  check,
+  getExpectedKeys: (ast: SchemaAST.Objects) =>
+    ast.propertySignatures.map((p) => typeof p.name === "number" ? String(p.name) : p.name),
+  hasExcessProperties,
+  matchesTemplateLiteral: (ast: SchemaAST.TemplateLiteral, input: unknown, options: SchemaAST.ParseOptions) =>
+    typeof input === "string" && ast.matchPart(input, options) !== undefined,
+  getCandidates: SchemaAST.getCandidates,
+  getIndexSignatureKeys: SchemaAST.getIndexSignatureKeys,
+  parameterFromPropertyKey: SchemaAST.parameterFromPropertyKey,
+  getConstructorDescriptor: SchemaAST.getConstructorDescriptor,
+  defaultParseOptions: SchemaAST.defaultParseOptions
+}
diff --git a/repos/effect/packages/effect/src/unstable/schema/SchemaJITCompiler.ts b/repos/effect/packages/effect/src/unstable/schema/SchemaJITCompiler.ts
new file mode 100644
index 000000000..efb0bb30b
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/schema/SchemaJITCompiler.ts
@@ -0,0 +1,89 @@
+/**
+ * Installs runtime-generated schema decoders without changing SchemaParser's
+ * public interface. Operations are compiled lazily. Import the separate
+ * `SchemaJITCompiler/enable` module to enable compilation globally.
+ *
+ * @since 4.0.0
+ */
+import { type DecoderOperation, generate, shouldCompileParser } from "../../internal/schema/codegen.ts"
+import * as Registry from "../../internal/schema/compilerRegistry.ts"
+import type * as SchemaAST from "../../SchemaAST.ts"
+import type { CompiledDecoder } from "./SchemaCompiler.ts"
+import { runtime } from "./SchemaCompiler/runtime.ts"
+
+let checked: FunctionConstructor | undefined
+let supported = false
+
+/** @internal */
+export const compiler: Registry.CompileSource = (ast, resolve) => {
+  if (!shouldCompileParser(ast)) return undefined
+  if (checked !== globalThis.Function) {
+    checked = globalThis.Function
+    try {
+      checked("return true")
+      supported = true
+    } catch {
+      supported = false
+    }
+  }
+  if (!supported) return undefined
+  let decodeFailed = false
+  const operation = (key: DecoderOperation) => {
+    const isConstruction = key === "make" || key === "makeEffect"
+    if (isConstruction || !decodeFailed) {
+      try {
+        const source = generate(ast, key)
+        if (source === undefined) return undefined
+        return globalThis.Function("ast", "R", "resolve", source)(ast, runtime, resolve)
+      } catch {
+        // Only code generation and initialization are inside this catch.
+        if (!isConstruction) decodeFailed = true
+      }
+    }
+    return key === "decodeEffect"
+      ? runtime.decode(ast, resolve)
+      : key === "makeEffect"
+      ? runtime.make(ast, resolve)
+      : undefined
+  }
+  return {
+    get is() {
+      return operation("is")
+    },
+    get decode() {
+      return operation("decode")
+    },
+    get make() {
+      return operation("make")
+    },
+    get decodeEffect() {
+      return operation("decodeEffect")
+    },
+    get makeEffect() {
+      return operation("makeEffect")
+    }
+  } satisfies CompiledDecoder
+}
+
+/**
+ * Enables lazy JIT compilation for an AST and its parsing dependencies.
+ *
+ * **Details**
+ *
+ * Uses the same registry as `SchemaCompiler.set`. Compilation failures, including
+ * environments that block `new Function`, retain interpreted parsing. Errors
+ * thrown while parsing are not retried. No checks, transformations or defaults
+ * execute during installation.
+ *
+ * **Gotchas**
+ *
+ * Enable before first use to optimize every consumer. Functions that already
+ * captured an entry keep it. Enable type-side and flipped ASTs separately when
+ * they differ from the supplied AST.
+ *
+ * @category compilation
+ * @since 4.0.0
+ */
+export function enable(ast: SchemaAST.AST): void {
+  Registry.enable(ast, compiler)
+}
diff --git a/repos/effect/packages/effect/src/unstable/schema/SchemaJITCompiler/enable.ts b/repos/effect/packages/effect/src/unstable/schema/SchemaJITCompiler/enable.ts
new file mode 100644
index 000000000..6ab43497f
--- /dev/null
+++ b/repos/effect/packages/effect/src/unstable/schema/SchemaJITCompiler/enable.ts
@@ -0,0 +1,12 @@
+/**
+ * Enables lazy JIT compilation globally through a side-effect import.
+ * Import before the first use of schemas, including construction. Previously
+ * captured parsers remain usable but are not replaced. If dynamic function
+ * construction is blocked or compilation fails, parsing uses the interpreter.
+ *
+ * @since 4.0.0
+ */
+import { install } from "../../../internal/schema/compilerRegistry.ts"
+import { compiler } from "../SchemaJITCompiler.ts"
+
+install(compiler)
diff --git a/repos/effect/packages/effect/src/unstable/schema/VariantSchema.ts b/repos/effect/packages/effect/src/unstable/schema/VariantSchema.ts
index 895a17ef6..622e32b2e 100644
--- a/repos/effect/packages/effect/src/unstable/schema/VariantSchema.ts
+++ b/repos/effect/packages/effect/src/unstable/schema/VariantSchema.ts
@@ -217,6 +217,9 @@ const extract: {
       readonly isDefault?: boolean | undefined
     }
   ): Extract<V, A> => {
+    if (options?.isDefault === true && Schema.isSchema(self)) {
+      return self as any
+    }
     const cache = options?.isDefault === true
       ? self[defaultCacheSymbol] ?? (self[defaultCacheSymbol] = Object.create(null))
       : self[cacheSymbol] ?? (self[cacheSymbol] = Object.create(null))
diff --git a/repos/effect/packages/effect/src/unstable/schema/index.ts b/repos/effect/packages/effect/src/unstable/schema/index.ts
index af8486da1..6639e3f7d 100644
--- a/repos/effect/packages/effect/src/unstable/schema/index.ts
+++ b/repos/effect/packages/effect/src/unstable/schema/index.ts
@@ -9,6 +9,21 @@
  */
 export * as Model from "./Model.ts"
 
+/**
+ * @since 4.0.0
+ */
+export * as SchemaAOTCompiler from "./SchemaAOTCompiler.ts"
+
+/**
+ * @since 4.0.0
+ */
+export * as SchemaCompiler from "./SchemaCompiler.ts"
+
+/**
+ * @since 4.0.0
+ */
+export * as SchemaJITCompiler from "./SchemaJITCompiler.ts"
+
 /**
  * @since 4.0.0
  */
diff --git a/repos/effect/packages/effect/src/unstable/socket/Socket.ts b/repos/effect/packages/effect/src/unstable/socket/Socket.ts
index 2a85f8608..387c1d83e 100644
--- a/repos/effect/packages/effect/src/unstable/socket/Socket.ts
+++ b/repos/effect/packages/effect/src/unstable/socket/Socket.ts
@@ -23,7 +23,6 @@ import * as Layer from "../../Layer.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Pull from "../../Pull.ts"
 import type * as Redacted from "../../Redacted.ts"
-import * as Scheduler from "../../Scheduler.ts"
 import * as Schema from "../../Schema.ts"
 import * as Scope from "../../Scope.ts"
 import * as Stream from "../../Stream.ts"
@@ -863,7 +862,6 @@ export const fromWebSocket = <RO, WS extends WebSocketLike>(
 
     const reader: Socket["reader"] = Effect.gen(function*() {
       const scope = yield* Effect.scope
-      const dispatcher = (yield* Scheduler.Scheduler).makeDispatcher()
       const ws = yield* Scope.provide(acquire, scope)
       if ("binaryType" in ws) {
         ;(ws as { binaryType: string }).binaryType = "arraybuffer"
@@ -876,7 +874,7 @@ export const fromWebSocket = <RO, WS extends WebSocketLike>(
       ) => void
 
       let open = ws.readyState === 1
-      let paused = false
+      let paused = pausable && "isPaused" in ws && ws.isPaused === true
       let buffer: Array<Uint8Array | string> = []
       let bufferSize = 0
       let error: SocketError | undefined
@@ -887,7 +885,6 @@ export const fromWebSocket = <RO, WS extends WebSocketLike>(
           readonly cleanup: () => void
         }
         | undefined
-      let flushScheduled = false
 
       function pauseWebSocket() {
         if (!pausable || paused) return
@@ -910,7 +907,6 @@ export const fromWebSocket = <RO, WS extends WebSocketLike>(
       }
 
       function deliver() {
-        flushScheduled = false
         if (waiter === undefined || buffer.length === 0) return
         const resume = waiter
         waiter = undefined
@@ -919,13 +915,10 @@ export const fromWebSocket = <RO, WS extends WebSocketLike>(
 
       function push(data: Uint8Array | string) {
         buffer.push(data)
-        bufferSize += typeof data === "string" ? data.length : data.byteLength
-        if (waiter !== undefined) {
-          if (!flushScheduled) {
-            flushScheduled = true
-            dispatcher.scheduleTask(deliver, 0)
-          }
+        if (highWaterMark !== undefined) {
+          bufferSize += typeof data === "string" ? encoder.encode(data).byteLength : data.byteLength
         }
+        if (waiter !== undefined) deliver()
         if (pausable && bufferSize >= highWaterMark!) {
           pauseWebSocket()
         } else if (!pausable && !waiter && highWaterMark !== undefined && bufferSize > highWaterMark) {
@@ -1038,6 +1031,7 @@ export const fromWebSocket = <RO, WS extends WebSocketLike>(
         open = true
       }
 
+      if (error === undefined && bufferSize < highWaterMark!) resumeWebSocket()
       currentWS = ws
       latch.openUnsafe()
 
diff --git a/repos/effect/packages/effect/src/unstable/socket/SocketServer.ts b/repos/effect/packages/effect/src/unstable/socket/SocketServer.ts
index ea4a39ec6..75f966eb7 100644
--- a/repos/effect/packages/effect/src/unstable/socket/SocketServer.ts
+++ b/repos/effect/packages/effect/src/unstable/socket/SocketServer.ts
@@ -3,15 +3,16 @@
  *
  * `SocketServer` exposes the bound server `address` and a long-running `run`
  * loop that hands each accepted connection to a handler as a `Socket.Socket`.
- * The module also defines TCP and Unix socket address models plus the
- * server-level errors reported while opening or running a server. Platform
- * layers provide concrete implementations of this service.
+ * Bound addresses use the shared `NetAddress.SocketAddress` model. This module also
+ * defines server-level errors reported while opening or running a server.
+ * Platform layers provide concrete implementations of this service.
  *
  * @since 4.0.0
  */
 import * as Context from "../../Context.ts"
 import * as Data from "../../Data.ts"
 import type * as Effect from "../../Effect.ts"
+import type * as NetAddress from "../net/NetAddress.ts"
 import type * as Socket from "./Socket.ts"
 
 /**
@@ -22,7 +23,7 @@ import type * as Socket from "./Socket.ts"
  * @since 4.0.0
  */
 export class SocketServer extends Context.Service<SocketServer, {
-  readonly address: Address
+  readonly address: NetAddress.SocketAddress
   readonly run: <R, E, _>(
     handler: (socket: Socket.Socket) => Effect.Effect<_, E, R>
   ) => Effect.Effect<never, SocketServerError, R>
@@ -114,34 +115,3 @@ export class SocketServerError extends Data.TaggedError("SocketServerError")<{
     return this.reason.message
   }
 }
-
-/**
- * Socket server address, either a TCP host and port or a Unix socket path.
- *
- * @category models
- * @since 4.0.0
- */
-export type Address = UnixAddress | TcpAddress
-
-/**
- * TCP socket server address with hostname and port.
- *
- * @category models
- * @since 4.0.0
- */
-export interface TcpAddress {
-  readonly _tag: "TcpAddress"
-  readonly hostname: string
-  readonly port: number
-}
-
-/**
- * Unix socket server address identified by a filesystem path.
- *
- * @category models
- * @since 4.0.0
- */
-export interface UnixAddress {
-  readonly _tag: "UnixAddress"
-  readonly path: string
-}
diff --git a/repos/effect/packages/effect/src/unstable/sql/Migrator.ts b/repos/effect/packages/effect/src/unstable/sql/Migrator.ts
index 2bf15e682..8b5c4dee2 100644
--- a/repos/effect/packages/effect/src/unstable/sql/Migrator.ts
+++ b/repos/effect/packages/effect/src/unstable/sql/Migrator.ts
@@ -195,7 +195,7 @@ export const make = <RD = never>({
               )
           ),
           Effect.filterOrFail(
-            Effect.isEffect,
+            (_): _ is Effect.Effect<any, any, Client.SqlClient> => Effect.isEffect(_),
             () =>
               new MigrationError({
                 kind: "ImportError",
diff --git a/repos/effect/packages/effect/src/unstable/sql/SqlClient.ts b/repos/effect/packages/effect/src/unstable/sql/SqlClient.ts
index 6682f69b4..95d6bc685 100644
--- a/repos/effect/packages/effect/src/unstable/sql/SqlClient.ts
+++ b/repos/effect/packages/effect/src/unstable/sql/SqlClient.ts
@@ -138,6 +138,12 @@ export declare namespace SqlClient {
     readonly rollback?: string | undefined
     readonly commit?: string | undefined
     readonly savepoint?: ((name: string) => string) | undefined
+    /**
+     * SQL to release a nested savepoint after success or a successful rollback.
+     * Omit to leave savepoints unreleased, including for dialects such as MSSQL
+     * that do not support releasing savepoints.
+     */
+    readonly releaseSavepoint?: ((name: string) => string) | undefined
     readonly rollbackSavepoint?: ((name: string) => string) | undefined
     readonly transformRows?: (<A extends object>(row: ReadonlyArray<A>) => ReadonlyArray<A>) | undefined
     readonly reactiveQueue?: <A, E, R>(
@@ -171,6 +177,7 @@ export const make = Effect.fnUntraced(function*(options: SqlClient.MakeOptions)
   const beginTransaction = options.beginTransaction ?? "BEGIN"
   const commit = options.commit ?? "COMMIT"
   const savepoint = options.savepoint ?? ((name: string) => `SAVEPOINT ${name}`)
+  const releaseSavepoint = options.releaseSavepoint
   const rollback = options.rollback ?? "ROLLBACK"
   const rollbackSavepoint = options.rollbackSavepoint ?? ((name: string) => `ROLLBACK TO SAVEPOINT ${name}`)
   const transactionAcquirer = options.transactionAcquirer ?? options.acquirer
@@ -186,6 +193,9 @@ export const make = Effect.fnUntraced(function*(options: SqlClient.MakeOptions)
     ),
     begin: (conn) => control(conn, beginTransaction),
     savepoint: (conn, id) => control(conn, savepoint(`effect_sql_${id}`)),
+    releaseSavepoint: releaseSavepoint
+      ? (conn, id) => control(conn, releaseSavepoint(`effect_sql_${id}`))
+      : undefined,
     commit: (conn) => control(conn, commit),
     rollback: (conn) => control(conn, rollback),
     rollbackSavepoint: (conn, id) => control(conn, rollbackSavepoint(`effect_sql_${id}`))
@@ -251,7 +261,8 @@ export const make = Effect.fnUntraced(function*(options: SqlClient.MakeOptions)
 /**
  * Builds a transaction wrapper that begins top-level transactions, uses
  * savepoints for nested transactions, commits on success, and rolls back on
- * failure or interruption.
+ * failure or interruption. Releases nested savepoints when `releaseSavepoint`
+ * is provided.
  *
  * @category transactions
  * @since 4.0.0
@@ -262,6 +273,12 @@ export const makeWithTransaction = <I, S>(options: {
   readonly acquireConnection: Effect.Effect<readonly [Scope.Closeable | undefined, S], SqlError>
   readonly begin: (conn: NoInfer<S>) => Effect.Effect<void, SqlError>
   readonly savepoint: (conn: NoInfer<S>, id: number) => Effect.Effect<void, SqlError>
+  /**
+   * Releases a nested savepoint after success or a successful rollback.
+   * Omit to leave savepoints unreleased, including for dialects such as MSSQL
+   * that do not support releasing savepoints.
+   */
+  readonly releaseSavepoint?: ((conn: NoInfer<S>, id: number) => Effect.Effect<void, SqlError>) | undefined
   readonly commit: (conn: NoInfer<S>) => Effect.Effect<void, SqlError>
   readonly rollback: (conn: NoInfer<S>) => Effect.Effect<void, SqlError>
   readonly rollbackSavepoint: (conn: NoInfer<S>, id: number) => Effect.Effect<void, SqlError>
@@ -320,6 +337,9 @@ export const makeWithTransaction = <I, S>(options: {
                               : options.rollback(conn)
                           )
                         }
+                        if (id > 0 && options.releaseSavepoint) {
+                          effect = Effect.andThen(effect, Effect.orDie(options.releaseSavepoint(conn, id)))
+                        }
                         return Effect.flatMap(effect, () => exit)
                       },
                       true
diff --git a/repos/effect/packages/effect/src/unstable/sql/SqlModel.ts b/repos/effect/packages/effect/src/unstable/sql/SqlModel.ts
index e8007e51f..b8ea0796a 100644
--- a/repos/effect/packages/effect/src/unstable/sql/SqlModel.ts
+++ b/repos/effect/packages/effect/src/unstable/sql/SqlModel.ts
@@ -246,7 +246,7 @@ export const makeResolvers = <
         S["insert"]["Type"],
         S["Type"],
         ResultLengthMismatch | SqlError,
-        S["insert"]["EncodingServices"]
+        S["DecodingServices"] | S["insert"]["EncodingServices"]
       >
     >
     readonly insertVoid: RequestResolver.RequestResolver<
diff --git a/repos/effect/packages/effect/src/unstable/sql/Statement.ts b/repos/effect/packages/effect/src/unstable/sql/Statement.ts
index ab71525ff..7583dbae9 100644
--- a/repos/effect/packages/effect/src/unstable/sql/Statement.ts
+++ b/repos/effect/packages/effect/src/unstable/sql/Statement.ts
@@ -21,7 +21,7 @@ import * as InternalRecord from "../../internal/record.ts"
 import { hasProperty } from "../../Predicate.ts"
 import { TracerTimingEnabled } from "../../References.ts"
 import * as Stream from "../../Stream.ts"
-import type * as Tracer from "../../Tracer.ts"
+import * as Tracer from "../../Tracer.ts"
 import type { Acquirer, Borrower, Connection, Row } from "./SqlConnection.ts"
 import type { SqlError } from "./SqlError.ts"
 
@@ -106,6 +106,17 @@ export const CurrentTransformer = Context.Reference<Transformer | undefined>("ef
   defaultValue: constUndefined
 })
 
+/**
+ * Parents driver spans under `sql.execute` for every client in the current scope,
+ * including acquisition and stream pulls. Defaults to `false`; ignored when tracing is disabled.
+ *
+ * @category services
+ * @since 4.0.0
+ */
+export const SpanPropagationEnabled = Context.Reference<boolean>("effect/sql/SpanPropagationEnabled", {
+  defaultValue: () => false
+})
+
 /**
  * Returns `true` when a value is a SQL `Fragment`.
  *
@@ -256,7 +267,7 @@ const RecordInsertHelperProto = {
   returning(this: RecordInsertHelper, sql: string | Identifier | Fragment) {
     const self = Object.create(Object.getPrototypeOf(this))
     Object.assign(self, this, {
-      returningIdentifier: sql
+      returningIdentifier: typeof sql === "string" || isFragment(sql) ? sql : fragment([sql])
     })
     return self
   }
@@ -833,7 +844,7 @@ const CompilerProto = {
     withoutTransform = withoutTransform || this.disableTransforms
     const cache = withoutTransform ? this.statementCacheNoTransform : this.statementCache
     const cached = cache.get(statement)
-    if (cached !== undefined) {
+    if (cached !== undefined && placeholderOverride === undefined) {
       return cached
     }
 
@@ -1300,20 +1311,19 @@ const StatementProto: Omit<
     withoutTransform: boolean,
     span: Tracer.Span
   ): Effect.Effect<XA, E | SqlError> {
-    return withStatement(this, span, (statement) => {
+    return withStatement(this, span, (statement, fiber) => {
       const [sql, params] = statement.compile(withoutTransform)
       for (const [key, value] of this.spanAttributes) {
         span.attribute(key, value)
       }
       span.attribute(ATTR_DB_OPERATION_NAME, operation)
       span.attribute(ATTR_DB_QUERY_TEXT, sql)
-      // A client that can lend a connection for the duration of one effect
-      // saves the scope and the finalizer that borrowing through the acquirer
-      // needs. `stream` keeps the acquirer, because its lease has to outlive
-      // the effect that starts it.
-      return this.borrower === undefined
+      const execute = this.borrower === undefined
         ? Effect.scoped(Effect.flatMap(this.acquirer, (_) => f(_, sql, params)))
         : this.borrower((connection: Connection) => f(connection, sql, params))
+      return fiber.cache.tracerEnabled && fiber.getRef(SpanPropagationEnabled)
+        ? Effect.provideService(execute, Tracer.ParentSpan, span)
+        : execute
     })
   },
 
@@ -1338,14 +1348,17 @@ const StatementProto: Omit<
     return Stream.unwrap(Effect.flatMap(
       Effect.makeSpanScoped("sql.execute", { kind: "client" }),
       (span) =>
-        withStatement(self, span, (statement) => {
+        withStatement(self, span, (statement, fiber) => {
           const [sql, params] = statement.compile()
           for (const [key, value] of self.spanAttributes) {
             span.attribute(key, value)
           }
           span.attribute(ATTR_DB_OPERATION_NAME, "executeStream")
           span.attribute(ATTR_DB_QUERY_TEXT, sql)
-          return Effect.map(self.acquirer, (_) => _.executeStream(sql, params, self.transformRows))
+          const acquire = Effect.map(self.acquirer, (_) => _.executeStream(sql, params, self.transformRows))
+          return fiber.cache.tracerEnabled && fiber.getRef(SpanPropagationEnabled)
+            ? Effect.succeed(Stream.provideService(Stream.unwrap(acquire), Tracer.ParentSpan, span))
+            : acquire
         })
     ))
   },
@@ -1413,21 +1426,21 @@ const StatementProto: Omit<
 const withStatement = <A, X, E, R>(
   self: StatementImpl<A>,
   span: Tracer.Span,
-  f: (statement: StatementImpl<A>) => Effect.Effect<X, E, R>
+  f: (statement: StatementImpl<A>, fiber: Fiber.Fiber<unknown, unknown>) => Effect.Effect<X, E, R>
 ) =>
   Effect.withFiber<X, E, R>((fiber) => {
     const transform = fiber.getRef(CurrentTransformer)
     if (transform === undefined) {
-      return f(self)
+      return f(self, fiber)
     }
     return Effect.flatMap(
       transform(
         self,
-        make(self.acquirer, self.compiler, self.spanAttributes, self.transformRows),
+        make(self.acquirer, self.compiler, self.spanAttributes, self.transformRows, self.borrower),
         fiber,
         span
       ) as Effect.Effect<StatementImpl<A>>,
-      f
+      (statement) => f(statement, fiber)
     )
   })
 
diff --git a/repos/effect/packages/effect/src/unstable/workers/Transferable.ts b/repos/effect/packages/effect/src/unstable/workers/Transferable.ts
index 804d27bfe..55348398f 100644
--- a/repos/effect/packages/effect/src/unstable/workers/Transferable.ts
+++ b/repos/effect/packages/effect/src/unstable/workers/Transferable.ts
@@ -98,7 +98,7 @@ export const addAll = (
 export const getterAddAll = <A>(
   f: (_: A) => Iterable<globalThis.Transferable>
 ): SchemaGetter.Getter<A, A> =>
-  SchemaGetter.transformOrFail((e: A) =>
+  SchemaGetter.transformEffect((e: A) =>
     Effect.contextWith((services) => {
       const collector = Context.getOrUndefined(services, Collector)
       if (!collector) return Effect.succeed(e)
diff --git a/repos/effect/packages/effect/src/unstable/workers/Worker.ts b/repos/effect/packages/effect/src/unstable/workers/Worker.ts
index c96b65863..9ce12e19c 100644
--- a/repos/effect/packages/effect/src/unstable/workers/Worker.ts
+++ b/repos/effect/packages/effect/src/unstable/workers/Worker.ts
@@ -216,7 +216,9 @@ export const makePlatform = <W>() =>
                   },
                   deferred: fiberSet.deferred as any
                 })
-                yield* ready.await
+                // Fail fast if the worker dies before signalling readiness,
+                // and allow interruption while waiting for the handshake.
+                yield* restore(Effect.raceFirst(ready.await, FiberSet.join(fiberSet)))
                 currentPort = port
                 if (buffer.length > 0) {
                   for (const [message, transfers] of buffer) {
diff --git a/repos/effect/packages/effect/src/unstable/workflow/Activity.ts b/repos/effect/packages/effect/src/unstable/workflow/Activity.ts
index 1692d7f02..86b2c7257 100644
--- a/repos/effect/packages/effect/src/unstable/workflow/Activity.ts
+++ b/repos/effect/packages/effect/src/unstable/workflow/Activity.ts
@@ -117,6 +117,13 @@ export interface AnyWithProps {
  * Creates a workflow activity from an effect, using the provided schemas to
  * encode successes and failures for durable execution.
  *
+ * **Gotchas**
+ *
+ * Only completed activity results are memoized. If the activity suspends while
+ * awaiting child workflows or a durable clock, its body runs again when the
+ * parent workflow replays. Side effects before the suspension can repeat;
+ * make those side effects idempotent.
+ *
  * @category constructors
  * @since 4.0.0
  */
@@ -190,15 +197,19 @@ const retryOnInterrupt = (
   name: string,
   policy: Schedule.Schedule<any, Cause.Cause<unknown>> = interruptRetryPolicy
 ) =>
-<A, E, R>(effect: Effect.Effect<A, E, R>): Effect.Effect<A, E, R> =>
-  effect.pipe(
-    Effect.sandbox,
-    Effect.retry(policy),
-    Effect.catch((cause) => {
-      if (!Cause.hasInterrupts(cause)) return Effect.failCause(cause)
-      return Effect.die(`Activity "${name}" interrupted and retry attempts exhausted`)
-    })
-  )
+<A, E, R>(effect: Effect.Effect<A, E, R>): Effect.Effect<A, E, R | WorkflowInstance> =>
+  Effect.flatMap(InstanceTag, (instance) =>
+    effect.pipe(
+      Effect.sandbox,
+      // A suspension interrupts the activity body on purpose and must surface
+      // as a suspended result instead of being retried.
+      Effect.retry({ schedule: policy, while: () => !instance.suspended }),
+      Effect.catch((cause) =>
+        Cause.hasInterrupts(cause) && !instance.suspended
+          ? Effect.die(`Activity "${name}" interrupted and retry attempts exhausted`)
+          : Effect.failCause(cause)
+      )
+    ))
 
 /**
  * Retries an effect with `Effect.retry` while updating `CurrentAttempt` for
diff --git a/repos/effect/packages/effect/src/unstable/workflow/DurableClock.ts b/repos/effect/packages/effect/src/unstable/workflow/DurableClock.ts
index 7029c863c..60ea712d6 100644
--- a/repos/effect/packages/effect/src/unstable/workflow/DurableClock.ts
+++ b/repos/effect/packages/effect/src/unstable/workflow/DurableClock.ts
@@ -93,7 +93,7 @@ export const sleep: (
     return
   }
 
-  const inMemoryThreshold = options.inMemoryThreshold
+  const inMemoryThreshold = options.inMemoryThreshold !== undefined
     ? Duration.fromInputUnsafe(options.inMemoryThreshold)
     : defaultInMemoryThreshold
 
diff --git a/repos/effect/packages/effect/src/unstable/workflow/DurableDeferred.ts b/repos/effect/packages/effect/src/unstable/workflow/DurableDeferred.ts
index b6fad5e74..6ee7cc1e8 100644
--- a/repos/effect/packages/effect/src/unstable/workflow/DurableDeferred.ts
+++ b/repos/effect/packages/effect/src/unstable/workflow/DurableDeferred.ts
@@ -187,6 +187,8 @@ export const into: {
     | WorkflowInstance
     | Success["DecodingServices"]
     | Error["DecodingServices"]
+    | Success["EncodingServices"]
+    | Error["EncodingServices"]
   >
   <Success extends Schema.Constraint, Error extends Schema.Constraint, R>(
     effect: Effect.Effect<Success["Type"], Error["Type"], R>,
@@ -199,6 +201,8 @@ export const into: {
     | WorkflowInstance
     | Success["DecodingServices"]
     | Error["DecodingServices"]
+    | Success["EncodingServices"]
+    | Error["EncodingServices"]
   >
 } = dual(
   2,
@@ -213,6 +217,8 @@ export const into: {
     | WorkflowInstance
     | Success["DecodingServices"]
     | Error["DecodingServices"]
+    | Success["EncodingServices"]
+    | Error["EncodingServices"]
   > =>
     Effect.contextWith(
       (context: Context.Context<WorkflowEngine | WorkflowInstance>) => {
diff --git a/repos/effect/packages/effect/src/unstable/workflow/Workflow.ts b/repos/effect/packages/effect/src/unstable/workflow/Workflow.ts
index 35474ee01..475c1b1d5 100644
--- a/repos/effect/packages/effect/src/unstable/workflow/Workflow.ts
+++ b/repos/effect/packages/effect/src/unstable/workflow/Workflow.ts
@@ -347,7 +347,7 @@ const Proto = {
   ) {
     return Effect.suspend(() => {
       const payload = this.payloadSchema.make(fields)
-      return Effect.flatMap(
+      const run = Effect.flatMap(
         EngineTag,
         (engine) =>
           Effect.flatMap(makeExecutionIdFromPayload(this, payload), (executionId) =>
@@ -361,6 +361,9 @@ const Proto = {
               })
             ))
       )
+      // Register with the parent before the execution id is computed, so a
+      // sibling that suspends first waits for this child to be dispatched.
+      return opts?.discard ? run : withPendingActivity(run)
     }).pipe(
       Effect.withSpan(
         `${this._tag}.execute`,
@@ -734,28 +737,82 @@ export const wrapActivityResult = <A, E, R>(
 ): Effect.Effect<A, E, R | WorkflowInstance> =>
   Effect.contextWith((context: Context.Context<WorkflowInstance>) => {
     const instance = Context.get(context, InstanceTag)
-    const state = instance.activityState
-    if (state.count === 0) state.latch.closeUnsafe()
-    state.count++
-    return Effect.onExit(effect, (exit) => {
-      state.count--
-      const isSuspended = Exit.isSuccess(exit) && isSuspend(exit.value)
-      if (
-        Exit.isSuccess(exit) &&
-        isResult(exit.value) &&
-        exit.value._tag === "Suspended" &&
-        exit.value.cause
-      ) {
-        instance.cause = instance.cause
-          ? Cause.combine(instance.cause, exit.value.cause)
-          : exit.value.cause
+    return Effect.acquireUseRelease(
+      Effect.sync(() => adoptActivityUnsafe(context, instance) ?? registerActivityUnsafe(instance)),
+      () => effect,
+      (registration, exit) => {
+        releaseActivityUnsafe(registration)
+        const isSuspended = Exit.isSuccess(exit) && isSuspend(exit.value)
+        if (
+          Exit.isSuccess(exit) &&
+          isResult(exit.value) &&
+          exit.value._tag === "Suspended" &&
+          exit.value.cause
+        ) {
+          instance.cause = instance.cause
+            ? Cause.combine(instance.cause, exit.value.cause)
+            : exit.value.cause
+        }
+        return isSuspended && instance.activityState.count > 0
+          ? waitForZero(instance)
+          : Effect.void
       }
-      return state.count === 0
-        ? state.latch.open
-        : isSuspended
-        ? waitForZero(instance)
-        : Effect.void
-    })
+    )
+  })
+
+interface ActivityRegistration {
+  readonly instance: WorkflowInstance["Service"]
+  state: "pending" | "adopted" | "released"
+}
+
+const PendingActivityRegistration = Context.Service<ActivityRegistration>(
+  "effect/workflow/Workflow/PendingActivityRegistration"
+)
+
+const registerActivityUnsafe = (instance: WorkflowInstance["Service"]): ActivityRegistration => {
+  const state = instance.activityState
+  if (state.count === 0) state.latch.closeUnsafe()
+  state.count++
+  return { instance, state: "pending" }
+}
+
+const adoptActivityUnsafe = (
+  context: Context.Context<never>,
+  instance: WorkflowInstance["Service"]
+): ActivityRegistration | undefined => {
+  const pending = Context.getOrUndefined(context, PendingActivityRegistration)
+  if (!pending || pending.instance !== instance) {
+    return undefined
+  }
+  if (pending.state !== "pending") {
+    throw new Error("Workflow.wrapActivityResult: pending child registration has already been consumed")
+  }
+  pending.state = "adopted"
+  return pending
+}
+
+const releaseActivityUnsafe = (registration: ActivityRegistration) => {
+  if (registration.state === "released") return
+  registration.state = "released"
+  const state = registration.instance.activityState
+  state.count--
+  if (state.count === 0) state.latch.openUnsafe()
+}
+
+/**
+ * Registers a pending child workflow execution with the current workflow
+ * instance before any asynchronous work runs. `wrapActivityResult` adopts the
+ * registration once the execution is dispatched.
+ */
+const withPendingActivity = <A, E, R>(effect: Effect.Effect<A, E, R>): Effect.Effect<A, E, R> =>
+  Effect.contextWith((context: Context.Context<never>) => {
+    const instance = Context.getOrUndefined(context, InstanceTag)
+    if (!instance) return effect
+    return Effect.acquireUseRelease(
+      Effect.sync(() => registerActivityUnsafe(instance)),
+      (registration) => Effect.provideService(effect, PendingActivityRegistration, registration),
+      (registration) => Effect.sync(() => releaseActivityUnsafe(registration))
+    )
   })
 
 const waitForZero = Effect.fnUntraced(function*(instance: WorkflowInstance["Service"]) {
diff --git a/repos/effect/packages/effect/src/unstable/workflow/WorkflowEngine.ts b/repos/effect/packages/effect/src/unstable/workflow/WorkflowEngine.ts
index 6ccfaa826..2d86261be 100644
--- a/repos/effect/packages/effect/src/unstable/workflow/WorkflowEngine.ts
+++ b/repos/effect/packages/effect/src/unstable/workflow/WorkflowEngine.ts
@@ -300,29 +300,22 @@ export class WorkflowInstance extends Context.Service<
 }
 
 /**
- * In-process deferred state for live workflow executions.
+ * Tracks live workflow runs so deferred completions can wake them.
  *
  * @category models
  * @since 4.0.0
  */
 export interface DeferredState {
-  /** Returns a completion not yet durably readable. */
-  readonly pendingResult: (
-    executionId: string,
-    name: string
-  ) => Exit.Exit<unknown, unknown> | undefined
-
-  /** Tracks and provides a run, retaining pending results across suspension. */
+  /** Tracks and provides a run until it completes or suspends. */
   readonly trackRun: <A, E, R>(
     instance: WorkflowInstance["Service"],
     effect: Effect.Effect<A, E, R>
   ) => Effect.Effect<A, E, Exclude<R, WorkflowInstance>>
 
-  /** Records a completion, preempting a run parked on that deferred. */
+  /** Preempts a run parked on the completed deferred. */
   readonly deferredDone: (
     executionId: string,
-    name: string,
-    exit: Exit.Exit<unknown, unknown>
+    name: string
   ) => Effect.Effect<void>
 }
 
@@ -333,13 +326,11 @@ export interface DeferredState {
  * @since 4.0.0
  */
 export const makeDeferredState = (): DeferredState => {
-  const pending = new Map<string, Map<string, Exit.Exit<unknown, unknown>>>()
   const running = new Map<string, {
     readonly instance: WorkflowInstance["Service"]
     readonly fiber: Fiber.Fiber<unknown, unknown>
   }>()
   return {
-    pendingResult: (executionId, name) => pending.get(executionId)?.get(name),
     trackRun: (instance, effect) =>
       Effect.withFiber((fiber) => {
         const run = { instance, fiber: fiber as Fiber.Fiber<unknown, unknown> }
@@ -347,25 +338,15 @@ export const makeDeferredState = (): DeferredState => {
         return Effect.ensuring(
           Effect.provideService(effect, WorkflowInstance, instance),
           Effect.sync(() => {
-            if (!instance.suspended) {
-              pending.delete(instance.executionId)
-            }
-            if (running.get(instance.executionId) === run) {
-              running.delete(instance.executionId)
-            }
+            if (running.get(instance.executionId) !== run) return
+            running.delete(instance.executionId)
           })
         )
       }),
-    deferredDone: (executionId, name, exit) =>
+    deferredDone: (executionId, name) =>
       Effect.withFiber((current) => {
         const run = running.get(executionId)
         if (!run) return Effect.void
-        let entries = pending.get(executionId)
-        if (!entries) {
-          entries = new Map()
-          pending.set(executionId, entries)
-        }
-        entries.set(name, exit)
         if (
           run.fiber === current ||
           run.fiber.pollUnsafe() ||
@@ -373,8 +354,8 @@ export const makeDeferredState = (): DeferredState => {
         ) {
           return Effect.void
         }
-        // Suspended retains the pending result; the engine re-runs the
-        // interrupted run and the replay observes the completion.
+        // The engine stores the completion before waking this run. Replay
+        // observes it after the interrupted run reports suspension.
         run.instance.suspended = true
         return Fiber.interrupt(run.fiber)
       })
@@ -690,6 +671,7 @@ export const layerMemory: Layer.Layer<WorkflowEngine> = Layer.effect(WorkflowEng
       readonly parent: string | undefined
       instance: WorkflowInstance["Service"]
       interrupted: boolean
+      resumeRequested: boolean
       fiber: Fiber.Fiber<Workflow.Result<unknown, unknown>> | undefined
     }
     const executions = new Map<string, ExecutionState>()
@@ -708,6 +690,18 @@ export const layerMemory: Layer.Layer<WorkflowEngine> = Layer.effect(WorkflowEng
       if (exit && exit._tag === "Success" && exit.value._tag === "Complete") {
         return
       } else if (state.fiber && !exit) {
+        // A child can finish while the parent is still releasing its activity.
+        // Preserve the wake until that run has published its suspended result.
+        if (!state.resumeRequested) {
+          state.resumeRequested = true
+          yield* Fiber.await(state.fiber).pipe(
+            Effect.flatMap(() => {
+              state.resumeRequested = false
+              return resume(executionId)
+            }),
+            Effect.forkIn(scope)
+          )
+        }
         return
       }
 
@@ -765,6 +759,7 @@ export const layerMemory: Layer.Layer<WorkflowEngine> = Layer.effect(WorkflowEng
             execute: entry.execute,
             instance: WorkflowInstance.initial(workflow, options.executionId),
             interrupted: false,
+            resumeRequested: false,
             fiber: undefined,
             parent: options.parent?.executionId
           }
@@ -848,10 +843,16 @@ export const layerMemory: Layer.Layer<WorkflowEngine> = Layer.effect(WorkflowEng
           const id = `${options.executionId}/${options.deferredName}`
           if (deferredResults.has(id)) return Effect.void
           deferredResults.set(id, options.exit)
-          return Effect.andThen(
-            deferredState.deferredDone(options.executionId, options.deferredName, options.exit),
+          const wake = Effect.andThen(
+            deferredState.deferredDone(options.executionId, options.deferredName),
             resume(options.executionId)
           )
+          return Effect.flatMap(Effect.serviceOption(WorkflowInstance), (instance) =>
+            // A workflow finalizer cannot wait for its own run's cleanup.
+            // The engine scope owns the wake so cleanup still precedes replay.
+            Option.isSome(instance) && instance.value.executionId === options.executionId
+              ? wake.pipe(Effect.forkIn(scope), Effect.asVoid)
+              : wake)
         }),
       scheduleClock: (workflow, options) =>
         engine.deferredDone(options.clock.deferred, {
diff --git a/repos/effect/packages/effect/test/Array.test.ts b/repos/effect/packages/effect/test/Array.test.ts
index c88ab00fb..cd38496f5 100644
--- a/repos/effect/packages/effect/test/Array.test.ts
+++ b/repos/effect/packages/effect/test/Array.test.ts
@@ -1,4 +1,4 @@
-import { describe, it } from "@effect/vitest"
+import { assert, describe, it } from "@effect/vitest"
 import { assertNone, assertSome, deepStrictEqual, strictEqual, throws } from "@effect/vitest/utils"
 import {
   Array as Arr,
@@ -32,6 +32,13 @@ class HashCollision implements Equal.Equal {
 }
 
 describe("Array", () => {
+  it("isCanonicalArrayIndex", () => {
+    assert.isTrue(Arr.isCanonicalArrayIndex("0"))
+    assert.isTrue(Arr.isCanonicalArrayIndex("4294967294"))
+    assert.isFalse(Arr.isCanonicalArrayIndex("01"))
+    assert.isFalse(Arr.isCanonicalArrayIndex("4294967295"))
+  })
+
   it("of", () => {
     deepStrictEqual(Arr.of(1), [1])
   })
diff --git a/repos/effect/packages/effect/test/ByteSize.test.ts b/repos/effect/packages/effect/test/ByteSize.test.ts
index 7e527471d..f9cb37909 100644
--- a/repos/effect/packages/effect/test/ByteSize.test.ts
+++ b/repos/effect/packages/effect/test/ByteSize.test.ts
@@ -14,6 +14,17 @@ import * as fc from "fast-check"
 const arb = fc.bigInt({ min: 0n, max: 10n ** 40n }).map(ByteSize.bytes)
 
 describe("ByteSize", () => {
+  it("decodes strict inputs and validates numeric values at runtime", () => {
+    deepStrictEqual(ByteSize.fromInputUnsafe("4MB"), ByteSize.megabytes(4))
+    assertSome(ByteSize.fromInput("100kB"), ByteSize.kilobytes(100))
+    assertSome(ByteSize.fromInput("2 mebibytes"), ByteSize.mebibytes(2))
+    assertSome(ByteSize.fromInput("0B"), ByteSize.zero)
+    for (const input of [-1, 0.5, NaN, Infinity, Number.MAX_SAFE_INTEGER + 1, -1n]) {
+      assertNone(ByteSize.fromInput(input))
+      throws(() => ByteSize.fromInputUnsafe(input))
+    }
+  })
+
   it("constructs exact decimal and binary units", () => {
     const decimal = [
       ByteSize.kilobytes,
@@ -70,7 +81,8 @@ describe("ByteSize", () => {
       ["  9007199254740993 B  ", 9_007_199_254_740_993n]
     ]
     for (const [input, expected] of cases) {
-      deepStrictEqual(ByteSize.fromInputUnsafe(input), ByteSize.bytes(expected))
+      deepStrictEqual(ByteSize.fromStringUnsafe(input), ByteSize.bytes(expected))
+      assertSome(ByteSize.fromString(input), ByteSize.bytes(expected))
     }
   })
 
@@ -91,17 +103,21 @@ describe("ByteSize", () => {
       "1 b",
       "1 MiB trailing"
     ]
-    for (const input of invalid) assertNone(ByteSize.fromInput(input))
+    for (const input of invalid) {
+      assertNone(ByteSize.fromString(input))
+      throws(() => ByteSize.fromStringUnsafe(input))
+    }
   })
 
-  it("has exact canonical serialization and value behavior", () => {
+  it("uses a branded bigint representation", () => {
     const value = ByteSize.bytes(9_007_199_254_740_993n)
-    strictEqual(String(value), "9007199254740993 bytes")
-    deepStrictEqual(value.toJSON(), { _id: "ByteSize", bytes: "9007199254740993" })
-    assertTrue(Equal.equals(value, ByteSize.fromInputUnsafe(String(value))))
-    strictEqual(Hash.hash(value), Hash.hash(ByteSize.bytes(value.value)))
+    strictEqual(typeof value, "bigint")
+    strictEqual(String(value), "9007199254740993")
+    assertTrue(Equal.equals(value, ByteSize.bytes(9_007_199_254_740_993n)))
+    strictEqual(Hash.hash(value), Hash.hash(9_007_199_254_740_993n))
     assertTrue(ByteSize.isByteSize(value))
-    assertFalse(ByteSize.isByteSize(value.value))
+    assertTrue(ByteSize.isByteSize(0n))
+    assertFalse(ByteSize.isByteSize(-1n))
   })
 
   it("converts to numbers only within the safe-integer range", () => {
@@ -140,14 +156,14 @@ describe("ByteSize", () => {
     strictEqual(ByteSize.format(ByteSize.bytes(1536), { system: "decimal" }), "1.54 kB")
     strictEqual(ByteSize.format(ByteSize.bytes(1500), { unit: "kB", precision: 3, trailingZeros: true }), "1.500 kB")
     strictEqual(ByteSize.format(ByteSize.mebibytes(1)), "1 MiB")
-    strictEqual(ByteSize.format(ByteSize.mebibytes(1).pipe(ByteSize.subtractUnsafe(ByteSize.bytes(1)))), "1 MiB")
+    strictEqual(ByteSize.format(ByteSize.subtractUnsafe(ByteSize.mebibytes(1), ByteSize.bytes(1))), "1 MiB")
     strictEqual(ByteSize.format(ByteSize.bytes(10n ** 35n), { system: "decimal" }), "100000 QB")
     throws(() => ByteSize.format(ByteSize.zero, { precision: 21 }))
   })
 
   it("roundtrips canonical strings", () => {
     fc.assert(fc.property(arb, (value) => {
-      deepStrictEqual(ByteSize.fromInputUnsafe(String(value)), value)
+      deepStrictEqual(ByteSize.fromStringUnsafe(`${value} B`), value)
     }))
   })
 
@@ -169,7 +185,7 @@ describe("ByteSize", () => {
 
   it("is total for arbitrary strings", () => {
     fc.assert(fc.property(fc.string(), (input) => {
-      ByteSize.fromInput(input)
+      ByteSize.fromString(input)
     }))
   })
 })
diff --git a/repos/effect/packages/effect/test/Cache.test.ts b/repos/effect/packages/effect/test/Cache.test.ts
index 376308b96..5c13a3977 100644
--- a/repos/effect/packages/effect/test/Cache.test.ts
+++ b/repos/effect/packages/effect/test/Cache.test.ts
@@ -1,6 +1,7 @@
 import { assert, describe, it } from "@effect/vitest"
 import { Cache, Context, Data, Deferred, Duration, Effect, Exit, Fiber, Latch, MutableHashMap, Option } from "effect"
 import { TestClock } from "effect/testing"
+import { Persistable, PersistedCache, Persistence } from "effect/unstable/persistence"
 
 describe("Cache", () => {
   describe("constructors", () => {
@@ -165,6 +166,20 @@ describe("Cache", () => {
 
   describe("basic operations", () => {
     describe("get", () => {
+      it.effect("does not retain synchronously interrupted lookups", () =>
+        Effect.gen(function*() {
+          let calls = 0
+          const cache = yield* Cache.make<string, number>({
+            capacity: 1,
+            lookup: () => Effect.suspend(() => ++calls > 1 ? Effect.succeed(42) : Effect.interrupt)
+          })
+
+          yield* Effect.exit(Cache.get(cache, "key"))
+          const second = yield* Effect.exit(Cache.get(cache, "key"))
+
+          assert.deepStrictEqual(second, Exit.succeed(42))
+        }))
+
       it.effect("cache hit - returns existing cached value", () =>
         Effect.gen(function*() {
           const { cache, lookupCount, setLookupResult } = yield* makeTestCache(10)
@@ -650,6 +665,39 @@ describe("Cache", () => {
     })
 
     describe("invalidateWhen", () => {
+      it.effect.each([Exit.succeed(1), Exit.fail("error")])(
+        "preserves a newer set value after an old lookup completes (%#)",
+        (exit) =>
+          Effect.gen(function*() {
+            const gate = yield* Deferred.make<number, string>()
+            const values: Array<number> = []
+            const cache = yield* Cache.make<string, number, string>({
+              capacity: 1,
+              lookup: () => Deferred.await(gate)
+            })
+            const lookup = yield* Cache.get(cache, "key").pipe(
+              Effect.exit,
+              Effect.forkChild({ startImmediately: true })
+            )
+            const invalidator = yield* Cache.invalidateWhen(cache, "key", (value) => {
+              values.push(value)
+              return value === 1
+            }).pipe(
+              Effect.forkChild({ startImmediately: true })
+            )
+
+            yield* Cache.set(cache, "key", 99)
+            yield* Deferred.done(gate, exit)
+            const original = yield* Fiber.join(lookup)
+            const invalidated = yield* Fiber.join(invalidator)
+
+            assert.deepStrictEqual(original, exit)
+            assert.deepStrictEqual(values, Exit.isSuccess(exit) ? [1] : [])
+            assert.isFalse(invalidated)
+            assert.deepStrictEqual(yield* Cache.getSuccess(cache, "key"), Option.some(99))
+          })
+      )
+
       it.effect("invalidates when predicate matches", () =>
         Effect.gen(function*() {
           const cache = yield* Cache.make<string, number>({
@@ -719,17 +767,113 @@ describe("Cache", () => {
           assert.strictEqual(result, 2)
         }))
 
-      it.effect("refresh non-existent key invokes lookup", () =>
+      it.effect("refresh non-existent key invokes lookup and enforces capacity", () =>
         Effect.gen(function*() {
           let counter = 0
           const cache = yield* Cache.make<string, number>({
-            capacity: 10,
+            capacity: 1,
             lookup: (_key) => Effect.sync(() => ++counter)
           })
 
+          yield* Cache.set(cache, "other", 99)
           const result = yield* Cache.refresh(cache, "test")
 
           assert.strictEqual(result, 1)
+          assert.strictEqual(yield* Cache.size(cache), 1)
+          assert.deepStrictEqual(Array.from(yield* Cache.keys(cache)), ["test"])
+        }))
+
+      it.effect("refresh enforces capacity when the existing key is evicted during lookup", () =>
+        Effect.gen(function*() {
+          const started = yield* Deferred.make<void>()
+          const result = yield* Deferred.make<number>()
+          const cache = yield* Cache.make<string, number>({
+            capacity: 1,
+            lookup: () => Deferred.succeed(started, void 0).pipe(Effect.andThen(Deferred.await(result)))
+          })
+
+          yield* Cache.set(cache, "a", 1)
+          const refresh = yield* Cache.refresh(cache, "a").pipe(Effect.forkChild({ startImmediately: true }))
+          yield* Deferred.await(started)
+          yield* Cache.set(cache, "b", 99)
+          assert.isFalse(yield* Cache.has(cache, "a"))
+
+          yield* Deferred.succeed(result, 2)
+          assert.strictEqual(yield* Fiber.join(refresh), 2)
+          assert.deepStrictEqual({
+            size: yield* Cache.size(cache),
+            keys: Array.from(yield* Cache.keys(cache)).sort()
+          }, { size: 1, keys: ["a"] })
+          assert.deepStrictEqual(yield* Cache.getSuccess(cache, "a"), Option.some(2))
+        }))
+
+      it.effect("repro: interrupting a missing-key refresh does not remove a newer set value", () =>
+        Effect.gen(function*() {
+          const lookupStarted = yield* Latch.make()
+          const cache = yield* Cache.make<string, number>({
+            capacity: 1,
+            lookup: () => lookupStarted.open.pipe(Effect.andThen(Effect.never))
+          })
+
+          const refresh = yield* Cache.refresh(cache, "key").pipe(Effect.forkChild({ startImmediately: true }))
+          yield* lookupStarted.await
+          yield* Cache.set(cache, "key", 99)
+          assert.deepStrictEqual(yield* Cache.getSuccess(cache, "key"), Option.some(99))
+
+          yield* Fiber.interrupt(refresh)
+
+          assert.deepStrictEqual(yield* Cache.getSuccess(cache, "key"), Option.some(99))
+        }))
+
+      it.effect("interrupting a missing-key refresh removes its pending entry", () =>
+        Effect.gen(function*() {
+          const lookupStarted = yield* Latch.make()
+          const cache = yield* Cache.make<string, number>({
+            capacity: 1,
+            lookup: () => lookupStarted.open.pipe(Effect.andThen(Effect.never))
+          })
+
+          const refresh = yield* Cache.refresh(cache, "key").pipe(Effect.forkChild({ startImmediately: true }))
+          yield* lookupStarted.await
+          assert.isTrue(yield* Cache.has(cache, "key"))
+
+          yield* Fiber.interrupt(refresh)
+
+          assert.isFalse(yield* Cache.has(cache, "key"))
+        }))
+
+      it.effect.each([false, true])(
+        "zero-TTL refresh with replacement (existing: %s)",
+        (existing) =>
+          Effect.gen(function*() {
+            const gate = yield* Deferred.make<number, string>()
+            const cache = yield* Cache.makeWith((_key: string) => Deferred.await(gate), {
+              capacity: 1,
+              timeToLive: (exit) => Exit.isFailure(exit) ? 0 : "1 hour"
+            })
+            if (existing) yield* Cache.set(cache, "key", 1)
+
+            const refresh = yield* Cache.refresh(cache, "key").pipe(Effect.forkChild({ startImmediately: true }))
+            yield* Cache.set(cache, "key", 99)
+            yield* Deferred.fail(gate, "error")
+
+            assert.deepStrictEqual(yield* Fiber.await(refresh), Exit.fail("error"))
+            assert.deepStrictEqual(
+              yield* Cache.getSuccess(cache, "key"),
+              existing ? Option.none() : Option.some(99)
+            )
+          })
+      )
+
+      it.effect("zero-TTL refresh removes its own entry", () =>
+        Effect.gen(function*() {
+          const cache = yield* Cache.makeWith((_key: string) => Effect.fail("error"), {
+            capacity: 1,
+            timeToLive: () => 0
+          })
+
+          assert.deepStrictEqual(yield* Effect.exit(Cache.refresh(cache, "key")), Exit.fail("error"))
+          assert.isFalse(yield* Cache.has(cache, "key"))
         }))
 
       it.effect("refresh updates TTL", () =>
@@ -1484,6 +1628,30 @@ describe("Cache", () => {
   })
 })
 
+describe("PersistedCache", () => {
+  it.effect("persists synchronous lookup defects", () =>
+    Effect.gen(function*() {
+      class LookupRequest extends Persistable.Class()("LookupRequest", {
+        primaryKey: () => "lookup"
+      }) {}
+
+      let calls = 0
+      const lookup = (_key: LookupRequest): Effect.Effect<void> => {
+        calls++
+        throw new Error("lookup defect")
+      }
+      const options = { storeId: "synchronous-lookup-defect", timeToLive: () => "1 hour" as const }
+      const key = new LookupRequest()
+
+      const cache = yield* PersistedCache.make(lookup, options)
+      yield* Effect.exit(cache.get(key))
+      const recreated = yield* PersistedCache.make(lookup, options)
+      yield* Effect.exit(recreated.get(key))
+
+      assert.strictEqual(calls, 1)
+    }).pipe(Effect.provide(Persistence.layerMemory)))
+})
+
 const makeTestCache = (capacity: number, ttl?: Duration.Input) =>
   Effect.gen(function*() {
     let lookupCount = 0
diff --git a/repos/effect/packages/effect/test/Cause.test.ts b/repos/effect/packages/effect/test/Cause.test.ts
index 89df74281..767d6471d 100644
--- a/repos/effect/packages/effect/test/Cause.test.ts
+++ b/repos/effect/packages/effect/test/Cause.test.ts
@@ -1,6 +1,8 @@
 import * as Cause from "effect/Cause"
 import * as Context from "effect/Context"
+import * as Equal from "effect/Equal"
 import { pipe } from "effect/Function"
+import * as Hash from "effect/Hash"
 import * as Option from "effect/Option"
 import * as Result from "effect/Result"
 import assert from "node:assert/strict"
@@ -494,6 +496,33 @@ describe("Cause", () => {
   })
 
   describe("combine", () => {
+    it("preserves unequal reasons with colliding hashes while removing duplicates", () => {
+      class Collision implements Equal.Equal {
+        constructor(readonly value: string) {}
+        [Hash.symbol](): number {
+          return 0
+        }
+        [Equal.symbol](that: Equal.Equal): boolean {
+          return that instanceof Collision && this.value === that.value
+        }
+      }
+
+      const first = Cause.makeFailReason(new Collision("first"))
+      const second = Cause.makeFailReason(new Collision("second"))
+      const duplicate = Cause.makeFailReason(new Collision("first"))
+      assert.strictEqual(Hash.hash(first), Hash.hash(second))
+      assert.strictEqual(Equal.equals(first, second), false)
+
+      const combined = Cause.combine(
+        Cause.fromReasons([first, second, first]),
+        Cause.fromReasons([duplicate, second])
+      )
+      assert.strictEqual(combined.reasons.length, 2)
+      assert.strictEqual(combined.reasons[0], first)
+      assert.strictEqual(combined.reasons[1], second)
+      assert.strictEqual(Cause.combine(combined, Cause.fromReasons([duplicate])), combined)
+    })
+
     it("merges two causes (data-first)", () => {
       const combined = Cause.combine(Cause.fail("a"), Cause.fail("b"))
       assert.strictEqual(combined.reasons.length, 2)
diff --git a/repos/effect/packages/effect/test/Channel.test.ts b/repos/effect/packages/effect/test/Channel.test.ts
index 9ce1bd6a1..130084d45 100644
--- a/repos/effect/packages/effect/test/Channel.test.ts
+++ b/repos/effect/packages/effect/test/Channel.test.ts
@@ -220,6 +220,16 @@ describe("Channel", () => {
   })
 
   describe("destructors", () => {
+    it.effect("runDrain returns the done value after emitted elements", () =>
+      Effect.gen(function*() {
+        const result = yield* Channel.fromArray([1]).pipe(
+          Channel.concat(Channel.end("done")),
+          Channel.runDrain
+        )
+
+        assert.strictEqual(result, "done")
+      }))
+
     it.effect("mkUint8Array", () =>
       Effect.gen(function*() {
         const bytes = yield* Channel.fromArray(
@@ -486,6 +496,22 @@ describe("Channel", () => {
       readonly message: string
     }> {}
 
+    it.effect("catchDefect", () =>
+      Effect.gen(function*() {
+        const defect = new Error("boom")
+        const recovered = yield* Channel.fromEffect(Effect.die(defect)).pipe(
+          Channel.catchDefect((caught) => Channel.succeed(caught)),
+          Channel.runCollect
+        )
+        const failed = yield* Channel.fail("failure").pipe(
+          Channel.catchDefect(() => Channel.succeed("recovered")),
+          Channel.runCollect,
+          Effect.exit
+        )
+        assert.deepStrictEqual(recovered, [defect])
+        assertExitFailure(failed, Cause.fail("failure"))
+      }))
+
     it.effect("catchIf with refinement", () =>
       Effect.gen(function*() {
         const exit = yield* (Channel.fail(new ValidationError({ field: "email" })) as Channel.Channel<
diff --git a/repos/effect/packages/effect/test/Chunk.test.ts b/repos/effect/packages/effect/test/Chunk.test.ts
index e8c3602ed..b1732a40f 100644
--- a/repos/effect/packages/effect/test/Chunk.test.ts
+++ b/repos/effect/packages/effect/test/Chunk.test.ts
@@ -537,6 +537,16 @@ describe("Chunk", () => {
   })
 
   describe("concat", () => {
+    it("preserves a sliced chunk when appending after a prefix", () => {
+      const chunk = pipe(
+        Chunk.make(2, 3, 4),
+        Chunk.take(2),
+        Chunk.prependAll(Chunk.of(1)),
+        Chunk.append(5)
+      )
+      deepStrictEqual(Chunk.toArray(chunk), [1, 2, 3, 5])
+    })
+
     describe("Given 2 chunks of the same length", () => {
       const chunk1 = Chunk.fromArrayUnsafe([0, 1])
       const chunk2 = Chunk.fromArrayUnsafe([2, 3])
diff --git a/repos/effect/packages/effect/test/Clock.test.ts b/repos/effect/packages/effect/test/Clock.test.ts
index 6ad6a30c8..eb1486d6e 100644
--- a/repos/effect/packages/effect/test/Clock.test.ts
+++ b/repos/effect/packages/effect/test/Clock.test.ts
@@ -1,7 +1,7 @@
 import { assert, describe, it, vi } from "@effect/vitest"
 import { Clock, Effect } from "effect"
 
-describe.sequential("Clock", () => {
+describe("Clock", { concurrent: false }, () => {
   it.live("keeps wall time aligned while exposing the monotonic source", () => {
     let wallMillis = 1_000_000
     let monotonicNanos = 5_000_000_000n
diff --git a/repos/effect/packages/effect/test/ConfigProvider.test.ts b/repos/effect/packages/effect/test/ConfigProvider.test.ts
index c2bcaa9fd..e8f7d80f9 100644
--- a/repos/effect/packages/effect/test/ConfigProvider.test.ts
+++ b/repos/effect/packages/effect/test/ConfigProvider.test.ts
@@ -564,6 +564,14 @@ describe("ConfigProvider", () => {
       await assertSuccess(provider, ["A", 1], ConfigProvider.makeValue("value2"))
     })
 
+    it("array: values outside the JavaScript array index range yield a Record", async () => {
+      const env = { A_4294967295: "value1" }
+      const provider = ConfigProvider.fromEnv({ env })
+
+      await assertSuccess(provider, ["A"], ConfigProvider.makeRecord(new Set(["4294967295"])))
+      await assertSuccess(provider, ["A", "4294967295"], ConfigProvider.makeValue("value1"))
+    })
+
     it("root path exposes top-level keys", async () => {
       const env = { A: "value1", B_C: "value2" }
       const provider = ConfigProvider.fromEnv({ env })
@@ -838,6 +846,17 @@ DB_PASS=\${PASSWORD}
       await assertSuccess(provider, ["DB_PASS"], ConfigProvider.makeValue("value"))
     })
 
+    it("expands referenced values as literal data", async () => {
+      const provider = ConfigProvider.fromDotEnvContents(
+        `
+SOURCE=a$&b$'c$\`d
+TARGET=\${SOURCE}
+`,
+        { expandVariables: true }
+      )
+      await assertSuccess(provider, ["TARGET"], ConfigProvider.makeValue("a$&b$'c$`d"))
+    })
+
     it("expansion defaults are used only for empty or unset variables", async () => {
       const provider = ConfigProvider.fromDotEnvContents(
         `
diff --git a/repos/effect/packages/effect/test/Crypto.test.ts b/repos/effect/packages/effect/test/Crypto.test.ts
index 294bc448e..109aad9d8 100644
--- a/repos/effect/packages/effect/test/Crypto.test.ts
+++ b/repos/effect/packages/effect/test/Crypto.test.ts
@@ -64,6 +64,15 @@ describe("Crypto", () => {
       assert.deepStrictEqual(randomShuffle, [1, 2, 3])
     }).pipe(Effect.provideService(Crypto.Crypto, testCrypto)))
 
+  it.effect("randomBetween excludes the upper bound when the result rounds up", () =>
+    Effect.gen(function*() {
+      const value = yield* makeCrypto((1n << 53n) - 2n).randomBetween(10, 20)
+
+      assert.isAtLeast(value, 10)
+      assert.isBelow(value, 20)
+      assert.strictEqual(value, 20 - 2 ** -48)
+    }))
+
   it("maps adjacent random values to adjacent safe integers", () => {
     assert.strictEqual(makeCrypto(0n).nextIntUnsafe(), Number.MIN_SAFE_INTEGER)
     assert.strictEqual(makeCrypto(1n).nextIntUnsafe(), Number.MIN_SAFE_INTEGER + 1)
@@ -99,6 +108,24 @@ describe("Crypto", () => {
       assert.strictEqual(uuid, "01234567-89ab-7607-8809-0a0b0c0d0e0f")
     }).pipe(Effect.provideService(Crypto.Crypto, testCrypto)))
 
+  it.effect("randomULID encodes the Clock timestamp and random bytes", () =>
+    Effect.gen(function*() {
+      yield* TestClock.setTime(0x0123456789ab)
+      const crypto = yield* Crypto.Crypto
+      const ulid = yield* crypto.randomULID
+
+      assert.strictEqual(ulid, "014D2PF2DB000G40R40M30E209")
+    }).pipe(Effect.provideService(Crypto.Crypto, testCrypto)))
+
+  it.effect("randomULID clamps an overflowing Clock timestamp", () =>
+    Effect.gen(function*() {
+      yield* TestClock.setTime(2 ** 48)
+      const crypto = yield* Crypto.Crypto
+      const ulid = yield* crypto.randomULID
+
+      assert.strictEqual(ulid, "7ZZZZZZZZZ000G40R40M30E209")
+    }).pipe(Effect.provideService(Crypto.Crypto, testCrypto)))
+
   it.effect("digest delegates to the service", () =>
     Effect.gen(function*() {
       const crypto = yield* Crypto.Crypto
diff --git a/repos/effect/packages/effect/test/DateTime.test.ts b/repos/effect/packages/effect/test/DateTime.test.ts
index 6628344f6..b81d917c8 100644
--- a/repos/effect/packages/effect/test/DateTime.test.ts
+++ b/repos/effect/packages/effect/test/DateTime.test.ts
@@ -280,6 +280,12 @@ describe("DateTime", () => {
   })
 
   describe("setPartsUtc", () => {
+    it("applies calendar parts without intermediate overflow", () => {
+      const date = DateTime.makeUnsafe("2024-01-31T12:34:56.789Z")
+      const updated = DateTime.setPartsUtc(date, { month: 2, day: 1 })
+      strictEqual(DateTime.formatIso(updated), "2024-02-01T12:34:56.789Z")
+    })
+
     it("partial", () => {
       const date = DateTime.makeUnsafe({
         year: 2024,
diff --git a/repos/effect/packages/effect/test/Effect.test.ts b/repos/effect/packages/effect/test/Effect.test.ts
index e8c27842b..66f0eb8b8 100644
--- a/repos/effect/packages/effect/test/Effect.test.ts
+++ b/repos/effect/packages/effect/test/Effect.test.ts
@@ -7,6 +7,7 @@ import {
   Deferred,
   Duration,
   Effect,
+  Effectable,
   Exit,
   Fiber,
   type Filter,
@@ -15,6 +16,7 @@ import {
   Logger,
   type LogLevel,
   Option,
+  Ref,
   References,
   Result,
   Schedule,
@@ -55,6 +57,35 @@ describe("Effect", () => {
     assert.isFalse(Effect.isEffect([0]))
   })
 
+  describe("Effectable.Class", () => {
+    it.effect("runs using asEffect", () =>
+      Effect.gen(function*() {
+        class Answer extends Effectable.Class<number> {
+          asEffect() {
+            return Effect.succeed(42)
+          }
+        }
+
+        assert.strictEqual(yield* new Answer(), 42)
+      }))
+
+    it.effect("evaluates asEffect on every execution", () =>
+      Effect.gen(function*() {
+        class Answer extends Effectable.Class<number> {
+          value = 1
+
+          asEffect() {
+            return Effect.succeed(this.value)
+          }
+        }
+
+        const answer = new Answer()
+        assert.strictEqual(yield* answer, 1)
+        answer.value = 2
+        assert.strictEqual(yield* answer, 2)
+      }))
+  })
+
   describe("structural compare", () => {
     it("should pass structural comparison", () => {
       assert.deepEqual(Effect.succeed(0), Effect.succeed(0))
@@ -154,6 +185,34 @@ describe("Effect", () => {
     assert.isTrue(release)
   })
 
+  it.effect("acquireUseRelease runs release when use throws", () =>
+    Effect.gen(function*() {
+      const resource = { id: 1 }
+      const defect = new Error("boom")
+      let releases = 0
+      let releasedResource: typeof resource | undefined
+      let releaseExit: Exit.Exit<never> | undefined
+
+      const exit = yield* Effect.acquireUseRelease(
+        Effect.succeed(resource),
+        (): Effect.Effect<never> => {
+          throw defect
+        },
+        (resource, exit) =>
+          Effect.sync(() => {
+            releases++
+            releasedResource = resource
+            releaseExit = exit
+          })
+      ).pipe(Effect.exit)
+
+      assertExitDefect(exit, defect)
+      assert.strictEqual(releases, 1)
+      assert.strictEqual(releasedResource, resource)
+      assert.isDefined(releaseExit)
+      assertExitDefect(releaseExit, defect)
+    }))
+
   it("acquireUseRelease uninterruptible", async () => {
     let acquire = false
     let use = false
@@ -1469,6 +1528,200 @@ describe("Effect", () => {
       }))
   })
 
+  describe("timeoutOrElse", () => {
+    const forms = ["data-first", "pipe"] as const
+
+    for (const form of forms) {
+      it.live(`${form}: factory and body follow cleanup and replay`, () =>
+        Effect.gen(function*() {
+          let stopped = false
+          let factories = 0
+          let bodies = 0
+          const order: Array<string> = []
+          const value = { fallback: true }
+          const source = Effect.never.pipe(Effect.ensuring(Effect.sync(() => {
+            stopped = true
+            order.push("stopped")
+          })))
+          const options = {
+            duration: 0,
+            orElse: () => {
+              factories++
+              order.push(`factory:${stopped}`)
+              return Effect.sync(() => {
+                bodies++
+                order.push(`body:${stopped}`)
+                return value
+              })
+            }
+          }
+          const program = form === "data-first"
+            ? Effect.timeoutOrElse(source, options)
+            : source.pipe(Effect.timeoutOrElse(options))
+          const before = [factories, bodies]
+          const first = yield* program
+          const firstStopped = stopped
+          stopped = false
+          const second = yield* program
+          assert.deepStrictEqual({
+            before,
+            factories,
+            bodies,
+            firstStopped,
+            stopped,
+            identity: [first === value, second === value],
+            order
+          }, {
+            before: [0, 0],
+            factories: 2,
+            bodies: 2,
+            firstStopped: true,
+            stopped: true,
+            identity: [true, true],
+            order: ["stopped", "factory:true", "body:true", "stopped", "factory:true", "body:true"]
+          })
+        }))
+    }
+
+    it.live("a ready source value is not confused with a zero-duration timeout", () =>
+      Effect.gen(function*() {
+        const value = Option.none()
+        let calls = 0
+        const result = yield* Effect.timeoutOrElse(Effect.succeed(value), {
+          duration: 0,
+          orElse: () => {
+            calls++
+            return Effect.succeed(Option.some("unexpected fallback"))
+          }
+        })
+        assert.deepStrictEqual([result, calls], [value, 0])
+      }))
+
+    it.live("slow fallback cannot let the original source win after timeout", () =>
+      Effect.gen(function*() {
+        const sourceGate = yield* Deferred.make<void>()
+        const sourceStopped = yield* Deferred.make<void>()
+        const fallbackStarted = yield* Deferred.make<void>()
+        const fallbackRelease = yield* Deferred.make<void>()
+        const sourceCompleted = yield* Ref.make(false)
+        const value = { fallback: true }
+        let fallbackInterrupted = false
+        const source = Deferred.await(sourceGate).pipe(
+          Effect.andThen(Ref.set(sourceCompleted, true)),
+          Effect.as({ source: true }),
+          Effect.ensuring(Deferred.succeed(sourceStopped, undefined))
+        )
+        const fiber = yield* Effect.timeoutOrElse(source, {
+          duration: 0,
+          orElse: () =>
+            Deferred.succeed(fallbackStarted, undefined).pipe(
+              Effect.andThen(Deferred.await(fallbackRelease)),
+              Effect.as(value),
+              Effect.onInterrupt(() =>
+                Effect.sync(() => {
+                  fallbackInterrupted = true
+                })
+              )
+            )
+        }).pipe(Effect.forkChild)
+        yield* Deferred.await(fallbackStarted)
+        yield* Deferred.succeed(sourceGate, undefined)
+        yield* Deferred.await(sourceStopped)
+        yield* Deferred.succeed(fallbackRelease, undefined)
+        const completed = yield* Ref.get(sourceCompleted)
+        const result = yield* Fiber.join(fiber)
+        assert.deepStrictEqual([result === value, completed, fallbackInterrupted], [true, false, false])
+      }))
+
+    class SourceService extends Context.Service<SourceService, { source: string }>()("timeout-test/SourceService") {}
+    class FallbackService
+      extends Context.Service<FallbackService, { fallback: string }>()("timeout-test/FallbackService")
+    {}
+    const Local = Context.Reference<string>("timeout-test/Local", { defaultValue: () => "default" })
+
+    it.live("source and fallback inherit caller context", () =>
+      Effect.gen(function*() {
+        const sourceService = { source: "source service" }
+        const fallbackService = { fallback: "fallback service" }
+        const observed: Array<unknown> = []
+        const result = yield* Effect.gen(function*() {
+          const callerId = yield* Effect.fiberId
+          const parentSpan = yield* Effect.currentSpan
+          const source = Effect.gen(function*() {
+            observed.push(
+              (yield* SourceService) === sourceService,
+              yield* Local,
+              (yield* Effect.currentSpan) === parentSpan
+            )
+            return yield* Effect.never
+          }).pipe(Effect.provideService(Local, "source-local"))
+          const value = yield* Effect.timeoutOrElse(source, {
+            duration: 0,
+            orElse: () =>
+              Effect.gen(function*() {
+                const annotations = yield* References.CurrentLogAnnotations
+                observed.push(
+                  (yield* Effect.fiberId) === callerId,
+                  yield* Local,
+                  (yield* Effect.currentSpan) === parentSpan,
+                  annotations["request"]
+                )
+                return yield* FallbackService
+              })
+          })
+          observed.push(yield* Local, (yield* Effect.currentSpan) === parentSpan)
+          return value
+        }).pipe(
+          Effect.provideService(SourceService, sourceService),
+          Effect.provideService(FallbackService, fallbackService),
+          Effect.provideService(Local, "parent-local"),
+          Effect.annotateLogs({ request: "request-value" }),
+          Effect.withSpan("timeout-parent")
+        )
+        assert.deepStrictEqual([result === fallbackService, observed], [true, [
+          true,
+          "source-local",
+          true,
+          true,
+          "parent-local",
+          true,
+          "request-value",
+          "parent-local",
+          true
+        ]])
+      }))
+
+    it.live("external interruption stops a pending fallback", () =>
+      Effect.gen(function*() {
+        const started = yield* Deferred.make<void>()
+        let sourceStopped = false
+        let fallbackStopped = false
+        let calls = 0
+        const fiber = yield* Effect.never.pipe(
+          Effect.ensuring(Effect.sync(() => {
+            sourceStopped = true
+          })),
+          Effect.timeoutOrElse({
+            duration: 0,
+            orElse: () => {
+              calls++
+              return Deferred.succeed(started, undefined).pipe(
+                Effect.andThen(Effect.never),
+                Effect.ensuring(Effect.sync(() => {
+                  fallbackStopped = true
+                }))
+              )
+            }
+          }),
+          Effect.forkChild
+        )
+        yield* Deferred.await(started)
+        yield* Fiber.interrupt(fiber)
+        const exit = yield* Fiber.await(fiber)
+        assert.deepStrictEqual([Exit.hasInterrupts(exit), sourceStopped, fallbackStopped, calls], [true, true, true, 1])
+      }))
+  })
+
   describe("timeoutOption", () => {
     it.live("timeout a long computation", () =>
       Effect.gen(function*() {
@@ -3288,6 +3541,23 @@ describe("Effect", () => {
         assertExitFailure(exit, Cause.fail(new AiError({ reason })))
       }))
 
+    it.effect("preserves the cause for a non-matching reason", () =>
+      Effect.gen(function*() {
+        const error = new AiError({ reason: new QuotaExceededError({ limit: 100 }) })
+        const result = yield* Effect.gen(function*() {
+          yield* Effect.addFinalizer(() => Effect.die("finalizer failure"))
+          return yield* Effect.fail(error)
+        }).pipe(
+          Effect.scoped,
+          Effect.catchReason("AiError", "RateLimitError", () => Effect.succeed("no")),
+          Effect.exit
+        )
+        assert.deepStrictEqual(
+          result,
+          Exit.failCause(Cause.combine(Cause.fail(error), Cause.die("finalizer failure")))
+        )
+      }))
+
     it.effect("ignores non-matching parent tag", () =>
       Effect.gen(function*() {
         const error = new OtherError({ message: "test" })
@@ -3361,6 +3631,25 @@ describe("Effect", () => {
         )
         assertExitFailure(exit, Cause.fail(new AiError({ reason })))
       }))
+
+    it.effect("preserves the cause for an unhandled reason", () =>
+      Effect.gen(function*() {
+        const error = new AiError({ reason: new QuotaExceededError({ limit: 100 }) })
+        const result = yield* Effect.gen(function*() {
+          yield* Effect.addFinalizer(() => Effect.die("finalizer failure"))
+          return yield* Effect.fail(error)
+        }).pipe(
+          Effect.scoped,
+          Effect.catchReasons("AiError", {
+            RateLimitError: () => Effect.succeed("handled")
+          }),
+          Effect.exit
+        )
+        assert.deepStrictEqual(
+          result,
+          Exit.failCause(Cause.combine(Cause.fail(error), Cause.die("finalizer failure")))
+        )
+      }))
   })
 
   describe("unwrapReason", () => {
@@ -3411,7 +3700,127 @@ describe("Effect", () => {
       }))
   })
 
+  describe("cached", () => {
+    it.effect("runs the effect once for concurrent callers", () =>
+      Effect.gen(function*() {
+        const release = yield* Deferred.make<void>()
+        let count = 0
+        const cached = yield* Effect.cached(
+          Effect.gen(function*() {
+            count++
+            yield* Deferred.await(release)
+            return count
+          })
+        )
+
+        const fibers = yield* Effect.forEach([1, 2, 3], () => cached.pipe(Effect.forkChild({ startImmediately: true })))
+        assert.strictEqual(count, 1)
+
+        yield* Deferred.succeed(release, void 0)
+        assert.deepStrictEqual(yield* Fiber.awaitAll(fibers), [Exit.succeed(1), Exit.succeed(1), Exit.succeed(1)])
+      }))
+
+    it.effect("replays failures", () =>
+      Effect.gen(function*() {
+        let count = 0
+        const cached = yield* Effect.cached(
+          Effect.sync(() => count++).pipe(Effect.andThen(Effect.fail("boom")))
+        )
+
+        assert.deepStrictEqual(yield* Effect.exit(cached), Exit.fail("boom"))
+        assert.deepStrictEqual(yield* Effect.exit(cached), Exit.fail("boom"))
+        assert.strictEqual(count, 1)
+      }))
+
+    it.effect("interrupting a waiter leaves the owner running", () =>
+      Effect.gen(function*() {
+        const started = yield* Deferred.make<void>()
+        const release = yield* Deferred.make<void>()
+        const cached = yield* Effect.cached(
+          Deferred.succeed(started, void 0).pipe(
+            Effect.andThen(Deferred.await(release)),
+            Effect.as(42)
+          )
+        )
+
+        const owner = yield* cached.pipe(Effect.forkChild({ startImmediately: true }))
+        yield* Deferred.await(started)
+        const waiter = yield* cached.pipe(Effect.forkChild({ startImmediately: true }))
+        yield* Fiber.interrupt(waiter)
+        assert.isTrue(Exit.hasInterrupts(yield* Fiber.await(waiter)))
+
+        yield* Deferred.succeed(release, void 0)
+        assert.strictEqual(yield* Fiber.join(owner), 42)
+        assert.strictEqual(yield* cached, 42)
+      }))
+
+    it.effect("replays the owner's interrupted exit", () =>
+      Effect.gen(function*() {
+        const started = yield* Deferred.make<void>()
+        const cached = yield* Effect.cached(
+          Deferred.succeed(started, void 0).pipe(Effect.andThen(Effect.never))
+        )
+
+        const owner = yield* cached.pipe(Effect.forkChild({ startImmediately: true }))
+        yield* Deferred.await(started)
+        yield* Fiber.interrupt(owner)
+        const ownerExit = yield* Fiber.await(owner)
+        const replayedExit = yield* Effect.exit(cached)
+
+        assert.isTrue(Exit.hasInterrupts(ownerExit))
+        assert.deepStrictEqual(replayedExit, ownerExit)
+      }))
+  })
+
   describe("cachedWithTTL", () => {
+    it.effect("selects ttl from each fresh exit without evaluating on cache hits", () =>
+      Effect.gen(function*() {
+        let count = 0
+        const exits: Array<Exit.Exit<number>> = []
+        const cached = yield* Effect.cachedWithTTL(
+          Effect.sync(() => ++count),
+          (exit: Exit.Exit<number>) => {
+            exits.push(exit)
+            return Exit.isSuccess(exit) && exit.value === 1 ? "1 second" : Duration.seconds(3)
+          }
+        )
+
+        assert.strictEqual(count, 0)
+        assert.deepStrictEqual(exits, [])
+        assert.strictEqual(yield* cached, 1)
+        yield* TestClock.adjust("999 millis")
+        assert.strictEqual(yield* cached, 1)
+        assert.deepStrictEqual(exits, [Exit.succeed(1)])
+
+        yield* TestClock.adjust("1 milli")
+        assert.strictEqual(yield* cached, 2)
+        yield* TestClock.adjust("1 second")
+        assert.strictEqual(yield* cached, 2)
+        yield* TestClock.adjust("2 seconds")
+        assert.strictEqual(yield* cached, 3)
+        assert.deepStrictEqual(exits, [Exit.succeed(1), Exit.succeed(2), Exit.succeed(3)])
+      }))
+
+    it.effect("supports a piped callback that skips failures and caches successes", () =>
+      Effect.gen(function*() {
+        let count = 0
+        const exits: Array<Exit.Exit<number, string>> = []
+        const cached = yield* Effect.suspend(() => ++count === 1 ? Effect.fail("boom") : Effect.succeed(count)).pipe(
+          Effect.cachedWithTTL((exit: Exit.Exit<number, string>) => {
+            exits.push(exit)
+            return Exit.isFailure(exit) ? 0 : "1 second"
+          })
+        )
+
+        assert.deepStrictEqual(yield* Effect.exit(cached), Exit.fail("boom"))
+        assert.strictEqual(yield* cached, 2)
+        assert.strictEqual(yield* cached, 2)
+        assert.deepStrictEqual(exits, [Exit.fail("boom"), Exit.succeed(2)])
+        yield* TestClock.adjust("1 second")
+        assert.strictEqual(yield* cached, 3)
+        assert.deepStrictEqual(exits, [Exit.fail("boom"), Exit.succeed(2), Exit.succeed(3)])
+      }))
+
     it.effect("starts ttl from value creation", () =>
       Effect.gen(function*() {
         let count = 0
@@ -3451,6 +3860,17 @@ describe("Effect", () => {
       defaultValue: () => []
     })
 
+    it.effect("skips restoration when the provider expires before scope closure", () =>
+      Effect.gen(function*() {
+        const result = yield* Effect.gen(function*() {
+          yield* Effect.updateServiceScoped(CurrentNumber, (value) => value + 1)
+          return yield* CurrentNumber
+        }).pipe(Effect.provideService(CurrentNumber, 1), Effect.scoped)
+
+        assert.strictEqual(result, 2)
+        assert.deepStrictEqual(yield* Effect.serviceOption(CurrentNumber), Option.none())
+      }))
+
     it.effect("updates a Context.Service until the scope closes", () =>
       Effect.gen(function*() {
         const before = yield* CurrentNumber
diff --git a/repos/effect/packages/effect/test/EffectEager.test.ts b/repos/effect/packages/effect/test/EffectEager.test.ts
index 4e8876132..d610d7157 100644
--- a/repos/effect/packages/effect/test/EffectEager.test.ts
+++ b/repos/effect/packages/effect/test/EffectEager.test.ts
@@ -131,6 +131,19 @@ describe("Effect Eager Operations", () => {
         assert.strictEqual(result, 20)
       }))
 
+    it.effect("forwards arguments to pipeable operators", () =>
+      Effect.gen(function*() {
+        const fn = Effect.fnUntracedEager(
+          function*(value: string) {
+            return value.length
+          },
+          (effect, value) => Effect.map(effect, (length) => `${value}:${length}`)
+        )
+
+        const result = yield* fn("hello")
+        assert.strictEqual(result, "hello:5")
+      }))
+
     it("proxies body length", () => {
       const fn = Effect.fnUntracedEager(function*(a: string, b: number, c: boolean) {
         return c ? a.length + b : b
diff --git a/repos/effect/packages/effect/test/EffectKeepAlive.test.ts b/repos/effect/packages/effect/test/EffectKeepAlive.test.ts
index 4626366aa..d4f4e2ee4 100644
--- a/repos/effect/packages/effect/test/EffectKeepAlive.test.ts
+++ b/repos/effect/packages/effect/test/EffectKeepAlive.test.ts
@@ -1,6 +1,6 @@
 import { assert, describe, it, vitest } from "@effect/vitest"
 
-describe("Effect keepAlive", () => {
+describe("Effect keepAlive", { concurrent: false }, () => {
   it("makeRunMain keeps process alive until completion", async () => {
     const originalSetInterval = globalThis.setInterval
     const originalClearInterval = globalThis.clearInterval
diff --git a/repos/effect/packages/effect/test/Effectable.test.ts b/repos/effect/packages/effect/test/Effectable.test.ts
new file mode 100644
index 000000000..bd29da0ad
--- /dev/null
+++ b/repos/effect/packages/effect/test/Effectable.test.ts
@@ -0,0 +1,103 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Context, Effect, Effectable, Exit } from "effect"
+
+describe("Effectable", () => {
+  describe("Mixin", () => {
+    class Box {
+      constructor(readonly value: number) {}
+      double() {
+        return this.value * 2
+      }
+    }
+
+    class EffectBox extends Effectable.Mixin(Box) {
+      override asEffect() {
+        return Effect.succeed(this.value)
+      }
+    }
+
+    it.effect("evaluates asEffect", () =>
+      Effect.gen(function*() {
+        const effectValue = yield* new EffectBox(1)
+        assert.strictEqual(effectValue, 1)
+      }))
+
+    it.effect("propagates failures", () =>
+      Effect.gen(function*() {
+        class FailingBox extends Effectable.Mixin(Box) {
+          override asEffect() {
+            return Effect.fail(this.value)
+          }
+        }
+
+        assert.deepStrictEqual(yield* Effect.exit(new FailingBox(1)), Exit.fail(1))
+      }))
+
+    it.effect("uses provided services", () =>
+      Effect.gen(function*() {
+        class Multiplier extends Context.Service<Multiplier, number>()("Multiplier") {}
+        class ServiceBox extends Effectable.Mixin(Box) {
+          override asEffect() {
+            return Effect.map(Multiplier, (multiplier) => this.value * multiplier)
+          }
+        }
+
+        const value = yield* new ServiceBox(2).pipe(Effect.provideService(Multiplier, 3))
+        assert.strictEqual(value, 6)
+      }))
+
+    it("shadows base prototype methods without modifying them", () => {
+      class PrintableBox extends Box {
+        override toString() {
+          return "Box"
+        }
+        toJSON(): unknown {
+          return { _id: "Box" }
+        }
+      }
+      class PrintableEffectBox extends Effectable.Mixin(PrintableBox) {
+        override asEffect() {
+          return Effect.succeed(this.value)
+        }
+      }
+
+      const box = new PrintableEffectBox(1)
+      assert.deepStrictEqual(box.toJSON(), { _id: "Effect", op: "Effectable" })
+      assert.deepStrictEqual(JSON.parse(box.toString()), box.toJSON())
+      assert.strictEqual(new PrintableBox(1).toString(), "Box")
+      assert.deepStrictEqual(new PrintableBox(1).toJSON(), { _id: "Box" })
+    })
+
+    it("inserts the Effect prototype between the subclass and original class", () => {
+      const box = new EffectBox(1)
+      const protos: Array<object> = []
+      let current: object | null = Object.getPrototypeOf(box)
+      while (current !== null && current !== Box.prototype) {
+        protos.push(current)
+        current = Object.getPrototypeOf(current)
+      }
+      assert.strictEqual(current, Box.prototype)
+      assert.isTrue(protos.some((proto) => Effect.TypeId in proto))
+    })
+
+    it("preserves the original constructor and instance members", () => {
+      const box = new EffectBox(2)
+      assert.isTrue(box instanceof EffectBox)
+      assert.isTrue(box instanceof Box)
+      assert.strictEqual(box.constructor, EffectBox)
+      assert.strictEqual(box.value, 2)
+      assert.strictEqual(box.double(), 4)
+    })
+
+    it("makes instances behave as Effects", () => {
+      const box = new EffectBox(3)
+      assert.isTrue(Effect.isEffect(box))
+      assert.strictEqual(box.pipe((b) => b.value), 3)
+    })
+
+    it("does not modify the original class prototype", () => {
+      assert.isFalse(Effect.TypeId in Box.prototype)
+      assert.isFalse(Effect.isEffect(new Box(1)))
+    })
+  })
+})
diff --git a/repos/effect/packages/effect/test/ExecutionPlan.test.ts b/repos/effect/packages/effect/test/ExecutionPlan.test.ts
index 64edfbb2b..905a5b653 100644
--- a/repos/effect/packages/effect/test/ExecutionPlan.test.ts
+++ b/repos/effect/packages/effect/test/ExecutionPlan.test.ts
@@ -71,6 +71,37 @@ describe("ExecutionPlan", () => {
     })
   })
 
+  describe("captureRequirements", () => {
+    class Policy extends Context.Service<Policy, { allow: boolean }>()("ExecutionPlan.test/Policy") {}
+
+    const failOnce = () => {
+      let attempts = 0
+      return Effect.suspend(() => ++attempts === 1 ? Effect.fail("busy") : Effect.succeed("ok"))
+    }
+
+    const plan = ExecutionPlan.make({
+      provide: Context.empty(),
+      attempts: 2,
+      while: (_: string) => Effect.map(Policy, ({ allow }) => allow)
+    })
+
+    it.effect("captures while predicate requirements", () =>
+      Effect.gen(function*() {
+        const captured = yield* plan.captureRequirements.pipe(Effect.provideService(Policy, { allow: true }))
+        const result = yield* Effect.withExecutionPlan(failOnce(), captured)
+        strictEqual(result, "ok")
+      }))
+
+    it.effect("prefers captured while predicate requirements over the ambient context", () =>
+      Effect.gen(function*() {
+        const captured = yield* plan.captureRequirements.pipe(Effect.provideService(Policy, { allow: true }))
+        const result = yield* Effect.withExecutionPlan(failOnce(), captured).pipe(
+          Effect.provideService(Policy, { allow: false })
+        )
+        strictEqual(result, "ok")
+      }))
+  })
+
   describe("Stream.withExecutionPlan", () => {
     it.effect("limits attempts after partial stream failures", () =>
       Effect.gen(function*() {
diff --git a/repos/effect/packages/effect/test/FiberHandle.test.ts b/repos/effect/packages/effect/test/FiberHandle.test.ts
index 5ad0ea88c..754e4d385 100644
--- a/repos/effect/packages/effect/test/FiberHandle.test.ts
+++ b/repos/effect/packages/effect/test/FiberHandle.test.ts
@@ -3,6 +3,20 @@ import { assertFalse, assertTrue, strictEqual } from "@effect/vitest/utils"
 import { Deferred, Effect, Exit, Fiber, FiberHandle, Option, pipe, Ref } from "effect"
 import { TestClock } from "effect/testing"
 
+const makeWorker = Effect.gen(function*() {
+  const ready = yield* Deferred.make<void>()
+  const cleanups = yield* Ref.make(0)
+  const fiber = yield* Effect.forkScoped(
+    Deferred.succeed(ready, undefined).pipe(
+      Effect.andThen(Effect.never),
+      Effect.ensuring(Ref.update(cleanups, (n) => n + 1))
+    ),
+    { startImmediately: true }
+  )
+  yield* Deferred.await(ready)
+  return { fiber, cleanups }
+})
+
 describe("FiberHandle", () => {
   it.effect("interrupts the current fiber when the scope closes", () =>
     Effect.gen(function*() {
@@ -87,6 +101,34 @@ describe("FiberHandle", () => {
       strictEqual(fiberA.pollUnsafe(), undefined)
     }))
 
+  it.effect("onlyIfMissing keeps the same registered fiber", () =>
+    Effect.gen(function*() {
+      const handle = yield* FiberHandle.make()
+      const worker = yield* makeWorker
+      FiberHandle.setUnsafe(handle, worker.fiber)
+      FiberHandle.setUnsafe(handle, worker.fiber, { onlyIfMissing: true })
+
+      strictEqual(Option.getOrUndefined(FiberHandle.getUnsafe(handle)), worker.fiber)
+      strictEqual(worker.fiber.pollUnsafe(), undefined)
+      strictEqual(yield* Ref.get(worker.cleanups), 0)
+    }))
+
+  for (const propagateInterruption of [false, true]) {
+    it.effect(`same-fiber registration preserves propagateInterruption: ${propagateInterruption}`, () =>
+      Effect.gen(function*() {
+        const handle = yield* FiberHandle.make()
+        const worker = yield* makeWorker
+        FiberHandle.setUnsafe(handle, worker.fiber, { propagateInterruption })
+        FiberHandle.setUnsafe(handle, worker.fiber, {
+          onlyIfMissing: true,
+          propagateInterruption: !propagateInterruption
+        })
+
+        yield* Fiber.interrupt(worker.fiber)
+        strictEqual(yield* Deferred.isDone(handle.deferred), propagateInterruption)
+      }))
+  }
+
   it.effect("clear does not remove a newer fiber installed while interrupting the previous one", () =>
     Effect.gen(function*() {
       const handle = yield* FiberHandle.make()
diff --git a/repos/effect/packages/effect/test/FiberMap.test.ts b/repos/effect/packages/effect/test/FiberMap.test.ts
index 97379f7a7..f6831504f 100644
--- a/repos/effect/packages/effect/test/FiberMap.test.ts
+++ b/repos/effect/packages/effect/test/FiberMap.test.ts
@@ -3,7 +3,59 @@ import { assertFalse, assertTrue, strictEqual } from "@effect/vitest/utils"
 import { Array, Deferred, Effect, Exit, Fiber, FiberMap, Option, pipe, Ref, Scope } from "effect"
 import { TestClock } from "effect/testing"
 
+const makeWorker = Effect.gen(function*() {
+  const ready = yield* Deferred.make<void>()
+  const cleanups = yield* Ref.make(0)
+  const fiber = yield* Effect.forkScoped(
+    Deferred.succeed(ready, undefined).pipe(
+      Effect.andThen(Effect.never),
+      Effect.ensuring(Ref.update(cleanups, (n) => n + 1))
+    ),
+    { startImmediately: true }
+  )
+  yield* Deferred.await(ready)
+  return { fiber, cleanups }
+})
+
 describe("FiberMap", () => {
+  it.effect("retains ownership of replacements made by a synchronous finalizer", () =>
+    Effect.gen(function*() {
+      const scope = yield* Scope.make()
+      const map = yield* FiberMap.make<string>().pipe(Scope.provide(scope))
+      const run = yield* FiberMap.runtime(map)()
+      const fibers: Array<Fiber.Fiber<unknown, unknown>> = []
+      yield* Effect.addFinalizer(() => Fiber.interruptAll(fibers))
+
+      const previous = run(
+        "key",
+        Effect.never.pipe(
+          Effect.ensuring(Effect.sync(() => {
+            fibers.push(run("key", Effect.never))
+          }))
+        )
+      )
+      const replacement = run("key", Effect.never)
+      fibers.push(previous, replacement)
+      assert.strictEqual(fibers.length, 3)
+
+      yield* Scope.close(scope, Exit.void)
+
+      for (const fiber of fibers) {
+        assert.isDefined(fiber.pollUnsafe())
+      }
+    }))
+
+  it.effect("removes a synchronously completed replacement", () =>
+    Effect.gen(function*() {
+      const map = yield* FiberMap.make<string>()
+      const previous = yield* FiberMap.run(map, "key", Effect.never)
+      const replacement = yield* FiberMap.run(map, "key", Effect.succeed("done"))
+
+      assert.deepStrictEqual(yield* Fiber.join(replacement), "done")
+      assert.isTrue(Exit.hasInterrupts(yield* Fiber.await(previous)))
+      assert.strictEqual(yield* FiberMap.size(map), 0)
+    }))
+
   it.effect("interrupts fibers", () =>
     Effect.gen(function*() {
       const ref = yield* Ref.make(0)
@@ -109,6 +161,34 @@ describe("FiberMap", () => {
       strictEqual(fiberA.pollUnsafe(), undefined)
     }))
 
+  it.effect("onlyIfMissing keeps the same registered fiber", () =>
+    Effect.gen(function*() {
+      const map = yield* FiberMap.make<string>()
+      const worker = yield* makeWorker
+      FiberMap.setUnsafe(map, "key", worker.fiber)
+      FiberMap.setUnsafe(map, "key", worker.fiber, { onlyIfMissing: true })
+
+      strictEqual(Option.getOrUndefined(FiberMap.getUnsafe(map, "key")), worker.fiber)
+      strictEqual(worker.fiber.pollUnsafe(), undefined)
+      strictEqual(yield* Ref.get(worker.cleanups), 0)
+    }))
+
+  for (const propagateInterruption of [false, true]) {
+    it.effect(`same-fiber registration preserves propagateInterruption: ${propagateInterruption}`, () =>
+      Effect.gen(function*() {
+        const map = yield* FiberMap.make<string>()
+        const worker = yield* makeWorker
+        FiberMap.setUnsafe(map, "key", worker.fiber, { propagateInterruption })
+        FiberMap.setUnsafe(map, "key", worker.fiber, {
+          onlyIfMissing: true,
+          propagateInterruption: !propagateInterruption
+        })
+
+        yield* Fiber.interrupt(worker.fiber)
+        strictEqual(yield* Deferred.isDone(map.deferred), propagateInterruption)
+      }))
+  }
+
   it.effect("runtime onlyIfMissing", () =>
     Effect.gen(function*() {
       const run = yield* FiberMap.makeRuntime<never, string>()
diff --git a/repos/effect/packages/effect/test/FileSystem.test-utils.ts b/repos/effect/packages/effect/test/FileSystem.test-utils.ts
index 3490d7db9..19fa02fbc 100644
--- a/repos/effect/packages/effect/test/FileSystem.test-utils.ts
+++ b/repos/effect/packages/effect/test/FileSystem.test-utils.ts
@@ -1,5 +1,5 @@
 import { assert, expect, it } from "@effect/vitest"
-import { Array, Result } from "effect"
+import { Array, ByteSize, Cause, Option, Result } from "effect"
 import * as Effect from "effect/Effect"
 import * as Fs from "effect/FileSystem"
 import type * as Layer from "effect/Layer"
@@ -101,6 +101,10 @@ export const testLayer = <E>(layer: Layer.Layer<Fs.FileSystem, E>, options: Test
       const before = yield* Effect.map(fs.readFile(file), (_) => new TextDecoder().decode(_))
       expect(before).toEqual(text)
 
+      yield* fs.truncate(file, 5)
+      const truncated = yield* Effect.map(fs.readFile(file), (_) => new TextDecoder().decode(_))
+      expect(truncated).toEqual("hello")
+
       yield* fs.truncate(file)
 
       const after = yield* Effect.map(fs.readFile(file), (_) => new TextDecoder().decode(_))
@@ -196,34 +200,37 @@ export const testLayer = <E>(layer: Layer.Layer<Fs.FileSystem, E>, options: Test
         let text: string
         const file = yield* fs.open(`${__dirname}/fixtures/text.txt`)
 
-        text = yield* file.readAlloc(Fs.Size(5)).pipe(
+        text = yield* file.readAlloc(5).pipe(
           Effect.flatMap(Effect.fromOption),
           Effect.map((_) => new TextDecoder().decode(_))
         )
         expect(text).toBe("lorem")
 
-        yield* file.seek(Fs.Size(7), "current")
-        text = yield* file.readAlloc(Fs.Size(5)).pipe(
+        yield* file.seek(BigInt(7), "current")
+        text = yield* file.readAlloc(5).pipe(
           Effect.flatMap(Effect.fromOption),
           Effect.map((_) => new TextDecoder().decode(_))
         )
         expect(text).toBe("dolar")
 
-        yield* file.seek(Fs.Size(1), "current")
-        text = yield* file.readAlloc(Fs.Size(8)).pipe(
+        yield* file.seek(BigInt(1), "current")
+        text = yield* file.readAlloc(8).pipe(
           Effect.flatMap(Effect.fromOption),
           Effect.map((_) => new TextDecoder().decode(_))
         )
         expect(text).toBe("sit amet")
 
-        yield* file.seek(Fs.Size(0), "start")
-        text = yield* file.readAlloc(Fs.Size(11)).pipe(
+        yield* file.seek(BigInt(0), "start")
+        text = yield* file.readAlloc(11).pipe(
           Effect.flatMap(Effect.fromOption),
           Effect.map((_) => new TextDecoder().decode(_))
         )
         expect(text).toBe("lorem ipsum")
 
-        text = yield* fs.stream(`${__dirname}/fixtures/text.txt`, { offset: Fs.Size(6), bytesToRead: Fs.Size(5) }).pipe(
+        text = yield* fs.stream(`${__dirname}/fixtures/text.txt`, {
+          offset: ByteSize.bytes(6),
+          bytesToRead: ByteSize.bytes(5)
+        }).pipe(
           Stream.map((_) => new TextDecoder().decode(_)),
           Stream.runCollect,
           Effect.map(Array.join(""))
@@ -234,6 +241,46 @@ export const testLayer = <E>(layer: Layer.Layer<Fs.FileSystem, E>, options: Test
       )
     })))
 
+  it.each([
+    { chunkSize: 1.5, bytesToRead: undefined },
+    { chunkSize: NaN, bytesToRead: undefined },
+    { chunkSize: 1.5, bytesToRead: 0 },
+    { chunkSize: NaN, bytesToRead: 0 }
+  ])(
+    "rejects stream chunkSize $chunkSize with bytesToRead $bytesToRead",
+    ({ bytesToRead, chunkSize }) =>
+      runPromise(Effect.gen(function*() {
+        const fs = yield* Fs.FileSystem
+        const chunks: Array<Uint8Array> = []
+        const stream = fs.stream(`${__dirname}/fixtures/text.txt`, { bytesToRead, chunkSize })
+        const exit = yield* Effect.exit(stream.pipe(
+          Stream.tap((chunk) => Effect.sync(() => chunks.push(chunk))),
+          Stream.runDrain
+        ))
+
+        assert.deepStrictEqual(chunks, [])
+        assert.strictEqual(exit._tag, "Failure")
+        if (exit._tag === "Failure") {
+          assert.isTrue(Cause.hasDies(exit.cause))
+          assert.isFalse(Cause.hasFails(exit.cause))
+          assert.instanceOf(Cause.squash(exit.cause), RangeError)
+        }
+      }))
+  )
+
+  it("should return a numeric byte count when reading", () =>
+    runPromise(Effect.gen(function*() {
+      const fs = yield* Fs.FileSystem
+
+      yield* Effect.gen(function*() {
+        const file = yield* fs.open(`${__dirname}/fixtures/text.txt`)
+        const buffer = new Uint8Array(5)
+
+        assert.strictEqual(yield* file.read(buffer), 5)
+        assert.strictEqual(new TextDecoder().decode(buffer), "lorem")
+      }).pipe(Effect.scoped)
+    })))
+
   it("should read from a backwards seek", () =>
     runPromise(Effect.gen(function*() {
       const fs = yield* Fs.FileSystem
@@ -241,14 +288,14 @@ export const testLayer = <E>(layer: Layer.Layer<Fs.FileSystem, E>, options: Test
       yield* Effect.gen(function*() {
         const file = yield* fs.open(`${__dirname}/fixtures/text.txt`)
 
-        const first = yield* file.readAlloc(Fs.Size(5)).pipe(
+        const first = yield* file.readAlloc(5).pipe(
           Effect.flatMap(Effect.fromOption),
           Effect.map((_) => new TextDecoder().decode(_))
         )
         expect(first).toBe("lorem")
 
-        yield* file.seek(Fs.Size(-3), "current")
-        const second = yield* file.readAlloc(Fs.Size(3)).pipe(
+        yield* file.seek(BigInt(-3), "current")
+        const second = yield* file.readAlloc(3).pipe(
           Effect.flatMap(Effect.fromOption),
           Effect.map((_) => new TextDecoder().decode(_))
         )
@@ -258,6 +305,89 @@ export const testLayer = <E>(layer: Layer.Layer<Fs.FileSystem, E>, options: Test
       )
     })))
 
+  it.each([
+    { offset: BigInt(-1), from: "start" as const },
+    { offset: BigInt(-3), from: "start" as const },
+    { offset: BigInt(-6), from: "current" as const },
+    { offset: BigInt(-8), from: "current" as const }
+  ])(
+    "should reject seeks before the start of the file ($offset from $from)",
+    ({ from, offset }) =>
+      runPromise(Effect.gen(function*() {
+        const fs = yield* Fs.FileSystem
+
+        yield* Effect.gen(function*() {
+          const file = yield* fs.open(`${__dirname}/fixtures/text.txt`)
+          const buffer = new Uint8Array(5)
+          assert.strictEqual(yield* file.read(buffer), 5)
+          assert.strictEqual(new TextDecoder().decode(buffer), "lorem")
+
+          const result = yield* Effect.result(file.seek(offset, from))
+          expect(result).toMatchObject({
+            _tag: "Failure",
+            failure: {
+              _tag: "PlatformError",
+              reason: { _tag: "BadArgument", module: "FileSystem", method: "seek" }
+            }
+          })
+          assert.strictEqual(yield* file.seek(BigInt(0), "current"), BigInt(5))
+          assert.strictEqual(yield* file.read(buffer), 5)
+          assert.strictEqual(new TextDecoder().decode(buffer), " ipsu")
+          assert.strictEqual(yield* file.seek(BigInt(0), "current"), BigInt(10))
+
+          assert.strictEqual(yield* file.seek(BigInt(-10), "current"), BigInt(0))
+          assert.strictEqual(yield* file.read(buffer), 5)
+          assert.strictEqual(new TextDecoder().decode(buffer), "lorem")
+        }).pipe(Effect.scoped)
+      }))
+  )
+
+  it.each([-1, 1.5, NaN, Infinity, Number.MAX_VALUE])(
+    "readAlloc(%s) fails with BadArgument without moving the cursor",
+    (size) =>
+      runPromise(Effect.gen(function*() {
+        const fs = yield* Fs.FileSystem
+
+        yield* Effect.gen(function*() {
+          const file = yield* fs.open(`${__dirname}/fixtures/text.txt`)
+          const first = yield* file.readAlloc(6).pipe(Effect.flatMap(Effect.fromOption))
+          assert.strictEqual(new TextDecoder().decode(first), "lorem ")
+
+          const exit = yield* Effect.exit(file.readAlloc(size))
+          const position = yield* file.seek(BigInt(0), "current")
+          const next = yield* file.readAlloc(5).pipe(Effect.flatMap(Effect.fromOption))
+
+          assert.strictEqual(position, BigInt(6))
+          assert.strictEqual(new TextDecoder().decode(next), "ipsum")
+          assert(exit._tag === "Failure")
+          assert.isFalse(Cause.hasDies(exit.cause))
+          const error = Cause.findErrorOption(exit.cause)
+          assert(Option.isSome(error))
+          assert.strictEqual(error.value._tag, "PlatformError")
+          assert.strictEqual(error.value.reason._tag, "BadArgument")
+          assert.strictEqual(error.value.reason.module, "FileSystem")
+          assert.strictEqual(error.value.reason.method, "readAlloc")
+        }).pipe(Effect.scoped)
+      }))
+  )
+
+  it("readAlloc(0) returns None without moving the cursor", () =>
+    runPromise(Effect.gen(function*() {
+      const fs = yield* Fs.FileSystem
+
+      yield* Effect.gen(function*() {
+        const file = yield* fs.open(`${__dirname}/fixtures/text.txt`)
+        const first = yield* file.readAlloc(6).pipe(Effect.flatMap(Effect.fromOption))
+        assert.strictEqual(new TextDecoder().decode(first), "lorem ")
+
+        assert.deepStrictEqual(yield* file.readAlloc(0), Option.none())
+        assert.strictEqual(yield* file.seek(BigInt(0), "current"), BigInt(6))
+
+        const next = yield* file.readAlloc(5).pipe(Effect.flatMap(Effect.fromOption))
+        assert.strictEqual(new TextDecoder().decode(next), "ipsum")
+      }).pipe(Effect.scoped)
+    })))
+
   it("should read sequentially without an intervening seek", () =>
     runPromise(Effect.gen(function*() {
       const fs = yield* Fs.FileSystem
@@ -265,13 +395,13 @@ export const testLayer = <E>(layer: Layer.Layer<Fs.FileSystem, E>, options: Test
       yield* Effect.gen(function*() {
         const file = yield* fs.open(`${__dirname}/fixtures/text.txt`)
 
-        const first = yield* file.readAlloc(Fs.Size(5)).pipe(
+        const first = yield* file.readAlloc(5).pipe(
           Effect.flatMap(Effect.fromOption),
           Effect.map((_) => new TextDecoder().decode(_))
         )
         expect(first).toBe("lorem")
 
-        const second = yield* file.readAlloc(Fs.Size(6)).pipe(
+        const second = yield* file.readAlloc(6).pipe(
           Effect.flatMap(Effect.fromOption),
           Effect.map((_) => new TextDecoder().decode(_))
         )
@@ -290,18 +420,18 @@ export const testLayer = <E>(layer: Layer.Layer<Fs.FileSystem, E>, options: Test
         const path = yield* fs.makeTempFileScoped()
         const file = yield* fs.open(path, { flag: "w+" })
 
-        yield* file.write(new TextEncoder().encode("lorem ipsum"))
+        assert.strictEqual(yield* file.write(new TextEncoder().encode("lorem ipsum")), 11)
         yield* file.write(new TextEncoder().encode(" "))
         yield* file.write(new TextEncoder().encode("dolor sit amet"))
         text = yield* fs.readFileString(path)
         expect(text).toBe("lorem ipsum dolor sit amet")
 
-        yield* file.seek(Fs.Size(-4), "current")
+        yield* file.seek(BigInt(-4), "current")
         yield* file.write(new TextEncoder().encode("hello world"))
         text = yield* fs.readFileString(path)
         expect(text).toBe("lorem ipsum dolor sit hello world")
 
-        yield* file.seek(Fs.Size(6), "start")
+        yield* file.seek(BigInt(6), "start")
         yield* file.write(new TextEncoder().encode("blabl"))
         text = yield* fs.readFileString(path)
         expect(text).toBe("lorem blabl dolor sit hello world")
@@ -320,13 +450,13 @@ export const testLayer = <E>(layer: Layer.Layer<Fs.FileSystem, E>, options: Test
         const file = yield* fs.open(path, { flag: "a+" })
 
         yield* file.write(new TextEncoder().encode("foo"))
-        yield* file.seek(Fs.Size(0), "start")
+        yield* file.seek(BigInt(0), "start")
 
         yield* file.write(new TextEncoder().encode("bar"))
         text = yield* fs.readFileString(path)
         expect(text).toBe("foobar")
 
-        text = yield* file.readAlloc(Fs.Size(3)).pipe(
+        text = yield* file.readAlloc(3).pipe(
           Effect.flatMap(Effect.fromOption),
           Effect.map((_) => new TextDecoder().decode(_))
         )
@@ -336,7 +466,7 @@ export const testLayer = <E>(layer: Layer.Layer<Fs.FileSystem, E>, options: Test
         text = yield* fs.readFileString(path)
         expect(text).toBe("foobarbaz")
 
-        text = yield* file.readAlloc(Fs.Size(6)).pipe(
+        text = yield* file.readAlloc(6).pipe(
           Effect.flatMap(Effect.fromOption),
           Effect.map((_) => new TextDecoder().decode(_))
         )
@@ -355,16 +485,16 @@ export const testLayer = <E>(layer: Layer.Layer<Fs.FileSystem, E>, options: Test
         const file = yield* fs.open(path, { flag: "a+" })
 
         yield* file.write(new TextEncoder().encode("foo"))
-        yield* file.seek(Fs.Size(0), "start")
+        yield* file.seek(BigInt(0), "start")
 
-        const first = yield* file.readAlloc(Fs.Size(1)).pipe(
+        const first = yield* file.readAlloc(1).pipe(
           Effect.flatMap(Effect.fromOption),
           Effect.map((_) => new TextDecoder().decode(_))
         )
         expect(first).toBe("f")
 
         yield* file.write(new TextEncoder().encode("bar"))
-        const second = yield* file.readAlloc(Fs.Size(2)).pipe(
+        const second = yield* file.readAlloc(2).pipe(
           Effect.flatMap(Effect.fromOption),
           Effect.map((_) => new TextDecoder().decode(_))
         )
@@ -383,11 +513,11 @@ export const testLayer = <E>(layer: Layer.Layer<Fs.FileSystem, E>, options: Test
         const file = yield* fs.open(path, { flag: "w+" })
 
         yield* file.write(new TextEncoder().encode("lorem ipsum dolor sit amet"))
-        yield* file.seek(Fs.Size(6), "start")
-        yield* file.truncate(Fs.Size(11))
+        yield* file.seek(BigInt(6), "start")
+        yield* file.truncate(11)
 
-        const cursor = yield* file.seek(Fs.Size(0), "current")
-        expect(cursor).toBe(Fs.Size(6))
+        const cursor = yield* file.seek(BigInt(0), "current")
+        assert.strictEqual(cursor, BigInt(6))
       }).pipe(
         Effect.scoped
       )
@@ -402,10 +532,10 @@ export const testLayer = <E>(layer: Layer.Layer<Fs.FileSystem, E>, options: Test
         const file = yield* fs.open(path, { flag: "w+" })
 
         yield* file.write(new TextEncoder().encode("lorem ipsum dolor sit amet"))
-        yield* file.truncate(Fs.Size(11))
+        yield* file.truncate(11)
 
-        const cursor = yield* file.seek(Fs.Size(0), "current")
-        expect(cursor).toBe(Fs.Size(11))
+        const cursor = yield* file.seek(BigInt(0), "current")
+        assert.strictEqual(cursor, BigInt(11))
       }).pipe(
         Effect.scoped
       )
@@ -420,10 +550,10 @@ export const testLayer = <E>(layer: Layer.Layer<Fs.FileSystem, E>, options: Test
         const file = yield* fs.open(path, { flag: "w+" })
 
         yield* file.write(new TextEncoder().encode("abcdefghij"))
-        yield* file.truncate(Fs.Size(5))
+        yield* file.truncate(5)
         yield* fs.writeFile(path, new TextEncoder().encode("xyz"), { flag: "a" })
 
-        const text = yield* file.readAlloc(Fs.Size(3)).pipe(
+        const text = yield* file.readAlloc(3).pipe(
           Effect.flatMap(Effect.fromOption),
           Effect.map((_) => new TextDecoder().decode(_))
         )
diff --git a/repos/effect/packages/effect/test/Formatter.test.ts b/repos/effect/packages/effect/test/Formatter.test.ts
index 7d53b4f91..ae3db5370 100644
--- a/repos/effect/packages/effect/test/Formatter.test.ts
+++ b/repos/effect/packages/effect/test/Formatter.test.ts
@@ -163,6 +163,13 @@ describe("Formatter", () => {
     it("Error", () => {
       strictEqual(format(new Error("a")), `Error: a`)
       strictEqual(format(new Error("a", { cause: "b" })), `Error: a (cause: "b")`)
+      strictEqual(format(new Error("a", { cause: 0 })), `Error: a (cause: 0)`)
+      strictEqual(format(new Error("a", { cause: false })), `Error: a (cause: false)`)
+      strictEqual(format(new Error("a", { cause: "" })), `Error: a (cause: "")`)
+      strictEqual(format(new Error("a", { cause: null })), `Error: a (cause: null)`)
+      strictEqual(format(new Error("a", { cause: 0n })), `Error: a (cause: 0n)`)
+      strictEqual(format(new Error("a", { cause: Number.NaN })), `Error: a (cause: NaN)`)
+      strictEqual(format(new Error("a", { cause: undefined })), `Error: a`)
     })
 
     it("Date", () => {
@@ -497,7 +504,7 @@ describe("Formatter", () => {
     it("allows user-provided transformations to report their input", () => {
       const schema = Schema.String.pipe(
         Schema.decode({
-          decode: SchemaGetter.transformOrFail((input, options) =>
+          decode: SchemaGetter.transformEffect((input, options) =>
             Effect.fail(new SchemaIssue.InvalidValue(undefined, input, options))
           ),
           encode: SchemaGetter.passthrough()
@@ -563,38 +570,42 @@ describe("Formatter", () => {
       strictEqual(formatIssue(oneOf.failure), `Expected exactly one member to match the input "a"`)
     })
 
-    it("respects annotated parse options", () => {
-      const enabled = Schema.String.annotate({ parseOptions: { reportInput: true } })
-      const enabledResult = SchemaParser.decodeUnknownResult(enabled)(1, { reportInput: false })
+    it("runtime reportInput overrides preset options and reaches nested schemas", () => {
+      const enabledResult = SchemaParser.decodeUnknownResult(Schema.String, { reportInput: false })(1, {
+        reportInput: true
+      })
       assertTrue(Result.isFailure(enabledResult))
       strictEqual(enabledResult.failure.input, 1)
 
-      const disabled = Schema.String.annotate({ parseOptions: { reportInput: false } })
-      const disabledResult = SchemaParser.decodeUnknownResult(disabled)(1, { reportInput: true })
+      const disabledResult = SchemaParser.decodeUnknownResult(Schema.String, { reportInput: true })(1, {
+        reportInput: false
+      })
       assertTrue(Result.isFailure(disabledResult))
       assertFalse(SchemaIssue.hasInput(disabledResult.failure))
 
-      const nestedDisabled = Schema.Struct({ value: disabled })
+      const nested = Schema.Struct({ value: Schema.String })
       const nestedInput = { value: 1 }
-      const nestedResult = SchemaParser.decodeUnknownResult(nestedDisabled)(nestedInput, { reportInput: true })
+      const nestedResult = SchemaParser.decodeUnknownResult(nested)(nestedInput, { reportInput: true })
       assertTrue(Result.isFailure(nestedResult))
       assertTrue(nestedResult.failure._tag === "Composite")
       strictEqual(nestedResult.failure.input, nestedInput)
       const pointer = nestedResult.failure.issues[0]
       assertTrue(pointer._tag === "Pointer")
-      assertFalse(SchemaIssue.hasInput(pointer.issue))
+      assertTrue(SchemaIssue.hasInput(pointer.issue))
+      strictEqual(pointer.issue.input, 1)
     })
 
     it.effect("distinguishes present undefined from absent input in forbidden", () =>
       Effect.gen(function*() {
         const getter = SchemaGetter.forbidden<never, undefined>(() => "not allowed")
-        const present = yield* getter.run(Option.some(undefined), { reportInput: true }).pipe(Effect.flip)
+        assertTrue(getter._tag === "TransformOptionalEffect")
+        const present = yield* getter.transform(Option.some(undefined), { reportInput: true }).pipe(Effect.flip)
         assertTrue(present._tag === "Forbidden")
         assertTrue(SchemaIssue.hasInput(present))
         strictEqual(present.input, undefined)
         strictEqual(formatIssue(present), "not allowed")
 
-        const absent = yield* getter.run(Option.none(), { reportInput: true }).pipe(Effect.flip)
+        const absent = yield* getter.transform(Option.none(), { reportInput: true }).pipe(Effect.flip)
         assertTrue(absent._tag === "Forbidden")
         assertFalse(SchemaIssue.hasInput(absent))
       }))
diff --git a/repos/effect/packages/effect/test/Graph.test.ts b/repos/effect/packages/effect/test/Graph.test.ts
index f8a94c80d..5452034a9 100644
--- a/repos/effect/packages/effect/test/Graph.test.ts
+++ b/repos/effect/packages/effect/test/Graph.test.ts
@@ -1952,14 +1952,20 @@ describe("Graph", () => {
       )
     })
 
-    it("ignores negative cycles that cannot affect the Bellman-Ford target", () => {
-      const graph = directed([0, 1, 2, 3], [[0, 1, 1], [1, 2, -2], [2, 1, 1], [0, 3, 5]])
+    it("ignores negative cycles separated from the Bellman-Ford target by impassable edges", () => {
+      const graph = directed([0, 1, 2, 3], [[0, 1, 1], [1, 2, -2], [2, 1, 1], [0, 3, 5], [2, 3, Infinity]])
       const expected = { path: [0, 3], edges: [3], distance: 5, costs: [5] }
       assertPath(Graph.bellmanFord(graph, { source: 0, target: 3, cost: (edge) => edge }), expected)
       assertPath(
         Graph.bellmanFord(Graph.beginMutation(graph), { source: 0, target: 3, cost: (edge) => edge }),
         expected
       )
+
+      const unreachable = directed([0, 1, 2, 3], [[0, 1, 1], [1, 2, -2], [2, 1, 1], [2, 3, Infinity]])
+      assert.deepStrictEqual(
+        Graph.bellmanFord(unreachable, { source: 0, target: 3, cost: (edge) => edge }),
+        Option.none()
+      )
     })
 
     it("detects directed and undirected negative self-loops when source equals target", () => {
diff --git a/repos/effect/packages/effect/test/HashMap.test.ts b/repos/effect/packages/effect/test/HashMap.test.ts
index 719a8019c..b8210495a 100644
--- a/repos/effect/packages/effect/test/HashMap.test.ts
+++ b/repos/effect/packages/effect/test/HashMap.test.ts
@@ -156,6 +156,15 @@ describe("HashMap", () => {
       const entries = Array.from(map).sort(([a], [b]) => a.localeCompare(b))
       expect(entries).toEqual([["a", 1], ["b", 2]])
     })
+
+    it("does not expose mutable collision entries", () => {
+      const map = HashMap.make(["fF", 1], ["AA", 2])
+      const entry = Array.from(HashMap.entries(map)).find(([key]) => key === "fF")!
+
+      entry[1] = 99
+
+      expect(HashMap.getUnsafe(map, "fF")).toBe(1)
+    })
   })
 
   describe("bulk operations", () => {
diff --git a/repos/effect/packages/effect/test/HashRing.test.ts b/repos/effect/packages/effect/test/HashRing.test.ts
index a6bf6d2a8..b81534123 100644
--- a/repos/effect/packages/effect/test/HashRing.test.ts
+++ b/repos/effect/packages/effect/test/HashRing.test.ts
@@ -59,4 +59,24 @@ describe("HashRing", () => {
 
     assert.deepStrictEqual(shards, [[], [], [], [], [node], [node, node]])
   })
+
+  it("getShards considers the first ring entry when excluding allocated nodes", () => {
+    // With one ring entry per node, these keys make every shard nearest to
+    // `second`, so `first` at index 0 is reached only by the exclusion scan.
+    const first = {
+      [PrimaryKey.symbol]() {
+        return "node-10"
+      }
+    }
+    const second = {
+      [PrimaryKey.symbol]() {
+        return "node-29"
+      }
+    }
+    const ring = HashRing.make<typeof first>({ baseWeight: 1 })
+    HashRing.add(ring, first)
+    HashRing.add(ring, second)
+
+    assert.deepStrictEqual(HashRing.getShards(ring, 3)?.map(PrimaryKey.value), ["node-10", "node-29", "node-29"])
+  })
 })
diff --git a/repos/effect/packages/effect/test/HttpClient.test.ts b/repos/effect/packages/effect/test/HttpClient.test.ts
index 58ad6c0a3..3b2a16ba9 100644
--- a/repos/effect/packages/effect/test/HttpClient.test.ts
+++ b/repos/effect/packages/effect/test/HttpClient.test.ts
@@ -1,4 +1,4 @@
-import { expect, it } from "@effect/vitest"
+import { assert, expect, it } from "@effect/vitest"
 import { Context, Effect, Layer, Schema, Stream, Struct } from "effect"
 import { TestClock } from "effect/testing"
 import {
@@ -41,7 +41,7 @@ const JsonPlaceholderLayer = Layer.effect(JsonPlaceholder)(makeJsonPlaceholder)
 const TestRoutes = HttpRouter.serve(HttpRouter.use(Effect.fnUntraced(function*(router) {
   yield* router.addAll([
     HttpRouter.route("GET", "/", Effect.succeed(HttpServerResponse.text("test"))),
-    HttpRouter.route("GET", "/redirect", Effect.succeed(HttpServerResponse.redirect("/"))),
+    HttpRouter.route("GET", "/redirect", Effect.succeed(HttpServerResponse.redirect("/?value=a%23b#fragment"))),
     HttpRouter.route(
       "GET",
       "/stream",
@@ -118,10 +118,13 @@ const TestServerLayer = Layer.unwrap(Effect.promise(() =>
         const client = (yield* HttpClient.HttpClient).pipe(
           HttpClient.followRedirects()
         )
-        const response = yield* client.get("/redirect").pipe(
-          Effect.flatMap((_) => _.text)
-        )
-        expect(response).toBe("test")
+        const response = yield* client.get("/redirect")
+        // Fetch follows redirects natively and retains the original request.
+        expect(new URL(response.request.url).pathname).toBe("/redirect")
+        expect(new URL(response.url).pathname).toBe("/")
+        assert.strictEqual(new URL(response.url).search, "?value=a%23b")
+        assert.strictEqual(new URL(response.url).hash, "")
+        expect(yield* response.text).toBe("test")
       }).pipe(Effect.provide(testLayer)))
 
     it.effect("stream", () =>
diff --git a/repos/effect/packages/effect/test/JsonPointer.test.ts b/repos/effect/packages/effect/test/JsonPointer.test.ts
index 6707a2357..113be56ae 100644
--- a/repos/effect/packages/effect/test/JsonPointer.test.ts
+++ b/repos/effect/packages/effect/test/JsonPointer.test.ts
@@ -1,6 +1,6 @@
 import { describe, it } from "@effect/vitest"
 import { deepStrictEqual, strictEqual } from "@effect/vitest/utils"
-import { escapeToken, unescapeToken } from "effect/JsonPointer"
+import { escapeToken, formatUriFragment, parseUriFragment, unescapeToken } from "effect/JsonPointer"
 
 describe("JsonPointer", () => {
   describe("escapeToken", () => {
@@ -263,6 +263,88 @@ describe("JsonPointer", () => {
     })
   })
 
+  describe("parseUriFragment", () => {
+    it("parses the document root", () => {
+      deepStrictEqual(parseUriFragment(""), [])
+      deepStrictEqual(parseUriFragment("#"), [])
+    })
+
+    it("decodes percent-encoding before splitting tokens", () => {
+      deepStrictEqual(parseUriFragment("#/definitions/a%20b"), ["definitions", "a b"])
+      deepStrictEqual(parseUriFragment("#%2Fdefinitions%2FValue"), ["definitions", "Value"])
+      deepStrictEqual(parseUriFragment("#/definitions/a%25b"), ["definitions", "a%b"])
+      deepStrictEqual(parseUriFragment("#/definitions/caf%C3%A9"), ["definitions", "café"])
+    })
+
+    it("distinguishes encoded separators from escaped slashes", () => {
+      deepStrictEqual(parseUriFragment("#/$defs/Box%2Fproperties%2Fvalue"), [
+        "$defs",
+        "Box",
+        "properties",
+        "value"
+      ])
+      deepStrictEqual(parseUriFragment("#/$defs/Box~1properties~1value"), [
+        "$defs",
+        "Box/properties/value"
+      ])
+      deepStrictEqual(parseUriFragment("#/$defs/Box%7E1properties%7E1value"), [
+        "$defs",
+        "Box/properties/value"
+      ])
+    })
+
+    it("rejects invalid fragments", () => {
+      strictEqual(parseUriFragment("/a"), undefined)
+      strictEqual(parseUriFragment("#/%"), undefined)
+      strictEqual(parseUriFragment("#/%FF"), undefined)
+      strictEqual(parseUriFragment("#/a b"), undefined)
+      strictEqual(parseUriFragment("#/a#b"), undefined)
+      strictEqual(parseUriFragment("#/a\\b"), undefined)
+      strictEqual(parseUriFragment("#/café"), undefined)
+      strictEqual(parseUriFragment(`#/${String.fromCharCode(0xd800)}`), undefined)
+      strictEqual(parseUriFragment("#/a~2b"), undefined)
+      strictEqual(parseUriFragment("#/a~"), undefined)
+    })
+  })
+
+  describe("formatUriFragment", () => {
+    it("formats the document root", () => {
+      strictEqual(formatUriFragment([]), "#")
+    })
+
+    it("applies JSON Pointer escaping before URI percent-encoding", () => {
+      strictEqual(
+        formatUriFragment(["$defs", "a b", "a%b", "a/b", "café", "a#b"]),
+        "#/$defs/a%20b/a%25b/a~1b/caf%C3%A9/a%23b"
+      )
+    })
+
+    it("round trips path tokens", () => {
+      const paths = [
+        [],
+        [""],
+        ["$defs", "Rate%"],
+        ["a/b", "c~d"],
+        ["!$&'()*+,;=:@?"],
+        ["café", "世界", "🚀"]
+      ]
+      for (const path of paths) {
+        deepStrictEqual(parseUriFragment(formatUriFragment(path)), path)
+      }
+    })
+
+    it("throws for unpaired surrogates", () => {
+      const path = [String.fromCharCode(0xd800)]
+      let error: unknown
+      try {
+        formatUriFragment(path)
+      } catch (cause) {
+        error = cause
+      }
+      strictEqual(error instanceof URIError, true)
+    })
+  })
+
   describe("round-trip", () => {
     it("unescapeToken(escapeToken(token)) === token for basic cases", () => {
       const cases = [
diff --git a/repos/effect/packages/effect/test/Layer.test.ts b/repos/effect/packages/effect/test/Layer.test.ts
index a8f4bcd79..8d8662acd 100644
--- a/repos/effect/packages/effect/test/Layer.test.ts
+++ b/repos/effect/packages/effect/test/Layer.test.ts
@@ -1,5 +1,5 @@
 import { assert, describe, it } from "@effect/vitest"
-import { Channel, Context, Fiber, Stream, Tracer } from "effect"
+import { Channel, Context, Fiber, References, Stream, Tracer } from "effect"
 import * as Cause from "effect/Cause"
 import * as Data from "effect/Data"
 import * as Effect from "effect/Effect"
@@ -553,6 +553,36 @@ describe("Layer", () => {
   })
 
   describe("tracing", () => {
+    it.effect("withSpan forwards captureStackTrace to the layer stack frame", () =>
+      Effect.gen(function*() {
+        const Frame = Context.Service<References.StackFrame | undefined>("Frame")
+        const layer = Layer.effect(Frame, References.CurrentStackFrame)
+
+        // By default the frame records this call site, not Layer's internals.
+        const captured = yield* Effect.provide(Frame, Layer.withSpan(layer, "captured"))
+        assert.include(captured!.stack()!, "Layer.test.ts")
+
+        const disabled = yield* Effect.provide(
+          Frame,
+          layer.pipe(Layer.withSpan("disabled", { captureStackTrace: false }))
+        )
+        assert.isUndefined(disabled!.stack())
+
+        let calls = 0
+        const supplied = yield* Effect.provide(
+          Frame,
+          Layer.withSpan(layer, "supplied", {
+            captureStackTrace: () => {
+              calls++
+              return "at construct (app.ts:1:1)"
+            }
+          })
+        )
+        assert.strictEqual(calls, 0)
+        assert.strictEqual(supplied!.stack(), "at construct (app.ts:1:1)")
+        assert.strictEqual(calls, 1)
+      }))
+
     it.effect("withSpan supports data-first usage and runs the onEnd finalizer", () =>
       Effect.gen(function*() {
         // Edge case: the data-first overload has separate runtime branching, and onEnd
diff --git a/repos/effect/packages/effect/test/Logger.test.ts b/repos/effect/packages/effect/test/Logger.test.ts
index b121e1f40..e90a0e595 100644
--- a/repos/effect/packages/effect/test/Logger.test.ts
+++ b/repos/effect/packages/effect/test/Logger.test.ts
@@ -162,6 +162,31 @@ describe("Logger", () => {
       )
     }))
 
+  for (const initial of [{}, { measurement: "previous" }]) {
+    it.effect(`annotateLogsScoped ${"measurement" in initial ? "restores" : "removes"} NaN annotations`, () =>
+      Effect.gen(function*() {
+        const annotations: Array<Record<string, unknown>> = []
+        const logger = Logger.make<unknown, void>(({ fiber }) => {
+          annotations.push({ ...fiber.getRef(References.CurrentLogAnnotations) })
+        })
+        const scope = yield* Scope.make()
+
+        yield* Effect.gen(function*() {
+          yield* Effect.annotateLogsScoped("measurement", NaN)
+          yield* Effect.log("inside")
+          yield* Scope.close(scope, Exit.void)
+          yield* Effect.log("after close")
+        }).pipe(
+          Scope.provide(scope),
+          Effect.annotateLogs(initial),
+          Effect.provide(Logger.layer([logger])),
+          Effect.ensuring(Scope.close(scope, Exit.void))
+        )
+
+        assert.deepStrictEqual(annotations, [{ measurement: NaN }, initial])
+      }))
+  }
+
   it.effect("default logger preserves message item order when logging a cause", () =>
     Effect.gen(function*() {
       yield* Effect.log("first", Cause.fail("boom"), "second")
diff --git a/repos/effect/packages/effect/test/Metric.test.ts b/repos/effect/packages/effect/test/Metric.test.ts
index 5defa99be..16e9e4f0a 100644
--- a/repos/effect/packages/effect/test/Metric.test.ts
+++ b/repos/effect/packages/effect/test/Metric.test.ts
@@ -1,11 +1,46 @@
-import { assert, describe, it } from "@effect/vitest"
-import { Duration, Fiber, Metric, String } from "effect"
+import * as OtelMetrics from "@effect/opentelemetry/OtelMetrics"
+import * as Resource from "@effect/opentelemetry/Resource"
+import { assert, describe, it, vi } from "@effect/vitest"
+import { Duration, Fiber, Layer, Metric, Ref, String } from "effect"
 import * as Effect from "effect/Effect"
 import { TestClock } from "effect/testing"
+import { HttpClient, type HttpClientError, HttpClientResponse } from "effect/unstable/http"
+import { OtlpExporter, OtlpMetrics, OtlpSerialization } from "effect/unstable/observability"
 
 const attributes = { x: "a", y: "b" }
 
 describe("Metric", () => {
+  it.effect("keeps shared metrics scoped to the active registry", () =>
+    Effect.gen(function*() {
+      const counter = Metric.counter(nextId())
+      const registryA: Metric.MetricRegistry = new Map()
+      const registryB: Metric.MetricRegistry = new Map()
+
+      yield* Metric.update(counter, 1).pipe(Effect.provideService(Metric.MetricRegistry, registryA))
+      yield* Metric.update(counter, 10).pipe(Effect.provideService(Metric.MetricRegistry, registryB))
+      yield* Metric.update(counter, 2).pipe(Effect.provideService(Metric.MetricRegistry, registryA))
+
+      const valueA = yield* Metric.value(counter).pipe(Effect.provideService(Metric.MetricRegistry, registryA))
+      const valueB = yield* Metric.value(counter).pipe(Effect.provideService(Metric.MetricRegistry, registryB))
+      assert.deepStrictEqual(valueA, { count: 3, incremental: false })
+      assert.deepStrictEqual(valueB, { count: 10, incremental: false })
+    }))
+
+  it.effect("keeps attributed metrics scoped to the active registry", () =>
+    Effect.gen(function*() {
+      const counter = Metric.counter(nextId()).pipe(Metric.withAttributes(attributes))
+      const registryA: Metric.MetricRegistry = new Map()
+      const registryB: Metric.MetricRegistry = new Map()
+
+      yield* Metric.update(counter, 1).pipe(Effect.provideService(Metric.MetricRegistry, registryA))
+      yield* Metric.update(counter, 10).pipe(Effect.provideService(Metric.MetricRegistry, registryB))
+
+      const valueA = yield* Metric.value(counter).pipe(Effect.provideService(Metric.MetricRegistry, registryA))
+      const valueB = yield* Metric.value(counter).pipe(Effect.provideService(Metric.MetricRegistry, registryB))
+      assert.strictEqual(valueA.count, 1)
+      assert.strictEqual(valueB.count, 10)
+    }))
+
   it.effect("keeps distinct attribute sets in separate series", () =>
     Effect.gen(function*() {
       const id = nextId()
@@ -19,6 +54,89 @@ describe("Metric", () => {
       assert.strictEqual((yield* Metric.value(second)).count, 10)
     }))
 
+  it.effect("keeps equal attribute names with different values in separate series", () =>
+    Effect.gen(function*() {
+      const id = nextId()
+      const first = Metric.counter(id, { attributes: { route: "/users", method: "GET" } })
+      const second = Metric.counter(id, { attributes: { route: "/users", method: "POST" } })
+
+      yield* Metric.update(first, 1)
+      yield* Metric.update(second, 10)
+
+      assert.strictEqual((yield* Metric.value(first)).count, 1)
+    }))
+
+  it.effect("shares a series for equal attributes in different record orders", () =>
+    Effect.gen(function*() {
+      const id = nextId()
+      const first = Metric.counter(id, { attributes: { route: "/users", method: "GET" } })
+      const second = Metric.counter(id, { attributes: { method: "GET", route: "/users" } })
+
+      yield* Metric.update(first, 1)
+      yield* Metric.update(second, 10)
+
+      assert.strictEqual((yield* Metric.value(first)).count, 11)
+    }))
+
+  it.effect("shares a series after merging metric and contextual attributes", () =>
+    Effect.gen(function*() {
+      const id = nextId()
+      const first = Metric.counter(id, { attributes: { route: "/users" } })
+      const second = Metric.counter(id, { attributes: { method: "GET" } })
+      const firstContext = { method: "GET" }
+
+      yield* Metric.update(first, 1).pipe(Effect.provideService(Metric.CurrentMetricAttributes, firstContext))
+      yield* Metric.update(second, 10).pipe(
+        Effect.provideService(Metric.CurrentMetricAttributes, { route: "/users" })
+      )
+
+      assert.strictEqual(
+        (yield* Metric.value(first).pipe(Effect.provideService(Metric.CurrentMetricAttributes, firstContext))).count,
+        11
+      )
+    }))
+
+  it.effect("preserves attribute order in snapshots", () =>
+    Effect.gen(function*() {
+      const metric = Metric.counter(nextId(), { attributes: { route: "/users", method: "GET" } })
+
+      yield* Metric.update(metric, 1)
+      const snapshot = yield* Metric.snapshot
+
+      assert.deepStrictEqual(Object.keys(snapshot[0].attributes ?? {}), ["route", "method"])
+    }).pipe(Effect.provideService(Metric.MetricRegistry, new Map())))
+
+  it.effect.each([
+    { name: "counter", makeUpdate: () => Metric.update(Metric.counter(nextId()), 1) },
+    {
+      name: "histogram",
+      makeUpdate: () => Metric.update(Metric.histogram(nextId(), { boundaries: [1] }), 1)
+    },
+    { name: "frequency", makeUpdate: () => Metric.update(Metric.frequency(nextId()), "value") }
+  ])("uses collection interval starts for delta $name points", ({ makeUpdate }) =>
+    Effect.gen(function*() {
+      const now = yield* Effect.acquireRelease(
+        Effect.sync(() => vi.spyOn(Date, "now").mockReturnValue(1000)),
+        (now) => Effect.sync(() => now.mockRestore())
+      )
+      const producer = yield* OtelMetrics.makeProducer("delta").pipe(Effect.provide(Resource.layerEmpty))
+      const update = makeUpdate()
+      const intervals = []
+
+      for (const time of [2000, 3000]) {
+        now.mockReturnValue(time)
+        yield* update
+        const result = yield* Effect.promise(() => producer.collect())
+        const point = result.resourceMetrics.scopeMetrics[0].metrics[0].dataPoints[0]
+        intervals.push([point.startTime, point.endTime])
+      }
+
+      assert.deepStrictEqual(intervals, [
+        [[1, 0], [2, 0]],
+        [[2, 0], [3, 0]]
+      ])
+    }).pipe(Effect.provideService(Metric.MetricRegistry, new Map())))
+
   it.effect("should be referentially transparent", () =>
     Effect.gen(function*() {
       const id = nextId()
@@ -99,6 +217,62 @@ describe("Metric", () => {
   })
 
   describe("Counter", () => {
+    it.effect("exports negative updates as deltas", () =>
+      Effect.gen(function*() {
+        type ExportRequest = {
+          readonly resourceMetrics: ReadonlyArray<{
+            readonly scopeMetrics: ReadonlyArray<{
+              readonly metrics: ReadonlyArray<{
+                readonly name: string
+                readonly sum?: {
+                  readonly dataPoints: ReadonlyArray<{ readonly asDouble?: number }>
+                }
+              }>
+            }>
+          }>
+        }
+
+        const requests = yield* Ref.make<ReadonlyArray<ExportRequest>>([])
+        const client = HttpClient.makeWith(
+          Effect.fnUntraced(function*(requestEffect) {
+            const request = yield* requestEffect
+            if (request.body._tag === "Uint8Array") {
+              const body = JSON.parse(new TextDecoder().decode(request.body.body)) as ExportRequest
+              yield* Ref.update(requests, (requests) => [...requests, body])
+            }
+            return HttpClientResponse.fromWeb(request, new Response())
+          }),
+          Effect.succeed as HttpClient.HttpClient.Preprocess<HttpClientError.HttpClientError, never>
+        )
+        const layer = OtlpMetrics.layer({
+          url: "http://localhost:4318/v1/metrics",
+          resource: { serviceName: "test" },
+          temporality: "delta",
+          exportInterval: "1 hour"
+        }).pipe(
+          Layer.provide(OtlpSerialization.layerJson),
+          Layer.provideMerge(Layer.succeed(HttpClient.HttpClient, client))
+        )
+
+        const values = yield* Effect.gen(function*() {
+          const counter = Metric.counter("counter_delta")
+          const flusher = yield* OtlpExporter.Flusher
+          for (const update of [5, -2, 4]) {
+            yield* Metric.update(counter, update)
+            yield* flusher.flush
+          }
+          return (yield* Ref.get(requests)).map((request) =>
+            request.resourceMetrics[0].scopeMetrics[0].metrics.find((metric) => metric.name === "counter_delta")
+              ?.sum?.dataPoints[0].asDouble
+          )
+        }).pipe(
+          Effect.provide(layer),
+          Effect.provideService(Metric.MetricRegistry, new Map())
+        )
+
+        assert.deepStrictEqual(values, [5, -2, 4])
+      }))
+
     it.effect("custom increment with value", () =>
       Effect.gen(function*() {
         const id = nextId()
diff --git a/repos/effect/packages/effect/test/MutableList.test.ts b/repos/effect/packages/effect/test/MutableList.test.ts
index 0d8247625..5fec8cbe7 100644
--- a/repos/effect/packages/effect/test/MutableList.test.ts
+++ b/repos/effect/packages/effect/test/MutableList.test.ts
@@ -12,6 +12,14 @@ describe("MutableList", () => {
     strictEqual(list.length, 2)
   })
 
+  it("preserves bulk-prepended values when appending to the list", () => {
+    const list = MutableList.make<number>()
+    MutableList.prependAll(list, [1, 2])
+    MutableList.append(list, 3)
+
+    deepStrictEqual(MutableList.toArray(list), [1, 2, 3], "bulk-prepended values should be preserved")
+  })
+
   it("returns an empty snapshot for a negative bound", () => {
     const list = MutableList.make<number>()
     MutableList.append(list, 1)
diff --git a/repos/effect/packages/effect/test/Number.test.ts b/repos/effect/packages/effect/test/Number.test.ts
index 003c035d1..a5833b6d2 100644
--- a/repos/effect/packages/effect/test/Number.test.ts
+++ b/repos/effect/packages/effect/test/Number.test.ts
@@ -296,6 +296,7 @@ describe("remainder", () => {
   it("preserves the dividend sign, including negative zero", () => {
     assert.strictEqual(N.remainder(-5, 2), -1)
     assertNegativeZero(N.remainder(-4, 2))
+    assertNegativeZero(N.remainder(-0, 2))
   })
 
   it("preserves the dividend sign with negative divisors", () => {
diff --git a/repos/effect/packages/effect/test/Optic.test.ts b/repos/effect/packages/effect/test/Optic.test.ts
index 80ab2c11c..4de740664 100644
--- a/repos/effect/packages/effect/test/Optic.test.ts
+++ b/repos/effect/packages/effect/test/Optic.test.ts
@@ -351,6 +351,13 @@ describe("Optic", () => {
         deepStrictEqual(optic.modify(f)([1, 2]), [1, 3])
         deepStrictEqual(optic.modify(f)([1]), [1])
       })
+
+      it("string index", () => {
+        type S = readonly [number, number?, number?]
+        const optic = Optic.id<S>().optionalKey("1")
+
+        deepStrictEqual(optic.replace(undefined, [1, 2, 3]), [1, 3])
+      })
     })
 
     it("Array", () => {
@@ -481,6 +488,13 @@ Expected a value greater than 0`
 
       deepStrictEqual(optic.replace({ a: "a2", c: false }, { a: "a", b: 1, c: true }), { a: "a2", b: 1, c: false })
     })
+
+    it("deletes optional fields omitted from the replacement", () => {
+      type S = { readonly a?: string; readonly b: number }
+      const optic = Optic.id<S>().pick(["a"])
+
+      deepStrictEqual(optic.replace({}, { a: "a", b: 1 }), { b: 1 })
+    })
   })
 
   describe("omit", () => {
@@ -490,6 +504,13 @@ Expected a value greater than 0`
 
       deepStrictEqual(optic.replace({ a: "a2", c: false }, { a: "a", b: 1, c: true }), { a: "a2", b: 1, c: false })
     })
+
+    it("deletes optional fields omitted from the replacement", () => {
+      type S = { readonly a?: string; readonly b: number }
+      const optic = Optic.id<S>().omit(["b"])
+
+      deepStrictEqual(optic.replace({}, { a: "a", b: 1 }), { b: 1 })
+    })
   })
 
   describe("forEach", () => {
diff --git a/repos/effect/packages/effect/test/Order.test.ts b/repos/effect/packages/effect/test/Order.test.ts
index f75ef2764..a06904664 100644
--- a/repos/effect/packages/effect/test/Order.test.ts
+++ b/repos/effect/packages/effect/test/Order.test.ts
@@ -131,6 +131,12 @@ describe("Order", () => {
     deepStrictEqual(max(first, second), first)
   })
 
+  it("combineAll reuses finite criteria across comparisons", () => {
+    const O = Order.combineAll([Order.Number].values())
+    strictEqual(O(1, 2), -1)
+    strictEqual(O(1, 2), -1)
+  })
+
   it("combine", () => {
     type T = [number, string]
     const tuples: Array<T> = [
diff --git a/repos/effect/packages/effect/test/PartitionedSemaphore.test.ts b/repos/effect/packages/effect/test/PartitionedSemaphore.test.ts
index c5a547926..f3455e778 100644
--- a/repos/effect/packages/effect/test/PartitionedSemaphore.test.ts
+++ b/repos/effect/packages/effect/test/PartitionedSemaphore.test.ts
@@ -1,5 +1,5 @@
 import { assert, describe, it } from "@effect/vitest"
-import { Effect, Fiber, Option, PartitionedSemaphore } from "effect"
+import { Effect, Exit, Fiber, Option, PartitionedSemaphore, Scheduler } from "effect"
 
 describe("PartitionedSemaphore", () => {
   it.effect("module-level combinators delegate to the instance api", () =>
@@ -89,4 +89,47 @@ describe("PartitionedSemaphore", () => {
       assert.strictEqual(yield* PartitionedSemaphore.available(sem), 4)
       yield* PartitionedSemaphore.take(sem, "c", 4)
     }))
+
+  for (const key of ["other", "same"]) {
+    it.effect(`interrupting a resumed waiter preserves the next ${key}-key waiter`, () =>
+      Effect.gen(function*() {
+        const tasks: Array<() => void> = []
+        let shouldYield = false
+        const scheduler: Scheduler.Scheduler = {
+          executionMode: "async",
+          makeDispatcher() {
+            return {
+              scheduleTask(task) {
+                tasks.push(task)
+              },
+              flush() {}
+            }
+          },
+          shouldYield: () => {
+            if (!shouldYield) return false
+            shouldYield = false
+            return true
+          }
+        }
+
+        const sem = yield* PartitionedSemaphore.make<string>({ permits: 1 })
+        yield* sem.take("holder", 1)
+        const first = yield* sem.take("same", 1).pipe(
+          Effect.provideService(Scheduler.Scheduler, scheduler),
+          Effect.forkChild({ startImmediately: true })
+        )
+
+        // Pause the selected waiter before its take effect finishes.
+        shouldYield = true
+        yield* sem.release(1)
+        const next = yield* sem.take(key, 1).pipe(Effect.forkChild({ startImmediately: true }))
+        yield* Fiber.interrupt(first)
+        while (tasks.length > 0) tasks.shift()!()
+
+        const exit = next.pollUnsafe()
+        yield* Fiber.interrupt(next)
+
+        assert.deepStrictEqual(exit, Exit.void)
+      }))
+  }
 })
diff --git a/repos/effect/packages/effect/test/Pool.test.ts b/repos/effect/packages/effect/test/Pool.test.ts
index 75ea733cc..0b8d09bb6 100644
--- a/repos/effect/packages/effect/test/Pool.test.ts
+++ b/repos/effect/packages/effect/test/Pool.test.ts
@@ -2,6 +2,7 @@ import { assert, describe, it } from "@effect/vitest"
 import { deepStrictEqual, strictEqual } from "@effect/vitest/utils"
 import { Deferred, Duration, Effect, Exit, Fiber, pipe, Pool, Ref, Schedule, Scope } from "effect"
 import { TestClock } from "effect/testing"
+import { collectGarbage } from "./utils/gc.ts"
 
 describe("Pool", () => {
   it.effect("preallocates pool items", () =>
@@ -308,6 +309,167 @@ describe("Pool", () => {
       yield* Scope.close(scope1, Exit.void)
     }))
 
+  it.effect("releasing a shared borrower preserves an active reservation", () =>
+    Effect.gen(function*() {
+      const pool = yield* Pool.make({ acquire: Effect.succeed("resource"), size: 1, concurrency: 2 })
+      const owner = yield* Scope.make()
+      const borrower = yield* Scope.make()
+      const reservation = yield* Scope.make()
+      yield* Pool.get(pool).pipe(Scope.provide(owner))
+      yield* Pool.get(pool).pipe(Scope.provide(borrower))
+      yield* Pool.reserve(pool, "resource").pipe(Scope.provide(reservation))
+
+      yield* Scope.close(borrower, Exit.void)
+      const next = yield* Pool.use(pool, Effect.succeed).pipe(Effect.forkChild({ startImmediately: true }))
+      const beforeRelease = next.pollUnsafe()
+      yield* Scope.close(reservation, Exit.void)
+      const result = yield* Fiber.join(next)
+      yield* Scope.close(owner, Exit.void)
+
+      assert.isUndefined(beforeRelease)
+      assert.strictEqual(result, "resource")
+    }))
+
+  it.effect("overlapping reservations keep an item reserved until both close", () =>
+    Effect.gen(function*() {
+      const pool = yield* Pool.make({ acquire: Effect.succeed("resource"), size: 1, concurrency: 2 })
+      const owner = yield* Scope.make()
+      const first = yield* Scope.make()
+      const second = yield* Scope.make()
+      yield* Pool.get(pool).pipe(Scope.provide(owner))
+      yield* Pool.reserve(pool, "resource").pipe(Scope.provide(first))
+      yield* Pool.reserve(pool, "resource").pipe(Scope.provide(second))
+      // One lease plus one reservation; the overlapping reservation must not
+      // count usage again.
+      assert.strictEqual(pool.state.usage, 2)
+
+      yield* Scope.close(first, Exit.void)
+      assert.strictEqual(pool.state.usage, 2)
+      const next = yield* Pool.use(pool, Effect.succeed).pipe(Effect.forkChild({ startImmediately: true }))
+      const beforeRelease = next.pollUnsafe()
+      yield* Scope.close(second, Exit.void)
+      const result = yield* Fiber.join(next)
+      yield* Scope.close(owner, Exit.void)
+
+      assert.isUndefined(beforeRelease)
+      assert.strictEqual(result, "resource")
+      assert.strictEqual(pool.state.usage, 0)
+    }))
+
+  it.effect("releasing a reservation wakes all available slots after borrowers return", () =>
+    Effect.gen(function*() {
+      const pool = yield* Pool.make({ acquire: Effect.succeed("resource"), size: 1, concurrency: 2 })
+      const owner = yield* Scope.make()
+      const reservation = yield* Scope.make()
+      const borrowers = yield* Scope.make()
+      yield* Pool.get(pool).pipe(Scope.provide(owner))
+      yield* Pool.reserve(pool, "resource").pipe(Scope.provide(reservation))
+      yield* Scope.close(owner, Exit.void)
+
+      const first = yield* Pool.get(pool).pipe(Scope.provide(borrowers), Effect.forkChild({ startImmediately: true }))
+      const second = yield* Pool.get(pool).pipe(Scope.provide(borrowers), Effect.forkChild({ startImmediately: true }))
+      const beforeRelease = [first.pollUnsafe(), second.pollUnsafe()]
+      yield* Scope.close(reservation, Exit.void)
+      yield* TestClock.adjust(0)
+      const afterRelease = [first.pollUnsafe(), second.pollUnsafe()]
+      yield* Fiber.interrupt(first)
+      yield* Fiber.interrupt(second)
+      yield* Scope.close(borrowers, Exit.void)
+
+      assert.deepStrictEqual(beforeRelease, [undefined, undefined])
+      assert.deepStrictEqual(afterRelease, [Exit.succeed("resource"), Exit.succeed("resource")])
+      assert.strictEqual(pool.state.usage, 0)
+    }))
+
+  it.effect("usage TTL reclaim skips reserved items", () =>
+    Effect.gen(function*() {
+      let acquired = 0
+      const pool = yield* Pool.makeWithTTL({
+        acquire: Effect.sync(() => ++acquired),
+        min: 0,
+        max: 2,
+        concurrency: 2,
+        timeToLive: 1000
+      })
+      const owner = yield* Scope.make()
+      const reservation = yield* Scope.make()
+      yield* Pool.get(pool).pipe(Scope.provide(owner))
+      yield* Pool.reserve(pool, 1).pipe(Scope.provide(reservation))
+      yield* Pool.use(pool, Effect.succeed)
+      yield* TestClock.adjust(1000)
+
+      const first = yield* Pool.get(pool).pipe(Scope.provide(owner))
+      yield* TestClock.adjust(0)
+      const second = yield* Pool.get(pool).pipe(Scope.provide(owner))
+      // The invalidated item 1 is still reserved, so reclaim must not
+      // un-invalidate it; the waiter is served by a fresh item instead.
+      const result = yield* Pool.use(pool, Effect.succeed)
+      yield* Scope.close(reservation, Exit.void)
+      yield* Scope.close(owner, Exit.void)
+
+      assert.deepStrictEqual([first, second], [2, 2])
+      assert.strictEqual(result, 3)
+      assert.strictEqual(acquired, 3)
+      assert.strictEqual(pool.state.usage, 0)
+    }))
+
+  it.effect("reserve is a no-op with concurrency one", () =>
+    Effect.gen(function*() {
+      const pool = yield* Pool.make({ acquire: Effect.succeed("resource"), size: 1 })
+      const owner = yield* Scope.make()
+      const reservation = yield* Scope.make()
+      yield* Pool.get(pool).pipe(Scope.provide(owner))
+      yield* Pool.reserve(pool, "resource").pipe(Scope.provide(reservation))
+      yield* Scope.close(owner, Exit.void)
+
+      const next = yield* Pool.use(pool, Effect.succeed).pipe(Effect.forkChild({ startImmediately: true }))
+      const beforeRelease = next.pollUnsafe()
+      yield* Scope.close(reservation, Exit.void)
+      yield* Fiber.interrupt(next)
+
+      assert.deepStrictEqual(beforeRelease, Exit.succeed("resource"))
+    }))
+
+  it.effect.each([false, true])(
+    "reservation cleanup does not revive removed items (shutdown: %s)",
+    (shutdown) =>
+      Effect.gen(function*() {
+        let acquired = 0
+        const released: Array<number> = []
+        const poolScope = yield* Scope.make()
+        const owner = yield* Scope.make()
+        const reservation = yield* Scope.make()
+        const pool = yield* Pool.make({
+          acquire: Effect.acquireRelease(
+            Effect.sync(() => ++acquired),
+            (item) => Effect.sync(() => released.push(item))
+          ),
+          size: 1,
+          concurrency: 2
+        }).pipe(Scope.provide(poolScope))
+        yield* Pool.get(pool).pipe(Scope.provide(owner))
+        yield* Pool.reserve(pool, 1).pipe(Scope.provide(reservation))
+        yield* Scope.close(owner, Exit.void)
+        if (shutdown) {
+          yield* Scope.close(poolScope, Exit.void)
+        } else {
+          yield* Pool.invalidate(pool, 1)
+        }
+        yield* Scope.close(reservation, Exit.void)
+        const next = yield* Effect.exit(Pool.use(pool, Effect.succeed))
+        yield* Scope.close(poolScope, Exit.void)
+
+        if (shutdown) {
+          assert.isTrue(Exit.hasInterrupts(next))
+          assert.deepStrictEqual(released, [1])
+        } else {
+          assert.deepStrictEqual(next, Exit.succeed(2))
+          assert.deepStrictEqual(released, [1, 2])
+        }
+        assert.strictEqual(pool.state.usage, 0)
+      })
+  )
+
   it.effect("scale to zero", () =>
     Effect.gen(function*() {
       const deferred = yield* Deferred.make<void>()
@@ -568,6 +730,47 @@ describe("Pool", () => {
       strictEqual(yield* Ref.get(allocations), 10)
       strictEqual(yield* Ref.get(released), 10)
     }))
+  it.effect("skips strategy callbacks for failures consumed during finalization", () =>
+    Effect.gen(function*() {
+      const cleanupStarted = yield* Deferred.make<void>()
+      const resumeCleanup = yield* Deferred.make<void>()
+      const replacementAcquired = yield* Deferred.make<void>()
+      let acquired = 0
+      let callbacks = 0
+      const pool = yield* Pool.makeWithStrategy({
+        acquire: Effect.gen(function*() {
+          if (++acquired > 1) return "replacement"
+          yield* Effect.addFinalizer(() =>
+            Effect.andThen(
+              Deferred.succeed(cleanupStarted, undefined),
+              Deferred.await(resumeCleanup)
+            )
+          )
+          return yield* Effect.fail("boom")
+        }),
+        min: 1,
+        max: 2,
+        strategy: {
+          run: () => Effect.void,
+          reclaim: () => Effect.undefined,
+          onAcquire: (item) =>
+            Effect.gen(function*() {
+              callbacks++
+              if (Exit.isSuccess(item.exit)) yield* Deferred.succeed(replacementAcquired, undefined)
+            })
+        }
+      })
+      yield* Effect.addFinalizer(() => Deferred.succeed(resumeCleanup, undefined))
+      yield* Deferred.await(cleanupStarted)
+      strictEqual(yield* Effect.flip(Effect.scoped(Pool.get(pool))), "boom")
+      strictEqual(callbacks, 0)
+      yield* Deferred.succeed(resumeCleanup, undefined)
+      strictEqual(yield* Effect.scoped(Pool.get(pool)), "replacement")
+      yield* Deferred.await(replacementAcquired)
+      strictEqual(acquired, 2)
+      strictEqual(callbacks, 1)
+    }))
+
   it.effect("admits one waiter per released lease", () =>
     Effect.gen(function*() {
       const acquired = yield* Ref.make(0)
@@ -598,4 +801,218 @@ describe("Pool", () => {
       strictEqual(yield* Ref.get(acquired), 8)
       strictEqual(pool.state.usage, 0)
     }))
+
+  describe.skipIf(process.versions.bun !== undefined || process.versions.deno !== undefined)(
+    "usage TTL retention",
+    () => {
+      it.effect("releases invalidated resources while at minimum size", () =>
+        Effect.gen(function*() {
+          const references: Array<WeakRef<object>> = []
+          const control = new WeakRef({})
+          let finalized = 0
+          const pool = yield* Pool.makeWithTTL({
+            acquire: Effect.acquireRelease(
+              Effect.sync(() => ({})),
+              () =>
+                Effect.sync(() => {
+                  finalized++
+                })
+            ),
+            min: 1,
+            max: 2,
+            timeToLive: "1 hour"
+          })
+          for (let i = 0; i < 2; i++) {
+            yield* Effect.scoped(Effect.gen(function*() {
+              const value = yield* Pool.get(pool)
+              references.push(new WeakRef(value))
+              yield* Pool.invalidate(pool, value)
+            }))
+          }
+          strictEqual(finalized, 2)
+          yield* collectGarbage
+          assert.isUndefined(control.deref())
+          for (const reference of references) assert.isUndefined(reference.deref())
+          strictEqual(pool.state.items.size, 1)
+        }))
+
+      it.effect("releases consumed acquisition failures", () =>
+        Effect.gen(function*() {
+          const references: Array<WeakRef<object>> = []
+          const control = new WeakRef({})
+          const pool = yield* Pool.makeWithTTL({
+            acquire: Effect.suspend(() => {
+              const error = {}
+              references.push(new WeakRef(error))
+              return Effect.fail(error)
+            }),
+            min: 0,
+            max: 2,
+            timeToLive: "1 hour"
+          })
+          for (let i = 0; i < 2; i++) {
+            assert.isTrue(Exit.isFailure(yield* Effect.exit(Effect.scoped(Pool.get(pool)))))
+          }
+          assert.lengthOf(references, 2)
+          yield* collectGarbage
+          assert.isUndefined(control.deref())
+          for (const reference of references) assert.isUndefined(reference.deref())
+          strictEqual(pool.state.items.size, 0)
+        }))
+
+      it.effect("does not requeue failures consumed during asynchronous cleanup", () =>
+        Effect.gen(function*() {
+          const references: Array<WeakRef<object>> = []
+          const control = new WeakRef({})
+          const cleanupStarted = yield* Deferred.make<void>()
+          const resumeCleanup = yield* Deferred.make<void>()
+          let acquired = 0
+          let finalized = 0
+          const pool = yield* Pool.makeWithTTL({
+            acquire: Effect.gen(function*() {
+              if (++acquired > 1) return "replacement"
+              yield* Effect.addFinalizer(() =>
+                Effect.gen(function*() {
+                  yield* Deferred.succeed(cleanupStarted, undefined)
+                  yield* Deferred.await(resumeCleanup)
+                  finalized++
+                })
+              )
+              const error = {}
+              references.push(new WeakRef(error))
+              return yield* Effect.fail(error)
+            }),
+            min: 1,
+            max: 2,
+            timeToLive: "1 hour"
+          })
+          yield* Effect.addFinalizer(() => Deferred.succeed(resumeCleanup, undefined))
+          yield* Deferred.await(cleanupStarted)
+          assert.isTrue(Exit.isFailure(yield* Effect.exit(Effect.scoped(Pool.get(pool)))))
+          strictEqual(finalized, 0)
+          yield* Deferred.succeed(resumeCleanup, undefined)
+          strictEqual(yield* Effect.scoped(Pool.get(pool)), "replacement")
+          strictEqual(acquired, 2)
+          strictEqual(finalized, 1)
+          assert.lengthOf(references, 1)
+          yield* collectGarbage
+          assert.isUndefined(control.deref())
+          assert.isUndefined(references[0].deref())
+          strictEqual(pool.state.items.size, 1)
+        }))
+
+      it.effect("releases resources after shutdown while the pool remains reachable", () =>
+        Effect.gen(function*() {
+          const references: Array<WeakRef<object>> = []
+          const control = new WeakRef({})
+          let finalized = 0
+          const scope = yield* Scope.fork(yield* Effect.scope)
+          const pool = yield* Pool.makeWithTTL({
+            acquire: Effect.acquireRelease(
+              Effect.sync(() => ({})),
+              () =>
+                Effect.sync(() => {
+                  finalized++
+                })
+            ),
+            min: 1,
+            max: 2,
+            timeToLive: "1 hour"
+          }).pipe(Scope.provide(scope))
+          yield* Pool.use(pool, (value) =>
+            Effect.sync(() => {
+              references.push(new WeakRef(value))
+            }))
+          yield* Scope.close(scope, Exit.void)
+          strictEqual(finalized, 1)
+          assert.lengthOf(references, 1)
+          yield* collectGarbage
+          assert.isUndefined(control.deref())
+          assert.isUndefined(references[0].deref())
+          strictEqual(pool.state.items.size, 0)
+        }))
+    }
+  )
+
+  it.effect("invalidating a busy item waits for its last lease and finalizes once", () =>
+    Effect.gen(function*() {
+      const finalized: Array<number> = []
+      let acquired = 0
+      yield* Effect.scoped(Effect.gen(function*() {
+        const pool = yield* Pool.makeWithTTL({
+          acquire: Effect.acquireRelease(
+            Effect.sync(() => ++acquired),
+            (value) =>
+              Effect.sync(() => {
+                finalized.push(value)
+              })
+          ),
+          min: 1,
+          max: 2,
+          concurrency: 2,
+          timeToLive: "1 hour"
+        })
+        const first = yield* Scope.fork(yield* Effect.scope)
+        const second = yield* Scope.fork(yield* Effect.scope)
+        const value = yield* Scope.provide(Pool.get(pool), first)
+        strictEqual(yield* Scope.provide(Pool.get(pool), second), value)
+        yield* Pool.invalidate(pool, value)
+        deepStrictEqual(finalized, [])
+        yield* Scope.close(first, Exit.void)
+        deepStrictEqual(finalized, [])
+        yield* Scope.close(second, Exit.void)
+        deepStrictEqual(finalized, [value])
+        strictEqual(yield* Effect.scoped(Pool.get(pool)), 2)
+      }))
+      deepStrictEqual(finalized, [1, 2])
+    }))
+
+  for (const [removal, removed] of [["no", undefined], ["middle", 2], ["tail", 3]] as const) {
+    it.effect(`usage TTL preserves FIFO retirement and minimum size after ${removal} removal`, () =>
+      Effect.gen(function*() {
+        let acquired = 0
+        const finalized: Array<number> = []
+        const pool = yield* Pool.makeWithTTL({
+          acquire: Effect.acquireRelease(
+            Effect.sync(() => ++acquired),
+            (value) =>
+              Effect.sync(() => {
+                finalized.push(value)
+              })
+          ),
+          min: 1,
+          max: 3,
+          timeToLive: "1 second"
+        })
+        yield* Effect.scoped(Effect.gen(function*() {
+          for (let i = 0; i < 3; i++) yield* Pool.get(pool)
+          strictEqual(acquired, 3)
+        }))
+        if (removed !== undefined) {
+          yield* Pool.invalidate(pool, removed)
+          deepStrictEqual(finalized, [removed])
+          yield* Effect.scoped(Effect.gen(function*() {
+            for (let i = 0; i < 3; i++) yield* Pool.get(pool)
+            strictEqual(acquired, 4)
+          }))
+        }
+        const expected = removed === undefined ? [1, 2] : [removed, ...[1, 2, 3].filter((n) => n !== removed)]
+        yield* TestClock.adjust("1 second")
+        deepStrictEqual(finalized, expected)
+        yield* TestClock.adjust("5 seconds")
+        deepStrictEqual(finalized, expected)
+        strictEqual(pool.state.items.size, 1)
+        strictEqual(yield* Effect.scoped(Pool.get(pool)), removed === undefined ? 3 : 4)
+        if (removed !== undefined) {
+          yield* Effect.scoped(Effect.gen(function*() {
+            for (let i = 0; i < 3; i++) yield* Pool.get(pool)
+            strictEqual(acquired, 6)
+          }))
+          yield* TestClock.adjust("1 second")
+          deepStrictEqual(finalized, [...expected, 4, 5])
+          strictEqual(pool.state.items.size, 1)
+          strictEqual(yield* Effect.scoped(Pool.get(pool)), 6)
+        }
+      }))
+  }
 })
diff --git a/repos/effect/packages/effect/test/PubSub.test.ts b/repos/effect/packages/effect/test/PubSub.test.ts
index 62070a478..18cc1f124 100644
--- a/repos/effect/packages/effect/test/PubSub.test.ts
+++ b/repos/effect/packages/effect/test/PubSub.test.ts
@@ -1,8 +1,49 @@
 import { assert, describe, it } from "@effect/vitest"
-import { Array, Effect, Exit, Fiber, Latch, PubSub, Stream } from "effect"
+import { Array, Effect, Exit, Fiber, Latch, MutableList, PubSub, Scope, Stream } from "effect"
 import { pipe } from "effect/Function"
 
 describe("PubSub", () => {
+  for (const batch of [false, true]) {
+    it.effect.each([1, 2, 3])(
+      `sliding capacity %s delivers each retained message once per subscriber (batch: ${batch})`,
+      (capacity) =>
+        Effect.gen(function*() {
+          const pubsub = yield* PubSub.sliding<number>(capacity)
+          const first = yield* PubSub.subscribe(pubsub)
+          const second = yield* PubSub.subscribe(pubsub)
+          const values = Array.range(1, capacity + 2)
+          const retained = values.slice(-capacity)
+          yield* PubSub.publishAll(pubsub, values)
+
+          const received = batch
+            ? yield* PubSub.takeAll(first)
+            : yield* Effect.forEach(retained, () => PubSub.take(first))
+          const duplicate = yield* PubSub.takeUpTo(first, capacity)
+          const other = yield* PubSub.takeUpTo(second, capacity)
+
+          assert.deepStrictEqual([received, duplicate, other], [retained, [], retained])
+        })
+    )
+  }
+
+  it.effect.each([1, 2, 3])(
+    "unsubscribing after a slide preserves the other subscriber's messages (capacity: %s)",
+    (capacity) =>
+      Effect.gen(function*() {
+        const pubsub = yield* PubSub.sliding<number>(capacity)
+        const scope = yield* Scope.make()
+        const first = yield* PubSub.subscribe(pubsub).pipe(Scope.provide(scope))
+        const second = yield* PubSub.subscribe(pubsub)
+        const values = Array.range(1, capacity + 2)
+        const retained = values.slice(-capacity)
+        yield* PubSub.publishAll(pubsub, values)
+        yield* PubSub.takeAll(first)
+        yield* Scope.close(scope, Exit.void)
+
+        assert.deepStrictEqual(yield* PubSub.takeUpTo(second, capacity), retained)
+      })
+  )
+
   it.effect("publishAll - capacity 2 (BoundedPubSubPow2)", () => {
     const messages = [1, 2]
     return PubSub.bounded<number>(2).pipe(
@@ -421,6 +462,27 @@ describe("PubSub", () => {
     assert.deepStrictEqual(replay.takeAll(), [2, 3])
   })
 
+  it("polls MutableList.Empty as a value", () => {
+    const pubsub = PubSub.makeAtomicBounded<symbol>(1)
+    const subscription = pubsub.subscribe()
+    pubsub.publish(MutableList.Empty)
+
+    assert.deepStrictEqual(subscription.pollUpTo(1), [MutableList.Empty])
+  })
+
+  it("publishes after a capacity-one subscriber unsubscribes from a slid message", () => {
+    const pubsub = PubSub.makeAtomicBounded<number>(1)
+    const subscription = pubsub.subscribe()
+    pubsub.publish(1)
+    pubsub.slide()
+    subscription.unsubscribe()
+
+    const next = pubsub.subscribe()
+    assert.isTrue(pubsub.publish(2))
+    assert.strictEqual(pubsub.size(), 1)
+    assert.deepStrictEqual(next.pollUpTo(1), [2])
+  })
+
   describe("replay", () => {
     it("does not retain values published after the replay window is drained", () => {
       const pubsub = PubSub.makeAtomicUnbounded<object>({ replay: 1 })
diff --git a/repos/effect/packages/effect/test/Queue.test.ts b/repos/effect/packages/effect/test/Queue.test.ts
index 21aabab61..5eae9e52c 100644
--- a/repos/effect/packages/effect/test/Queue.test.ts
+++ b/repos/effect/packages/effect/test/Queue.test.ts
@@ -1,5 +1,6 @@
 import { assert, describe, it } from "@effect/vitest"
 import { Cause, Effect, Exit, Fiber, Option, Queue, Stream } from "effect"
+import * as Scheduler from "effect/Scheduler"
 
 describe("Queue", () => {
   it.effect("isEnqueue type guard", () =>
@@ -69,6 +70,95 @@ describe("Queue", () => {
       assert.deepStrictEqual(fiber.pollUnsafe(), Exit.succeed([]))
     }))
 
+  it.effect("resuming a blocked producer does not enqueue its message twice", () =>
+    Effect.gen(function*() {
+      const queue = yield* Queue.bounded<number>(1)
+      yield* Queue.offer(queue, 0)
+      const producer = yield* Effect.forkChild(
+        Effect.gen(function*() {
+          yield* Queue.offer(queue, 1)
+          return yield* Queue.take(queue)
+        }),
+        { startImmediately: true }
+      )
+
+      const first = yield* Queue.take(queue)
+      const second = yield* Fiber.join(producer)
+      const remaining = yield* Queue.clear(queue)
+      yield* Queue.shutdown(queue)
+
+      assert.deepStrictEqual([first, second], [0, 1])
+      assert.deepStrictEqual(remaining, [])
+    }))
+
+  for (const method of ["offer", "offerAll"]) {
+    for (const take of ["take", "takeAll", "clear"]) {
+      it.effect(`zero-capacity ${take} reserves the message before resuming ${method}`, () =>
+        Effect.gen(function*() {
+          const queue = yield* Queue.bounded<number>(0)
+          const producer = yield* Effect.forkChild(
+            Effect.gen(function*() {
+              if (method === "offer") yield* Queue.offer(queue, 1)
+              else yield* Queue.offerAll(queue, [1])
+              return yield* Queue.take(queue)
+            }),
+            { startImmediately: true }
+          )
+
+          const first = take === "take"
+            ? [yield* Queue.take(queue)]
+            : take === "takeAll"
+            ? yield* Queue.takeAll(queue)
+            : yield* Queue.clear(queue)
+          const producerExit = producer.pollUnsafe()
+          yield* Queue.shutdown(queue)
+
+          assert.deepStrictEqual({ first, producerExit }, { first: [1], producerExit: undefined })
+        }))
+    }
+
+    it.effect(`resuming ${method} can shut down the queue without defecting the consumer`, () =>
+      Effect.gen(function*() {
+        const queue = yield* Queue.bounded<number>(1)
+        yield* Queue.offer(queue, 0)
+        const producer = yield* Effect.forkChild(
+          Effect.gen(function*() {
+            if (method === "offer") yield* Queue.offer(queue, 1)
+            else yield* Queue.offerAll(queue, [1])
+            yield* Queue.shutdown(queue)
+          }),
+          { startImmediately: true }
+        )
+
+        const exit = yield* Effect.exit(Queue.take(queue))
+        yield* Fiber.join(producer)
+
+        assert.deepStrictEqual(exit, Exit.succeed(0))
+      }))
+
+    it.effect(`resuming ${method} does not overfill the queue with reentrant offers`, () =>
+      Effect.gen(function*() {
+        const queue = yield* Queue.bounded<number>(2)
+        yield* Queue.offerAll(queue, [0, 1])
+        yield* Effect.forkChild(
+          Effect.gen(function*() {
+            if (method === "offer") yield* Queue.offer(queue, 2)
+            else yield* Queue.offerAll(queue, [2])
+            yield* Queue.offer(queue, 3)
+          }),
+          { startImmediately: true }
+        )
+        yield* Effect.forkChild(Queue.offer(queue, 4), { startImmediately: true })
+
+        const first = yield* Queue.takeAll(queue)
+        const size = Queue.sizeUnsafe(queue)
+        yield* Queue.shutdown(queue)
+
+        assert.deepStrictEqual(first, [0, 1])
+        assert.isAtMost(size, 2)
+      }))
+  }
+
   it.effect("takeN", () =>
     Effect.gen(function*() {
       const queue = yield* Queue.unbounded<number>()
@@ -303,6 +393,70 @@ describe("Queue", () => {
       assert.strictEqual(yield* Queue.offer(queue, 10), false)
     }))
 
+  it.effect("shutdownUnsafe interrupts waiting takers synchronously", () =>
+    Effect.gen(function*() {
+      const queue = yield* Queue.unbounded<number>()
+      const taker = yield* Queue.take(queue).pipe(Effect.forkChild({ startImmediately: true }))
+
+      Queue.shutdownUnsafe(queue)
+
+      assert.isTrue(Exit.hasInterrupts(taker.pollUnsafe()!))
+    }))
+
+  it.effect("shutdownUnsafe clears buffered messages and settles pending offers synchronously", () =>
+    Effect.gen(function*() {
+      const queue = yield* Queue.bounded<number>(1)
+      Queue.offerUnsafe(queue, 1)
+      const offerer = yield* Queue.offer(queue, 2).pipe(Effect.forkChild({ startImmediately: true }))
+
+      Queue.shutdownUnsafe(queue)
+
+      assert.strictEqual(queue.messages.length, 0)
+      assert.deepStrictEqual(offerer.pollUnsafe(), Exit.succeed(false))
+    }))
+
+  it.effect("shutdownUnsafe resumes batch offers with their unaccepted suffix", () =>
+    Effect.gen(function*() {
+      const queue = yield* Queue.bounded<number>(1)
+      const producer = yield* Queue.offerAll(queue, [1, 2, 3]).pipe(
+        Effect.forkChild({ startImmediately: true })
+      )
+      assert.strictEqual(yield* Queue.take(queue), 1)
+
+      Queue.shutdownUnsafe(queue)
+
+      assert.deepStrictEqual(producer.pollUnsafe(), Exit.succeed([3]))
+    }))
+
+  it.effect("shutdownUnsafe returns true and preserves an existing failure", () =>
+    Effect.gen(function*() {
+      const queue = yield* Queue.unbounded<number, string>()
+      Queue.offerUnsafe(queue, 1)
+      Queue.failCauseUnsafe(queue, Cause.fail("boom"))
+
+      assert.isTrue(Queue.shutdownUnsafe(queue))
+
+      assert.strictEqual(yield* Queue.take(queue).pipe(Effect.flip), "boom")
+    }))
+
+  it.effect("shutdownUnsafe returns false when already shut down", () =>
+    Effect.gen(function*() {
+      const queue = yield* Queue.unbounded<number>()
+
+      assert.isTrue(Queue.shutdownUnsafe(queue))
+      assert.isFalse(Queue.shutdownUnsafe(queue))
+      assert.isTrue(Exit.hasInterrupts(yield* Effect.exit(Queue.await(queue))))
+    }))
+
+  it.effect("shutdown returns false and preserves a completed queue's failure", () =>
+    Effect.gen(function*() {
+      const queue = yield* Queue.unbounded<number, string>()
+      Queue.failCauseUnsafe(queue, Cause.fail("boom"))
+
+      assert.isFalse(yield* Queue.shutdown(queue))
+      assert.strictEqual(yield* Queue.take(queue).pipe(Effect.flip), "boom")
+    }))
+
   it.effect("fail doesnt drop items", () =>
     Effect.gen(function*() {
       const queue = yield* Queue.bounded<number, string>(2)
@@ -357,6 +511,109 @@ describe("Queue", () => {
       assert.deepStrictEqual(yield* Fiber.join(fiber), Exit.fail("boom"))
     }))
 
+  it.effect("flushUnsafe releases a waiting taker after offerUnsafe without completing the queue", () =>
+    Effect.gen(function*() {
+      const queue = yield* Queue.unbounded<number>()
+      const taker = yield* Queue.take(queue).pipe(Effect.forkChild)
+      const awaiter = yield* Queue.await(queue).pipe(Effect.forkChild)
+      yield* Effect.yieldNow
+
+      Queue.offerUnsafe(queue, 1)
+      assert.isUndefined(taker.pollUnsafe())
+
+      Queue.flushUnsafe(queue)
+
+      assert.deepStrictEqual(taker.pollUnsafe(), Exit.succeed(1))
+      assert.isUndefined(awaiter.pollUnsafe())
+      yield* Queue.shutdown(queue)
+    }))
+
+  it.effect("flush releases a waiting taker after offerUnsafe without completing the queue", () =>
+    Effect.gen(function*() {
+      const queue = yield* Queue.unbounded<number>()
+      const taker = yield* Queue.take(queue).pipe(Effect.forkChild)
+      const awaiter = yield* Queue.await(queue).pipe(Effect.forkChild)
+      yield* Effect.yieldNow
+
+      Queue.offerUnsafe(queue, 1)
+      assert.isUndefined(taker.pollUnsafe())
+
+      yield* Queue.flush(queue)
+
+      assert.deepStrictEqual(taker.pollUnsafe(), Exit.succeed(1))
+      assert.isUndefined(awaiter.pollUnsafe())
+      yield* Queue.shutdown(queue)
+    }))
+
+  it.effect("flushUnsafe coalesces scheduled releases across repeated offers", () =>
+    Effect.gen(function*() {
+      const tasks: Array<() => void> = []
+      const scheduler: Scheduler.Scheduler = {
+        executionMode: "async",
+        makeDispatcher() {
+          return {
+            scheduleTask(task, _priority) {
+              tasks.push(task)
+            },
+            flush() {
+            }
+          }
+        },
+        shouldYield: () => false
+      }
+      const queue = yield* Queue.unbounded<number>().pipe(
+        Effect.provideService(Scheduler.Scheduler, scheduler)
+      )
+      for (let i = 0; i < 10; i++) {
+        yield* Queue.take(queue).pipe(Effect.forkChild)
+      }
+      yield* Effect.yieldNow
+
+      for (let i = 0; i < 8; i++) {
+        Queue.offerUnsafe(queue, i)
+        Queue.flushUnsafe(queue)
+      }
+
+      assert.lengthOf(tasks, 1)
+      yield* Queue.shutdown(queue)
+    }))
+
+  it.effect("flush is a no-op after shutdown", () =>
+    Effect.gen(function*() {
+      const queue = yield* Queue.unbounded<number>()
+      yield* Queue.shutdown(queue)
+
+      Queue.flushUnsafe(queue)
+      yield* Queue.flush(queue)
+
+      assert.isFalse(yield* Queue.offer(queue, 1))
+    }))
+
+  it.effect("flush keeps a buffered message when no taker is waiting", () =>
+    Effect.gen(function*() {
+      const queue = yield* Queue.unbounded<number>()
+      Queue.offerUnsafe(queue, 1)
+
+      yield* Queue.flush(queue)
+
+      assert.strictEqual(yield* Queue.take(queue), 1)
+    }))
+
+  it.effect("flushUnsafe preserves later offers when the queue is empty", () =>
+    Effect.gen(function*() {
+      const queue = yield* Queue.unbounded<number>()
+      const first = yield* Queue.take(queue).pipe(Effect.forkChild)
+      const second = yield* Queue.take(queue).pipe(Effect.forkChild)
+      yield* Effect.yieldNow
+
+      Queue.flushUnsafe(queue)
+      yield* Queue.offerAll(queue, [1, 2])
+
+      const values = yield* Effect.all([Fiber.join(first), Fiber.join(second)])
+      assert.deepStrictEqual(new Set(values), new Set([1, 2]))
+      yield* Queue.shutdown(queue)
+    }))
+
   it.effect("bounded 0 capacity", () =>
     Effect.gen(function*() {
       const queue = yield* Queue.bounded<number>(0)
@@ -368,4 +625,37 @@ describe("Queue", () => {
       result = yield* Fiber.join(fiber)
       assert.strictEqual(result, 2)
     }))
+
+  it.effect("zero-capacity takeAll consumes buffered messages before pending offers", () =>
+    Effect.gen(function*() {
+      const queue = yield* Queue.bounded<number>(0)
+      const waiting = yield* Queue.take(queue).pipe(Effect.forkChild({ startImmediately: true }))
+      const producer = yield* Queue.offerAll(queue, [1, 2]).pipe(Effect.forkChild({ startImmediately: true }))
+
+      const batch = yield* Queue.takeAll(queue)
+      const next = yield* Fiber.join(waiting)
+      yield* Fiber.join(producer)
+
+      assert.deepStrictEqual(batch, [1])
+      assert.strictEqual(next, 2)
+    }))
+
+  it.effect("zero-capacity offerAll drains in order and completes a closing queue", () =>
+    Effect.gen(function*() {
+      const queue = yield* Queue.bounded<number, Cause.Done>(0)
+      const producer = yield* Queue.offerAll(queue, [1, 2, 3]).pipe(Effect.forkChild({ startImmediately: true }))
+
+      const first = yield* Queue.takeAll(queue)
+      yield* Queue.end(queue)
+      const second = yield* Queue.clear(queue)
+      const third = yield* Queue.poll(queue)
+      const producerExit = producer.pollUnsafe()
+      const done = yield* Effect.exit(Queue.await(queue))
+
+      assert.deepStrictEqual(first, [1])
+      assert.deepStrictEqual(second, [2])
+      assert.deepStrictEqual(third, Option.some(3))
+      assert.deepStrictEqual(producerExit, Exit.succeed([]))
+      assert.deepStrictEqual(done, Exit.void)
+    }))
 })
diff --git a/repos/effect/packages/effect/test/Random.test.ts b/repos/effect/packages/effect/test/Random.test.ts
index 5b82c9878..1652ca603 100644
--- a/repos/effect/packages/effect/test/Random.test.ts
+++ b/repos/effect/packages/effect/test/Random.test.ts
@@ -60,6 +60,51 @@ describe("Random", () => {
   })
 
   describe("nextBetween", () => {
+    it.effect.each(
+      [
+        ["positive", 10, 20, 1 - Number.EPSILON, 20 - 2 ** -48],
+        ["adjacent", 1e16, 1e16 + 2, 0.75, 1e16],
+        ["negative", -1e16 - 2, -1e16, 0.75, -1e16 - 2],
+        ["zero", -Number.MIN_VALUE, 0, 0.75, -Number.MIN_VALUE]
+      ] as const
+    )("excludes a rounded upper bound: %s", ([_name, min, max, draw, expected]) =>
+      Effect.gen(function*() {
+        const value = yield* Random.nextBetween(min, max).pipe(
+          Effect.provideService(Random.Random, {
+            nextIntUnsafe: () => 0,
+            nextDoubleUnsafe: () => draw
+          })
+        )
+
+        assert.isAtLeast(value, min)
+        assert.isBelow(value, max)
+        assert.strictEqual(value, expected)
+      }))
+
+    it.effect("preserves degenerate bounds", () =>
+      Effect.gen(function*() {
+        const value = yield* Random.nextBetween(10, 10).pipe(
+          Effect.provideService(Random.Random, {
+            nextIntUnsafe: () => 0,
+            nextDoubleUnsafe: () => 0.75
+          })
+        )
+
+        assert.strictEqual(value, 10)
+      }))
+
+    it.effect("documents current behavior for unsupported bounds", () =>
+      Effect.gen(function*() {
+        const value = yield* Random.nextBetween(10, Infinity).pipe(
+          Effect.provideService(Random.Random, {
+            nextIntUnsafe: () => 0,
+            nextDoubleUnsafe: () => 0.75
+          })
+        )
+
+        assert.strictEqual(value, Infinity)
+      }))
+
     it.effect("generates number in half-open range", () =>
       Effect.gen(function*() {
         for (let i = 0; i < 100; i++) {
diff --git a/repos/effect/packages/effect/test/RcMap.test.ts b/repos/effect/packages/effect/test/RcMap.test.ts
index 37386b523..57fdeaef0 100644
--- a/repos/effect/packages/effect/test/RcMap.test.ts
+++ b/repos/effect/packages/effect/test/RcMap.test.ts
@@ -3,6 +3,53 @@ import { Cause, Data, Deferred, Effect, Exit, Fiber, MutableHashMap, Option, RcM
 import { TestClock } from "effect/testing"
 
 describe("RcMap", () => {
+  describe("lookup defects", () => {
+    for (const throws of [false, true]) {
+      it.effect.each([0, 1000])(
+        `releases capacity after a ${throws ? "throwing" : "dying"} lookup with TTL %s`,
+        (idleTimeToLive) =>
+          Effect.gen(function*() {
+            const map = yield* RcMap.make({
+              lookup: (key: string) => {
+                if (key !== "bad") return Effect.succeed(key)
+                if (throws) throw "boom"
+                return Effect.die("boom")
+              },
+              capacity: 1,
+              idleTimeToLive
+            })
+
+            assert.deepStrictEqual(yield* RcMap.get(map, "bad").pipe(Effect.scoped, Effect.exit), Exit.die("boom"))
+            if (idleTimeToLive > 0) {
+              assert.isTrue(yield* RcMap.has(map, "bad"))
+              yield* TestClock.adjust(idleTimeToLive)
+            }
+            assert.deepStrictEqual(yield* RcMap.get(map, "good").pipe(Effect.exit), Exit.succeed("good"))
+            assert.isFalse(yield* RcMap.has(map, "bad"))
+          })
+      )
+
+      it.effect(`shares a ${throws ? "throwing" : "dying"} lookup's defect with later borrowers`, () =>
+        Effect.gen(function*() {
+          const map = yield* RcMap.make({
+            lookup: (_key: string): Effect.Effect<string> => {
+              if (throws) throw "boom"
+              return Effect.die("boom")
+            }
+          })
+
+          assert.deepStrictEqual(yield* RcMap.get(map, "bad").pipe(Effect.exit), Exit.die("boom"))
+          const borrower = yield* RcMap.getOption(map, "bad").pipe(
+            Effect.exit,
+            Effect.timeoutOption(1000),
+            Effect.forkChild({ startImmediately: true })
+          )
+          yield* TestClock.adjust(1000)
+          assert.deepStrictEqual(yield* Fiber.join(borrower), Option.some(Exit.die("boom")))
+        }))
+    }
+  })
+
   describe("invalidate", () => {
     it.effect.each([0, 1000, Infinity])(
       "releases only the invalidated entry with TTL %s",
diff --git a/repos/effect/packages/effect/test/RcRef.test.ts b/repos/effect/packages/effect/test/RcRef.test.ts
index 142d2fc0b..90d7451dc 100644
--- a/repos/effect/packages/effect/test/RcRef.test.ts
+++ b/repos/effect/packages/effect/test/RcRef.test.ts
@@ -1,5 +1,7 @@
 import { assert, describe, it } from "@effect/vitest"
+import * as Clock from "effect/Clock"
 import * as Deferred from "effect/Deferred"
+import * as Duration from "effect/Duration"
 import * as Effect from "effect/Effect"
 import * as Exit from "effect/Exit"
 import * as Fiber from "effect/Fiber"
@@ -60,6 +62,100 @@ describe("RcRef", () => {
       assert.isTrue(Exit.hasInterrupts(exit))
     }))
 
+  it.effect("releasing an invalidated borrower preserves the replacement resource", () =>
+    Effect.gen(function*() {
+      let acquired = 0
+      const released: Array<number> = []
+      const owner = yield* Scope.make()
+      const scopeA = yield* Scope.make()
+      const scopeB = yield* Scope.make()
+      const scopeC = yield* Scope.make()
+      const ref = yield* RcRef.make({
+        acquire: Effect.acquireRelease(
+          Effect.sync(() => ++acquired),
+          (id) => Effect.sync(() => released.push(id))
+        )
+      }).pipe(Scope.provide(owner))
+
+      const first = yield* RcRef.get(ref).pipe(Scope.provide(scopeA))
+      yield* RcRef.invalidate(ref)
+      const replacement = yield* RcRef.get(ref).pipe(Scope.provide(scopeB))
+      yield* Scope.close(scopeA, Exit.void)
+      const next = yield* RcRef.get(ref).pipe(Scope.provide(scopeC))
+      yield* Scope.close(owner, Exit.void)
+      const releasedAtOwnerClose = [...released]
+      yield* Scope.close(scopeB, Exit.void)
+      yield* Scope.close(scopeC, Exit.void)
+
+      assert.deepStrictEqual(
+        { first, replacement, next, releasedAtOwnerClose, released },
+        { first: 1, replacement: 2, next: 2, releasedAtOwnerClose: [1, 2], released: [1, 2] }
+      )
+    }))
+
+  it.effect("releasing a borrower after owner shutdown does not reopen the reference", () =>
+    Effect.gen(function*() {
+      let acquired = 0
+      const owner = yield* Scope.make()
+      const borrower = yield* Scope.make()
+      const ref = yield* RcRef.make({
+        acquire: Effect.sync(() => ++acquired)
+      }).pipe(Scope.provide(owner))
+
+      yield* RcRef.get(ref).pipe(Scope.provide(borrower))
+      yield* Scope.close(owner, Exit.void)
+      yield* Scope.close(borrower, Exit.void)
+      const exit = yield* RcRef.get(ref).pipe(Effect.scoped, Effect.exit)
+
+      assert.isTrue(Exit.hasInterrupts(exit))
+      assert.strictEqual(acquired, 1)
+    }))
+
+  it.effect("acquisition completing after owner shutdown cannot reopen the reference", () =>
+    Effect.gen(function*() {
+      const owner = yield* Scope.make()
+      const borrower = yield* Scope.make()
+      const started = yield* Deferred.make<void>()
+      const finish = yield* Deferred.make<void>()
+      const released: Array<number> = []
+      const ref = yield* RcRef.make({
+        acquire: Effect.gen(function*() {
+          const value = yield* Effect.acquireRelease(
+            Effect.succeed(1),
+            (value) => Effect.sync(() => released.push(value))
+          )
+          yield* Deferred.succeed(started, undefined)
+          yield* Deferred.await(finish)
+          return value
+        })
+      }).pipe(Scope.provide(owner))
+      const pending = yield* RcRef.get(ref).pipe(
+        Scope.provide(borrower),
+        Effect.forkChild({ startImmediately: true })
+      )
+      yield* Deferred.await(started)
+      const queued = yield* RcRef.get(ref).pipe(
+        Scope.provide(borrower),
+        Effect.forkChild({ startImmediately: true })
+      )
+
+      yield* Scope.close(owner, Exit.void)
+      const before = yield* RcRef.get(ref).pipe(Effect.scoped, Effect.exit)
+      yield* Deferred.succeed(finish, undefined)
+      const pendingExit = yield* Fiber.await(pending)
+      const queuedExit = yield* Fiber.await(queued)
+      const after = yield* RcRef.get(ref).pipe(Effect.scoped, Effect.exit)
+      const releasedBeforeBorrowerClose = [...released]
+      yield* Scope.close(borrower, Exit.void)
+
+      assert.isTrue(Exit.hasInterrupts(before))
+      assert.isTrue(Exit.hasInterrupts(pendingExit))
+      assert.isTrue(Exit.hasInterrupts(queuedExit))
+      assert.isTrue(Exit.hasInterrupts(after))
+      assert.deepStrictEqual(releasedBeforeBorrowerClose, [1])
+      assert.deepStrictEqual(released, [1])
+    }))
+
   it.effect("releases resources acquired before acquisition failure", () =>
     Effect.gen(function*() {
       const acquired = yield* Ref.make(0)
@@ -190,4 +286,31 @@ describe("RcRef", () => {
       yield* TestClock.adjust("10 millis")
       assert.strictEqual(released, 2)
     }))
+
+  it.effect("idleTimeToLive 0 releases resources after a zero-duration sleep", () =>
+    Effect.gen(function*() {
+      const clock = yield* Clock.Clock
+      const sleeps: Array<number> = []
+      let released = 0
+      const ref = yield* RcRef.make({
+        acquire: Effect.acquireRelease(
+          Effect.succeed("foo"),
+          () =>
+            Effect.sync(() => {
+              released++
+            })
+        ),
+        idleTimeToLive: 0
+      }).pipe(Effect.provideService(Clock.Clock, {
+        ...clock,
+        sleep: (duration) => {
+          sleeps.push(Duration.toMillis(duration))
+          return clock.sleep(duration)
+        }
+      }))
+
+      yield* Effect.scoped(RcRef.get(ref))
+      assert.deepStrictEqual(sleeps, [0])
+      assert.strictEqual(released, 1)
+    }))
 })
diff --git a/repos/effect/packages/effect/test/Request.test.ts b/repos/effect/packages/effect/test/Request.test.ts
index 027e2a48e..6fd663374 100644
--- a/repos/effect/packages/effect/test/Request.test.ts
+++ b/repos/effect/packages/effect/test/Request.test.ts
@@ -1,11 +1,12 @@
 import { assert, describe, expect, it } from "@effect/vitest"
-import { Array, Context, Data, Equal, Fiber, Hash } from "effect"
+import { Array, Context, Data, Deferred, Equal, Fiber, Hash, Schema } from "effect"
 import * as Cause from "effect/Cause"
 import * as Effect from "effect/Effect"
 import * as Exit from "effect/Exit"
 import { flow, pipe } from "effect/Function"
 import * as Request from "effect/Request"
 import * as Resolver from "effect/RequestResolver"
+import { Persistable, Persistence } from "effect/unstable/persistence"
 
 class Counter extends Context.Service<Counter, { count: number }>()("Counter") {}
 class Requests extends Context.Service<Requests, { count: number }>()("Requests") {}
@@ -132,7 +133,7 @@ const provideEnv = flow(
   Effect.provideServiceEffect(Requests, Effect.sync(() => ({ count: 0 })))
 )
 
-describe.sequential("Request", () => {
+describe("Request", { concurrent: false }, () => {
   it("preserves __proto__ as an own constructor property", () => {
     interface ProtoRequest extends Request.Request<void> {
       readonly "__proto__": { readonly polluted: boolean }
@@ -200,6 +201,69 @@ describe.sequential("Request", () => {
     }, provideEnv)
   )
 
+  it.effect("fromEffectTagged preserves typed errors", () =>
+    Effect.gen(function*() {
+      const resolver = Resolver.fromEffectTagged<GetNameById>()({
+        GetNameById: () => Effect.fail("missing")
+      })
+      const error = yield* Effect.flip(Effect.request(new GetNameById({ id: 1 }), resolver))
+
+      assert.strictEqual(error, "missing")
+    }))
+
+  it.effect("fromEffectTagged preserves defects", () =>
+    Effect.gen(function*() {
+      const defect = new Error("boom")
+      const resolver = Resolver.fromEffectTagged<GetNameById>()({
+        GetNameById: () => Effect.die(defect)
+      })
+      const exit = yield* Effect.exit(Effect.request(new GetNameById({ id: 1 }), resolver))
+
+      assert.isTrue(Exit.isFailure(exit))
+      if (Exit.isFailure(exit)) {
+        assert.strictEqual(exit.cause.reasons.length, 1)
+        const reason = exit.cause.reasons[0]
+        assert.isTrue(Cause.isDieReason(reason))
+        if (Cause.isDieReason(reason)) {
+          assert.strictEqual(reason.defect, defect)
+        }
+      }
+    }))
+
+  it.effect("fromEffectTagged preserves interrupts", () =>
+    Effect.gen(function*() {
+      const resolver = Resolver.fromEffectTagged<GetNameById>()({
+        GetNameById: () => Effect.interrupt
+      })
+      const exit = yield* Effect.exit(Effect.request(new GetNameById({ id: 1 }), resolver))
+
+      assert.isTrue(Exit.hasInterrupts(exit))
+    }))
+
+  it.effect.each([
+    { name: "array", make: (values: Array<string>) => values },
+    { name: "array iterator", make: (values: Array<string>) => values.values() },
+    {
+      name: "generator",
+      make: (values: Array<string>) =>
+        (function*() {
+          yield* values
+        })()
+    }
+  ])("fromEffectTagged resolves requests from $name results", ({ make }) =>
+    Effect.gen(function*() {
+      const resolver = Resolver.fromEffectTagged<GetNameById>()({
+        GetNameById: (requests) => Effect.succeed(make(requests.map(({ request }) => String(request.id))))
+      })
+      const names = yield* Effect.forEach(
+        [1, 2, 3],
+        (id) => Effect.request(new GetNameById({ id }), resolver),
+        { concurrency: "unbounded" }
+      )
+
+      assert.deepStrictEqual(names, ["1", "2", "3"])
+    }))
+
   it.effect(
     "requests don't break interruption",
     Effect.fnUntraced(
@@ -270,6 +334,323 @@ describe.sequential("Request", () => {
     })
   )
 
+  for (const cached of [false, true]) {
+    it.effect(`repro: cancelling a pending batch does not poison ${cached ? "cached" : "uncached"} requests`, () =>
+      Effect.gen(function*() {
+        const gate = yield* Deferred.make<void>()
+        const base = Resolver.make<GetNameById>((entries) =>
+          Effect.sync(() => {
+            for (const entry of entries) entry.completeUnsafe(Exit.succeed("Alice"))
+          })
+        ).pipe(Resolver.setDelayEffect(Deferred.await(gate)))
+        const resolver = cached ? yield* Resolver.withCache(base, { capacity: 10 }) : base
+        const request = new GetNameById({ id: 1 })
+
+        const first = yield* Effect.request(request, resolver).pipe(Effect.forkChild({ startImmediately: true }))
+        yield* Fiber.interrupt(first)
+        const next = yield* Effect.request(request, resolver).pipe(Effect.forkChild({ startImmediately: true }))
+
+        // Allow execution only after cancelling the first batch and retrying.
+        yield* Deferred.succeed(gate, undefined)
+        yield* Effect.yieldNow
+        const exit = next.pollUnsafe()
+        yield* Fiber.interrupt(next)
+
+        assert.deepStrictEqual(exit, Exit.succeed("Alice"))
+      }))
+  }
+
+  it.effect("withCache removes cancelled entries from a surviving batch", () =>
+    Effect.gen(function*() {
+      const gate = yield* Deferred.make<void>()
+      const batches: Array<Array<number>> = []
+      const resolver = yield* Resolver.make<GetNameById>((entries) =>
+        Effect.sync(() => {
+          batches.push(entries.map((entry) => entry.request.id))
+          for (const entry of entries) entry.completeUnsafe(Exit.succeed(String(entry.request.id)))
+        })
+      ).pipe(
+        Resolver.setDelayEffect(Effect.andThen(Effect.yieldNow, Deferred.await(gate))),
+        Resolver.withCache({ capacity: 10 })
+      )
+      const first = yield* Effect.request(new GetNameById({ id: 1 }), resolver).pipe(
+        Effect.forkChild({ startImmediately: true })
+      )
+      const other = yield* Effect.request(new GetNameById({ id: 2 }), resolver).pipe(
+        Effect.forkChild({ startImmediately: true })
+      )
+      yield* Fiber.interrupt(first)
+      yield* Deferred.succeed(gate, undefined)
+      yield* Effect.yieldNow
+      assert.deepStrictEqual(other.pollUnsafe(), Exit.succeed("2"))
+      assert.deepStrictEqual(batches, [[2]])
+
+      const retry = yield* Effect.request(new GetNameById({ id: 1 }), resolver).pipe(
+        Effect.forkChild({ startImmediately: true })
+      )
+      yield* Effect.yieldNow
+      assert.deepStrictEqual(retry.pollUnsafe(), Exit.succeed("1"))
+      assert.deepStrictEqual(batches, [[2], [1]])
+    }))
+
+  for (const cancelFirst of [false, true]) {
+    it.effect(`withCache preserves coalesced requests when the ${cancelFirst ? "first" : "second"} caller cancels`, () =>
+      Effect.gen(function*() {
+        const gate = yield* Deferred.make<void>()
+        const batches: Array<number> = []
+        const resolver = yield* Resolver.make<GetNameById>((entries) =>
+          Effect.sync(() => {
+            batches.push(entries.length)
+            for (const entry of entries) entry.completeUnsafe(Exit.succeed("Alice"))
+          })
+        ).pipe(Resolver.setDelayEffect(Deferred.await(gate)), Resolver.withCache({ capacity: 10 }))
+        const first = yield* Effect.request(new GetNameById({ id: 1 }), resolver).pipe(
+          Effect.forkChild({ startImmediately: true })
+        )
+        const second = yield* Effect.request(new GetNameById({ id: 1 }), resolver).pipe(
+          Effect.forkChild({ startImmediately: true })
+        )
+        const cancelled = cancelFirst ? first : second
+        const remaining = cancelFirst ? second : first
+        yield* Fiber.interrupt(cancelled)
+        assert.isTrue(Exit.hasInterrupts(yield* Fiber.await(cancelled)))
+        assert.deepStrictEqual(batches, [])
+        yield* Deferred.succeed(gate, undefined)
+        yield* Effect.yieldNow
+
+        assert.deepStrictEqual(remaining.pollUnsafe(), Exit.succeed("Alice"))
+        assert.strictEqual(yield* Effect.request(new GetNameById({ id: 1 }), resolver), "Alice")
+        assert.deepStrictEqual(batches, [1])
+      }))
+  }
+
+  it.effect("withCache still caches completed failures", () =>
+    Effect.gen(function*() {
+      let calls = 0
+      const resolver = yield* Resolver.make<GetNameById>((entries) =>
+        Effect.sync(() => {
+          calls++
+          for (const entry of entries) entry.completeUnsafe(Exit.fail("Not Found"))
+        })
+      ).pipe(Resolver.withCache({ capacity: 10 }))
+
+      for (let i = 0; i < 2; i++) {
+        assert.deepStrictEqual(
+          yield* Effect.exit(Effect.request(new GetNameById({ id: 1 }), resolver)),
+          Exit.fail("Not Found")
+        )
+      }
+      assert.strictEqual(calls, 1)
+    }))
+
+  it.effect("withCache does not cache interrupted resolver results", () =>
+    Effect.gen(function*() {
+      let calls = 0
+      const resolver = yield* Resolver.make<GetNameById>((entries) =>
+        Effect.sync(() => {
+          calls++
+          for (const entry of entries) {
+            entry.completeUnsafe(calls === 1 ? Exit.interrupt() : Exit.succeed("Alice"))
+          }
+        })
+      ).pipe(Resolver.withCache({ capacity: 10 }))
+
+      assert.isTrue(Exit.hasInterrupts(yield* Effect.exit(Effect.request(new GetNameById({ id: 1 }), resolver))))
+      assert.strictEqual(yield* Effect.request(new GetNameById({ id: 1 }), resolver), "Alice")
+      assert.strictEqual(calls, 2)
+    }))
+
+  it.effect("withCache cancellation does not evict a replacement entry", () =>
+    Effect.gen(function*() {
+      const gate = yield* Deferred.make<void>()
+      const batches: Array<Array<number>> = []
+      let delays = 0
+      const resolver = yield* Resolver.make<GetNameById>((entries) =>
+        Effect.sync(() => {
+          batches.push(entries.map((entry) => entry.request.id))
+          for (const entry of entries) entry.completeUnsafe(Exit.succeed("Alice"))
+        })
+      ).pipe(
+        Resolver.grouped(({ request }) => request.id),
+        Resolver.setDelayEffect(Effect.suspend(() => ++delays === 1 ? Deferred.await(gate) : Effect.yieldNow)),
+        Resolver.withCache({ capacity: 1 })
+      )
+      const first = yield* Effect.request(new GetNameById({ id: 1 }), resolver).pipe(
+        Effect.forkChild({ startImmediately: true })
+      )
+      yield* Effect.yieldNow
+      // Completing another group evicts the first entry while its batch is still pending.
+      yield* Effect.request(new GetNameById({ id: 2 }), resolver)
+      yield* Effect.yieldNow
+      const replacement = yield* Effect.request(new GetNameById({ id: 1 }), resolver).pipe(
+        Effect.forkChild({ startImmediately: true })
+      )
+      yield* Fiber.interrupt(first)
+      const coalesced = yield* Effect.request(new GetNameById({ id: 1 }), resolver).pipe(
+        Effect.forkChild({ startImmediately: true })
+      )
+      yield* Deferred.succeed(gate, undefined)
+      yield* Effect.yieldNow
+
+      assert.deepStrictEqual(replacement.pollUnsafe(), Exit.succeed("Alice"))
+      assert.deepStrictEqual(coalesced.pollUnsafe(), Exit.succeed("Alice"))
+      assert.deepStrictEqual(batches, [[2], [1]])
+    }))
+
+  it.effect("withCache allows an equal retry from the cancelled delay's finalizer", () =>
+    Effect.gen(function*() {
+      const gate = yield* Deferred.make<void>()
+      const context = yield* Effect.context<never>()
+      const results: Array<Request.Result<GetNameById>> = []
+      const batches: Array<number> = []
+      let cancelledCallbacks = 0
+      let finalizers = 0
+      const resolver = yield* Resolver.make<GetNameById>((entries) =>
+        Effect.sync(() => {
+          batches.push(entries.length)
+          for (const entry of entries) entry.completeUnsafe(Exit.succeed("Alice"))
+        })
+      ).pipe(
+        Resolver.setDelayEffect(
+          Deferred.await(gate).pipe(
+            Effect.onInterrupt(() =>
+              Effect.sync(() => {
+                finalizers++
+                Effect.requestUnsafe(new GetNameById({ id: 1 }), {
+                  resolver,
+                  context,
+                  onExit: (exit) => results.push(exit)
+                })
+              })
+            )
+          )
+        ),
+        Resolver.withCache({ capacity: 10 })
+      )
+      const cancel = Effect.requestUnsafe(new GetNameById({ id: 1 }), {
+        resolver,
+        context,
+        onExit: () => cancelledCallbacks++
+      })
+      cancel()
+      assert.strictEqual(finalizers, 1)
+      assert.deepStrictEqual(results, [])
+      cancel()
+      yield* Deferred.succeed(gate, undefined)
+      yield* Effect.yieldNow
+
+      assert.strictEqual(cancelledCallbacks, 0)
+      assert.strictEqual(finalizers, 1)
+      assert.deepStrictEqual(results, [Exit.succeed("Alice")])
+      assert.deepStrictEqual(batches, [1])
+    }))
+
+  it.effect("withCache preserves the race winner when the losing resolver is interrupted", () =>
+    Effect.gen(function*() {
+      const finished = yield* Deferred.make<void>()
+      let calls = 0
+      let interruptions = 0
+      const fast = Resolver.fromEffect<GetNameById>(() =>
+        Effect.andThen(
+          Effect.yieldNow,
+          Effect.sync(() => {
+            calls++
+            return "Alice"
+          })
+        )
+      )
+      const slow = Resolver.fromEffect<GetNameById>(() =>
+        Effect.never.pipe(Effect.onInterrupt(() =>
+          Effect.sync(() => {
+            interruptions++
+          })
+        ))
+      )
+      const resolver = yield* Resolver.race(fast, slow).pipe(
+        Resolver.around(() => Effect.void, () => Deferred.succeed(finished, undefined)),
+        Resolver.withCache({ capacity: 10 })
+      )
+
+      assert.strictEqual(yield* Effect.request(new GetNameById({ id: 1 }), resolver), "Alice")
+      // Wait for the losing resolver's interruption before reading the cache again.
+      yield* Deferred.await(finished)
+      assert.strictEqual(interruptions, 1)
+      assert.deepStrictEqual(
+        yield* Effect.exit(Effect.request(new GetNameById({ id: 1 }), resolver)),
+        Exit.succeed("Alice")
+      )
+      assert.strictEqual(calls, 1)
+    }))
+
+  it.effect("withCache accepts refreshed results from stale-while-revalidate", () =>
+    Effect.gen(function*() {
+      class GetName extends Persistable.Class()("GetName", {
+        primaryKey: () => "name",
+        success: Schema.String
+      }) {}
+      const store = yield* (yield* Persistence.Persistence).make({ storeId: "names" })
+      yield* store.set(new GetName(), Exit.succeed("Alice"))
+      const finished = yield* Deferred.make<void>()
+      let calls = 0
+      const persisted = yield* Resolver.fromFunction<GetName>(() => {
+        calls++
+        return "Bob"
+      }).pipe(Resolver.persisted({ storeId: "names", staleWhileRevalidate: () => true }))
+      const resolver = yield* persisted.pipe(
+        Resolver.around(() => Effect.void, () => Deferred.succeed(finished, undefined)),
+        Resolver.withCache({ capacity: 10 })
+      )
+
+      assert.strictEqual(yield* Effect.request(new GetName(), resolver), "Alice")
+      yield* Deferred.await(finished)
+      assert.strictEqual(yield* Effect.request(new GetName(), resolver), "Bob")
+      assert.strictEqual(calls, 1)
+    }).pipe(Effect.provide(Persistence.layerMemory)))
+
+  it.effect("persisted propagates failures to unfinished requests", () =>
+    Effect.gen(function*() {
+      class GetValue extends Persistable.Class<{ payload: { id: number } }>()("GetValue", {
+        primaryKey: ({ id }) => String(id),
+        success: Schema.String,
+        error: Persistence.PersistenceError
+      }) {}
+      const request = new GetValue({ id: 1 })
+      const error = new Persistence.PersistenceError({ message: "backend failed" })
+      const resolver = Resolver.make<GetValue>((entries) => {
+        entries[0].completeUnsafe(Exit.succeed("first"))
+        return Effect.fail(error)
+      })
+      const persisted = yield* Resolver.persisted(resolver, { storeId: "resolver-failure" })
+
+      assert.deepStrictEqual(
+        yield* Effect.forEach(
+          [request, request, new GetValue({ id: 2 })],
+          (request) => Effect.exit(Effect.request(request, persisted)),
+          { concurrency: "unbounded" }
+        ),
+        [Exit.succeed("first"), Exit.fail(error), Exit.fail(error)]
+      )
+    }).pipe(Effect.provide(Persistence.layerMemory)))
+
+  it.effect("persisted stores synchronous resolver failures", () =>
+    Effect.gen(function*() {
+      class GetValue extends Persistable.Class()("ThrowingValue", {
+        primaryKey: () => "value",
+        success: Schema.String
+      }) {}
+      let calls = 0
+      const resolver = Resolver.make<GetValue>(() => {
+        calls++
+        throw "backend defect"
+      })
+      const persisted = yield* Resolver.persisted(resolver, { storeId: "resolver-throw" })
+      const request = new GetValue()
+
+      assert.deepStrictEqual(yield* Effect.exit(Effect.request(request, persisted)), Exit.die("backend defect"))
+      assert.deepStrictEqual(yield* Effect.exit(Effect.request(request, persisted)), Exit.die("backend defect"))
+      assert.strictEqual(calls, 1)
+    }).pipe(Effect.provide(Persistence.layerMemory)))
+
   it.effect(
     "batching preserves individual & identical requests",
     Effect.fnUntraced(function*() {
diff --git a/repos/effect/packages/effect/test/Scheduler.test.ts b/repos/effect/packages/effect/test/Scheduler.test.ts
index e82c3a9fb..30b06e6e0 100644
--- a/repos/effect/packages/effect/test/Scheduler.test.ts
+++ b/repos/effect/packages/effect/test/Scheduler.test.ts
@@ -103,4 +103,21 @@ describe("Scheduler", () => {
       )
       assert.strictEqual(calls, 0)
     }))
+
+  it("MixedScheduler falls back to a microtask when timers cannot be set", async () => {
+    // Cloudflare Workers throw for timers set in global scope
+    const setImmediate = vi.spyOn(globalThis, "setImmediate").mockImplementation(() => {
+      throw new Error("Disallowed operation called within global scope")
+    })
+    try {
+      const count = Scheduler.MaxOpsBeforeYield.defaultValue() * 3
+      const result = await Effect.runPromise(
+        Effect.forEach(Array.from({ length: count }, (_, i) => i), (i) => Effect.succeed(i))
+      )
+      assert.strictEqual(result.length, count)
+      assert.isAbove(setImmediate.mock.calls.length, 0)
+    } finally {
+      setImmediate.mockRestore()
+    }
+  })
 })
diff --git a/repos/effect/packages/effect/test/ScopedCache.test.ts b/repos/effect/packages/effect/test/ScopedCache.test.ts
index 91c844e9a..636d87fa0 100644
--- a/repos/effect/packages/effect/test/ScopedCache.test.ts
+++ b/repos/effect/packages/effect/test/ScopedCache.test.ts
@@ -1,5 +1,5 @@
 import { assert, describe, it } from "@effect/vitest"
-import { Clock, Context, Data, Deferred, Duration, Effect, Exit, Fiber, Option, ScopedCache } from "effect"
+import { Clock, Context, Data, Deferred, Duration, Effect, Exit, Fiber, Option, Scope, ScopedCache } from "effect"
 import { TestClock } from "effect/testing"
 
 describe("ScopedCache", () => {
@@ -752,6 +752,57 @@ describe("ScopedCache", () => {
     })
 
     describe("invalidateWhen", () => {
+      it.effect.each([Exit.succeed(1), Exit.fail("error")])(
+        "preserves a replacement resource after an old lookup completes (%#)",
+        (exit) =>
+          Effect.gen(function*() {
+            let acquired = 0
+            const released: Array<number> = []
+            const values: Array<number> = []
+            const gate = yield* Deferred.make<number, string>()
+            const owner = yield* Scope.make()
+            const cache = yield* ScopedCache.make({
+              capacity: 1,
+              lookup: (_key: string) =>
+                Effect.gen(function*() {
+                  const id = yield* Effect.acquireRelease(
+                    Effect.sync(() => ++acquired),
+                    (value) => Effect.sync(() => released.push(value))
+                  )
+                  if (id === 1) return yield* Deferred.await(gate)
+                  return id
+                })
+            }).pipe(Scope.provide(owner))
+            const lookup = yield* ScopedCache.get(cache, "key").pipe(
+              Effect.exit,
+              Effect.forkChild({ startImmediately: true })
+            )
+            const invalidator = yield* ScopedCache.invalidateWhen(cache, "key", (value) => {
+              values.push(value)
+              return value === 1
+            }).pipe(
+              Effect.forkChild({ startImmediately: true })
+            )
+
+            yield* ScopedCache.invalidate(cache, "key")
+            const replacement = yield* ScopedCache.get(cache, "key")
+            yield* Deferred.done(gate, exit)
+            const original = yield* Fiber.join(lookup)
+            const invalidated = yield* Fiber.join(invalidator)
+            const cached = yield* ScopedCache.getSuccess(cache, "key")
+            const releasedBeforeClose = [...released]
+            yield* Scope.close(owner, Exit.void)
+
+            assert.deepStrictEqual(releasedBeforeClose, [1])
+            assert.deepStrictEqual(original, exit)
+            assert.deepStrictEqual(values, Exit.isSuccess(exit) ? [1] : [])
+            assert.deepStrictEqual(
+              { invalidated, replacement, cached, released },
+              { invalidated: false, replacement: 2, cached: Option.some(2), released: [1, 2] }
+            )
+          })
+      )
+
       it.effect("invalidates when predicate matches", () =>
         Effect.gen(function*() {
           const cache = yield* ScopedCache.make({
@@ -820,6 +871,57 @@ describe("ScopedCache", () => {
     })
 
     describe("refresh", () => {
+      it.effect("caches a synchronous lookup defect for a missing key", () =>
+        Effect.gen(function*() {
+          let lookups = 0
+          const cache = yield* ScopedCache.make({
+            capacity: 10,
+            lookup: (_key: string): Effect.Effect<number> => {
+              lookups++
+              throw "lookup defect"
+            }
+          })
+
+          assert.deepStrictEqual(yield* Effect.exit(ScopedCache.refresh(cache, "test")), Exit.die("lookup defect"))
+          const reader = yield* ScopedCache.get(cache, "test").pipe(
+            Effect.exit,
+            Effect.timeoutOption("1 second"),
+            Effect.forkChild
+          )
+          yield* TestClock.adjust("1 second")
+
+          assert.deepStrictEqual(yield* Fiber.join(reader), Option.some(Exit.die("lookup defect")))
+          assert.strictEqual(lookups, 1)
+        }))
+
+      it.effect("replaces an existing entry with a synchronous lookup defect", () =>
+        Effect.gen(function*() {
+          let fail = false
+          let released = 0
+          const cache = yield* ScopedCache.make({
+            capacity: 10,
+            lookup: (_key: string) => {
+              if (fail) throw "lookup defect"
+              return Effect.acquireRelease(
+                Effect.succeed(42),
+                () => Effect.sync(() => released++)
+              )
+            }
+          })
+          assert.strictEqual(yield* ScopedCache.get(cache, "test"), 42)
+          fail = true
+
+          assert.deepStrictEqual(yield* Effect.exit(ScopedCache.refresh(cache, "test")), Exit.die("lookup defect"))
+
+          assert.deepStrictEqual({
+            result: yield* Effect.exit(ScopedCache.get(cache, "test")),
+            released
+          }, {
+            result: Exit.die("lookup defect"),
+            released: 1
+          })
+        }))
+
       it.effect("refresh existing key invokes lookup again", () =>
         Effect.gen(function*() {
           let counter = 0
@@ -834,17 +936,59 @@ describe("ScopedCache", () => {
           assert.strictEqual(result, 2)
         }))
 
-      it.effect("refresh non-existent key invokes lookup", () =>
+      it.effect("refresh non-existent key invokes lookup and enforces capacity", () =>
         Effect.gen(function*() {
           let counter = 0
           const cache = yield* ScopedCache.make({
-            capacity: 10,
+            capacity: 1,
             lookup: (_key: string) => Effect.sync(() => ++counter)
           })
 
+          yield* ScopedCache.set(cache, "other", 99)
           const result = yield* ScopedCache.refresh(cache, "test")
 
           assert.strictEqual(result, 1)
+          assert.strictEqual(yield* ScopedCache.size(cache), 1)
+          assert.deepStrictEqual(yield* ScopedCache.keys(cache), ["test"])
+        }))
+
+      it.effect("refresh enforces capacity when the existing key is evicted during lookup", () =>
+        Effect.gen(function*() {
+          const started = yield* Deferred.make<void>()
+          const result = yield* Deferred.make<number>()
+          const released: Array<number> = []
+          const cache = yield* ScopedCache.make({
+            capacity: 1,
+            lookup: (key: string) =>
+              Effect.gen(function*() {
+                const value = key === "a"
+                  ? yield* Deferred.succeed(started, void 0).pipe(Effect.andThen(Deferred.await(result)))
+                  : 99
+                return yield* Effect.acquireRelease(
+                  Effect.succeed(value),
+                  (value) => Effect.sync(() => released.push(value))
+                )
+              })
+          })
+
+          yield* ScopedCache.set(cache, "a", 1)
+          const refresh = yield* ScopedCache.refresh(cache, "a").pipe(Effect.forkChild({ startImmediately: true }))
+          yield* Deferred.await(started)
+          assert.strictEqual(yield* ScopedCache.get(cache, "b"), 99)
+          assert.isFalse(yield* ScopedCache.has(cache, "a"))
+          assert.deepStrictEqual(released, [])
+
+          yield* Deferred.succeed(result, 2)
+          assert.strictEqual(yield* Fiber.join(refresh), 2)
+          assert.deepStrictEqual({
+            size: yield* ScopedCache.size(cache),
+            keys: (yield* ScopedCache.keys(cache)).sort(),
+            released: released.slice()
+          }, { size: 1, keys: ["a"], released: [99] })
+          assert.deepStrictEqual(yield* ScopedCache.getSuccess(cache, "a"), Option.some(2))
+
+          yield* ScopedCache.invalidateAll(cache)
+          assert.deepStrictEqual(released, [99, 2])
         }))
 
       it.effect("refresh updates TTL", () =>
@@ -899,6 +1043,66 @@ describe("ScopedCache", () => {
     })
 
     describe("invalidateAll", () => {
+      it.effect.each([false, true])(
+        "retains ownership of entries refreshed by finalizers (yield: %s)",
+        (yieldBeforeRefresh) =>
+          Effect.gen(function*() {
+            let acquired = 0
+            const released: Array<number> = []
+
+            const cached = yield* Effect.scoped(Effect.gen(function*() {
+              const cache: ScopedCache.ScopedCache<string, number> = yield* ScopedCache.make({
+                capacity: 10,
+                lookup: (_key: string) =>
+                  Effect.acquireRelease(
+                    Effect.sync(() => ++acquired),
+                    (value) =>
+                      Effect.gen(function*() {
+                        released.push(value)
+                        if (value === 1) {
+                          if (yieldBeforeRefresh) {
+                            yield* Effect.yieldNow
+                          }
+                          yield* ScopedCache.refresh(cache, "key")
+                        }
+                      })
+                  )
+              })
+
+              yield* ScopedCache.get(cache, "key")
+              yield* ScopedCache.invalidateAll(cache)
+              assert.deepStrictEqual(released, [1])
+              return yield* ScopedCache.getSuccess(cache, "key")
+            }))
+
+            assert.strictEqual(acquired, 2)
+            assert.deepStrictEqual(released, [1, 2])
+            assert.deepStrictEqual(cached, Option.some(2))
+          })
+      )
+
+      it.effect("removes all entries before running finalizers", () =>
+        Effect.gen(function*() {
+          const observedKeys: Array<Array<string>> = []
+          const cache: ScopedCache.ScopedCache<string, string> = yield* ScopedCache.make({
+            capacity: 10,
+            lookup: (key: string) =>
+              Effect.acquireRelease(
+                Effect.succeed(key),
+                () =>
+                  Effect.gen(function*() {
+                    observedKeys.push(yield* ScopedCache.keys(cache))
+                  })
+              )
+          })
+
+          yield* ScopedCache.get(cache, "first")
+          yield* ScopedCache.get(cache, "second")
+          yield* ScopedCache.invalidateAll(cache)
+
+          assert.deepStrictEqual(observedKeys, [[], []])
+        }))
+
       it.effect("clears all entries", () =>
         Effect.gen(function*() {
           const cache = yield* ScopedCache.make({
diff --git a/repos/effect/packages/effect/test/Sink.test.ts b/repos/effect/packages/effect/test/Sink.test.ts
index 62e787782..a63091c78 100644
--- a/repos/effect/packages/effect/test/Sink.test.ts
+++ b/repos/effect/packages/effect/test/Sink.test.ts
@@ -314,6 +314,16 @@ describe("Sink", () => {
   })
 
   describe("flatMap", () => {
+    it.effect("preserves leftovers when the next sink consumes no input", () =>
+      Effect.gen(function*() {
+        const sink = Sink.take<number>(1).pipe(
+          Sink.flatMap(() => Sink.take<number>(0)),
+          Sink.flatMap(() => Sink.collect<number>())
+        )
+        const result = yield* Stream.fromArrays([1, 2, 3], [4, 5]).pipe(Stream.run(sink))
+        deepStrictEqual(result, [2, 3, 4, 5], "pending leftovers should be preserved")
+      }))
+
     it.effect("flatMap - empty input", () =>
       Effect.gen(function*() {
         const sink = pipe(Sink.head<number>(), Sink.flatMap(Sink.succeed))
diff --git a/repos/effect/packages/effect/test/StackCapture.test.ts b/repos/effect/packages/effect/test/StackCapture.test.ts
new file mode 100644
index 000000000..24244827e
--- /dev/null
+++ b/repos/effect/packages/effect/test/StackCapture.test.ts
@@ -0,0 +1,57 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Effect, References } from "effect"
+
+const withCaptureDisabled = <A>(run: () => A): A => {
+  const limit = Error.stackTraceLimit
+  Error.stackTraceLimit = 0
+  try {
+    return run()
+  } finally {
+    Error.stackTraceLimit = limit
+  }
+}
+
+// Even an empty stack costs a capture in workerd, so count Error allocations.
+const countErrors = (run: () => void): number => {
+  const original = globalThis.Error
+  let count = 0
+  globalThis.Error = new Proxy(original, {
+    construct(target, args, newTarget) {
+      count++
+      return Reflect.construct(target, args, newTarget)
+    }
+  })
+  try {
+    run()
+    return count
+  } finally {
+    globalThis.Error = original
+  }
+}
+
+describe("stack capture", { concurrent: false }, () => {
+  it("Effect.fn skips definition capture at limit zero", () => {
+    const count = withCaptureDisabled(() => countErrors(() => Effect.fn("test")(() => Effect.void)))
+    assert.strictEqual(count, 0)
+  })
+
+  it("Effect.fn skips invocation capture at limit zero", () => {
+    const fn = Effect.fn("test")(() => Effect.void)
+    const count = withCaptureDisabled(() => countErrors(() => Effect.runSync(fn())))
+    assert.strictEqual(count, 0)
+  })
+
+  it("default spans skip capture at limit zero", () => {
+    const count = withCaptureDisabled(() => countErrors(() => Effect.runSync(Effect.withSpan(Effect.void, "test"))))
+    assert.strictEqual(count, 0)
+  })
+
+  it("explicit span capture works at limit zero", () => {
+    const frame = withCaptureDisabled(() => {
+      const frame = Effect.runSync(Effect.withSpan(References.CurrentStackFrame, "test", { captureStackTrace: true }))
+      assert.strictEqual(Error.stackTraceLimit, 0)
+      return frame
+    })
+    assert.match(frame!.stack()!, /StackCapture\.test\.ts:\d+:\d+/)
+  })
+})
diff --git a/repos/effect/packages/effect/test/Stream.test.ts b/repos/effect/packages/effect/test/Stream.test.ts
index 4c5864eeb..55d888009 100644
--- a/repos/effect/packages/effect/test/Stream.test.ts
+++ b/repos/effect/packages/effect/test/Stream.test.ts
@@ -3,6 +3,7 @@ import { assert, describe, it } from "@effect/vitest"
 import { assertExitFailure, assertSuccess, assertTrue, deepStrictEqual, strictEqual } from "@effect/vitest/utils"
 import {
   Array,
+  ByteSize,
   Cause,
   Channel,
   Clock,
@@ -625,6 +626,18 @@ describe("Stream", () => {
           assert.deepStrictEqual(result, ["a", "b", "c"])
         }))
 
+      it.effect("emits a carriage-return-terminated line before pulling upstream again", () =>
+        Effect.gen(function*() {
+          const result = yield* Stream.succeed("a\r").pipe(
+            Stream.concat(Stream.fail("boom")),
+            Stream.splitLines,
+            Stream.take(1),
+            Stream.runCollect,
+            Effect.result
+          )
+          assert.deepStrictEqual(result, Result.succeed(["a"]))
+        }))
+
       it.effect("emits the final line when the stream does not end with a newline", () =>
         Effect.gen(function*() {
           const result = yield* splitLines(["a\nb\nc\n", "d\ne"])
@@ -714,7 +727,7 @@ describe("Stream", () => {
         let evaluated = false
         const chunks = [new Uint8Array([1, 2]), new Uint8Array([3, 4])]
         const result = yield* Stream.fromIterable(chunks).pipe(
-          Stream.limitBytes(5, () => {
+          Stream.limitBytes("5 B", () => {
             evaluated = true
             return Stream.empty
           }),
@@ -730,7 +743,7 @@ describe("Stream", () => {
         let evaluated = false
         const chunks = [new Uint8Array([1, 2]), new Uint8Array([3, 4])]
         const result = yield* Stream.fromIterable(chunks).pipe(
-          Stream.limitBytes(4, () => {
+          Stream.limitBytes(ByteSize.bytes(4), () => {
             evaluated = true
             return Stream.empty
           }),
@@ -748,7 +761,7 @@ describe("Stream", () => {
         const after = new Uint8Array([7])
         const fallback = new Uint8Array([8, 9])
         const result = yield* Stream.make(first, crossing, after).pipe(
-          Stream.limitBytes(5, () => Stream.succeed(fallback)),
+          Stream.limitBytes(ByteSize.bytes(5), () => Stream.succeed(fallback)),
           Stream.runCollect
         )
 
@@ -947,6 +960,22 @@ describe("Stream", () => {
         assertExitFailure(exit, Cause.die(defect))
       }))
 
+    it.effect("catchDefect", () =>
+      Effect.gen(function*() {
+        const defect = new Error("boom")
+        const recovered = yield* Stream.die(defect).pipe(
+          Stream.catchDefect((caught) => Stream.succeed(caught)),
+          Stream.runCollect
+        )
+        const failed = yield* Stream.fail("failure").pipe(
+          Stream.catchDefect(() => Stream.succeed("recovered")),
+          Stream.runCollect,
+          Effect.exit
+        )
+        assert.deepStrictEqual(recovered, [defect])
+        assertExitFailure(failed, Cause.fail("failure"))
+      }))
+
     it.effect("catchIf with refinement", () =>
       Effect.gen(function*() {
         interface ErrorA {
@@ -1337,7 +1366,7 @@ describe("Stream", () => {
       Effect.gen(function*() {
         const stream = Stream.make(1, 2, 3, 4, 5)
         const { result1, result2 } = yield* Effect.all({
-          result1: stream.pipe(Stream.scan(0, (acc, curr) => acc + curr), Stream.runCollect),
+          result1: stream.pipe(Stream.scan(() => 0, (acc, curr) => acc + curr), Stream.runCollect),
           result2: Stream.runCollect(stream).pipe(
             Effect.map((chunk) => Array.scan(chunk, 0, (acc, curr) => acc + curr))
           )
@@ -1348,7 +1377,7 @@ describe("Stream", () => {
     it.effect("scanEffect", () =>
       Effect.gen(function*() {
         const result = yield* Stream.make(1, 2, 3, 4, 5).pipe(
-          Stream.scanEffect(0, (acc, curr) => Effect.succeed(acc + curr)),
+          Stream.scanEffect(() => 0, (acc, curr) => Effect.succeed(acc + curr)),
           Stream.runCollect
         )
 
@@ -1569,6 +1598,34 @@ describe("Stream", () => {
     })
   )
 
+  it.effect.each([
+    { size: 200001, lengths: [200000] },
+    { size: 200000, lengths: [200000] },
+    { size: 199999, lengths: [199999, 1] }
+  ])("rechunk preserves a large source chunk with target $size", ({ lengths, size }) =>
+    Effect.gen(function*() {
+      const values = Array.makeBy(200000, (i) => i)
+      const actual = yield* Stream.fromArray(values).pipe(
+        Stream.rechunk(size),
+        Stream.chunks,
+        Stream.runCollect
+      )
+      assert.deepStrictEqual(actual.map((chunk) => chunk.length), lengths)
+      assert.deepStrictEqual(actual.flat(), values)
+    }))
+
+  it.effect("rechunk preserves large input split across source chunks", () =>
+    Effect.gen(function*() {
+      const values = Array.makeBy(200001, (i) => i)
+      const actual = yield* Stream.fromArrays(values.slice(0, 1), values.slice(1)).pipe(
+        Stream.rechunk(200002),
+        Stream.chunks,
+        Stream.runCollect
+      )
+      assert.deepStrictEqual(actual.map((chunk) => chunk.length), [200001])
+      assert.deepStrictEqual(actual.flat(), values)
+    }))
+
   it.effect("rechunk and grouped normalize their chunk size", () =>
     Effect.gen(function*() {
       const counts = [Number.NaN, 0.5, 1.9, 2.9]
@@ -4245,12 +4302,29 @@ describe("Stream", () => {
   })
 
   describe("partition", () => {
+    it.effect("defaults to a capacity of 16", () =>
+      Effect.gen(function*() {
+        let pulled = 0
+        yield* Stream.range(0, 31).pipe(
+          Stream.rechunk(1),
+          Stream.tap(() =>
+            Effect.sync(() => {
+              pulled++
+            })
+          ),
+          Stream.partition(Result.succeed)
+        )
+        yield* TestClock.adjust(0)
+        // Sixteen elements are buffered; the next offer is blocked.
+        assert.strictEqual(pulled, 17)
+      }).pipe(Effect.scoped))
+
     it.effect("values", () =>
       Effect.gen(function*() {
         const { result1, result2 } = yield* pipe(
           Stream.range(0, 5),
           Stream.partition((n) => n % 2 === 0 ? Result.succeed(n) : Result.fail(n)),
-          Effect.flatMap(([odds, evens]) =>
+          Effect.flatMap(([evens, odds]) =>
             Effect.all({
               result1: Stream.runCollect(evens),
               result2: Stream.runCollect(odds)
@@ -4268,7 +4342,7 @@ describe("Stream", () => {
           Stream.make(0),
           Stream.concat(Stream.fail("boom")),
           Stream.partition((n) => n % 2 === 0 ? Result.succeed(n) : Result.fail(n)),
-          Effect.flatMap(([odds, evens]) =>
+          Effect.flatMap(([evens, odds]) =>
             Effect.all({
               result1: Effect.flip(Stream.runCollect(evens)),
               result2: Effect.flip(Stream.runCollect(odds))
@@ -4284,8 +4358,8 @@ describe("Stream", () => {
       Effect.gen(function*() {
         const { result1, result2, result3 } = yield* pipe(
           Stream.range(0, 5),
-          Stream.partition((n) => n % 2 === 0 ? Result.succeed(n) : Result.fail(n), { bufferSize: 1 }),
-          Effect.flatMap(([odds, evens]) =>
+          Stream.partition((n) => n % 2 === 0 ? Result.succeed(n) : Result.fail(n), { capacity: 1 }),
+          Effect.flatMap(([evens, odds]) =>
             Effect.gen(function*() {
               const ref = yield* Ref.make(Array.empty<number>())
               const latch = yield* Deferred.make<void>()
@@ -4377,7 +4451,7 @@ describe("Stream", () => {
         const { result1, result2 } = yield* pipe(
           Stream.range(0, 5),
           Stream.partition((n) => n % 2 === 0 ? Result.succeed(n) : Result.fail(n)),
-          Effect.flatMap(([odds, evens]) =>
+          Effect.flatMap(([evens, odds]) =>
             Effect.all({
               result1: Stream.runCollect(evens),
               result2: Stream.runCollect(odds)
@@ -4395,7 +4469,7 @@ describe("Stream", () => {
           Stream.make(0),
           Stream.concat(Stream.fail("boom")),
           Stream.partition((n) => n % 2 === 0 ? Result.succeed(n) : Result.fail(n)),
-          Effect.flatMap(([odds, evens]) =>
+          Effect.flatMap(([evens, odds]) =>
             Effect.all({
               result1: Effect.flip(Stream.runCollect(evens)),
               result2: Effect.flip(Stream.runCollect(odds))
@@ -4411,8 +4485,8 @@ describe("Stream", () => {
       Effect.gen(function*() {
         const { result1, result2, result3 } = yield* pipe(
           Stream.range(0, 5),
-          Stream.partition((n) => (n % 2 === 0 ? Result.succeed(n) : Result.fail(n)), { bufferSize: 1 }),
-          Effect.flatMap(([odds, evens]) =>
+          Stream.partition((n) => (n % 2 === 0 ? Result.succeed(n) : Result.fail(n)), { capacity: 1 }),
+          Effect.flatMap(([evens, odds]) =>
             Effect.gen(function*() {
               const ref = yield* Ref.make(Array.empty<number>())
               const latch = yield* (Deferred.make<void>())
@@ -4452,7 +4526,7 @@ describe("Stream", () => {
         const { evens, odds } = yield* pipe(
           Stream.range(0, 5),
           Stream.partition((n: number) => n % 2 === 0 ? Result.succeed(n) : Result.fail(n)),
-          Effect.flatMap(([fail, pass]) =>
+          Effect.flatMap(([pass, fail]) =>
             Effect.all({
               evens: Stream.runCollect(pass),
               odds: Stream.runCollect(fail)
diff --git a/repos/effect/packages/effect/test/Struct.test.ts b/repos/effect/packages/effect/test/Struct.test.ts
index 3310d8d06..4f183367e 100644
--- a/repos/effect/packages/effect/test/Struct.test.ts
+++ b/repos/effect/packages/effect/test/Struct.test.ts
@@ -32,6 +32,12 @@ describe("Struct", () => {
       deepStrictEqual(pipe(s, Struct.pick(["a", "b"])), { b: 1 })
       deepStrictEqual(Struct.pick(s, ["a", "b"]), { b: 1 })
     })
+
+    it("numeric properties", () => {
+      const s: { 1: string; 2: number } = { 1: "a", 2: 1 }
+      deepStrictEqual(pipe(s, Struct.pick([1])), { 1: "a" })
+      deepStrictEqual(Struct.pick(s, [1]), { 1: "a" })
+    })
   })
 
   describe("omit", () => {
@@ -47,6 +53,12 @@ describe("Struct", () => {
       deepStrictEqual(Struct.omit(s, ["c"]), { b: 1 })
     })
 
+    it("numeric properties", () => {
+      const s: { 1: string; 2: number } = { 1: "a", 2: 1 }
+      deepStrictEqual(pipe(s, Struct.omit([2])), { 1: "a" })
+      deepStrictEqual(Struct.omit(s, [2]), { 1: "a" })
+    })
+
     it("ignores non-enumerable properties", () => {
       const hidden = Symbol.for("hidden")
       const s = { a: "a" }
@@ -125,6 +137,16 @@ describe("Struct", () => {
     )
   })
 
+  it("mapPick numeric properties", () => {
+    equals(
+      Struct.mapPick({ 1: Schema.String, 2: Schema.Number }, [1], Schema.NullOr),
+      {
+        1: Schema.NullOr(Schema.String),
+        2: Schema.Number
+      }
+    )
+  })
+
   it("mapOmit", () => {
     equals(
       pipe({ a: Schema.String, b: Schema.Number }, Struct.mapOmit(["b"], Schema.NullOr)),
@@ -142,6 +164,16 @@ describe("Struct", () => {
     )
   })
 
+  it("mapOmit numeric properties", () => {
+    equals(
+      Struct.mapOmit({ 1: Schema.String, 2: Schema.Number }, [2], Schema.NullOr),
+      {
+        1: Schema.NullOr(Schema.String),
+        2: Schema.Number
+      }
+    )
+  })
+
   it("makeEquivalence compares structs by configured fields", () => {
     const PersonEquivalence = Struct.makeEquivalence({
       a: Equivalence.strictEqual<string>(),
diff --git a/repos/effect/packages/effect/test/SynchronizedRef.modifySomeEffect.test.ts b/repos/effect/packages/effect/test/SynchronizedRef.modifySomeEffect.test.ts
new file mode 100644
index 000000000..a044af5b3
--- /dev/null
+++ b/repos/effect/packages/effect/test/SynchronizedRef.modifySomeEffect.test.ts
@@ -0,0 +1,26 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Effect, Option, SynchronizedRef } from "effect"
+
+describe("SynchronizedRef.modifySomeEffect", () => {
+  it.effect("supports callback-only currying", () =>
+    Effect.gen(function*() {
+      const ref = yield* SynchronizedRef.make(1)
+      const result = yield* SynchronizedRef.modifySomeEffect((value: number) =>
+        Effect.succeed(["updated", Option.some(value + 1)] as const)
+      )(ref)
+
+      assert.strictEqual(result, "updated")
+      assert.strictEqual(yield* SynchronizedRef.get(ref), 2)
+    }))
+
+  it.effect("preserves the value for Option.none", () =>
+    Effect.gen(function*() {
+      const ref = yield* SynchronizedRef.make(1)
+      const result = yield* SynchronizedRef.modifySomeEffect((_: number) =>
+        Effect.succeed(["unchanged", Option.none<number>()] as const)
+      )(ref)
+
+      assert.strictEqual(result, "unchanged")
+      assert.strictEqual(yield* SynchronizedRef.get(ref), 1)
+    }))
+})
diff --git a/repos/effect/packages/effect/test/Tracer.test.ts b/repos/effect/packages/effect/test/Tracer.test.ts
index 30dfa9f44..2f3d66dcc 100644
--- a/repos/effect/packages/effect/test/Tracer.test.ts
+++ b/repos/effect/packages/effect/test/Tracer.test.ts
@@ -1,6 +1,6 @@
 import { assert, describe, it } from "@effect/vitest"
 import { assertNone, deepStrictEqual, strictEqual } from "@effect/vitest/utils"
-import { Cause, Context, Duration, Effect, Fiber, Layer, Tracer } from "effect"
+import { Cause, Context, Duration, Effect, Exit, Fiber, Layer, Tracer } from "effect"
 import { TestClock } from "effect/testing"
 import type { Span } from "effect/Tracer"
 import { HttpClient, HttpClientResponse } from "effect/unstable/http"
@@ -242,6 +242,33 @@ describe("Tracer", () => {
       }))
   })
 
+  describe("Effect.useSpan", () => {
+    it.effect("ends the span when the callback throws", () =>
+      Effect.gen(function*() {
+        const defect = new Error("boom")
+        const spans: Array<Tracer.Span> = []
+        const tracer = Tracer.make({
+          span: (options) => {
+            const span = new Tracer.NativeSpan(options)
+            spans.push(span)
+            return span
+          }
+        })
+
+        const exit = yield* Effect.useSpan("A", (): Effect.Effect<never> => {
+          throw defect
+        }).pipe(Effect.withTracer(tracer), Effect.exit)
+
+        deepStrictEqual(exit, Exit.die(defect))
+        strictEqual(spans.length, 1)
+        const span = spans[0]!
+        strictEqual(span.status._tag, "Ended")
+        if (span.status._tag === "Ended") {
+          deepStrictEqual(span.status.exit, Exit.die(defect))
+        }
+      }))
+  })
+
   describe("Effect.useSpanScoped", () => {
     it.effect("should control span lifetimes with a scope", () =>
       Effect.gen(function*() {
diff --git a/repos/effect/packages/effect/test/Trie.test.ts b/repos/effect/packages/effect/test/Trie.test.ts
index ac4e82759..5eb88afc8 100644
--- a/repos/effect/packages/effect/test/Trie.test.ts
+++ b/repos/effect/packages/effect/test/Trie.test.ts
@@ -233,6 +233,12 @@ describe("Trie", () => {
     deepStrictEqual(Array.from(trie2), [["me", 1], ["mid", 3], ["mind", 2]])
   })
 
+  it("remove preserves a valued prefix", () => {
+    const trie = Trie.make(["ab", 1], ["abc", 2]).pipe(Trie.remove("abc"))
+
+    deepStrictEqual(Array.from(trie), [["ab", 1]], "valued prefix should remain after removing its extension")
+  })
+
   it("keys returns keys in sorted order", () => {
     const trie = Trie.empty<number>().pipe(
       Trie.insert("cab", 0),
diff --git a/repos/effect/packages/effect/test/cluster/ClusterWorkflowEngine.test.ts b/repos/effect/packages/effect/test/cluster/ClusterWorkflowEngine.test.ts
index 7b4864df4..814e57737 100644
--- a/repos/effect/packages/effect/test/cluster/ClusterWorkflowEngine.test.ts
+++ b/repos/effect/packages/effect/test/cluster/ClusterWorkflowEngine.test.ts
@@ -1,20 +1,324 @@
 import { assert, describe, expect, it } from "@effect/vitest"
-import { Cause, Context, DateTime, Duration, Effect, Exit, Fiber, Layer, Option, Result, Schema, Tracer } from "effect"
+import {
+  Cause,
+  Context,
+  DateTime,
+  Duration,
+  Effect,
+  Exit,
+  Fiber,
+  Latch,
+  Layer,
+  Logger,
+  Option,
+  Result,
+  Schema,
+  Scope,
+  Tracer
+} from "effect"
 import { TestClock } from "effect/testing"
 import {
   ClusterSchema,
   ClusterWorkflowEngine,
+  Entity,
   MessageStorage,
   RunnerHealth,
   Runners,
   RunnerStorage,
   Sharding,
-  ShardingConfig
+  ShardingConfig,
+  Snowflake
 } from "effect/unstable/cluster"
+import { CurrentActivationScope } from "effect/unstable/cluster/internal/entityActivation"
+import { Rpc } from "effect/unstable/rpc"
 import { Activity, DurableClock, DurableDeferred, Workflow } from "effect/unstable/workflow"
-import { WorkflowEngine, WorkflowInstance } from "effect/unstable/workflow/WorkflowEngine"
+import {
+  makeUnsafe as makeWorkflowEngineUnsafe,
+  WorkflowEngine,
+  WorkflowInstance
+} from "effect/unstable/workflow/WorkflowEngine"
 
 describe.concurrent("ClusterWorkflowEngine", () => {
+  for (const entityMailboxCapacity of [2, 3]) {
+    it.effect(
+      `admits a required completion after an unrelated completion with mailbox capacity ${entityMailboxCapacity}`,
+      () =>
+        Effect.gen(function*() {
+          const unrelatedRead = yield* Latch.make()
+          const required = DurableDeferred.make("MailboxProgress/Required", { success: Schema.String })
+          const unrelated = DurableDeferred.make("MailboxProgress/Unrelated", { success: Schema.String })
+          const workflow = Workflow.make("MailboxProgress", {
+            payload: {},
+            success: Schema.String,
+            idempotencyKey: () => "one"
+          })
+          let instance: WorkflowInstance["Service"] | undefined
+          let runRequestId: Snowflake.Snowflake | undefined
+          const shared = yield* Layer.build(
+            MessageStorage.layerMemory.pipe(Layer.provide(ShardingConfig.layerDefaults))
+          )
+          const storage = Context.get(shared, MessageStorage.MessageStorage)
+          const driver = Context.get(shared, MessageStorage.MemoryDriver)
+          const storageLayer = Layer.succeed(MessageStorage.MessageStorage, {
+            ...storage,
+            repliesForUnfiltered: (requestIds) => {
+              const ids = Array.from(requestIds)
+              return storage.repliesForUnfiltered(ids).pipe(
+                Effect.tap(() =>
+                  runRequestId !== undefined && ids.includes(runRequestId) ? unrelatedRead.open : Effect.void
+                )
+              )
+            }
+          })
+          const context = yield* Layer.build(
+            workflow.toLayer(() =>
+              Effect.gen(function*() {
+                instance = yield* WorkflowInstance
+                return yield* DurableDeferred.raceAll({
+                  name: "mailbox-progress",
+                  success: Schema.String,
+                  error: Schema.Never,
+                  // Keep the run active without allocating an activity RPC/mailbox slot.
+                  effects: [DurableDeferred.await(required), Effect.never]
+                })
+              })
+            ).pipe(Layer.provideMerge(makeTestWorkflowEngine({ storageLayer, config: { entityMailboxCapacity } })))
+          )
+          yield* Effect.gen(function*() {
+            const sharding = yield* Sharding.Sharding
+            const executionId = yield* workflow.execute({}, { discard: true })
+            yield* advanceUntil(
+              () => instance?.awaitedDeferreds.has(required.name) === true,
+              "run must await the required deferred"
+            )
+            assert.isFalse(instance!.awaitedDeferreds.has(unrelated.name))
+            const run = driver.journal.find((message) => message._tag === "Request" && message.tag === "run")!
+            runRequestId = Snowflake.Snowflake(run.requestId)
+            yield* DurableDeferred.succeed(unrelated, {
+              token: DurableDeferred.tokenFromExecutionId(unrelated, { workflow, executionId }),
+              value: "unrelated"
+            })
+            // Both implementations read the active run before replying or parking.
+            // Wait for that read before admitting the completion needed for progress.
+            yield* advanceUntil(() => unrelatedRead.isOpen(), "unrelated completion must inspect the active run")
+            yield* DurableDeferred.succeed(required, {
+              token: DurableDeferred.tokenFromExecutionId(required, { workflow, executionId }),
+              value: "signal"
+            })
+            let result = yield* workflow.poll(executionId)
+            for (let i = 0; i < 100 && !(Option.isSome(result) && result.value._tag === "Complete"); i++) {
+              yield* TestClock.adjust(100)
+              yield* sharding.pollStorage
+              result = yield* workflow.poll(executionId)
+            }
+            const pendingDeferreds = Array.from(driver.requests.values()).filter((entry) =>
+              entry.envelope._tag === "Request" && entry.envelope.tag === "deferred" && entry.replies.length === 0
+            ).map((entry) => (entry.envelope as { payload: { name: string } }).payload.name)
+            assert.deepStrictEqual(
+              result,
+              Option.some(new Workflow.Complete({ exit: Exit.succeed("signal") })),
+              `required completion must progress; pending deferreds: ${pendingDeferreds.join(", ")}`
+            )
+          }).pipe(Effect.provide(context))
+        }),
+      20_000
+    )
+  }
+
+  it.effect("retains a handover completion before its deferred reply is persisted", () =>
+    Effect.gen(function*() {
+      const gate = DurableDeferred.make("DeferredHandover/Gate", { success: Schema.String })
+      const workflow = Workflow.make("DeferredHandover", {
+        payload: {},
+        success: Schema.String,
+        idempotencyKey: () => "one"
+      })
+      const shared = yield* Layer.build(
+        MessageStorage.layerMemory.pipe(Layer.provide(ShardingConfig.layerDefaults))
+      )
+      const storage = Context.get(shared, MessageStorage.MessageStorage)
+      const layer = workflow.toLayer(() => DurableDeferred.await(gate)).pipe(
+        Layer.provideMerge(makeTestWorkflowEngine({
+          storageLayer: Layer.succeed(MessageStorage.MessageStorage, {
+            ...storage,
+            saveReply: (reply) =>
+              reply.rpc._tag === "deferred"
+                ? Effect.sleep(100).pipe(Effect.andThen(storage.saveReply(reply)))
+                : storage.saveReply(reply)
+          })
+        }))
+      )
+      // Each owner has a fresh engine over the same durable storage.
+      const withOwner = <A, E>(body: Effect.Effect<A, E, Layer.Success<typeof layer>>) =>
+        Effect.scoped(Effect.gen(function*() {
+          const context = yield* Layer.build(layer)
+          return yield* Effect.provide(body, context)
+        }))
+      const executionId = yield* withOwner(Effect.gen(function*() {
+        const id = yield* workflow.execute({}, { discard: true })
+        yield* pollUntil(workflow, id, "Suspended")
+        return id
+      }))
+      const result = yield* withOwner(Effect.gen(function*() {
+        yield* DurableDeferred.succeed(gate, {
+          token: DurableDeferred.tokenFromExecutionId(gate, { workflow, executionId }),
+          value: "signal"
+        })
+        // Complete before the 5-second storage retry can hide a lost wake-up.
+        const result = yield* pollUntil(workflow, executionId, "Complete")
+        yield* TestClock.adjust(1000)
+        return result
+      }))
+      assert.deepStrictEqual(result, new Workflow.Complete({ exit: Exit.succeed("signal") }))
+    }), 30_000)
+
+  for (const lifecycle of ["defect rebuild", "overlapping activations"] as const) {
+    it.effect(`completes before deferred persistence across ${lifecycle}`, () =>
+      Effect.gen(function*() {
+        const saving = yield* Latch.make()
+        const allowSave = yield* Latch.make()
+        const rebuilt = yield* Latch.make()
+        const allowRun = yield* Latch.make()
+        const allowDefect = yield* Latch.make()
+        const closing = yield* Latch.make()
+        const allowClose = yield* Latch.make()
+        const closed = yield* Latch.make()
+        const allowRedelivery = yield* Latch.make()
+        let persisted = false
+        let builds = 0
+        let firstBuildRuns = 0
+        let deferredDeliveries = 0
+        const activations: Array<Scope.Scope> = []
+        const gate = DurableDeferred.make("BehaviouralLifecycle/Gate", { success: Schema.String })
+        const workflow = Workflow.make("BehaviouralLifecycle", {
+          payload: {},
+          success: Schema.String,
+          idempotencyKey: () => "one"
+        })
+        const shardingLayer = Layer.effect(
+          Sharding.Sharding,
+          Effect.map(Sharding.Sharding, (sharding) => ({
+            ...sharding,
+            registerEntity: (entity, handlers, options) =>
+              sharding.registerEntity(
+                entity,
+                Effect.gen(function*() {
+                  if (entity.type !== `Workflow/${workflow._tag}`) return yield* handlers
+                  const build = ++builds
+                  const activationOption = yield* Effect.serviceOption(CurrentActivationScope)
+                  assert(Option.isSome(activationOption), "the entity manager must provide its activation")
+                  const activation = activationOption.value
+                  activations.push(activation)
+                  assert.notStrictEqual(activation, yield* Effect.scope, "handler and activation scopes must differ")
+                  // Registered before the production handlers, this marks the end of activation cleanup.
+                  if (build === 1) yield* Scope.addFinalizer(activation, closed.open)
+                  const built = yield* handlers
+                  if (build === 1 && lifecycle === "overlapping activations") {
+                    // Pause the retiring activation before its production cleanup. Its replacement
+                    // records the completion first, then the old activation finishes closing.
+                    yield* Scope.addFinalizer(activation, closing.open.pipe(Effect.andThen(allowClose.await)))
+                  }
+                  if (build === 2) yield* rebuilt.open
+                  const { deferred, run } = built as unknown as {
+                    run: (request: Entity.Request<any>) => Effect.Effect<any, any, any>
+                    deferred: (request: Entity.Request<any>) => Effect.Effect<any, any, any>
+                  }
+                  return {
+                    ...built,
+                    run: (request: Entity.Request<any>) =>
+                      Effect.suspend(() => {
+                        if (build === 1 && ++firstBuildRuns === 2 && lifecycle === "defect rebuild") {
+                          // Defect outside Workflow.intoResult to rebuild the real RPC server.
+                          return saving.await.pipe(
+                            Effect.andThen(allowDefect.await),
+                            Effect.andThen(Effect.die("injected entity defect"))
+                          )
+                        }
+                        return build === 2 ? allowRun.await.pipe(Effect.andThen(run(request))) : run(request)
+                      }),
+                    deferred: (request: Entity.Request<any>) =>
+                      Effect.suspend(() => {
+                        // A replayed completion must not repair a cache loss before the assertion.
+                        if (++deferredDeliveries > 1) {
+                          return allowRedelivery.await.pipe(Effect.andThen(deferred(request)))
+                        }
+                        return deferred(request)
+                      })
+                  }
+                }),
+                options
+              )
+          }))
+        ).pipe(Layer.provide(Sharding.layer))
+        const storageLayer = Layer.effect(
+          MessageStorage.MessageStorage,
+          Effect.map(
+            MessageStorage.MessageStorage,
+            (storage) => ({
+              ...storage,
+              saveReply: (reply) =>
+                reply.rpc._tag === "deferred"
+                  ? saving.open.pipe(
+                    Effect.andThen(allowSave.await),
+                    Effect.interruptible,
+                    Effect.andThen(storage.saveReply(reply)),
+                    Effect.tap(() =>
+                      Effect.sync(() => {
+                        persisted = true
+                      })
+                    )
+                  )
+                  : storage.saveReply(reply)
+            })
+          )
+        ).pipe(Layer.provide(MessageStorage.layerMemory))
+        const context = yield* Layer.build(
+          workflow.toLayer(() => DurableDeferred.await(gate)).pipe(
+            Layer.provideMerge(makeTestWorkflowEngine({ shardingLayer, storageLayer }))
+          )
+        )
+        yield* Effect.addFinalizer(() =>
+          Effect.all([
+            allowSave.open,
+            allowRun.open,
+            allowDefect.open,
+            allowClose.open,
+            allowRedelivery.open
+          ], { discard: true })
+        )
+        yield* Effect.gen(function*() {
+          const executionId = yield* workflow.execute({}, { discard: true })
+          yield* pollUntil(workflow, executionId, "Suspended")
+          if (lifecycle === "overlapping activations") {
+            yield* advanceUntil(() => closing.isOpen(), "old activation must start closing", 5000, 12)
+            assert.strictEqual(builds, 1)
+          }
+          yield* DurableDeferred.succeed(gate, {
+            token: DurableDeferred.tokenFromExecutionId(gate, { workflow, executionId }),
+            value: "signal"
+          })
+          yield* advanceUntil(() => saving.isOpen(), "deferred persistence must start")
+          yield* allowDefect.open
+          yield* advanceUntil(() => rebuilt.isOpen(), "replacement handlers must be built")
+          assert.strictEqual(builds, 2)
+          if (lifecycle === "defect rebuild") {
+            assert.strictEqual(activations[0], activations[1], "rebuild must retain activation identity")
+            assert.isFalse(closed.isOpen(), "a handler rebuild must not close its activation")
+          } else {
+            assert.notStrictEqual(activations[0], activations[1], "replacement must have its own activation")
+            yield* allowClose.open
+            yield* advanceUntil(() => closed.isOpen(), "old activation cleanup must finish")
+          }
+          yield* allowRun.open
+          const result = yield* pollUntil(workflow, executionId, "Complete")
+          assert.deepStrictEqual(result, new Workflow.Complete({ exit: Exit.succeed("signal") }))
+          assert.isFalse(allowSave.isOpen(), "workflow must complete while persistence remains gated")
+          assert.isFalse(persisted, "no deferred reply may be durable before workflow completion")
+          assert.isFalse(allowRedelivery.isOpen(), "redelivery must not repair a lost completion")
+        }).pipe(Effect.provide(context))
+      }), 30_000)
+  }
+
   it.effect("executes, resumes, deduplicates, and polls a suspended workflow", () =>
     Effect.gen(function*() {
       const sharding = yield* Sharding.Sharding
@@ -102,18 +406,37 @@ describe.concurrent("ClusterWorkflowEngine", () => {
 
       const envelope = driver.journal[0]
       const executionId = envelope.address.entityId
+      // Interrupt after the clock-backed activity completes, so the workflow is
+      // suspended on EmailTrigger rather than racing the clock's completion.
+      yield* advanceUntil(
+        () =>
+          Array.from(driver.requests.values()).some(({ envelope, replies }) =>
+            envelope._tag === "Request" && envelope.tag === "activity" &&
+            envelope.address.entityId === executionId &&
+            (envelope.payload as { name: string }).name === "Sleep" &&
+            replies.some((reply) =>
+              reply._tag === "WithExit" && reply.exit._tag === "Success" &&
+              (reply.exit.value as Workflow.ResultEncoded<any, any>)._tag === "Complete"
+            )
+          ),
+        "sleep activity must complete before interruption",
+        10
+      )
+      yield* pollUntil(EmailWorkflow, executionId, "Suspended")
       yield* EmailWorkflow.interrupt(executionId)
 
-      // - 1 initial request
-      // - 5 attempts to send email
-      // - 1 sleep activity
-      // - 1 durable clock run
-      // - 1 durable clock deferred set
-      // - 1 interrupt signal set
-      expect(driver.requests.size).toEqual(10)
-      yield* TestClock.adjust(5000)
-      yield* sharding.pollStorage
-      yield* TestClock.adjust(5000)
+      // Wait for this execution's signal; concurrent cleanup can change the total request count.
+      yield* advanceUntil(
+        () =>
+          Array.from(driver.requests.values()).some(({ envelope }) =>
+            envelope._tag === "Request" && envelope.tag === "deferred" &&
+            envelope.address.entityId === executionId &&
+            envelope.address.entityType === `Workflow/${EmailWorkflow._tag}` &&
+            (envelope.payload as { name: string }).name === "Workflow/InterruptSignal"
+          ),
+        "interrupt signal request must be persisted"
+      )
+      yield* pollUntil(EmailWorkflow, executionId, "Complete")
       // - clock cleared
       expect(driver.requests.size).toEqual(9)
 
@@ -126,6 +449,7 @@ describe.concurrent("ClusterWorkflowEngine", () => {
       const value = reply.exit.value as Workflow.ResultEncoded<any, any>
       assert(value._tag === "Complete" && value.exit._tag === "Failure")
 
+      yield* advanceUntil(() => fiber.pollUnsafe() !== undefined, "execute waiter must observe interruption", 10)
       const exit = yield* Fiber.await(fiber)
       assert(Exit.hasInterrupts(exit))
 
@@ -144,15 +468,18 @@ describe.concurrent("ClusterWorkflowEngine", () => {
         to: "compensation"
       }).pipe(Effect.forkChild({ startImmediately: true }))
 
-      yield* TestClock.adjust(500)
-
-      const flags = yield* Flags
-      assert.isTrue(flags.get("compensation"))
+      yield* pollUntil(
+        EmailWorkflow,
+        yield* EmailWorkflow.executionId({ id: "test-email-3", to: "compensation" }),
+        "Complete"
+      )
 
       const error = yield* Fiber.join(fiber).pipe(
         Effect.flip
       )
       expect(error).toBeInstanceOf(SendEmailError)
+      const flags = yield* Flags
+      assert.isTrue(flags.get("compensation"))
     }).pipe(
       Effect.provide(TestWorkflowLayer)
     ))
@@ -166,7 +493,8 @@ describe.concurrent("ClusterWorkflowEngine", () => {
         id: "race-1"
       }).pipe(Effect.forkChild({ startImmediately: true }))
 
-      yield* TestClock.adjust(500)
+      // Activity timers may be registered after the caller's first clock advance.
+      yield* pollUntil(RaceWorkflow, yield* RaceWorkflow.executionId({ id: "race-1" }), "Complete")
 
       const result = yield* Fiber.join(fiber)
       expect(result).toEqual("Activity3")
@@ -182,7 +510,7 @@ describe.concurrent("ClusterWorkflowEngine", () => {
         id: "failure-race"
       }).pipe(Effect.forkChild({ startImmediately: true }))
 
-      yield* TestClock.adjust("1 second")
+      yield* pollUntil(FailureRaceWorkflow, yield* FailureRaceWorkflow.executionId({ id: "failure-race" }), "Complete")
 
       expect(yield* Fiber.join(fiber)).toEqual("slow")
     }).pipe(Effect.provide(TestWorkflowLayer)))
@@ -420,13 +748,14 @@ describe.concurrent("ClusterWorkflowEngine", () => {
   it.effect("DurableDeferred.raceAll re-runs a multi-await branch once per completion", () =>
     Effect.gen(function*() {
       const flags = yield* Flags
+      const branchControl = yield* TwoStepBranchControl
       const sharding = yield* Sharding.Sharding
       const executionId = yield* TwoStepWorkflow.executionId({ id: "two-step" })
       const fiber = yield* TwoStepWorkflow.execute({ id: "two-step" }).pipe(
         Effect.forkChild({ startImmediately: true })
       )
 
-      yield* TestClock.adjust(1)
+      yield* branchControl.entered.await
       const tokenA = DurableDeferred.tokenFromExecutionId(TwoStepGateA, {
         workflow: TwoStepWorkflow,
         executionId
@@ -434,9 +763,11 @@ describe.concurrent("ClusterWorkflowEngine", () => {
       yield* DurableDeferred.succeed(TwoStepGateA, { token: tokenA, value: "a" })
       yield* sharding.pollStorage
       yield* TestClock.adjust("1 second")
+      yield* branchControl.release.open
+      yield* branchControl.started.await
 
-      // The run parks on the second gate, usually after one wake replay;
-      // under load the first completion can be read directly (1 run).
+      // The run parks on the second gate after reading the first completion
+      // directly or replaying once while the completion is committed.
       assert([1, 2].includes(flags.get("two-step-branch-runs") as number))
 
       const tokenB = DurableDeferred.tokenFromExecutionId(TwoStepGateB, {
@@ -451,6 +782,79 @@ describe.concurrent("ClusterWorkflowEngine", () => {
       assert([2, 3].includes(flags.get("two-step-branch-runs") as number))
     }).pipe(Effect.provide(TestWorkflowLayer)), 20_000)
 
+  it.effect(
+    "DurableDeferred resumes a discarded execution when completion precedes the suspension commit",
+    () =>
+      Effect.gen(function*() {
+        const savingRun = yield* Latch.make()
+        const releaseRun = yield* Latch.make()
+        const readBeforeCommit = yield* Latch.make()
+        const savedDeferred = yield* Latch.make()
+        let runRequestId: Snowflake.Snowflake | undefined
+        const gate = DurableDeferred.make("DiscardedSuspension/Gate", { success: Schema.String })
+        const workflow = Workflow.make("DiscardedSuspension", {
+          payload: {},
+          success: Schema.String,
+          idempotencyKey: () => "one"
+        })
+        const storageLayer = Layer.effect(
+          MessageStorage.MessageStorage,
+          Effect.map(MessageStorage.MessageStorage, (storage) => ({
+            ...storage,
+            saveReply: (reply) => {
+              if (reply.rpc._tag === "run" && !savingRun.isOpen()) {
+                runRequestId = reply.reply.requestId
+                assert(reply.reply._tag === "WithExit" && reply.reply.exit._tag === "Success")
+                assert(Schema.is(Workflow.Suspended)(reply.reply.exit.value))
+                return savingRun.open.pipe(
+                  Effect.andThen(releaseRun.await),
+                  Effect.andThen(storage.saveReply(reply))
+                )
+              }
+              return storage.saveReply(reply).pipe(
+                Effect.tap(() => reply.rpc._tag === "deferred" ? savedDeferred.open : Effect.void)
+              )
+            },
+            repliesForUnfiltered: (requestIds) => {
+              const ids = Array.from(requestIds)
+              return storage.repliesForUnfiltered(ids).pipe(
+                Effect.tap((replies) => {
+                  if (!releaseRun.isOpen() && runRequestId !== undefined && ids.includes(runRequestId)) {
+                    assert.deepStrictEqual(replies, [])
+                    return readBeforeCommit.open
+                  }
+                  return Effect.void
+                })
+              )
+            }
+          }))
+        ).pipe(Layer.provide(MessageStorage.layerMemory))
+        const context = yield* Layer.build(
+          workflow.toLayer(() => DurableDeferred.await(gate)).pipe(
+            Layer.provideMerge(makeTestWorkflowEngine({ storageLayer }))
+          )
+        )
+        yield* Effect.addFinalizer(() => releaseRun.open)
+        yield* Effect.gen(function*() {
+          // No execute waiter may retry a Suspended reply and repair the lost wake-up.
+          const executionId = yield* workflow.execute({}, { discard: true })
+          yield* advanceUntil(() => savingRun.isOpen(), "run must reach suspension persistence")
+          yield* DurableDeferred.succeed(gate, {
+            token: DurableDeferred.tokenFromExecutionId(gate, { workflow, executionId }),
+            value: "signal"
+          })
+          // Both resume and waitForRunReply read storage. Hold the commit until
+          // that read observes no reply, allowing a fixed handler to park on it.
+          yield* advanceUntil(() => readBeforeCommit.isOpen(), "completion must read the uncommitted run")
+          yield* releaseRun.open
+          yield* advanceUntil(() => savedDeferred.isOpen(), "deferred completion must be persisted")
+          const result = yield* pollUntil(workflow, executionId, "Complete")
+          assert.deepStrictEqual(result, new Workflow.Complete({ exit: Exit.succeed("signal") }))
+        }).pipe(Effect.provide(context))
+      }),
+    20_000
+  )
+
   it.effect(
     "DurableDeferred.raceAll delivers a completion that lands while a suspension commits",
     () =>
@@ -546,17 +950,507 @@ describe.concurrent("ClusterWorkflowEngine", () => {
       assert.isTrue(flags.get("child-end"))
     }).pipe(Effect.provide(TestWorkflowLayer)))
 
+  it.effect("bounds a durable clock notification when its workflow is absent after restart", () =>
+    Effect.gen(function*() {
+      const clockDuration = 3000
+      const registrationTimeout = 5000
+      const RemovedWorkflow = Workflow.make("RemovedWorkflow", {
+        payload: {},
+        success: Schema.Void,
+        idempotencyKey: () => "one"
+      })
+      const shared = yield* Layer.build(
+        MessageStorage.layerMemory.pipe(Layer.provide(ShardingConfig.layerDefaults))
+      )
+      const driver = Context.get(shared, MessageStorage.MemoryDriver)
+      const storageLayer = Layer.succeed(
+        MessageStorage.MessageStorage,
+        Context.get(shared, MessageStorage.MessageStorage)
+      )
+      const config = { entityRegistrationTimeout: registrationTimeout }
+      const clock = DurableClock.make({ name: "wait", duration: clockDuration })
+
+      const executionId = yield* Effect.gen(function*() {
+        const executionId = yield* RemovedWorkflow.execute({}, { discard: true })
+        yield* pollUntil(RemovedWorkflow, executionId, "Suspended")
+        return executionId
+      }).pipe(Effect.provide(
+        RemovedWorkflow.toLayer(() =>
+          DurableClock.sleep({ name: "wait", duration: clockDuration, inMemoryThreshold: Duration.zero })
+        ).pipe(Layer.provideMerge(makeTestWorkflowEngine({ storageLayer, config })))
+      ))
+      const clockRequest = driver.journal.find((message) =>
+        message._tag === "Request" && message.address.entityType === "Workflow/-/DurableClock"
+      )
+      assert(clockRequest !== undefined && clockRequest._tag === "Request")
+
+      yield* Effect.gen(function*() {
+        // Fire the persisted timer before the registration-start deadline.
+        yield* TestClock.adjust(clockDuration)
+        // This is the completion emitted by ClockEntity when the persisted timer fires.
+        // Calling it directly isolates the notifyLocal registration wait from storage claims.
+        const fiber = yield* DurableDeferred.done(clock.deferred, {
+          token: DurableDeferred.tokenFromExecutionId(clock.deferred, {
+            workflow: RemovedWorkflow,
+            executionId
+          }),
+          exit: Exit.void
+        }).pipe(Effect.forkDetach({ startImmediately: true }))
+        yield* Effect.yieldNow
+        assert.isUndefined(fiber.pollUnsafe())
+        yield* TestClock.adjust(registrationTimeout - clockDuration)
+
+        const exit = fiber.pollUnsafe()
+        assert(exit !== undefined, "the notifyLocal registration wait must be bounded")
+        const defect = Exit.findDefect(exit)
+        assert(Result.isSuccess(defect) && defect.success instanceof Error)
+        assert.strictEqual(defect.success.message, `Entity type 'Workflow/${RemovedWorkflow._tag}' not registered`)
+      }).pipe(Effect.provide(makeTestWorkflowEngine({ storageLayer, config })))
+    }))
+
+  for (const [id, threshold] of [["number", 0], ["bigint", 0n]] as const) {
+    it.effect(`DurableClock.sleep preserves an explicit ${id} zero threshold`, () => verifyZeroThreshold(id, threshold))
+  }
+
+  it.effect("parallel child workflows inside an activity suspend the parent durably", () =>
+    Effect.gen(function*() {
+      const sharding = yield* Sharding.Sharding
+      const flags = yield* Flags
+      yield* TestClock.adjust(1)
+
+      const payload = { id: "parallel-activity", childCount: 3, concurrency: 3, sleep: 2000 }
+      const executionId = yield* ParallelParentWorkflow.executionId(payload)
+      const fiber = yield* ParallelParentWorkflow.execute(payload).pipe(
+        Effect.forkChild({ startImmediately: true })
+      )
+
+      // the parent suspends durably once every child has been dispatched
+      let suspended = false
+      while (!suspended) {
+        yield* Effect.yieldNow
+        yield* sharding.pollStorage
+        const result = yield* ParallelParentWorkflow.poll(executionId)
+        suspended = Option.isSome(result) && result.value._tag === "Suspended"
+      }
+      assert.strictEqual(flags.get("parallel-runs-parallel-activity"), 1)
+      assert.isTrue(flags.get("parallel-child-start-parallel-activity-child-0"))
+      assert.isTrue(flags.get("parallel-child-start-parallel-activity-child-1"))
+      assert.isTrue(flags.get("parallel-child-start-parallel-activity-child-2"))
+      assert.strictEqual(flags.get("parallel-activity-runs-parallel-activity"), 1)
+      assert.strictEqual(flags.get("parallel-activity-releases-parallel-activity"), 1)
+
+      // the children complete after a single sleep window and wake the parent
+      yield* TestClock.adjust(Duration.seconds(2))
+      yield* sharding.pollStorage
+      while (fiber.pollUnsafe() === undefined) {
+        yield* Effect.yieldNow
+        yield* TestClock.adjust(1)
+        yield* sharding.pollStorage
+      }
+      assert.deepStrictEqual(fiber.pollUnsafe(), Exit.succeed(["done-0", "done-1", "done-2"]))
+
+      // the parent replayed after suspending, and no run retried the activity body
+      const parentRuns = Number(flags.get("parallel-runs-parallel-activity"))
+      const activityRuns = Number(flags.get("parallel-activity-runs-parallel-activity"))
+      assert.isAtLeast(parentRuns, 2)
+      assert.isAtMost(activityRuns, parentRuns)
+    }).pipe(Effect.provide(TestWorkflowLayer)))
+
+  it.effect("bounded child concurrency progresses across suspended activity replays", () =>
+    Effect.gen(function*() {
+      const sharding = yield* Sharding.Sharding
+      const flags = yield* Flags
+      yield* TestClock.adjust(1)
+      const payload = { id: "parallel-bounded", childCount: 5, concurrency: 2, sleep: 2000 }
+      const executionId = yield* ParallelParentWorkflow.executionId(payload)
+      yield* ParallelParentWorkflow.execute(payload, { discard: true })
+
+      for (const started of [2, 4, 5]) {
+        let suspended = false
+        while (!suspended) {
+          yield* Effect.yieldNow
+          // Drive cluster retries between runs without advancing child clocks
+          // while the activity is computing execution IDs.
+          if (
+            flags.get("parallel-activity-runs-parallel-bounded") ===
+              flags.get("parallel-activity-releases-parallel-bounded")
+          ) {
+            yield* TestClock.adjust(1)
+          }
+          yield* sharding.pollStorage
+          const result = yield* ParallelParentWorkflow.poll(executionId)
+          suspended = Option.isSome(result) && result.value._tag === "Suspended" &&
+            flags.get(`parallel-child-start-parallel-bounded-child-${started - 1}`) === true
+        }
+        for (let index = 0; index < 5; index++) {
+          assert.strictEqual(
+            flags.get(`parallel-child-start-parallel-bounded-child-${index}`),
+            index < started ? true : undefined
+          )
+        }
+        assert.strictEqual(
+          flags.get("parallel-activity-releases-parallel-bounded"),
+          flags.get("parallel-activity-runs-parallel-bounded")
+        )
+        yield* TestClock.adjust(Duration.seconds(2))
+        yield* sharding.pollStorage
+      }
+      let result = yield* ParallelParentWorkflow.poll(executionId)
+      while (Option.isNone(result) || result.value._tag !== "Complete") {
+        yield* Effect.yieldNow
+        yield* TestClock.adjust(1)
+        yield* sharding.pollStorage
+        result = yield* ParallelParentWorkflow.poll(executionId)
+      }
+      assert.deepStrictEqual(
+        result.value,
+        new Workflow.Complete({ exit: Exit.succeed(["done-0", "done-1", "done-2", "done-3", "done-4"]) })
+      )
+      assert.isAtMost(
+        Number(flags.get("parallel-activity-runs-parallel-bounded")),
+        Number(flags.get("parallel-runs-parallel-bounded"))
+      )
+    }).pipe(Effect.provide(TestWorkflowLayer)))
+
+  it.effect("resumes when children complete during activity cleanup", () =>
+    Effect.gen(function*() {
+      const cleaningUp = yield* Latch.make()
+      const release = yield* Latch.make()
+      const Parent = Workflow.make("CleanupParent", {
+        payload: {},
+        success: Schema.Array(Schema.Number),
+        idempotencyKey: () => "parent"
+      })
+      const Child = Workflow.make("CleanupChild", {
+        payload: { index: Schema.Number },
+        success: Schema.Number,
+        idempotencyKey: ({ index }) => String(index)
+      })
+      const ParentLayer = Parent.toLayer(() =>
+        Activity.make({
+          name: "children",
+          success: Schema.Array(Schema.Number),
+          execute: Effect.forEach([0, 1], (index) => Child.execute({ index }), { concurrency: "unbounded" }).pipe(
+            Effect.ensuring(Effect.andThen(cleaningUp.open, release.await))
+          )
+        })
+      )
+      const ChildLayer = Child.toLayer(({ index }) =>
+        DurableClock.sleep({ name: "wait", duration: "2 seconds", inMemoryThreshold: Duration.zero }).pipe(
+          Effect.as(index)
+        )
+      )
+      yield* Effect.gen(function*() {
+        const sharding = yield* Sharding.Sharding
+        yield* TestClock.adjust(1)
+        const executionId = yield* Parent.execute({}, { discard: true })
+        yield* cleaningUp.await
+        yield* TestClock.adjust("2 seconds")
+        yield* sharding.pollStorage
+        for (const index of [0, 1]) {
+          const childId = yield* Child.executionId({ index })
+          let childResult = yield* Child.poll(childId)
+          while (Option.isNone(childResult) || childResult.value._tag !== "Complete") {
+            yield* Effect.yieldNow
+            yield* TestClock.adjust(1)
+            yield* sharding.pollStorage
+            childResult = yield* Child.poll(childId)
+          }
+          assert.deepStrictEqual(
+            childResult.value,
+            new Workflow.Complete({ exit: Exit.succeed(index) })
+          )
+        }
+        yield* release.open
+        let result = yield* Parent.poll(executionId)
+        while (Option.isNone(result) || result.value._tag !== "Complete") {
+          yield* Effect.yieldNow
+          yield* TestClock.adjust(1)
+          yield* sharding.pollStorage
+          result = yield* Parent.poll(executionId)
+        }
+        assert.deepStrictEqual(
+          result.value,
+          new Workflow.Complete({ exit: Exit.succeed([0, 1]) })
+        )
+      }).pipe(Effect.provide(Layer.mergeAll(ParentLayer, ChildLayer).pipe(Layer.provideMerge(TestWorkflowLayer))))
+    }))
+
+  it.effect("coalesces parked child wakeups while parent cleanup is pending", () =>
+    Effect.gen(function*() {
+      const cleaningUp = yield* Latch.make()
+      const release = yield* Latch.make()
+      const indices = Array.from({ length: 64 }, (_, index) => index)
+      let parked = 0
+      let peak = 0
+      const storageLayer = Layer.effect(
+        MessageStorage.MessageStorage,
+        Effect.map(
+          MessageStorage.MessageStorage,
+          (storage) =>
+            MessageStorage.MessageStorage.of({
+              ...storage,
+              registerReplyHandler: (message) => {
+                if (
+                  message.envelope.address.entityType !== "Workflow/ManyChildrenParent" ||
+                  message.envelope.tag !== "run"
+                ) {
+                  return storage.registerReplyHandler(message)
+                }
+                return Effect.suspend(() => {
+                  parked++
+                  peak = Math.max(peak, parked)
+                  return storage.registerReplyHandler(message)
+                }).pipe(Effect.ensuring(Effect.sync(() => {
+                  parked--
+                })))
+              }
+            })
+        )
+      ).pipe(Layer.provideMerge(MessageStorage.layerMemory))
+      const Parent = Workflow.make("ManyChildrenParent", {
+        payload: {},
+        success: Schema.Array(Schema.Number),
+        idempotencyKey: () => "parent"
+      })
+      const Child = Workflow.make("ManyChildrenChild", {
+        payload: { index: Schema.Number },
+        success: Schema.Number,
+        idempotencyKey: ({ index }) => String(index)
+      })
+      const ParentLayer = Parent.toLayer(() =>
+        Activity.make({
+          name: "children",
+          success: Schema.Array(Schema.Number),
+          execute: Effect.forEach(indices, (index) => Child.execute({ index }), { concurrency: "unbounded" }).pipe(
+            Effect.ensuring(Effect.andThen(cleaningUp.open, release.await))
+          )
+        })
+      )
+      const ChildLayer = Child.toLayer(({ index }) =>
+        DurableClock.sleep({ name: "wait", duration: "2 seconds", inMemoryThreshold: Duration.zero }).pipe(
+          Effect.as(index)
+        )
+      )
+      yield* Effect.gen(function*() {
+        const sharding = yield* Sharding.Sharding
+        const driver = yield* MessageStorage.MemoryDriver
+        yield* TestClock.adjust(1)
+        const executionId = yield* Parent.execute({}, { discard: true })
+        yield* cleaningUp.await
+        yield* TestClock.adjust("2 seconds")
+        const wakeRequests = () =>
+          driver.journal.filter((message) =>
+            message._tag === "Request" &&
+            message.address.entityType === "Workflow/ManyChildrenParent" && message.tag === "resume"
+          )
+        const allWakesHandled = () => {
+          const wakes = wakeRequests()
+          const replied = wakes.filter((message) =>
+            message._tag === "Request" && (driver.requests.get(message.requestId)?.replies.length ?? 0) > 0
+          ).length
+          // Every wake must have replied or parked before releasing the parent.
+          return wakes.length === indices.length && replied + parked === indices.length
+        }
+        while (!allWakesHandled()) {
+          yield* Effect.yieldNow
+          yield* TestClock.adjust(1)
+          yield* sharding.pollStorage
+        }
+        const wakes = wakeRequests()
+        const parkedBeforeRelease = parked
+        yield* release.open
+        let result = yield* Parent.poll(executionId)
+        while (Option.isNone(result) || result.value._tag !== "Complete" || parked !== 0) { // oxlint-disable-line no-unmodified-loop-condition
+          yield* Effect.yieldNow
+          yield* TestClock.adjust(1)
+          yield* sharding.pollStorage
+          result = yield* Parent.poll(executionId)
+        }
+        assert.deepStrictEqual(
+          result.value,
+          new Workflow.Complete({ exit: Exit.succeed(indices) })
+        )
+        assert.strictEqual(parked, 0)
+        assert.strictEqual(wakes.length, indices.length)
+        // Each wake remains durable, but only one waits on this parent run.
+        assert.strictEqual(parkedBeforeRelease, 1, `peak parked reply handlers: ${peak}`)
+        assert.strictEqual(peak, 1)
+      }).pipe(Effect.provide(
+        Layer.mergeAll(ParentLayer, ChildLayer).pipe(
+          Layer.provideMerge(makeTestWorkflowEngine({ config: { entityMailboxCapacity: 1000 }, storageLayer }))
+        )
+      ))
+    }))
+
+  for (const queuedReplay of [false, true]) {
+    it.effect(`resumes a fresh entity from a legacy envelope with queued replay ${queuedReplay}`, () =>
+      Effect.gen(function*() {
+        const Parent = Workflow.make("ColdParent", {
+          payload: {},
+          success: Schema.Array(Schema.Number),
+          idempotencyKey: () => "parent"
+        })
+        const Child = Workflow.make("ColdChild", {
+          payload: { index: Schema.Number },
+          success: Schema.Number,
+          idempotencyKey: ({ index }) => String(index)
+        })
+        const gate = DurableDeferred.make("cold-child")
+        const ParentLayer = Parent.toLayer(() =>
+          Activity.make({
+            name: "children",
+            success: Schema.Array(Schema.Number),
+            execute: Effect.forEach([0, 1], (index) => Child.execute({ index }), { concurrency: "unbounded" })
+          })
+        )
+        const ChildLayer = Child.toLayer(({ index }) => DurableDeferred.await(gate).pipe(Effect.as(index)))
+        const LegacyResume = Entity.make("Workflow/ColdParent", [
+          Rpc.make("resume", { payload: {}, primaryKey: () => "" }).annotate(ClusterSchema.Persisted, true)
+        ])
+        yield* Effect.gen(function*() {
+          const sharding = yield* Sharding.Sharding
+          const driver = yield* MessageStorage.MemoryDriver
+          const engine = yield* WorkflowEngine
+          yield* TestClock.adjust(1)
+          const executionId = yield* Parent.execute({}, { discard: true })
+          let result = yield* Parent.poll(executionId)
+          while (Option.isNone(result) || result.value._tag !== "Suspended") {
+            yield* Effect.yieldNow
+            yield* TestClock.adjust(1)
+            yield* sharding.pollStorage
+            result = yield* Parent.poll(executionId)
+          }
+          for (let i = 0; i < 12 && (yield* sharding.activeEntityCount) > 0; i++) {
+            yield* TestClock.adjust(5000)
+          }
+          assert.strictEqual(yield* sharding.activeEntityCount, 0)
+          if (queuedReplay) {
+            const run = driver.journal.find((message) =>
+              message._tag === "Request" &&
+              message.address.entityType === "Workflow/ColdParent" && message.tag === "run"
+            )!
+            assert(run._tag === "Request")
+            assert.isTrue(yield* sharding.reset(Snowflake.Snowflake(run.requestId)))
+            assert.isTrue(Option.isNone(yield* Parent.poll(executionId)))
+          }
+          const client = yield* LegacyResume.client
+          // The empty payload is the format of resume messages persisted before this fix.
+          const legacyResume = yield* client(executionId).resume({}).pipe(Effect.forkChild({ startImmediately: true }))
+          for (const index of [0, 1]) {
+            yield* engine.deferredDone(gate, {
+              workflowName: Child._tag,
+              executionId: yield* Child.executionId({ index }),
+              deferredName: gate.name,
+              exit: Exit.void
+            })
+          }
+          result = yield* Parent.poll(executionId)
+          while (Option.isNone(result) || result.value._tag !== "Complete" || legacyResume.pollUnsafe() === undefined) {
+            yield* Effect.yieldNow
+            yield* TestClock.adjust(1)
+            yield* sharding.pollStorage
+            result = yield* Parent.poll(executionId)
+          }
+          assert.deepStrictEqual(
+            result.value,
+            new Workflow.Complete({ exit: Exit.succeed([0, 1]) })
+          )
+          assert.deepStrictEqual(legacyResume.pollUnsafe(), Exit.void)
+        }).pipe(Effect.provide(
+          Layer.mergeAll(ParentLayer, ChildLayer).pipe(
+            Layer.provideMerge(makeTestWorkflowEngine({ config: { entityMessagePollInterval: "1 hour" } }))
+          )
+        ))
+      }))
+  }
+
+  it.effect("a parent stays suspended past the activity interrupt retry budget", () =>
+    Effect.gen(function*() {
+      const sharding = yield* Sharding.Sharding
+      const flags = yield* Flags
+      yield* TestClock.adjust(1)
+
+      const payload = { id: "parallel-long", childCount: 2, concurrency: 2, sleep: 60_000 }
+      const executionId = yield* ParallelParentWorkflow.executionId(payload)
+      const fiber = yield* ParallelParentWorkflow.execute(payload).pipe(
+        Effect.forkChild({ startImmediately: true })
+      )
+
+      let suspended = false
+      while (!suspended) {
+        yield* Effect.yieldNow
+        yield* sharding.pollStorage
+        const result = yield* ParallelParentWorkflow.poll(executionId)
+        suspended = Option.isSome(result) && result.value._tag === "Suspended"
+      }
+
+      // well past the activity interrupt retry budget the run is still suspended
+      // and the activity body has not been re-executed
+      yield* TestClock.adjust(Duration.seconds(50))
+      yield* sharding.pollStorage
+      const still = yield* ParallelParentWorkflow.poll(executionId)
+      assert.isTrue(Option.isSome(still) && still.value._tag === "Suspended")
+      assert.strictEqual(flags.get("parallel-activity-runs-parallel-long"), 1)
+      assert.strictEqual(flags.get("parallel-activity-releases-parallel-long"), 1)
+      assert.isUndefined(fiber.pollUnsafe())
+
+      yield* TestClock.adjust(Duration.seconds(10))
+      yield* sharding.pollStorage
+      while (fiber.pollUnsafe() === undefined) {
+        yield* Effect.yieldNow
+        yield* TestClock.adjust(1)
+        yield* sharding.pollStorage
+      }
+      assert.deepStrictEqual(fiber.pollUnsafe(), Exit.succeed(["done-0", "done-1"]))
+    }).pipe(Effect.provide(TestWorkflowLayer)))
+
+  it.effect("parallel child workflows in the workflow body all dispatch before suspending", () =>
+    Effect.gen(function*() {
+      const sharding = yield* Sharding.Sharding
+      const flags = yield* Flags
+      yield* TestClock.adjust(1)
+
+      const payload = { id: "parallel-direct", childCount: 3 }
+      const executionId = yield* ParallelDirectWorkflow.executionId(payload)
+      const fiber = yield* ParallelDirectWorkflow.execute(payload).pipe(
+        Effect.forkChild({ startImmediately: true })
+      )
+
+      let suspended = false
+      while (!suspended) {
+        yield* Effect.yieldNow
+        yield* sharding.pollStorage
+        const result = yield* ParallelDirectWorkflow.poll(executionId)
+        suspended = Option.isSome(result) && result.value._tag === "Suspended"
+      }
+      assert.strictEqual(flags.get("parallel-runs-parallel-direct"), 1)
+      assert.isTrue(flags.get("parallel-child-start-parallel-direct-child-0"))
+      assert.isTrue(flags.get("parallel-child-start-parallel-direct-child-1"))
+      assert.isTrue(flags.get("parallel-child-start-parallel-direct-child-2"))
+
+      yield* TestClock.adjust(Duration.seconds(2))
+      yield* sharding.pollStorage
+      while (fiber.pollUnsafe() === undefined) {
+        yield* Effect.yieldNow
+        yield* TestClock.adjust(1)
+        yield* sharding.pollStorage
+      }
+      assert.deepStrictEqual(fiber.pollUnsafe(), Exit.succeed(["done-0", "done-1", "done-2"]))
+    }).pipe(Effect.provide(TestWorkflowLayer)))
+
   it.effect("routes fractional millisecond durable clock wakeups to the workflow shard group", () =>
     Effect.gen(function*() {
       const driver = yield* MessageStorage.MemoryDriver
       const sharding = yield* Sharding.Sharding
+      const scheduled = yield* ShardedClockScheduled
       const startedAt = yield* DateTime.now
 
       const fiber = yield* ShardedClockWorkflow.execute({
         id: "sharded-clock"
       }).pipe(Effect.forkChild({ startImmediately: true }))
 
-      yield* TestClock.adjust(1)
+      yield* scheduled.await
 
       const envelope = driver.journal.find((envelope) =>
         envelope._tag === "Request" && envelope.address.entityType === "Workflow/-/DurableClock"
@@ -611,6 +1505,77 @@ describe.concurrent("ClusterWorkflowEngine", () => {
       assert.strictEqual(envelope.address.shardId.group, "workflow")
     }).pipe(Effect.provide(TestWorkflowEngine)))
 
+  it.effect("warns for conflicting definitions and stays silent for the same definition", () => {
+    class FirstPayload extends Schema.Class<FirstPayload>("DuplicateClassPayload")({
+      organizationId: Schema.String
+    }) {}
+    class SecondPayload extends Schema.Class<SecondPayload>("DuplicateClassPayload")({
+      deploymentId: Schema.Number
+    }) {}
+    const first = Workflow.make("DuplicateClassPayloadWorkflow", {
+      payload: FirstPayload,
+      idempotencyKey: ({ organizationId }) => organizationId
+    })
+    const second = Workflow.make("DuplicateClassPayloadWorkflow", {
+      payload: SecondPayload,
+      idempotencyKey: ({ deploymentId }) => String(deploymentId)
+    })
+    const warnings: Array<unknown> = []
+    const logger = Logger.make<unknown, void>((options) => {
+      if (options.logLevel === "Warn") {
+        warnings.push(options.message)
+      }
+    })
+
+    return Effect.gen(function*() {
+      const engine = yield* WorkflowEngine
+      yield* engine.register(first, () => Effect.void)
+      yield* engine.register(first, () => Effect.void)
+
+      assert.deepStrictEqual(warnings, [])
+
+      yield* engine.register(second, () => Effect.void)
+
+      const warning = warnings
+        .map((message) => globalThis.Array.isArray(message) ? message.join(" ") : String(message))
+        .find((message) => message.includes("DuplicateClassPayloadWorkflow"))
+      assert(warning, "duplicate workflow registration must emit a warning containing its tag")
+      const normalized = warning.toLowerCase()
+      for (const fragment of ["organizationid", "string", "deploymentid", "number"]) {
+        assert.include(normalized, fragment, `warning must identify both class payload shapes: ${warning}`)
+      }
+    }).pipe(Effect.provide(TestWorkflowEngine), Effect.withLogger(logger))
+  })
+
+  it.effect("does not fail when duplicate workflow payload shapes cannot be rendered", () => {
+    const payloadKey = Symbol("payload")
+    const first = Workflow.make("UnavailablePayloadShapeWorkflow", {
+      payload: Schema.Struct({ [payloadKey]: Schema.String }),
+      idempotencyKey: () => "first"
+    })
+    const second = Workflow.make("UnavailablePayloadShapeWorkflow", {
+      payload: Schema.Struct({ [payloadKey]: Schema.Number }),
+      idempotencyKey: () => "second"
+    })
+    const warnings: Array<unknown> = []
+    const logger = Logger.make<unknown, void>((options) => {
+      if (options.logLevel === "Warn") {
+        warnings.push(options.message)
+      }
+    })
+
+    return Effect.gen(function*() {
+      const engine = yield* WorkflowEngine
+      yield* engine.register(first, () => Effect.void)
+      yield* engine.register(second, () => Effect.void)
+
+      const warning = warnings
+        .map((message) => globalThis.Array.isArray(message) ? message.join(" ") : String(message))
+        .find((message) => message.includes("UnavailablePayloadShapeWorkflow"))
+      assert(warning, "duplicate workflow registration must still warn when rendering a payload shape fails")
+    }).pipe(Effect.provide(TestWorkflowEngine), Effect.withLogger(logger))
+  })
+
   it.effect("propagates trace context to persisted workflow requests", () => {
     let callerSpan: Tracer.NativeSpan | undefined
     const tracer = Tracer.make({
@@ -737,11 +1702,23 @@ describe.concurrent("ClusterWorkflowEngine", () => {
     }).pipe(Effect.provide(TestWorkflowLayer)))
 })
 
-const makeTestWorkflowEngine = (config?: Partial<ShardingConfig.ShardingConfig["Service"]>) =>
+const makeTestWorkflowEngine = <Storage = MessageStorage.MemoryDriver>(options?: {
+  readonly config?: Partial<ShardingConfig.ShardingConfig["Service"]> | undefined
+  readonly shardingLayer?: typeof Sharding.layer | undefined
+  readonly storageLayer?:
+    | Layer.Layer<MessageStorage.MessageStorage | Storage, never, ShardingConfig.ShardingConfig>
+    | undefined
+}) =>
   ClusterWorkflowEngine.layer.pipe(
-    Layer.provideMerge(Sharding.layer),
+    Layer.provideMerge(options?.shardingLayer ?? Sharding.layer),
     Layer.provide(Runners.layerNoop),
-    Layer.provideMerge(MessageStorage.layerMemory),
+    Layer.provideMerge(
+      (options?.storageLayer ?? MessageStorage.layerMemory) as Layer.Layer<
+        MessageStorage.MessageStorage | Storage,
+        never,
+        ShardingConfig.ShardingConfig
+      >
+    ),
     Layer.provide(RunnerStorage.layerMemory),
     Layer.provide(RunnerHealth.layerNoop),
     Layer.provide(ShardingConfig.layer({
@@ -752,10 +1729,34 @@ const makeTestWorkflowEngine = (config?: Partial<ShardingConfig.ShardingConfig["
       entityTerminationTimeout: 0,
       entityMessagePollInterval: 5000,
       sendRetryInterval: 100,
-      ...config
+      ...options?.config
     }))
   )
 
+const pollUntil = <A extends Schema.Top, E extends Schema.Top>(
+  workflow: Workflow.Workflow<any, any, A, E>,
+  executionId: string,
+  tag: "Suspended" | "Complete"
+) =>
+  Effect.gen(function*() {
+    const sharding = yield* Sharding.Sharding
+    let result = yield* workflow.poll(executionId)
+    for (let i = 0; i < 2000 && !(Option.isSome(result) && result.value._tag === tag); i++) {
+      yield* Effect.yieldNow
+      yield* TestClock.adjust(1)
+      yield* sharding.pollStorage
+      result = yield* workflow.poll(executionId)
+    }
+    assert(Option.isSome(result) && result.value._tag === tag, `workflow must reach ${tag}`)
+    return result.value
+  })
+
+const advanceUntil = (ready: () => boolean, message: string, step = 1, rounds = 2000) =>
+  Effect.gen(function*() {
+    for (let i = 0; i < rounds && !ready(); i++) yield* TestClock.adjust(step)
+    assert(ready(), message)
+  })
+
 const TestWorkflowEngine = makeTestWorkflowEngine()
 
 class SendEmailError extends Schema.Error<SendEmailError>("SendEmailError")({
@@ -1228,6 +2229,16 @@ const TwoStepGateB = DurableDeferred.make("TwoStepGateB", {
   success: Schema.String
 })
 
+class TwoStepBranchControl extends Context.Service<TwoStepBranchControl>()("TwoStepBranchControl", {
+  make: Effect.all({
+    entered: Latch.make(),
+    release: Latch.make(),
+    started: Latch.make()
+  })
+}) {
+  static readonly layer = Layer.effect(TwoStepBranchControl, this.make)
+}
+
 const TwoStepWorkflowLayer = TwoStepWorkflow.toLayer(() =>
   DurableDeferred.raceAll({
     name: "two-step",
@@ -1236,8 +2247,12 @@ const TwoStepWorkflowLayer = TwoStepWorkflow.toLayer(() =>
     effects: [
       Effect.gen(function*() {
         const flags = yield* Flags
+        const branchControl = yield* TwoStepBranchControl
+        branchControl.entered.openUnsafe()
+        yield* branchControl.release.await
         const runs = flags.get("two-step-branch-runs")
         flags.set("two-step-branch-runs", typeof runs === "number" ? runs + 1 : 1)
+        branchControl.started.openUnsafe()
         const a = yield* DurableDeferred.await(TwoStepGateA)
         const b = yield* DurableDeferred.await(TwoStepGateB)
         return `${a}:${b}`
@@ -1349,6 +2364,126 @@ const ChildWorkflowLayer = ChildWorkflow.toLayer(Effect.fnUntraced(function*() {
   flags.set("child-end", true)
 }))
 
+const ParallelParentWorkflow = Workflow.make("ParallelParentWorkflow", {
+  payload: {
+    id: Schema.String,
+    childCount: Schema.Number,
+    concurrency: Schema.Number,
+    sleep: Schema.Number
+  },
+  success: Schema.Array(Schema.String),
+  idempotencyKey(payload) {
+    return payload.id
+  }
+})
+
+const ParallelDirectWorkflow = Workflow.make("ParallelDirectWorkflow", {
+  payload: {
+    id: Schema.String,
+    childCount: Schema.Number
+  },
+  success: Schema.Array(Schema.String),
+  idempotencyKey(payload) {
+    return payload.id
+  }
+})
+
+const ParallelChildWorkflow = Workflow.make("ParallelChildWorkflow", {
+  payload: {
+    id: Schema.String,
+    index: Schema.Number,
+    sleep: Schema.Number
+  },
+  success: Schema.String,
+  idempotencyKey(payload) {
+    return payload.id
+  }
+})
+
+const increment = (flags: Map<string, boolean | number | string>, key: string) => {
+  flags.set(key, Number(flags.get(key) ?? 0) + 1)
+}
+
+const ParallelParentWorkflowLayer = ParallelParentWorkflow.toLayer(Effect.fnUntraced(function*(payload) {
+  const flags = yield* Flags
+  increment(flags, `parallel-runs-${payload.id}`)
+  const indices = Array.from({ length: payload.childCount }, (_, i) => i)
+  return yield* Activity.make({
+    name: "parallel-children",
+    success: Schema.Array(Schema.String),
+    error: Schema.Never,
+    execute: Effect.suspend(() => {
+      increment(flags, `parallel-activity-runs-${payload.id}`)
+      return Effect.forEach(
+        indices,
+        (index) => ParallelChildWorkflow.execute({ id: `${payload.id}-child-${index}`, index, sleep: payload.sleep }),
+        { concurrency: payload.concurrency }
+      )
+    }).pipe(Effect.ensuring(Effect.sync(() => increment(flags, `parallel-activity-releases-${payload.id}`))))
+  })
+}))
+
+const ParallelDirectWorkflowLayer = ParallelDirectWorkflow.toLayer(Effect.fnUntraced(function*(payload) {
+  const flags = yield* Flags
+  increment(flags, `parallel-runs-${payload.id}`)
+  const indices = Array.from({ length: payload.childCount }, (_, i) => i)
+  return yield* Effect.forEach(
+    indices,
+    (index) => ParallelChildWorkflow.execute({ id: `${payload.id}-child-${index}`, index, sleep: 2000 }),
+    { concurrency: "unbounded" }
+  )
+}))
+
+const ParallelChildWorkflowLayer = ParallelChildWorkflow.toLayer(Effect.fnUntraced(function*(payload) {
+  const flags = yield* Flags
+  flags.set(`parallel-child-start-${payload.id}`, true)
+  yield* DurableClock.sleep({
+    name: "parallel-child",
+    duration: payload.sleep,
+    inMemoryThreshold: Duration.zero
+  })
+  return `done-${payload.index}`
+}))
+
+const ZeroThresholdWorkflow = Workflow.make("DurableClock/ZeroThreshold", {
+  payload: { id: Schema.String },
+  idempotencyKey: ({ id }) => id
+})
+
+const verifyZeroThreshold = Effect.fn(function*(id: string, inMemoryThreshold: 0 | 0n) {
+  const instance = WorkflowInstance.initial(ZeroThresholdWorkflow, `execution/${id}`)
+  const calls: Array<string> = []
+  const unexpected = () => Effect.die("unexpected engine operation")
+  const engine = makeWorkflowEngineUnsafe({
+    register: unexpected,
+    execute: unexpected,
+    poll: unexpected,
+    interrupt: unexpected,
+    interruptUnsafe: unexpected,
+    resume: unexpected,
+    deferredDone: unexpected,
+    activityExecute: () =>
+      Effect.sync(() => {
+        calls.push("activityExecute")
+        return new Workflow.Complete({ exit: Exit.void })
+      }),
+    scheduleClock: () =>
+      Effect.sync(() => {
+        calls.push("scheduleClock")
+      }),
+    deferredResult: () =>
+      Effect.sync(() => {
+        calls.push("deferredResult")
+        return Option.some(Exit.void)
+      })
+  })
+  yield* DurableClock.sleep({ name: `clock/${id}`, duration: 10, inMemoryThreshold }).pipe(
+    Effect.provideService(WorkflowEngine, engine),
+    Effect.provideService(WorkflowInstance, instance)
+  )
+  assert.deepStrictEqual(calls, ["scheduleClock", "deferredResult"])
+})
+
 const ShardedClockWorkflow = Workflow.make("ShardedClockWorkflow", {
   payload: {
     id: Schema.String
@@ -1358,12 +2493,26 @@ const ShardedClockWorkflow = Workflow.make("ShardedClockWorkflow", {
   }
 }).annotate(ClusterSchema.ShardGroup, () => "workflow")
 
+class ShardedClockScheduled extends Context.Service<ShardedClockScheduled>()("ShardedClockScheduled", {
+  make: Latch.make()
+}) {
+  static readonly layer = Layer.effect(ShardedClockScheduled, this.make)
+}
+
 const ShardedClockWorkflowLayer = ShardedClockWorkflow.toLayer(Effect.fnUntraced(function*() {
-  yield* DurableClock.sleep({
+  const engine = yield* WorkflowEngine
+  const instance = yield* WorkflowInstance
+  const scheduled = yield* ShardedClockScheduled
+  const clock = DurableClock.make({
     name: "ShardedClock",
-    duration: 10000.5,
-    inMemoryThreshold: Duration.zero
+    duration: 10000.5
+  })
+  yield* engine.scheduleClock(instance.workflow, {
+    executionId: instance.executionId,
+    clock
   })
+  yield* scheduled.open
+  yield* DurableDeferred.await(clock.deferred)
 }))
 
 const ShardedDeferred = DurableDeferred.make("ShardedDeferred")
@@ -1473,10 +2622,15 @@ const TestWorkflowLayer = EmailWorkflowLayer.pipe(
   Layer.merge(RaceWorkflowLayers),
   Layer.merge(ParentWorkflowLayer),
   Layer.merge(ChildWorkflowLayer),
+  Layer.merge(ParallelParentWorkflowLayer),
+  Layer.merge(ParallelDirectWorkflowLayer),
+  Layer.merge(ParallelChildWorkflowLayer),
   Layer.merge(ShardedClockWorkflowLayer),
   Layer.merge(SuspendOnFailureWorkflowLayer),
   Layer.merge(CatchWorkflowLayer),
   Layer.merge(ErrorDefectWorkflowLayer),
   Layer.provideMerge(Flags.layer),
+  Layer.provideMerge(TwoStepBranchControl.layer),
+  Layer.provideMerge(ShardedClockScheduled.layer),
   Layer.provideMerge(TestWorkflowEngine)
 )
diff --git a/repos/effect/packages/effect/test/cluster/Entity.test.ts b/repos/effect/packages/effect/test/cluster/Entity.test.ts
index 5722ed2ba..75e135c0d 100644
--- a/repos/effect/packages/effect/test/cluster/Entity.test.ts
+++ b/repos/effect/packages/effect/test/cluster/Entity.test.ts
@@ -1,6 +1,7 @@
 import { assert, describe, it } from "@effect/vitest"
-import { type Cause, Effect, Queue, Schema, Stream } from "effect"
+import { type Cause, Deferred, Effect, Exit, Fiber, Option, Queue, Schema, Scope, Stream } from "effect"
 import { Entity, ShardingConfig } from "effect/unstable/cluster"
+import { CurrentActivationScope } from "effect/unstable/cluster/internal/entityActivation"
 import { Rpc } from "effect/unstable/rpc"
 import { CallerId, ContextBleedEntity, ContextBleedLayer, TestEntity, TestEntityLayer, User } from "./TestEntity.ts"
 
@@ -11,8 +12,81 @@ const StreamEntity = Entity.make("StreamEntity", [
   })
 ])
 
+const FatalDefectEntity = Entity.make("FatalDefectEntity", [
+  Rpc.make("Hold", { success: Schema.Number }),
+  Rpc.make("Bad", { error: Schema.String })
+])
+
+const snapshot = <A, E>(exit: Exit.Exit<A, E>) =>
+  Exit.isSuccess(exit)
+    ? { _tag: "Success", value: exit.value }
+    : {
+      _tag: "Failure",
+      reasons: exit.cause.reasons.map((reason) =>
+        reason._tag === "Die"
+          ? { _tag: reason._tag, defect: reason.defect }
+          : reason._tag === "Fail"
+          ? { _tag: reason._tag, error: reason.error }
+          : { _tag: reason._tag }
+      )
+    }
+
+const observeFatalDefect = (disableFatalDefects: boolean | undefined, defecting: boolean, separateIds = false) =>
+  Effect.gen(function*() {
+    const entered = yield* Deferred.make<void>()
+    const release = yield* Deferred.make<void>()
+    const layer = FatalDefectEntity.toLayer({
+      Hold: () =>
+        Effect.gen(function*() {
+          yield* Deferred.succeed(entered, undefined)
+          yield* Deferred.await(release)
+          return 42
+        }),
+      Bad: () => defecting ? Effect.die("fixture defect") : Effect.fail("typed failure")
+    }, {
+      concurrency: "unbounded",
+      ...(disableFatalDefects === undefined ? {} : { disableFatalDefects })
+    })
+    const clientFor = yield* Entity.makeTestClient(FatalDefectEntity, layer)
+    const holdClient = yield* clientFor("one")
+    const badClient = yield* clientFor(separateIds ? "two" : "one")
+    yield* Effect.addFinalizer(() => Deferred.succeed(release, undefined))
+    const good = yield* Effect.forkChild(holdClient.Hold())
+    yield* Deferred.await(entered)
+    const badExit = yield* Effect.exit(badClient.Bad())
+    yield* Deferred.succeed(release, undefined)
+    const goodExit = yield* Fiber.await(good)
+    return { badExit: snapshot(badExit), goodExit: snapshot(goodExit) }
+  }).pipe(Effect.provide(ShardingConfig.layerDefaults), Effect.timeout("5 seconds"))
+
 describe.concurrent("Entity", () => {
   describe("makeTestClient", () => {
+    it.effect("provides an activation scope per entity and closes it with the client", () =>
+      Effect.gen(function*() {
+        const entity = Entity.make("ActivationScope", [Rpc.make("Read", { success: Schema.String })])
+        const activations: Array<Scope.Scope> = []
+        const closed: Array<string> = []
+        const layer = entity.toLayer(Effect.gen(function*() {
+          const address = yield* Entity.CurrentAddress
+          const activation = yield* Effect.serviceOption(CurrentActivationScope)
+          assert(Option.isSome(activation), "makeTestClient must provide the entity activation scope")
+          activations.push(activation.value)
+          yield* Scope.addFinalizer(activation.value, Effect.sync(() => closed.push(address.entityId)))
+          return { Read: () => Effect.succeed(address.entityId) }
+        }))
+        yield* Effect.scoped(Effect.gen(function*() {
+          const makeClient = yield* Entity.makeTestClient(entity, layer)
+          const first = yield* makeClient("one")
+          const second = yield* makeClient("two")
+          assert.strictEqual(yield* first.Read(), "one")
+          assert.strictEqual(yield* second.Read(), "two")
+          assert.strictEqual(activations.length, 2)
+          assert.notStrictEqual(activations[0], activations[1])
+          assert.deepStrictEqual(closed, [])
+        }))
+        assert.deepStrictEqual(closed.sort(), ["one", "two"])
+      }).pipe(Effect.provide(TestShardingConfig)))
+
     it.effect("creates an in-memory client for an entity layer", () =>
       Effect.gen(function*() {
         const makeClient = yield* Entity.makeTestClient(TestEntity, TestEntityLayer)
@@ -30,6 +104,34 @@ describe.concurrent("Entity", () => {
         const observed = yield* client.ReadCaller()
         assert.strictEqual(observed, "none")
       }).pipe(Effect.provide(TestShardingConfig)))
+
+    for (const flag of [true, false, undefined]) {
+      const label = flag === undefined ? "omitted" : String(flag)
+      it.live(`isolates defects when disableFatalDefects is ${label}`, () =>
+        Effect.gen(function*() {
+          const actual = yield* observeFatalDefect(flag, true)
+          assert.deepEqual(actual.badExit, snapshot(Exit.die("fixture defect")), "Bad preserves the original defect")
+          assert.deepEqual(
+            actual.goodExit,
+            snapshot(flag === true ? Exit.succeed(42) : Exit.die("fixture defect")),
+            "Hold isolation follows the registered flag"
+          )
+        }))
+
+      it.live(`keeps typed failures request-local when disableFatalDefects is ${label}`, () =>
+        Effect.gen(function*() {
+          const actual = yield* observeFatalDefect(flag, false)
+          assert.deepEqual(actual.badExit, snapshot(Exit.fail("typed failure")))
+          assert.deepEqual(actual.goodExit, snapshot(Exit.succeed(42)))
+        }))
+    }
+
+    it.live("does not send fatal defects across entity IDs", () =>
+      Effect.gen(function*() {
+        const actual = yield* observeFatalDefect(false, true, true)
+        assert.deepEqual(actual.badExit, snapshot(Exit.die("fixture defect")))
+        assert.deepEqual(actual.goodExit, snapshot(Exit.succeed(42)))
+      }))
   })
 
   describe("toLayerQueue", () => {
diff --git a/repos/effect/packages/effect/test/cluster/MessageStorage.test.ts b/repos/effect/packages/effect/test/cluster/MessageStorage.test.ts
index ca5aae9ff..720fc0ae3 100644
--- a/repos/effect/packages/effect/test/cluster/MessageStorage.test.ts
+++ b/repos/effect/packages/effect/test/cluster/MessageStorage.test.ts
@@ -51,6 +51,24 @@ describe("MessageStorage", () => {
         expect(result._tag).toEqual("Success")
       }).pipe(Effect.provide(MessageStorage.MemoryDriver.layer)))
 
+    it.effect("removes a queued Interrupt when clearing an address", () =>
+      Effect.gen(function*() {
+        const storage = yield* MessageStorage.MessageStorage
+        const snowflake = yield* Snowflake.Generator
+        const request = yield* makeRequest()
+        yield* storage.saveRequest(request)
+        yield* storage.saveEnvelope(Message.OutgoingEnvelope.interrupt({
+          id: snowflake.nextUnsafe(),
+          requestId: request.envelope.requestId,
+          address: request.envelope.address
+        }))
+
+        yield* storage.clearAddress(request.envelope.address)
+
+        const messages = yield* storage.unprocessedMessages([request.envelope.address.shardId])
+        expect(messages.map(({ envelope }) => envelope._tag)).toEqual([])
+      }).pipe(Effect.provide(MemoryLayer)))
+
     it.effect("encoded unprocessedMessages fails closed for an empty address filter", () =>
       Effect.gen(function*() {
         const driver = yield* MessageStorage.MemoryDriver
@@ -86,6 +104,52 @@ describe("MessageStorage", () => {
         expect(messages).toHaveLength(0)
       }).pipe(Effect.provide(MessageStorage.MemoryDriver.layer)))
 
+    it.effect("resetRequests with no IDs leaves existing claims untouched", () =>
+      Effect.gen(function*() {
+        const storage = yield* MessageStorage.MessageStorage
+        const request = yield* makeRequest()
+        yield* storage.saveRequest(request)
+        expect(yield* storage.unprocessedMessages([request.envelope.address.shardId])).toHaveLength(1)
+        yield* storage.resetRequests([])
+        const driver = yield* MessageStorage.MemoryDriver
+        yield* driver.encoded.resetRequests([])
+        expect(yield* storage.unprocessedMessages([request.envelope.address.shardId])).toHaveLength(0)
+      }).pipe(Effect.provide(MemoryLayer)))
+
+    it.effect("resetRequests releases only the selected request at a shared address", () =>
+      Effect.gen(function*() {
+        const storage = yield* MessageStorage.MessageStorage
+        const selected = yield* makeRequest()
+        const unrelated = yield* makeRequest()
+        yield* storage.saveRequest(selected)
+        yield* storage.saveRequest(unrelated)
+        const shards = [selected.envelope.address.shardId]
+        expect(yield* storage.unprocessedMessages(shards)).toHaveLength(2)
+        yield* storage.resetRequests([selected.envelope.requestId])
+        const messages = yield* storage.unprocessedMessages(shards)
+        expect(messages.map((message) => message.envelope.requestId)).toEqual([selected.envelope.requestId])
+        expect(yield* storage.unprocessedMessages(shards)).toHaveLength(0)
+      }).pipe(Effect.provide(MemoryLayer)))
+
+    it.effect("resetRequests preserves chunk replies, exit replies, and completed state", () =>
+      Effect.gen(function*() {
+        const storage = yield* MessageStorage.MessageStorage
+        const streaming = yield* makeRequest({ rpc: StreamRpc, payload: StreamRpc.payloadSchema.make({ id: 123 }) })
+        const completed = yield* makeRequest()
+        yield* storage.saveRequest(streaming)
+        yield* storage.saveRequest(completed)
+        yield* storage.saveReply(yield* makeChunkReply(streaming))
+        yield* storage.saveReply(yield* makeReply(completed))
+        const replies = yield* storage.repliesFor([streaming, completed])
+        expect(replies).toHaveLength(2)
+        const shards = [streaming.envelope.address.shardId]
+        expect(yield* storage.unprocessedMessages(shards)).toHaveLength(1)
+        yield* storage.resetRequests([streaming.envelope.requestId, completed.envelope.requestId])
+        const messages = yield* storage.unprocessedMessages(shards)
+        expect(messages.map((message) => message.envelope.requestId)).toEqual([streaming.envelope.requestId])
+        expect(yield* storage.repliesFor([streaming, completed])).toEqual(replies)
+      }).pipe(Effect.provide(MemoryLayer)))
+
     it.effect("saves a request", () =>
       Effect.gen(function*() {
         const storage = yield* MessageStorage.MessageStorage
diff --git a/repos/effect/packages/effect/test/cluster/RunnerServer.test.ts b/repos/effect/packages/effect/test/cluster/RunnerServer.test.ts
index 0b49574fa..fe311cbb0 100644
--- a/repos/effect/packages/effect/test/cluster/RunnerServer.test.ts
+++ b/repos/effect/packages/effect/test/cluster/RunnerServer.test.ts
@@ -1,5 +1,5 @@
 import { assert, it } from "@effect/vitest"
-import { Effect, Layer, Option, Queue, Schema, Stream } from "effect"
+import { Deferred, Effect, Exit, Layer, Option, PubSub, Queue, Schema, Scope, Stream } from "effect"
 import { TestClock } from "effect/testing"
 import {
   ClusterSchema,
@@ -8,6 +8,7 @@ import {
   EntityId,
   EntityType,
   Envelope,
+  Message,
   MessageStorage,
   RunnerHealth,
   Runners,
@@ -18,7 +19,7 @@ import {
   Snowflake
 } from "effect/unstable/cluster"
 import { Headers } from "effect/unstable/http"
-import { Rpc, type RpcSerialization, RpcServer, RpcTest } from "effect/unstable/rpc"
+import { Rpc, RpcMessage, type RpcSerialization, RpcServer, RpcTest } from "effect/unstable/rpc"
 
 const ReproEntity = Entity.make("ReproRunnerServer", [
   Rpc.make("ReproStream", { success: Schema.Int, payload: { id: Schema.Number }, stream: true })
@@ -28,6 +29,8 @@ const HoleCodecEntity = Entity.make("HoleCodecEntity", [
   Rpc.make("Double", { success: Schema.Int, payload: { id: Schema.Number } })
 ]).annotateRpcs(ClusterSchema.Persisted, false)
 
+const jsonCodec = Schema.toCodecJson as RpcSerialization.CodecFor
+
 // A hole codec that is observably different from `Schema.toCodecJson`: the
 // entity payload and the replies become JSON strings on the wire.
 const codecForJsonString =
@@ -54,7 +57,7 @@ const layerProtocol = (codecFor: RpcSerialization.CodecFor) =>
 
 const makeHandlers = (
   entities: Layer.Layer<never, never, any>,
-  codecFor: RpcSerialization.CodecFor
+  codecFor: RpcSerialization.CodecFor = jsonCodec
 ) =>
   RunnerServer.layerHandlers.pipe(
     Layer.provide(layerProtocol(codecFor)),
@@ -74,45 +77,72 @@ const makeHandlers = (
     }))
   )
 
-const handlers = makeHandlers(
-  ReproEntity.toLayer({ ReproStream: () => Stream.make(1) }),
-  Schema.toCodecJson as RpcSerialization.CodecFor
-)
-
 const holeCodecHandlers = makeHandlers(
   HoleCodecEntity.toLayer({ Double: ({ payload }) => Effect.succeed(payload.id * 2) }),
   codecForJsonString
 )
 
-it.effect("completes a successful runner stream", () =>
+// A request for `entity`'s single RPC, addressed the way a sending runner would.
+const makeRequest = (
+  entity: Pick<Entity.Any, "type" | "getShardGroup">,
+  entityId: string,
+  options?: { readonly tag?: string; readonly payload?: unknown }
+) =>
   Effect.gen(function*() {
-    yield* TestClock.adjust(1)
     const sharding = yield* Sharding.Sharding
     const snowflake = yield* Snowflake.Generator
-    const entityId = EntityId.make("one")
-    const request = {
+    const id = EntityId.make(entityId)
+    const request: Envelope.PartialRequest = {
       _tag: "Request",
       requestId: snowflake.nextUnsafe(),
       address: EntityAddress.make({
-        shardId: sharding.getShardId(entityId, ReproEntity.getShardGroup(entityId)),
-        entityType: EntityType.make("ReproRunnerServer"),
-        entityId
+        shardId: sharding.getShardId(id, entity.getShardGroup(id)),
+        entityType: EntityType.make(entity.type),
+        entityId: id
       }),
-      tag: "ReproStream",
-      payload: { id: 1 },
+      tag: options?.tag ?? "ReproStream",
+      payload: options?.payload ?? { id: 1 },
       headers: Headers.empty
-    } as Envelope.PartialRequest
+    }
+    return request
+  })
+
+// A runner RPC server whose replies are discarded.
+const makeServer = RpcServer.makeNoSerialization(Runners.Rpcs, { onFromServer: () => Effect.void })
+
+const writeRequest = (
+  server: RpcServer.RpcServer<any>,
+  tag: "Effect" | "Stream",
+  request: Envelope.PartialRequest,
+  options?: { readonly persisted?: boolean; readonly clientId?: number }
+) =>
+  server.write(options?.clientId ?? 0, {
+    _tag: "Request",
+    id: RpcMessage.RequestId(String(request.requestId)),
+    tag,
+    payload: { request, persisted: options?.persisted ?? false },
+    headers: Headers.empty
+  })
+
+const incomingRequest = (envelope: Envelope.PartialRequest, callerScope?: Scope.Scope) =>
+  new Message.IncomingRequest({
+    envelope,
+    lastSentReply: Option.none(),
+    respond: () => Effect.void,
+    codecFor: jsonCodec,
+    callerScope
+  })
+
+it.effect("completes a successful runner stream", () =>
+  Effect.gen(function*() {
+    yield* TestClock.adjust(1)
+    const snowflake = yield* Snowflake.Generator
+    const request = yield* makeRequest(ReproEntity, "one")
     const client = yield* RpcTest.makeClient(Runners.Rpcs)
     const queue = yield* client.Stream({ request, persisted: false }, { asQueue: true })
-    const first = yield* Queue.take(queue).pipe(
-      Effect.timeout("1 second"),
-      TestClock.withLive
-    )
-    if (first._tag !== "Chunk") {
-      return assert.fail("expected the stream value before the terminal reply")
-    }
+    const first = yield* Queue.take(queue).pipe(Effect.timeout("1 second"), TestClock.withLive)
+    if (first._tag !== "Chunk") return assert.fail("expected the stream value before the terminal reply")
     assert.deepStrictEqual(first.values, [1])
-
     yield* client.Envelope({
       envelope: new Envelope.AckChunk({
         id: snowflake.nextUnsafe(),
@@ -122,40 +152,236 @@ it.effect("completes a successful runner stream", () =>
       }),
       persisted: false
     })
-
     const completion = yield* Effect.gen(function*() {
       const last = yield* Queue.take(queue)
       yield* Queue.take(queue).pipe(Effect.catchTag("Done", () => Effect.void))
       return last
-    }).pipe(
-      Effect.timeoutOption("1 second"),
-      TestClock.withLive
+    }).pipe(Effect.timeout("1 second"), TestClock.withLive)
+    assert.strictEqual(completion._tag, "WithExit")
+  }).pipe(Effect.provide(makeHandlers(
+    ReproEntity.toLayer({ ReproStream: () => Stream.make(1) })
+  ))))
+
+it.effect("releases a non-persisted Effect handler when the runner caller disconnects", () =>
+  Effect.gen(function*() {
+    const started = yield* Deferred.make<void>()
+    const stopped = yield* Deferred.make<void>()
+    yield* Effect.gen(function*() {
+      yield* TestClock.adjust(1)
+      const request = yield* makeRequest(HoleCodecEntity, "effect-disconnect", { tag: "Double" })
+      const server = yield* makeServer
+      yield* writeRequest(server, "Effect", request)
+      yield* TestClock.adjust(1)
+      assert.isTrue(yield* Deferred.isDone(started))
+      assert.isFalse(yield* Deferred.isDone(stopped))
+      yield* server.disconnect(0)
+      yield* TestClock.adjust(1)
+      assert.isTrue(yield* Deferred.isDone(stopped))
+    }).pipe(Effect.provide(makeHandlers(
+      HoleCodecEntity.toLayer({
+        Double: () =>
+          Rpc.fork(
+            Deferred.succeed(started, undefined).pipe(
+              Effect.andThen(Effect.never),
+              Effect.ensuring(Deferred.succeed(stopped, undefined))
+            )
+          )
+      })
+    )))
+  }))
+
+it.effect("forgets departed callers during rebuild without replaying or retaining mailbox slots", () =>
+  Effect.gen(function*() {
+    const rebuilding = yield* Deferred.make<void>()
+    const releaseBuild = yield* Deferred.make<void>()
+    const starts: Array<number> = []
+    let builds = 0
+    const entityLayer = ReproEntity.toLayer(
+      Effect.gen(function*() {
+        builds++
+        if (builds === 2) {
+          yield* Deferred.succeed(rebuilding, undefined)
+          yield* Deferred.await(releaseBuild)
+        }
+        return {
+          ReproStream: ({ payload }) => {
+            starts.push(payload.id)
+            return Rpc.fork(starts.length === 1 ? Stream.die("trigger entity rebuild") : Stream.never)
+          }
+        }
+      }),
+      { mailboxCapacity: 2 }
     )
-    if (Option.isNone(completion)) {
-      return assert.fail("expected the runner stream to complete")
-    }
-    assert.strictEqual(completion.value._tag, "WithExit")
-  }).pipe(Effect.provide(handlers)))
+    yield* Effect.gen(function*() {
+      yield* TestClock.adjust(1)
+      const sharding = yield* Sharding.Sharding
+      const server = yield* makeServer
+      const request = (id: number) => makeRequest(ReproEntity, "mailbox-during-rebuild", { payload: { id } })
+      const send = (clientId: number, id: number) =>
+        Effect.flatMap(request(id), (request) => writeRequest(server, "Stream", request, { clientId }))
+      yield* send(0, 1)
+      yield* TestClock.adjust("5 seconds")
+      assert.isTrue(yield* Deferred.isDone(rebuilding))
+      yield* send(1, 2)
+      yield* TestClock.adjust(1)
+      assert.deepStrictEqual(starts, [1])
+
+      const probe = (id: number) => Effect.flatMap(request(id), (request) => sharding.send(incomingRequest(request)))
+      // A and B fill both slots, proving B was admitted before its disconnect.
+      const full = yield* probe(3).pipe(Effect.flip)
+      assert.strictEqual(full._tag, "MailboxFull")
+      yield* server.disconnect(0).pipe(Effect.timeout("1 second"), TestClock.withLive)
+      yield* server.disconnect(1).pipe(Effect.timeout("1 second"), TestClock.withLive)
+      assert.isFalse(yield* Deferred.isDone(releaseBuild))
+      yield* Deferred.succeed(releaseBuild, undefined)
+      yield* TestClock.adjust(1)
+      assert.deepStrictEqual(starts, [1])
+
+      // Both the interrupted handler and the never-delivered request release
+      // their slots. Neither may run again when the rebuild finishes.
+      yield* probe(3)
+      yield* probe(4)
+      yield* TestClock.adjust(1)
+      assert.deepStrictEqual(starts, [1, 3, 4])
+    }).pipe(Effect.provide(makeHandlers(entityLayer)))
+  }))
+
+it.effect("releases a replayed handler when its caller disconnects during acquisition", () =>
+  Effect.gen(function*() {
+    const callerScope = yield* Effect.acquireRelease(Scope.make(), (scope) => Scope.close(scope, Exit.void))
+    const crash = yield* Deferred.make<void>()
+    const replaying = yield* Deferred.make<void>()
+    const disconnected = yield* Deferred.make<void>()
+    let starts = 0
+    let stops = 0
+    let crashes = 0
+    const entityLayer = ReproEntity.toLayer({
+      ReproStream: ({ payload }) => {
+        if (payload.id === 1) {
+          const invocation = ++starts
+          return Rpc.fork(
+            Stream.fromEffect(Effect.gen(function*() {
+              if (invocation === 2) yield* Deferred.succeed(replaying, undefined)
+              return yield* Effect.never
+            })).pipe(Stream.ensuring(Effect.sync(() => {
+              stops++
+            })))
+          )
+        }
+        return Rpc.fork(
+          ++crashes === 1
+            ? Stream.fromEffect(Deferred.await(crash).pipe(Effect.andThen(Effect.die("trigger entity rebuild"))))
+            : Stream.never
+        )
+      }
+    })
+    yield* Effect.gen(function*() {
+      yield* TestClock.adjust(1)
+      const sharding = yield* Sharding.Sharding
+      const request = (id: number) => makeRequest(ReproEntity, "disconnect-during-replay", { payload: { id } })
+      yield* sharding.send(incomingRequest(yield* request(1), callerScope))
+      yield* sharding.send(incomingRequest(yield* request(2)))
+      yield* TestClock.adjust(1)
+      assert.strictEqual(starts, 1)
+      assert.strictEqual(stops, 0)
+
+      // Close from another fiber as soon as the replacement handler starts,
+      // while the entity is still acquiring and replaying its requests.
+      yield* Deferred.await(replaying).pipe(
+        Effect.andThen(Scope.close(callerScope, Exit.void)),
+        Effect.andThen(Deferred.succeed(disconnected, undefined)),
+        Effect.forkChild({ startImmediately: true })
+      )
+      yield* Deferred.succeed(crash, undefined)
+      yield* TestClock.adjust("5 seconds")
+      assert.strictEqual(starts, 2)
+      assert.isTrue(yield* Deferred.isDone(disconnected))
+      // Both the original handler and its replacement must release resources.
+      assert.strictEqual(stops, 2)
+    }).pipe(Effect.provide(makeHandlers(entityLayer)))
+  }))
+
+it.effect("does not admit a request with an already-closed caller scope", () =>
+  Effect.gen(function*() {
+    let starts = 0
+    yield* Effect.gen(function*() {
+      yield* TestClock.adjust(1)
+      const sharding = yield* Sharding.Sharding
+      const callerScope = yield* Scope.make()
+      yield* Scope.close(callerScope, Exit.void)
+      const closed = incomingRequest(yield* makeRequest(ReproEntity, "closed-scope"), callerScope)
+      yield* Effect.exit(sharding.send(closed))
+      yield* TestClock.adjust(1)
+      assert.strictEqual(starts, 0)
+      // A live request must still fit in the only mailbox slot.
+      const live = incomingRequest(yield* makeRequest(ReproEntity, "closed-scope"))
+      const admitted = yield* Effect.exit(sharding.send(live))
+      assert.strictEqual(admitted._tag, "Success")
+      yield* TestClock.adjust(1)
+      assert.strictEqual(starts, 1)
+    }).pipe(Effect.provide(makeHandlers(
+      ReproEntity.toLayer({
+        ReproStream: () => {
+          starts++
+          return Rpc.fork(Stream.never)
+        }
+      }, { mailboxCapacity: 1 })
+    )))
+  }))
+
+for (const persisted of [false, true]) {
+  it.effect(`caller disconnect preserves ${persisted ? "persisted" : "Uninterruptible"} streams`, () =>
+    Effect.gen(function*() {
+      const pubsub = yield* Effect.acquireRelease(PubSub.unbounded<number>(), PubSub.shutdown)
+      const entity = persisted
+        ? ReproEntity.annotateRpcs(ClusterSchema.Persisted, true)
+        : ReproEntity.annotateRpcs(ClusterSchema.Uninterruptible, true)
+      yield* Effect.gen(function*() {
+        yield* TestClock.adjust(1)
+        const request = yield* makeRequest(entity, "protected-caller")
+        if (persisted) {
+          const driver = yield* MessageStorage.MemoryDriver
+          yield* driver.encoded.saveEnvelope({
+            envelope: yield* Schema.encodeEffect(Envelope.PartialJson)(request),
+            primaryKey: null,
+            deliverAt: null
+          })
+        }
+        const server = yield* makeServer
+        yield* writeRequest(server, "Stream", request, { persisted })
+        yield* TestClock.adjust(1)
+        assert.strictEqual(pubsub.subscribers.size, 1)
+        yield* server.disconnect(0)
+        yield* TestClock.adjust(1)
+        assert.strictEqual(pubsub.subscribers.size, 1)
+
+        if (!persisted) {
+          // An exemption from caller cleanup must not block explicit interrupts.
+          const sharding = yield* Sharding.Sharding
+          const snowflake = yield* Snowflake.Generator
+          yield* sharding.send(
+            new Message.IncomingEnvelope({
+              envelope: new Envelope.Interrupt({
+                id: snowflake.nextUnsafe(),
+                address: request.address,
+                requestId: request.requestId
+              })
+            })
+          )
+          yield* TestClock.adjust(1)
+          assert.strictEqual(pubsub.subscribers.size, 0)
+        }
+      }).pipe(Effect.provide(makeHandlers(
+        entity.toLayer({ ReproStream: () => Rpc.fork(Stream.fromPubSub(pubsub)) })
+      )))
+    }))
+}
 
 it.effect("fills the entity payload and reply holes with the serialization's codec", () =>
   Effect.gen(function*() {
     yield* TestClock.adjust(1)
-    const sharding = yield* Sharding.Sharding
-    const snowflake = yield* Snowflake.Generator
-    const entityId = EntityId.make("hole")
-    const request = {
-      _tag: "Request",
-      requestId: snowflake.nextUnsafe(),
-      address: EntityAddress.make({
-        shardId: sharding.getShardId(entityId, HoleCodecEntity.getShardGroup(entityId)),
-        entityType: EntityType.make("HoleCodecEntity"),
-        entityId
-      }),
-      tag: "Double",
-      // already encoded by the sender with the same hole codec
-      payload: JSON.stringify({ id: 21 }),
-      headers: Headers.empty
-    } as any as Envelope.PartialRequest
+    // already encoded by the sender with the same hole codec
+    const request = yield* makeRequest(HoleCodecEntity, "hole", { tag: "Double", payload: JSON.stringify({ id: 21 }) })
 
     const client = yield* RpcTest.makeClient(Runners.Rpcs)
     const reply = yield* client.Effect({ request, persisted: false }).pipe(
diff --git a/repos/effect/packages/effect/test/cluster/Runners.test.ts b/repos/effect/packages/effect/test/cluster/Runners.test.ts
index 6bf033ee2..1c017686d 100644
--- a/repos/effect/packages/effect/test/cluster/Runners.test.ts
+++ b/repos/effect/packages/effect/test/cluster/Runners.test.ts
@@ -1,5 +1,5 @@
 import { assert, describe, it } from "@effect/vitest"
-import { Cause, Context, Effect, Exit, Layer, Option, Queue, Schema, Stream } from "effect"
+import { Cause, Context, Deferred, Effect, Exit, Layer, Option, Queue, Schema, Stream } from "effect"
 import { TestClock } from "effect/testing"
 import {
   ClusterError,
@@ -9,6 +9,7 @@ import {
   EntityId,
   EntityType,
   Envelope,
+  HttpRunner,
   Message,
   MessageStorage,
   type Reply,
@@ -22,8 +23,8 @@ import {
   ShardingConfig,
   Snowflake
 } from "effect/unstable/cluster"
-import { Headers } from "effect/unstable/http"
-import { Rpc, RpcClient, type RpcSerialization, RpcServer, RpcTest } from "effect/unstable/rpc"
+import { Headers, HttpClient, HttpClientResponse } from "effect/unstable/http"
+import { Rpc, RpcClient, RpcGroup, RpcMessage, RpcSerialization, RpcServer, RpcTest } from "effect/unstable/rpc"
 import { RpcClientError } from "effect/unstable/rpc/RpcClientError"
 import type { FromClientEncoded, FromServerEncoded } from "effect/unstable/rpc/RpcMessage"
 import { Socket } from "effect/unstable/socket"
@@ -86,6 +87,71 @@ const RunnerServerHandlers = RunnerServer.layerHandlers.pipe(
   Layer.provide(TestShardingConfig)
 )
 
+describe.concurrent("HttpRunner", () => {
+  const address = RunnerAddress.make("localhost", 8080)
+  const Rpcs = RpcGroup.make(Rpc.make("Ping", { success: Schema.String }))
+
+  it.effect("preserves a leading slash in HTTP client paths", () => {
+    let requestUrl: string | undefined
+    const httpClient = HttpClient.make((request) => {
+      requestUrl = request.url
+      return Effect.succeed(HttpClientResponse.fromWeb(
+        request,
+        new Response("[{\"_tag\":\"Exit\",\"requestId\":\"0\",\"exit\":{\"_tag\":\"Success\",\"value\":\"pong\"}}]")
+      ))
+    })
+    return Effect.gen(function*() {
+      const runnerProtocol = yield* Runners.RpcClientProtocol
+      const protocol = yield* runnerProtocol.make(address)
+      const client = yield* RpcClient.make(Rpcs, {
+        generateRequestId: () => RpcMessage.RequestId("0")
+      }).pipe(Effect.provideService(RpcClient.Protocol, protocol))
+
+      yield* client.Ping()
+
+      assert.strictEqual(requestUrl, "http://localhost:8080/runner/")
+    }).pipe(
+      Effect.provide(HttpRunner.layerClientProtocolHttp({ path: "/runner" })),
+      Effect.provide(RpcSerialization.layerJson),
+      Effect.provideService(HttpClient.HttpClient, httpClient)
+    )
+  })
+
+  it.effect("preserves a leading slash in WebSocket client paths", () =>
+    Effect.gen(function*() {
+      const connected = yield* Deferred.make<void>()
+      let socketUrl: string | undefined
+      const constructor: Socket.WebSocketConstructor["Service"] = (url) => {
+        socketUrl = url
+        return {
+          readyState: 1,
+          addEventListener() {},
+          removeEventListener() {},
+          close() {},
+          send() {}
+        }
+      }
+
+      yield* Effect.gen(function*() {
+        const runnerProtocol = yield* Runners.RpcClientProtocol
+        const protocol = yield* runnerProtocol.make(address)
+        yield* protocol.run(0, () => Effect.void).pipe(Effect.forkScoped)
+        yield* Deferred.await(connected)
+
+        assert.strictEqual(socketUrl, "ws://localhost:8080/runner")
+      }).pipe(
+        Effect.provide(HttpRunner.layerClientProtocolWebsocket({ path: "/runner" })),
+        Effect.provide(RpcSerialization.layerJson),
+        Effect.provideService(Socket.WebSocketConstructor, constructor),
+        Effect.provideService(RpcClient.ConnectionHooks, {
+          onConnect: Deferred.succeed(connected, undefined).pipe(Effect.asVoid),
+          onDisconnect: Effect.void
+        }),
+        Effect.scoped
+      )
+    }))
+})
+
 describe.concurrent("RunnerServer", () => {
   const makeRequest = (options: {
     readonly entityId: string
diff --git a/repos/effect/packages/effect/test/cluster/Sharding.test.ts b/repos/effect/packages/effect/test/cluster/Sharding.test.ts
index 99d9f4bb3..5c8e57f8a 100644
--- a/repos/effect/packages/effect/test/cluster/Sharding.test.ts
+++ b/repos/effect/packages/effect/test/cluster/Sharding.test.ts
@@ -14,6 +14,8 @@ import {
   MutableRef,
   Option,
   Queue,
+  Result,
+  Schedule,
   Schema,
   Stream
 } from "effect"
@@ -53,7 +55,471 @@ import {
   User
 } from "./TestEntity.ts"
 
+// Isolate the long-lived stream from concurrent shard-metric tests.
+describe("Sharding claim release regressions", { concurrent: false }, () => {
+  it.effect("keeps the claim of an active request replayed after an entity defect", () =>
+    Effect.gen(function*() {
+      const started = yield* Queue.make<number>()
+      let starts = 0
+      let active = 0
+      let layerBuilds = 0
+      let defectAttempts = 0
+      const released: Array<Snowflake.Snowflake> = []
+      const claimed: Array<Snowflake.Snowflake> = []
+      const Replaying = Entity.make("ClaimDefectReplay", [
+        Rpc.make("Run"),
+        Rpc.make("Defect")
+      ]).annotateRpcs(ClusterSchema.Persisted, true)
+      const layer = Replaying.toLayer(
+        Effect.sync(() => {
+          layerBuilds++
+          return Replaying.of({
+            Run: () =>
+              Rpc.fork(
+                Effect.gen(function*() {
+                  starts++
+                  active++
+                  yield* Queue.offer(started, starts)
+                  return yield* Effect.never
+                }).pipe(Effect.ensuring(Effect.sync(() => active--)))
+              ),
+            Defect: () =>
+              Effect.suspend(() => {
+                defectAttempts++
+                return defectAttempts === 1 ? Effect.die("restart entity") : Effect.void
+              })
+          })
+        }),
+        { defectRetryPolicy: Schedule.forever }
+      ).pipe(Layer.provideMerge(CappedSharding({}, (storage) => ({
+        ...storage,
+        resetRequests: (ids) =>
+          Effect.gen(function*() {
+            released.push(...ids)
+            yield* storage.resetRequests(ids)
+          }),
+        unprocessedMessages: (shards, options) =>
+          storage.unprocessedMessages(shards, options).pipe(
+            Effect.tap((messages) =>
+              Effect.sync(() => {
+                for (const message of messages) {
+                  if (message._tag === "IncomingRequest") claimed.push(message.envelope.requestId)
+                }
+              })
+            )
+          )
+      }))))
+
+      yield* Effect.gen(function*() {
+        yield* TestClock.adjust(1)
+        const sharding = yield* Sharding.Sharding
+        const driver = yield* MessageStorage.MemoryDriver
+        const client = (yield* Replaying.client)("replay")
+        const running = yield* client.Run().pipe(Effect.forkChild({ startImmediately: true }))
+        yield* TestClock.adjust(1)
+        assert.strictEqual(yield* Queue.take(started), 1)
+        const request = driver.journal[0]
+        assert.strictEqual(request._tag, "Request")
+
+        // Defecting another handler rebuilds the entity and replays Run.
+        yield* client.Defect()
+        assert.strictEqual(yield* Queue.take(started), 2, "in-flight handler must replay after the defect")
+        assert.strictEqual(layerBuilds, 2)
+        assert.strictEqual(defectAttempts, 2)
+        assert.strictEqual(active, 1)
+        expect(running.pollUnsafe()).toBeUndefined()
+        claimed.length = 0
+        released.length = 0
+
+        yield* TestClock.adjust("10 minutes")
+        for (let i = 0; i < 3; i++) {
+          yield* sharding.pollStorage
+          yield* TestClock.adjust(1)
+        }
+        expect(claimed).toContain(Snowflake.Snowflake(request.requestId))
+        assert.strictEqual(starts, 2, "polling must not deliver the replayed request again")
+        assert.strictEqual(layerBuilds, 2, "polling must not restart the entity again")
+        assert.strictEqual(active, 1, "replayed handler must remain active")
+        expect(running.pollUnsafe()).toBeUndefined()
+        assert.strictEqual(released.length, 0, "replayed active request claim must not be released")
+        assert.deepStrictEqual(
+          claimed,
+          [Snowflake.Snowflake(request.requestId)],
+          "replayed request must not be reclaimed on every poll"
+        )
+      }).pipe(Effect.provide(layer))
+    }))
+
+  it.effect("keeps the claim of an active uninterruptible request after restarting", () =>
+    Effect.gen(function*() {
+      const started = yield* Queue.make<number>()
+      let starts = 0
+      let active = 0
+      const released: Array<Snowflake.Snowflake> = []
+      const claimed: Array<Snowflake.Snowflake> = []
+      const Restarting = Entity.make("ClaimRestart", [
+        Rpc.make("Run")
+          .annotate(ClusterSchema.Persisted, true)
+          .annotate(ClusterSchema.Uninterruptible, true)
+      ])
+      const layer = Restarting.toLayer({
+        Run: () =>
+          Effect.gen(function*() {
+            starts++
+            active++
+            yield* Queue.offer(started, starts)
+            return yield* Effect.never
+          }).pipe(Effect.ensuring(Effect.sync(() => active--)))
+      }).pipe(Layer.provideMerge(CappedSharding({}, (storage) => ({
+        ...storage,
+        resetRequests: (ids) =>
+          Effect.gen(function*() {
+            released.push(...ids)
+            yield* storage.resetRequests(ids)
+          }),
+        unprocessedMessages: (shards, options) =>
+          storage.unprocessedMessages(shards, options).pipe(
+            Effect.tap((messages) =>
+              Effect.sync(() => {
+                for (const message of messages) {
+                  if (message._tag === "IncomingRequest") claimed.push(message.envelope.requestId)
+                }
+              })
+            )
+          )
+      }))))
+
+      yield* Effect.gen(function*() {
+        yield* TestClock.adjust(1)
+        const sharding = yield* Sharding.Sharding
+        const driver = yield* MessageStorage.MemoryDriver
+        const client = (yield* Restarting.client)("restart")
+        const running = yield* client.Run().pipe(Effect.forkChild({ startImmediately: true }))
+        assert.strictEqual(yield* Queue.take(started), 1)
+        const request = driver.journal[0]
+        assert.strictEqual(request._tag, "Request")
+
+        // A persisted interrupt restarts the uninterruptible request.
+        yield* driver.encoded.saveEnvelope({
+          envelope: {
+            _tag: "Interrupt",
+            id: String(yield* sharding.getSnowflake),
+            requestId: request.requestId,
+            address: request.address
+          },
+          primaryKey: null,
+          deliverAt: null
+        })
+        yield* sharding.pollStorage
+        yield* TestClock.adjust(1)
+        assert.strictEqual(yield* Queue.take(started), 2, "handler must restart after the stored interrupt")
+        assert.strictEqual(active, 1)
+        expect(running.pollUnsafe()).toBeUndefined()
+        claimed.length = 0
+        released.length = 0
+
+        yield* TestClock.adjust("10 minutes")
+        for (let i = 0; i < 3; i++) {
+          yield* sharding.pollStorage
+          yield* TestClock.adjust(1)
+        }
+        expect(claimed).toContain(Snowflake.Snowflake(request.requestId))
+        assert.strictEqual(starts, 2, "polling must not deliver the restarted request again")
+        assert.strictEqual(active, 1, "restarted handler must remain active")
+        expect(running.pollUnsafe()).toBeUndefined()
+        assert.strictEqual(released.length, 0, "restarted active request claim must not be released")
+        assert.deepStrictEqual(
+          claimed,
+          [Snowflake.Snowflake(request.requestId)],
+          "restarted request must not be reclaimed on every poll"
+        )
+      }).pipe(Effect.provide(layer))
+    }))
+
+  it.effect("keeps the claim of an active stream after an acknowledged chunk", () =>
+    Effect.gen(function*() {
+      const acked = yield* Deferred.make<void>()
+      const released: Array<Snowflake.Snowflake> = []
+      const claimed: Array<Snowflake.Snowflake> = []
+      yield* Effect.gen(function*() {
+        yield* TestClock.adjust(1)
+        const sharding = yield* Sharding.Sharding
+        const state = yield* TestEntityState
+        const client = (yield* TestEntity.client)("active-stream")
+        const values: Array<number> = []
+        const stream = yield* client.StreamWithKey({ key: "run" }).pipe(
+          Stream.runForEach((value) => Effect.sync(() => values.push(value))),
+          Effect.forkChild({ startImmediately: true })
+        )
+        yield* Queue.offer(state.streamMessages, void 0)
+        yield* TestClock.adjust(1000)
+        yield* Deferred.await(acked)
+        expect(values).toEqual([0])
+        expect(stream.pollUnsafe()).toBeUndefined()
+        claimed.length = 0
+        released.length = 0
+
+        // Await the ack because memory storage does not model SQL reply filtering.
+        yield* TestClock.adjust("10 minutes")
+        for (let i = 0; i < 3; i++) {
+          yield* sharding.pollStorage
+          yield* TestClock.adjust(1)
+        }
+        expect(claimed.length).toBeGreaterThan(0)
+        expect(stream.pollUnsafe()).toBeUndefined()
+        expect(values).toEqual([0])
+        assert.strictEqual(released.length, 0, "active stream claim must not be released after a chunk")
+        assert.strictEqual(claimed.length, 1, "active stream must not be reclaimed on every poll")
+      }).pipe(Effect.provide(CappedSharding({}, (storage) => ({
+        ...storage,
+        saveEnvelope: (message) =>
+          storage.saveEnvelope(message).pipe(
+            Effect.tap(() => message.envelope._tag === "AckChunk" ? Deferred.succeed(acked, void 0) : Effect.void)
+          ),
+        resetRequests: (ids) =>
+          Effect.gen(function*() {
+            released.push(...ids)
+            yield* storage.resetRequests(ids)
+          }),
+        unprocessedMessages: (shards, options) =>
+          storage.unprocessedMessages(shards, options).pipe(
+            Effect.tap((messages) =>
+              Effect.sync(() => {
+                for (const message of messages) {
+                  if (message._tag === "IncomingRequest") claimed.push(message.envelope.requestId)
+                }
+              })
+            )
+          )
+      }))))
+    }))
+
+  it.effect("releases capped addresses even when targeted claim release fails", () =>
+    Effect.gen(function*() {
+      const readStarted = yield* Deferred.make<void>()
+      const releaseRead = yield* Deferred.make<void>()
+      let pauseNextRead = false
+      const failedReleases: Array<Snowflake.Snowflake> = []
+      const cappedReleases: Array<EntityAddress.EntityAddress> = []
+      const claimed: Array<string> = []
+      yield* Effect.gen(function*() {
+        yield* TestClock.adjust(1)
+        const sharding = yield* Sharding.Sharding
+        const state = yield* TestEntityState
+        const client = yield* TestEntity.client
+        const firstRun = yield* client("completed").RequestWithKey({ key: "run" }).pipe(
+          Effect.forkChild({ startImmediately: true })
+        )
+        const request = yield* Queue.take(state.envelopes)
+        pauseNextRead = true
+        yield* sharding.pollStorage
+        yield* Deferred.await(readStarted)
+        yield* Queue.offer(state.messages, void 0)
+        yield* Fiber.join(firstRun)
+        yield* TestClock.adjust(1)
+        yield* sharding.reset(request.requestId)
+        yield* saveGetUserRequest("capped", 42)
+
+        // Fill capacity during the read so its batch also contains a capped address.
+        yield* client("resident").NeverVolatile().pipe(Effect.forkChild({ startImmediately: true }))
+        yield* Queue.take(state.envelopes)
+        expect(yield* sharding.activeEntityCount).toEqual(2)
+        yield* Deferred.succeed(releaseRead, void 0)
+        yield* TestClock.adjust(1)
+        expect(claimed).toContain("completed")
+        expect(claimed).toContain("capped")
+        expect(failedReleases).toEqual([request.requestId])
+        assert.deepStrictEqual(
+          cappedReleases.map((address) => address.entityId),
+          ["capped"],
+          "failed targeted release must not skip capped-address release from the same batch"
+        )
+      }).pipe(Effect.provide(CappedSharding({ maxResidentEntities: 2 }, (storage) => ({
+        ...storage,
+        resetRequests: (ids) =>
+          Effect.suspend(() => {
+            failedReleases.push(...ids)
+            return Effect.fail(new ClusterError.PersistenceError({ cause: "injected targeted release failure" }))
+          }),
+        resetAddresses: (addresses) =>
+          Effect.gen(function*() {
+            cappedReleases.push(...addresses)
+            yield* storage.resetAddresses(addresses)
+          }),
+        unprocessedMessages: (shards, options) =>
+          Effect.gen(function*() {
+            if (pauseNextRead) {
+              pauseNextRead = false
+              yield* Deferred.succeed(readStarted, void 0)
+              yield* Deferred.await(releaseRead)
+            }
+            const messages = yield* storage.unprocessedMessages(shards, options)
+            for (const message of messages) claimed.push(message.envelope.address.entityId)
+            return messages
+          })
+      }))))
+    }))
+})
+
 describe.concurrent("Sharding", () => {
+  it.effect("redelivers a request reset while an asynchronous storage read is pending", () =>
+    Effect.gen(function*() {
+      const readStarted = yield* Deferred.make<void>()
+      const releaseRead = yield* Deferred.make<void>()
+      let pauseNextRead = false
+      const claimed: Array<Snowflake.Snowflake> = []
+
+      yield* Effect.gen(function*() {
+        yield* TestClock.adjust(1)
+        const sharding = yield* Sharding.Sharding
+        const state = yield* TestEntityState
+        const client = (yield* TestEntity.client)("reset-race")
+        const firstRun = yield* client.RequestWithKey({ key: "run" }).pipe(
+          Effect.forkChild({ startImmediately: true })
+        )
+        const request = yield* Queue.take(state.envelopes)
+
+        // Pause after clearing processed IDs but before storage claims rows.
+        pauseNextRead = true
+        yield* sharding.pollStorage
+        yield* Deferred.await(readStarted)
+
+        // Complete the request while the read is paused.
+        yield* Queue.offer(state.messages, void 0)
+        yield* Fiber.join(firstRun)
+        yield* TestClock.adjust(1)
+        assert.isTrue(yield* sharding.reset(request.requestId))
+        yield* sharding.pollStorage
+        claimed.length = 0
+
+        // The reset must be redelivered before its new claim expires.
+        yield* Deferred.succeed(releaseRead, void 0)
+        yield* TestClock.adjust(5000)
+        assert.include(claimed, request.requestId)
+        const deliveriesBeforeClaimExpiry = Queue.sizeUnsafe(state.envelopes)
+
+        yield* TestClock.adjust("10 minutes")
+        assert.strictEqual(Queue.sizeUnsafe(state.envelopes), 1)
+        assert.strictEqual(
+          deliveriesBeforeClaimExpiry,
+          1,
+          "reset request was claimed but not redelivered before claim expiry"
+        )
+      }).pipe(Effect.provide(CappedSharding({}, (storage) => ({
+        ...storage,
+        unprocessedMessages: (shardIds, options) =>
+          Effect.gen(function*() {
+            if (pauseNextRead) {
+              pauseNextRead = false
+              yield* Deferred.succeed(readStarted, void 0)
+              yield* Deferred.await(releaseRead)
+            }
+            const messages = yield* storage.unprocessedMessages(shardIds, options)
+            for (const message of messages) claimed.push(message.envelope.requestId)
+            return messages
+          })
+      }))))
+    }))
+
+  for (const pauseReply of [false, true]) {
+    it.effect(
+      pauseReply
+        ? "redelivers a remote reset published before active-request cleanup"
+        : "redelivers a remote reset during a pending storage read",
+      () =>
+        Effect.gen(function*() {
+          const readStarted = yield* Deferred.make<void>()
+          const releaseRead = yield* Deferred.make<void>()
+          const replyPublished = yield* Deferred.make<void>()
+          const releaseReply = yield* Deferred.make<void>()
+          let pauseNextRead = false
+          let pauseNextReply = pauseReply
+          const released: Array<Snowflake.Snowflake> = []
+
+          yield* Effect.gen(function*() {
+            yield* TestClock.adjust(1)
+            const sharding = yield* Sharding.Sharding
+            const driver = yield* MessageStorage.MemoryDriver
+            // Share persistence without sharing runner state.
+            const remoteStorage = yield* MessageStorage.makeEncoded(driver.encoded).pipe(
+              Effect.provide(Snowflake.layerGenerator.pipe(Layer.provide(ShardingConfig.layerDefaults)))
+            )
+            const state = yield* TestEntityState
+            const client = (yield* TestEntity.client)("remote-reset-race")
+            const firstRun = yield* client.RequestWithKey({ key: "run" }).pipe(
+              Effect.forkChild({ startImmediately: true })
+            )
+            const request = yield* Queue.take(state.envelopes)
+
+            // Reclaiming an active request must not redeliver it or release its claim.
+            yield* remoteStorage.resetRequests([request.requestId])
+            yield* sharding.pollStorage
+            yield* TestClock.adjust(1)
+            expect(Queue.sizeUnsafe(state.envelopes)).toEqual(0)
+            expect(released).toEqual([])
+
+            pauseNextRead = true
+            yield* sharding.pollStorage
+            yield* Deferred.await(readStarted)
+            yield* Queue.offer(state.messages, void 0)
+            yield* Fiber.join(firstRun)
+            if (pauseReply) yield* Deferred.await(replyPublished)
+            yield* TestClock.adjust(1)
+
+            // Simulate Sharding.reset on another runner.
+            yield* remoteStorage.clearReplies(request.requestId)
+            yield* Deferred.succeed(releaseRead, void 0)
+            yield* TestClock.adjust(1)
+            expect(released).toContain(request.requestId)
+            if (pauseReply) {
+              expect(Queue.sizeUnsafe(state.envelopes)).toEqual(0)
+              yield* Deferred.succeed(releaseReply, void 0)
+              yield* TestClock.adjust(1)
+            }
+            yield* sharding.pollStorage
+            yield* TestClock.adjust(5000)
+            expect(Queue.sizeUnsafe(state.envelopes)).toEqual(1)
+            expect((yield* Queue.take(state.envelopes)).requestId).toEqual(request.requestId)
+            yield* sharding.pollStorage
+            yield* TestClock.adjust(5000)
+            expect(Queue.sizeUnsafe(state.envelopes)).toEqual(0)
+          }).pipe(Effect.provide(CappedSharding({}, (storage) => ({
+            ...storage,
+            resetRequests: (ids) =>
+              Effect.gen(function*() {
+                released.push(...ids)
+                yield* storage.resetRequests(ids)
+              }),
+            unprocessedMessages: (shards, options) =>
+              Effect.gen(function*() {
+                if (pauseNextRead) {
+                  pauseNextRead = false
+                  yield* Deferred.succeed(readStarted, void 0)
+                  yield* Deferred.await(releaseRead)
+                }
+                const messages = yield* storage.unprocessedMessages(shards, options)
+                return messages.map((message) =>
+                  message._tag !== "IncomingRequest" ?
+                    message :
+                    new Message.IncomingRequest({
+                      ...message,
+                      respond: (reply) =>
+                        Effect.gen(function*() {
+                          yield* message.respond(reply)
+                          if (pauseNextReply) {
+                            pauseNextReply = false
+                            yield* Deferred.succeed(replyPublished, void 0)
+                            yield* Deferred.await(releaseReply)
+                          }
+                        })
+                    })
+                )
+              })
+          }))))
+        })
+    )
+  }
+
   it.effect("delivers volatile requests directly to the entity", () =>
     Effect.gen(function*() {
       yield* TestClock.adjust(1)
@@ -79,6 +545,22 @@ describe.concurrent("Sharding", () => {
       expect(durable).toEqual("none")
     }).pipe(Effect.provide(ContextBleedSharding)))
 
+  it.effect("uses services provided when registering an entity", () =>
+    Effect.gen(function*() {
+      const sharding = yield* Sharding.Sharding
+      yield* sharding.registerEntity(RegistrationContextEntity, RegistrationContextHandlers).pipe(
+        Effect.provideService(RegistrationContext, "registration")
+      )
+      yield* TestClock.adjust(1)
+
+      const client = (yield* RegistrationContextEntity.client)("1")
+      expect(yield* client.Read()).toEqual("registration")
+    }).pipe(
+      Effect.provide(TestSharding),
+      Effect.provideService(RegistrationContext, "construction"),
+      Effect.scoped
+    ))
+
   it.effect("persists durable requests until the entity replies", () =>
     Effect.gen(function*() {
       yield* TestClock.adjust(1)
@@ -845,6 +1327,107 @@ describe.concurrent("Sharding", () => {
       Layer.merge(TestEntityState.layer)
     ))))
 
+  it.effect("bounds local sends while entity registration is missing", () =>
+    Effect.gen(function*() {
+      const sharding = yield* Sharding.Sharding
+      const entityId = EntityId.make("one")
+      yield* TestClock.adjust(1)
+      assert.isTrue(sharding.hasShardId(sharding.getShardId(entityId, "default")))
+
+      const client = (yield* MissingRegistrationEntity.client)(entityId)
+      const fiber = yield* client.Call().pipe(Effect.forkDetach({ startImmediately: true }))
+      yield* Effect.yieldNow
+      assert.isUndefined(fiber.pollUnsafe())
+
+      yield* TestClock.adjust(1000)
+      const exit = fiber.pollUnsafe()
+      assert(exit !== undefined, "the sendLocal registration wait must be bounded")
+      const defect = Exit.findDefect(exit)
+      assert(Result.isSuccess(defect) && defect.success instanceof Error)
+      assert.strictEqual(defect.success.message, "Entity type 'MissingRegistrationEntity' not registered")
+    }).pipe(Effect.provide(CappedSharding({ entityRegistrationTimeout: 1000 }))))
+
+  it.effect("recomputes the missing entity deadline when registration starts", () =>
+    Effect.gen(function*() {
+      const sharding = yield* Sharding.Sharding
+      const entityId = EntityId.make("one")
+      yield* TestClock.adjust(1)
+      assert.isTrue(sharding.hasShardId(sharding.getShardId(entityId, "default")))
+
+      const client = (yield* MissingRegistrationEntity.client)(entityId)
+      const fiber = yield* client.Call().pipe(Effect.forkDetach({ startImmediately: true }))
+      yield* Effect.yieldNow
+      assert.isUndefined(fiber.pollUnsafe())
+
+      yield* TestClock.adjust(1500)
+      yield* sharding.registerEntity(
+        FirstRegistrationEntity,
+        Effect.succeed(FirstRegistrationEntity.of({ Call: () => Effect.void }))
+      )
+
+      // The registration-start deadline is 1 second from now. The original
+      // fallback deadline has elapsed, but must no longer win the race.
+      yield* TestClock.adjust(600)
+      assert.isUndefined(fiber.pollUnsafe())
+
+      yield* TestClock.adjust(400)
+      const exit = fiber.pollUnsafe()
+      assert(exit !== undefined, "the registration-start deadline must be bounded")
+      const defect = Exit.findDefect(exit)
+      assert(Result.isSuccess(defect) && defect.success instanceof Error)
+      assert.strictEqual(defect.success.message, "Entity type 'MissingRegistrationEntity' not registered")
+    }).pipe(Effect.provide(UnregisteredSharding({ entityRegistrationTimeout: 1000 }))))
+
+  it.effect("keeps a shared registration latch when one waiter is interrupted", () =>
+    Effect.gen(function*() {
+      const sharding = yield* Sharding.Sharding
+      const entityId = EntityId.make("one")
+      yield* TestClock.adjust(1)
+      assert.isTrue(sharding.hasShardId(sharding.getShardId(entityId, "default")))
+
+      const client = (yield* MissingRegistrationEntity.client)(entityId)
+      const interrupted = yield* client.Call().pipe(Effect.forkDetach({ startImmediately: true }))
+      const remaining = yield* client.Call().pipe(Effect.forkDetach({ startImmediately: true }))
+      yield* Effect.yieldNow
+      assert.isUndefined(interrupted.pollUnsafe())
+      assert.isUndefined(remaining.pollUnsafe())
+
+      interrupted.interruptUnsafe()
+      yield* Effect.yieldNow
+      yield* sharding.registerEntity(
+        MissingRegistrationEntity,
+        Effect.succeed(MissingRegistrationEntity.of({ Call: () => Effect.void }))
+      )
+      const interruptedExit = yield* Fiber.await(interrupted)
+      assert.isTrue(Exit.isFailure(interruptedExit) && Cause.hasInterruptsOnly(interruptedExit.cause))
+      yield* Fiber.join(remaining)
+    }).pipe(Effect.provide(UnregisteredSharding({ entityRegistrationTimeout: 1000 }))))
+
+  it.effect("bounds client interruption while entity registration is missing", () =>
+    Effect.gen(function*() {
+      const sharding = yield* Sharding.Sharding
+      const entityId = EntityId.make("one")
+      yield* TestClock.adjust(1)
+      assert.isTrue(sharding.hasShardId(sharding.getShardId(entityId, "default")))
+
+      const client = (yield* MissingRegistrationEntity.client)(entityId)
+      const fiber = yield* client.Call().pipe(Effect.forkDetach({ startImmediately: true }))
+      yield* Effect.yieldNow
+
+      // Interrupting a client sends an interrupt message through the same local
+      // registration wait. Fork it so TestClock can reach the shared deadline.
+      const interruptFiber = yield* Fiber.interrupt(fiber).pipe(
+        Effect.forkDetach({ startImmediately: true })
+      )
+      yield* Effect.yieldNow
+      assert.isUndefined(interruptFiber.pollUnsafe())
+
+      yield* TestClock.adjust(1000)
+      yield* Fiber.join(interruptFiber)
+      const interruptedExit = yield* Fiber.await(fiber)
+      assert.isTrue(Exit.isFailure(interruptedExit) && Cause.hasInterruptsOnly(interruptedExit.cause))
+    }).pipe(Effect.provide(CappedSharding({ entityRegistrationTimeout: 1000 }))))
+
   it.effect("durable streams are resumed on restart", () =>
     Effect.gen(function*() {
       const EnvLayer = TestShardingWithoutState.pipe(
@@ -1126,6 +1709,8 @@ describe.concurrent("Sharding active teardowns", () => {
       assert.strictEqual(journalInterrupts(driver), 0)
     }).pipe(Effect.provide(ActiveTeardownSharding({ entityMaxIdleTime: 1 }))))
 
+  // TestClock-driven reassignment can exhaust the wall-clock timeout when
+  // this test competes with the rest of this file in CI.
   it.effect("swallows persisted interrupts when the caller's shard is released", () =>
     Effect.gen(function*() {
       const storageState = makeFailoverStorageState()
@@ -1175,7 +1760,7 @@ describe.concurrent("Sharding active teardowns", () => {
 
         assert.strictEqual(journalInterrupts(driver), 0)
       }).pipe(Effect.provide(layer), Effect.scoped)
-    }))
+    }), { concurrent: false })
 
   it.effect("treats node shutdown interrupts as transient via isShutdown", () =>
     Effect.gen(function*() {
@@ -1969,6 +2554,27 @@ const otherRunner = Runner.make({
   weight: 1
 })
 
+class RegistrationContext extends Context.Service<RegistrationContext, string>()(
+  "effect/test/cluster/RegistrationContext"
+) {}
+
+const RegistrationContextEntity = Entity.make("RegistrationContextEntity", [
+  Rpc.make("Read", { success: Schema.String }).annotate(ClusterSchema.Persisted, false)
+])
+
+const MissingRegistrationEntity = Entity.make("MissingRegistrationEntity", [
+  Rpc.make("Call").annotate(ClusterSchema.Persisted, false)
+])
+
+const FirstRegistrationEntity = Entity.make("FirstRegistrationEntity", [
+  Rpc.make("Call").annotate(ClusterSchema.Persisted, false)
+])
+
+const RegistrationContextHandlers = Effect.map(
+  RegistrationContext,
+  (value) => RegistrationContextEntity.of({ Read: () => Effect.succeed(value) })
+)
+
 const testConfigDefaults: Partial<ShardingConfig.ShardingConfig["Service"]> = {
   entityMailboxCapacity: 10,
   entityTerminationTimeout: 0,
@@ -2021,6 +2627,19 @@ const CappedSharding = (
   )
 }
 
+const UnregisteredSharding = (
+  config: Partial<ShardingConfig.ShardingConfig["Service"]>
+) => {
+  const configLayer = ShardingConfig.layer({ ...testConfigDefaults, ...config })
+  return Sharding.layer.pipe(
+    Layer.provide(RunnerStorage.layerMemory),
+    Layer.provide(RunnerHealth.layerNoop),
+    Layer.provide(Runners.layerNoop),
+    Layer.provideMerge(MessageStorage.layerMemory),
+    Layer.provide(configLayer)
+  )
+}
+
 const ContextBleedSharding = ContextBleedLayer.pipe(Layer.provideMerge(TestSharding))
 
 const ActiveTeardownSharding = (
diff --git a/repos/effect/packages/effect/test/reactivity/Atom.test.ts b/repos/effect/packages/effect/test/reactivity/Atom.test.ts
index 41eebcff1..9ccf1bdc3 100644
--- a/repos/effect/packages/effect/test/reactivity/Atom.test.ts
+++ b/repos/effect/packages/effect/test/reactivity/Atom.test.ts
@@ -16,13 +16,13 @@ import {
 } from "effect"
 import { TestClock } from "effect/testing"
 import { KeyValueStore } from "effect/unstable/persistence"
-import { AsyncResult, Atom, AtomRegistry, Hydration } from "effect/unstable/reactivity"
+import { AsyncResult, Atom, AtomRegistry, Hydration, Reactivity } from "effect/unstable/reactivity"
 
 declare const global: any
 
 addEqualityTesters()
 
-describe.sequential("Atom", () => {
+describe("Atom", { concurrent: false }, () => {
   beforeEach(async () => {
     vitest.useFakeTimers({
       toFake: [
@@ -1251,6 +1251,20 @@ describe.sequential("Atom", () => {
     assert.deepEqual(r.get(count), AsyncResult.success(1))
   })
 
+  it("withFallback forwards writes to the primary atom", () => {
+    const primary = Atom.make<AsyncResult.AsyncResult<number>>(AsyncResult.success(1))
+    const fallback = AsyncResult.success(2)
+    const atom = Atom.withFallback(primary, Atom.make(fallback))
+    const r = AtomRegistry.make()
+
+    r.set(atom, AsyncResult.initial())
+
+    assert.deepEqual([r.get(primary), r.get(atom)], [
+      AsyncResult.initial(),
+      AsyncResult.waiting(fallback)
+    ])
+  })
+
   it("failure with previousSuccess", async () => {
     const count = Atom.fn((i: number) => i === 1 ? Effect.fail("fail") : Effect.succeed(i))
     const r = AtomRegistry.make()
@@ -2433,6 +2447,13 @@ describe.sequential("Atom", () => {
   })
 
   describe("Reactivity", () => {
+    it.effect("cleans up queries with duplicate keys", () =>
+      Effect.gen(function*() {
+        const reactivity = yield* Reactivity.make
+        const results = yield* reactivity.query(["todos", "todos"], Effect.succeed(42))
+        assert.strictEqual(yield* Queue.take(results), 42)
+      }).pipe(Effect.scoped))
+
     it("does not broadcast mutations across registries", () => {
       let reads = 0
       const query = Atom.make(() => ++reads).pipe(
diff --git a/repos/effect/packages/effect/test/reactivity/AtomHttpApi.test.ts b/repos/effect/packages/effect/test/reactivity/AtomHttpApi.test.ts
index b300a6f61..6758ea35c 100644
--- a/repos/effect/packages/effect/test/reactivity/AtomHttpApi.test.ts
+++ b/repos/effect/packages/effect/test/reactivity/AtomHttpApi.test.ts
@@ -1,8 +1,9 @@
 import { assert, describe, it } from "@effect/vitest"
-import { Effect, Layer, Ref, Schema } from "effect"
+import { Duration, Effect, Exit, Layer, Ref, Schema, Stream } from "effect"
+import { Sse } from "effect/unstable/encoding"
 import { HttpClient, HttpClientResponse } from "effect/unstable/http"
 import type * as HttpClientError from "effect/unstable/http/HttpClientError"
-import { HttpApi, HttpApiEndpoint, HttpApiGroup } from "effect/unstable/httpapi"
+import { HttpApi, HttpApiEndpoint, HttpApiGroup, HttpApiSchema } from "effect/unstable/httpapi"
 import { Atom, AtomHttpApi, AtomRegistry, Hydration } from "effect/unstable/reactivity"
 
 const Api = HttpApi.make("api").add(
@@ -18,7 +19,91 @@ const Api = HttpApi.make("api").add(
   )
 )
 
+const TopLevelApi = HttpApi.make("top-level-api").add(
+  HttpApiGroup.make("group", { topLevel: true }).add(
+    HttpApiEndpoint.get("query", "/query"),
+    HttpApiEndpoint.post("mutation", "/mutation")
+  )
+)
+
+const StreamApi = HttpApi.make("StreamApi").add(
+  HttpApiGroup.make("events").add(
+    HttpApiEndpoint.get("watch", "/watch", { success: HttpApiSchema.StreamSse({ data: Schema.String }) })
+  )
+)
+
 describe("AtomHttpApi", () => {
+  it.effect("query keeps SSE decode options in the cache key and forwards them", () =>
+    Effect.gen(function*() {
+      const Client = makeStreamingClient()
+      const registry = AtomRegistry.make()
+      yield* Effect.addFinalizer(() => Effect.sync(() => registry.dispose()))
+      const limited = Client.query("group", "events", { sseOptions: { maxEventSize: 4 } })
+      const defaults = Client.query("group", "events", {})
+      assert.notStrictEqual(limited, defaults)
+      assert.strictEqual(limited, Client.query("group", "events", { sseOptions: { maxEventSize: 4 } }))
+
+      const limitedStream = yield* AtomRegistry.getResult(registry, limited)
+      const defaultStream = yield* AtomRegistry.getResult(registry, defaults)
+      const [error, values] = yield* Effect.all([
+        limitedStream.pipe(Stream.runCollect, Effect.flip),
+        Stream.runCollect(defaultStream)
+      ], { concurrency: "unbounded" })
+
+      assertEventTooLarge(error)
+      assert.deepStrictEqual(values, ["hello"])
+    }).pipe(Effect.scoped))
+
+  it.effect("mutation forwards SSE decode options independently for each call", () =>
+    Effect.gen(function*() {
+      const Client = makeStreamingClient()
+      const registry = AtomRegistry.make()
+      yield* Effect.addFinalizer(() => Effect.sync(() => registry.dispose()))
+      const mutation = Client.mutation("group", "events", { responseMode: "decoded-only" })
+      yield* AtomRegistry.mount(registry, mutation)
+
+      registry.set(mutation, { sseOptions: { maxEventSize: 4 } })
+      const limitedStream = yield* AtomRegistry.getResult(registry, mutation, { suspendOnWaiting: true })
+      const error = yield* limitedStream.pipe(Stream.runCollect, Effect.flip)
+      assertEventTooLarge(error)
+
+      registry.set(mutation, {})
+      const defaultStream = yield* AtomRegistry.getResult(registry, mutation, { suspendOnWaiting: true })
+      assert.deepStrictEqual(yield* Stream.runCollect(defaultStream), ["hello"])
+    }).pipe(Effect.scoped))
+
+  it.effect("dispatches queries and mutations for top-level groups", () =>
+    Effect.gen(function*() {
+      const requests: Array<string> = []
+      const httpClient = HttpClient.makeWith(
+        Effect.fnUntraced(function*(requestEffect) {
+          const request = yield* requestEffect
+          requests.push(request.url)
+          return HttpClientResponse.fromWeb(request, new Response(null, { status: 204 }))
+        }),
+        Effect.succeed as HttpClient.HttpClient.Preprocess<HttpClientError.HttpClientError, never>
+      )
+      const Client = AtomHttpApi.Service()("TopLevelClient", {
+        api: TopLevelApi,
+        httpClient: Layer.succeed(HttpClient.HttpClient, httpClient)
+      })
+      const registry = AtomRegistry.make()
+      const query = Client.query("group", "query", {})
+      const mutation = Client.mutation("group", "mutation")
+
+      yield* AtomRegistry.mount(registry, query)
+      yield* AtomRegistry.mount(registry, mutation)
+      registry.set(mutation, {})
+
+      const queryExit = yield* Effect.exit(AtomRegistry.getResult(registry, query, { suspendOnWaiting: true }))
+      const mutationExit = yield* Effect.exit(AtomRegistry.getResult(registry, mutation, { suspendOnWaiting: true }))
+
+      assert.deepStrictEqual(
+        { mutation: mutationExit, query: queryExit, requests },
+        { mutation: Exit.succeed(undefined), query: Exit.succeed(undefined), requests: ["/query", "/mutation"] }
+      )
+    }).pipe(Effect.scoped))
+
   it.effect("query creates a serializable atom with reactivity and retention that encodes the request", () =>
     Effect.gen(function*() {
       const requestRef = yield* Ref.make<
@@ -63,6 +148,14 @@ describe("AtomHttpApi", () => {
           serializable: true
         }
       )
+      assert.strictEqual(
+        Client.query("group", "get", { params: { id: 2 }, query: { page: 3 }, timeToLive: 0 }).idleTTL,
+        0
+      )
+      assert.strictEqual(
+        Client.query("group", "get", { params: { id: 3 }, query: { page: 4 }, timeToLive: 0n }).idleTTL,
+        0
+      )
       const keepAliveAtom = Client.query("group", "get", {
         params: { id: 2 },
         query: { page: 3 },
@@ -114,4 +207,70 @@ describe("AtomHttpApi", () => {
 
       unmount()
     }))
+
+  it.effect("returns generated SSE stream failures from queries", () =>
+    Effect.gen(function*() {
+      const Client = AtomHttpApi.Service()("StreamClient", {
+        api: StreamApi,
+        baseUrl: "https://example.test",
+        httpClient: Layer.succeed(
+          HttpClient.HttpClient,
+          HttpClient.make((request) =>
+            Effect.succeed(HttpClientResponse.fromWeb(
+              request,
+              new Response("retry: 1000\n\n", {
+                headers: { "content-type": "text/event-stream" }
+              })
+            ))
+          )
+        )
+      })
+      const registry = AtomRegistry.make()
+      const atom = Client.query("events", "watch", {})
+      yield* AtomRegistry.mount(registry, atom)
+      const stream = yield* AtomRegistry.getResult(registry, atom)
+      const error = yield* Effect.flip(Stream.runCollect(stream))
+
+      assert.deepStrictEqual(
+        error,
+        new Sse.Retry({ duration: Duration.millis(1000), lastEventId: undefined })
+      )
+    }).pipe(Effect.scoped))
 })
+
+const makeStreamingClient = () =>
+  AtomHttpApi.Service()("StreamingClient", {
+    baseUrl: "http://test",
+    api: HttpApi.make("StreamingApi").add(
+      HttpApiGroup.make("group").add(
+        HttpApiEndpoint.get("events", "/events", {
+          success: HttpApiSchema.StreamSse({ data: Schema.String })
+        })
+      )
+    ),
+    httpClient: Layer.succeed(
+      HttpClient.HttpClient,
+      HttpClient.make((request) =>
+        Effect.succeed(HttpClientResponse.fromWeb(
+          request,
+          new Response(
+            new ReadableStream<Uint8Array>({
+              start(controller) {
+                const encoder = new TextEncoder()
+                controller.enqueue(encoder.encode("data: "))
+                controller.enqueue(encoder.encode("\"hello\"\n\n"))
+                controller.close()
+              }
+            }),
+            { headers: { "content-type": "text/event-stream" } }
+          )
+        ))
+      )
+    )
+  })
+
+const assertEventTooLarge = (error: unknown) => {
+  assert.instanceOf(error, Sse.SseError)
+  assert.instanceOf(error.reason, Sse.EventTooLarge)
+  assert.strictEqual(error.reason.maxEventSize, 4)
+}
diff --git a/repos/effect/packages/effect/test/reactivity/AtomRpc.test.ts b/repos/effect/packages/effect/test/reactivity/AtomRpc.test.ts
index f74d31358..1f2852e54 100644
--- a/repos/effect/packages/effect/test/reactivity/AtomRpc.test.ts
+++ b/repos/effect/packages/effect/test/reactivity/AtomRpc.test.ts
@@ -1,7 +1,14 @@
-import { assert, describe, it } from "@effect/vitest"
-import { Effect, Layer, Schema } from "effect"
-import { Atom, AtomRegistry, AtomRpc, Hydration } from "effect/unstable/reactivity"
-import { Rpc, RpcGroup } from "effect/unstable/rpc"
+import { assert, describe, expectTypeOf, it } from "@effect/vitest"
+import { type Cause, Deferred, Effect, Layer, Schema } from "effect"
+import { AsyncResult, Atom, AtomRegistry, AtomRpc, Hydration } from "effect/unstable/reactivity"
+import {
+  Rpc,
+  RpcClient,
+  type RpcClientError,
+  RpcGroup,
+  RpcMiddleware,
+  type RpcSerialization
+} from "effect/unstable/rpc"
 
 const Group = RpcGroup.make(
   Rpc.make("getUser", {
@@ -15,7 +22,63 @@ const Group = RpcGroup.make(
   })
 )
 
+class ClientFailure extends Schema.Error<ClientFailure>("ClientFailure")({
+  _tag: Schema.tag("ClientFailure")
+}) {}
+
+class ClientMiddleware extends RpcMiddleware.Service<ClientMiddleware, {
+  clientError: ClientFailure
+}>()("ClientMiddleware", {
+  requiredForClient: true
+}) {}
+
+const ClientMiddlewareGroup = RpcGroup.make(
+  Rpc.make("getUser", {
+    success: Schema.String
+  }).middleware(ClientMiddleware),
+  Rpc.make("stream", {
+    success: Schema.String,
+    stream: true
+  }).middleware(ClientMiddleware)
+)
+
+const makeClientMiddlewareProtocol = (
+  middleware: RpcMiddleware.RpcMiddlewareClient<never, ClientFailure, never>
+) =>
+  Layer.mergeAll(
+    Layer.effect(
+      RpcClient.Protocol,
+      RpcClient.Protocol.make(() =>
+        Effect.succeed({
+          send: () => Effect.die("unexpected request"),
+          supportsAck: false,
+          supportsTransferables: false,
+          codecFor: Schema.toCodecJson as RpcSerialization.CodecFor
+        })
+      )
+    ),
+    RpcMiddleware.layerClient(ClientMiddleware, middleware)
+  )
+
 describe("AtomRpc", () => {
+  it("includes client middleware errors in atom failure types", () => {
+    const Client = AtomRpc.Service()("MiddlewareClient", {
+      group: ClientMiddlewareGroup,
+      protocol: Layer.empty,
+      makeEffect: Effect.die("unused")
+    })
+
+    const mutation = Client.mutation("getUser")
+    const query = Client.query("getUser", undefined)
+    const stream = Client.query("stream", undefined)
+
+    expectTypeOf<Atom.Failure<typeof mutation>>().toEqualTypeOf<RpcClientError.RpcClientError | ClientFailure>()
+    expectTypeOf<Atom.Failure<typeof query>>().toEqualTypeOf<RpcClientError.RpcClientError | ClientFailure>()
+    expectTypeOf<Atom.Failure<typeof stream>>().toEqualTypeOf<
+      RpcClientError.RpcClientError | ClientFailure | Cause.NoSuchElementError
+    >()
+  })
+
   it.effect("query creates a serializable atom with reactivity and retention", () =>
     Effect.gen(function*() {
       const Client = AtomRpc.Service()("Client", {
@@ -53,6 +116,8 @@ describe("AtomRpc", () => {
           serializable: true
         }
       )
+      assert.strictEqual(Client.query("getUser", { id: 2 }, { timeToLive: 0 }).idleTTL, 0)
+      assert.strictEqual(Client.query("getUser", { id: 3 }, { timeToLive: 0n }).idleTTL, 0)
       const keepAliveAtom = Client.query("getUser", { id: 2 }, {
         reactivityKeys: ["users"],
         timeToLive: "Infinity",
@@ -96,4 +161,75 @@ describe("AtomRpc", () => {
 
       unmount()
     }))
+
+  it.effect("dehydrates the rest of the registry when client middleware fails", () =>
+    Effect.gen(function*() {
+      const Client = AtomRpc.Service()("ClientWithMiddleware", {
+        group: ClientMiddlewareGroup,
+        protocol: makeClientMiddlewareProtocol(() => Effect.fail(new ClientFailure({})))
+      })
+      const failedAtom = Client.query("getUser", undefined, {
+        serializationKey: "failed"
+      })
+      const unaffectedAtom = Atom.make(42).pipe(
+        Atom.serializable({
+          key: "unaffected",
+          schema: Schema.Number
+        })
+      )
+      const registry = AtomRegistry.make()
+      const unmountFailed = registry.mount(failedAtom)
+      const unmountUnaffected = registry.mount(unaffectedAtom)
+      yield* Effect.yieldNow
+      yield* Effect.yieldNow
+
+      assert(AsyncResult.isFailure(registry.get(failedAtom)))
+      const dehydrated = Hydration.toValues(Hydration.dehydrate(registry))
+      assert.isUndefined(dehydrated.find((entry) => entry.key === "AtomRpc:getUser:failed"))
+      assert.strictEqual(dehydrated.find((entry) => entry.key === "unaffected")?.value, 42)
+
+      unmountUnaffected()
+      unmountFailed()
+    }))
+
+  it.effect("settles promise dehydration when client middleware later fails", () =>
+    Effect.gen(function*() {
+      const failMiddleware = yield* Deferred.make<void>()
+      const Client = AtomRpc.Service()("ClientWithDeferredMiddleware", {
+        group: ClientMiddlewareGroup,
+        protocol: makeClientMiddlewareProtocol(() =>
+          Deferred.await(failMiddleware).pipe(
+            Effect.andThen(Effect.fail(new ClientFailure({})))
+          )
+        )
+      })
+      const failedAtom = Client.query("getUser", undefined, {
+        serializationKey: "deferred-failure"
+      })
+      const registry = AtomRegistry.make()
+      const unmountFailed = registry.mount(failedAtom)
+
+      assert(AsyncResult.isInitial(registry.get(failedAtom)))
+      const dehydrated = Hydration.toValues(Hydration.dehydrate(registry, {
+        encodeInitialAs: "promise"
+      }))
+      const resultPromise = dehydrated.find((entry) => entry.key === "AtomRpc:getUser:deferred-failure")
+        ?.resultPromise
+      assert.isDefined(resultPromise)
+
+      let notifications = 0
+      const unsubscribe = registry.subscribe(failedAtom, () => notifications++)
+      const hydratedRegistry = AtomRegistry.make()
+      Hydration.hydrate(hydratedRegistry, dehydrated)
+
+      yield* Deferred.succeed(failMiddleware, undefined)
+      yield* Effect.promise(() => resultPromise).pipe(Effect.timeout("1 second"))
+
+      assert.strictEqual(notifications, 1)
+      const unmountHydrated = hydratedRegistry.mount(failedAtom)
+
+      unmountHydrated()
+      unsubscribe()
+      unmountFailed()
+    }))
 })
diff --git a/repos/effect/packages/effect/test/rpc/RpcClient.test.ts b/repos/effect/packages/effect/test/rpc/RpcClient.test.ts
index 20393d936..12d11186d 100644
--- a/repos/effect/packages/effect/test/rpc/RpcClient.test.ts
+++ b/repos/effect/packages/effect/test/rpc/RpcClient.test.ts
@@ -1,5 +1,5 @@
 import { assert, describe, it } from "@effect/vitest"
-import { Cause, Deferred, Effect, Fiber, Layer, Schedule, Schema, Stream } from "effect"
+import { Cause, Deferred, Effect, Exit, Fiber, Layer, Queue, Schedule, Schema, Stream } from "effect"
 import { TestClock } from "effect/testing"
 import * as HttpClient from "effect/unstable/http/HttpClient"
 import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse"
@@ -62,6 +62,26 @@ const assertEmptyResponseFailsRequest = (
   })
 
 describe("RpcClient", () => {
+  for (const consumer of ["queue", "stream"] as const) {
+    it.effect(`releases the ${consumer} consumer when the request write is interrupted`, () =>
+      Effect.gen(function*() {
+        const writing = yield* Deferred.make<Fiber.Fiber<unknown, unknown>>()
+        const { client } = yield* RpcClient.makeNoSerialization(TestGroup, {
+          onFromClient: ({ message }) =>
+            message._tag === "Request"
+              ? Effect.withFiber((fiber) => Deferred.succeed(writing, fiber).pipe(Effect.andThen(Effect.never)))
+              : Effect.void
+        })
+        const reader = yield* (consumer === "queue"
+          ? client.Events(undefined, { asQueue: true }).pipe(Effect.flatMap(Queue.take), Effect.asVoid)
+          : Stream.runDrain(client.Events())).pipe(Effect.forkChild)
+        const writer = yield* Deferred.await(writing)
+        yield* Fiber.interrupt(writer)
+        const readExit = yield* Fiber.await(reader)
+        assert(Exit.isFailure(readExit) && Cause.hasInterruptsOnly(readExit.cause))
+      }))
+  }
+
   it.effect("releases a worker pool slot when the worker run fails", () =>
     Effect.gen(function*() {
       const runFailure = yield* Deferred.make<never, WorkerError>()
diff --git a/repos/effect/packages/effect/test/rpc/RpcSerialization.test.ts b/repos/effect/packages/effect/test/rpc/RpcSerialization.test.ts
index f6e99aa77..a2305399b 100644
--- a/repos/effect/packages/effect/test/rpc/RpcSerialization.test.ts
+++ b/repos/effect/packages/effect/test/rpc/RpcSerialization.test.ts
@@ -160,7 +160,67 @@ const uvarint = (value: number): Uint8Array => {
 }
 
 describe("RpcSerialization", () => {
-  describe.sequential("jsonRpc inherited properties", () => {
+  for (
+    const [name, serialization] of [
+      ["jsonRpc", RpcSerialization.jsonRpc()],
+      ["ndJsonRpc", RpcSerialization.ndJsonRpc()]
+    ] as const
+  ) {
+    describe(`${name} cause roundtrips`, () => {
+      const failure = { _tag: "Fail", error: { code: -32021, message: "Missing capability" } } as const
+      const defect = { _tag: "Die", defect: { message: "boom" } } as const
+      const interrupt = { _tag: "Interrupt", fiberId: 42 } as const
+
+      it.each(
+        [
+          ["typed failure", [failure]],
+          ["defect", [defect]],
+          ["interruption", [interrupt]],
+          ["mixed causes", [failure, defect, interrupt]],
+          ["empty cause", []]
+        ] as const
+      )("preserves %s", (_name, cause) => {
+        const response: RpcMessage.ResponseExitEncoded = {
+          _tag: "Exit",
+          requestId: 1,
+          exit: { _tag: "Failure", cause }
+        }
+        const encoded = serialization.makeUnsafe().encode(response)
+        assert.isDefined(encoded)
+        assert.deepStrictEqual(serialization.makeUnsafe().decode(encoded!), [response])
+      })
+
+      it("preserves a protocol defect", () => {
+        const response: RpcMessage.ResponseDefectEncoded = {
+          _tag: "Defect",
+          defect: { message: "protocol failed" }
+        }
+        const encoded = serialization.makeUnsafe().encode(response)
+        assert.isDefined(encoded)
+        assert.deepStrictEqual(serialization.makeUnsafe().decode(encoded!), [response])
+      })
+    })
+  }
+
+  it.each(
+    [
+      ["Ack", 0],
+      ["Ack", ""],
+      ["Interrupt", 0],
+      ["Interrupt", ""]
+    ] as const
+  )("jsonRpc preserves %s requestId %j", (_tag, requestId) => {
+    const parser = RpcSerialization.jsonRpc().makeUnsafe()
+    const encoded = JSON.stringify({
+      jsonrpc: "2.0",
+      method: `@effect/rpc/${_tag}`,
+      params: { requestId }
+    })
+
+    assert.deepStrictEqual(parser.decode(encoded), [{ _tag, requestId }])
+  })
+
+  describe("jsonRpc inherited properties", { concurrent: false }, () => {
     afterEach(() => {
       delete objectPrototype["method"]
       delete objectPrototype["error"]
@@ -361,6 +421,27 @@ describe("RpcSerialization", () => {
     )
   })
 
+  it("jsonRpc decodes standard error objects as typed failures", () => {
+    const parser = RpcSerialization.jsonRpc().makeUnsafe()
+    const error = { code: -32021, message: "Missing capability", data: { requiredCapabilities: {} } }
+
+    assert.deepStrictEqual(
+      parser.decode(JSON.stringify({
+        jsonrpc: "2.0",
+        id: 1,
+        error
+      })),
+      [{
+        _tag: "Exit",
+        requestId: 1,
+        exit: {
+          _tag: "Failure",
+          cause: [{ _tag: "Fail", error }]
+        }
+      }]
+    )
+  })
+
   it("jsonRpc encodes a notification without an id", () => {
     const parser = RpcSerialization.jsonRpc().makeUnsafe()
     const decoded = parser.decode("{\"jsonrpc\":\"2.0\",\"method\":\"notifications/message\"}")
diff --git a/repos/effect/packages/effect/test/rpc/RpcServer.test.ts b/repos/effect/packages/effect/test/rpc/RpcServer.test.ts
index ed1dd03e2..ef6bb8b20 100644
--- a/repos/effect/packages/effect/test/rpc/RpcServer.test.ts
+++ b/repos/effect/packages/effect/test/rpc/RpcServer.test.ts
@@ -1,7 +1,9 @@
 import { assert, describe, it } from "@effect/vitest"
-import { Deferred, Effect, Layer, Schema, Stream } from "effect"
-import { HttpRouter } from "effect/unstable/http"
+import { Deferred, Effect, Exit, Fiber, Layer, Queue, Ref, Schema, Scope, Sink, Stdio, Stream } from "effect"
+import { Headers, HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/unstable/http"
+import * as NetAddress from "effect/unstable/net/NetAddress"
 import { Rpc, RpcGroup, RpcSerialization, RpcServer } from "effect/unstable/rpc"
+import * as RpcMessage from "effect/unstable/rpc/RpcMessage"
 import { Socket, SocketServer } from "effect/unstable/socket"
 
 const producedWithoutReadingFramedBody = Effect.fnUntraced(function*(
@@ -46,6 +48,189 @@ const producedWithoutReadingFramedBody = Effect.fnUntraced(function*(
 })
 
 describe("RpcServer", () => {
+  it.effect("should accept only cancellation of an active request when client input has ended", () =>
+    Effect.gen(function*() {
+      const entered = yield* Deferred.make<void>()
+      const interrupted = yield* Deferred.make<void>()
+      const releaseOther = yield* Deferred.make<void>()
+      const group = RpcGroup.make(Rpc.make("wait", {
+        payload: { block: Schema.Boolean },
+        success: Schema.String
+      }))
+      const messages = yield* Queue.unbounded<RpcMessage.FromServer<RpcGroup.Rpcs<typeof group>>>()
+      const server = yield* RpcServer.makeNoSerialization(group, {
+        onFromServer: (message) => Queue.offer(messages, message).pipe(Effect.asVoid)
+      }).pipe(Effect.provide(group.toLayerHandler("wait", ({ block }) =>
+        block
+          ? Deferred.succeed(entered, void 0).pipe(
+            Effect.andThen(Effect.never),
+            Effect.onInterrupt(() => Deferred.succeed(interrupted, void 0))
+          )
+          : Deferred.await(releaseOther).pipe(Effect.as("kept")))))
+      const request = {
+        _tag: "Request" as const,
+        id: RpcMessage.RequestId("same"),
+        tag: "wait" as const,
+        payload: { block: true },
+        headers: Headers.empty
+      }
+      yield* server.write(1, request)
+      yield* server.write(2, { ...request, payload: { block: false } })
+      yield* Deferred.await(entered)
+      yield* server.write(1, RpcMessage.constEof)
+      yield* server.write(2, RpcMessage.constEof)
+      for (
+        const message of [
+          { ...request, id: RpcMessage.RequestId("new") },
+          { _tag: "Ack" as const, requestId: request.id },
+          RpcMessage.constEof,
+          { _tag: "Interrupt" as const, requestId: RpcMessage.RequestId("unknown"), interruptors: [] }
+        ]
+      ) {
+        assert(Exit.isFailure(yield* Effect.exit(server.write(1, message))))
+      }
+      assert(Exit.isSuccess(
+        yield* Effect.exit(server.write(1, {
+          _tag: "Interrupt",
+          requestId: request.id,
+          interruptors: []
+        }))
+      ))
+      yield* Deferred.await(interrupted)
+      const cancelled = yield* Queue.take(messages)
+      assert.strictEqual(cancelled._tag, "Exit")
+      assert.strictEqual(cancelled.clientId, 1)
+      if (cancelled._tag === "Exit") assert(Exit.isFailure(cancelled.exit))
+      assert.deepStrictEqual(yield* Queue.take(messages), { _tag: "ClientEnd", clientId: 1 })
+      yield* Deferred.succeed(releaseOther, void 0)
+      assert.deepStrictEqual(yield* Queue.take(messages), {
+        _tag: "Exit",
+        clientId: 2,
+        requestId: request.id,
+        exit: Exit.succeed("kept")
+      })
+      assert.deepStrictEqual(yield* Queue.take(messages), { _tag: "ClientEnd", clientId: 2 })
+    }))
+
+  it.effect("should backpressure STDIO sends when the output buffer is full", () =>
+    Effect.gen(function*() {
+      const protocolReady = yield* Deferred.make<RpcServer.Protocol["Service"]>()
+      const firstWriteStarted = yield* Deferred.make<void>()
+      const releaseFirstWrite = yield* Deferred.make<void>()
+      const overflowSendCompleted = yield* Deferred.make<void>()
+      const writes = yield* Ref.make(0)
+      const stdio = Stdio.layerTest({
+        stdin: Stream.never,
+        stdout: () =>
+          Sink.forEach(() =>
+            Ref.getAndUpdate(writes, (count) => count + 1).pipe(
+              Effect.flatMap((index) =>
+                index === 0
+                  ? Deferred.succeed(firstWriteStarted, undefined).pipe(
+                    Effect.andThen(Deferred.await(releaseFirstWrite))
+                  )
+                  : Effect.void
+              )
+            )
+          )
+      })
+      yield* Effect.gen(function*() {
+        const protocol = yield* RpcServer.makeProtocolStdio
+        yield* Deferred.succeed(protocolReady, protocol)
+        return yield* protocol.run(() => Effect.void)
+      }).pipe(
+        Effect.provide(stdio),
+        Effect.provide(RpcSerialization.layerJsonRpc()),
+        Effect.forkScoped
+      )
+      const protocol = yield* Deferred.await(protocolReady)
+
+      const first = yield* protocol.send(0, { _tag: "Pong" }).pipe(Effect.forkScoped)
+      yield* Deferred.await(firstWriteStarted)
+      for (let i = 0; i < 8; i++) {
+        yield* protocol.send(0, { _tag: "Pong" })
+      }
+      const overflow = yield* protocol.send(0, { _tag: "Pong" }).pipe(
+        Effect.andThen(Deferred.succeed(overflowSendCompleted, undefined)),
+        Effect.forkScoped
+      )
+      yield* Effect.yieldNow
+      assert.strictEqual(yield* Ref.get(writes), 1)
+      assert.isFalse(yield* Deferred.isDone(overflowSendCompleted))
+
+      yield* Deferred.succeed(releaseFirstWrite, undefined)
+      yield* Fiber.join(first)
+      yield* Fiber.join(overflow)
+      assert.strictEqual(yield* Ref.get(writes), 10)
+    }))
+
+  it.effect("should continue sending to other clients when a backpressured HTTP client disconnects", () =>
+    Effect.gen(function*() {
+      const { httpEffect, protocol } = yield* RpcServer.makeProtocolWithHttpEffect({ streamBufferSize: 1 }).pipe(
+        Effect.provide(RpcSerialization.layerNdjson)
+      )
+      const connected = yield* Queue.unbounded<number>()
+      const interrupted = yield* Queue.unbounded<RpcMessage.FromClientEncoded>()
+      yield* protocol.run((clientId, message) => {
+        if (message._tag === "Request") {
+          return Queue.offer(connected, clientId).pipe(
+            Effect.andThen(protocol.send(clientId, { _tag: "Pong" }))
+          )
+        }
+        return message._tag === "Interrupt" ? Queue.offer(interrupted, message) : Effect.void
+      }).pipe(Effect.forkScoped)
+
+      const scope = yield* Scope.Scope
+      const firstScope = yield* Scope.fork(scope)
+      const request = HttpServerRequest.fromWeb(
+        new Request("http://test/rpc", {
+          method: "POST",
+          body: `{"_tag":"Request","id":1,"tag":"events","payload":{},"headers":[]}\n`
+        })
+      )
+      yield* httpEffect.pipe(
+        Effect.provideService(HttpServerRequest.HttpServerRequest, request),
+        Effect.provideService(Scope.Scope, firstScope)
+      )
+      const firstId = yield* Queue.take(connected)
+      const response = yield* httpEffect.pipe(
+        Effect.provideService(
+          HttpServerRequest.HttpServerRequest,
+          HttpServerRequest.fromWeb(
+            new Request(
+              "http://test/rpc",
+              { method: "POST", body: `{"_tag":"Request","id":2,"tag":"events","payload":{},"headers":[]}\n` }
+            )
+          )
+        )
+      )
+      const secondId = yield* Queue.take(connected)
+      yield* protocol.send(firstId, { _tag: "Pong" })
+      const delivered = yield* Deferred.make<void>()
+      const sender = yield* protocol.send(firstId, { _tag: "Pong" }).pipe(
+        Effect.andThen(protocol.send(secondId, { _tag: "Pong" })),
+        Effect.andThen(Deferred.succeed(delivered, undefined)),
+        Effect.forkScoped
+      )
+      yield* Effect.yieldNow
+      assert.isFalse(yield* Deferred.isDone(delivered))
+
+      yield* Scope.close(firstScope, Exit.void)
+      yield* Effect.yieldNow
+      assert.isTrue(yield* Deferred.isDone(delivered))
+      yield* Fiber.join(sender)
+      assert.deepStrictEqual(yield* Queue.take(interrupted), {
+        _tag: "Interrupt",
+        requestId: RpcMessage.RequestId(1)
+      })
+      yield* protocol.end(secondId)
+      const body = yield* Effect.promise(() => HttpServerResponse.toWeb(response).text())
+      assert.deepStrictEqual(body.trim().split("\n").map((line) => JSON.parse(line)), [
+        { _tag: "Pong" },
+        { _tag: "Pong" }
+      ])
+    }))
+
   it.effect("applies backpressure to framed HTTP responses by default", () =>
     Effect.gen(function*() {
       const produced = yield* producedWithoutReadingFramedBody()
@@ -152,11 +337,7 @@ describe("RpcServer", () => {
         })
       })
       const socketServer = SocketServer.SocketServer.of({
-        address: {
-          _tag: "TcpAddress",
-          hostname: "localhost",
-          port: 0
-        },
+        address: NetAddress.inetAddressFromStringUnsafe("127.0.0.1:0"),
         run: (handler) => handler(socket).pipe(Effect.orDie, Effect.andThen(Effect.never))
       })
 
diff --git a/repos/effect/packages/effect/test/schema/Schema.test.ts b/repos/effect/packages/effect/test/schema/Schema.test.ts
index dde3c3d71..1d2948119 100644
--- a/repos/effect/packages/effect/test/schema/Schema.test.ts
+++ b/repos/effect/packages/effect/test/schema/Schema.test.ts
@@ -1,4 +1,4 @@
-import { describe, it } from "@effect/vitest"
+import { assert, describe, it } from "@effect/vitest"
 import {
   BigDecimal,
   Brand,
@@ -127,8 +127,8 @@ describe("Schema", () => {
     })
   })
 
-  describe("parseOptions annotation", () => {
-    it("Number", async () => {
+  describe("parse options", () => {
+    it("does not interpret custom parseOptions metadata", async () => {
       const schema = Schema.Number.check(Schema.isGreaterThan(0), Schema.isInt()).annotate({
         parseOptions: { errors: "all" }
       })
@@ -137,12 +137,11 @@ describe("Schema", () => {
       const decoding = asserts.decoding()
       await decoding.fail(
         -1.2,
-        `Expected a value greater than 0
-Expected an integer`
+        "Expected a value greater than 0"
       )
     })
 
-    it("Struct", async () => {
+    it("applies errors to nested schemas without annotation overrides", async () => {
       const schema = Schema.Struct({
         a: Schema.String,
         b: Schema.Struct({
@@ -156,18 +155,19 @@ Expected an integer`
       await decoding.fail(
         { a: "a", b: {} },
         `Missing key
-  at ["b"]["c"]`
+  at ["b"]["c"]
+Missing key
+  at ["b"]["d"]`
       )
     })
 
-    it("should not read parseOptions from encodingChecks", async () => {
+    it("applies errors with encoding checks", async () => {
       const schema = Schema.Struct({
         a: Schema.String,
         b: Schema.String
       }).pipe(
         Schema.flip,
         Schema.check(Schema.isMaxProperties(1)),
-        Schema.annotate({ parseOptions: { errors: "first" } }),
         Schema.flip
       )
       assertTrue(SchemaAST.isObjects(schema.ast))
@@ -184,9 +184,6 @@ Missing key
   at ["b"]`
       )
     })
-  })
-
-  describe("parse options", () => {
     it("decoders can receive options when they are created", () => {
       const schema = Schema.Struct({
         a: Schema.String
@@ -196,9 +193,10 @@ Missing key
       const failure = decode({ a: "a", b: "b" })
       assertTrue(Exit.isFailure(failure))
 
-      const success = decode({ a: "a", b: "b" }, { onExcessProperty: "preserve" })
+      const success = decode({ a: "a", b: "b" }, { onExcessProperty: "ignore" })
       assertTrue(Exit.isSuccess(success))
-      deepStrictEqual(success.value, { a: "a", b: "b" })
+      deepStrictEqual(success.value, { a: "a" })
+      assertTrue(Exit.isFailure(decode({ a: "a", b: "b" })))
     })
 
     it("encoders can receive options when they are created", () => {
@@ -210,9 +208,10 @@ Missing key
       const failure = encode({ a: "a", b: "b" })
       assertTrue(Exit.isFailure(failure))
 
-      const success = encode({ a: "a", b: "b" }, { onExcessProperty: "preserve" })
+      const success = encode({ a: "a", b: "b" }, { onExcessProperty: "ignore" })
       assertTrue(Exit.isSuccess(success))
-      deepStrictEqual(success.value, { a: "a", b: "b" })
+      deepStrictEqual(success.value, { a: "a" })
+      assertTrue(Exit.isFailure(encode({ a: "a", b: "b" })))
     })
   })
 
@@ -275,6 +274,16 @@ Missing key
       await encoding.fail("1", `Expected 1`)
     })
 
+    it("accepts either signed zero and preserves the input sign", () => {
+      for (const literal of [0, -0]) {
+        const schema = Schema.Literal(literal)
+        for (const input of [0, -0]) {
+          assertTrue(Object.is(Schema.decodeUnknownSync(schema)(input), input))
+          assertTrue(Object.is(Schema.encodeUnknownSync(schema)(input), input))
+        }
+      }
+    })
+
     it("transform", async () => {
       const schema = Schema.Literal(0).transform("a")
       const asserts = new TestSchema.Asserts(schema)
@@ -586,37 +595,18 @@ Missing key
       )
     })
 
-    describe("propertyOrder", () => {
-      it("all required fields", () => {
-        const schema = Schema.Struct({
-          a: Schema.String,
-          b: Schema.String
-        })
-
-        const input = { c: "c", b: "b", a: "a", d: "d" }
-        const output = Schema.decodeUnknownSync(schema)(input, {
-          propertyOrder: "original",
-          onExcessProperty: "preserve"
-        })
-        deepStrictEqual(Object.keys(output), ["c", "b", "a", "d"])
-      })
-
-      it("optional field with default", () => {
-        const schema = Schema.Struct({
-          a: Schema.String.pipe(Schema.encode({
-            decode: SchemaGetter.withDefault(Effect.succeed("default-a")),
-            encode: SchemaGetter.passthrough()
-          })),
-          b: Schema.String
-        })
-
-        const input = { c: "c", b: "b", d: "d" }
-        const output = Schema.decodeUnknownSync(schema)(input, {
-          propertyOrder: "original",
-          onExcessProperty: "preserve"
-        })
-        deepStrictEqual(Object.keys(output), ["c", "b", "d", "a"])
-      })
+    it("should throw an error if a large struct has duplicate property signatures", () => {
+      throws(
+        () =>
+          new SchemaAST.Objects(
+            Array.from(
+              { length: 32 },
+              (_, index) => new SchemaAST.PropertySignature(`field${index === 31 ? 0 : index}`, Schema.String.ast)
+            ),
+            []
+          ),
+        new Error(`Duplicate identifiers: ["field0"]. ts(2300)`)
+      )
     })
 
     describe("onExcessProperty", () => {
@@ -648,16 +638,17 @@ Expected no excess property
         )
       })
 
-      it("preserve", async () => {
+      it("ignore strips undeclared string and symbol properties", async () => {
         const schema = Schema.Struct({
           a: Schema.String
         })
         const asserts = new TestSchema.Asserts(schema)
 
-        const decoding = asserts.decoding({ parseOptions: { onExcessProperty: "preserve" } })
+        const decoding = asserts.decoding({ parseOptions: { onExcessProperty: "ignore" } })
         const sym = Symbol("sym")
         await decoding.succeed(
-          { a: "a", b: "b", c: "c", [sym]: "sym" }
+          { a: "a", b: "b", c: "c", [sym]: "sym" },
+          { a: "a" }
         )
       })
     })
@@ -1159,6 +1150,18 @@ Expected no excess property
     await encoding.succeed([1, 2], ["1", "2"])
   })
 
+  it("ArrayEnsure roundtrips array-valued elements", () => {
+    const schema = Schema.ArrayEnsure(Schema.Tuple([Schema.Number, Schema.Number]))
+    const encoded = Schema.encodeSync(schema)([[1, 2]])
+    deepStrictEqual(encoded, [1, 2])
+    deepStrictEqual(Schema.decodeSync(schema)(encoded), [[1, 2]])
+  })
+
+  it("ArrayEnsure preserves outer-array encoding", () => {
+    const schema = Schema.ArrayEnsure(Schema.fromJsonString(Schema.Unknown))
+    deepStrictEqual(Schema.encodeSync(schema)([1, 2]), ["1", "2"])
+  })
+
   describe("NonEmptyArray", () => {
     it("should expose the element schema via .value", () => {
       const schema = Schema.NonEmptyArray(Schema.String)
@@ -1580,6 +1583,27 @@ Expected a string including "c"`
         assertFalse(is(Number("1.042e-321")))
       })
 
+      it("isMultipleOf normalizes negative divisors", async () => {
+        const schema = Schema.Number.check(Schema.isMultipleOf(-2))
+        const asserts = new TestSchema.Asserts(schema)
+
+        const decoding = asserts.decoding()
+        await decoding.succeed(4)
+        await decoding.fail(
+          3,
+          `Expected a value that is a multiple of 2`
+        )
+      })
+
+      it("isMultipleOf rejects invalid divisors", () => {
+        for (const divisor of [0, -0, NaN, Infinity, -Infinity]) {
+          throws(
+            () => Schema.isMultipleOf(divisor),
+            new RangeError(`Expected a finite non-zero number, got ${String(divisor)}`)
+          )
+        }
+      })
+
       describe("isBetween", () => {
         it("included & included", async () => {
           const schema = Schema.Int.check(Schema.isBetween({ minimum: 1, maximum: 3 }))
@@ -2382,7 +2406,8 @@ Expected a value between -2147483648 and 2147483647`
     it("double transformation", async () => {
       const schema = Schema.String.pipe(
         Schema.decode(
-          SchemaTransformation.trim().compose(
+          SchemaTransformation.composeTransformation(
+            SchemaTransformation.trim(),
             SchemaTransformation.toLowerCase()
           )
         )
@@ -2530,7 +2555,8 @@ Expected a value between -2147483648 and 2147483647`
     it("double transformation", async () => {
       const schema = Schema.String.pipe(
         Schema.encode(
-          SchemaTransformation.trim().compose(
+          SchemaTransformation.composeTransformation(
+            SchemaTransformation.trim(),
             SchemaTransformation.toLowerCase()
           ).flip()
         )
@@ -2819,6 +2845,9 @@ Expected a value between -2147483648 and 2147483647`
 
       const decoding = asserts.decoding()
       await decoding.succeed(Redacted.make("123"), Redacted.make(123))
+      const decoded = Schema.decodeUnknownSync(schema)(Redacted.make("123", { label: "secret" }))
+      strictEqual(Redacted.value(decoded), 123)
+      strictEqual(decoded.label, "secret")
       await decoding.fail(null, `Expected Redacted`)
       await decoding.fail(
         Redacted.make(null),
@@ -2838,6 +2867,9 @@ Expected a value between -2147483648 and 2147483647`
 
       const encoding = asserts.encoding()
       await encoding.succeed(Redacted.make(123), Redacted.make("123"))
+      const encoded = Schema.encodeSync(schema)(Redacted.make(123, { label: "secret" }))
+      strictEqual(Redacted.value(encoded), "123")
+      strictEqual(encoded.label, "secret")
       await encoding.fail(null, `Expected Redacted`)
       await encoding.fail(
         Redacted.make(null),
@@ -3282,6 +3314,22 @@ Expected a value between -2147483648 and 2147483647`
   })
 
   describe("Cause", () => {
+    it("strict encoding preserves the default wire format for every reason variant", () => {
+      const schema = Schema.fromJsonString(Schema.toCodecJson(Schema.Cause(Schema.String, Schema.Number)))
+      const cause = Cause.fromReasons([
+        Cause.makeFailReason("boom"),
+        Cause.makeDieReason(42),
+        Cause.makeInterruptReason(7),
+        Cause.makeInterruptReason()
+      ])
+      const wire =
+        "[{\"_tag\":\"Fail\",\"error\":\"boom\"},{\"_tag\":\"Die\",\"defect\":42},{\"_tag\":\"Interrupt\",\"fiberId\":7},{\"_tag\":\"Interrupt\",\"fiberId\":null}]"
+      strictEqual(Schema.encodeSync(schema)(cause), wire)
+      strictEqual(Schema.encodeSync(schema, { onExcessProperty: "error" })(cause), wire)
+      assert.deepStrictEqual(Schema.decodeSync(schema)(wire), cause)
+      assert.deepStrictEqual(Schema.decodeSync(schema, { onExcessProperty: "error" })(wire), cause)
+    })
+
     it("should expose the values", () => {
       const schema = Schema.Cause(Schema.String, Schema.Number)
       strictEqual(schema.error, Schema.String)
@@ -3497,6 +3545,19 @@ Expected a value between -2147483648 and 2147483647`
       strictEqual((rebuilt as any).length, 2)
     })
 
+    it("assigns options", () => {
+      const schema = Schema.make<Schema.String>(Schema.String.ast, {
+        custom: "value"
+      })
+
+      assertTrue(Schema.isSchema(schema))
+      strictEqual((schema as any).custom, "value")
+
+      const rebuilt = schema.annotate({})
+
+      strictEqual((rebuilt as any).custom, "value")
+    })
+
     it("should throw an error when the cause contains both a schema issue and a defect", () => {
       const cause = Cause.combine(
         Cause.fail(new SchemaIssue.InvalidValue({ message: "schema issue" })),
@@ -3871,7 +3932,7 @@ Expected a value between -2147483648 and 2147483647`
         const calls: Array<string> = []
         const value = Schema.String.pipe(
           Schema.decode({
-            decode: SchemaGetter.transformOrFail((value) => {
+            decode: SchemaGetter.transformEffect((value) => {
               calls.push(value)
               return value === "b" ? Effect.yieldNow.pipe(Effect.as(value)) : Effect.succeed(value)
             }),
@@ -3923,6 +3984,31 @@ Expected a value between -2147483648 and 2147483647`
       )
     })
 
+    it("applies excess-property options to unmatched own keys", () => {
+      const schema = Schema.Record(Schema.String.check(Schema.isPattern(/^a/)), Schema.Number)
+      const input = { a: 1, b: 2 }
+
+      deepStrictEqual(Schema.decodeUnknownSync(schema)(input, { onExcessProperty: "ignore" }), { a: 1 })
+      deepStrictEqual(Schema.encodeUnknownSync(schema)(input, { onExcessProperty: "ignore" }), { a: 1 })
+      throws(
+        () => Schema.decodeUnknownSync(schema)(input, { onExcessProperty: "error" }),
+        `Expected no excess property\n  at ["b"]`
+      )
+      throws(
+        () => Schema.encodeUnknownSync(schema)(input, { onExcessProperty: "error" }),
+        `Expected no excess property\n  at ["b"]`
+      )
+    })
+
+    it("recognizes numeric declared keys with an index signature", () => {
+      const symbol = Symbol("symbol")
+      const schema = Schema.Record(Schema.Union([Schema.Literal(1), Schema.Symbol]), Schema.String)
+      const input = { 1: "one", [symbol]: "symbol" }
+
+      deepStrictEqual(Schema.decodeUnknownSync(schema)(input, { onExcessProperty: "error" }), input)
+      deepStrictEqual(Schema.encodeUnknownSync(schema)(input, { onExcessProperty: "error" }), input)
+    })
+
     it("Record(Symbol, Number)", async () => {
       const schema = Schema.Record(Schema.Symbol, Schema.Number)
       const asserts = new TestSchema.Asserts(schema)
@@ -4445,42 +4531,51 @@ Expected a value between -2147483648 and 2147483647`
       strictEqual(evaluations, 0)
     })
 
-    it.effect("preserves member order with concurrent decoding", () =>
+    it.effect("does not start later members after an asynchronous success", () =>
       Effect.gen(function*() {
+        const firstStarted = yield* Deferred.make<void>()
         const firstLatch = yield* Deferred.make<void>()
-        const secondCompleted = yield* Deferred.make<void>()
+        let secondCalls = 0
         const first = Schema.String.pipe(
           Schema.decode({
-            decode: SchemaGetter.transformOrFail(() => Deferred.await(firstLatch).pipe(Effect.as("first"))),
+            decode: SchemaGetter.transformEffect(() =>
+              Deferred.succeed(firstStarted, undefined).pipe(
+                Effect.andThen(Deferred.await(firstLatch)),
+                Effect.as("first")
+              )
+            ),
             encode: SchemaGetter.passthrough()
           })
         )
         const second = Schema.String.pipe(
           Schema.decode({
-            decode: SchemaGetter.transformOrFail(() =>
-              Deferred.succeed(secondCompleted, undefined).pipe(Effect.as("second"))
-            ),
+            decode: SchemaGetter.transform(() => {
+              secondCalls++
+              return "second"
+            }),
             encode: SchemaGetter.passthrough()
           })
         )
-        const fiber = yield* Schema.decodeUnknownEffect(Schema.Union([first, second]))("value", {
-          concurrency: 2
-        }).pipe(Effect.forkChild)
+        const fiber = yield* Schema.decodeUnknownEffect(Schema.Union([first, second]))("value").pipe(Effect.forkChild)
 
-        yield* Deferred.await(secondCompleted)
+        yield* Deferred.await(firstStarted)
         yield* Effect.yieldNow
+        strictEqual(secondCalls, 0)
         yield* Deferred.succeed(firstLatch, undefined)
         strictEqual(yield* Fiber.join(fiber), "first")
+        strictEqual(secondCalls, 0)
       }))
 
-    it.effect("uses a buffered concurrent success after earlier candidates fail", () =>
+    it.effect("starts the next member only after an asynchronous failure", () =>
       Effect.gen(function*() {
+        const firstStarted = yield* Deferred.make<void>()
         const firstLatch = yield* Deferred.make<void>()
-        const secondCompleted = yield* Deferred.make<void>()
+        let secondCalls = 0
         const first = Schema.String.pipe(
           Schema.decode({
-            decode: SchemaGetter.transformOrFail(() =>
-              Deferred.await(firstLatch).pipe(
+            decode: SchemaGetter.transformEffect(() =>
+              Deferred.succeed(firstStarted, undefined).pipe(
+                Effect.andThen(Deferred.await(firstLatch)),
                 Effect.andThen(Effect.fail(new SchemaIssue.Forbidden({ message: "first failed" })))
               )
             ),
@@ -4489,49 +4584,58 @@ Expected a value between -2147483648 and 2147483647`
         )
         const second = Schema.String.pipe(
           Schema.decode({
-            decode: SchemaGetter.transformOrFail(() =>
-              Deferred.succeed(secondCompleted, undefined).pipe(Effect.as("second"))
-            ),
+            decode: SchemaGetter.transform(() => {
+              secondCalls++
+              return "second"
+            }),
             encode: SchemaGetter.passthrough()
           })
         )
-        const fiber = yield* Schema.decodeUnknownEffect(Schema.Union([first, second]))("value", {
-          concurrency: 2
-        }).pipe(Effect.forkChild)
+        const fiber = yield* Schema.decodeUnknownEffect(Schema.Union([first, second]))("value").pipe(Effect.forkChild)
 
-        yield* Deferred.await(secondCompleted)
+        yield* Deferred.await(firstStarted)
         yield* Effect.yieldNow
+        strictEqual(secondCalls, 0)
         yield* Deferred.succeed(firstLatch, undefined)
         strictEqual(yield* Fiber.join(fiber), "second")
+        strictEqual(secondCalls, 1)
       }))
 
-    it.effect(`mode: "oneOf" detects concurrent successes in member order`, () =>
+    it.effect(`mode: "oneOf" detects asynchronous successes in member order`, () =>
       Effect.gen(function*() {
+        const firstStarted = yield* Deferred.make<void>()
         const firstLatch = yield* Deferred.make<void>()
-        const secondCompleted = yield* Deferred.make<void>()
+        let secondCalls = 0
         const first = Schema.String.pipe(
           Schema.decode({
-            decode: SchemaGetter.transformOrFail(() => Deferred.await(firstLatch).pipe(Effect.as("first"))),
+            decode: SchemaGetter.transformEffect(() =>
+              Deferred.succeed(firstStarted, undefined).pipe(
+                Effect.andThen(Deferred.await(firstLatch)),
+                Effect.as("first")
+              )
+            ),
             encode: SchemaGetter.passthrough()
           })
         )
         const second = Schema.String.pipe(
           Schema.decode({
-            decode: SchemaGetter.transformOrFail(() =>
-              Deferred.succeed(secondCompleted, undefined).pipe(Effect.as("second"))
-            ),
+            decode: SchemaGetter.transform(() => {
+              secondCalls++
+              return "second"
+            }),
             encode: SchemaGetter.passthrough()
           })
         )
         const fiber = yield* Schema.decodeUnknownEffect(Schema.Union([first, second], { mode: "oneOf" }))(
-          "value",
-          { concurrency: 2 }
+          "value"
         ).pipe(Effect.exit, Effect.forkChild)
 
-        yield* Deferred.await(secondCompleted)
+        yield* Deferred.await(firstStarted)
         yield* Effect.yieldNow
+        strictEqual(secondCalls, 0)
         yield* Deferred.succeed(firstLatch, undefined)
         const exit = yield* Fiber.join(fiber)
+        strictEqual(secondCalls, 1)
         strictEqual(exit._tag, "Failure")
         if (exit._tag === "Failure") {
           const reason = exit.cause.reasons[0]
@@ -4548,45 +4652,6 @@ Expected a value between -2147483648 and 2147483647`
         }
       }))
 
-    it.effect("interrupts pending concurrent members after anyOf succeeds", () =>
-      Effect.gen(function*() {
-        const firstStarted = yield* Deferred.make<void>()
-        const firstLatch = yield* Deferred.make<void>()
-        const secondStarted = yield* Deferred.make<void>()
-        const secondInterrupted = yield* Deferred.make<void>()
-        const first = Schema.String.pipe(
-          Schema.decode({
-            decode: SchemaGetter.transformOrFail(() =>
-              Deferred.succeed(firstStarted, undefined).pipe(
-                Effect.andThen(Deferred.await(firstLatch)),
-                Effect.as("first")
-              )
-            ),
-            encode: SchemaGetter.passthrough()
-          })
-        )
-        const second = Schema.String.pipe(
-          Schema.decode({
-            decode: SchemaGetter.transformOrFail(() =>
-              Deferred.succeed(secondStarted, undefined).pipe(
-                Effect.andThen(Effect.never),
-                Effect.onInterrupt(() => Deferred.succeed(secondInterrupted, undefined).pipe(Effect.asVoid))
-              )
-            ),
-            encode: SchemaGetter.passthrough()
-          })
-        )
-        const fiber = yield* Schema.decodeUnknownEffect(Schema.Union([first, second]))("value", {
-          concurrency: 2
-        }).pipe(Effect.forkChild)
-
-        yield* Deferred.await(firstStarted)
-        yield* Deferred.await(secondStarted)
-        yield* Deferred.succeed(firstLatch, undefined)
-        strictEqual(yield* Fiber.join(fiber), "first")
-        yield* Deferred.await(secondInterrupted)
-      }))
-
     it(`mode: "oneOf" with Void`, async () => {
       const schema = Schema.Union([Schema.Void, Schema.String], { mode: "oneOf" })
       const asserts = new TestSchema.Asserts(schema)
@@ -4889,6 +4954,26 @@ Expected a value between -2147483648 and 2147483647`
       )
     })
 
+    it("applies excess-property options after fixed and index signatures", () => {
+      const schema = Schema.StructWithRest(
+        Schema.Struct({ fixed: Schema.Number }),
+        [Schema.Record(Schema.String.check(Schema.isPattern(/^a/)), Schema.Number)]
+      )
+      const input = { fixed: 0, a: 1, b: 2 }
+      const expected = { fixed: 0, a: 1 }
+
+      deepStrictEqual(Schema.decodeUnknownSync(schema)(input, { onExcessProperty: "ignore" }), expected)
+      deepStrictEqual(Schema.encodeUnknownSync(schema)(input, { onExcessProperty: "ignore" }), expected)
+      throws(
+        () => Schema.decodeUnknownSync(schema)(input, { onExcessProperty: "error" }),
+        `Expected no excess property\n  at ["b"]`
+      )
+      throws(
+        () => Schema.encodeUnknownSync(schema)(input, { onExcessProperty: "error" }),
+        `Expected no excess property\n  at ["b"]`
+      )
+    })
+
     it("should preserve both checks", async () => {
       const schema = Schema.StructWithRest(
         Schema.Struct({ a: Schema.Number }).check(
@@ -5989,11 +6074,11 @@ Expected a value between -2147483648 and 2147483647`
     )
   })
 
-  it("transformOrFail", async () => {
+  it("transformEffect", async () => {
     const schema = Schema.String.pipe(
       Schema.decodeTo(
         Schema.String,
-        SchemaTransformation.transformOrFail({
+        SchemaTransformation.transformEffect({
           decode: (s) =>
             s === "a"
               ? Effect.fail(new SchemaIssue.Forbidden({ message: `input should not be "a"` }))
@@ -6384,26 +6469,10 @@ Expected a value between -2147483648 and 2147483647`
       )
     })
 
-    it(`"a" + transformation`, async () => {
-      const schema = Schema.TemplateLiteral(["a", Schema.FiniteFromString])
-      const asserts = new TestSchema.Asserts(schema)
-
-      const decoding = asserts.decoding()
-      await decoding.succeed("a")
-      await decoding.succeed("a1")
-
-      await decoding.fail(
-        null,
-        "Expected string"
-      )
-      await decoding.fail(
-        "",
-        `Expected a string matching template literal parts`
-      )
-      await decoding.fail(
-        "ab",
-        `Expected a finite number
-  at [1]`
+    it(`rejects "a" + transformation`, () => {
+      throws(
+        () => Schema.TemplateLiteral(["a", Schema.FiniteFromString]),
+        "TemplateLiteral parts cannot have an encoding at parts[1]"
       )
     })
   })
@@ -6548,8 +6617,7 @@ Expected a value between -2147483648 and 2147483647`
       await decoding.succeed("ced", ["c", "e", "d"])
       await decoding.fail(
         "cabd",
-        `Expected a string matching template literal parts
-  at [1]`
+        `Expected a string matching template literal parts`
       )
       await decoding.fail(
         "ed",
@@ -6573,13 +6641,11 @@ Expected a value between -2147483648 and 2147483647`
       await decoding.succeed("ca1bd", ["c", ["a", 1, "b"], "d"])
       await decoding.fail(
         "ca1.1bd",
-        `Expected a string matching template literal parts
-  at [1]`
+        `Expected a string matching template literal parts`
       )
       await decoding.fail(
         "ca-bd",
-        `Expected a string matching template literal parts
-  at [1]`
+        `Expected a string matching template literal parts`
       )
     })
 
@@ -6609,13 +6675,56 @@ Expected a value between -2147483648 and 2147483647`
       await decoding.succeed("<h2>", ["<", ["h", 2], ">"])
       await decoding.fail(
         "<h3>",
-        `Expected a string matching template literal parts
-  at [1]`
+        `Expected a string matching template literal parts`
       )
     })
   })
 
   describe("Class", () => {
+    it.effect("make preserves existing instances like the other constructor adapters", () =>
+      Effect.gen(function*() {
+        let constructions = 0
+        class A extends Schema.Class<A>("A")({ a: Schema.String }) {
+          readonly construction = ++constructions
+        }
+        const instance = new A({ a: "a" })
+
+        assert.strictEqual(A.make(instance), instance)
+        assert.strictEqual(SchemaParser.make(A)(instance), instance)
+        assert.strictEqual(Option.getOrThrow(A.makeOption(instance)), instance)
+        assert.strictEqual(yield* A.makeEffect(instance), instance)
+        assert.strictEqual(constructions, 1)
+
+        assert.notStrictEqual(new A(instance), instance)
+        assert.strictEqual(constructions, 2)
+      }))
+
+    it("make applies defaults, source checks, and the constructor once", () => {
+      let defaults = 0
+      let checks = 0
+      let constructions = 0
+      const struct = Schema.Struct({
+        a: Schema.String.pipe(Schema.withConstructorDefault(Effect.sync(() => {
+          defaults++
+          return "default"
+        })))
+      }).check(Schema.makeFilter(() => {
+        checks++
+        return true
+      }))
+      class A extends Schema.Class<A>("A")(struct) {
+        readonly construction = ++constructions
+      }
+
+      const instance = A.make({})
+
+      assert.instanceOf(instance, A)
+      assert.strictEqual(instance.a, "default")
+      assert.strictEqual(defaults, 1)
+      assert.strictEqual(checks, 1)
+      assert.strictEqual(constructions, 1)
+    })
+
     it("make with void input", () => {
       class A extends Schema.Class<A>("A")({}) {}
       deepStrictEqual(A.make(), new A())
@@ -6976,17 +7085,17 @@ Expected a value between -2147483648 and 2147483647`
       assertFalse("extra" in instance)
     })
 
-    it("constructor preserves excess properties when requested", () => {
+    it("constructor strips excess properties with explicit ignore", () => {
       class A extends Schema.Class<A>("A")({
         a: Schema.String
       }) {}
 
       const instance = new A({ a: "a", extra: "extra" } as any, {
-        parseOptions: { onExcessProperty: "preserve" }
+        parseOptions: { onExcessProperty: "ignore" }
       })
 
       strictEqual(instance.a, "a")
-      strictEqual((instance as any).extra, "extra")
+      assertFalse("extra" in instance)
     })
 
     it("constructor rejects excess properties when requested", () => {
@@ -7092,7 +7201,7 @@ Expected a value between -2147483648 and 2147483647`
         assertFalse("extra" in instance)
       })
 
-      it("constructor preserves subclass fields and excess properties when requested", () => {
+      it("constructor keeps subclass fields and strips excess properties with explicit ignore", () => {
         class A extends Schema.Class<A>("A")({
           a: Schema.String
         }) {}
@@ -7101,12 +7210,12 @@ Expected a value between -2147483648 and 2147483647`
         }) {}
 
         const instance = new B({ a: "a", b: 2, extra: "extra" } as any, {
-          parseOptions: { onExcessProperty: "preserve" }
+          parseOptions: { onExcessProperty: "ignore" }
         })
 
         strictEqual(instance.a, "a")
         strictEqual(instance.b, 2)
-        strictEqual((instance as any).extra, "extra")
+        assertFalse("extra" in instance)
       })
 
       it("constructor does not treat subclass fields as excess properties", () => {
@@ -7313,19 +7422,19 @@ Expected a value between -2147483648 and 2147483647`
       assertFalse("extra" in err)
     })
 
-    it("constructor preserves excess properties when requested", () => {
+    it("constructor strips excess properties with explicit ignore", () => {
       class E extends Schema.Error<E>("E")({
         message: Schema.String,
         code: Schema.Number
       }) {}
 
       const err = new E({ message: "boom", code: 1, extra: "extra" } as any, {
-        parseOptions: { onExcessProperty: "preserve" }
+        parseOptions: { onExcessProperty: "ignore" }
       })
 
       strictEqual(err.message, "boom")
       strictEqual(err.code, 1)
-      strictEqual((err as any).extra, "extra")
+      assertFalse("extra" in err)
     })
 
     it("Struct argument", async () => {
@@ -7426,6 +7535,13 @@ Expected a value between -2147483648 and 2147483647`
   })
 
   describe("TaggedError", () => {
+    it("make preserves existing instances", () => {
+      class E extends Schema.TaggedError<E>()("E", { message: Schema.String }) {}
+      const instance = new E({ message: "failure" })
+
+      assert.strictEqual(E.make(instance), instance)
+    })
+
     it("make with void input", () => {
       class E extends Schema.TaggedError<E>()("E", {}) {}
       deepStrictEqual(E.make(), new E())
@@ -7573,6 +7689,15 @@ Expected a value between -2147483648 and 2147483647`
   })
 
   describe("Enum", () => {
+    it("rejects non-finite numeric values", () => {
+      for (const value of [NaN, Infinity, -Infinity]) {
+        throws(
+          () => Schema.Enum({ value }),
+          new Error(`A numeric enum value must be finite, got ${String(value)}`)
+        )
+      }
+    })
+
     it("enums should be exposed", () => {
       enum Fruits {
         Apple,
@@ -8195,12 +8320,12 @@ Expected a value between -2147483648 and 2147483647`
         Cause.die(new Error("defect"))
       )
       const decodeSchema = Schema.String.pipe(Schema.decode({
-        decode: new SchemaGetter.Getter(() => Effect.failCause(cause)),
+        decode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(cause)),
         encode: SchemaGetter.passthrough()
       }))
       const encodeSchema = Schema.String.pipe(Schema.encode({
         decode: SchemaGetter.passthrough(),
-        encode: new SchemaGetter.Getter(() => Effect.failCause(cause))
+        encode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(cause))
       }))
 
       const r1 = await Schema.decodeUnknownPromise(decodeSchema)("a").then(Result.succeed, Result.fail)
@@ -8238,12 +8363,12 @@ Expected a value between -2147483648 and 2147483647`
 
     it("should throw an error when the cause is not a schema issue", () => {
       const decodeSchema = Schema.String.pipe(Schema.decode({
-        decode: new SchemaGetter.Getter(() => Effect.die(new Error("decode defect"))),
+        decode: SchemaGetter.transformOptionalEffect(() => Effect.die(new Error("decode defect"))),
         encode: SchemaGetter.passthrough()
       }))
       const encodeSchema = Schema.String.pipe(Schema.encode({
         decode: SchemaGetter.passthrough(),
-        encode: new SchemaGetter.Getter(() => Effect.die(new Error("encode defect")))
+        encode: SchemaGetter.transformOptionalEffect(() => Effect.die(new Error("encode defect")))
       }))
 
       throws(() => Schema.decodeUnknownOption(decodeSchema)("a"), (e) => {
@@ -8264,12 +8389,12 @@ Expected a value between -2147483648 and 2147483647`
         Cause.die(new Error("defect"))
       )
       const decodeSchema = Schema.String.pipe(Schema.decode({
-        decode: new SchemaGetter.Getter(() => Effect.failCause(cause)),
+        decode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(cause)),
         encode: SchemaGetter.passthrough()
       }))
       const encodeSchema = Schema.String.pipe(Schema.encode({
         decode: SchemaGetter.passthrough(),
-        encode: new SchemaGetter.Getter(() => Effect.failCause(cause))
+        encode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(cause))
       }))
 
       throws(() => Schema.decodeUnknownOption(decodeSchema)("a"), (e) => {
@@ -8326,12 +8451,12 @@ Expected a value between -2147483648 and 2147483647`
         Cause.die(new Error("defect"))
       )
       const decodeSchema = Schema.String.pipe(Schema.decode({
-        decode: new SchemaGetter.Getter(() => Effect.failCause(cause)),
+        decode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(cause)),
         encode: SchemaGetter.passthrough()
       }))
       const encodeSchema = Schema.String.pipe(Schema.encode({
         decode: SchemaGetter.passthrough(),
-        encode: new SchemaGetter.Getter(() => Effect.failCause(cause))
+        encode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(cause))
       }))
 
       throws(() => Schema.decodeUnknownResult(decodeSchema)("a"), (e) => {
@@ -8379,12 +8504,12 @@ Expected a value between -2147483648 and 2147483647`
         Cause.die(new Error("defect"))
       )
       const decodeSchema = Schema.String.pipe(Schema.decode({
-        decode: new SchemaGetter.Getter(() => Effect.failCause(cause)),
+        decode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(cause)),
         encode: SchemaGetter.passthrough()
       }))
       const encodeSchema = Schema.String.pipe(Schema.encode({
         decode: SchemaGetter.passthrough(),
-        encode: new SchemaGetter.Getter(() => Effect.failCause(cause))
+        encode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(cause))
       }))
 
       throws(() => Schema.decodeUnknownSync(decodeSchema)("a"), (e) => {
@@ -8403,7 +8528,7 @@ Expected a value between -2147483648 and 2147483647`
   describe("decodeUnknownResult", () => {
     it("should throw on async decoding", () => {
       const AsyncString = Schema.String.pipe(Schema.decode({
-        decode: new SchemaGetter.Getter((os: Option.Option<string>) =>
+        decode: SchemaGetter.transformOptionalEffect((os: Option.Option<string>) =>
           Effect.gen(function*() {
             yield* Effect.sleep("10 millis")
             return os
@@ -8419,10 +8544,10 @@ Expected a value between -2147483648 and 2147483647`
     it("should throw on missing dependency", () => {
       class MagicNumber extends Context.Service<MagicNumber, number>()("MagicNumber") {}
       const DepString = Schema.Number.pipe(Schema.decode({
-        decode: SchemaGetter.onSome((n) =>
+        decode: SchemaGetter.transformEffect((n) =>
           Effect.gen(function*() {
             const magicNumber = yield* MagicNumber
-            return Option.some(n * magicNumber)
+            return n * magicNumber
           })
         ),
         encode: SchemaGetter.passthrough()
@@ -8436,7 +8561,7 @@ Expected a value between -2147483648 and 2147483647`
   describe("decodeUnknownExit", () => {
     it("should die on async decoding", () => {
       const AsyncString = Schema.String.pipe(Schema.decode({
-        decode: new SchemaGetter.Getter((os: Option.Option<string>) =>
+        decode: SchemaGetter.transformOptionalEffect((os: Option.Option<string>) =>
           Effect.gen(function*() {
             yield* Effect.sleep("10 millis")
             return os
@@ -8453,10 +8578,10 @@ Expected a value between -2147483648 and 2147483647`
     it("should die on missing dependency", () => {
       class MagicNumber extends Context.Service<MagicNumber, number>()("MagicNumber") {}
       const DepString = Schema.Number.pipe(Schema.decode({
-        decode: SchemaGetter.onSome((n) =>
+        decode: SchemaGetter.transformEffect((n) =>
           Effect.gen(function*() {
             const magicNumber = yield* MagicNumber
-            return Option.some(n * magicNumber)
+            return n * magicNumber
           })
         ),
         encode: SchemaGetter.passthrough()
@@ -8474,12 +8599,12 @@ Expected a value between -2147483648 and 2147483647`
         Cause.die(new Error("defect"))
       )
       const decodeSchema = Schema.String.pipe(Schema.decode({
-        decode: new SchemaGetter.Getter(() => Effect.failCause(cause)),
+        decode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(cause)),
         encode: SchemaGetter.passthrough()
       }))
       const encodeSchema = Schema.String.pipe(Schema.encode({
         decode: SchemaGetter.passthrough(),
-        encode: new SchemaGetter.Getter(() => Effect.failCause(cause))
+        encode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(cause))
       }))
 
       const decodeExit = Schema.decodeUnknownExit(decodeSchema)("a")
@@ -8802,6 +8927,18 @@ Expected a value between -2147483648 and 2147483647`
     })
   })
 
+  describe("Union options", () => {
+    it("preserves Union options through public derivations", () => {
+      const options: SchemaAST.UnionOptions = { mode: "oneOf" }
+      const schema = Schema.Union([Schema.String, Schema.Number], options)
+
+      strictEqual(schema.mapMembers(Tuple.appendElement(Schema.Boolean)).ast.options, options)
+      const flipped = Schema.flip(schema).ast
+      assertTrue(SchemaAST.isUnion(flipped))
+      strictEqual(flipped.options, options)
+    })
+  })
+
   describe("Union.mapMembers", () => {
     it("appendElement", () => {
       const schema = Schema.Union([Schema.String, Schema.Number]).mapMembers(Tuple.appendElement(Schema.Boolean))
diff --git a/repos/effect/packages/effect/test/schema/SchemaAOTCompiler.test.ts b/repos/effect/packages/effect/test/schema/SchemaAOTCompiler.test.ts
new file mode 100644
index 000000000..42fe85b69
--- /dev/null
+++ b/repos/effect/packages/effect/test/schema/SchemaAOTCompiler.test.ts
@@ -0,0 +1,178 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Schema, SchemaParser } from "effect"
+import * as CompilerRegistry from "effect/internal/schema/compilerRegistry"
+import * as SchemaTransformation from "effect/SchemaTransformation"
+import * as SchemaAOTCompiler from "effect/unstable/schema/SchemaAOTCompiler"
+import { execFileSync } from "node:child_process"
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs"
+import { join } from "node:path"
+import { fileURLToPath, pathToFileURL } from "node:url"
+import { roots, schemas, suspendEvaluations } from "./fixtures/aot.ts"
+
+describe("SchemaAOTCompiler", { concurrent: false }, () => {
+  it("emits deterministic modules without installing a decoder", () => {
+    let checks = 0
+    const schema = Schema.Struct({
+      value: Schema.String.check(Schema.makeFilter(() => {
+        checks++
+        return true
+      }))
+    })
+    const before = CompilerRegistry.resolve(schema.ast)
+    const targets = [{ ast: schema.ast, operations: ["decode"] }] as const
+    const source = SchemaAOTCompiler.compile(targets)
+    assert.strictEqual(SchemaAOTCompiler.compile(targets), source)
+    assert.strictEqual(CompilerRegistry.resolve(schema.ast), before)
+    assert.strictEqual(checks, 0)
+    assert.include(source, "effect/unstable/schema/SchemaCompiler/runtime")
+    assert.notInclude(source, "new Function")
+    assert.notInclude(source, "SchemaJITCompiler")
+  })
+
+  it("emits only the requested operation family", () => {
+    const schema = Schema.Struct({ value: Schema.String })
+    const decode = SchemaAOTCompiler.compile([{ ast: schema.ast, operations: ["decode"] }])
+    assert.include(decode, "case \"decode\":{")
+    assert.include(decode, "case \"decodeEffect\":{")
+    assert.notInclude(decode, "case \"is\":{")
+    assert.notInclude(decode, "case \"make\":{")
+    assert.notInclude(decode, "case \"makeEffect\":{")
+
+    const make = SchemaAOTCompiler.compile([{ ast: schema.ast, operations: ["make"] }])
+    assert.include(make, "case \"make\":{")
+    assert.include(make, "case \"makeEffect\":{")
+    assert.notInclude(make, "case \"is\":{")
+    assert.notInclude(make, "case \"decode\":{")
+  })
+
+  it("allows a target without requested operations", () => {
+    const schema = Schema.Struct({ value: Schema.String })
+    const source = SchemaAOTCompiler.compile([{ ast: schema.ast, operations: [] }])
+    assert.notInclude(source, "runtime.setCompiler(")
+  })
+
+  it("omits fast decode operations from diagnostic-only dependencies", () => {
+    const child = Schema.Struct({ value: Schema.String })
+    const schema = Schema.Array(child)
+    const source = SchemaAOTCompiler.compile([{ ast: schema.ast, operations: ["decode"] }])
+    assert.strictEqual(source.match(/case "decode":\{/g)?.length, 1)
+    assert.strictEqual(source.match(/case "decodeEffect":\{/g)?.length, 2)
+
+    const targeted = SchemaAOTCompiler.compile([
+      { ast: schema.ast, operations: ["decode"] },
+      { ast: child.ast, operations: ["decode"] }
+    ])
+    assert.strictEqual(targeted.match(/case "decode":\{/g)?.length, 2)
+    assert.strictEqual(targeted.match(/case "decodeEffect":\{/g)?.length, 2)
+  })
+
+  it("uses registry fallbacks for operations that were not requested", async () => {
+    const schema = Schema.Struct({ value: Schema.String })
+    const directory = mkdtempSync(fileURLToPath(new URL("../../.schema-aot-operations-test-", import.meta.url)))
+    try {
+      const file = join(directory, "decode.mjs")
+      writeFileSync(file, SchemaAOTCompiler.compile([{ ast: schema.ast, operations: ["decode"] }]))
+      const generated = await import(`${pathToFileURL(file).href}?test=${Date.now()}`)
+      generated.install([schema.ast])
+
+      const entry = CompilerRegistry.resolve(schema.ast)
+      assert.strictEqual(typeof entry.compiled, "function")
+      assert.isDefined(entry.decode)
+      assert.isUndefined(entry.is)
+      assert.isUndefined(entry.make)
+      assert.strictEqual(SchemaParser.is(schema)({ value: "a" }), true)
+      assert.deepStrictEqual(SchemaParser.make(schema)({ value: "a" }), { value: "a" })
+    } finally {
+      rmSync(directory, { recursive: true, force: true })
+    }
+  })
+
+  it("initializes dependency operations on first use", async () => {
+    const child = Schema.String.pipe(
+      Schema.decodeTo(
+        Schema.Number,
+        SchemaTransformation.transform({ decode: Number, encode: String })
+      ),
+      Schema.annotate({ title: "lazy AOT dependency" })
+    )
+    const schema = Schema.Struct({ child })
+    const directory = mkdtempSync(fileURLToPath(new URL("../../.schema-aot-lazy-test-", import.meta.url)))
+    try {
+      const file = join(directory, "decode.mjs")
+      writeFileSync(file, SchemaAOTCompiler.compile([{ ast: schema.ast, operations: ["decode"] }]))
+      const generated = await import(`${pathToFileURL(file).href}?test=${Date.now()}`)
+      generated.install([schema.ast])
+
+      const dependency = CompilerRegistry.resolve(child.ast)
+      assert.isFalse(Object.hasOwn(dependency, "decodeEffect"))
+
+      const decode = SchemaParser.decodeUnknownSync(schema)
+      assert.deepStrictEqual(decode({ child: "1" }), { child: 1 })
+      assert.isFalse(Object.hasOwn(dependency, "decodeEffect"))
+
+      assert.throws(() => decode({ child: false }))
+      assert.isTrue(Object.hasOwn(dependency, "decodeEffect"))
+    } finally {
+      rmSync(directory, { recursive: true, force: true })
+    }
+  })
+
+  it("deduplicates repeated roots and dependencies shared across roots", () => {
+    const child = Schema.Struct({ value: Schema.String })
+    const first = Schema.Struct({ child })
+    const second = Schema.Array(child)
+    const source = SchemaAOTCompiler.compile([
+      { ast: first.ast, operations: ["decode"] },
+      { ast: second.ast, operations: ["decode"] }
+    ])
+    assert.strictEqual(
+      SchemaAOTCompiler.compile([
+        { ast: first.ast, operations: ["decode"] },
+        { ast: second.ast, operations: ["decode"] },
+        { ast: first.ast, operations: ["decode"] },
+        { ast: second.ast, operations: ["decode"] }
+      ]),
+      source
+    )
+    assert.strictEqual(source.match(/runtime\.setCompiler\(/g)?.length, 3)
+  })
+
+  it("reuses identical decoder factories", () => {
+    const schema = Schema.Union(
+      Array.from({ length: 8 }, (_, tag) => Schema.Struct({ tag: Schema.Literal(tag), value: Schema.Number }))
+    )
+    const source = SchemaAOTCompiler.compile([{ ast: schema.ast, operations: ["decode"] }])
+    assert.strictEqual(source.match(/function d\d+\(ast,resolve,operation\)/g)?.length, 2)
+  })
+
+  it("runs generated decoders without dynamic code generation", () => {
+    const directory = mkdtempSync(fileURLToPath(new URL("../../.schema-aot-test-", import.meta.url)))
+    try {
+      for (const [name, schema] of Object.entries(schemas)) {
+        writeFileSync(
+          join(directory, `${name}.mjs`),
+          SchemaAOTCompiler.compile([{ ast: schema.ast, operations: ["decode", "is", "make"] }])
+        )
+      }
+      writeFileSync(
+        join(directory, "all.mjs"),
+        SchemaAOTCompiler.compile(roots.map((ast) => ({ ast, operations: ["decode", "is", "make"] })))
+      )
+      writeFileSync(join(directory, "empty.mjs"), SchemaAOTCompiler.compile([]))
+      assert.strictEqual(suspendEvaluations, 0)
+      for (const mode of ["single", "multiple"]) {
+        const output = execFileSync(process.execPath, [
+          "--disallow-code-generation-from-strings",
+          "--import",
+          fileURLToPath(new URL("./fixtures/aot-import-guard.ts", import.meta.url)),
+          fileURLToPath(new URL("./fixtures/aot-runner.ts", import.meta.url)),
+          directory,
+          mode
+        ], { encoding: "utf8" })
+        assert.include(output, "AOT integration passed")
+      }
+    } finally {
+      rmSync(directory, { recursive: true, force: true })
+    }
+  }, 20_000)
+})
diff --git a/repos/effect/packages/effect/test/schema/SchemaAOTCompilerBuild.test.ts b/repos/effect/packages/effect/test/schema/SchemaAOTCompilerBuild.test.ts
new file mode 100644
index 000000000..a6efb5977
--- /dev/null
+++ b/repos/effect/packages/effect/test/schema/SchemaAOTCompilerBuild.test.ts
@@ -0,0 +1,148 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Effect, FileSystem, Path, SchemaParser } from "effect"
+import * as CompilerRegistry from "effect/internal/schema/compilerRegistry"
+import * as SchemaAOTCompilerBuild from "effect/unstable/schema/SchemaAOTCompiler/Build"
+import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs"
+import { join } from "node:path"
+import { fileURLToPath, pathToFileURL } from "node:url"
+import * as Schemas from "./fixtures/aot-build.ts"
+
+describe("SchemaAOTCompilerBuild", { concurrent: false }, () => {
+  it.effect("writes a deterministic self-installing module", () =>
+    Effect.gen(function*() {
+      const directory = yield* Effect.acquireRelease(
+        Effect.sync(() => mkdtempSync(fileURLToPath(new URL("../../.schema-aot-build-test-", import.meta.url)))),
+        (directory) => Effect.sync(() => rmSync(directory, { recursive: true, force: true }))
+      )
+      const outFile = join(directory, "generated.mjs")
+      const fileSystem = FileSystem.layerNoop({
+        makeDirectory: (path, options) =>
+          Effect.sync(() => {
+            mkdirSync(path, options)
+          }),
+        writeFileString: (path, source) => Effect.sync(() => writeFileSync(path, source))
+      })
+      const options = {
+        modules: {
+          "./fixtures/aot-build.ts": () => Promise.resolve(Schemas)
+        },
+        baseUrl: import.meta.url,
+        outFile,
+        operations: ["make", "decode", "is", "encode", "decode"]
+      } as const
+
+      const first = yield* SchemaAOTCompilerBuild.build(options).pipe(
+        Effect.provide(fileSystem),
+        Effect.provide(Path.layer)
+      )
+      const source = yield* Effect.sync(() => readFileSync(outFile, "utf8"))
+      const second = yield* SchemaAOTCompilerBuild.build(options).pipe(
+        Effect.provide(fileSystem),
+        Effect.provide(Path.layer)
+      )
+      const secondSource = yield* Effect.sync(() => readFileSync(outFile, "utf8"))
+
+      assert.deepStrictEqual(first, {
+        outFile,
+        modules: 1,
+        schemas: 2
+      })
+      assert.deepStrictEqual(second, first)
+      assert.strictEqual(secondSource, source)
+      assert.include(source, "effect/SchemaAST")
+      assert.include(source, "A.flip(m0[\"Port\"].ast)")
+      assert.include(source, "A.toType(m0[\"Port\"].ast)")
+      assert.notInclude(source, "ignored")
+
+      const before = CompilerRegistry.resolve(Schemas.User.ast)
+      yield* Effect.promise(() => import(`${pathToFileURL(outFile).href}?test=${Date.now()}`))
+      assert.notStrictEqual(CompilerRegistry.resolve(Schemas.User.ast), before)
+      assert.deepStrictEqual(SchemaParser.decodeUnknownSync(Schemas.User)({ name: "Ada", port: "8080" }), {
+        name: "Ada",
+        port: 8080
+      })
+      assert.strictEqual(SchemaParser.is(Schemas.User)({ name: "Ada", port: 8080 }), true)
+      assert.deepStrictEqual(SchemaParser.make(Schemas.User)({ name: "Ada", port: 8080 }), {
+        name: "Ada",
+        port: 8080
+      })
+      assert.deepStrictEqual(SchemaParser.encodeUnknownSync(Schemas.User)({ name: "Ada", port: 8080 }), {
+        name: "Ada",
+        port: "8080"
+      })
+    }))
+
+  it.effect("uses decoding as the default operation and ignores non-Schema exports", () =>
+    Effect.gen(function*() {
+      let written = ""
+      const result = yield* SchemaAOTCompilerBuild.build({
+        modules: {
+          "./fixtures/aot-build.ts": () => Promise.resolve(Schemas),
+          "./fixtures/ignored.ts": () => Promise.resolve({ value: 1 })
+        },
+        baseUrl: import.meta.url,
+        outFile: "/generated/schema-aot.mjs"
+      }).pipe(
+        Effect.provide(FileSystem.layerNoop({
+          makeDirectory: () => Effect.void,
+          writeFileString: (_path, source) =>
+            Effect.sync(() => {
+              written = source
+            })
+        })),
+        Effect.provide(Path.layer)
+      )
+
+      assert.deepStrictEqual(result, {
+        outFile: "/generated/schema-aot.mjs",
+        modules: 1,
+        schemas: 2
+      })
+      assert.notInclude(written, "import * as A from \"effect/SchemaAST\"")
+      assert.notInclude(written, "ignored.ts")
+      assert.notInclude(written, "case \"is\":{")
+      assert.notInclude(written, "case \"make\":{")
+      assert.notInclude(written, "case \"makeEffect\":{")
+      assert.include(written, "install([m0[\"Port\"].ast,m0[\"User\"].ast]);")
+    }))
+
+  it.effect("reports module loading failures", () =>
+    Effect.gen(function*() {
+      const error = yield* SchemaAOTCompilerBuild.build({
+        modules: {
+          "./fixtures/failing.ts": () => Promise.reject("boom")
+        },
+        baseUrl: import.meta.url,
+        outFile: "/generated/schema-aot.mjs"
+      }).pipe(
+        Effect.provide(FileSystem.layerNoop({})),
+        Effect.provide(Path.layer),
+        Effect.flip
+      )
+
+      assert.instanceOf(error, SchemaAOTCompilerBuild.BuildError)
+      assert.strictEqual(error.kind, "LoadModule")
+      assert.strictEqual(error.module, "./fixtures/failing.ts")
+      assert.strictEqual(error.cause, "boom")
+    }))
+
+  it.effect("reports invalid loaded modules", () =>
+    Effect.gen(function*() {
+      const error = yield* SchemaAOTCompilerBuild.build({
+        modules: {
+          "./fixtures/invalid.ts": () => Promise.resolve(1)
+        },
+        baseUrl: import.meta.url,
+        outFile: "/generated/schema-aot.mjs"
+      }).pipe(
+        Effect.provide(FileSystem.layerNoop({})),
+        Effect.provide(Path.layer),
+        Effect.flip
+      )
+
+      assert.instanceOf(error, SchemaAOTCompilerBuild.BuildError)
+      assert.strictEqual(error.kind, "InvalidModule")
+      assert.strictEqual(error.module, "./fixtures/invalid.ts")
+      assert.strictEqual(error.cause, 1)
+    }))
+})
diff --git a/repos/effect/packages/effect/test/schema/SchemaAST.test.ts b/repos/effect/packages/effect/test/schema/SchemaAST.test.ts
index 014944ba1..d3d32f0ac 100644
--- a/repos/effect/packages/effect/test/schema/SchemaAST.test.ts
+++ b/repos/effect/packages/effect/test/schema/SchemaAST.test.ts
@@ -1,9 +1,30 @@
-import { Schema, SchemaAST, SchemaGetter, SchemaTransformation } from "effect"
+import { Effect, Schema, SchemaAST, SchemaGetter, SchemaTransformation } from "effect"
 import { runInNewContext } from "node:vm"
 import { describe, it } from "vitest"
 import { deepStrictEqual, doesNotThrow, strictEqual, throws } from "../utils/assert.ts"
 
 describe("SchemaAST", () => {
+  it("stores constructor defaults directly in the context", () => {
+    const defaultValue = Effect.succeed("default")
+    const ast = SchemaAST.withConstructorDefault(SchemaAST.string, defaultValue)
+    strictEqual(ast.context?.constructorDefault, defaultValue)
+  })
+
+  describe("Suspend", () => {
+    it("memoizes the thunk", () => {
+      let calls = 0
+      const ast = new SchemaAST.Suspend(() => {
+        calls++
+        return SchemaAST.string
+      })
+
+      strictEqual(calls, 0)
+      strictEqual(ast.thunk(), SchemaAST.string)
+      strictEqual(ast.thunk(), SchemaAST.string)
+      strictEqual(calls, 1)
+    })
+  })
+
   it("isJson", () => {
     strictEqual(SchemaAST.isJson(null), true)
     strictEqual(SchemaAST.isJson(undefined), false)
@@ -665,6 +686,15 @@ describe("SchemaAST", () => {
     })
   })
 
+  describe("Union options", () => {
+    it("preserves the complete options object through recur and flip", () => {
+      const unionOptions: SchemaAST.UnionOptions = { mode: "oneOf" }
+      const union = new SchemaAST.Union([Schema.NumberFromString.ast, Schema.String.ast], unionOptions)
+      strictEqual(union.recur(SchemaAST.toEncoded).options, unionOptions)
+      strictEqual(union.flip(SchemaAST.flip).options, unionOptions)
+    })
+  })
+
   describe("IndexSignature", () => {
     it("accepts valid parameters on both type and encoded side", () => {
       doesNotThrow(() => new SchemaAST.IndexSignature(Schema.String.ast, Schema.Number.ast))
@@ -695,6 +725,25 @@ describe("SchemaAST", () => {
         () => new SchemaAST.IndexSignature(StringFromBoolean.ast, Schema.Number.ast),
         new Error("Invalid index signature parameter String")
       )
+      throws(
+        () =>
+          new SchemaAST.IndexSignature(
+            Schema.Union([Schema.String, StringFromBoolean]).ast,
+            Schema.Number.ast
+          ),
+        new Error("Invalid index signature parameter Union")
+      )
+
+      const UnionFromBoolean = Schema.Boolean.pipe(
+        Schema.decodeTo(Schema.Union([Schema.String, Schema.Number]), {
+          decode: SchemaGetter.transform((b: boolean): string | number => b ? "true" : 0),
+          encode: SchemaGetter.transform((_value: string | number) => true)
+        })
+      )
+      throws(
+        () => new SchemaAST.IndexSignature(UnionFromBoolean.ast, Schema.Number.ast),
+        new Error("Invalid index signature parameter Union")
+      )
     })
   })
 })
diff --git a/repos/effect/packages/effect/test/schema/SchemaCompilerApi.test.ts b/repos/effect/packages/effect/test/schema/SchemaCompilerApi.test.ts
new file mode 100644
index 000000000..66bc4a6c9
--- /dev/null
+++ b/repos/effect/packages/effect/test/schema/SchemaCompilerApi.test.ts
@@ -0,0 +1,342 @@
+import { assert, describe, it, vi } from "@effect/vitest"
+import { Effect, Schema, SchemaAST, SchemaParser } from "effect"
+import { SchemaCompiler, SchemaJITCompiler } from "effect/unstable/schema"
+import { deepStrictEqual, strictEqual, throws } from "../utils/assert.ts"
+
+describe("SchemaCompiler", () => {
+  it("resolves a type guard on first invocation", () => {
+    const schema = Schema.String.annotate({ title: "lazy type guard" })
+    const ast = SchemaAST.toType(schema.ast)
+    const guard = SchemaParser.is(schema)
+    let calls = 0
+
+    SchemaCompiler.set(ast, {
+      is: () => {
+        calls++
+        return true
+      },
+      decodeEffect: Effect.succeed
+    })
+
+    strictEqual(guard(1), true)
+    strictEqual(guard(2), true)
+    strictEqual(calls, 2)
+
+    SchemaCompiler.set(ast, {
+      is: () => false,
+      decodeEffect: Effect.succeed
+    })
+
+    strictEqual(guard(3), true)
+    strictEqual(SchemaParser.is(schema)(3), false)
+    strictEqual(calls, 3)
+  })
+
+  it("reuses interpreted candidates inside a selectively compiled Union", () => {
+    const child = Schema.String.annotate({ title: "interpreted Union candidate" })
+    const schema = Schema.Union([child, Schema.Number])
+    const initialize = vi.spyOn(child.ast, "getParser")
+    try {
+      SchemaJITCompiler.enable(schema.ast)
+      const make = SchemaParser.make(schema)
+      strictEqual(make("first"), "first")
+      strictEqual(make("second"), "second")
+      strictEqual(initialize.mock.calls.length, 1)
+    } finally {
+      initialize.mockRestore()
+    }
+  })
+
+  it("installs a decoder in the shared registry", () => {
+    const schema = Schema.Struct({ value: Schema.String })
+    const early = SchemaParser.decodeUnknownSync(schema)
+    deepStrictEqual(early({ value: "interpreted" }), { value: "interpreted" })
+
+    let decodes = 0
+    SchemaCompiler.set(schema.ast, {
+      is: () => true,
+      decode: (_input, options) =>
+        options.reportInput === true
+          ? { value: "compiled" }
+          : SchemaCompiler.invalid,
+      decodeEffect: () => {
+        decodes++
+        return Effect.succeed({ value: "detailed" })
+      }
+    })
+
+    const late = SchemaParser.decodeUnknownSync(schema)
+    deepStrictEqual(late({ value: 1 }, { reportInput: true }), { value: "compiled" })
+    deepStrictEqual(late({ value: 1 }), { value: "detailed" })
+    strictEqual(decodes, 1)
+
+    // Parsers that resolved the old entry before set keep using it.
+    deepStrictEqual(early({ value: "interpreted" }), { value: "interpreted" })
+  })
+
+  it("uses is only for type guards", () => {
+    const schema = Schema.Struct({ value: Schema.String })
+    let validations = 0
+    SchemaCompiler.set(schema.ast, {
+      is: (input, options) => {
+        strictEqual(options, SchemaAST.defaultParseOptions)
+        return (input as { readonly value?: unknown }).value === "accepted"
+      },
+      decode: (input) => {
+        validations++
+        return input
+      },
+      decodeEffect: Effect.succeed
+    })
+
+    strictEqual(SchemaParser.is(schema)({ value: "accepted" }), true)
+    strictEqual(SchemaParser.is(schema)({ value: "rejected" }), false)
+    deepStrictEqual(SchemaParser.decodeUnknownSync(schema)({ value: "decoded" }), { value: "decoded" })
+    strictEqual(validations, 1)
+  })
+
+  it("retains one resolved entry across sync option paths", () => {
+    for (const direction of ["decode", "encode"]) {
+      for (const firstOptions of [undefined, { reportInput: true }]) {
+        const schema = Schema.Struct({ value: Schema.String })
+        const makeSync = () =>
+          direction === "decode"
+            ? SchemaParser.decodeUnknownSync(schema)
+            : SchemaParser.encodeUnknownSync(schema)
+        const decode = makeSync()
+        const input = { value: "original" }
+        deepStrictEqual(decode(input, firstOptions), input)
+
+        SchemaCompiler.set(schema.ast, {
+          decode: () => ({ value: "replacement" }),
+          decodeEffect: () => Effect.succeed({ value: "replacement" })
+        })
+
+        deepStrictEqual(decode(input), input)
+        deepStrictEqual(decode(input, { reportInput: true }), input)
+        deepStrictEqual(makeSync()(input), { value: "replacement" })
+      }
+    }
+  })
+
+  it("does not resolve child operations until the child is parsed", () => {
+    const child = Schema.String.annotate({ title: "lazy child" })
+    let reads = 0
+    SchemaCompiler.set(child.ast, {
+      get decode() {
+        reads++
+        return undefined
+      },
+      get decodeEffect() {
+        reads++
+        return Effect.succeed
+      }
+    })
+    const schema = Schema.Struct({ first: Schema.Number, child })
+    const decode = SchemaParser.decodeUnknownSync(schema)
+    throws(() => decode({ first: "invalid", child: "unreached" }))
+    strictEqual(reads, 0)
+    deepStrictEqual(decode({ first: 1, child: "reached" }), { first: 1, child: "reached" })
+    strictEqual(reads, 2)
+    deepStrictEqual(decode({ first: 2, child: "cached" }), { first: 2, child: "cached" })
+    strictEqual(reads, 2)
+  })
+
+  it("uses an installed child decoder from an interpreted Array", () => {
+    const child = Schema.String.annotate({ title: "installed array child" })
+    SchemaCompiler.set(child.ast, {
+      decode: (input) => typeof input === "string" ? `${input}!` : SchemaCompiler.invalid,
+      decodeEffect: (input) => Effect.succeed(`${input}!`)
+    })
+
+    deepStrictEqual(
+      SchemaParser.decodeUnknownSync(Schema.Array(child))(["a"]),
+      ["a!"]
+    )
+  })
+
+  it("exposes the canonical missing value to installed decoders", () => {
+    const schema = Schema.Struct({ value: Schema.optionalKey(Schema.String) })
+    assert(schema.ast._tag === "Objects")
+    const value = schema.ast.propertySignatures[0].type
+    let sawMissing = false
+    SchemaCompiler.set(value, {
+      decode: (input) => typeof input === "string" ? input : SchemaCompiler.invalid,
+      decodeEffect: (input) => {
+        sawMissing = input === SchemaCompiler.missing
+        return Effect.succeed(input)
+      }
+    })
+
+    deepStrictEqual(SchemaParser.decodeUnknownSync(schema)({}), {})
+    strictEqual(sawMissing, true)
+  })
+
+  it("installs encoders on the flipped AST", () => {
+    const schema = Schema.FiniteFromString
+    SchemaCompiler.set(SchemaAST.flip(schema.ast), {
+      decode: () => "aot",
+      decodeEffect: () => Effect.succeed("detailed")
+    })
+
+    strictEqual(SchemaParser.encodeUnknownSync(schema)(1), "aot")
+  })
+})
+
+describe("SchemaJITCompiler", () => {
+  it("reuses option-independent generated functions for explicit options", () => {
+    const schema = Schema.Struct({ nested: Schema.Struct({ value: Schema.String }) })
+    const input = { nested: { value: "valid" } }
+    const Function = globalThis.Function
+    let constructions = 0
+    try {
+      globalThis.Function = ((...args: ReadonlyArray<string>) => {
+        constructions++
+        return Function(...args)
+      }) as FunctionConstructor
+
+      SchemaJITCompiler.enable(schema.ast)
+      const decode = SchemaParser.decodeUnknownSync(schema)
+      deepStrictEqual(decode(input), input)
+      strictEqual(SchemaParser.is(schema)(input), true)
+      const initialized = constructions
+      assert(initialized > 1)
+      for (const options of [{}, { reportInput: true }, { errors: "all" }, { disableChecks: true }] as const) {
+        deepStrictEqual(decode(input, options), input)
+        strictEqual(SchemaParser.is(schema)(input), true)
+        strictEqual(constructions, initialized)
+      }
+    } finally {
+      globalThis.Function = Function
+    }
+  })
+
+  it("keeps generated operations lazy", () => {
+    const schema = Schema.Struct({ value: Schema.String })
+    const Function = globalThis.Function
+    let constructions = 0
+    try {
+      globalThis.Function = ((...args: ReadonlyArray<string>) => {
+        constructions++
+        return Function(...args)
+      }) as FunctionConstructor
+
+      SchemaJITCompiler.enable(schema.ast)
+      strictEqual(constructions, 1)
+      deepStrictEqual(SchemaParser.decodeUnknownSync(schema)({ value: "valid" }), { value: "valid" })
+      assert(constructions > 1)
+    } finally {
+      globalThis.Function = Function
+    }
+  })
+
+  it("replaces only the selected AST and leaves resolved parsers intact", () => {
+    const selected = Schema.Struct({ value: Schema.String })
+    const untouched = Schema.Struct({ value: Schema.String })
+    const early = SchemaParser.decodeUnknownSync(selected)
+    deepStrictEqual(early({ value: "valid" }), { value: "valid" })
+
+    SchemaJITCompiler.enable(selected.ast)
+
+    let earlyReads = 0
+    throws(() =>
+      early({
+        get value() {
+          earlyReads++
+          return 1
+        }
+      })
+    )
+    strictEqual(earlyReads, 1)
+
+    let selectedReads = 0
+    throws(() =>
+      SchemaParser.decodeUnknownSync(selected)({
+        get value() {
+          selectedReads++
+          return 1
+        }
+      })
+    )
+    strictEqual(selectedReads, 2)
+
+    let untouchedReads = 0
+    throws(() =>
+      SchemaParser.decodeUnknownSync(untouched)({
+        get value() {
+          untouchedReads++
+          return 1
+        }
+      })
+    )
+    strictEqual(untouchedReads, 1)
+  })
+
+  it("compiles descendants through an unsupported lazy root", () => {
+    const child = Schema.Struct({ value: Schema.String })
+    const schema = Schema.suspend(() => child)
+    SchemaJITCompiler.enable(schema.ast)
+
+    let reads = 0
+    throws(() =>
+      SchemaParser.decodeUnknownSync(schema)({
+        get value() {
+          reads++
+          return 1
+        }
+      })
+    )
+    strictEqual(reads, 2)
+  })
+
+  it("prepares declaration type parameters with the selective compiler on first use", () => {
+    const child = Schema.Struct({ value: Schema.String })
+    const schema = Schema.ReadonlySet(child)
+    SchemaJITCompiler.enable(schema.ast)
+    const decode = SchemaParser.decodeUnknownSync(schema)
+    deepStrictEqual(decode(new Set([{ value: "a", extra: true }])), new Set([{ value: "a" }]))
+    throws(() => decode(new Set([{ value: 1 }])))
+  })
+
+  it("does not initialize unused declaration type parameter operations", () => {
+    const child = Schema.Struct({ value: Schema.String })
+    let reads = 0
+    SchemaCompiler.set(child.ast, {
+      get decode() {
+        reads++
+        return undefined
+      },
+      get decodeEffect() {
+        reads++
+        return Effect.succeed
+      }
+    })
+    const schema = Schema.ReadonlySet(child)
+    SchemaJITCompiler.enable(schema.ast)
+    const decode = SchemaParser.decodeUnknownSync(schema)
+    strictEqual(reads, 0)
+    deepStrictEqual(decode(new Set()), new Set())
+    strictEqual(reads, 0)
+    deepStrictEqual(decode(new Set([{ value: "a" }])), new Set([{ value: "a" }]))
+    strictEqual(reads, 2)
+  })
+
+  it("preserves an installed decoder when dynamic code generation is unavailable", () => {
+    const schema = Schema.Struct({ value: Schema.String })
+    SchemaCompiler.set(schema.ast, {
+      decode: () => ({ value: "installed" }),
+      decodeEffect: () => Effect.succeed({ value: "installed" })
+    })
+    const Function = globalThis.Function
+    try {
+      globalThis.Function = (() => {
+        throw new Error("dynamic function generation unavailable")
+      }) as any
+      SchemaJITCompiler.enable(schema.ast)
+    } finally {
+      globalThis.Function = Function
+    }
+
+    deepStrictEqual(SchemaParser.decodeUnknownSync(schema)({ value: 1 }), { value: "installed" })
+  })
+})
diff --git a/repos/effect/packages/effect/test/schema/SchemaCompilerArray.test.ts b/repos/effect/packages/effect/test/schema/SchemaCompilerArray.test.ts
new file mode 100644
index 000000000..637f31194
--- /dev/null
+++ b/repos/effect/packages/effect/test/schema/SchemaCompilerArray.test.ts
@@ -0,0 +1,105 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Deferred, Effect, Fiber, Schema, SchemaGetter, SchemaParser } from "effect"
+import { SchemaCompiler, SchemaJITCompiler } from "effect/unstable/schema"
+
+describe("compiled homogeneous Array traversal", () => {
+  it.effect("keeps detailed errors and sparse input behavior", () =>
+    Effect.gen(function*() {
+      const schema = Schema.Array(Schema.NumberFromString)
+      const inputs = [["1", "2"], ["bad", "2"], ["1", "bad", "bad"], new Array(2)]
+      const snapshot = Effect.fnUntraced(function*() {
+        const parse = SchemaParser.decodeUnknownEffect(schema)
+        const results = []
+        for (const errors of ["first", "all"] as const) {
+          for (const input of inputs) {
+            results.push(yield* Effect.result(parse(input, { errors })))
+          }
+        }
+        return results
+      })
+      const interpreted = yield* snapshot()
+      SchemaJITCompiler.enable(schema.ast)
+      assert.deepStrictEqual(yield* snapshot(), interpreted)
+    }))
+
+  it.effect("resumes without replaying the pending element or rereading its accessor", () =>
+    Effect.gen(function*() {
+      const events: Array<string> = []
+      const element = Schema.String.pipe(Schema.decode({
+        decode: SchemaGetter.transformEffect((value) =>
+          Effect.gen(function*() {
+            events.push(value)
+            yield* Effect.yieldNow
+            return value.toUpperCase()
+          })
+        ),
+        encode: SchemaGetter.passthrough()
+      }))
+      const schema = Schema.Array(element)
+      let reads = 0
+      const input = ["a", "b"]
+      Object.defineProperty(input, "0", {
+        get() {
+          reads++
+          return "a"
+        }
+      })
+      SchemaJITCompiler.enable(schema.ast)
+      assert.deepStrictEqual(yield* SchemaParser.decodeUnknownEffect(schema)(input), ["A", "B"])
+      assert.deepStrictEqual(events, ["a", "b"])
+      assert.strictEqual(reads, 1)
+    }))
+
+  it("passes missing constructor results to the shared element step", () => {
+    for (const optional of [false, true]) {
+      const required = Schema.String.annotate({ title: "Array constructor element" })
+      const element = optional ? Schema.optionalKey(required) : required
+      SchemaCompiler.set(element.ast, {
+        decodeEffect: Effect.succeed,
+        makeEffect: () => Effect.succeed(SchemaCompiler.missing)
+      })
+      const schema = Schema.Array(element)
+      SchemaJITCompiler.enable(schema.ast)
+      const make = SchemaParser.make(schema)
+      if (optional) {
+        const output = make(["a"])
+        assert.strictEqual(output.length, 1)
+        assert.strictEqual(0 in output, false)
+      } else {
+        assert.throws(() => make(["a"]), /Schema validation failed/)
+      }
+    }
+  })
+
+  it.effect("keeps bounded concurrency on the interpreter's concurrent traversal", () =>
+    Effect.gen(function*() {
+      const started = yield* Effect.forEach([0, 1, 2], () => Deferred.make<void>())
+      const releases = yield* Effect.forEach([0, 1, 2], () => Deferred.make<void>())
+      const calls = [0, 0, 0]
+      const element = Schema.Number.pipe(Schema.decode({
+        decode: SchemaGetter.transformEffect((index) =>
+          Effect.gen(function*() {
+            calls[index]++
+            yield* Deferred.succeed(started[index], undefined)
+            yield* Deferred.await(releases[index])
+            return index
+          })
+        ),
+        encode: SchemaGetter.passthrough()
+      }))
+      const schema = Schema.Array(element)
+      SchemaJITCompiler.enable(schema.ast)
+      const fiber = yield* SchemaParser.decodeUnknownEffect(schema)([0, 1, 2], { concurrency: 2 }).pipe(
+        Effect.forkChild
+      )
+      yield* Deferred.await(started[0])
+      yield* Deferred.await(started[1])
+      assert.strictEqual(yield* Deferred.isDone(started[2]), false)
+      yield* Deferred.succeed(releases[0], undefined)
+      yield* Deferred.await(started[2])
+      yield* Deferred.succeed(releases[1], undefined)
+      yield* Deferred.succeed(releases[2], undefined)
+      assert.deepStrictEqual(yield* Fiber.join(fiber), [0, 1, 2])
+      assert.deepStrictEqual(calls, [1, 1, 1])
+    }))
+})
diff --git a/repos/effect/packages/effect/test/schema/SchemaCompilerConcurrency.test.ts b/repos/effect/packages/effect/test/schema/SchemaCompilerConcurrency.test.ts
new file mode 100644
index 000000000..a4f584c37
--- /dev/null
+++ b/repos/effect/packages/effect/test/schema/SchemaCompilerConcurrency.test.ts
@@ -0,0 +1,38 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Deferred, Effect, Fiber, Schema, SchemaParser } from "effect"
+import { SchemaJITCompiler } from "effect/unstable/schema"
+
+describe("compiled construction concurrency", () => {
+  for (const product of ["Struct", "Tuple"] as const) {
+    it.effect(`${product} preserves bounded concurrency and runs defaults once`, () =>
+      Effect.gen(function*() {
+        const started = yield* Effect.forEach([0, 1, 2], () => Deferred.make<void>())
+        const releases = yield* Effect.forEach([0, 1, 2], () => Deferred.make<void>())
+        const calls = [0, 0, 0]
+        const fields = [0, 1, 2].map((index) =>
+          Schema.Number.pipe(Schema.withConstructorDefault(Effect.gen(function*() {
+            calls[index]++
+            yield* Deferred.succeed(started[index], undefined)
+            yield* Deferred.await(releases[index])
+            return index
+          })))
+        )
+        const schema: Schema.Codec<unknown> = product === "Struct"
+          ? Schema.Struct({ a: fields[0], b: fields[1], c: fields[2] })
+          : Schema.Tuple(fields)
+        SchemaJITCompiler.enable(schema.ast)
+        const fiber = yield* SchemaParser.makeEffect(schema)(product === "Struct" ? {} : [], {
+          parseOptions: { concurrency: 2 }
+        }).pipe(Effect.forkChild)
+        yield* Deferred.await(started[0])
+        yield* Deferred.await(started[1])
+        assert.strictEqual(yield* Deferred.isDone(started[2]), false)
+        yield* Deferred.succeed(releases[0], undefined)
+        yield* Deferred.await(started[2])
+        yield* Deferred.succeed(releases[1], undefined)
+        yield* Deferred.succeed(releases[2], undefined)
+        assert.deepStrictEqual(yield* Fiber.join(fiber), product === "Struct" ? { a: 0, b: 1, c: 2 } : [0, 1, 2])
+        assert.deepStrictEqual(calls, [1, 1, 1])
+      }))
+  }
+})
diff --git a/repos/effect/packages/effect/test/schema/SchemaCompilerConstruction.test.ts b/repos/effect/packages/effect/test/schema/SchemaCompilerConstruction.test.ts
new file mode 100644
index 000000000..148e4904d
--- /dev/null
+++ b/repos/effect/packages/effect/test/schema/SchemaCompilerConstruction.test.ts
@@ -0,0 +1,359 @@
+import { assert, describe, it, vi } from "@effect/vitest"
+import { Effect, Schema, SchemaAST, SchemaParser } from "effect"
+import * as Codegen from "effect/internal/schema/codegen"
+import * as Registry from "effect/internal/schema/compilerRegistry"
+import { SchemaCompiler, SchemaJITCompiler } from "effect/unstable/schema"
+import { constructionCases, constructionEvents, constructionOptions } from "./fixtures/construction.ts"
+
+describe("Schema compiler construction", { concurrent: false }, () => {
+  it.effect("matches interpreted construction, effects and options", () =>
+    Effect.gen(function*() {
+      const fixtures = Object.entries(constructionCases)
+      const snapshot = Effect.fnUntraced(function*(fixture: typeof fixtures[number][1]) {
+        const out = []
+        const make = SchemaParser.makeEffect(fixture.schema)
+        for (const parseOptions of constructionOptions) {
+          for (const input of fixture.inputs) {
+            constructionEvents.length = 0
+            const result = yield* Effect.result(make(input as never, { parseOptions }))
+            out.push({ result, events: [...constructionEvents] })
+          }
+        }
+        return out
+      })
+      // Capture every interpreted result before installing shared child ASTs.
+      const interpreted = yield* Effect.forEach(fixtures, ([, fixture]) => snapshot(fixture))
+      for (const [index, [name, fixture]] of fixtures.entries()) {
+        SchemaJITCompiler.enable(SchemaAST.toType(fixture.schema.ast))
+        assert.deepStrictEqual(yield* snapshot(fixture), interpreted[index], name)
+      }
+    }))
+
+  it("keeps selective compilation below an interpreted Suspend", () => {
+    let forced = 0
+    const child = Schema.Struct({ value: Schema.String })
+    const schema = Schema.suspend(() => {
+      forced++
+      return child
+    })
+    SchemaJITCompiler.enable(SchemaAST.toType(schema.ast))
+    assert.strictEqual(forced, 0)
+    assert.deepStrictEqual(SchemaParser.make(schema)({ value: "a" }), { value: "a" })
+    assert.strictEqual(forced, 1)
+  })
+
+  it("compiles only the raw constructor when construction succeeds", () => {
+    const schema = Schema.Struct({ a: Schema.String })
+    const emit = vi.spyOn(Codegen, "generate")
+    try {
+      SchemaJITCompiler.enable(schema.ast)
+      assert.deepStrictEqual(SchemaParser.make(schema)({ a: "a" }), { a: "a" })
+      assert.strictEqual(
+        emit.mock.calls.filter(([, operation]) => operation === "decode" || operation === "is").length,
+        0
+      )
+      assert.strictEqual(emit.mock.calls.filter(([, operation]) => operation === "make").length, 1)
+      assert.strictEqual(emit.mock.calls.filter(([, operation]) => operation === "makeEffect").length, 0)
+    } finally {
+      emit.mockRestore()
+    }
+  })
+
+  it("does not compile construction when only decoding is used", () => {
+    const schema = Schema.Struct({ a: Schema.String })
+    const emit = vi.spyOn(Codegen, "generate")
+    try {
+      SchemaJITCompiler.enable(schema.ast)
+      assert.deepStrictEqual(SchemaParser.decodeUnknownSync(schema)({ a: "a" }), { a: "a" })
+      assert.strictEqual(emit.mock.calls.filter(([, operation]) => operation === "makeEffect").length, 0)
+      assert.deepStrictEqual(SchemaParser.make(schema)({ a: "a" }), { a: "a" })
+      assert.strictEqual(emit.mock.calls.filter(([, operation]) => operation === "make").length, 1)
+      assert.strictEqual(emit.mock.calls.filter(([, operation]) => operation === "makeEffect").length, 0)
+    } finally {
+      emit.mockRestore()
+    }
+  })
+
+  for (const compiled of [false, true]) {
+    it(`initializes only reached constructor children, compiled=${compiled}`, () => {
+      const child = Schema.String.annotate({ title: "lazy constructor child" })
+      let reads = 0
+      const decoder: SchemaCompiler.CompiledDecoder = Object.freeze({
+        decodeEffect: Effect.succeed,
+        get makeEffect() {
+          assert.strictEqual<unknown>(this, decoder)
+          reads++
+          return Effect.succeed
+        }
+      })
+      SchemaCompiler.set(child.ast, decoder)
+      const schema = Schema.Struct({ first: Schema.Number, child })
+      if (compiled) SchemaJITCompiler.enable(schema.ast)
+      const make = SchemaParser.make(schema)
+      assert.throws(() => make({ first: "invalid", child: "unreached" } as never))
+      assert.strictEqual(reads, 0)
+      assert.deepStrictEqual(make({ first: 1, child: "a" }), { first: 1, child: "a" })
+      assert.deepStrictEqual(make({ first: 2, child: "b" }), { first: 2, child: "b" })
+      assert.strictEqual(reads, 1)
+    })
+  }
+
+  it("prepares selective Declaration parameters for public decoders in the callback", () => {
+    const child = Schema.Struct({ value: Schema.String })
+    const schema = Schema.ReadonlySet(child)
+    SchemaJITCompiler.enable(SchemaAST.toType(schema.ast))
+    assert.deepStrictEqual(SchemaParser.make(schema)(new Set([{ value: "a" }])), new Set([{ value: "a" }]))
+    assert.strictEqual(Registry.resolve(child.ast).compiled !== undefined, true)
+  })
+
+  it("does not restart a parent if compilation fails after a default", () => {
+    let defaults = 0
+    const child = Schema.Struct({ value: Schema.String })
+    const schema = Schema.Struct({
+      child: child.pipe(Schema.withConstructorDefault(Effect.sync(() => {
+        defaults++
+        return { value: "default" }
+      })))
+    })
+    const childAST = schema.fields.child.ast
+    const emit = Codegen.generate
+    const failure = vi.spyOn(Codegen, "generate").mockImplementation((ast, operation) => {
+      if (ast === childAST && operation === "makeEffect") {
+        assert.strictEqual(defaults, 1)
+        throw new Error("child compile failed")
+      }
+      return emit(ast, operation)
+    })
+    try {
+      SchemaJITCompiler.enable(schema.ast)
+      assert.deepStrictEqual(SchemaParser.make(schema)({}), { child: { value: "default" } })
+      assert.strictEqual(defaults, 1)
+    } finally {
+      failure.mockRestore()
+    }
+  })
+
+  for (const operation of ["make", "decode"] as const) {
+    it(`keeps the other operation compiled after ${operation} compilation fails`, () => {
+      const schema = Schema.Struct({ a: Schema.String })
+      SchemaJITCompiler.enable(schema.ast)
+      const generate = Codegen.generate
+      const failed = vi.spyOn(Codegen, "generate").mockImplementation((ast, key) => {
+        if (ast === schema.ast && key === (operation === "make" ? "make" : "decode")) {
+          throw new Error("compile failed")
+        }
+        return generate(ast, key)
+      })
+      try {
+        const first = operation === "make" ? SchemaParser.make(schema) : SchemaParser.decodeUnknownSync(schema)
+        assert.deepStrictEqual(first({ a: "a" }), { a: "a" })
+        const second = operation === "make" ? SchemaParser.decodeUnknownSync(schema) : SchemaParser.make(schema)
+        assert.deepStrictEqual(second({ a: "a" }), { a: "a" })
+        assert(
+          failed.mock.calls.some(([ast, key]) =>
+            ast === schema.ast && key === (operation === "make" ? "decode" : "make")
+          )
+        )
+      } finally {
+        failed.mockRestore()
+      }
+    })
+  }
+  it("resolves installed construction lazily and independently from decoding", () => {
+    const schema = Schema.Struct({ a: Schema.String })
+    let reads = 0
+    let calls = 0
+    SchemaCompiler.set(schema.ast, {
+      get decodeEffect(): SchemaCompiler.DecodeEffect {
+        throw new Error("unused decoder")
+      },
+      get decode(): SchemaCompiler.Decode {
+        throw new Error("unused fast decoder")
+      },
+      get is(): SchemaCompiler.Is {
+        throw new Error("unused guard")
+      },
+      get makeEffect() {
+        reads++
+        return (input: unknown) => {
+          calls++
+          return Effect.succeed(input)
+        }
+      }
+    })
+    const make = SchemaParser.make(schema)
+    assert.strictEqual(reads, 0)
+    assert.deepStrictEqual(make({ a: "a" }), { a: "a" })
+    assert.deepStrictEqual(SchemaParser.make(schema)({ a: "b" }), { a: "b" })
+    assert.strictEqual(reads, 1)
+    assert.strictEqual(calls, 2)
+  })
+
+  it("uses an installed synchronous constructor without resolving makeEffect", () => {
+    const schema = Schema.Struct({ a: Schema.String })
+    let calls = 0
+    SchemaCompiler.set(schema.ast, {
+      decodeEffect: Effect.succeed,
+      make: (input, options) => {
+        calls++
+        assert.strictEqual(options, SchemaAST.defaultParseOptions)
+        return { a: `${(input as { readonly a: string }).a}!` }
+      },
+      get makeEffect(): SchemaCompiler.MakeEffect {
+        throw new Error("unused detailed constructor")
+      }
+    })
+    assert.deepStrictEqual(SchemaParser.make(schema)({ a: "a" }), { a: "a!" })
+    assert.strictEqual(calls, 1)
+  })
+
+  it("falls back to makeEffect after an installed synchronous constructor fails", () => {
+    const schema = Schema.Struct({ a: Schema.String })
+    let fast = 0
+    let detailed = 0
+    SchemaCompiler.set(schema.ast, {
+      decodeEffect: Effect.succeed,
+      make: () => {
+        fast++
+        return SchemaCompiler.invalid
+      },
+      makeEffect: (input) => {
+        detailed++
+        return Effect.succeed(input)
+      }
+    })
+    assert.deepStrictEqual(SchemaParser.make(schema)({ a: "a" }), { a: "a" })
+    assert.strictEqual(fast, 1)
+    assert.strictEqual(detailed, 1)
+  })
+
+  it("does not return a missing result from an installed synchronous constructor", () => {
+    const schema = Schema.Struct({ a: Schema.String })
+    SchemaCompiler.set(schema.ast, {
+      decodeEffect: Effect.succeed,
+      make: () => SchemaCompiler.missing,
+      makeEffect: () => Effect.succeed(SchemaCompiler.missing)
+    })
+    assert.throws(() => SchemaParser.make(schema)({ a: "a" }), /Schema validation failed/)
+  })
+
+  it("composes an installed synchronous child constructor in a compiled Array", () => {
+    const child = Schema.Struct({ a: Schema.String })
+    SchemaCompiler.set(child.ast, {
+      decodeEffect: Effect.succeed,
+      make: (input) => ({ a: `${(input as { readonly a: string }).a}!` }),
+      makeEffect: () => {
+        throw new Error("unused detailed child constructor")
+      }
+    })
+    const schema = Schema.Array(child)
+    SchemaJITCompiler.enable(schema.ast)
+    assert.deepStrictEqual(SchemaParser.make(schema)([{ a: "a" }, { a: "b" }]), [{ a: "a!" }, { a: "b!" }])
+  })
+
+  it("composes a compiled synchronous child constructor in a compiled Array", () => {
+    const child = Schema.Struct({ a: Schema.String })
+    SchemaJITCompiler.enable(child.ast)
+    const childEntry = Registry.resolve(child.ast)
+    const schema = Schema.Array(child)
+    SchemaJITCompiler.enable(schema.ast)
+    assert.deepStrictEqual(SchemaParser.make(schema)([{ a: "a" }]), [{ a: "a" }])
+    assert.isTrue(Object.hasOwn(childEntry, "make"))
+  })
+
+  it("falls back to detailed construction for an invalid compiled Array", () => {
+    const schema = Schema.Array(Schema.Struct({ a: Schema.String }))
+    SchemaJITCompiler.enable(schema.ast)
+    const make = SchemaParser.make(schema)
+    assert.deepStrictEqual(make([{ a: "a" }]), [{ a: "a" }])
+    assert.throws(() => make([{ a: 1 } as never]), /Schema validation failed/)
+  })
+
+  it("caches interpreted construction when an installed bundle omits it", () => {
+    const schema = Schema.Struct({ a: Schema.Number.pipe(Schema.withConstructorDefault(Effect.succeed(1))) })
+    SchemaCompiler.set(schema.ast, {
+      decodeEffect: () => {
+        throw new Error("not a constructor")
+      }
+    })
+    const entry = Registry.resolve(schema.ast)
+    const make = entry.makeEffect
+    assert.strictEqual(entry.makeEffect, make)
+    assert.deepStrictEqual(SchemaParser.make(schema)({}), { a: 1 })
+  })
+
+  it("keeps previously captured constructors after whole-entry replacement", () => {
+    const schema = Schema.Struct({ a: Schema.String })
+    const make = SchemaParser.make(schema)
+    assert.deepStrictEqual(make({ a: "a" }), { a: "a" })
+    SchemaCompiler.set(schema.ast, {
+      decodeEffect: Effect.succeed,
+      makeEffect: () => Effect.succeed({ a: "installed" })
+    })
+    assert.deepStrictEqual(make({ a: "a" }), { a: "a" })
+    assert.deepStrictEqual(SchemaParser.make(schema)({ a: "a" }), { a: "installed" })
+    SchemaCompiler.set(schema.ast, { decodeEffect: Effect.succeed })
+    assert.deepStrictEqual(SchemaParser.make(schema)({ a: "a" }), { a: "a" })
+  })
+
+  it("uses type-side identity without applying root defaults", () => {
+    const schema = Schema.FiniteFromString.pipe(Schema.withConstructorDefault(Effect.succeed(1)))
+    const ast = SchemaAST.toType(schema.ast)
+    SchemaCompiler.set(ast, { decodeEffect: Effect.succeed, makeEffect: Effect.succeed })
+    assert.strictEqual(SchemaParser.make(schema)(2), 2)
+    const number = Schema.Number.pipe(Schema.withConstructorDefault(Effect.succeed(1)))
+    SchemaJITCompiler.enable(number.ast)
+    assert.throws(() => SchemaParser.make(number)(undefined as never))
+    assert.deepStrictEqual(SchemaParser.make(Schema.Struct({ number }))({}), { number: 1 })
+  })
+
+  it("preserves missing separately from undefined for installed children", () => {
+    const child = Schema.optionalKey(Schema.Undefined)
+    const inputs: Array<unknown> = []
+    SchemaCompiler.set(child.ast, {
+      decodeEffect: Effect.succeed,
+      makeEffect: (input) => {
+        inputs.push(input)
+        return Effect.succeed(input)
+      }
+    })
+    const schema = Schema.Struct({ child })
+    assert.deepStrictEqual(SchemaParser.make(schema)({}), {})
+    assert.deepStrictEqual(SchemaParser.make(schema)({ child: undefined }), { child: undefined })
+    assert.deepStrictEqual(inputs, [SchemaCompiler.missing, undefined])
+  })
+
+  it("lets parents and public roots handle missing constructor outputs", () => {
+    const required = Schema.String.annotate({ title: "Required construction output" })
+    const optional = Schema.optionalKey(required)
+    for (const schema of [required, optional]) {
+      SchemaCompiler.set(schema.ast, {
+        decodeEffect: Effect.succeed,
+        makeEffect: () => Effect.succeed(SchemaCompiler.missing)
+      })
+    }
+    const schema = Schema.Struct({ required, optional })
+    SchemaJITCompiler.enable(schema.ast)
+    assert.throws(() => SchemaParser.make(schema)({ required: "a" }), /Schema validation failed/)
+    assert.deepStrictEqual(SchemaParser.make(Schema.Struct({ optional }))({ optional: "a" }), {})
+    assert.throws(() => SchemaParser.make(required)("a"), /Schema validation failed/)
+  })
+
+  it.effect("executes async defaults once, including on later failure", () =>
+    Effect.gen(function*() {
+      let defaults = 0
+      const schema = Schema.Struct({
+        a: Schema.String.pipe(Schema.withConstructorDefault(Effect.gen(function*() {
+          yield* Effect.yieldNow
+          defaults++
+          return "default"
+        }))),
+        b: Schema.Number
+      })
+      SchemaJITCompiler.enable(schema.ast)
+      const make = SchemaParser.makeEffect(schema)
+      assert.deepStrictEqual(yield* make({ b: 1 }), { a: "default", b: 1 })
+      assert.strictEqual((yield* Effect.exit(make({ b: "bad" } as never)))._tag, "Failure")
+      assert.strictEqual(defaults, 2)
+    }))
+})
diff --git a/repos/effect/packages/effect/test/schema/SchemaCompilerRegression.test.ts b/repos/effect/packages/effect/test/schema/SchemaCompilerRegression.test.ts
new file mode 100644
index 000000000..a76106f0e
--- /dev/null
+++ b/repos/effect/packages/effect/test/schema/SchemaCompilerRegression.test.ts
@@ -0,0 +1,458 @@
+import { assert, describe, it } from "@effect/vitest"
+import {
+  Effect,
+  Exit,
+  Option,
+  Result,
+  Schema,
+  SchemaAST,
+  SchemaGetter,
+  SchemaParser,
+  SchemaTransformation
+} from "effect"
+import { SchemaCompiler, SchemaJITCompiler } from "effect/unstable/schema"
+import { deepStrictEqual, strictEqual } from "../utils/assert.ts"
+
+describe("compiler regression contracts", () => {
+  it("preserves template literal issues after compilation", () => {
+    const schema = Schema.TemplateLiteral(["count:", Schema.Int.check(Schema.isGreaterThan(0))])
+    const inputs = ["count:1", "count:0", "count:1.5", "invalid", null]
+    const snapshot = () => {
+      const decode = SchemaParser.decodeUnknownResult(schema)
+      // Diagnostic ASTs contain freshly constructed transformation functions.
+      return inputs.map((input) => Result.mapError(decode(input), (issue) => JSON.stringify(issue)))
+    }
+    const interpreted = snapshot()
+    SchemaJITCompiler.enable(schema.ast)
+    deepStrictEqual(snapshot(), interpreted)
+  })
+
+  it.effect("preserves missing and present undefined through eager and suspended transformations", () =>
+    Effect.gen(function*() {
+      for (const suspended of [false, true]) {
+        const seen: Array<Option.Option<unknown>> = []
+        const schema = Schema.Struct({
+          value: Schema.Unknown.pipe(
+            Schema.decode({
+              decode: SchemaGetter.transformOptionalEffect<unknown, unknown>((input) => {
+                seen.push(input)
+                const output = Option.isNone(input) || input.value === "omit" ? Option.none() : Option.some(undefined)
+                return suspended ? Effect.sync(() => output) : Effect.succeed(output)
+              }),
+              encode: SchemaGetter.passthrough()
+            }),
+            Schema.optionalKey
+          )
+        })
+        for (const compiled of [false, true]) {
+          if (compiled) SchemaJITCompiler.enable(schema.ast)
+          seen.length = 0
+          const decode = SchemaParser.decodeUnknownEffect(schema)
+          deepStrictEqual(yield* decode({}), {})
+          deepStrictEqual(yield* decode({ value: "omit" }), {})
+          deepStrictEqual(yield* decode({ value: "present" }), { value: undefined })
+          deepStrictEqual(seen, [Option.none(), Option.some("omit"), Option.some("present")])
+        }
+      }
+    }))
+
+  it.effect("continues encoding checkpoints after middleware recovery without replaying transformations", () =>
+    Effect.gen(function*() {
+      for (const suspended of [false, true]) {
+        const events: Array<string> = []
+        const schema = Schema.String.pipe(
+          Schema.decodeTo(
+            Schema.Number.check(Schema.isGreaterThan(0)),
+            SchemaTransformation.transform({
+              decode: (input) => {
+                events.push("first")
+                return Number(input)
+              },
+              encode: String
+            })
+          ),
+          Schema.middlewareDecoding((effect) =>
+            Effect.catchEager(effect, () => {
+              events.push("recover")
+              return suspended ? Effect.sync(() => Option.some(1)) : Effect.succeed(Option.some(1))
+            })
+          ),
+          Schema.decodeTo(
+            Schema.String,
+            SchemaTransformation.transform({
+              decode: (input) => {
+                events.push("last")
+                return String(input)
+              },
+              encode: Number
+            })
+          )
+        )
+        for (const compiled of [false, true]) {
+          if (compiled) SchemaJITCompiler.enable(schema.ast)
+          const decode = SchemaParser.decodeUnknownEffect(schema)
+          events.length = 0
+          strictEqual(yield* decode("2"), "2")
+          deepStrictEqual(events, ["first", "last"])
+          events.length = 0
+          strictEqual(yield* decode("-1"), "1")
+          deepStrictEqual(events, ["first", "recover", "last"])
+          events.length = 0
+          strictEqual(yield* decode(false), "1")
+          deepStrictEqual(events, ["recover", "last"])
+        }
+      }
+    }))
+
+  it.effect("resolved parsers return Effects containing their actual output", () =>
+    Effect.gen(function*() {
+      const object = { value: "a" }
+      const cases: ReadonlyArray<readonly [Schema.Codec<unknown>, unknown, unknown]> = [
+        [Schema.String, "a", "a"],
+        [Schema.Number, -0, -0],
+        [Schema.Literal(0), -0, -0],
+        [Schema.Undefined, undefined, undefined],
+        [Schema.ObjectKeyword, object, object],
+        [Schema.Json, object, object],
+        [Schema.Struct({}), 1, 1],
+        [Schema.TemplateLiteral(["a"]), "a", "a"],
+        [Schema.FiniteFromString, "1", 1]
+      ]
+      for (const [schema, input, expected] of cases) {
+        for (const compiled of [false, true]) {
+          if (compiled) SchemaJITCompiler.enable(schema.ast)
+          const parser = SchemaParser.decodeUnknownEffect(schema)
+          const effect = parser(input, SchemaAST.defaultParseOptions)
+          strictEqual(Effect.isEffect(effect), true)
+          const output = yield* Effect.map(effect, (value) => value)
+          strictEqual(Object.is(output, expected), true)
+          const publicEffect = SchemaParser.decodeUnknownEffect(schema)(input)
+          strictEqual(Effect.isEffect(publicEffect), true)
+          strictEqual(Object.is(yield* publicEffect, expected), true)
+        }
+      }
+    }))
+
+  it.effect("retains public success values across subsequent and reentrant parser calls", () =>
+    Effect.gen(function*() {
+      let reenter: (input: unknown) => string
+      const schema = Schema.String.check(
+        Schema.makeFilter((value) => value !== "first" || reenter("nested") === "nested")
+      )
+      for (const compiled of [false, true]) {
+        if (compiled) SchemaJITCompiler.enable(schema.ast)
+        const decode = SchemaParser.decodeUnknownEffect(schema)
+        const decodeSync = SchemaParser.decodeUnknownSync(schema)
+        reenter = decodeSync
+        const first = decode("first")
+        const second = decode("second")
+        strictEqual(
+          yield* Effect.map(first, (value) => {
+            strictEqual(decodeSync("nested"), "nested")
+            return value
+          }),
+          "first"
+        )
+        strictEqual(yield* second, "second")
+        strictEqual(yield* first, "first")
+      }
+    }))
+
+  it.effect("preserves unchanged fields before and after asynchronous transformations", () =>
+    Effect.gen(function*() {
+      const number = Schema.String.pipe(Schema.decodeTo(Schema.Number, {
+        decode: SchemaGetter.transformOptionalEffect((input) =>
+          Effect.yieldNow.pipe(Effect.as(Option.map(input, Number)))
+        ),
+        encode: SchemaGetter.transform(String)
+      }))
+      const tuple = Schema.Tuple([Schema.String, number, Schema.Undefined]).check(
+        Schema.makeFilter((value) => value[0] === "before" && value[1] === 42 && value[2] === undefined)
+      )
+      const struct = Schema.Struct({ before: Schema.String, middle: number, after: Schema.Undefined }).check(
+        Schema.makeFilter((value) => value.before === "before" && value.middle === 42 && value.after === undefined)
+      )
+      for (const compiled of [false, true]) {
+        if (compiled) {
+          SchemaJITCompiler.enable(tuple.ast)
+          SchemaJITCompiler.enable(struct.ast)
+        }
+        deepStrictEqual(
+          yield* SchemaParser.decodeUnknownEffect(tuple)(["before", "42", undefined]),
+          ["before", 42, undefined]
+        )
+        deepStrictEqual(
+          yield* SchemaParser.decodeUnknownEffect(struct)({ before: "before", middle: "42", after: undefined }),
+          { before: "before", middle: 42, after: undefined }
+        )
+      }
+    }))
+
+  it("calls installed operations with options without inspecting extra function properties", () => {
+    const schema = Schema.Struct({ value: Schema.String })
+    const seen: Array<SchemaAST.ParseOptions> = []
+    const is: SchemaCompiler.Is = (_input, options) => {
+      seen.push(options)
+      return true
+    }
+    const decode: SchemaCompiler.Decode = (input, options) => {
+      seen.push(options)
+      return input
+    }
+    for (const operation of [is, decode]) {
+      Object.defineProperty(operation, "default", {
+        get() {
+          throw new Error("Not part of the compiled decoder contract")
+        }
+      })
+    }
+    SchemaCompiler.set(schema.ast, { is, decode, decodeEffect: Effect.succeed })
+    const input = { value: "a" }
+    strictEqual(SchemaParser.is(schema)(input), true)
+    strictEqual(SchemaParser.decodeUnknownSync(schema)(input), input)
+    const options = { reportInput: true }
+    strictEqual(SchemaParser.decodeUnknownSync(schema, options)(input), input)
+    deepStrictEqual(seen, [SchemaAST.defaultParseOptions, SchemaAST.defaultParseOptions, options])
+  })
+
+  it("bounds inlining of shared subgraphs", () => {
+    let schema: Schema.Codec<unknown> = Schema.Struct({ value: Schema.optionalKey(Schema.String) })
+    let valid: unknown = { value: "value" }
+    let invalid: unknown = { value: 1 }
+    for (let i = 0; i < 16; i++) {
+      schema = Schema.Struct({
+        left: Schema.optionalKey(schema),
+        right: Schema.optionalKey(schema)
+      })
+      valid = { left: valid }
+      invalid = { left: invalid }
+    }
+    const cases = [
+      { schema, valid, invalid },
+      { schema, valid: { left: { right: {} } }, invalid: { left: { right: 1 } } },
+      { schema: Schema.Array(schema), valid: [{}], invalid: [1] },
+      { schema: Schema.Union([schema, Schema.String]), valid: {}, invalid: 1 }
+    ]
+    for (const { schema, valid, invalid } of cases) {
+      const expected = SchemaParser.decodeUnknownResult(schema)(invalid)
+      assert(Result.isFailure(expected))
+      SchemaJITCompiler.enable(schema.ast)
+      deepStrictEqual(SchemaParser.decodeUnknownSync(schema)(valid), valid)
+      strictEqual(SchemaParser.is(schema)(valid), true)
+      strictEqual(SchemaParser.is(schema)(invalid), false)
+      deepStrictEqual(SchemaParser.decodeUnknownResult(schema)(invalid), expected)
+    }
+  })
+
+  it("bounds generated composed parsers for wide objects", () => {
+    const property = Schema.optionalKey(Schema.String)
+    const schema = Schema.Struct(Object.fromEntries(
+      Array.from({ length: 4096 }, (_, i) => [`key${i}`, property])
+    ))
+    SchemaJITCompiler.enable(schema.ast)
+    const input = { key4095: "last" }
+    deepStrictEqual(SchemaParser.decodeUnknownSync(schema)(input), input)
+    strictEqual(SchemaParser.is(schema)(input), true)
+    strictEqual(SchemaParser.is(schema)({ key4095: 1 }), false)
+  })
+
+  it("stops oneOf after its second successful candidate", () => {
+    const schema = Schema.Union([
+      Schema.String.check(Schema.isMinLength(1)),
+      Schema.String.check(Schema.isMaxLength(10)),
+      Schema.String.check(Schema.makeFilter(() => {
+        throw new Error("The third candidate must not be evaluated")
+      }))
+    ], { mode: "oneOf" })
+    for (const compiled of [false, true]) {
+      if (compiled) SchemaJITCompiler.enable(schema.ast)
+      strictEqual(SchemaParser.is(schema)("hello"), false)
+      for (const options of [undefined, { errors: "all" }] as const) {
+        const result = SchemaParser.decodeUnknownResult(schema, options)("hello")
+        assert(Result.isFailure(result))
+        strictEqual(result.failure._tag, "OneOf")
+      }
+    }
+  })
+
+  it.effect("accepts both zero signs and preserves the input across parser adapters", () =>
+    Effect.gen(function*() {
+      const options: Array<SchemaAST.ParseOptions | undefined> = [
+        undefined,
+        { errors: "all" },
+        { reportInput: true }
+      ]
+      for (const literal of [0, -0]) {
+        const schemas = [
+          Schema.Literal(literal),
+          Schema.Union([Schema.Literal(literal), Schema.Literal(1)]),
+          Schema.Literal(literal).check(Schema.makeFilter((n) => Object.is(n, -0)))
+        ]
+        for (const schema of schemas) {
+          const nested = Schema.Struct({ values: Schema.Array(schema) })
+          for (const compiled of [false, true]) {
+            if (compiled) {
+              SchemaJITCompiler.enable(schema.ast)
+              SchemaJITCompiler.enable(nested.ast)
+            }
+            for (const input of [0, -0]) {
+              if (schema.ast.checks && !Object.is(input, -0)) {
+                strictEqual(SchemaParser.is(schema)(input), false)
+                assert(Result.isFailure(SchemaParser.decodeUnknownResult(schema)(input)))
+                continue
+              }
+              strictEqual(SchemaParser.is(schema)(input), true)
+              for (const option of options) {
+                strictEqual(Object.is(SchemaParser.decodeUnknownSync(schema, option)(input), input), true)
+                strictEqual(Object.is(SchemaParser.encodeUnknownSync(schema, option)(input), input), true)
+                const result = SchemaParser.decodeUnknownResult(schema, option)(input)
+                assert(Result.isSuccess(result))
+                strictEqual(Object.is(result.success, input), true)
+                const exit = SchemaParser.decodeUnknownExit(schema, option)(input)
+                assert(Exit.isSuccess(exit))
+                strictEqual(Object.is(exit.value, input), true)
+                const optional = SchemaParser.decodeUnknownOption(schema, option)(input)
+                assert(Option.isSome(optional))
+                strictEqual(Object.is(optional.value, input), true)
+                const output = yield* SchemaParser.decodeUnknownEffect(schema, option)(input)
+                strictEqual(Object.is(output, input), true)
+                const decoded = SchemaParser.decodeUnknownSync(nested, option)({ values: [input] })
+                strictEqual(Object.is(decoded.values[0], input), true)
+              }
+            }
+          }
+        }
+      }
+    }))
+
+  it("retains the original encoding AST in local checks", () => {
+    const schema = Schema.NumberFromString.check(
+      Schema.makeFilter((_value, ast) => ast === schema.ast && ast.encoding !== undefined)
+    )
+    strictEqual(SchemaParser.decodeUnknownSync(schema)("1"), 1)
+    SchemaJITCompiler.enable(schema.ast)
+    strictEqual(SchemaParser.decodeUnknownSync(schema)("1"), 1)
+  })
+
+  it("retains the original encoding AST in structural issues", () => {
+    const schema = Schema.String.pipe(Schema.decodeTo(
+      Schema.Number,
+      SchemaTransformation.transform({ decode: () => "invalid" as any, encode: String })
+    ))
+    for (const compiled of [false, true]) {
+      if (compiled) SchemaJITCompiler.enable(schema.ast)
+      const result = SchemaParser.decodeUnknownResult(schema)("input")
+      assert(Result.isFailure(result))
+      assert(result.failure._tag === "InvalidType")
+      strictEqual(result.failure.ast, schema.ast)
+    }
+  })
+
+  it("installs accessors without evaluating them and reads only the selected operation once", () => {
+    const schema = Schema.Struct({ value: Schema.String })
+    const reads: Array<string> = []
+    const decoder = {
+      get is() {
+        strictEqual(this, decoder)
+        reads.push("is")
+        return (_input: unknown) => true
+      },
+      get decode() {
+        strictEqual(this, decoder)
+        reads.push("decode")
+        return (input: unknown) => input
+      },
+      get decodeEffect() {
+        strictEqual(this, decoder)
+        reads.push("decodeEffect")
+        return Effect.succeed
+      }
+    }
+    SchemaCompiler.set(schema.ast, decoder)
+    deepStrictEqual(reads, [])
+    strictEqual(SchemaParser.is(schema)({ value: "a" }), true)
+    strictEqual(SchemaParser.is(schema)({ value: "b" }), true)
+    deepStrictEqual(reads, ["is"])
+    const input = { value: "a" }
+    strictEqual(SchemaParser.decodeUnknownSync(schema)(input), input)
+    strictEqual(SchemaParser.decodeUnknownSync(schema)(input), input)
+    deepStrictEqual(reads, ["is", "decode"])
+  })
+
+  it("memoizes an absent optional operation", () => {
+    const schema = Schema.Struct({ value: Schema.String })
+    let reads = 0
+    SchemaCompiler.set(schema.ast, {
+      get is() {
+        reads++
+        return undefined
+      },
+      decode: (input) => input,
+      decodeEffect: Effect.succeed
+    })
+    strictEqual(SchemaParser.is(schema)({ value: "a" }), true)
+    strictEqual(SchemaParser.is(schema)({ value: "b" }), true)
+    strictEqual(reads, 1)
+  })
+
+  it("shares lazy detailed decoding across public adapters without mutating the supplied decoder", () => {
+    const schema = Schema.Struct({ value: Schema.String })
+    const reads: Array<string> = []
+    const decoder = Object.freeze({
+      get decode() {
+        strictEqual(this, decoder)
+        reads.push("decode")
+        return () => SchemaCompiler.invalid
+      },
+      get decodeEffect() {
+        strictEqual(this, decoder)
+        reads.push("decodeEffect")
+        return Effect.succeed
+      }
+    })
+    SchemaCompiler.set(schema.ast, decoder)
+    const input = { value: "a" }
+    strictEqual(SchemaParser.decodeUnknownSync(schema)(input), input)
+    deepStrictEqual(SchemaParser.decodeUnknownResult(schema)(input), Result.succeed(input))
+    strictEqual(SchemaParser.decodeUnknownSync(schema, { reportInput: true })(input), input)
+    deepStrictEqual(reads, ["decode", "decodeEffect"])
+  })
+
+  it("does not restart validation inside the detailed decoder", () => {
+    const schema = Schema.Struct({ values: Schema.Array(Schema.Struct({ value: Schema.String })) })
+    SchemaJITCompiler.enable(schema.ast)
+    let reads = 0
+    const result = SchemaParser.decodeUnknownResult(schema)({
+      values: [{
+        get value() {
+          reads++
+          return 1
+        }
+      }]
+    })
+    assert(Result.isFailure(result))
+    strictEqual(reads, 2)
+  })
+
+  it("uses the interpreter after selective JIT generation fails", () => {
+    const schema = Schema.Struct({ value: Schema.String })
+    const original = globalThis.Function
+    const defect = new SyntaxError("generated source defect")
+    let attempts = 0
+    try {
+      globalThis.Function = ((...parameters: Array<string>) => {
+        if (parameters.length === 1 && parameters[0] === "return true") return original(...parameters)
+        attempts++
+        throw defect
+      }) as FunctionConstructor
+      SchemaJITCompiler.enable(schema.ast)
+      const decode = SchemaParser.decodeUnknownSync(schema)
+      deepStrictEqual(decode({ value: "a", extra: true }), { value: "a" })
+      assert(Result.isFailure(SchemaParser.decodeUnknownResult(schema)({ value: 1 })))
+      deepStrictEqual(decode({ value: "b" }), { value: "b" })
+      strictEqual(attempts, 1)
+    } finally {
+      globalThis.Function = original
+    }
+  })
+})
diff --git a/repos/effect/packages/effect/test/schema/SchemaCompilerStartup.test.ts b/repos/effect/packages/effect/test/schema/SchemaCompilerStartup.test.ts
new file mode 100644
index 000000000..bc5945d9a
--- /dev/null
+++ b/repos/effect/packages/effect/test/schema/SchemaCompilerStartup.test.ts
@@ -0,0 +1,19 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Schema, SchemaParser } from "effect"
+import * as Registry from "effect/internal/schema/compilerRegistry"
+
+describe("Schema compiler startup", () => {
+  it("allows late global activation without replacing a maker's interpreted entry", async () => {
+    const schema = Schema.Struct({ a: Schema.String })
+    assert.deepStrictEqual(SchemaParser.make(schema)({ a: "a" }), { a: "a" })
+    const before = Registry.resolve(schema.ast)
+    assert.strictEqual(before.compiled, undefined)
+    const unused = Schema.Struct({ a: Schema.Number })
+    const make = SchemaParser.make(unused)
+    await import("effect/unstable/schema/SchemaJITCompiler/enable")
+    assert.strictEqual(Registry.resolve(schema.ast), before)
+    assert.deepStrictEqual(SchemaParser.decodeUnknownSync(schema)({ a: "a" }), { a: "a" })
+    assert.deepStrictEqual(make({ a: 1 }), { a: 1 })
+    assert.strictEqual(Registry.resolve(unused.ast).compiled !== undefined, true)
+  })
+})
diff --git a/repos/effect/packages/effect/test/schema/SchemaGetter.test.ts b/repos/effect/packages/effect/test/schema/SchemaGetter.test.ts
index dd1794d21..40d477c0d 100644
--- a/repos/effect/packages/effect/test/schema/SchemaGetter.test.ts
+++ b/repos/effect/packages/effect/test/schema/SchemaGetter.test.ts
@@ -7,7 +7,7 @@ const formatIssue = SchemaIssue.makeFormatterDefault()
 function makeAsserts<T, E>(getter: SchemaGetter.Getter<T, E>) {
   return async (input: E, expected: T) => {
     const r = await Effect.runPromise(
-      getter.run(Option.some(input), {}).pipe(
+      SchemaGetter.run(getter, Option.some(input), {}).pipe(
         Effect.mapError(formatIssue),
         Effect.result
       )
@@ -20,22 +20,79 @@ describe("SchemaGetter", () => {
   it.effect("forbiddenEncoding", () =>
     Effect.gen(function*() {
       const getter: SchemaGetter.Getter<string, number> = SchemaGetter.forbiddenEncoding
-      const issue = yield* getter.run(Option.some(1), {}).pipe(Effect.flip)
+      const issue = yield* SchemaGetter.run(getter, Option.some(1), {}).pipe(Effect.flip)
 
       assert.strictEqual(issue._tag, "Forbidden")
       assert.strictEqual(formatIssue(issue), "Encoding is not supported")
     }))
 
   it.effect("stringifyJson fails when JSON.stringify returns undefined", () =>
-    SchemaGetter.stringifyJson().run(Option.some(undefined), {}).pipe(
+    SchemaGetter.run(SchemaGetter.stringifyJson(), Option.some(undefined), {}).pipe(
       Effect.flip,
       Effect.map((issue) => assert.strictEqual(issue._tag, "InvalidValue"))
     ))
 
-  it("map", () => {
-    const getter = SchemaGetter.succeed(1).map((t) => t + 1)
-    const result = Effect.runSync(getter.run(Option.some(1), {}))
-    assertSome(result, 2)
+  it.effect("map", () =>
+    Effect.gen(function*() {
+      const getter = SchemaGetter.map(SchemaGetter.succeed(1), (t) => t + 1)
+      const result = yield* SchemaGetter.run(Option.some(1), {})(getter)
+      assertSome(result, 2)
+    }))
+
+  it("map preserves the specialized execution mode", () => {
+    assert.strictEqual(SchemaGetter.map(SchemaGetter.passthrough<number>(), String)._tag, "Transform")
+    assert.strictEqual(SchemaGetter.map(SchemaGetter.transform(Number), String)._tag, "Transform")
+    assert.strictEqual(
+      SchemaGetter.map(
+        SchemaGetter.transformOptional((input: Option.Option<string>) => Option.map(input, Number)),
+        String
+      )._tag,
+      "TransformOptional"
+    )
+    assert.strictEqual(
+      SchemaGetter.map(SchemaGetter.transformEffect((input: string) => Effect.succeed(Number(input))), String)._tag,
+      "TransformEffect"
+    )
+    assert.strictEqual(
+      SchemaGetter.map(
+        SchemaGetter.transformOptionalEffect((input: Option.Option<string>) =>
+          Effect.succeed(Option.map(input, Number))
+        ),
+        String
+      )._tag,
+      "TransformOptionalEffect"
+    )
+  })
+
+  it.effect("compose", () =>
+    Effect.gen(function*() {
+      const first = SchemaGetter.transform<number, string>(Number)
+      const second = SchemaGetter.transform((value: number) => value * 2)
+      const composed = SchemaGetter.compose(first, second)
+
+      assert.strictEqual(composed._tag, "Transform")
+      assertSome(yield* SchemaGetter.run(composed, Option.some("2"), {}), 4)
+      assert.strictEqual(SchemaGetter.compose(SchemaGetter.passthrough<string>(), first), first)
+      assert.strictEqual(SchemaGetter.compose(first, SchemaGetter.passthrough<number>()), first)
+    }))
+
+  it("compose preserves the specialized execution mode", () => {
+    const transform = SchemaGetter.transform<number, string>(Number)
+    const transformNumber = SchemaGetter.transform((value: number) => value + 1)
+    const transformOptional = SchemaGetter.transformOptional<number, number>(Option.map((value) => value + 1))
+    const transformEffect = SchemaGetter.transformEffect((value: number) => Effect.succeed(value + 1))
+    const transformOptionalEffect = SchemaGetter.transformOptionalEffect((input: Option.Option<number>) =>
+      Effect.succeed(Option.map(input, (value) => value + 1))
+    )
+
+    assert.strictEqual(SchemaGetter.compose(transform, transformOptional)._tag, "TransformOptional")
+    assert.strictEqual(SchemaGetter.compose(transform, transformEffect)._tag, "TransformEffect")
+    assert.strictEqual(SchemaGetter.compose(transformOptional, transformNumber)._tag, "TransformOptional")
+    assert.strictEqual(SchemaGetter.compose(transformEffect, transformNumber)._tag, "TransformEffect")
+    assert.strictEqual(SchemaGetter.compose(transformEffect, transformEffect)._tag, "TransformEffect")
+    assert.strictEqual(SchemaGetter.compose(transformOptional, transformEffect)._tag, "TransformOptionalEffect")
+    assert.strictEqual(SchemaGetter.compose(transformEffect, transformOptional)._tag, "TransformOptionalEffect")
+    assert.strictEqual(SchemaGetter.compose(transformOptionalEffect, transformNumber)._tag, "TransformOptionalEffect")
   })
 
   it("dateTimeUtcFromInput", async () => {
@@ -47,6 +104,17 @@ describe("SchemaGetter", () => {
   })
 
   describe("makeTreeRecord", () => {
+    it("preserves array-valued leaves at duplicate paths", () => {
+      deepStrictEqual(
+        SchemaGetter.makeTreeRecord([
+          ["permissions", ["read"]],
+          ["permissions", ["write"]],
+          ["permissions", ["share"]]
+        ]),
+        { permissions: [["read"], ["write"], ["share"]] }
+      )
+    })
+
     it("replaces conflicting leaf values with containers", () => {
       deepStrictEqual(
         SchemaGetter.makeTreeRecord([
@@ -107,6 +175,19 @@ describe("SchemaGetter", () => {
         { a: [{ b: 1 }] }
       )
     })
+
+    it("preserves invalid array index segments as object keys", () => {
+      assert.deepStrictEqual(
+        SchemaGetter.makeTreeRecord([
+          ["leading[01]", "a"],
+          ["overflow[4294967295]", "b"]
+        ]),
+        {
+          leading: { "01": "a" },
+          overflow: { "4294967295": "b" }
+        }
+      )
+    })
   })
 
   describe("decodeFormData / encodeFormData", () => {
diff --git a/repos/effect/packages/effect/test/schema/SchemaJITCompiler.test.ts b/repos/effect/packages/effect/test/schema/SchemaJITCompiler.test.ts
new file mode 100644
index 000000000..7ebcd99e5
--- /dev/null
+++ b/repos/effect/packages/effect/test/schema/SchemaJITCompiler.test.ts
@@ -0,0 +1,817 @@
+import { assert, describe, it } from "@effect/vitest"
+import {
+  Cause,
+  Deferred,
+  Effect,
+  Fiber,
+  Result,
+  Schema,
+  SchemaGetter,
+  SchemaIssue,
+  SchemaParser,
+  SchemaTransformation
+} from "effect"
+import { SchemaCompiler } from "effect/unstable/schema"
+// oxlint-disable-next-line no-unassigned-import
+import "effect/unstable/schema/SchemaJITCompiler/enable"
+import { assertSchemaIssueError, deepStrictEqual, strictEqual, throws } from "../utils/assert.ts"
+
+const schema = Schema.Struct({
+  name: Schema.String,
+  count: Schema.Number,
+  active: Schema.Boolean,
+  nested: Schema.Struct({ value: Schema.String })
+})
+
+const decode = SchemaParser.decodeUnknownSync(schema)
+const is = SchemaParser.is(schema)
+
+describe("SchemaJITCompiler", () => {
+  it.effect("preserves product concurrency", () =>
+    Effect.gen(function*() {
+      const started = yield* Effect.forEach([0, 1, 2], () => Deferred.make<void>())
+      const releases = yield* Effect.forEach([0, 1, 2], () => Deferred.make<void>())
+      const item = Schema.String.pipe(Schema.decode({
+        decode: SchemaGetter.transformEffect((value) => {
+          const index = value.charCodeAt(0) - 97
+          return Deferred.succeed(started[index], undefined).pipe(
+            Effect.andThen(Deferred.await(releases[index])),
+            Effect.as(value)
+          )
+        }),
+        encode: SchemaGetter.passthrough()
+      }))
+      const schema = Schema.Struct({ a: item, b: item, c: item })
+      const fiber = yield* SchemaParser.decodeUnknownEffect(schema)(
+        { a: "a", b: "b", c: "c" },
+        { concurrency: 2 }
+      ).pipe(Effect.forkChild)
+
+      yield* Deferred.await(started[0])
+      yield* Deferred.await(started[1])
+      strictEqual(yield* Deferred.isDone(started[2]), false)
+
+      yield* Deferred.succeed(releases[0], undefined)
+      yield* Deferred.await(started[2])
+      yield* Deferred.succeed(releases[1], undefined)
+      yield* Deferred.succeed(releases[2], undefined)
+
+      deepStrictEqual(yield* Fiber.join(fiber), { a: "a", b: "b", c: "c" })
+    }))
+
+  it("compiles a decoder lazily after import", () => {
+    const input = {
+      name: "a",
+      count: 1,
+      active: true,
+      nested: { value: "b", extra: true },
+      extra: true
+    }
+    const output = decode(input)
+
+    deepStrictEqual(output, {
+      name: "a",
+      count: 1,
+      active: true,
+      nested: { value: "b" }
+    })
+    assert.notStrictEqual(output, input)
+    assert.notStrictEqual(output.nested, input.nested)
+  })
+
+  it("compiles type guards", () => {
+    strictEqual(
+      is({
+        name: "a",
+        count: 1,
+        active: true,
+        nested: { value: "b" }
+      }),
+      true
+    )
+    strictEqual(
+      is({
+        name: 1,
+        count: 1,
+        active: true,
+        nested: { value: "b" }
+      }),
+      false
+    )
+
+    const defect = new Error("boom")
+    let reads = 0
+    throws(() =>
+      is({
+        get name(): string {
+          reads++
+          throw defect
+        },
+        count: 1,
+        active: true,
+        nested: { value: "b" }
+      }), (error) => {
+      assert(error instanceof Error)
+      strictEqual(error.message, "Type guard adapter can only return false for schema issues")
+      assert(Cause.hasDies(error.cause as Cause.Cause<never>))
+    })
+    strictEqual(reads, 1)
+  })
+
+  it("does not confuse a valid value with the invalid sentinel", () => {
+    const schemas = [
+      Schema.Union([Schema.Symbol, Schema.String]),
+      Schema.Union([Schema.UniqueSymbol(SchemaCompiler.invalid), Schema.Literal("valid")])
+    ]
+    for (const schema of schemas) {
+      strictEqual(SchemaParser.is(schema)(SchemaCompiler.invalid), true)
+      strictEqual(SchemaParser.decodeUnknownSync(schema)(SchemaCompiler.invalid), SchemaCompiler.invalid)
+    }
+  })
+
+  it("uses default options in compiled type guards", () => {
+    const structural = Schema.Struct({ value: Schema.String })
+    const is = SchemaParser.is(structural)
+    strictEqual(is({ value: "a" }), true)
+    strictEqual(is({ value: "a", extra: true }), true)
+    strictEqual(is({ value: 1 }), false)
+
+    const checked = Schema.Struct({ a: Schema.String, b: Schema.String }).check(
+      Schema.makeFilter((value, _ast, options) => options.reportInput === true && !Object.hasOwn(value, "extra"))
+    )
+    const input = { b: "b", a: "a", extra: true }
+    strictEqual(SchemaParser.is(checked)(input), false)
+    deepStrictEqual(SchemaParser.decodeUnknownSync(checked)(input, { reportInput: true }), { a: "a", b: "b" })
+    deepStrictEqual(SchemaParser.decodeUnknownSync(checked)(input, { disableChecks: true }), { a: "a", b: "b" })
+    strictEqual(SchemaParser.is(checked)(input), false)
+  })
+
+  it("accepts the invalid sentinel inside a checked composite", () => {
+    const schema = Schema.Struct({ value: Schema.Union([Schema.Symbol, Schema.String]) }).check(
+      Schema.makeFilter(() => true)
+    )
+    const input = { value: SchemaCompiler.invalid }
+    strictEqual(SchemaParser.is(schema)(input), true)
+    deepStrictEqual(SchemaParser.decodeUnknownSync(schema)(input), input)
+  })
+
+  it("keeps runtime options for nested checks, template parts and record keys", () => {
+    const checked = Schema.Struct({
+      nested: Schema.Struct({ value: Schema.String }).check(
+        Schema.makeFilter((_value, _ast, options) => options.reportInput === true)
+      )
+    })
+    const value = { nested: { value: "valid" } }
+    strictEqual(SchemaParser.is(checked)(value), false)
+    deepStrictEqual(SchemaParser.decodeUnknownSync(checked)(value, { reportInput: true }), value)
+
+    const template = Schema.Struct({
+      value: Schema.TemplateLiteral(["prefix-", Schema.String.check(Schema.isMinLength(2))])
+    })
+    strictEqual(SchemaParser.is(template)({ value: "prefix-a" }), false)
+    deepStrictEqual(SchemaParser.decodeUnknownSync(template)({ value: "prefix-a" }, { disableChecks: true }), {
+      value: "prefix-a"
+    })
+    strictEqual(SchemaParser.is(template)({ value: "prefix-a" }), false)
+
+    const record = Schema.Record(Schema.String.check(Schema.isStartsWith("x")), Schema.Number)
+    const decode = SchemaParser.decodeUnknownSync(record)
+    deepStrictEqual(decode({ x: 1, y: 2 }), { x: 1 })
+    deepStrictEqual(decode({ x: 1, y: 2 }, { disableChecks: true }), { x: 1, y: 2 })
+  })
+
+  it("runs the diagnostic phase after fast validation fails", () => {
+    let reads = 0
+    const input = {
+      get name() {
+        reads++
+        return 1
+      },
+      count: 1,
+      active: true,
+      nested: { value: "b" }
+    }
+
+    throws(() => decode(input), (error) => {
+      assertSchemaIssueError(error, `Expected string\n  at ["name"]`)
+    })
+    strictEqual(reads, 2)
+  })
+
+  it("runs one diagnostic pass for a nested failure", () => {
+    let checks = 0
+    const decode = SchemaParser.decodeUnknownSync(Schema.Struct({
+      nested: Schema.Struct({
+        value: Schema.String.check(Schema.makeFilter(() => {
+          checks++
+          return false
+        }))
+      })
+    }))
+
+    throws(() => decode({ nested: { value: "invalid" } }), (error) => {
+      assertSchemaIssueError(
+        error,
+        `Expected <filter>
+  at ["nested"]["value"]`
+      )
+    })
+    strictEqual(checks, 2)
+  })
+
+  it("preserves diagnostics with shared parser helpers", () => {
+    const schema = Schema.Struct({ value: Schema.String })
+    const decode = SchemaParser.decodeUnknownSync(schema)
+
+    deepStrictEqual(decode({ value: "a", extra: true }), { value: "a" })
+    throws(() => decode({ value: 1 }), (error) => {
+      assertSchemaIssueError(
+        error,
+        `Expected string
+  at ["value"]`
+      )
+    })
+    throws(() => decode({ value: "a", extra: true }, { onExcessProperty: "error" }), (error) => {
+      assertSchemaIssueError(
+        error,
+        `Expected no excess property
+  at ["extra"]`
+      )
+    })
+  })
+
+  it("executes transformations and middleware once", () => {
+    let transformations = 0
+    const transformed = Schema.String.pipe(
+      Schema.decodeTo(
+        Schema.String.check(Schema.isMinLength(2)),
+        SchemaTransformation.transform({
+          decode: (value) => {
+            transformations++
+            return value.trim()
+          },
+          encode: (value) => value
+        })
+      )
+    )
+    const decodeTransformed = SchemaParser.decodeUnknownSync(transformed)
+
+    strictEqual(decodeTransformed("  valid  "), "valid")
+    strictEqual(transformations, 1)
+    throws(() => decodeTransformed(" x "))
+    strictEqual(transformations, 2)
+
+    let middlewareRuns = 0
+    const middleware = Schema.Struct({ value: Schema.String }).pipe(
+      Schema.middlewareDecoding((effect) => {
+        middlewareRuns++
+        return effect
+      })
+    )
+
+    deepStrictEqual(SchemaParser.decodeUnknownSync(middleware)({ value: "valid" }), { value: "valid" })
+    strictEqual(middlewareRuns, 1)
+  })
+
+  it("decodes transformed Struct properties with runtime options", () => {
+    const schema = Schema.Struct({
+      first: Schema.FiniteFromString,
+      second: Schema.FiniteFromString
+    })
+
+    const decode = SchemaParser.decodeUnknownSync(schema)
+    for (
+      const options of [
+        undefined,
+        {},
+        { errors: "first" },
+        { onExcessProperty: "ignore" },
+        { reportInput: true },
+        { disableChecks: true }
+      ] as const
+    ) {
+      deepStrictEqual(decode({ first: "1", second: "2" }, options), { first: 1, second: 2 })
+    }
+  })
+
+  it("does not replay inlined Struct transformations", () => {
+    let transformations = 0
+    const transformed = Schema.String.pipe(
+      Schema.decodeTo(
+        Schema.Number,
+        SchemaTransformation.transform({
+          decode: (value) => {
+            transformations++
+            return value === "invalid" ? "invalid" as any : Number(value)
+          },
+          encode: String
+        })
+      )
+    )
+    const decode = SchemaParser.decodeUnknownSync(Schema.Struct({ value: transformed }))
+
+    deepStrictEqual(decode({ value: "1" }), { value: 1 })
+    strictEqual(transformations, 1)
+    throws(() => decode({ value: false }))
+    strictEqual(transformations, 1)
+    throws(() => decode({ value: "invalid" }))
+    strictEqual(transformations, 2)
+  })
+
+  it("applies Struct output and encoding checks after compiled fields without replay", () => {
+    let transformations = 0
+    let checks = 0
+    const schema = Schema.Struct({
+      value: Schema.String.pipe(Schema.decodeTo(
+        Schema.Number,
+        SchemaTransformation.transform({
+          decode: (value) => {
+            transformations++
+            return Number(value)
+          },
+          encode: String
+        })
+      ))
+    }).check(Schema.makeFilter((output) => {
+      checks++
+      deepStrictEqual(Object.keys(output), ["value"])
+      return output.value > 0
+    })).pipe(
+      Schema.flip,
+      Schema.check(Schema.makeFilter((input) => input.value !== "01")),
+      Schema.flip
+    )
+    const decode = SchemaParser.decodeUnknownSync(schema)
+    deepStrictEqual(decode({ value: "1", extra: true }), { value: 1 })
+    throws(() => decode({ value: "-1", extra: true }))
+    strictEqual(transformations, 2)
+    strictEqual(checks, 2)
+
+    deepStrictEqual(decode({ value: "-1" }, { disableChecks: true }), { value: -1 })
+    strictEqual(checks, 2)
+    throws(() => decode({ value: "-1" }, { errors: "all" }))
+    strictEqual(transformations, 4)
+    strictEqual(checks, 3)
+    throws(() => decode({ value: "01" }))
+    strictEqual(transformations, 5)
+    strictEqual(checks, 3)
+  })
+
+  it("replaces the parser used by the other decoding adapters", () => {
+    let checks = 0
+    const schema = Schema.String.check(Schema.makeFilter(() => {
+      checks++
+      return false
+    }))
+
+    assert(Result.isFailure(SchemaParser.decodeUnknownResult(schema)("value")))
+    strictEqual(checks, 2)
+  })
+
+  it("replaces the parser used by encoding adapters", () => {
+    let checks = 0
+    const schema = Schema.String.check(Schema.makeFilter(() => {
+      checks++
+      return false
+    }))
+
+    assert(Result.isFailure(SchemaParser.encodeUnknownResult(schema)("value")))
+    strictEqual(checks, 2)
+  })
+
+  it("does not replay defects", () => {
+    const defect = new Error("boom")
+    let reads = 0
+    const input = {
+      get name(): string {
+        reads++
+        throw defect
+      },
+      count: 1,
+      active: true,
+      nested: { value: "b" }
+    }
+
+    throws(() => decode(input), (error) => {
+      assert(error instanceof Error)
+      strictEqual(error.message, "Sync adapter can only throw schema issues")
+      assert(Cause.hasDies(error.cause as Cause.Cause<never>))
+    })
+    strictEqual(reads, 1)
+  })
+
+  it("honors explicit ParseOptions in the compiled diagnostic phase", () => {
+    throws(() =>
+      decode({
+        name: "a",
+        count: 1,
+        active: true,
+        nested: { value: "b", nestedExtra: true },
+        extra: true
+      }, { onExcessProperty: "error", errors: "all" }), (error) => {
+      assertSchemaIssueError(
+        error,
+        `Expected no excess property
+  at ["extra"]
+Expected no excess property
+  at ["nested"]["nestedExtra"]`
+      )
+    })
+  })
+
+  it("compiles symbol-keyed Struct properties", () => {
+    const key = Symbol("key")
+    const decode = SchemaParser.decodeUnknownSync(Schema.Struct({
+      text: Schema.String,
+      [key]: Schema.Number
+    }))
+    const output = decode({ text: "value", [key]: 1, extra: true })
+
+    strictEqual(output.text, "value")
+    strictEqual(output[key], 1)
+    deepStrictEqual(Reflect.ownKeys(output), ["text", key])
+  })
+
+  it("uses the interpreter for unsupported schemas", () => {
+    const date = new Date(0)
+    const decode = SchemaParser.decodeUnknownSync(Schema.instanceOf(Date))
+    strictEqual(decode(date), date)
+  })
+
+  it("uses the interpreter when dynamic function generation is unavailable", () => {
+    const Function = globalThis.Function
+    try {
+      globalThis.Function = (() => {
+        throw new Error("dynamic function generation unavailable")
+      }) as any
+      const schema = Schema.Struct({ value: Schema.String })
+      const getParser = schema.ast.getParser.bind(schema.ast)
+      let interpreterConstructions = 0
+      Object.defineProperty(schema.ast, "getParser", {
+        configurable: true,
+        value(...args: Parameters<typeof getParser>) {
+          interpreterConstructions++
+          return getParser(...args)
+        }
+      })
+      const decode = SchemaParser.decodeUnknownSync(schema)
+
+      deepStrictEqual(decode({ value: "a" }), { value: "a" })
+      strictEqual(interpreterConstructions, 1)
+      throws(() => decode({ value: 1 }), (error) => {
+        assertSchemaIssueError(
+          error,
+          `Expected string
+  at ["value"]`
+        )
+      })
+    } finally {
+      globalThis.Function = Function
+    }
+  })
+
+  it("compiles primitive leaves without confusing undefined with a missing key", () => {
+    const decode = SchemaParser.decodeUnknownSync(Schema.Struct({
+      undefined: Schema.Undefined,
+      unknown: Schema.Unknown,
+      bigint: Schema.BigInt,
+      symbol: Schema.Symbol,
+      literal: Schema.Literal("a")
+    }))
+    const symbol = globalThis.Symbol("a")
+
+    deepStrictEqual(
+      decode({ undefined, unknown: undefined, bigint: 1n, symbol, literal: "a", extra: true }),
+      { undefined, unknown: undefined, bigint: 1n, symbol, literal: "a" }
+    )
+    throws(() => decode({ unknown: undefined, bigint: 1n, symbol, literal: "a" }), (error) => {
+      assertSchemaIssueError(error, `Missing key\n  at ["undefined"]`)
+    })
+  })
+
+  it("compiles arrays and tuples with rest and tail elements", () => {
+    const decodeArray = SchemaParser.decodeUnknownSync(Schema.Array(Schema.String))
+    deepStrictEqual(decodeArray(["a", "b"]), ["a", "b"])
+
+    const decodeTuple = SchemaParser.decodeUnknownSync(
+      Schema.TupleWithRest(Schema.Tuple([Schema.String]), [Schema.Number, Schema.Boolean])
+    )
+    deepStrictEqual(decodeTuple(["a", 1, 2, true]), ["a", 1, 2, true])
+    throws(() => decodeTuple(["a", 1, 2]), (error) => {
+      assertSchemaIssueError(error, `Expected boolean\n  at [2]`)
+    })
+  })
+
+  it("compiles optional tuple elements", () => {
+    const schema = Schema.Tuple([Schema.optionalKey(Schema.String)])
+    const decode = SchemaParser.decodeUnknownSync(schema)
+    const is = SchemaParser.is(schema)
+
+    deepStrictEqual(decode([]), [])
+    deepStrictEqual(decode(["a"]), ["a"])
+    strictEqual(is([]), true)
+    strictEqual(is(["a"]), true)
+    strictEqual(is([1]), false)
+  })
+
+  it("preserves the input sign for signed-zero literals", () => {
+    const decode = SchemaParser.decodeUnknownSync(Schema.Struct({
+      negative: Schema.Literal(-0),
+      positive: Schema.Union([Schema.Literal(0), Schema.Literal(1)]),
+      union: Schema.Union([Schema.Literal(-0), Schema.Literal(1)])
+    }))
+    const output = decode({ negative: 0, positive: -0, union: 0 })
+
+    strictEqual(Object.is(output.negative, 0), true)
+    strictEqual(Object.is(output.positive, -0), true)
+    strictEqual(Object.is(output.union, 0), true)
+  })
+
+  it("compiles primitive anyOf and oneOf unions", () => {
+    const decodeAnyOf = SchemaParser.decodeUnknownSync(
+      Schema.Union([Schema.Literal("a"), Schema.Literal("b"), Schema.Number])
+    )
+    strictEqual(decodeAnyOf("b"), "b")
+    strictEqual(decodeAnyOf(1), 1)
+    throws(() => decodeAnyOf(true), (error) => {
+      assertSchemaIssueError(error, "Expected \"a\" | \"b\" | number")
+    })
+
+    const decodeOneOf = SchemaParser.decodeUnknownSync(
+      Schema.Union([Schema.String, Schema.Literal("a")], { mode: "oneOf" })
+    )
+    strictEqual(decodeOneOf("b"), "b")
+    throws(() => decodeOneOf("a"), (error) => {
+      assertSchemaIssueError(error, "Expected exactly one member to match")
+    })
+  })
+
+  it("compiles structural unions through canonical candidate selection", () => {
+    const decodeTagged = SchemaParser.decodeUnknownSync(Schema.Union([
+      Schema.Struct({ kind: Schema.Literal("a"), value: Schema.String }),
+      Schema.Struct({ kind: Schema.Literal("b"), value: Schema.Number })
+    ]))
+    deepStrictEqual(
+      decodeTagged({ kind: "b", value: 1, extra: true }),
+      { kind: "b", value: 1 }
+    )
+
+    const decodeUntagged = SchemaParser.decodeUnknownSync(Schema.Union([
+      Schema.Struct({ first: Schema.String }),
+      Schema.Struct({ second: Schema.String })
+    ]))
+    deepStrictEqual(
+      decodeUntagged({ first: "a", second: "b" }),
+      { first: "a" }
+    )
+
+    const decodeOneOf = SchemaParser.decodeUnknownSync(Schema.Union([
+      Schema.Struct({ first: Schema.String }),
+      Schema.Struct({ second: Schema.String })
+    ], { mode: "oneOf" }))
+    throws(() => decodeOneOf({ first: "a", second: "b" }), (error) => {
+      assertSchemaIssueError(error, "Expected exactly one member to match")
+    })
+  })
+
+  it("compiles optional object properties", () => {
+    const decode = SchemaParser.decodeUnknownSync(Schema.Struct({
+      required: Schema.String,
+      optional: Schema.optionalKey(Schema.Number),
+      undefined: Schema.optionalKey(Schema.Undefined)
+    }))
+
+    deepStrictEqual(decode({ required: "a" }), { required: "a" })
+    deepStrictEqual(
+      decode({ required: "a", optional: 1, undefined, extra: true }),
+      { required: "a", optional: 1, undefined }
+    )
+    throws(() => decode({ required: "a", optional: "invalid" }), (error) => {
+      assertSchemaIssueError(error, `Expected number\n  at ["optional"]`)
+    })
+  })
+
+  it("compiles string records", () => {
+    const decode = SchemaParser.decodeUnknownSync(
+      Schema.Record(Schema.String, Schema.Struct({ count: Schema.Number }))
+    )
+    deepStrictEqual(
+      decode({ a: { count: 1 }, b: { count: 2 }, extra: { count: 3, ignored: true } }),
+      { a: { count: 1 }, b: { count: 2 }, extra: { count: 3 } }
+    )
+    throws(() => decode({ a: { count: "invalid" } }), (error) => {
+      assertSchemaIssueError(error, `Expected number\n  at ["a"]["count"]`)
+    })
+  })
+
+  it("compiles symbol and template-literal records", () => {
+    const symbol = Symbol("key")
+    const decodeSymbols = SchemaParser.decodeUnknownSync(Schema.Record(Schema.Symbol, Schema.Number))
+    const symbolOutput = decodeSymbols({ text: "ignored", [symbol]: 1 })
+    strictEqual(symbolOutput[symbol], 1)
+    deepStrictEqual(Reflect.ownKeys(symbolOutput), [symbol])
+
+    const decodeTemplates = SchemaParser.decodeUnknownSync(
+      Schema.Record(Schema.TemplateLiteral(["data-", Schema.String]), Schema.Number)
+    )
+    deepStrictEqual(
+      decodeTemplates({ "data-a": 1, ignored: 2, "data-b": 3 }),
+      { "data-a": 1, "data-b": 3 }
+    )
+  })
+
+  it("compiles fixed properties with index signatures", () => {
+    const decode = SchemaParser.decodeUnknownSync(
+      Schema.StructWithRest(
+        Schema.Struct({ fixed: Schema.Trim }),
+        [Schema.Record(Schema.String, Schema.String)]
+      )
+    )
+    deepStrictEqual(decode({ fixed: "  value  ", other: "other" }), { fixed: "value", other: "other" })
+  })
+
+  it("compiles decoded index keys", () => {
+    const decodeNumbers = SchemaParser.decodeUnknownSync(Schema.Record(Schema.Number, Schema.Number))
+    deepStrictEqual(decodeNumbers({ 1: 1, other: "ignored" }), { 1: 1 })
+
+    const decodeCamelCase = SchemaParser.decodeUnknownSync(
+      Schema.Record(
+        Schema.String.pipe(Schema.decodeTo(Schema.String, SchemaTransformation.toUpperCase())),
+        Schema.Number
+      )
+    )
+    deepStrictEqual(decodeCamelCase({ a: 1, b: 2 }), { A: 1, B: 2 })
+  })
+
+  it("compiles encoding checks", () => {
+    const checked = Schema.Struct({ value: Schema.String }).pipe(
+      Schema.flip,
+      Schema.check(Schema.makeFilter((input) => input.value.length > 1)),
+      Schema.flip
+    )
+    const decode = SchemaParser.decodeUnknownSync(checked)
+    deepStrictEqual(decode({ value: "valid" }), { value: "valid" })
+    throws(() => decode({ value: "" }))
+  })
+
+  it("runs checks against decoded output", () => {
+    const decodeString = SchemaParser.decodeUnknownSync(
+      Schema.String.check(Schema.isMinLength(2))
+    )
+    strictEqual(decodeString("ab"), "ab")
+    throws(() => decodeString("a"), (error) => {
+      assertSchemaIssueError(error, "Expected a value with a length of at least 2")
+    })
+
+    const decodeObject = SchemaParser.decodeUnknownSync(
+      Schema.Struct({ value: Schema.String }).check(Schema.isMaxProperties(1))
+    )
+    deepStrictEqual(decodeObject({ value: "a", extra: true }), { value: "a" })
+  })
+
+  it("runs compiled type guard checks against decoded output", () => {
+    const checked = Schema.Struct({ value: Schema.String }).check(Schema.isMaxProperties(1))
+    const isRoot = SchemaParser.is(checked)
+    const isNested = SchemaParser.is(Schema.Struct({ nested: checked }))
+
+    strictEqual(isRoot({ value: "a", extra: true }), true)
+    strictEqual(isNested({ nested: { value: "a", extra: true }, extra: true }), true)
+    strictEqual(isNested({ nested: { value: 1 } }), false)
+  })
+
+  it("uses compiled checkpoints around interpreted declarations and transformations", () => {
+    const date = new Date(0)
+    const decode = SchemaParser.decodeUnknownSync(Schema.Struct({
+      date: Schema.instanceOf(Date),
+      count: Schema.FiniteFromString
+    }))
+
+    const output = decode({ date, count: "1", extra: true })
+    strictEqual(output.date, date)
+    strictEqual(output.count, 1)
+    deepStrictEqual(Reflect.ownKeys(output), ["date", "count"])
+  })
+
+  it("uses compiled checkpoints inside root encoding chains", () => {
+    const decodeNumber = SchemaParser.decodeUnknownSync(Schema.FiniteFromString)
+    strictEqual(decodeNumber("1"), 1)
+    throws(() => decodeNumber("invalid"), (error) => {
+      assertSchemaIssueError(error, "Expected a finite number")
+    })
+
+    const decodeJson = SchemaParser.decodeUnknownSync(
+      Schema.fromJsonString(Schema.Struct({ value: Schema.Number }))
+    )
+    deepStrictEqual(decodeJson("{\"value\":1,\"extra\":true}"), { value: 1 })
+  })
+
+  it("does not replay transformations when a compiled checkpoint fails", () => {
+    let sourceChecks = 0
+    let firstTransformations = 0
+    let secondTransformations = 0
+    let checks = 0
+    const schema = Schema.Struct({
+      value: Schema.String.check(Schema.makeFilter((value) => {
+        sourceChecks++
+        return value !== "blocked"
+      })).pipe(
+        Schema.decodeTo(
+          Schema.Number.check(Schema.makeFilter((value) => {
+            checks++
+            return value > 0
+          })),
+          SchemaTransformation.transform({
+            decode: (value) => {
+              firstTransformations++
+              return Number(value)
+            },
+            encode: String
+          })
+        ),
+        Schema.decodeTo(
+          Schema.String,
+          SchemaTransformation.transform({
+            decode: (value) => {
+              secondTransformations++
+              return String(value)
+            },
+            encode: Number
+          })
+        )
+      )
+    })
+
+    throws(() => SchemaParser.decodeUnknownSync(schema)({ value: "blocked" }))
+    strictEqual(sourceChecks, 2)
+    strictEqual(firstTransformations, 0)
+    strictEqual(secondTransformations, 0)
+
+    sourceChecks = 0
+    throws(() => SchemaParser.decodeUnknownSync(schema)({ value: "-1" }))
+    strictEqual(sourceChecks, 1)
+    strictEqual(firstTransformations, 1)
+    strictEqual(secondTransformations, 0)
+    strictEqual(checks, 2)
+  })
+
+  it("preserves mixed causes from interpreted encoding chains", () => {
+    const cause = Cause.combine(
+      Cause.fail(new SchemaIssue.InvalidValue({ message: "schema issue" })),
+      Cause.die(new Error("defect"))
+    )
+    const schema = Schema.String.pipe(Schema.decode({
+      decode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(cause)),
+      encode: SchemaGetter.passthrough()
+    }))
+
+    throws(() => SchemaParser.decodeUnknownSync(schema)("value"), (error) => {
+      assert(error instanceof Error)
+      strictEqual(error.message, "Sync adapter can only throw schema issues")
+      const issue = Cause.findError(error.cause as Cause.Cause<SchemaIssue.Issue>)
+      assert(Result.isSuccess(issue))
+      strictEqual(issue.success._tag, "Encoding")
+      assert(Cause.hasDies(error.cause as Cause.Cause<never>))
+    })
+  })
+
+  it("keeps Suspend parsers lazy", () => {
+    interface Category {
+      readonly value: string
+      readonly children: ReadonlyArray<Category>
+    }
+    let evaluations = 0
+    const schema: Schema.Codec<Category> = Schema.Struct({
+      value: Schema.String,
+      children: Schema.Array(Schema.suspend((): Schema.Codec<Category> => {
+        evaluations++
+        return schema
+      }))
+    })
+    const decode = SchemaParser.decodeUnknownSync(schema)
+
+    deepStrictEqual(decode({ value: "root", children: [] }), { value: "root", children: [] })
+    strictEqual(evaluations, 0)
+    deepStrictEqual(
+      decode({ value: "root", children: [{ value: "child", children: [] }] }),
+      { value: "root", children: [{ value: "child", children: [] }] }
+    )
+    strictEqual(evaluations, 1)
+  })
+
+  it("does not replay declaration defects", () => {
+    const defect = new Error("declaration defect")
+    let runs = 0
+    const declaration = Schema.declareConstructor<unknown>()([], () => () => {
+      runs++
+      return Effect.die(defect)
+    })
+    const decode = SchemaParser.decodeUnknownSync(Schema.Struct({ declaration }))
+
+    throws(() => decode({ declaration: "value" }), (error) => {
+      assert(error instanceof Error)
+      strictEqual(error.message, "Sync adapter can only throw schema issues")
+      assert(Cause.hasDies(error.cause as Cause.Cause<never>))
+    })
+    strictEqual(runs, 1)
+  })
+})
diff --git a/repos/effect/packages/effect/test/schema/SchemaJITCompilerFallback.test.ts b/repos/effect/packages/effect/test/schema/SchemaJITCompilerFallback.test.ts
new file mode 100644
index 000000000..2ff42e782
--- /dev/null
+++ b/repos/effect/packages/effect/test/schema/SchemaJITCompilerFallback.test.ts
@@ -0,0 +1,178 @@
+import { assert, describe, it, vi } from "@effect/vitest"
+import { Cause, Schema, SchemaParser, SchemaTransformation } from "effect"
+import * as Codegen from "effect/internal/schema/codegen"
+// oxlint-disable-next-line no-unassigned-import
+import "effect/unstable/schema/SchemaJITCompiler/enable"
+import { assertSchemaIssueError, deepStrictEqual, strictEqual, throws } from "../utils/assert.ts"
+
+describe("Schema JIT compilation fallback", () => {
+  for (const phase of ["construction", "factory"] as const) {
+    for (const firstOperation of ["decode", "is"] as const) {
+      it(`recovers ${phase} failure during ${firstOperation} without retrying`, () => {
+        const schema = Schema.Struct({ value: Schema.String })
+        const getParser = vi.spyOn(schema.ast, "getParser")
+        const Function = globalThis.Function
+        let attempts = 0
+        try {
+          globalThis.Function = ((...args: Array<string>) => {
+            if (args.length === 1 && args[0] === "return true") return Function(...args)
+            attempts++
+            if (phase === "construction") throw new SyntaxError("invalid generated source")
+            return () => {
+              throw new Error("generated factory failed")
+            }
+          }) as FunctionConstructor
+
+          const decode = SchemaParser.decodeUnknownSync(schema)
+          const is = SchemaParser.is(schema)
+          const input = { value: "valid", extra: true }
+          if (firstOperation === "is") strictEqual(is(input), true)
+          deepStrictEqual(decode(input), { value: "valid" })
+          strictEqual(is(input), true)
+          strictEqual(is({ value: 1 }), false)
+          throws(() => decode({ value: 1 }), (error) => {
+            assertSchemaIssueError(error, `Expected string\n  at ["value"]`)
+          })
+          throws(() => decode(input, { onExcessProperty: "error" }), (error) => {
+            assertSchemaIssueError(error, `Expected no excess property\n  at ["extra"]`)
+          })
+          deepStrictEqual(SchemaParser.decodeUnknownSync(schema)(input), { value: "valid" })
+          strictEqual(attempts, 1)
+          strictEqual(getParser.mock.calls.length, 1)
+        } finally {
+          globalThis.Function = Function
+          getParser.mockRestore()
+        }
+      })
+    }
+  }
+
+  for (const phase of ["generate"] as const) {
+    it(`recovers errors in ${phase} without disabling other schemas`, () => {
+      const failure = vi.spyOn(Codegen, phase).mockImplementationOnce(() => {
+        throw new Error("compiler failed")
+      })
+      const schema = Schema.Struct({ value: Schema.String })
+      const getParser = vi.spyOn(schema.ast, "getParser")
+      try {
+        const decode = SchemaParser.decodeUnknownSync(schema)
+        deepStrictEqual(decode({ value: "valid" }), { value: "valid" })
+        strictEqual(getParser.mock.calls.length, 1)
+        const attempts = failure.mock.calls.length
+        deepStrictEqual(decode({ value: "again" }), { value: "again" })
+        strictEqual(failure.mock.calls.length, attempts)
+
+        const other = Schema.Struct({ value: Schema.String })
+        const otherParser = vi.spyOn(other.ast, "getParser")
+        try {
+          deepStrictEqual(SchemaParser.decodeUnknownSync(other)({ value: "compiled" }), { value: "compiled" })
+          strictEqual(otherParser.mock.calls.length, 0)
+        } finally {
+          otherParser.mockRestore()
+        }
+      } finally {
+        failure.mockRestore()
+        getParser.mockRestore()
+      }
+    })
+  }
+
+  it("recovers composed decoder generation without repeating transformations", () => {
+    let transformations = 0
+    const field = Schema.String.pipe(Schema.decodeTo(
+      Schema.String,
+      SchemaTransformation.transform({
+        decode: (value) => {
+          transformations++
+          return value.trim()
+        },
+        encode: (value) => value
+      })
+    ))
+    const schema = Schema.Struct({ value: field })
+    const generate = Codegen.generate
+    const failure = vi.spyOn(Codegen, "generate").mockImplementation((ast, operation) => {
+      if (ast === schema.ast) throw new Error("composed decoder generation failed")
+      return generate(ast, operation)
+    })
+    try {
+      const decode = SchemaParser.decodeUnknownSync(schema)
+      deepStrictEqual(decode({ value: " a " }), { value: "a" })
+      deepStrictEqual(decode({ value: " b " }), { value: "b" })
+      strictEqual(transformations, 2)
+      strictEqual(failure.mock.calls.filter(([ast]) => ast === schema.ast).length, 1)
+    } finally {
+      failure.mockRestore()
+    }
+  })
+
+  it("recovers decoder generation without replaying its encoding or middleware", () => {
+    let transformations = 0
+    let middlewareRuns = 0
+    const schema = Schema.String.pipe(
+      Schema.decodeTo(
+        Schema.Struct({ value: Schema.String.check(Schema.isMinLength(2)) }),
+        SchemaTransformation.transform({
+          decode: (value) => {
+            transformations++
+            return { value: value.trim() }
+          },
+          encode: (value) => value.value
+        })
+      ),
+      Schema.middlewareDecoding((effect) => {
+        middlewareRuns++
+        return effect
+      })
+    )
+    const emit = Codegen.generate
+    let attempts = 0
+    let transformationsAtFailure = 0
+    const failure = vi.spyOn(Codegen, "generate").mockImplementation((ast, operation) => {
+      if (ast === schema.ast) {
+        attempts++
+        transformationsAtFailure = transformations
+        throw new Error("local checkpoint generation failed")
+      }
+      return emit(ast, operation)
+    })
+    try {
+      const decode = SchemaParser.decodeUnknownSync(schema)
+      deepStrictEqual(decode(" valid "), { value: "valid" })
+      strictEqual(transformationsAtFailure, 0)
+      strictEqual(transformations, 1)
+      strictEqual(middlewareRuns, 1)
+      throws(() => decode(" x "))
+      strictEqual(transformations, 2)
+      strictEqual(middlewareRuns, 2)
+      strictEqual(attempts, 1)
+    } finally {
+      failure.mockRestore()
+    }
+  })
+
+  it("propagates errors from executing generated code without interpreting the input", () => {
+    const schema = Schema.Struct({ value: Schema.String })
+    const getParser = vi.spyOn(schema.ast, "getParser")
+    const Function = globalThis.Function
+    let executions = 0
+    const defect = new Error("generated parser failed")
+    try {
+      globalThis.Function = ((...args: Array<string>) => {
+        if (args.length === 1 && args[0] === "return true") return Function(...args)
+        return () => () => {
+          executions++
+          throw defect
+        }
+      }) as FunctionConstructor
+      const result = SchemaParser.decodeUnknownExit(schema)({ value: "valid" })
+      assert(result._tag === "Failure")
+      assert(Cause.hasDies(result.cause))
+      strictEqual(executions, 1)
+      strictEqual(getParser.mock.calls.length, 0)
+    } finally {
+      globalThis.Function = Function
+      getParser.mockRestore()
+    }
+  })
+})
diff --git a/repos/effect/packages/effect/test/schema/SchemaParser.test.ts b/repos/effect/packages/effect/test/schema/SchemaParser.test.ts
index 990a06499..f37d78aba 100644
--- a/repos/effect/packages/effect/test/schema/SchemaParser.test.ts
+++ b/repos/effect/packages/effect/test/schema/SchemaParser.test.ts
@@ -1,8 +1,369 @@
 import { describe, it } from "@effect/vitest"
-import { Cause, Effect, Exit, Option, Result, Schema, SchemaGetter, SchemaIssue, SchemaParser } from "effect"
-import { assertSchemaIssueError, assertTrue, strictEqual, throws } from "../utils/assert.ts"
+import {
+  Cause,
+  Deferred,
+  Effect,
+  Exit,
+  Fiber,
+  Option,
+  Ref,
+  Result,
+  Schema,
+  type SchemaAST,
+  SchemaGetter,
+  SchemaIssue,
+  SchemaParser,
+  SchemaTransformation
+} from "effect"
+import {
+  assertFalse,
+  assertSchemaIssueError,
+  assertTrue,
+  deepStrictEqual,
+  strictEqual,
+  throws
+} from "../utils/assert.ts"
 
 describe("SchemaParser", () => {
+  describe("sequential parsing", () => {
+    const cases = [
+      {
+        name: "Struct",
+        make: (item: Schema.Codec<string>) => Schema.Struct({ a: item, b: item }),
+        input: { a: "a", b: "b" }
+      },
+      { name: "Tuple", make: (item: Schema.Codec<string>) => Schema.Tuple([item, item]), input: ["a", "b"] },
+      { name: "Array", make: (item: Schema.Codec<string>) => Schema.Array(item), input: ["a", "b"] },
+      {
+        name: "Record",
+        make: (item: Schema.Codec<string>) => Schema.Record(Schema.String, item),
+        input: { a: "a", b: "b" }
+      }
+    ]
+    for (const { input, make, name } of cases) {
+      for (const errors of ["first", "all"] as const) {
+        it.effect(`${name} decodes and encodes asynchronous children sequentially (${errors})`, () =>
+          Effect.gen(function*() {
+            const calls: Array<string> = []
+            const getter = SchemaGetter.transformEffect<string, string>((value) => {
+              calls.push(`start ${value}`)
+              return Effect.gen(function*() {
+                yield* Effect.yieldNow
+                calls.push(`end ${value}`)
+                return value
+              })
+            })
+            const schema = make(Schema.String.pipe(Schema.decode({ decode: getter, encode: getter })))
+            deepStrictEqual(yield* SchemaParser.decodeUnknownEffect(schema)(input, { errors }), input)
+            deepStrictEqual(calls, ["start a", "end a", "start b", "end b"])
+            calls.length = 0
+            deepStrictEqual(yield* SchemaParser.encodeUnknownEffect(schema)(input, { errors }), input)
+            deepStrictEqual(calls, ["start a", "end a", "start b", "end b"])
+          }))
+      }
+    }
+  })
+
+  describe("product concurrency", () => {
+    const cases = [
+      {
+        name: "Struct",
+        make: (item: Schema.Codec<string>) => Schema.Struct({ a: item, b: item, c: item }),
+        input: { a: "a", b: "b", c: "c" }
+      },
+      { name: "Tuple", make: (item: Schema.Codec<string>) => Schema.Tuple([item, item, item]), input: ["a", "b", "c"] },
+      { name: "Array", make: (item: Schema.Codec<string>) => Schema.Array(item), input: ["a", "b", "c"] },
+      {
+        name: "Record",
+        make: (item: Schema.Codec<string>) => Schema.Record(Schema.String, item),
+        input: { a: "a", b: "b", c: "c" }
+      }
+    ]
+
+    for (const { input, make, name } of cases) {
+      it.effect(`${name} uses Effect.forEach bounded concurrency when decoding and encoding`, () =>
+        Effect.gen(function*() {
+          for (const operation of ["decode", "encode"] as const) {
+            const started = yield* Effect.forEach([0, 1, 2], () => Deferred.make<void>())
+            const releases = yield* Effect.forEach([0, 1, 2], () => Deferred.make<void>())
+            const getter = SchemaGetter.transformEffect<string, string>((value) => {
+              const index = value.charCodeAt(0) - 97
+              return Deferred.succeed(started[index], undefined).pipe(
+                Effect.andThen(Deferred.await(releases[index])),
+                Effect.as(value)
+              )
+            })
+            const schema = make(Schema.String.pipe(Schema.decode({ decode: getter, encode: getter })))
+            const parse = operation === "decode"
+              ? SchemaParser.decodeUnknownEffect(schema)
+              : SchemaParser.encodeUnknownEffect(schema)
+            const fiber = yield* parse(input, { concurrency: 2 }).pipe(Effect.forkChild)
+
+            yield* Deferred.await(started[0])
+            yield* Deferred.await(started[1])
+            assertFalse(yield* Deferred.isDone(started[2]))
+
+            yield* Deferred.succeed(releases[0], undefined)
+            yield* Deferred.await(started[2])
+            yield* Deferred.succeed(releases[1], undefined)
+            yield* Deferred.succeed(releases[2], undefined)
+
+            deepStrictEqual(yield* Fiber.join(fiber), input)
+          }
+        }))
+    }
+
+    it.effect(`supports concurrency: "unbounded"`, () =>
+      Effect.gen(function*() {
+        const started = yield* Effect.forEach([0, 1, 2], () => Deferred.make<void>())
+        const release = yield* Deferred.make<void>()
+        const getter = SchemaGetter.transformEffect<string, string>((value) => {
+          const index = value.charCodeAt(0) - 97
+          return Deferred.succeed(started[index], undefined).pipe(
+            Effect.andThen(Deferred.await(release)),
+            Effect.as(value)
+          )
+        })
+        const schema = Schema.Array(Schema.String.pipe(Schema.decode({ decode: getter, encode: getter })))
+        const fiber = yield* SchemaParser.decodeUnknownEffect(schema)(["a", "b", "c"], {
+          concurrency: "unbounded"
+        }).pipe(Effect.forkChild)
+
+        yield* Effect.forEach(started, Deferred.await, { discard: true })
+        yield* Deferred.succeed(release, undefined)
+        deepStrictEqual(yield* Fiber.join(fiber), ["a", "b", "c"])
+      }))
+
+    it.effect("uses the first concurrent failure to complete and interrupts pending children", () =>
+      Effect.gen(function*() {
+        const firstStarted = yield* Deferred.make<void>()
+        const firstInterrupted = yield* Deferred.make<void>()
+        const first = Schema.String.pipe(Schema.decode({
+          decode: SchemaGetter.transformEffect(() =>
+            Deferred.succeed(firstStarted, undefined).pipe(
+              Effect.andThen(Effect.never),
+              Effect.onInterrupt(() => Deferred.succeed(firstInterrupted, undefined).pipe(Effect.asVoid))
+            )
+          ),
+          encode: SchemaGetter.passthrough()
+        }))
+        const second = Schema.String.pipe(Schema.decode({
+          decode: SchemaGetter.transformEffect(() =>
+            Deferred.await(firstStarted).pipe(
+              Effect.andThen(Effect.fail(new SchemaIssue.InvalidValue({ message: "second failed" })))
+            )
+          ),
+          encode: SchemaGetter.passthrough()
+        }))
+
+        const exit = yield* SchemaParser.decodeUnknownEffect(Schema.Tuple([first, second]))(["a", "b"], {
+          concurrency: 2
+        }).pipe(Effect.exit)
+
+        assertTrue(Exit.isFailure(exit))
+        assertTrue(yield* Deferred.isDone(firstInterrupted))
+        if (Exit.isFailure(exit)) {
+          const error = Cause.findError(exit.cause)
+          assertTrue(Result.isSuccess(error))
+          if (Result.isSuccess(error)) {
+            strictEqual(error.success._tag, "Composite")
+            if (error.success._tag === "Composite") {
+              strictEqual(error.success.issues[0]._tag, "Pointer")
+              if (error.success.issues[0]._tag === "Pointer") {
+                deepStrictEqual(error.success.issues[0].path, [1])
+              }
+            }
+          }
+        }
+      }))
+
+    it.effect(`accumulates concurrent errors in completion order with errors: "all"`, () =>
+      Effect.gen(function*() {
+        const releaseFirst = yield* Deferred.make<void>()
+        const secondCompleted = yield* Deferred.make<void>()
+        const failing = (effect: Effect.Effect<void>) =>
+          Schema.String.pipe(Schema.decode({
+            decode: SchemaGetter.transformEffect(() =>
+              effect.pipe(Effect.andThen(Effect.fail(new SchemaIssue.InvalidValue())))
+            ),
+            encode: SchemaGetter.passthrough()
+          }))
+        const schema = Schema.Tuple([
+          failing(Deferred.await(releaseFirst)),
+          failing(Deferred.succeed(secondCompleted, undefined).pipe(Effect.asVoid))
+        ])
+        const fiber = yield* SchemaParser.decodeUnknownEffect(schema)(["a", "b"], {
+          concurrency: 2,
+          errors: "all"
+        }).pipe(Effect.exit, Effect.forkChild)
+
+        yield* Deferred.await(secondCompleted)
+        yield* Effect.yieldNow
+        yield* Deferred.succeed(releaseFirst, undefined)
+        const exit = yield* Fiber.join(fiber)
+
+        assertTrue(Exit.isFailure(exit))
+        if (Exit.isFailure(exit)) {
+          const error = Cause.findError(exit.cause)
+          assertTrue(Result.isSuccess(error))
+          if (Result.isSuccess(error)) {
+            strictEqual(error.success._tag, "Composite")
+            if (error.success._tag === "Composite") {
+              deepStrictEqual(
+                error.success.issues.map((issue) => issue._tag === "Pointer" ? issue.path : []),
+                [[1], [0]]
+              )
+            }
+          }
+        }
+      }))
+
+    it.effect("uses completion order for colliding transformed Record keys", () =>
+      Effect.gen(function*() {
+        const releaseFirst = yield* Deferred.make<void>()
+        const secondCompleted = yield* Deferred.make<void>()
+        const value = Schema.String.pipe(Schema.decode({
+          decode: SchemaGetter.transformEffect((value) =>
+            value === "first"
+              ? Deferred.await(releaseFirst).pipe(Effect.as(value))
+              : Deferred.succeed(secondCompleted, undefined).pipe(Effect.as(value))
+          ),
+          encode: SchemaGetter.passthrough()
+        }))
+        const schema = Schema.Record(
+          Schema.String.pipe(Schema.decode(SchemaTransformation.snakeToCamel())),
+          value
+        )
+        const fiber = yield* SchemaParser.decodeUnknownEffect(schema)({ a_b: "first", aB: "second" }, {
+          concurrency: 2
+        }).pipe(Effect.forkChild)
+
+        yield* Deferred.await(secondCompleted)
+        yield* Effect.yieldNow
+        yield* Deferred.succeed(releaseFirst, undefined)
+        deepStrictEqual(yield* Fiber.join(fiber), { aB: "first" })
+      }))
+
+    it.effect("applies the concurrency limit independently to nested products", () =>
+      Effect.gen(function*() {
+        const started = yield* Ref.make(0)
+        const allStarted = yield* Deferred.make<void>()
+        const release = yield* Deferred.make<void>()
+        const item = Schema.String.pipe(Schema.decode({
+          decode: SchemaGetter.transformEffect((value) =>
+            Ref.updateAndGet(started, (n) => n + 1).pipe(
+              Effect.tap((n) => n === 4 ? Deferred.succeed(allStarted, undefined) : Effect.void),
+              Effect.andThen(Deferred.await(release)),
+              Effect.as(value)
+            )
+          ),
+          encode: SchemaGetter.passthrough()
+        }))
+        const schema = Schema.Array(Schema.Array(item))
+        const input = [["a", "b"], ["c", "d"]]
+        const fiber = yield* SchemaParser.decodeUnknownEffect(schema)(input, { concurrency: 2 }).pipe(Effect.forkChild)
+
+        yield* Deferred.await(allStarted)
+        strictEqual(yield* Ref.get(started), 4)
+        yield* Deferred.succeed(release, undefined)
+        deepStrictEqual(yield* Fiber.join(fiber), input)
+      }))
+
+    it.effect("keeps Union member evaluation sequential", () =>
+      Effect.gen(function*() {
+        const firstStarted = yield* Deferred.make<void>()
+        const releaseFirst = yield* Deferred.make<void>()
+        const secondStarted = yield* Deferred.make<void>()
+        const first = Schema.String.pipe(Schema.decode({
+          decode: SchemaGetter.transformEffect(() =>
+            Deferred.succeed(firstStarted, undefined).pipe(
+              Effect.andThen(Deferred.await(releaseFirst)),
+              Effect.as("first")
+            )
+          ),
+          encode: SchemaGetter.passthrough()
+        }))
+        const second = Schema.String.pipe(Schema.decode({
+          decode: SchemaGetter.transformEffect(() =>
+            Deferred.succeed(secondStarted, undefined).pipe(Effect.as("second"))
+          ),
+          encode: SchemaGetter.passthrough()
+        }))
+        const fiber = yield* SchemaParser.decodeUnknownEffect(Schema.Union([first, second]))("value", {
+          concurrency: "unbounded"
+        }).pipe(Effect.forkChild)
+
+        yield* Deferred.await(firstStarted)
+        yield* Effect.yieldNow
+        assertFalse(yield* Deferred.isDone(secondStarted))
+        yield* Deferred.succeed(releaseFirst, undefined)
+        strictEqual(yield* Fiber.join(fiber), "first")
+        assertFalse(yield* Deferred.isDone(secondStarted))
+      }))
+
+    it("keeps synchronous product parsers eager", () => {
+      const result = SchemaParser.decodeUnknownEffect(Schema.Array(Schema.String))(["a", "b"], {
+        concurrency: "unbounded"
+      })
+      assertTrue(Exit.isExit(result))
+      if (Exit.isSuccess(result)) {
+        deepStrictEqual(result.value, ["a", "b"])
+      }
+    })
+
+    it.effect("applies concurrency to constructor defaults", () =>
+      Effect.gen(function*() {
+        const firstStarted = yield* Deferred.make<void>()
+        const secondStarted = yield* Deferred.make<void>()
+        const release = yield* Deferred.make<void>()
+        const field = (value: string, started: Deferred.Deferred<void>) =>
+          Schema.String.pipe(Schema.withConstructorDefault(
+            Deferred.succeed(started, undefined).pipe(
+              Effect.andThen(Deferred.await(release)),
+              Effect.as(value)
+            )
+          ))
+        const schema = Schema.Struct({
+          a: field("a", firstStarted),
+          b: field("b", secondStarted)
+        })
+        const fiber = yield* SchemaParser.makeEffect(schema)({}, {
+          parseOptions: { concurrency: 2 }
+        }).pipe(Effect.forkChild)
+
+        yield* Deferred.await(firstStarted)
+        yield* Deferred.await(secondStarted)
+        yield* Deferred.succeed(release, undefined)
+        deepStrictEqual(yield* Fiber.join(fiber), { a: "a", b: "b" })
+      }))
+  })
+
+  describe("makeEffect", () => {
+    it.effect("defers deriving the type AST until the maker is called and derives it once", () =>
+      Effect.gen(function*() {
+        let encodingReads = 0
+        const ast = new Proxy(Schema.String.ast, {
+          get(target, property, receiver) {
+            if (property === "encoding") {
+              encodingReads++
+            }
+            return Reflect.get(target, property, receiver)
+          }
+        })
+        const schema: { ast: SchemaAST.AST } = { ast }
+        const make = SchemaParser.makeEffect(schema as Schema.Codec<string>)
+        schema.ast = Schema.Number.ast
+
+        strictEqual(encodingReads, 0)
+        const effect = make("a")
+        assertTrue(encodingReads > 0)
+        strictEqual(yield* effect, "a")
+        const reads = encodingReads
+        strictEqual(yield* make("b"), "b")
+        strictEqual(encodingReads, reads)
+      }))
+  })
+
   const makeMixedCause = () =>
     Cause.combine(
       Cause.fail(new SchemaIssue.InvalidValue({ message: "schema issue" })),
@@ -56,6 +417,107 @@ describe("SchemaParser", () => {
   })
 
   describe("decodeUnknownSync / encodeUnknownSync", () => {
+    it("decodes inherited struct properties", () => {
+      const schema = Schema.Struct({
+        required: Schema.String,
+        optional: Schema.optionalKey(Schema.String),
+        defaulted: Schema.String.pipe(Schema.withDecodingDefaultKey(Effect.succeed("default"))),
+        own: Schema.String
+      })
+      const input = Object.assign(
+        Object.create({
+          required: "required",
+          optional: "optional",
+          defaulted: "inherited"
+        }),
+        { own: "own" }
+      )
+
+      const output = SchemaParser.decodeUnknownSync(schema)(input)
+
+      deepStrictEqual(output, {
+        required: "required",
+        optional: "optional",
+        defaulted: "inherited",
+        own: "own"
+      })
+      for (const key of ["required", "optional", "defaulted", "own"]) {
+        assertTrue(Object.hasOwn(output, key))
+      }
+
+      const encoded = SchemaParser.encodeUnknownSync(Schema.Struct({ required: Schema.String }))(
+        Object.create({ required: "required" })
+      )
+      deepStrictEqual(encoded, { required: "required" })
+      assertTrue(Object.hasOwn(encoded, "required"))
+
+      deepStrictEqual(SchemaParser.decodeUnknownSync(schema)({ required: "required", own: "own" }), {
+        required: "required",
+        defaulted: "default",
+        own: "own"
+      })
+    })
+
+    it("decodes inherited string, number, and symbol fields", () => {
+      const symbol = Symbol("field")
+      const schema = Schema.Struct({
+        text: Schema.String,
+        1: Schema.Number,
+        [symbol]: Schema.Boolean
+      })
+      const output = SchemaParser.decodeUnknownSync(schema)(Object.create({ text: "a", 1: 1, [symbol]: true }))
+
+      deepStrictEqual(output, { text: "a", 1: 1, [symbol]: true })
+      for (const key of ["text", "1", symbol]) assertTrue(Object.hasOwn(output, key))
+    })
+
+    it("distinguishes an inherited undefined property from a missing property", () => {
+      const schema = Schema.Struct({
+        value: Schema.String.pipe(Schema.withDecodingDefaultKey(Effect.succeed("default")))
+      })
+      const decode = SchemaParser.decodeUnknownSync(schema)
+
+      deepStrictEqual(decode({}), { value: "default" })
+      throws(() => decode(Object.create({ value: undefined })), (error) => {
+        assertSchemaIssueError(error, `Expected string\n  at ["value"]`)
+      })
+    })
+
+    it("selects union members using inherited discriminants", () => {
+      const schema = Schema.Union([
+        Schema.Struct({ _tag: Schema.Literal("A"), value: Schema.String }),
+        Schema.Struct({ _tag: Schema.Literal("B"), value: Schema.Number })
+      ])
+      const input = Object.assign(Object.create({ _tag: "A" }), { value: "value" })
+      const output = SchemaParser.decodeUnknownSync(schema)(input)
+
+      deepStrictEqual(output, { _tag: "A", value: "value" })
+      assertTrue(Object.hasOwn(output, "_tag"))
+    })
+
+    it("decodes inherited Object.prototype properties", () => {
+      const output = SchemaParser.decodeUnknownSync(Schema.Struct({ toString: Schema.Unknown }))({})
+
+      strictEqual(output.toString, Object.prototype.toString)
+      assertTrue(Object.hasOwn(output, "toString"))
+    })
+
+    it("requires __proto__ to be an own property", () => {
+      const schema = Schema.Struct({ ["__proto__"]: Schema.String })
+      throws(() => SchemaParser.decodeUnknownSync(schema)(Object.create({ __proto__: "value" })))
+      deepStrictEqual(SchemaParser.decodeUnknownSync(schema)({ ["__proto__"]: "value" }), {
+        ["__proto__"]: "value"
+      })
+    })
+
+    it("keeps dynamic record properties own-only while finite record keys are declared", () => {
+      const input = Object.assign(Object.create({ inherited: 1 }), { own: 2 })
+      deepStrictEqual(SchemaParser.decodeUnknownSync(Schema.Record(Schema.String, Schema.Number))(input), { own: 2 })
+
+      const finite = Schema.Record(Schema.Literal("inherited"), Schema.Number)
+      deepStrictEqual(SchemaParser.decodeUnknownSync(finite)(input), { inherited: 1 })
+    })
+
     it("should throw an error when the input is invalid", () => {
       const schema = Schema.String
       throws(() => SchemaParser.decodeUnknownSync(schema)(null), (e) => {
@@ -68,12 +530,12 @@ describe("SchemaParser", () => {
 
     it("should throw an error when the cause contains both an Issue and a defect", () => {
       const decodeSchema = Schema.String.pipe(Schema.decode({
-        decode: new SchemaGetter.Getter(() => Effect.failCause(makeMixedCause())),
+        decode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(makeMixedCause())),
         encode: SchemaGetter.passthrough()
       }))
       const encodeSchema = Schema.String.pipe(Schema.encode({
         decode: SchemaGetter.passthrough(),
-        encode: new SchemaGetter.Getter(() => Effect.failCause(makeMixedCause()))
+        encode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(makeMixedCause()))
       }))
 
       throws(() => SchemaParser.decodeUnknownSync(decodeSchema)("a"), (e) => {
@@ -102,12 +564,12 @@ describe("SchemaParser", () => {
 
     it("should reject with an error when the cause contains both an Issue and a defect", async () => {
       const decodeSchema = Schema.String.pipe(Schema.decode({
-        decode: new SchemaGetter.Getter(() => Effect.failCause(makeMixedCause())),
+        decode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(makeMixedCause())),
         encode: SchemaGetter.passthrough()
       }))
       const encodeSchema = Schema.String.pipe(Schema.encode({
         decode: SchemaGetter.passthrough(),
-        encode: new SchemaGetter.Getter(() => Effect.failCause(makeMixedCause()))
+        encode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(makeMixedCause()))
       }))
 
       const r1 = await SchemaParser.decodeUnknownPromise(decodeSchema)("a").then(Result.succeed, Result.fail)
@@ -135,12 +597,12 @@ describe("SchemaParser", () => {
 
     it("should throw an error when the cause is not an Issue", () => {
       const decodeSchema = Schema.String.pipe(Schema.decode({
-        decode: new SchemaGetter.Getter(() => Effect.die(new Error("decode defect"))),
+        decode: SchemaGetter.transformOptionalEffect(() => Effect.die(new Error("decode defect"))),
         encode: SchemaGetter.passthrough()
       }))
       const encodeSchema = Schema.String.pipe(Schema.encode({
         decode: SchemaGetter.passthrough(),
-        encode: new SchemaGetter.Getter(() => Effect.die(new Error("encode defect")))
+        encode: SchemaGetter.transformOptionalEffect(() => Effect.die(new Error("encode defect")))
       }))
 
       throws(() => SchemaParser.decodeUnknownOption(decodeSchema)("a"), (e) => {
@@ -157,12 +619,12 @@ describe("SchemaParser", () => {
 
     it("should throw an error when the cause contains both an Issue and a defect", () => {
       const decodeSchema = Schema.String.pipe(Schema.decode({
-        decode: new SchemaGetter.Getter(() => Effect.failCause(makeMixedCause())),
+        decode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(makeMixedCause())),
         encode: SchemaGetter.passthrough()
       }))
       const encodeSchema = Schema.String.pipe(Schema.encode({
         decode: SchemaGetter.passthrough(),
-        encode: new SchemaGetter.Getter(() => Effect.failCause(makeMixedCause()))
+        encode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(makeMixedCause()))
       }))
 
       throws(() => SchemaParser.decodeUnknownOption(decodeSchema)("a"), (e) => {
@@ -243,12 +705,12 @@ describe("SchemaParser", () => {
   describe("decodeUnknownResult / encodeUnknownResult", () => {
     it("should throw an error when the cause is not an Issue", () => {
       const decodeSchema = Schema.String.pipe(Schema.decode({
-        decode: new SchemaGetter.Getter(() => Effect.die(new Error("decode defect"))),
+        decode: SchemaGetter.transformOptionalEffect(() => Effect.die(new Error("decode defect"))),
         encode: SchemaGetter.passthrough()
       }))
       const encodeSchema = Schema.String.pipe(Schema.encode({
         decode: SchemaGetter.passthrough(),
-        encode: new SchemaGetter.Getter(() => Effect.die(new Error("encode defect")))
+        encode: SchemaGetter.transformOptionalEffect(() => Effect.die(new Error("encode defect")))
       }))
 
       throws(() => SchemaParser.decodeUnknownResult(decodeSchema)("a"), (e) => {
@@ -265,12 +727,12 @@ describe("SchemaParser", () => {
 
     it("should throw an error when the cause contains both an Issue and a defect", () => {
       const decodeSchema = Schema.String.pipe(Schema.decode({
-        decode: new SchemaGetter.Getter(() => Effect.failCause(makeMixedCause())),
+        decode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(makeMixedCause())),
         encode: SchemaGetter.passthrough()
       }))
       const encodeSchema = Schema.String.pipe(Schema.encode({
         decode: SchemaGetter.passthrough(),
-        encode: new SchemaGetter.Getter(() => Effect.failCause(makeMixedCause()))
+        encode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(makeMixedCause()))
       }))
 
       throws(() => SchemaParser.decodeUnknownResult(decodeSchema)("a"), (e) => {
@@ -371,7 +833,7 @@ describe("SchemaParser", () => {
 
       let rejectedReads = 0
       const rejectedKey = Schema.String.pipe(Schema.decode({
-        decode: new SchemaGetter.Getter(() => Effect.fail(new SchemaIssue.InvalidValue())),
+        decode: SchemaGetter.transformOptionalEffect(() => Effect.fail(new SchemaIssue.InvalidValue())),
         encode: SchemaGetter.passthrough()
       }))
       const rejectedInput = {
@@ -394,7 +856,7 @@ describe("SchemaParser", () => {
 
     it("rejects a missing root output", () => {
       const schema = Schema.String.pipe(Schema.decode({
-        decode: new SchemaGetter.Getter(() => Effect.succeedNone),
+        decode: SchemaGetter.transformOptionalEffect(() => Effect.succeedNone),
         encode: SchemaGetter.passthrough()
       }))
       const result = SchemaParser.decodeUnknownExit(schema)("value")
@@ -403,7 +865,7 @@ describe("SchemaParser", () => {
     })
 
     it("rejects a missing root output after parsing structural schemas", () => {
-      const missing = new SchemaGetter.Getter<never, unknown>(() => Effect.succeedNone)
+      const missing = SchemaGetter.transformOptionalEffect<never, unknown>(() => Effect.succeedNone)
       const array = Schema.Array(Schema.String).pipe(Schema.decode({
         decode: missing,
         encode: missing
@@ -467,7 +929,7 @@ describe("SchemaParser", () => {
     it.effect("wraps an asynchronous failure from a uniquely selected union member", () =>
       Effect.gen(function*() {
         const failing = Schema.String.pipe(Schema.decode({
-          decode: new SchemaGetter.Getter(() =>
+          decode: SchemaGetter.transformOptionalEffect(() =>
             Effect.yieldNow.pipe(
               Effect.andThen(Effect.fail(new SchemaIssue.InvalidValue()))
             )
@@ -488,10 +950,10 @@ describe("SchemaParser", () => {
         strictEqual(error.success._tag, "AnyOf")
       }))
 
-    it.effect("resolves an unchanged concurrent union candidate", () =>
+    it.effect("resolves an unchanged union candidate after an asynchronous failure", () =>
       Effect.gen(function*() {
         const delayedFailure = Schema.String.pipe(Schema.decode({
-          decode: new SchemaGetter.Getter(() =>
+          decode: SchemaGetter.transformOptionalEffect(() =>
             Effect.yieldNow.pipe(
               Effect.andThen(Effect.fail(new SchemaIssue.InvalidValue()))
             )
@@ -501,7 +963,7 @@ describe("SchemaParser", () => {
         const schema = Schema.Union([delayedFailure, Schema.String])
 
         strictEqual(
-          yield* SchemaParser.decodeUnknownEffect(schema)("value", { concurrency: 2 }),
+          yield* SchemaParser.decodeUnknownEffect(schema)("value"),
           "value"
         )
       }))
@@ -510,7 +972,7 @@ describe("SchemaParser", () => {
       const calls: Array<string> = []
       const field = (name: string, suspended = false) =>
         Schema.String.pipe(Schema.decode({
-          decode: new SchemaGetter.Getter((input) => {
+          decode: SchemaGetter.transformOptionalEffect((input) => {
             calls.push(name)
             return suspended ? Effect.suspend(() => Effect.succeed(input)) : Effect.succeed(input)
           }),
@@ -691,7 +1153,7 @@ describe("SchemaParser", () => {
 
     it("should preserve mixed causes in union candidates instead of trying later candidates", () => {
       const failure = Schema.String.pipe(Schema.decode({
-        decode: new SchemaGetter.Getter(() => Effect.failCause(makeMixedCause())),
+        decode: SchemaGetter.transformOptionalEffect(() => Effect.failCause(makeMixedCause())),
         encode: SchemaGetter.passthrough()
       }))
       const schema = Schema.Union([
diff --git a/repos/effect/packages/effect/test/schema/SchemaTransformation.test.ts b/repos/effect/packages/effect/test/schema/SchemaTransformation.test.ts
index 33029305d..de4195f4e 100644
--- a/repos/effect/packages/effect/test/schema/SchemaTransformation.test.ts
+++ b/repos/effect/packages/effect/test/schema/SchemaTransformation.test.ts
@@ -1,10 +1,30 @@
-import { SchemaTransformation } from "effect"
+import { SchemaGetter, SchemaTransformation } from "effect"
 import { describe, it } from "vitest"
-import { assertFalse, assertTrue } from "../utils/assert.ts"
+import { assertFalse, assertTrue, strictEqual } from "../utils/assert.ts"
 
 describe("SchemaTransformation", () => {
   it("isTransformation", () => {
     assertTrue(SchemaTransformation.isTransformation(SchemaTransformation.passthrough()))
     assertFalse(SchemaTransformation.isTransformation({ "~effect/SchemaTransformation/Transformation": false }))
   })
+
+  it("pipe", () => {
+    const transformation = SchemaTransformation.passthrough<string>()
+    const middleware = new SchemaTransformation.Middleware<string, string, never, never, never, never>(
+      (effect) => effect,
+      (effect) => effect
+    )
+
+    strictEqual(transformation.pipe((self) => self), transformation)
+    strictEqual(middleware.pipe((self) => self), middleware)
+  })
+
+  it("makeTransformation preserves an existing transformation", () => {
+    const transformation = SchemaTransformation.makeTransformation({
+      decode: SchemaGetter.transform(Number),
+      encode: SchemaGetter.transform(String)
+    })
+
+    strictEqual(SchemaTransformation.makeTransformation(transformation), transformation)
+  })
 })
diff --git a/repos/effect/packages/effect/test/schema/TemplateLiteral.test.ts b/repos/effect/packages/effect/test/schema/TemplateLiteral.test.ts
new file mode 100644
index 000000000..2e157f306
--- /dev/null
+++ b/repos/effect/packages/effect/test/schema/TemplateLiteral.test.ts
@@ -0,0 +1,183 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Context, Effect, Schema, SchemaAST, SchemaGetter, SchemaTransformation } from "effect"
+
+describe("TemplateLiteral", () => {
+  it("does not expand shared subtemplates during construction", () => {
+    let visits = 0
+    let part: SchemaAST.AST = new Proxy(new SchemaAST.String(), {
+      get(target, property, receiver) {
+        if (property === "encoding") visits++
+        return Reflect.get(target, property, receiver)
+      }
+    })
+    const depth = 20
+    for (let level = 0; level < depth; level++) {
+      part = new SchemaAST.TemplateLiteral([part, part])
+    }
+    assert.isAtMost(visits, depth)
+  })
+
+  it("rejects codecs at construction, including transformations between equal types", () => {
+    for (
+      const part of [
+        Schema.BooleanFromBit,
+        Schema.FiniteFromString,
+        Schema.String.pipe(Schema.decode(SchemaTransformation.snakeToCamel()))
+      ]
+    ) {
+      assert.throws(
+        () => Schema.TemplateLiteral([part]),
+        "TemplateLiteral parts cannot have an encoding at parts[0]"
+      )
+      assert.throws(
+        () => new SchemaAST.TemplateLiteral([part.ast]),
+        "TemplateLiteral parts cannot have an encoding at parts[0]"
+      )
+    }
+  })
+
+  it("rejects codecs inside nested unions", () => {
+    const part = Schema.Union([
+      Schema.String,
+      Schema.Union([Schema.Number, Schema.BooleanFromBit])
+    ])
+    assert.throws(
+      () => Schema.TemplateLiteral(["prefix", part]),
+      "TemplateLiteral parts cannot have an encoding at parts[1].types[1].types[1]"
+    )
+  })
+
+  it("rejects a transformed nested template", () => {
+    const part = Schema.TemplateLiteral([Schema.String]).pipe(
+      Schema.decode(SchemaTransformation.snakeToCamel())
+    )
+    assert.throws(
+      () => Schema.TemplateLiteral([part]),
+      "TemplateLiteral parts cannot have an encoding at parts[0]"
+    )
+  })
+
+  it.effect("preserves brands, supported checks, and explicit projections", () =>
+    Effect.gen(function*() {
+      const schema = Schema.TemplateLiteral([
+        Schema.NonEmptyString.pipe(Schema.brand("Prefix")),
+        ":",
+        Schema.Int.check(Schema.isGreaterThan(0))
+      ])
+      assert.strictEqual(yield* Schema.decodeEffect(schema)("a:1"), "a:1")
+      assert.isFalse(Schema.is(schema)(":1"))
+      assert.isFalse(Schema.is(schema)("a:0"))
+
+      const bits = Schema.TemplateLiteral([Schema.toEncoded(Schema.BooleanFromBit)])
+      assert.isTrue(Schema.is(bits)("0"))
+      assert.isTrue(Schema.is(bits)("1"))
+      assert.isFalse(Schema.is(bits)("true"))
+    }))
+})
+
+describe("TemplateLiteralParser", () => {
+  it.effect("transforms a template into a tuple and encodes transformed parts", () =>
+    Effect.gen(function*() {
+      const schema = Schema.TemplateLiteralParser(["bit:", Schema.BooleanFromBit])
+      const encoded = Schema.toEncoded(schema)
+      assert.strictEqual(encoded.ast._tag, "TemplateLiteral")
+      assert.isTrue(Schema.is(encoded)("bit:1"))
+      assert.isFalse(Schema.is(encoded)("bit:true"))
+      assert.deepStrictEqual(yield* Schema.decodeEffect(schema)("bit:1"), ["bit:", true])
+      assert.strictEqual(yield* Schema.encodeEffect(schema)(["bit:", false]), "bit:0")
+      assert.strictEqual((yield* Effect.result(Schema.decodeUnknownEffect(schema)("bit:true")))._tag, "Failure")
+    }))
+
+  it.effect("preserves decoded checks and supports decode-only parts", () =>
+    Effect.gen(function*() {
+      const part = Schema.Literals([0, 1]).pipe(Schema.decodeTo(
+        Schema.Boolean.check(Schema.makeFilter((value) => value)),
+        {
+          decode: SchemaGetter.transform((value) => value === 1),
+          encode: SchemaGetter.forbiddenEncoding
+        }
+      ))
+      const schema = Schema.TemplateLiteralParser([part])
+      assert.deepStrictEqual(yield* Schema.decodeEffect(schema)("1"), [true])
+      assert.strictEqual((yield* Effect.result(Schema.decodeEffect(schema)("0")))._tag, "Failure")
+      assert.strictEqual((yield* Effect.result(Schema.encodeEffect(schema)([true])))._tag, "Failure")
+    }))
+
+  it.effect("preserves string coercion for transformed numeric parts", () =>
+    Effect.gen(function*() {
+      const schema = Schema.TemplateLiteralParser(["a", Schema.FiniteFromString])
+      assert.deepStrictEqual(yield* Schema.decodeEffect(schema)("a"), ["a", 0])
+      assert.deepStrictEqual(yield* Schema.decodeEffect(schema)("a1"), ["a", 1])
+      assert.strictEqual((yield* Effect.result(Schema.decodeEffect(schema)("ab")))._tag, "Failure")
+    }))
+
+  it.effect("enforces oneOf after decoding overlapping encoded members", () =>
+    Effect.gen(function*() {
+      const part = Schema.Union([
+        Schema.String.pipe(Schema.decodeTo(Schema.Literal("a"))),
+        Schema.String.pipe(Schema.decodeTo(Schema.Literal("b")))
+      ], { mode: "oneOf" })
+      const schema = Schema.TemplateLiteralParser([part])
+      assert.deepStrictEqual(yield* Schema.decodeEffect(schema)("a"), ["a"])
+      assert.deepStrictEqual(yield* Schema.decodeEffect(schema)("b"), ["b"])
+      assert.strictEqual((yield* Effect.result(Schema.decodeEffect(schema)("c")))._tag, "Failure")
+      assert.strictEqual(yield* Schema.encodeEffect(schema)(["a"]), "a")
+
+      const ambiguous = Schema.TemplateLiteralParser([
+        Schema.Union([Schema.String, Schema.Number], { mode: "oneOf" })
+      ])
+      assert.strictEqual((yield* Effect.result(Schema.decodeEffect(ambiguous)("1")))._tag, "Failure")
+      assert.strictEqual(yield* Schema.encodeEffect(ambiguous)(["1"]), "1")
+    }))
+
+  it.effect("preserves shared unions when normalizing encoded parts", () =>
+    Effect.gen(function*() {
+      let part: Schema.Codec<"a" | "b", string> = Schema.Union([
+        Schema.String.pipe(Schema.decodeTo(Schema.Literal("a"))),
+        Schema.String.pipe(Schema.decodeTo(Schema.Literal("b")))
+      ], { mode: "oneOf" })
+      const depth = 12
+      for (let level = 0; level < depth; level++) {
+        part = Schema.Union([part, part])
+      }
+      const schema = Schema.TemplateLiteralParser([part, ":", part])
+      const source = Schema.toEncoded(schema).ast
+      if (source._tag !== "TemplateLiteral") return assert.fail("Expected a TemplateLiteral source")
+      assert.isTrue(source.parts[0] === source.parts[2])
+      let current = source.parts[0]
+      for (let level = 0; level < depth; level++) {
+        if (current._tag !== "Union") return assert.fail("Expected a Union part")
+        assert.isTrue(current.types[0] === current.types[1])
+        current = current.types[0]
+      }
+      assert.deepStrictEqual(yield* Schema.decodeEffect(schema)("a:b"), ["a", ":", "b"])
+      assert.strictEqual(yield* Schema.encodeEffect(schema)(["b", ":", "a"]), "b:a")
+    }))
+
+  it.effect("keeps greedy segmentation without requiring tuple round-trips", () =>
+    Effect.gen(function*() {
+      const schema = Schema.TemplateLiteralParser([Schema.String, ":", Schema.String])
+      const encoded = yield* Schema.encodeEffect(schema)(["a", ":", "b:c"])
+      assert.strictEqual(encoded, "a:b:c")
+      assert.deepStrictEqual(yield* Schema.decodeEffect(schema)(encoded), ["a:b", ":", "c"])
+    }))
+
+  it.effect("uses separate decoding and encoding services", () =>
+    Effect.gen(function*() {
+      class DecodeScale extends Context.Service<DecodeScale, number>()("TemplateLiteral/DecodeScale") {}
+      class EncodeScale extends Context.Service<EncodeScale, number>()("TemplateLiteral/EncodeScale") {}
+      const part = Schema.Number.pipe(Schema.decode({
+        decode: SchemaGetter.transformEffect((value) => Effect.map(DecodeScale, (scale) => value * scale)),
+        encode: SchemaGetter.transformEffect((value) => Effect.map(EncodeScale, (scale) => value / scale))
+      }))
+      const schema = Schema.TemplateLiteralParser(["value:", part])
+      assert.deepStrictEqual(
+        yield* Schema.decodeEffect(schema)("value:2").pipe(Effect.provideService(DecodeScale, 3)),
+        ["value:", 6]
+      )
+      assert.strictEqual(
+        yield* Schema.encodeEffect(schema)(["value:", 6]).pipe(Effect.provideService(EncodeScale, 2)),
+        "value:3"
+      )
+    }))
+})
diff --git a/repos/effect/packages/effect/test/schema/fixtures/aot-build.ts b/repos/effect/packages/effect/test/schema/fixtures/aot-build.ts
new file mode 100644
index 000000000..b0e7363d9
--- /dev/null
+++ b/repos/effect/packages/effect/test/schema/fixtures/aot-build.ts
@@ -0,0 +1,10 @@
+import { Schema } from "effect"
+
+export const Port = Schema.NumberFromString
+
+export const User = Schema.Struct({
+  name: Schema.String,
+  port: Port
+})
+
+export const ignored = "not a Schema"
diff --git a/repos/effect/packages/effect/test/schema/fixtures/aot-import-guard.ts b/repos/effect/packages/effect/test/schema/fixtures/aot-import-guard.ts
new file mode 100644
index 000000000..011dfaf59
--- /dev/null
+++ b/repos/effect/packages/effect/test/schema/fixtures/aot-import-guard.ts
@@ -0,0 +1,22 @@
+import assert from "node:assert/strict"
+import * as Module from "node:module"
+
+if (Module.registerHooks !== undefined) {
+  Module.registerHooks({
+    resolve(specifier, context, nextResolve) {
+      const resolved = nextResolve(specifier, context)
+      assert.doesNotMatch(
+        resolved.url,
+        /\/(?:internal\/schema\/(?:codegen|jitCompiler)|unstable\/schema\/Schema(?:AOT|JIT)Compiler)(?:\.|\/)/,
+        "Generated modules must not load source generation or the JIT compiler"
+      )
+      return resolved
+    }
+  })
+} else {
+  Object.defineProperty(globalThis, "Function", {
+    value: function() {
+      throw new EvalError("Code generation from strings disallowed")
+    }
+  })
+}
diff --git a/repos/effect/packages/effect/test/schema/fixtures/aot-runner.ts b/repos/effect/packages/effect/test/schema/fixtures/aot-runner.ts
new file mode 100644
index 000000000..357dcff74
--- /dev/null
+++ b/repos/effect/packages/effect/test/schema/fixtures/aot-runner.ts
@@ -0,0 +1,166 @@
+import { Effect, Result, type SchemaAST, SchemaParser } from "effect"
+import type * as CompilerRegistryModule from "effect/internal/schema/compilerRegistry"
+import assert from "node:assert/strict"
+import { join } from "node:path"
+import { pathToFileURL } from "node:url"
+import { asyncFixture, events, lazy, proof, roots, schemas, suspendEvaluations, synchronous } from "./aot.ts"
+import {
+  Constructed,
+  constructionCases,
+  constructionEvents,
+  constructionOptions,
+  constructionSchemas
+} from "./construction.ts"
+
+const CompilerRegistry: typeof CompilerRegistryModule = await import(
+  new URL("../../../src/internal/schema/compilerRegistry.ts", import.meta.url).href
+)
+
+const options: ReadonlyArray<SchemaAST.ParseOptions | undefined> = [
+  undefined,
+  { errors: "all", reportInput: true },
+  { onExcessProperty: "error" },
+  { disableChecks: true }
+]
+
+const snapshot = () =>
+  Object.fromEntries(
+    Object.entries(synchronous).map(([name, { inputs, schema }]) => {
+      const is = SchemaParser.is(schema)
+      const results = options.map((option) => {
+        const decode = SchemaParser.decodeUnknownResult(schema, option)
+        return inputs.map((input) => {
+          events.length = 0
+          const result = decode(input)
+          const calls = [...events]
+          return {
+            // Template diagnostics construct internal ASTs with fresh functions.
+            result: name === "templateLiteral" || name === "templateLiteralParser"
+              ? Result.mapError(result, (issue) => JSON.stringify(issue))
+              : result,
+            calls,
+            is: is(input)
+          }
+        })
+      })
+      return [name, results]
+    })
+  )
+
+const snapshotAsync = async () => {
+  const results = []
+  const decode = SchemaParser.decodeUnknownEffect(asyncFixture.schema)
+  for (const input of asyncFixture.inputs) {
+    events.length = 0
+    const result = await Effect.runPromise(Effect.result(decode(input)))
+    results.push({ result, calls: [...events] })
+  }
+  return results
+}
+
+assert.throws(() => new Function("return true"), EvalError)
+const interpreted = snapshot()
+const interpretedAsync = await snapshotAsync()
+const snapshotConstruction = async () => {
+  const out = []
+  for (const fixture of Object.values(constructionCases)) {
+    const make = SchemaParser.makeEffect(fixture.schema)
+    for (const parseOptions of constructionOptions) {
+      for (const input of fixture.inputs) {
+        constructionEvents.length = 0
+        const result = await Effect.runPromise(Effect.result(make(input as never, { parseOptions })))
+        out.push({ result, events: [...constructionEvents] })
+      }
+    }
+  }
+  return out
+}
+const interpretedConstruction = await snapshotConstruction()
+assert.equal(suspendEvaluations, 0)
+
+const before = CompilerRegistry.resolve(schemas.struct.ast)
+const empty = await import(pathToFileURL(join(process.argv[2], "empty.mjs")).href)
+assert.equal(empty.install([]), undefined)
+assert.equal(CompilerRegistry.resolve(schemas.struct.ast), before)
+
+if (process.argv[3] === "multiple") {
+  const generated = await import(pathToFileURL(join(process.argv[2], "all.mjs")).href)
+  assert.equal(CompilerRegistry.resolve(schemas.struct.ast), before)
+  assert.equal(generated.install(roots), undefined)
+} else {
+  for (const [name, schema] of Object.entries(schemas)) {
+    const before = name === "struct" ? CompilerRegistry.resolve(schema.ast) : undefined
+    const generated = await import(pathToFileURL(join(process.argv[2], `${name}.mjs`)).href)
+    if (before !== undefined) assert.equal(CompilerRegistry.resolve(schema.ast), before)
+    assert.equal(generated.install([schema.ast]), undefined)
+  }
+}
+assert.equal(suspendEvaluations, 0)
+
+for (
+  const name of [
+    "struct",
+    "array",
+    "tuple",
+    "tagged",
+    "sentinel",
+    "sentinelLookup",
+    "record",
+    "transformed",
+    "transformedStruct",
+    "pureTransformedStruct",
+    "checkedTransformedStruct",
+    "encodingCheckedTransformedStruct",
+    "asynchronous",
+    "middleware"
+  ]
+) {
+  assert.equal(typeof CompilerRegistry.resolve(schemas[name].ast).compiled, "function", name)
+}
+
+assert.deepEqual(snapshot(), interpreted)
+assert.deepEqual(await snapshotAsync(), interpretedAsync)
+for (const [name, schema] of Object.entries(constructionSchemas)) {
+  if (name === "construct-declaration") continue
+  assert.equal(typeof CompilerRegistry.resolve(schema.ast).compiled, "function", name)
+}
+assert.deepEqual(await snapshotConstruction(), interpretedConstruction)
+const instance = Constructed.make({})
+constructionEvents.length = 0
+assert.equal(Constructed.make(instance), instance)
+assert.equal(await Effect.runPromise(Constructed.makeEffect(instance)), instance)
+assert.deepEqual(constructionEvents, [])
+
+const transform = SchemaParser.decodeUnknownResult(schemas.transformed)
+events.length = 0
+assert.deepEqual(transform("2"), Result.succeed(2))
+assert.deepEqual(events, ["transform"])
+events.length = 0
+assert.ok(Result.isFailure(transform("-1")))
+assert.deepEqual(events, ["transform"])
+
+events.length = 0
+assert.deepEqual(SchemaParser.decodeUnknownResult(schemas.middleware)("-1"), Result.succeed(1))
+assert.deepEqual(events, ["transform", "middleware", "recover"])
+
+assert.deepEqual(SchemaParser.decodeUnknownSync(proof)({ value: "a", extra: true }), { value: "a" })
+assert.deepEqual(SchemaParser.make(proof)({ value: "constructed" }), { value: "constructed" })
+assert.ok(Result.isFailure(SchemaParser.decodeUnknownResult(proof)({ value: 1 })))
+assert.equal(SchemaParser.is(proof)({ value: "a" }), true)
+assert.equal(SchemaParser.is(proof)({ value: 1 }), false)
+assert.deepEqual(SchemaParser.decodeUnknownSync(schemas.proofArray)([{ value: "a", extra: true }]), [{ value: "a" }])
+assert.ok(Result.isFailure(SchemaParser.decodeUnknownResult(schemas.proofArray)([{ value: 1 }])))
+let invalidReads = 0
+assert.ok(Result.isFailure(
+  SchemaParser.decodeUnknownResult(schemas.proofArray)([{
+    get value() {
+      invalidReads++
+      return 1
+    }
+  }])
+))
+assert.equal(invalidReads, 2)
+
+assert.deepEqual(SchemaParser.decodeUnknownSync(lazy)({ value: "lazy" }), { value: "lazy" })
+assert.equal(suspendEvaluations, 1)
+process.stdout.write("AOT integration passed\n")
diff --git a/repos/effect/packages/effect/test/schema/fixtures/aot.ts b/repos/effect/packages/effect/test/schema/fixtures/aot.ts
new file mode 100644
index 000000000..d10f3b6ac
--- /dev/null
+++ b/repos/effect/packages/effect/test/schema/fixtures/aot.ts
@@ -0,0 +1,239 @@
+import { Effect, Option, Schema, SchemaGetter, SchemaTransformation } from "effect"
+import { invalid } from "effect/unstable/schema/SchemaCompiler"
+import { constructionSchemas } from "./construction.ts"
+
+export const key = Symbol("key")
+export const token = Symbol("token")
+export const events: Array<string> = []
+
+const transformed = Schema.String.pipe(
+  Schema.decodeTo(
+    Schema.Number.check(Schema.isGreaterThan(0)),
+    SchemaTransformation.transform({
+      decode: (input) => {
+        events.push("transform")
+        return Number(input)
+      },
+      encode: String
+    })
+  )
+)
+
+const pureTransformed = Schema.String.pipe(
+  Schema.decodeTo(
+    Schema.Number,
+    SchemaTransformation.transform({
+      decode: (input) => {
+        events.push("pure transform")
+        return input === "invalid" ? "invalid" as any : Number(input)
+      },
+      encode: String
+    })
+  )
+)
+
+const pureTransform = (decode: (input: string) => number) =>
+  Schema.String.pipe(
+    Schema.decodeTo(
+      Schema.Number,
+      SchemaTransformation.transform({ decode, encode: String })
+    )
+  )
+const sharedPureTransform = pureTransform(Number)
+
+const middleware = transformed.pipe(
+  Schema.middlewareDecoding((effect) => {
+    events.push("middleware")
+    return Effect.catchEager(effect, () => {
+      events.push("recover")
+      return Effect.succeed(Option.some(1))
+    })
+  })
+)
+
+const asynchronous = Schema.String.pipe(
+  Schema.decodeTo(Schema.Number.check(Schema.isGreaterThan(0)), {
+    decode: SchemaGetter.transformOptionalEffect((input) => {
+      events.push("async")
+      return Effect.yieldNow.pipe(Effect.as(Option.map(input, Number)))
+    }),
+    encode: SchemaGetter.transform(String)
+  })
+)
+
+interface Fixture {
+  readonly schema: Schema.ConstraintDecoder<unknown>
+  readonly inputs: ReadonlyArray<unknown>
+}
+
+export const synchronous = {
+  struct: {
+    schema: Schema.Struct({
+      name: Schema.String,
+      nested: Schema.Struct({ count: Schema.Number.check(Schema.isGreaterThan(0)) }),
+      optional: Schema.optionalKey(Schema.String)
+    }).check(Schema.makeFilter((input) => Object.keys(input).length <= 3)),
+    inputs: [
+      { name: "a", nested: { count: 1, ignored: true }, extra: true },
+      { name: "a", nested: { count: -1 } },
+      { name: 1, nested: { count: "invalid" } },
+      { name: "a" }
+    ]
+  },
+  array: {
+    schema: Schema.Array(Schema.Struct({ value: Schema.String })),
+    inputs: [[{ value: "a", extra: true }], [{ value: 1 }, {}], null]
+  },
+  tuple: {
+    schema: Schema.TupleWithRest(Schema.Tuple([Schema.String]), [Schema.Number, Schema.Boolean]),
+    inputs: [["a", 1, 2, true], ["a", true], ["a", "invalid", false], ["a"]]
+  },
+  tagged: {
+    schema: Schema.Union([
+      Schema.Struct({ kind: Schema.Literal("a"), value: Schema.String }),
+      Schema.Struct({ kind: Schema.Literal("b"), value: Schema.Number })
+    ]),
+    inputs: [{ kind: "b", value: 1 }, { kind: "b", value: "invalid" }, { kind: "c" }]
+  },
+  literals: {
+    schema: Schema.Literals(["a", "b", 0, 1, 2, 3, 4, 5, 6, 7, 8]),
+    inputs: ["a", -0, 8, 9, null]
+  },
+  oneOf: {
+    schema: Schema.Union([Schema.String, Schema.Literal("a")], { mode: "oneOf" }),
+    inputs: ["b", "a", false]
+  },
+  sentinel: {
+    schema: Schema.Union([Schema.Symbol, Schema.String]),
+    inputs: [invalid]
+  },
+  sentinelLookup: {
+    schema: Schema.Union([Schema.UniqueSymbol(invalid), Schema.Literal("valid")]),
+    inputs: [invalid]
+  },
+  checkedSentinel: {
+    schema: Schema.Struct({ value: Schema.Union([Schema.Symbol, Schema.String]) }).check(
+      Schema.makeFilter(() => true)
+    ),
+    inputs: [{ value: invalid }]
+  },
+  symbols: {
+    schema: Schema.Struct({ [key]: Schema.UniqueSymbol(token) }),
+    inputs: [{ [key]: token }, { [key]: key }, {}]
+  },
+  enumeration: {
+    schema: Schema.Enum({ a: "a", b: "b", c: 0, d: 1, e: 2, f: 3, g: 4, h: 5, i: 6 }),
+    inputs: ["a", -0, 6, "invalid"]
+  },
+  record: {
+    schema: Schema.Record(Schema.String, Schema.Struct({ count: Schema.Number })),
+    inputs: [{ a: { count: 1 } }, { a: { count: "invalid" }, b: {} }, {}]
+  },
+  mixedRecord: {
+    schema: Schema.StructWithRest(
+      Schema.Struct({ fixed: Schema.Number }),
+      [
+        Schema.Record(Schema.TemplateLiteral(["data-", Schema.String]), Schema.Number),
+        Schema.Record(Schema.Symbol, Schema.Number)
+      ]
+    ),
+    inputs: [
+      { fixed: 1, "data-a": 2, [key]: 3 },
+      { fixed: 1, ignored: true },
+      { fixed: 1, [key]: "invalid" }
+    ]
+  },
+  numericRecord: {
+    schema: Schema.Record(Schema.Union([Schema.Literal(1), Schema.Symbol]), Schema.String),
+    inputs: [{ 1: "one", [key]: "symbol" }, { 1: "one", extra: true }, { 1: 1 }]
+  },
+  templateLiteral: {
+    schema: Schema.TemplateLiteral(["count:", Schema.Int.check(Schema.isGreaterThan(0))]),
+    inputs: ["count:1", "count:0", "count:1.5", "invalid", null]
+  },
+  templateLiteralParser: {
+    schema: Schema.TemplateLiteralParser(["bit:", Schema.BooleanFromBit]),
+    inputs: ["bit:1", "bit:0", "bit:true", null]
+  },
+  transformed: { schema: transformed, inputs: ["2", "-1", false] },
+  checkedTransformedStruct: {
+    schema: Schema.Struct({ value: transformed }).check(Schema.makeFilter((output) => {
+      events.push("struct check")
+      return output.value < 10 && Object.keys(output).length === 1
+    })),
+    inputs: [{ value: "2", extra: true }, { value: "12" }, { value: "-1" }, {}]
+  },
+  encodingCheckedTransformedStruct: {
+    schema: Schema.Struct({ value: transformed }).pipe(
+      Schema.flip,
+      Schema.check(Schema.makeFilter((input) => {
+        events.push("encoding check")
+        return input.value !== "02"
+      })),
+      Schema.flip
+    ),
+    inputs: [{ value: "2" }, { value: "02" }, { value: "-1" }]
+  },
+  transformedStruct: {
+    schema: Schema.Struct({ before: Schema.String, value: transformed, after: Schema.Boolean }),
+    inputs: [
+      { before: "a", value: "2", after: true },
+      { before: "a", value: "-1", after: true },
+      { before: "a", value: "2", after: "invalid" }
+    ]
+  },
+  pureTransformedStruct: {
+    schema: Schema.Struct({ value: pureTransformed }),
+    inputs: [{ value: "2" }, { value: false }, { value: "invalid" }]
+  },
+  pureTransformedFields: {
+    schema: Schema.Struct({
+      first: sharedPureTransform,
+      second: sharedPureTransform,
+      incremented: pureTransform((input) => Number(input) + 1),
+      doubled: pureTransform((input) => Number(input) * 2)
+    }),
+    inputs: [
+      { first: "1", second: "2", incremented: "3", doubled: "4" },
+      { first: false, second: "2", incremented: "3", doubled: "4" }
+    ]
+  },
+  middleware: {
+    schema: middleware,
+    inputs: ["2", "-1", false]
+  }
+} satisfies Record<string, Fixture>
+
+export const asyncFixture = {
+  schema: Schema.Struct({ before: Schema.String, value: asynchronous, after: Schema.Boolean }).check(
+    Schema.makeFilter((output) => {
+      events.push("async struct check")
+      return output.value < 10
+    })
+  ),
+  inputs: [
+    { before: "a", value: "2", after: true },
+    { before: "a", value: "12", after: true },
+    { before: "a", value: "-1", after: true },
+    { before: "a", value: "2", after: "invalid" }
+  ]
+}
+
+export let suspendEvaluations = 0
+export const lazy = Schema.suspend(() => {
+  suspendEvaluations++
+  return Schema.Struct({ value: Schema.String })
+})
+
+export const proof = Schema.Struct({ value: Schema.String })
+
+export const schemas: Readonly<Record<string, Schema.ConstraintDecoder<unknown>>> = {
+  ...constructionSchemas,
+  ...Object.fromEntries(Object.entries(synchronous).map(([name, fixture]) => [name, fixture.schema])),
+  asynchronous: asyncFixture.schema,
+  lazy,
+  proofArray: Schema.Array(proof),
+  proof
+}
+
+export const roots = [...Object.values(schemas).map((schema) => schema.ast), proof.ast]
diff --git a/repos/effect/packages/effect/test/schema/fixtures/construction.ts b/repos/effect/packages/effect/test/schema/fixtures/construction.ts
new file mode 100644
index 000000000..395b30a0e
--- /dev/null
+++ b/repos/effect/packages/effect/test/schema/fixtures/construction.ts
@@ -0,0 +1,70 @@
+import { Effect, Schema, SchemaAST } from "effect"
+
+export const constructionEvents: Array<string> = []
+const value = Schema.Number.pipe(Schema.withConstructorDefault(Effect.sync(() => {
+  constructionEvents.push("default")
+  return 1
+})))
+export class Constructed extends Schema.TaggedClass<Constructed>()("Constructed", {
+  value
+}) {
+  readonly initialized = constructionEvents.push("class") > 0
+}
+
+export const constructionCases = {
+  struct: {
+    schema: Schema.Struct({ value, optional: Schema.optionalKey(Schema.String) })
+      .check(Schema.makeFilter((input) => {
+        constructionEvents.push("check")
+        return input.value > 0
+      })),
+    inputs: [{}, { value: undefined }, { value: -1 }, { value: "bad", optional: 1 }, { value: 2, extra: true }]
+  },
+  array: { schema: Schema.Array(value), inputs: [[undefined, 2], ["bad", 3], null] },
+  tuple: {
+    schema: Schema.TupleWithRest(Schema.Tuple([value]), [Schema.String, Schema.Boolean]),
+    inputs: [[], [undefined, "a", true], ["bad", 1, false], [1, true]]
+  },
+  optionalTuple: {
+    schema: Schema.Tuple([Schema.optionalKey(Schema.Undefined)]),
+    inputs: [[], [undefined], [1], [undefined, 2]]
+  },
+  record: { schema: Schema.Record(Schema.String, value), inputs: [{ a: undefined }, { a: "bad", b: "bad" }, {}, null] },
+  mixedRecord: {
+    schema: Schema.StructWithRest(Schema.Struct({ value }), [
+      Schema.Record(Schema.TemplateLiteral(["x-", Schema.String]), Schema.Number)
+    ]),
+    inputs: [{}, { value: 1, "x-a": 2 }, { value: "bad", "x-a": "bad", extra: true }]
+  },
+  union: {
+    schema: Schema.Union([
+      Schema.Struct({ _tag: Schema.tag("A"), value }),
+      Schema.Struct({ _tag: Schema.tag("B"), text: Schema.String })
+    ]),
+    inputs: [{}, { text: "a" }, { _tag: "A", value: "bad" }, { _tag: "C" }]
+  },
+  oneOf: { schema: Schema.Union([Schema.String, Schema.Literal("a")], { mode: "oneOf" }), inputs: ["a", "b", 1] },
+  class: {
+    schema: Constructed,
+    inputs: [{}, { value: undefined }, { value: -1 }, { value: "bad" }, { _tag: "wrong" }]
+  },
+  transformed: {
+    schema: Schema.Struct({ value: Schema.FiniteFromString.pipe(Schema.withConstructorDefault(Effect.succeed(1))) }),
+    inputs: [{}, { value: "1" }, { value: 2 }]
+  },
+  declaration: { schema: Schema.ReadonlySet(Schema.Number), inputs: [new Set([1]), new Set(["bad"]), null] },
+  empty: { schema: Schema.Struct({}), inputs: [{}, 1, [], null] }
+} satisfies Record<string, { readonly schema: Schema.Constraint; readonly inputs: ReadonlyArray<unknown> }>
+
+export const constructionSchemas = Object.fromEntries(
+  Object.entries(constructionCases).map((
+    [name, test]
+  ) => [`construct-${name}`, Schema.make(SchemaAST.toType(test.schema.ast))])
+)
+
+export const constructionOptions: ReadonlyArray<SchemaAST.ParseOptions | undefined> = [
+  undefined,
+  { errors: "all", reportInput: true },
+  { onExcessProperty: "error" },
+  { disableChecks: true }
+]
diff --git a/repos/effect/packages/effect/test/schema/jsonSchemaRoundTrip.test.ts b/repos/effect/packages/effect/test/schema/jsonSchemaRoundTrip.test.ts
index a57717b2f..28b1e987b 100644
--- a/repos/effect/packages/effect/test/schema/jsonSchemaRoundTrip.test.ts
+++ b/repos/effect/packages/effect/test/schema/jsonSchemaRoundTrip.test.ts
@@ -1,6 +1,7 @@
 import { assert, describe, it } from "@effect/vitest"
 import type { Options as AjvOptions } from "ajv"
 import { Exit, JsonSchema, Schema, SchemaRepresentation } from "effect"
+import { throws } from "../utils/assert.ts"
 
 // oxlint-disable-next-line @typescript-eslint/no-require-imports
 const Ajv2020 = require("ajv/dist/2020")
@@ -51,7 +52,7 @@ function assertJsonSchemaImportRoundTrip(
   const source = JsonSchema.fromSchemaDraft2020_12(schema)
   const imported = SchemaRepresentation.fromJsonSchemaDocument(source, { patterns: "apply" })
   const representation = SchemaRepresentation.toRepresentation(imported.ast)
-  const emitted = SchemaRepresentation.toJsonSchemaDocument(representation)
+  const emitted = SchemaRepresentation.toJsonSchemaDocument(representation, { onExcessProperty: "error" })
   assertJsonSchemaEquivalent(source, emitted, inputs)
 
   const validate = compile(source)
@@ -63,9 +64,10 @@ function assertJsonSchemaImportRoundTrip(
 
 function assertRepresentationRoundTrip(
   schema: Schema.ConstraintDecoder<unknown>,
-  inputs: ReadonlyArray<unknown>
+  inputs: ReadonlyArray<unknown>,
+  options: Schema.ToJsonSchemaOptions = { onExcessProperty: "error" }
 ): void {
-  const emitted = Schema.toJsonSchemaDocument(schema)
+  const emitted = Schema.toJsonSchemaDocument(schema, options)
   const imported = SchemaRepresentation.fromJsonSchemaDocument(emitted, { patterns: "apply" })
   const decodeSource = Schema.decodeUnknownExit(schema, { onExcessProperty: "error" })
   const decodeImported = Schema.decodeUnknownExit(imported as unknown as Schema.ConstraintDecoder<unknown>, {
@@ -76,7 +78,7 @@ function assertRepresentationRoundTrip(
     (input) => Exit.isSuccess(decodeSource(input)),
     inputs
   )
-  assertJsonSchemaEquivalent(emitted, Schema.toJsonSchemaDocument(imported), inputs)
+  assertJsonSchemaEquivalent(emitted, Schema.toJsonSchemaDocument(imported, options), inputs)
 }
 
 describe("JSON Schema round-trip laws", () => {
@@ -200,11 +202,12 @@ describe("JSON Schema round-trip laws", () => {
       )
     })
 
-    it("preserves open patternProperties", () => {
+    it("preserves closed patternProperties", () => {
       assertJsonSchemaImportRoundTrip(
         {
           type: "object",
-          patternProperties: { "^a": { type: "string" } }
+          patternProperties: { "^a": { type: "string" } },
+          additionalProperties: false
         },
         [{}, { a: "a" }, { a: 1 }, { ab: "a", b: 1 }, { b: 1 }, []]
       )
@@ -226,20 +229,124 @@ describe("JSON Schema round-trip laws", () => {
       )
     })
 
-    it("preserves pattern indexes", () => {
+    it("preserves closed pattern records but rejects their open export", () => {
+      const schema = Schema.Record(Schema.String.check(Schema.isUppercased()), Schema.Finite)
       assertRepresentationRoundTrip(
-        Schema.Record(Schema.String.check(Schema.isUppercased()), Schema.Finite),
+        schema,
         [{}, { A: 1 }, { A: "a" }, { a: 1 }, { a: "a" }, []]
       )
+      const emitted = Schema.toJsonSchemaDocument(schema)
+      throws(
+        () => SchemaRepresentation.fromJsonSchemaDocument(emitted, { patterns: "apply" }),
+        `Cannot import open "patternProperties": unmatched keys cannot be typed correctly.\n  at ["schema"]`
+      )
     })
 
-    it("preserves pattern and string indexes", () => {
-      assertRepresentationRoundTrip(
+    it("handles conjunctive key patterns permissively", () => {
+      const schema = Schema.Record(
+        Schema.String.check(Schema.isStartsWith("ab"), Schema.isEndsWith("z")),
+        Schema.Finite
+      )
+      const document = Schema.toJsonSchemaDocument(schema)
+      assert.deepStrictEqual(document.schema, {
+        type: "object",
+        additionalProperties: true
+      })
+      const validate = compile(document)
+
+      assert.strictEqual(validate({ abc: "not a number" }), true)
+      assert.deepStrictEqual(Schema.decodeUnknownSync(schema)({ abc: "not a number" }), {})
+      assert.strictEqual(validate({ abz: "not a number" }), true)
+      assert.isTrue(Exit.isFailure(Schema.decodeUnknownExit(schema)({ abz: "not a number" })))
+      assert.strictEqual(validate({ abz: 1 }), true)
+      assert.deepStrictEqual(Schema.decodeUnknownSync(schema)({ abz: 1 }), { abz: 1 })
+
+      const strictDocument = Schema.toJsonSchemaDocument(schema, { onExcessProperty: "error" })
+      assert.deepStrictEqual(strictDocument.schema, {
+        type: "object",
+        propertyNames: {
+          type: "string",
+          pattern: "^ab",
+          allOf: [{ pattern: "z$" }]
+        },
+        additionalProperties: { type: "number" }
+      })
+      const validateStrict = compile(strictDocument)
+      assert.strictEqual(validateStrict({ abc: "not a number" }), false)
+      assert.isTrue(
+        Exit.isFailure(
+          Schema.decodeUnknownExit(schema, { onExcessProperty: "error" })({ abc: "not a number" })
+        )
+      )
+      assert.strictEqual(validateStrict({ abz: "not a number" }), false)
+      assert.strictEqual(validateStrict({ abz: 1 }), true)
+    })
+
+    it("uses permissive value alternatives with strict conjunctive indexes", () => {
+      const schema = Schema.StructWithRest(Schema.Struct({}), [
+        Schema.Record(
+          Schema.String.check(Schema.isStartsWith("a"), Schema.isEndsWith("z")),
+          Schema.Finite
+        ),
+        Schema.Record(
+          Schema.String.check(Schema.isStartsWith("b"), Schema.isEndsWith("z")),
+          Schema.Boolean
+        )
+      ])
+      const document = Schema.toJsonSchemaDocument(schema, { onExcessProperty: "error" })
+      assert.deepStrictEqual(document.schema, {
+        type: "object",
+        propertyNames: {
+          anyOf: [
+            {
+              type: "string",
+              pattern: "^a",
+              allOf: [{ pattern: "z$" }]
+            },
+            {
+              type: "string",
+              pattern: "^b",
+              allOf: [{ pattern: "z$" }]
+            }
+          ]
+        },
+        additionalProperties: {
+          anyOf: [{ type: "number" }, { type: "boolean" }]
+        }
+      })
+      const validate = compile(document)
+
+      assert.strictEqual(validate({ az: 1 }), true)
+      assert.deepStrictEqual(
+        Schema.decodeUnknownSync(schema, { onExcessProperty: "error" })({ az: 1 }) as unknown,
+        { az: 1 }
+      )
+      assert.strictEqual(validate({ bz: true }), true)
+      assert.deepStrictEqual(
+        Schema.decodeUnknownSync(schema, { onExcessProperty: "error" })({ bz: true }) as unknown,
+        { bz: true }
+      )
+      assert.strictEqual(validate({ az: true }), true)
+      assert.isTrue(
+        Exit.isFailure(Schema.decodeUnknownExit(schema, { onExcessProperty: "error" })({ az: true }))
+      )
+      assert.strictEqual(validate({ cz: 1 }), false)
+      assert.isTrue(
+        Exit.isFailure(Schema.decodeUnknownExit(schema, { onExcessProperty: "error" })({ cz: 1 }))
+      )
+    })
+
+    it("rejects exported pattern and string indexes", () => {
+      const emitted = Schema.toJsonSchemaDocument(
         Schema.StructWithRest(Schema.Struct({}), [
           Schema.Record(Schema.String.check(Schema.isUppercased()), Schema.Finite),
           Schema.Record(Schema.String, Schema.Boolean)
         ]),
-        [{}, { A: 1 }, { A: true }, { a: 1 }, { a: true }, []]
+        { onExcessProperty: "error" }
+      )
+      throws(
+        () => SchemaRepresentation.fromJsonSchemaDocument(emitted, { patterns: "apply" }),
+        `Cannot import open "patternProperties": unmatched keys cannot be typed correctly.\n  at ["schema"]["allOf"][0]`
       )
     })
 
diff --git a/repos/effect/packages/effect/test/schema/representation/builtInRevivers.test.ts b/repos/effect/packages/effect/test/schema/representation/builtInRevivers.test.ts
index 07743add6..dca024e9f 100644
--- a/repos/effect/packages/effect/test/schema/representation/builtInRevivers.test.ts
+++ b/repos/effect/packages/effect/test/schema/representation/builtInRevivers.test.ts
@@ -83,7 +83,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isStringFinite()),
       id: "effect/schema/isStringFinite",
       payload: null,
-      reviver: Schema.isStringFiniteReviver,
+      reviver: SchemaRepresentation.isStringFiniteReviver,
       valid: "1.5",
       invalid: "Infinity"
     })
@@ -94,7 +94,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isStringBigInt()),
       id: "effect/schema/isStringBigInt",
       payload: null,
-      reviver: Schema.isStringBigIntReviver,
+      reviver: SchemaRepresentation.isStringBigIntReviver,
       valid: "-10",
       invalid: "1.5"
     })
@@ -105,7 +105,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isStringSymbol()),
       id: "effect/schema/isStringSymbol",
       payload: null,
-      reviver: Schema.isStringSymbolReviver,
+      reviver: SchemaRepresentation.isStringSymbolReviver,
       valid: "Symbol(shared)",
       invalid: "shared"
     })
@@ -116,7 +116,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isMinLength(1.8)),
       id: "effect/schema/isMinLength",
       payload: { minLength: 1 },
-      reviver: Schema.isMinLengthReviver,
+      reviver: SchemaRepresentation.isMinLengthReviver,
       valid: "a",
       invalid: ""
     })
@@ -127,7 +127,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isMaxLength(3.8)),
       id: "effect/schema/isMaxLength",
       payload: { maxLength: 3 },
-      reviver: Schema.isMaxLengthReviver,
+      reviver: SchemaRepresentation.isMaxLengthReviver,
       valid: "abc",
       invalid: "abcd"
     })
@@ -138,7 +138,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isLengthBetween(1.8, 3.8)),
       id: "effect/schema/isLengthBetween",
       payload: { minimum: 1, maximum: 3 },
-      reviver: Schema.isLengthBetweenReviver,
+      reviver: SchemaRepresentation.isLengthBetweenReviver,
       valid: "ab",
       invalid: ""
     })
@@ -149,7 +149,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isPattern(/^a+$/i)),
       id: "effect/schema/isPattern",
       payload: { source: "^a+$", flags: "i" },
-      reviver: Schema.isPatternReviver,
+      reviver: SchemaRepresentation.isPatternReviver,
       valid: "AAA",
       invalid: "bbb"
     })
@@ -160,7 +160,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isTrimmed()),
       id: "effect/schema/isTrimmed",
       payload: null,
-      reviver: Schema.isTrimmedReviver,
+      reviver: SchemaRepresentation.isTrimmedReviver,
       valid: "text",
       invalid: " text "
     })
@@ -171,7 +171,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isUUID(4)),
       id: "effect/schema/isUUID",
       payload: { version: 4 },
-      reviver: Schema.isUUIDReviver,
+      reviver: SchemaRepresentation.isUUIDReviver,
       valid: "123e4567-e89b-42d3-a456-426614174000",
       invalid: "123e4567-e89b-12d3-a456-426614174000"
     })
@@ -182,7 +182,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isGUID()),
       id: "effect/schema/isGUID",
       payload: null,
-      reviver: Schema.isGUIDReviver,
+      reviver: SchemaRepresentation.isGUIDReviver,
       valid: "123e4567-e89b-12d3-a456-426614174000",
       invalid: "not-a-guid"
     })
@@ -193,7 +193,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isULID()),
       id: "effect/schema/isULID",
       payload: null,
-      reviver: Schema.isULIDReviver,
+      reviver: SchemaRepresentation.isULIDReviver,
       valid: "01ARZ3NDEKTSV4RRFFQ69G5FAV",
       invalid: "not-a-ulid"
     })
@@ -204,7 +204,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isBase64()),
       id: "effect/schema/isBase64",
       payload: null,
-      reviver: Schema.isBase64Reviver,
+      reviver: SchemaRepresentation.isBase64Reviver,
       valid: "YQ==",
       invalid: "?"
     })
@@ -215,7 +215,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isBase64Url()),
       id: "effect/schema/isBase64Url",
       payload: null,
-      reviver: Schema.isBase64UrlReviver,
+      reviver: SchemaRepresentation.isBase64UrlReviver,
       valid: "YQ",
       invalid: "?"
     })
@@ -226,7 +226,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isStartsWith("pre")),
       id: "effect/schema/isStartsWith",
       payload: { startsWith: "pre" },
-      reviver: Schema.isStartsWithReviver,
+      reviver: SchemaRepresentation.isStartsWithReviver,
       valid: "prefix",
       invalid: "suffix"
     })
@@ -237,7 +237,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isEndsWith("end")),
       id: "effect/schema/isEndsWith",
       payload: { endsWith: "end" },
-      reviver: Schema.isEndsWithReviver,
+      reviver: SchemaRepresentation.isEndsWithReviver,
       valid: "weekend",
       invalid: "ending"
     })
@@ -248,7 +248,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isIncludes("mid")),
       id: "effect/schema/isIncludes",
       payload: { includes: "mid" },
-      reviver: Schema.isIncludesReviver,
+      reviver: SchemaRepresentation.isIncludesReviver,
       valid: "middle",
       invalid: "outside"
     })
@@ -259,7 +259,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isUppercased()),
       id: "effect/schema/isUppercased",
       payload: null,
-      reviver: Schema.isUppercasedReviver,
+      reviver: SchemaRepresentation.isUppercasedReviver,
       valid: "ABC1",
       invalid: "Abc"
     })
@@ -270,7 +270,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isLowercased()),
       id: "effect/schema/isLowercased",
       payload: null,
-      reviver: Schema.isLowercasedReviver,
+      reviver: SchemaRepresentation.isLowercasedReviver,
       valid: "abc1",
       invalid: "Abc"
     })
@@ -281,7 +281,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isCapitalized()),
       id: "effect/schema/isCapitalized",
       payload: null,
-      reviver: Schema.isCapitalizedReviver,
+      reviver: SchemaRepresentation.isCapitalizedReviver,
       valid: "Hello",
       invalid: "hello"
     })
@@ -292,7 +292,7 @@ describe("SchemaRepresentation built-in string revivers", () => {
       schema: Schema.String.check(Schema.isUncapitalized()),
       id: "effect/schema/isUncapitalized",
       payload: null,
-      reviver: Schema.isUncapitalizedReviver,
+      reviver: SchemaRepresentation.isUncapitalizedReviver,
       valid: "hello",
       invalid: "Hello"
     })
@@ -319,7 +319,7 @@ describe("SchemaRepresentation built-in number revivers", () => {
       schema: Schema.Number.check(Schema.isFinite()),
       id: "effect/schema/isFinite",
       payload: null,
-      reviver: Schema.isFiniteReviver,
+      reviver: SchemaRepresentation.isFiniteReviver,
       valid: 1,
       invalid: Number.POSITIVE_INFINITY
     })
@@ -330,7 +330,7 @@ describe("SchemaRepresentation built-in number revivers", () => {
       schema: Schema.Number.check(Schema.isInt()),
       id: "effect/schema/isInt",
       payload: null,
-      reviver: Schema.isIntReviver,
+      reviver: SchemaRepresentation.isIntReviver,
       valid: 1,
       invalid: 1.5
     })
@@ -341,7 +341,7 @@ describe("SchemaRepresentation built-in number revivers", () => {
       schema: Schema.Number.check(Schema.isMultipleOf(3)),
       id: "effect/schema/isMultipleOf",
       payload: { divisor: 3 },
-      reviver: Schema.isMultipleOfReviver,
+      reviver: SchemaRepresentation.isMultipleOfReviver,
       valid: 6,
       invalid: 7
     })
@@ -352,7 +352,7 @@ describe("SchemaRepresentation built-in number revivers", () => {
       schema: Schema.Number.check(Schema.isGreaterThan(1)),
       id: "effect/schema/isGreaterThan",
       payload: { exclusiveMinimum: 1 },
-      reviver: Schema.isGreaterThanReviver,
+      reviver: SchemaRepresentation.isGreaterThanReviver,
       valid: 2,
       invalid: 1
     })
@@ -363,7 +363,7 @@ describe("SchemaRepresentation built-in number revivers", () => {
       schema: Schema.Number.check(Schema.isGreaterThanOrEqualTo(1)),
       id: "effect/schema/isGreaterThanOrEqualTo",
       payload: { minimum: 1 },
-      reviver: Schema.isGreaterThanOrEqualToReviver,
+      reviver: SchemaRepresentation.isGreaterThanOrEqualToReviver,
       valid: 1,
       invalid: 0
     })
@@ -374,7 +374,7 @@ describe("SchemaRepresentation built-in number revivers", () => {
       schema: Schema.Number.check(Schema.isLessThan(2)),
       id: "effect/schema/isLessThan",
       payload: { exclusiveMaximum: 2 },
-      reviver: Schema.isLessThanReviver,
+      reviver: SchemaRepresentation.isLessThanReviver,
       valid: 1,
       invalid: 2
     })
@@ -385,7 +385,7 @@ describe("SchemaRepresentation built-in number revivers", () => {
       schema: Schema.Number.check(Schema.isLessThanOrEqualTo(2)),
       id: "effect/schema/isLessThanOrEqualTo",
       payload: { maximum: 2 },
-      reviver: Schema.isLessThanOrEqualToReviver,
+      reviver: SchemaRepresentation.isLessThanOrEqualToReviver,
       valid: 2,
       invalid: 3
     })
@@ -398,7 +398,7 @@ describe("SchemaRepresentation built-in number revivers", () => {
       ),
       id: "effect/schema/isBetween",
       payload: { minimum: 1, maximum: 3, exclusiveMinimum: true },
-      reviver: Schema.isBetweenReviver,
+      reviver: SchemaRepresentation.isBetweenReviver,
       valid: 2,
       invalid: 1
     })
@@ -424,7 +424,7 @@ describe("SchemaRepresentation built-in number revivers", () => {
     ) as any
     json.representation.checks[0].representation.payload.divisor = "2"
 
-    expectInvalidPayload(json, Schema.isMultipleOfReviver)
+    expectInvalidPayload(json, SchemaRepresentation.isMultipleOfReviver)
   })
 
   it("rejects a non-canonical isBetween payload", () => {
@@ -435,7 +435,7 @@ describe("SchemaRepresentation built-in number revivers", () => {
     ) as any
     json.representation.checks[0].representation.payload.exclusiveMinimum = false
 
-    expectInvalidPayload(json, Schema.isBetweenReviver)
+    expectInvalidPayload(json, SchemaRepresentation.isBetweenReviver)
   })
 })
 
@@ -445,7 +445,7 @@ describe("SchemaRepresentation built-in BigInt revivers", () => {
       schema: Schema.BigInt.check(Schema.isGreaterThanBigInt(10n)),
       id: "effect/schema/isGreaterThanBigInt",
       payload: { exclusiveMinimum: "10" },
-      reviver: Schema.isGreaterThanBigIntReviver,
+      reviver: SchemaRepresentation.isGreaterThanBigIntReviver,
       valid: 11n,
       invalid: 10n
     })
@@ -456,7 +456,7 @@ describe("SchemaRepresentation built-in BigInt revivers", () => {
       schema: Schema.BigInt.check(Schema.isGreaterThanOrEqualToBigInt(10n)),
       id: "effect/schema/isGreaterThanOrEqualToBigInt",
       payload: { minimum: "10" },
-      reviver: Schema.isGreaterThanOrEqualToBigIntReviver,
+      reviver: SchemaRepresentation.isGreaterThanOrEqualToBigIntReviver,
       valid: 10n,
       invalid: 9n
     })
@@ -467,7 +467,7 @@ describe("SchemaRepresentation built-in BigInt revivers", () => {
       schema: Schema.BigInt.check(Schema.isLessThanBigInt(10n)),
       id: "effect/schema/isLessThanBigInt",
       payload: { exclusiveMaximum: "10" },
-      reviver: Schema.isLessThanBigIntReviver,
+      reviver: SchemaRepresentation.isLessThanBigIntReviver,
       valid: 9n,
       invalid: 10n
     })
@@ -478,7 +478,7 @@ describe("SchemaRepresentation built-in BigInt revivers", () => {
       schema: Schema.BigInt.check(Schema.isLessThanOrEqualToBigInt(10n)),
       id: "effect/schema/isLessThanOrEqualToBigInt",
       payload: { maximum: "10" },
-      reviver: Schema.isLessThanOrEqualToBigIntReviver,
+      reviver: SchemaRepresentation.isLessThanOrEqualToBigIntReviver,
       valid: 10n,
       invalid: 11n
     })
@@ -491,7 +491,7 @@ describe("SchemaRepresentation built-in BigInt revivers", () => {
       ),
       id: "effect/schema/isBetweenBigInt",
       payload: { minimum: "-10", maximum: "10", exclusiveMaximum: true },
-      reviver: Schema.isBetweenBigIntReviver,
+      reviver: SchemaRepresentation.isBetweenBigIntReviver,
       valid: 0n,
       invalid: 10n
     })
@@ -533,7 +533,7 @@ describe("SchemaRepresentation built-in Date revivers", () => {
       schema: Schema.Any.check(Schema.isGreaterThanDate(date(0))),
       id: "effect/schema/isGreaterThanDate",
       payload: { exclusiveMinimum: epoch },
-      reviver: Schema.isGreaterThanDateReviver,
+      reviver: SchemaRepresentation.isGreaterThanDateReviver,
       valid: date(1),
       invalid: date(0)
     })
@@ -544,7 +544,7 @@ describe("SchemaRepresentation built-in Date revivers", () => {
       schema: Schema.Any.check(Schema.isGreaterThanOrEqualToDate(date(0))),
       id: "effect/schema/isGreaterThanOrEqualToDate",
       payload: { minimum: epoch },
-      reviver: Schema.isGreaterThanOrEqualToDateReviver,
+      reviver: SchemaRepresentation.isGreaterThanOrEqualToDateReviver,
       valid: date(0),
       invalid: date(-1)
     })
@@ -555,7 +555,7 @@ describe("SchemaRepresentation built-in Date revivers", () => {
       schema: Schema.Any.check(Schema.isLessThanDate(date(0))),
       id: "effect/schema/isLessThanDate",
       payload: { exclusiveMaximum: epoch },
-      reviver: Schema.isLessThanDateReviver,
+      reviver: SchemaRepresentation.isLessThanDateReviver,
       valid: date(-1),
       invalid: date(0)
     })
@@ -566,7 +566,7 @@ describe("SchemaRepresentation built-in Date revivers", () => {
       schema: Schema.Any.check(Schema.isLessThanOrEqualToDate(date(0))),
       id: "effect/schema/isLessThanOrEqualToDate",
       payload: { maximum: epoch },
-      reviver: Schema.isLessThanOrEqualToDateReviver,
+      reviver: SchemaRepresentation.isLessThanOrEqualToDateReviver,
       valid: date(0),
       invalid: date(1)
     })
@@ -583,7 +583,7 @@ describe("SchemaRepresentation built-in Date revivers", () => {
         maximum: "1970-01-01T00:00:00.002Z",
         exclusiveMaximum: true
       },
-      reviver: Schema.isBetweenDateReviver,
+      reviver: SchemaRepresentation.isBetweenDateReviver,
       valid: date(1),
       invalid: date(2)
     })
@@ -622,7 +622,7 @@ describe("SchemaRepresentation built-in collection revivers", () => {
       schema: Schema.Any.check(Schema.isMinSize(2)),
       id: "effect/schema/isMinSize",
       payload: { minSize: 2 },
-      reviver: Schema.isMinSizeReviver,
+      reviver: SchemaRepresentation.isMinSizeReviver,
       valid: new Set([1, 2]),
       invalid: new Set([1])
     })
@@ -633,7 +633,7 @@ describe("SchemaRepresentation built-in collection revivers", () => {
       schema: Schema.Any.check(Schema.isMaxSize(1)),
       id: "effect/schema/isMaxSize",
       payload: { maxSize: 1 },
-      reviver: Schema.isMaxSizeReviver,
+      reviver: SchemaRepresentation.isMaxSizeReviver,
       valid: new Set([1]),
       invalid: new Set([1, 2])
     })
@@ -644,7 +644,7 @@ describe("SchemaRepresentation built-in collection revivers", () => {
       schema: Schema.Any.check(Schema.isSizeBetween(1, 2)),
       id: "effect/schema/isSizeBetween",
       payload: { minimum: 1, maximum: 2 },
-      reviver: Schema.isSizeBetweenReviver,
+      reviver: SchemaRepresentation.isSizeBetweenReviver,
       valid: new Set([1]),
       invalid: new Set()
     })
@@ -655,7 +655,7 @@ describe("SchemaRepresentation built-in collection revivers", () => {
       schema: Schema.Any.check(Schema.isUnique()),
       id: "effect/schema/isUnique",
       payload: null,
-      reviver: Schema.isUniqueReviver,
+      reviver: SchemaRepresentation.isUniqueReviver,
       valid: [1, 2],
       invalid: [1, 1]
     })
@@ -666,7 +666,7 @@ describe("SchemaRepresentation built-in collection revivers", () => {
       schema: Schema.Any.check(Schema.isUniqueKey()),
       id: "effect/schema/isUniqueKey",
       payload: null,
-      reviver: Schema.isUniqueKeyReviver,
+      reviver: SchemaRepresentation.isUniqueKeyReviver,
       valid: [["a", 1], ["b", 1]],
       invalid: [["a", 1], ["a", 2]],
       hasToJsonSchema: false
@@ -701,7 +701,7 @@ describe("SchemaRepresentation built-in object revivers", () => {
       schema: Schema.Any.check(Schema.isMinProperties(2)),
       id: "effect/schema/isMinProperties",
       payload: { minProperties: 2 },
-      reviver: Schema.isMinPropertiesReviver,
+      reviver: SchemaRepresentation.isMinPropertiesReviver,
       valid: { a: 1, b: 2 },
       invalid: { a: 1 }
     })
@@ -712,7 +712,7 @@ describe("SchemaRepresentation built-in object revivers", () => {
       schema: Schema.Any.check(Schema.isMaxProperties(1)),
       id: "effect/schema/isMaxProperties",
       payload: { maxProperties: 1 },
-      reviver: Schema.isMaxPropertiesReviver,
+      reviver: SchemaRepresentation.isMaxPropertiesReviver,
       valid: { a: 1 },
       invalid: { a: 1, b: 2 }
     })
@@ -723,7 +723,7 @@ describe("SchemaRepresentation built-in object revivers", () => {
       schema: Schema.Any.check(Schema.isPropertiesLengthBetween(1, 2)),
       id: "effect/schema/isPropertiesLengthBetween",
       payload: { minimum: 1, maximum: 2 },
-      reviver: Schema.isPropertiesLengthBetweenReviver,
+      reviver: SchemaRepresentation.isPropertiesLengthBetweenReviver,
       valid: { a: 1 },
       invalid: {}
     })
@@ -736,8 +736,8 @@ describe("SchemaRepresentation built-in object revivers", () => {
       id: "effect/schema/isPropertyNames",
       payload: null,
       schemas: [names.ast],
-      reviver: Schema.isPropertyNamesReviver,
-      dependencies: [Schema.isPatternReviver],
+      reviver: SchemaRepresentation.isPropertyNamesReviver,
+      dependencies: [SchemaRepresentation.isPatternReviver],
       valid: { Alpha: 1 },
       invalid: { alpha: 1 }
     })
@@ -782,7 +782,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.Option(Schema.String),
       id: "effect/schema/Option",
       payload: null,
-      reviver: Schema.OptionReviver
+      reviver: SchemaRepresentation.OptionReviver
     })
   })
 
@@ -791,7 +791,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.Result(Schema.String, Schema.Number),
       id: "effect/schema/Result",
       payload: null,
-      reviver: Schema.ResultReviver
+      reviver: SchemaRepresentation.ResultReviver
     })
   })
 
@@ -800,7 +800,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.Redacted(Schema.String),
       id: "effect/schema/Redacted",
       payload: null,
-      reviver: Schema.RedactedReviver
+      reviver: SchemaRepresentation.RedactedReviver
     })
   })
 
@@ -809,7 +809,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.CauseReason(Schema.String, Schema.Number),
       id: "effect/schema/CauseReason",
       payload: null,
-      reviver: Schema.CauseReasonReviver
+      reviver: SchemaRepresentation.CauseReasonReviver
     })
   })
 
@@ -818,7 +818,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.Cause(Schema.String, Schema.Number),
       id: "effect/schema/Cause",
       payload: null,
-      reviver: Schema.CauseReviver
+      reviver: SchemaRepresentation.CauseReviver
     })
   })
 
@@ -827,7 +827,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.ErrorInstance(),
       id: "effect/schema/Error",
       payload: null,
-      reviver: Schema.ErrorInstanceReviver
+      reviver: SchemaRepresentation.ErrorInstanceReviver
     })
   })
 
@@ -836,7 +836,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.Exit(Schema.String, Schema.Number, Schema.Boolean),
       id: "effect/schema/Exit",
       payload: null,
-      reviver: Schema.ExitReviver
+      reviver: SchemaRepresentation.ExitReviver
     })
   })
 
@@ -845,7 +845,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.ReadonlyMap(Schema.String, Schema.Number),
       id: "effect/schema/ReadonlyMap",
       payload: null,
-      reviver: Schema.ReadonlyMapReviver
+      reviver: SchemaRepresentation.ReadonlyMapReviver
     })
   })
 
@@ -854,7 +854,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.HashMap(Schema.String, Schema.Number),
       id: "effect/schema/HashMap",
       payload: null,
-      reviver: Schema.HashMapReviver
+      reviver: SchemaRepresentation.HashMapReviver
     })
   })
 
@@ -863,7 +863,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.Graph("directed", Schema.String, Schema.Number),
       id: "effect/schema/Graph",
       payload: "directed",
-      reviver: Schema.GraphReviver
+      reviver: SchemaRepresentation.GraphReviver
     })
   })
 
@@ -872,7 +872,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.ReadonlySet(Schema.String),
       id: "effect/schema/ReadonlySet",
       payload: null,
-      reviver: Schema.ReadonlySetReviver
+      reviver: SchemaRepresentation.ReadonlySetReviver
     })
   })
 
@@ -881,7 +881,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.HashSet(Schema.String),
       id: "effect/schema/HashSet",
       payload: null,
-      reviver: Schema.HashSetReviver
+      reviver: SchemaRepresentation.HashSetReviver
     })
   })
 
@@ -890,7 +890,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.Chunk(Schema.String),
       id: "effect/schema/Chunk",
       payload: null,
-      reviver: Schema.ChunkReviver
+      reviver: SchemaRepresentation.ChunkReviver
     })
   })
 
@@ -899,7 +899,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.RegExp,
       id: "effect/schema/RegExp",
       payload: null,
-      reviver: Schema.RegExpReviver
+      reviver: SchemaRepresentation.RegExpReviver
     })
   })
 
@@ -908,7 +908,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.URL,
       id: "effect/schema/URL",
       payload: null,
-      reviver: Schema.URLReviver
+      reviver: SchemaRepresentation.URLReviver
     })
   })
 
@@ -917,7 +917,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.Date,
       id: "effect/schema/Date",
       payload: null,
-      reviver: Schema.DateReviver
+      reviver: SchemaRepresentation.DateReviver
     })
   })
 
@@ -926,7 +926,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.Duration,
       id: "effect/schema/Duration",
       payload: null,
-      reviver: Schema.DurationReviver
+      reviver: SchemaRepresentation.DurationReviver
     })
   })
 
@@ -935,7 +935,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.ByteSize,
       id: "effect/schema/ByteSize",
       payload: null,
-      reviver: Schema.ByteSizeReviver
+      reviver: SchemaRepresentation.ByteSizeReviver
     })
   })
 
@@ -944,7 +944,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.BigDecimal,
       id: "effect/schema/BigDecimal",
       payload: null,
-      reviver: Schema.BigDecimalReviver
+      reviver: SchemaRepresentation.BigDecimalReviver
     })
   })
 
@@ -953,7 +953,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.File,
       id: "effect/schema/File",
       payload: null,
-      reviver: Schema.FileReviver
+      reviver: SchemaRepresentation.FileReviver
     })
   })
 
@@ -962,7 +962,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.FormData,
       id: "effect/schema/FormData",
       payload: null,
-      reviver: Schema.FormDataReviver
+      reviver: SchemaRepresentation.FormDataReviver
     })
   })
 
@@ -971,7 +971,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.URLSearchParams,
       id: "effect/schema/URLSearchParams",
       payload: null,
-      reviver: Schema.URLSearchParamsReviver
+      reviver: SchemaRepresentation.URLSearchParamsReviver
     })
   })
 
@@ -980,7 +980,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.Uint8Array,
       id: "effect/schema/Uint8Array",
       payload: null,
-      reviver: Schema.Uint8ArrayReviver
+      reviver: SchemaRepresentation.Uint8ArrayReviver
     })
   })
 
@@ -989,7 +989,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.DateTimeUtc,
       id: "effect/schema/DateTimeUtc",
       payload: null,
-      reviver: Schema.DateTimeUtcReviver
+      reviver: SchemaRepresentation.DateTimeUtcReviver
     })
   })
 
@@ -998,7 +998,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.TimeZoneOffset,
       id: "effect/schema/TimeZoneOffset",
       payload: null,
-      reviver: Schema.TimeZoneOffsetReviver
+      reviver: SchemaRepresentation.TimeZoneOffsetReviver
     })
   })
 
@@ -1007,7 +1007,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.TimeZoneNamed,
       id: "effect/schema/TimeZoneNamed",
       payload: null,
-      reviver: Schema.TimeZoneNamedReviver
+      reviver: SchemaRepresentation.TimeZoneNamedReviver
     })
   })
 
@@ -1016,7 +1016,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.TimeZone,
       id: "effect/schema/TimeZone",
       payload: null,
-      reviver: Schema.TimeZoneReviver
+      reviver: SchemaRepresentation.TimeZoneReviver
     })
   })
 
@@ -1025,7 +1025,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.DateTimeZoned,
       id: "effect/schema/DateTimeZoned",
       payload: null,
-      reviver: Schema.DateTimeZonedReviver
+      reviver: SchemaRepresentation.DateTimeZonedReviver
     })
   })
 
@@ -1034,7 +1034,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.Json,
       id: "effect/schema/Json",
       payload: null,
-      reviver: Schema.JsonReviver
+      reviver: SchemaRepresentation.JsonReviver
     })
   })
 
@@ -1043,7 +1043,7 @@ describe("SchemaRepresentation built-in declaration revivers", () => {
       schema: Schema.MutableJson,
       id: "effect/schema/MutableJson",
       payload: null,
-      reviver: Schema.MutableJsonReviver
+      reviver: SchemaRepresentation.MutableJsonReviver
     })
   })
 
diff --git a/repos/effect/packages/effect/test/schema/representation/fromJson.test.ts b/repos/effect/packages/effect/test/schema/representation/fromJson.test.ts
index 4cdfbbb8e..0f6385219 100644
--- a/repos/effect/packages/effect/test/schema/representation/fromJson.test.ts
+++ b/repos/effect/packages/effect/test/schema/representation/fromJson.test.ts
@@ -173,7 +173,7 @@ describe("SchemaRepresentation.fromJson", () => {
       representation: {
         _tag: "Union",
         types: [{ _tag: "String", checks: [] }, { _tag: "Number", checks: [] }],
-        mode: "oneOf",
+        options: { mode: "oneOf" },
         checks: []
       },
       references: {}
diff --git a/repos/effect/packages/effect/test/schema/representation/fromJsonSchemaDocument.test.ts b/repos/effect/packages/effect/test/schema/representation/fromJsonSchemaDocument.test.ts
index 40a82e906..dac743f77 100644
--- a/repos/effect/packages/effect/test/schema/representation/fromJsonSchemaDocument.test.ts
+++ b/repos/effect/packages/effect/test/schema/representation/fromJsonSchemaDocument.test.ts
@@ -1,6 +1,15 @@
+import { assert } from "@effect/vitest"
 import { JsonSchema, Schema, SchemaRepresentation } from "effect"
+import { TestSchema } from "effect/testing"
 import { describe, it } from "vitest"
-import { assertFalse, assertTrue, deepStrictEqual, strictEqual, throws } from "../../utils/assert.ts"
+import { deepStrictEqual, throws } from "../../utils/assert.ts"
+
+const makeCode = SchemaRepresentation.makeCode
+
+type Expected = {
+  readonly codes: SchemaRepresentation.Code
+  readonly references?: Partial<SchemaRepresentation.CodeDocument["references"]>
+}
 
 function toSchemaFromJsonSchemaDocument(
   document: JsonSchema.Document<"draft-2020-12">,
@@ -9,46 +18,108 @@ function toSchemaFromJsonSchemaDocument(
   return SchemaRepresentation.fromJsonSchemaDocument(document, { patterns: "apply", ...options })
 }
 
-function fromJsonSchemaRepresentation(
-  document: JsonSchema.Document<"draft-2020-12">,
-  options?: SchemaRepresentation.FromJsonSchemaOptions
-): SchemaRepresentation.Document {
-  return SchemaRepresentation.toRepresentation(toSchemaFromJsonSchemaDocument(document, options).ast)
-}
-
 describe("fromJsonSchemaDocument", () => {
+  it("round-trips optional Never properties (#8137)", () => {
+    const original = Schema.Struct({ value: Schema.optionalKey(Schema.Never) })
+    const imported = SchemaRepresentation.fromJsonSchemaDocument(Schema.toJsonSchemaDocument(original))
+    assertCode(imported, {
+      codes: makeCode(
+        `Schema.StructWithRest(Schema.Struct({ "value": Schema.optionalKey(Schema.Never) }), [Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" }))])`,
+        `{ readonly "value"?: never } & { readonly [x: string]: Schema.Json }`
+      )
+    })
+  })
+
+  it("imports not-empty schemas at the root and through references", () => {
+    assertFromJsonSchema({ schema: { not: {}, description: "impossible" } }, {
+      codes: makeCode(`Schema.Never.annotate({ "description": "impossible" })`, `never`)
+    })
+    assertFromJsonSchema({
+      schema: {
+        type: "object",
+        properties: { value: { $ref: "#/$defs/Impossible" } },
+        required: ["value"],
+        $defs: { Impossible: { type: "string", not: {} } }
+      }
+    }, {
+      codes: makeCode(
+        `Schema.StructWithRest(Schema.Struct({ "value": Impossible }), [Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" }))])`,
+        `{ readonly "value": Impossible } & { readonly [x: string]: Schema.Json }`
+      ),
+      references: {
+        nonRecursives: [{
+          $ref: `Impossible`,
+          code: makeCode(`Schema.Never.annotate({ "identifier": "Impossible" })`, `never`)
+        }]
+      }
+    })
+  })
+
+  it("preserves Never in array items and union members", () => {
+    assertFromJsonSchema(
+      { schema: { type: "array", items: { not: {} } } },
+      { codes: makeCode(`Schema.Array(Schema.Never)`, `ReadonlyArray<never>`) }
+    )
+    assertFromJsonSchema(
+      { schema: { type: "array", prefixItems: [{ not: {} }] } },
+      {
+        codes: makeCode(
+          `Schema.TupleWithRest(Schema.Tuple([Schema.optionalKey(Schema.Never)]), [Schema.Json.annotate({ "expected": "JSON value" })])`,
+          `readonly [(never)?, ...Array<Schema.Json>]`
+        )
+      }
+    )
+    assertFromJsonSchema(
+      { schema: { anyOf: [{ not: {} }, { type: "string" }] } },
+      { codes: makeCode(`Schema.Union([Schema.Never, Schema.String])`, `never | string`) }
+    )
+    assertFromJsonSchema(
+      { schema: { oneOf: [{ not: {} }, { type: "string" }] } },
+      { codes: makeCode(`Schema.Union([Schema.Never, Schema.String], { mode: "oneOf" })`, `never | string`) }
+    )
+  })
+
+  it("retains the string length and integer semantics of built-in checks", () => {
+    for (
+      const [source, input, expected] of [
+        [{ type: "string", minLength: 2 }, "😀", true],
+        [{ type: "string", maxLength: 1 }, "😀", false],
+        [{ type: "integer" }, 1e20, false],
+        [{ type: "string", pattern: "^.$" }, "😀", false]
+      ] as const
+    ) {
+      const schema = toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12(source))
+      assert.strictEqual(Schema.is(schema)(input), expected)
+    }
+  })
+
   function assertFromJsonSchema(
     input: {
       readonly schema: JsonSchema.JsonSchema
       readonly options?: SchemaRepresentation.FromJsonSchemaOptions
     },
-    expected: Schema.Json
+    expected: Expected
   ) {
     const jsonDocument = JsonSchema.fromSchemaDraft2020_12(input.schema)
     const schema = toSchemaFromJsonSchemaDocument(jsonDocument, input.options)
-    const document = SchemaRepresentation.toRepresentation(schema.ast)
-    deepStrictEqual(SchemaRepresentation.toJson(document), expected)
-    return schema
+    assertCode(schema, expected)
+  }
+
+  function assertCode(schema: Schema.Top, expected: Expected) {
+    deepStrictEqual(SchemaRepresentation.toCodeDocument(SchemaRepresentation.toRepresentations([schema.ast])), {
+      codes: [expected.codes],
+      references: {
+        nonRecursives: expected.references?.nonRecursives ?? [],
+        recursives: expected.references?.recursives ?? {}
+      },
+      artifacts: []
+    })
   }
 
   it("unconstrained schema", () => {
     assertFromJsonSchema(
       { schema: {} },
-      {
-        "representation": {
-          "_tag": "Declaration",
-          "representation": {
-            "id": "effect/schema/Json",
-            "payload": null
-          },
-          "annotations": {
-            "expected": "JSON value"
-          },
-          "typeParameters": [],
-          "checks": []
-        },
-        "references": {}
-      }
+      { codes: makeCode(`Schema.Json.annotate({ "expected": "JSON value" })`, `Schema.Json`) }
     )
     assertFromJsonSchema(
       {
@@ -62,131 +133,54 @@ describe("fromJsonSchemaDocument", () => {
         }
       },
       {
-        "representation": {
-          "_tag": "Declaration",
-          "representation": {
-            "id": "effect/schema/Json",
-            "payload": null
-          },
-          "annotations": {
-            "expected": "JSON value",
-            "title": "a",
-            "description": "b",
-            "default": "c",
-            "examples": [
-              "d"
-            ],
-            "readOnly": true,
-            "writeOnly": true
-          },
-          "typeParameters": [],
-          "checks": []
-        },
-        "references": {}
+        codes: makeCode(
+          `Schema.Json.annotate({ "expected": "JSON value", "title": "a", "description": "b", "default": "c", "examples": ["d"], "readOnly": true, "writeOnly": true })`,
+          `Schema.Json`
+        )
       }
     )
   })
 
   it("keeps annotation-only schemas unconstrained", () => {
-    const representation = fromJsonSchemaRepresentation(
-      JsonSchema.fromSchemaDraft2020_12({ format: "email" })
-    ).representation
-    assertTrue(representation._tag === "Declaration")
-    strictEqual(representation.annotations?.format, "email")
+    assertFromJsonSchema({ schema: { format: "email" } }, {
+      codes: makeCode(`Schema.Json.annotate({ "expected": "JSON value", "format": "email" })`, `Schema.Json`)
+    })
   })
 
   describe("const", () => {
     it("string literal", () => {
       assertFromJsonSchema(
         { schema: { const: "a" } },
-        {
-          "representation": {
-            "_tag": "Literal",
-            "checks": [],
-            "literal": {
-              "type": "string",
-              "value": "a"
-            }
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Literal("a")`, `"a"`) }
       )
       assertFromJsonSchema(
         { schema: { const: "a", description: "a" } },
-        {
-          "representation": {
-            "_tag": "Literal",
-            "annotations": {
-              "description": "a"
-            },
-            "checks": [],
-            "literal": {
-              "type": "string",
-              "value": "a"
-            }
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Literal("a").annotate({ "description": "a" })`, `"a"`) }
       )
     })
 
     it("const: literal (number)", () => {
       assertFromJsonSchema(
         { schema: { const: 1 } },
-        {
-          "representation": {
-            "_tag": "Literal",
-            "checks": [],
-            "literal": {
-              "type": "number",
-              "value": 1
-            }
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Literal(1)`, `1`) }
       )
     })
 
     it("const: literal (boolean)", () => {
       assertFromJsonSchema(
         { schema: { const: true } },
-        {
-          "representation": {
-            "_tag": "Literal",
-            "checks": [],
-            "literal": {
-              "type": "boolean",
-              "value": true
-            }
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Literal(true)`, `true`) }
       )
     })
 
     it("null literal", () => {
       assertFromJsonSchema(
         { schema: { const: null } },
-        {
-          "representation": {
-            "_tag": "Null",
-            "checks": []
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Null`, `null`) }
       )
       assertFromJsonSchema(
         { schema: { const: null, description: "a" } },
-        {
-          "representation": {
-            "_tag": "Null",
-            "annotations": {
-              "description": "a"
-            },
-            "checks": []
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Null.annotate({ "description": "a" })`, `null`) }
       )
     })
 
@@ -194,7 +188,7 @@ describe("fromJsonSchemaDocument", () => {
       for (const value of [{}, []]) {
         throws(
           () => toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({ const: value })),
-          `Unsupported structured JSON Schema value for "const"\n  at ["schema"]["const"]`
+          `Only primitive values are supported in "const" and "enum".\n  at ["schema"]["const"]`
         )
       }
     })
@@ -204,160 +198,43 @@ describe("fromJsonSchemaDocument", () => {
     it("single string member", () => {
       assertFromJsonSchema(
         { schema: { enum: ["a"] } },
-        {
-          "representation": {
-            "_tag": "Literal",
-            "checks": [],
-            "literal": {
-              "type": "string",
-              "value": "a"
-            }
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Literal("a")`, `"a"`) }
       )
       assertFromJsonSchema(
         { schema: { enum: ["a"], description: "a" } },
-        {
-          "representation": {
-            "_tag": "Literal",
-            "annotations": {
-              "description": "a"
-            },
-            "checks": [],
-            "literal": {
-              "type": "string",
-              "value": "a"
-            }
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Literal("a").annotate({ "description": "a" })`, `"a"`) }
       )
     })
 
     it("single enum (number)", () => {
       assertFromJsonSchema(
         { schema: { enum: [1] } },
-        {
-          "representation": {
-            "_tag": "Literal",
-            "checks": [],
-            "literal": {
-              "type": "number",
-              "value": 1
-            }
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Literal(1)`, `1`) }
       )
     })
 
     it("single enum (boolean)", () => {
       assertFromJsonSchema(
         { schema: { enum: [true] } },
-        {
-          "representation": {
-            "_tag": "Literal",
-            "checks": [],
-            "literal": {
-              "type": "boolean",
-              "value": true
-            }
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Literal(true)`, `true`) }
       )
     })
 
     it("multiple literal members", () => {
       assertFromJsonSchema(
         { schema: { enum: ["a", 1] } },
-        {
-          "representation": {
-            "_tag": "Union",
-            "checks": [],
-            "types": [
-              {
-                "_tag": "Literal",
-                "checks": [],
-                "literal": {
-                  "type": "string",
-                  "value": "a"
-                }
-              },
-              {
-                "_tag": "Literal",
-                "checks": [],
-                "literal": {
-                  "type": "number",
-                  "value": 1
-                }
-              }
-            ],
-            "mode": "anyOf"
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Literals(["a", 1])`, `"a" | 1`) }
       )
       assertFromJsonSchema(
         { schema: { enum: ["a", 1], description: "a" } },
-        {
-          "representation": {
-            "_tag": "Union",
-            "annotations": {
-              "description": "a"
-            },
-            "checks": [],
-            "types": [
-              {
-                "_tag": "Literal",
-                "checks": [],
-                "literal": {
-                  "type": "string",
-                  "value": "a"
-                }
-              },
-              {
-                "_tag": "Literal",
-                "checks": [],
-                "literal": {
-                  "type": "number",
-                  "value": 1
-                }
-              }
-            ],
-            "mode": "anyOf"
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Literals(["a", 1]).annotate({ "description": "a" })`, `"a" | 1`) }
       )
     })
 
     it("enum containing null", () => {
       assertFromJsonSchema(
         { schema: { enum: ["a", null] } },
-        {
-          "representation": {
-            "_tag": "Union",
-            "checks": [],
-            "types": [
-              {
-                "_tag": "Literal",
-                "checks": [],
-                "literal": {
-                  "type": "string",
-                  "value": "a"
-                }
-              },
-              {
-                "_tag": "Null",
-                "checks": []
-              }
-            ],
-            "mode": "anyOf"
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Union([Schema.Literal("a"), Schema.Null])`, `"a" | null`) }
       )
     })
   })
@@ -365,47 +242,7 @@ describe("fromJsonSchemaDocument", () => {
   it("anyOf", () => {
     assertFromJsonSchema(
       { schema: { anyOf: [{ const: "a" }, { enum: [1, 2] }] } },
-      {
-        "representation": {
-          "_tag": "Union",
-          "checks": [],
-          "types": [
-            {
-              "_tag": "Literal",
-              "checks": [],
-              "literal": {
-                "type": "string",
-                "value": "a"
-              }
-            },
-            {
-              "_tag": "Union",
-              "checks": [],
-              "types": [
-                {
-                  "_tag": "Literal",
-                  "checks": [],
-                  "literal": {
-                    "type": "number",
-                    "value": 1
-                  }
-                },
-                {
-                  "_tag": "Literal",
-                  "checks": [],
-                  "literal": {
-                    "type": "number",
-                    "value": 2
-                  }
-                }
-              ],
-              "mode": "anyOf"
-            }
-          ],
-          "mode": "anyOf"
-        },
-        "references": {}
-      }
+      { codes: makeCode(`Schema.Union([Schema.Literal("a"), Schema.Literals([1, 2])])`, `"a" | 1 | 2`) }
     )
   })
 
@@ -423,129 +260,10 @@ describe("fromJsonSchemaDocument", () => {
         }
       },
       {
-        "representation": {
-          "_tag": "Union",
-          "checks": [],
-          "types": [
-            {
-              "_tag": "Objects",
-              "checks": [],
-              "propertySignatures": [
-                {
-                  "name": {
-                    "type": "string",
-                    "value": "a"
-                  },
-                  "type": {
-                    "_tag": "String",
-                    "checks": []
-                  },
-                  "isOptional": false,
-                  "isMutable": false
-                },
-                {
-                  "name": {
-                    "type": "string",
-                    "value": "id"
-                  },
-                  "type": {
-                    "_tag": "String",
-                    "checks": []
-                  },
-                  "isOptional": false,
-                  "isMutable": false
-                }
-              ],
-              "indexSignatures": [
-                {
-                  "parameter": {
-                    "_tag": "String",
-                    "checks": []
-                  },
-                  "type": {
-                    "_tag": "Declaration",
-                    "representation": {
-                      "id": "effect/schema/Json",
-                      "payload": null
-                    },
-                    "annotations": {
-                      "expected": "JSON value"
-                    },
-                    "typeParameters": [],
-                    "checks": []
-                  }
-                }
-              ]
-            },
-            {
-              "_tag": "Objects",
-              "checks": [],
-              "propertySignatures": [
-                {
-                  "name": {
-                    "type": "string",
-                    "value": "b"
-                  },
-                  "type": {
-                    "_tag": "Number",
-                    "checks": [
-                      {
-                        "_tag": "Filter",
-                        "representation": {
-                          "id": "effect/schema/isFinite",
-                          "payload": null
-                        },
-                        "annotations": {
-                          "expected": "a finite number",
-                          "arbitraryConstraint": {
-                            "number": "finite"
-                          }
-                        },
-                        "aborted": false
-                      }
-                    ]
-                  },
-                  "isOptional": false,
-                  "isMutable": false
-                },
-                {
-                  "name": {
-                    "type": "string",
-                    "value": "id"
-                  },
-                  "type": {
-                    "_tag": "String",
-                    "checks": []
-                  },
-                  "isOptional": false,
-                  "isMutable": false
-                }
-              ],
-              "indexSignatures": [
-                {
-                  "parameter": {
-                    "_tag": "String",
-                    "checks": []
-                  },
-                  "type": {
-                    "_tag": "Declaration",
-                    "representation": {
-                      "id": "effect/schema/Json",
-                      "payload": null
-                    },
-                    "annotations": {
-                      "expected": "JSON value"
-                    },
-                    "typeParameters": [],
-                    "checks": []
-                  }
-                }
-              ]
-            }
-          ],
-          "mode": "anyOf"
-        },
-        "references": {}
+        codes: makeCode(
+          `Schema.Union([Schema.StructWithRest(Schema.Struct({ "a": Schema.String, "id": Schema.String }), [Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" }))]), Schema.StructWithRest(Schema.Struct({ "b": Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" })), "id": Schema.String }), [Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" }))])])`,
+          `{ readonly "a": string, readonly "id": string } & { readonly [x: string]: Schema.Json } | { readonly "b": number, readonly "id": string } & { readonly [x: string]: Schema.Json }`
+        )
       }
     )
   })
@@ -554,45 +272,10 @@ describe("fromJsonSchemaDocument", () => {
     assertFromJsonSchema(
       { schema: { oneOf: [{ const: "a" }, { enum: [1, 2] }] } },
       {
-        "representation": {
-          "_tag": "Union",
-          "checks": [],
-          "types": [
-            {
-              "_tag": "Literal",
-              "checks": [],
-              "literal": {
-                "type": "string",
-                "value": "a"
-              }
-            },
-            {
-              "_tag": "Union",
-              "checks": [],
-              "types": [
-                {
-                  "_tag": "Literal",
-                  "checks": [],
-                  "literal": {
-                    "type": "number",
-                    "value": 1
-                  }
-                },
-                {
-                  "_tag": "Literal",
-                  "checks": [],
-                  "literal": {
-                    "type": "number",
-                    "value": 2
-                  }
-                }
-              ],
-              "mode": "anyOf"
-            }
-          ],
-          "mode": "oneOf"
-        },
-        "references": {}
+        codes: makeCode(
+          `Schema.Union([Schema.Literal("a"), Schema.Literals([1, 2])], { mode: "oneOf" })`,
+          `"a" | 1 | 2`
+        )
       }
     )
   })
@@ -611,129 +294,10 @@ describe("fromJsonSchemaDocument", () => {
         }
       },
       {
-        "representation": {
-          "_tag": "Union",
-          "checks": [],
-          "types": [
-            {
-              "_tag": "Objects",
-              "checks": [],
-              "propertySignatures": [
-                {
-                  "name": {
-                    "type": "string",
-                    "value": "a"
-                  },
-                  "type": {
-                    "_tag": "String",
-                    "checks": []
-                  },
-                  "isOptional": false,
-                  "isMutable": false
-                },
-                {
-                  "name": {
-                    "type": "string",
-                    "value": "id"
-                  },
-                  "type": {
-                    "_tag": "String",
-                    "checks": []
-                  },
-                  "isOptional": false,
-                  "isMutable": false
-                }
-              ],
-              "indexSignatures": [
-                {
-                  "parameter": {
-                    "_tag": "String",
-                    "checks": []
-                  },
-                  "type": {
-                    "_tag": "Declaration",
-                    "representation": {
-                      "id": "effect/schema/Json",
-                      "payload": null
-                    },
-                    "annotations": {
-                      "expected": "JSON value"
-                    },
-                    "typeParameters": [],
-                    "checks": []
-                  }
-                }
-              ]
-            },
-            {
-              "_tag": "Objects",
-              "checks": [],
-              "propertySignatures": [
-                {
-                  "name": {
-                    "type": "string",
-                    "value": "b"
-                  },
-                  "type": {
-                    "_tag": "Number",
-                    "checks": [
-                      {
-                        "_tag": "Filter",
-                        "representation": {
-                          "id": "effect/schema/isFinite",
-                          "payload": null
-                        },
-                        "annotations": {
-                          "expected": "a finite number",
-                          "arbitraryConstraint": {
-                            "number": "finite"
-                          }
-                        },
-                        "aborted": false
-                      }
-                    ]
-                  },
-                  "isOptional": false,
-                  "isMutable": false
-                },
-                {
-                  "name": {
-                    "type": "string",
-                    "value": "id"
-                  },
-                  "type": {
-                    "_tag": "String",
-                    "checks": []
-                  },
-                  "isOptional": false,
-                  "isMutable": false
-                }
-              ],
-              "indexSignatures": [
-                {
-                  "parameter": {
-                    "_tag": "String",
-                    "checks": []
-                  },
-                  "type": {
-                    "_tag": "Declaration",
-                    "representation": {
-                      "id": "effect/schema/Json",
-                      "payload": null
-                    },
-                    "annotations": {
-                      "expected": "JSON value"
-                    },
-                    "typeParameters": [],
-                    "checks": []
-                  }
-                }
-              ]
-            }
-          ],
-          "mode": "oneOf"
-        },
-        "references": {}
+        codes: makeCode(
+          `Schema.Union([Schema.StructWithRest(Schema.Struct({ "a": Schema.String, "id": Schema.String }), [Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" }))]), Schema.StructWithRest(Schema.Struct({ "b": Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" })), "id": Schema.String }), [Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" }))])], { mode: "oneOf" })`,
+          `{ readonly "a": string, readonly "id": string } & { readonly [x: string]: Schema.Json } | { readonly "b": number, readonly "id": string } & { readonly [x: string]: Schema.Json }`
+        )
       }
     )
   })
@@ -742,13 +306,7 @@ describe("fromJsonSchemaDocument", () => {
     it("type only", () => {
       assertFromJsonSchema(
         { schema: { type: "null" } },
-        {
-          "representation": {
-            "_tag": "Null",
-            "checks": []
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Null`, `null`) }
       )
     })
   })
@@ -757,13 +315,7 @@ describe("fromJsonSchemaDocument", () => {
     it("type only", () => {
       assertFromJsonSchema(
         { schema: { type: "string" } },
-        {
-          "representation": {
-            "_tag": "String",
-            "checks": []
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.String`, `string`) }
       )
     })
 
@@ -772,29 +324,10 @@ describe("fromJsonSchemaDocument", () => {
         assertFromJsonSchema(
           { schema: { type: "string", minLength: 1 } },
           {
-            "representation": {
-              "_tag": "String",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMinLength",
-                    "payload": {
-                      "minLength": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at least 1",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "minLength": 1
-                    }
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.String.check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1" }))`,
+              `string`
+            )
           }
         )
       })
@@ -803,29 +336,10 @@ describe("fromJsonSchemaDocument", () => {
         assertFromJsonSchema(
           { schema: { type: "string", maxLength: 1 } },
           {
-            "representation": {
-              "_tag": "String",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMaxLength",
-                    "payload": {
-                      "maxLength": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at most 1",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "maxLength": 1
-                    }
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.String.check(Schema.isMaxLength(1).annotate({ "expected": "a value with a length of at most 1" }))`,
+              `string`
+            )
           }
         )
       })
@@ -834,46 +348,21 @@ describe("fromJsonSchemaDocument", () => {
         assertFromJsonSchema(
           { schema: { type: "string", pattern: "a*" } },
           {
-            "representation": {
-              "_tag": "String",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isPattern",
-                    "payload": {
-                      "source": "a*",
-                      "flags": ""
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a string matching the RegExp a*",
-                    "arbitraryConstraint": {
-                      "patterns": [
-                        {
-                          "source": "a*",
-                          "flags": ""
-                        }
-                      ]
-                    }
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.String.check(Schema.isPattern(new RegExp("a*")).annotate({ "expected": "a string matching the RegExp a*" }))`,
+              `string`
+            )
           }
         )
       })
 
       it("pattern only constrains strings", () => {
-        const is = Schema.is(toSchemaFromJsonSchemaDocument(
-          JsonSchema.fromSchemaDraft2020_12({ pattern: "^a+$" })
-        ))
-        assertTrue(is("a"))
-        assertFalse(is("b"))
-        assertTrue(is(1))
-        assertTrue(is(null))
+        assertFromJsonSchema({ schema: { pattern: "^a+$" } }, {
+          codes: makeCode(
+            `Schema.Union([Schema.Null, Schema.String.check(Schema.isPattern(new RegExp("^a+$")).annotate({ "expected": "a string matching the RegExp ^a+$" })), Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" })), Schema.Boolean, Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" })), Schema.Array(Schema.Json.annotate({ "expected": "JSON value" }))])`,
+            `null | string | number | boolean | { readonly [x: string]: Schema.Json } | ReadonlyArray<Schema.Json>`
+          )
+        })
       })
     })
   })
@@ -883,26 +372,10 @@ describe("fromJsonSchemaDocument", () => {
       assertFromJsonSchema(
         { schema: { type: "number" } },
         {
-          "representation": {
-            "_tag": "Number",
-            "checks": [
-              {
-                "_tag": "Filter",
-                "representation": {
-                  "id": "effect/schema/isFinite",
-                  "payload": null
-                },
-                "annotations": {
-                  "expected": "a finite number",
-                  "arbitraryConstraint": {
-                    "number": "finite"
-                  }
-                },
-                "aborted": false
-              }
-            ]
-          },
-          "references": {}
+          codes: makeCode(
+            `Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" }))`,
+            `number`
+          )
         }
       )
     })
@@ -912,39 +385,10 @@ describe("fromJsonSchemaDocument", () => {
         assertFromJsonSchema(
           { schema: { type: "number", minimum: 1 } },
           {
-            "representation": {
-              "_tag": "Number",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isFinite",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "a finite number",
-                    "arbitraryConstraint": {
-                      "number": "finite"
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isGreaterThanOrEqualTo",
-                    "payload": {
-                      "minimum": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value greater than or equal to 1"
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" })).check(Schema.isGreaterThanOrEqualTo(1).annotate({ "expected": "a value greater than or equal to 1" }))`,
+              `number`
+            )
           }
         )
       })
@@ -953,39 +397,10 @@ describe("fromJsonSchemaDocument", () => {
         assertFromJsonSchema(
           { schema: { type: "number", maximum: 1 } },
           {
-            "representation": {
-              "_tag": "Number",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isFinite",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "a finite number",
-                    "arbitraryConstraint": {
-                      "number": "finite"
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isLessThanOrEqualTo",
-                    "payload": {
-                      "maximum": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value less than or equal to 1"
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" })).check(Schema.isLessThanOrEqualTo(1).annotate({ "expected": "a value less than or equal to 1" }))`,
+              `number`
+            )
           }
         )
       })
@@ -994,39 +409,10 @@ describe("fromJsonSchemaDocument", () => {
         assertFromJsonSchema(
           { schema: { type: "number", exclusiveMinimum: 1 } },
           {
-            "representation": {
-              "_tag": "Number",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isFinite",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "a finite number",
-                    "arbitraryConstraint": {
-                      "number": "finite"
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isGreaterThan",
-                    "payload": {
-                      "exclusiveMinimum": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value greater than 1"
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" })).check(Schema.isGreaterThan(1).annotate({ "expected": "a value greater than 1" }))`,
+              `number`
+            )
           }
         )
       })
@@ -1035,39 +421,10 @@ describe("fromJsonSchemaDocument", () => {
         assertFromJsonSchema(
           { schema: { type: "number", exclusiveMaximum: 1 } },
           {
-            "representation": {
-              "_tag": "Number",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isFinite",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "a finite number",
-                    "arbitraryConstraint": {
-                      "number": "finite"
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isLessThan",
-                    "payload": {
-                      "exclusiveMaximum": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value less than 1"
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" })).check(Schema.isLessThan(1).annotate({ "expected": "a value less than 1" }))`,
+              `number`
+            )
           }
         )
       })
@@ -1076,39 +433,10 @@ describe("fromJsonSchemaDocument", () => {
         assertFromJsonSchema(
           { schema: { type: "number", multipleOf: 1 } },
           {
-            "representation": {
-              "_tag": "Number",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isFinite",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "a finite number",
-                    "arbitraryConstraint": {
-                      "number": "finite"
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMultipleOf",
-                    "payload": {
-                      "divisor": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value that is a multiple of 1"
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" })).check(Schema.isMultipleOf(1).annotate({ "expected": "a value that is a multiple of 1" }))`,
+              `number`
+            )
           }
         )
       })
@@ -1119,28 +447,7 @@ describe("fromJsonSchemaDocument", () => {
     it("type only", () => {
       assertFromJsonSchema(
         { schema: { type: "integer" } },
-        {
-          "representation": {
-            "_tag": "Number",
-            "checks": [
-              {
-                "_tag": "Filter",
-                "representation": {
-                  "id": "effect/schema/isInt",
-                  "payload": null
-                },
-                "annotations": {
-                  "expected": "an integer",
-                  "arbitraryConstraint": {
-                    "number": "integer"
-                  }
-                },
-                "aborted": false
-              }
-            ]
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Number.check(Schema.isInt().annotate({ "expected": "an integer" }))`, `number`) }
       )
     })
 
@@ -1149,39 +456,10 @@ describe("fromJsonSchemaDocument", () => {
         assertFromJsonSchema(
           { schema: { type: "integer", minimum: 1 } },
           {
-            "representation": {
-              "_tag": "Number",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isInt",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "an integer",
-                    "arbitraryConstraint": {
-                      "number": "integer"
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isGreaterThanOrEqualTo",
-                    "payload": {
-                      "minimum": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value greater than or equal to 1"
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Number.check(Schema.isInt().annotate({ "expected": "an integer" })).check(Schema.isGreaterThanOrEqualTo(1).annotate({ "expected": "a value greater than or equal to 1" }))`,
+              `number`
+            )
           }
         )
       })
@@ -1190,39 +468,10 @@ describe("fromJsonSchemaDocument", () => {
         assertFromJsonSchema(
           { schema: { type: "integer", maximum: 1 } },
           {
-            "representation": {
-              "_tag": "Number",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isInt",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "an integer",
-                    "arbitraryConstraint": {
-                      "number": "integer"
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isLessThanOrEqualTo",
-                    "payload": {
-                      "maximum": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value less than or equal to 1"
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Number.check(Schema.isInt().annotate({ "expected": "an integer" })).check(Schema.isLessThanOrEqualTo(1).annotate({ "expected": "a value less than or equal to 1" }))`,
+              `number`
+            )
           }
         )
       })
@@ -1231,39 +480,10 @@ describe("fromJsonSchemaDocument", () => {
         assertFromJsonSchema(
           { schema: { type: "integer", exclusiveMinimum: 1 } },
           {
-            "representation": {
-              "_tag": "Number",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isInt",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "an integer",
-                    "arbitraryConstraint": {
-                      "number": "integer"
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isGreaterThan",
-                    "payload": {
-                      "exclusiveMinimum": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value greater than 1"
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Number.check(Schema.isInt().annotate({ "expected": "an integer" })).check(Schema.isGreaterThan(1).annotate({ "expected": "a value greater than 1" }))`,
+              `number`
+            )
           }
         )
       })
@@ -1272,39 +492,10 @@ describe("fromJsonSchemaDocument", () => {
         assertFromJsonSchema(
           { schema: { type: "integer", exclusiveMaximum: 1 } },
           {
-            "representation": {
-              "_tag": "Number",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isInt",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "an integer",
-                    "arbitraryConstraint": {
-                      "number": "integer"
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isLessThan",
-                    "payload": {
-                      "exclusiveMaximum": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value less than 1"
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Number.check(Schema.isInt().annotate({ "expected": "an integer" })).check(Schema.isLessThan(1).annotate({ "expected": "a value less than 1" }))`,
+              `number`
+            )
           }
         )
       })
@@ -1313,39 +504,10 @@ describe("fromJsonSchemaDocument", () => {
         assertFromJsonSchema(
           { schema: { type: "integer", multipleOf: 1 } },
           {
-            "representation": {
-              "_tag": "Number",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isInt",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "an integer",
-                    "arbitraryConstraint": {
-                      "number": "integer"
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMultipleOf",
-                    "payload": {
-                      "divisor": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value that is a multiple of 1"
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Number.check(Schema.isInt().annotate({ "expected": "an integer" })).check(Schema.isMultipleOf(1).annotate({ "expected": "a value that is a multiple of 1" }))`,
+              `number`
+            )
           }
         )
       })
@@ -1356,13 +518,7 @@ describe("fromJsonSchemaDocument", () => {
     it("type only", () => {
       assertFromJsonSchema(
         { schema: { type: "boolean" } },
-        {
-          "representation": {
-            "_tag": "Boolean",
-            "checks": []
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Boolean`, `boolean`) }
       )
     })
   })
@@ -1372,26 +528,10 @@ describe("fromJsonSchemaDocument", () => {
       assertFromJsonSchema(
         { schema: { type: "array" } },
         {
-          "representation": {
-            "_tag": "Arrays",
-            "checks": [],
-            "elements": [],
-            "rest": [
-              {
-                "_tag": "Declaration",
-                "representation": {
-                  "id": "effect/schema/Json",
-                  "payload": null
-                },
-                "annotations": {
-                  "expected": "JSON value"
-                },
-                "typeParameters": [],
-                "checks": []
-              }
-            ]
-          },
-          "references": {}
+          codes: makeCode(
+            `Schema.Array(Schema.Json.annotate({ "expected": "JSON value" }))`,
+            `ReadonlyArray<Schema.Json>`
+          )
         }
       )
     })
@@ -1404,20 +544,7 @@ describe("fromJsonSchemaDocument", () => {
             items: { type: "string" }
           }
         },
-        {
-          "representation": {
-            "_tag": "Arrays",
-            "checks": [],
-            "elements": [],
-            "rest": [
-              {
-                "_tag": "String",
-                "checks": []
-              }
-            ]
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Array(Schema.String)`, `ReadonlyArray<string>`) }
       )
     })
 
@@ -1431,74 +558,10 @@ describe("fromJsonSchemaDocument", () => {
           }
         },
         {
-          "representation": {
-            "_tag": "Arrays",
-            "checks": [
-              {
-                "_tag": "Filter",
-                "representation": {
-                  "id": "effect/schema/isMaxLength",
-                  "payload": {
-                    "maxLength": 1
-                  }
-                },
-                "annotations": {
-                  "expected": "a value with a length of at most 1",
-                  "~structural": true,
-                  "arbitraryConstraint": {
-                    "maxLength": 1
-                  }
-                },
-                "aborted": false
-              }
-            ],
-            "elements": [
-              {
-                "isOptional": true,
-                "type": {
-                  "_tag": "String",
-                  "checks": []
-                }
-              },
-              {
-                "isOptional": true,
-                "type": {
-                  "_tag": "Number",
-                  "checks": [
-                    {
-                      "_tag": "Filter",
-                      "representation": {
-                        "id": "effect/schema/isFinite",
-                        "payload": null
-                      },
-                      "annotations": {
-                        "expected": "a finite number",
-                        "arbitraryConstraint": {
-                          "number": "finite"
-                        }
-                      },
-                      "aborted": false
-                    }
-                  ]
-                }
-              }
-            ],
-            "rest": [
-              {
-                "_tag": "Declaration",
-                "representation": {
-                  "id": "effect/schema/Json",
-                  "payload": null
-                },
-                "annotations": {
-                  "expected": "JSON value"
-                },
-                "typeParameters": [],
-                "checks": []
-              }
-            ]
-          },
-          "references": {}
+          codes: makeCode(
+            `Schema.TupleWithRest(Schema.Tuple([Schema.optionalKey(Schema.String), Schema.optionalKey(Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" })))]), [Schema.Json.annotate({ "expected": "JSON value" })]).check(Schema.isMaxLength(1).annotate({ "expected": "a value with a length of at most 1" }))`,
+            `readonly [(string)?, (number)?, ...Array<Schema.Json>]`
+          )
         }
       )
     })
@@ -1513,52 +576,10 @@ describe("fromJsonSchemaDocument", () => {
           }
         },
         {
-          "representation": {
-            "_tag": "Arrays",
-            "checks": [
-              {
-                "_tag": "Filter",
-                "representation": {
-                  "id": "effect/schema/isMaxLength",
-                  "payload": {
-                    "maxLength": 2
-                  }
-                },
-                "annotations": {
-                  "expected": "a value with a length of at most 2",
-                  "~structural": true,
-                  "arbitraryConstraint": {
-                    "maxLength": 2
-                  }
-                },
-                "aborted": false
-              }
-            ],
-            "elements": [
-              {
-                "isOptional": true,
-                "type": {
-                  "_tag": "String",
-                  "checks": []
-                }
-              }
-            ],
-            "rest": [
-              {
-                "_tag": "Declaration",
-                "representation": {
-                  "id": "effect/schema/Json",
-                  "payload": null
-                },
-                "annotations": {
-                  "expected": "JSON value"
-                },
-                "typeParameters": [],
-                "checks": []
-              }
-            ]
-          },
-          "references": {}
+          codes: makeCode(
+            `Schema.TupleWithRest(Schema.Tuple([Schema.optionalKey(Schema.String)]), [Schema.Json.annotate({ "expected": "JSON value" })]).check(Schema.isMaxLength(2).annotate({ "expected": "a value with a length of at most 2" }))`,
+            `readonly [(string)?, ...Array<Schema.Json>]`
+          )
         }
       )
     })
@@ -1573,23 +594,7 @@ describe("fromJsonSchemaDocument", () => {
             maxItems: 2
           }
         },
-        {
-          "representation": {
-            "_tag": "Arrays",
-            "checks": [],
-            "elements": [
-              {
-                "isOptional": true,
-                "type": {
-                  "_tag": "String",
-                  "checks": []
-                }
-              }
-            ],
-            "rest": []
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Tuple([Schema.optionalKey(Schema.String)])`, `readonly [(string)?]`) }
       )
     })
 
@@ -1602,23 +607,7 @@ describe("fromJsonSchemaDocument", () => {
             maxItems: 1
           }
         },
-        {
-          "representation": {
-            "_tag": "Arrays",
-            "checks": [],
-            "elements": [
-              {
-                "isOptional": true,
-                "type": {
-                  "_tag": "String",
-                  "checks": []
-                }
-              }
-            ],
-            "rest": []
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Tuple([Schema.optionalKey(Schema.String)])`, `readonly [(string)?]`) }
       )
     })
 
@@ -1632,23 +621,7 @@ describe("fromJsonSchemaDocument", () => {
             maxItems: 1
           }
         },
-        {
-          "representation": {
-            "_tag": "Arrays",
-            "checks": [],
-            "elements": [
-              {
-                "isOptional": false,
-                "type": {
-                  "_tag": "String",
-                  "checks": []
-                }
-              }
-            ],
-            "rest": []
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Tuple([Schema.String])`, `readonly [string]`) }
       )
     })
 
@@ -1663,41 +636,10 @@ describe("fromJsonSchemaDocument", () => {
           }
         },
         {
-          "representation": {
-            "_tag": "Arrays",
-            "checks": [],
-            "elements": [
-              {
-                "isOptional": false,
-                "type": {
-                  "_tag": "String",
-                  "checks": []
-                }
-              }
-            ],
-            "rest": [
-              {
-                "_tag": "Number",
-                "checks": [
-                  {
-                    "_tag": "Filter",
-                    "representation": {
-                      "id": "effect/schema/isFinite",
-                      "payload": null
-                    },
-                    "annotations": {
-                      "expected": "a finite number",
-                      "arbitraryConstraint": {
-                        "number": "finite"
-                      }
-                    },
-                    "aborted": false
-                  }
-                ]
-              }
-            ]
-          },
-          "references": {}
+          codes: makeCode(
+            `Schema.TupleWithRest(Schema.Tuple([Schema.String]), [Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" }))])`,
+            `readonly [string, ...Array<number>]`
+          )
         }
       )
     })
@@ -1707,44 +649,10 @@ describe("fromJsonSchemaDocument", () => {
         assertFromJsonSchema(
           { schema: { type: "array", minItems: 1 } },
           {
-            "representation": {
-              "_tag": "Arrays",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMinLength",
-                    "payload": {
-                      "minLength": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at least 1",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "minLength": 1
-                    }
-                  },
-                  "aborted": false
-                }
-              ],
-              "elements": [],
-              "rest": [
-                {
-                  "_tag": "Declaration",
-                  "representation": {
-                    "id": "effect/schema/Json",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "JSON value"
-                  },
-                  "typeParameters": [],
-                  "checks": []
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Array(Schema.Json.annotate({ "expected": "JSON value" })).check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1" }))`,
+              `ReadonlyArray<Schema.Json>`
+            )
           }
         )
       })
@@ -1752,45 +660,11 @@ describe("fromJsonSchemaDocument", () => {
       it("maxItems", () => {
         assertFromJsonSchema(
           { schema: { type: "array", maxItems: 1 } },
-          {
-            "representation": {
-              "_tag": "Arrays",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMaxLength",
-                    "payload": {
-                      "maxLength": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at most 1",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "maxLength": 1
-                    }
-                  },
-                  "aborted": false
-                }
-              ],
-              "elements": [],
-              "rest": [
-                {
-                  "_tag": "Declaration",
-                  "representation": {
-                    "id": "effect/schema/Json",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "JSON value"
-                  },
-                  "typeParameters": [],
-                  "checks": []
-                }
-              ]
-            },
-            "references": {}
+          {
+            codes: makeCode(
+              `Schema.Array(Schema.Json.annotate({ "expected": "JSON value" })).check(Schema.isMaxLength(1).annotate({ "expected": "a value with a length of at most 1" }))`,
+              `ReadonlyArray<Schema.Json>`
+            )
           }
         )
       })
@@ -1799,83 +673,87 @@ describe("fromJsonSchemaDocument", () => {
         assertFromJsonSchema(
           { schema: { type: "array", uniqueItems: true } },
           {
-            "representation": {
-              "_tag": "Arrays",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isUnique",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "an array with unique items"
-                  },
-                  "aborted": false
-                }
-              ],
-              "elements": [],
-              "rest": [
-                {
-                  "_tag": "Declaration",
-                  "representation": {
-                    "id": "effect/schema/Json",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "JSON value"
-                  },
-                  "typeParameters": [],
-                  "checks": []
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Array(Schema.Json.annotate({ "expected": "JSON value" })).check(Schema.isUnique().annotate({ "expected": "an array with unique items" }))`,
+              `ReadonlyArray<Schema.Json>`
+            )
           }
         )
       })
 
       it("does not require uniqueness when uniqueItems is false", () => {
-        const schema = toSchemaFromJsonSchemaDocument(
-          JsonSchema.fromSchemaDraft2020_12({ type: "array", uniqueItems: false })
-        )
-
-        assertTrue(Schema.is(schema)(["a", "a"]))
+        assertFromJsonSchema({ schema: { type: "array", uniqueItems: false } }, {
+          codes: makeCode(
+            `Schema.Array(Schema.Json.annotate({ "expected": "JSON value" }))`,
+            `ReadonlyArray<Schema.Json>`
+          )
+        })
       })
     })
   })
 
   describe("type: object", () => {
+    it("delegates excess properties of closed structs to ParseOptions", async () => {
+      const schema = toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
+        type: "object",
+        properties: { name: { type: "string" } },
+        additionalProperties: false
+      }))
+      const asserts = new TestSchema.Asserts(schema as unknown as Schema.ConstraintDecoder<unknown>)
+      const decoding = asserts.decoding()
+      const strictDecoding = asserts.decoding({ parseOptions: { onExcessProperty: "error" } })
+      const input = { extra: 1 }
+      await decoding.succeed(input, {})
+      assert.deepStrictEqual(input, { extra: 1 })
+      await strictDecoding.fail(input, `Expected no excess property\n  at ["extra"]`)
+      await strictDecoding.succeed({})
+      for (const value of [null, false, 0, "", [], undefined]) {
+        await decoding.fail(value, "Expected object")
+      }
+    })
+
+    it("preserves JSON-valued additional properties for every open form", async () => {
+      for (const additionalProperties of [undefined, true, {}]) {
+        const schema = toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
+          type: "object",
+          properties: { name: { type: "string" } },
+          ...(additionalProperties === undefined ? {} : { additionalProperties })
+        }))
+        const asserts = new TestSchema.Asserts(schema as unknown as Schema.ConstraintDecoder<unknown>)
+        const decoding = asserts.decoding()
+        const input = { name: "Mario", extra: { values: [1, null, true] } }
+        await decoding.succeed(input)
+        await asserts.decoding({ parseOptions: { onExcessProperty: "error" } }).succeed(input)
+        for (const extra of [undefined, Infinity, Symbol("extra"), () => 1]) {
+          await decoding.fail({ extra }, `Expected JSON value\n  at ["extra"]`)
+        }
+      }
+    })
+
+    it("runs property checks after stripping excess properties", async () => {
+      const schema = toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
+        type: "object",
+        properties: { name: { type: "string" } },
+        additionalProperties: false,
+        maxProperties: 1,
+        propertyNames: { enum: ["name"] }
+      }))
+      const asserts = new TestSchema.Asserts(schema as unknown as Schema.ConstraintDecoder<unknown>)
+      await asserts.decoding().succeed({ name: "Mario", extra: 1 }, { name: "Mario" })
+      await asserts.decoding({ parseOptions: { onExcessProperty: "error" } }).fail(
+        { name: "Mario", extra: 1 },
+        `Expected no excess property\n  at ["extra"]`
+      )
+    })
+
     it("allows additional properties by default", () => {
       assertFromJsonSchema(
         { schema: { type: "object" } },
         {
-          "representation": {
-            "_tag": "Objects",
-            "checks": [],
-            "propertySignatures": [],
-            "indexSignatures": [
-              {
-                "parameter": {
-                  "_tag": "String",
-                  "checks": []
-                },
-                "type": {
-                  "_tag": "Declaration",
-                  "representation": {
-                    "id": "effect/schema/Json",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "JSON value"
-                  },
-                  "typeParameters": [],
-                  "checks": []
-                }
-              }
-            ]
-          },
-          "references": {}
+          codes: makeCode(
+            `Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" }))`,
+            `{ readonly [x: string]: Schema.Json }`
+          )
         }
       )
     })
@@ -1888,29 +766,36 @@ describe("fromJsonSchemaDocument", () => {
             additionalProperties: false
           }
         },
-        {
-          "representation": {
-            "_tag": "Objects",
-            "checks": [],
-            "propertySignatures": [],
-            "indexSignatures": [
-              {
-                "parameter": {
-                  "_tag": "String",
-                  "checks": []
-                },
-                "type": {
-                  "_tag": "Never",
-                  "checks": []
-                }
-              }
-            ]
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Record(Schema.String, Schema.Never)`, `{ readonly [x: string]: never }`) }
       )
     })
 
+    it("preserves closed empty objects through representation persistence and code generation", async () => {
+      const schema = toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
+        type: "object",
+        additionalProperties: false
+      }))
+      const persisted = SchemaRepresentation.toJson(SchemaRepresentation.toRepresentation(schema.ast))
+      const revived = SchemaRepresentation.fromRepresentation(SchemaRepresentation.fromJson(persisted), {
+        revivers: []
+      })
+      for (const current of [schema, revived]) {
+        const asserts = new TestSchema.Asserts(current as unknown as Schema.ConstraintDecoder<unknown>)
+        for (
+          const decoding of [asserts.decoding(), asserts.decoding({ parseOptions: { onExcessProperty: "error" } })]
+        ) {
+          await decoding.succeed({})
+          for (const value of [1, undefined]) {
+            await decoding.fail({ extra: value }, `Expected never\n  at ["extra"]`)
+          }
+          await decoding.fail([], "Expected object")
+        }
+      }
+      assertCode(revived, {
+        codes: makeCode(`Schema.Record(Schema.String, Schema.Never)`, `{ readonly [x: string]: never }`)
+      })
+    })
+
     it("additionalProperties", () => {
       assertFromJsonSchema(
         {
@@ -1919,26 +804,7 @@ describe("fromJsonSchemaDocument", () => {
             additionalProperties: { type: "boolean" }
           }
         },
-        {
-          "representation": {
-            "_tag": "Objects",
-            "checks": [],
-            "propertySignatures": [],
-            "indexSignatures": [
-              {
-                "parameter": {
-                  "_tag": "String",
-                  "checks": []
-                },
-                "type": {
-                  "_tag": "Boolean",
-                  "checks": []
-                }
-              }
-            ]
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Record(Schema.String, Schema.Boolean)`, `{ readonly [x: string]: boolean }`) }
       )
     })
 
@@ -1953,38 +819,10 @@ describe("fromJsonSchemaDocument", () => {
           }
         },
         {
-          "representation": {
-            "_tag": "Objects",
-            "checks": [],
-            "propertySignatures": [
-              {
-                "name": {
-                  "type": "string",
-                  "value": "a"
-                },
-                "type": {
-                  "_tag": "String",
-                  "checks": []
-                },
-                "isOptional": false,
-                "isMutable": false
-              },
-              {
-                "name": {
-                  "type": "string",
-                  "value": "b"
-                },
-                "type": {
-                  "_tag": "String",
-                  "checks": []
-                },
-                "isOptional": true,
-                "isMutable": false
-              }
-            ],
-            "indexSignatures": []
-          },
-          "references": {}
+          codes: makeCode(
+            `Schema.Struct({ "a": Schema.String, "b": Schema.optionalKey(Schema.String) })`,
+            `{ readonly "a": string, readonly "b"?: string }`
+          )
         }
       )
     })
@@ -1998,24 +836,122 @@ describe("fromJsonSchemaDocument", () => {
             required: ["a"],
             additionalProperties: { type: "boolean" }
           })),
-        `Unsupported object keyword scopes\n  at ["schema"]`
+        `Cannot combine typed "additionalProperties" with other property schemas: Effect index signatures also check excluded keys.\n  at ["schema"]`
       )
     })
 
-    it("rejects a closed single pattern property", () => {
+    it("explains why typed additional properties cannot exclude patterned keys", () => {
       throws(
         () =>
           toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
             type: "object",
-            patternProperties: {
-              "a*": { type: "string" }
-            },
-            additionalProperties: false
+            patternProperties: { "^a": { type: "string" } },
+            additionalProperties: { type: "number" }
           })),
-        `Unsupported object keyword scopes\n  at ["schema"]`
+        `Cannot combine typed "additionalProperties" with other property schemas: Effect index signatures also check excluded keys.\n  at ["schema"]`
       )
     })
 
+    it("explains the supported closed pattern form when properties are declared or required", () => {
+      for (const fields of [{ properties: { a: { type: "number" } } }, { required: ["a"] }] as const) {
+        throws(
+          () =>
+            toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
+              type: "object",
+              patternProperties: { "^a": { type: "number" } },
+              additionalProperties: false,
+              ...fields
+            })),
+          `Cannot import this closed patterned object: only one pattern without properties is supported.\n  at ["schema"]`
+        )
+      }
+    })
+
+    it("round-trips a closed Record with a patterned key", async () => {
+      const original = Schema.Record(Schema.String.check(Schema.isStartsWith("a")), Schema.Finite)
+      const document = Schema.toJsonSchemaDocument(original, { onExcessProperty: "error" })
+      assert.deepStrictEqual(document.schema, {
+        type: "object",
+        patternProperties: { "^a": { type: "number" } },
+        additionalProperties: false
+      })
+      const imported = toSchemaFromJsonSchemaDocument(document)
+      const asserts = new TestSchema.Asserts(imported as unknown as Schema.ConstraintDecoder<unknown>)
+      const decoding = asserts.decoding()
+      const strictDecoding = asserts.decoding({ parseOptions: { onExcessProperty: "error" } })
+      for (const input of [{}, { a: 1 }, { a: 1, abc: 2 }]) {
+        await decoding.succeed(input)
+        await strictDecoding.succeed(input)
+      }
+      const input = { a: 1, z: "extra" }
+      await decoding.succeed(input, { a: 1 })
+      assert.deepStrictEqual(input, { a: 1, z: "extra" })
+      await decoding.succeed({ z: 1 }, {})
+      await strictDecoding.fail(input, `Expected no excess property\n  at ["z"]`)
+      await strictDecoding.fail({ z: 1 }, `Expected no excess property\n  at ["z"]`)
+      for (const value of ["x", null, undefined]) {
+        await decoding.fail({ a: value }, `Expected number\n  at ["a"]`)
+        await strictDecoding.fail({ a: value }, `Expected number\n  at ["a"]`)
+      }
+      await decoding.fail({ a: Infinity }, `Expected a finite number\n  at ["a"]`)
+      await strictDecoding.fail({ a: Infinity }, `Expected a finite number\n  at ["a"]`)
+      for (const value of [null, false, 0, "", [], undefined]) {
+        await decoding.fail(value, "Expected object")
+      }
+      assert.deepStrictEqual(Schema.toJsonSchemaDocument(imported, { onExcessProperty: "error" }), document)
+    })
+
+    it("imports a closed patterned Record through references", () => {
+      assertFromJsonSchema({
+        schema: {
+          type: "object",
+          properties: { values: { $ref: "#/$defs/Values" } },
+          required: ["values"],
+          additionalProperties: false,
+          $defs: {
+            Values: {
+              type: "object",
+              patternProperties: { a: { $ref: "#/$defs/Value" } },
+              additionalProperties: false
+            },
+            Value: { type: "string", minLength: 2 }
+          }
+        }
+      }, {
+        codes: makeCode(`Schema.Struct({ "values": Values })`, `{ readonly "values": Values }`),
+        references: {
+          nonRecursives: [{
+            $ref: `Value`,
+            code: makeCode(
+              `Schema.String.check(Schema.isMinLength(2).annotate({ "expected": "a value with a length of at least 2", "identifier": "Value" }))`,
+              `string`
+            )
+          }, {
+            $ref: `Values`,
+            code: makeCode(
+              `Schema.Record(Schema.String.check(Schema.isPattern(new RegExp("a")).annotate({ "expected": "a string matching the RegExp a" })), Value).annotate({ "identifier": "Values" })`,
+              `{ readonly [x: string]: Value }`
+            )
+          }]
+        }
+      })
+    })
+
+    it("keeps a closed pattern with Never values as an object schema", () => {
+      assertFromJsonSchema({
+        schema: {
+          type: "object",
+          patternProperties: { "^a": { not: {} } },
+          additionalProperties: false
+        }
+      }, {
+        codes: makeCode(
+          `Schema.Record(Schema.String.check(Schema.isPattern(new RegExp("^a")).annotate({ "expected": "a string matching the RegExp ^a" })), Schema.Never)`,
+          `{ readonly [x: string]: never }`
+        )
+      })
+    })
+
     it("rejects closed multiple pattern properties", () => {
       throws(
         () =>
@@ -2027,7 +963,7 @@ describe("fromJsonSchemaDocument", () => {
             },
             additionalProperties: false
           })),
-        `Unsupported object keyword scopes\n  at ["schema"]`
+        `Cannot import this closed patterned object: only one pattern without properties is supported.\n  at ["schema"]`
       )
     })
 
@@ -2036,50 +972,10 @@ describe("fromJsonSchemaDocument", () => {
         assertFromJsonSchema(
           { schema: { type: "object", minProperties: 1 } },
           {
-            "representation": {
-              "_tag": "Objects",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMinProperties",
-                    "payload": {
-                      "minProperties": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with at least 1 entry",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "minProperties": 1
-                    }
-                  },
-                  "aborted": false
-                }
-              ],
-              "propertySignatures": [],
-              "indexSignatures": [
-                {
-                  "parameter": {
-                    "_tag": "String",
-                    "checks": []
-                  },
-                  "type": {
-                    "_tag": "Declaration",
-                    "representation": {
-                      "id": "effect/schema/Json",
-                      "payload": null
-                    },
-                    "annotations": {
-                      "expected": "JSON value"
-                    },
-                    "typeParameters": [],
-                    "checks": []
-                  }
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" })).check(Schema.isMinProperties(1).annotate({ "expected": "a value with at least 1 entry" }))`,
+              `{ readonly [x: string]: Schema.Json }`
+            )
           }
         )
       })
@@ -2088,50 +984,10 @@ describe("fromJsonSchemaDocument", () => {
         assertFromJsonSchema(
           { schema: { type: "object", maxProperties: 1 } },
           {
-            "representation": {
-              "_tag": "Objects",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMaxProperties",
-                    "payload": {
-                      "maxProperties": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with at most 1 entry",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "maxProperties": 1
-                    }
-                  },
-                  "aborted": false
-                }
-              ],
-              "propertySignatures": [],
-              "indexSignatures": [
-                {
-                  "parameter": {
-                    "_tag": "String",
-                    "checks": []
-                  },
-                  "type": {
-                    "_tag": "Declaration",
-                    "representation": {
-                      "id": "effect/schema/Json",
-                      "payload": null
-                    },
-                    "annotations": {
-                      "expected": "JSON value"
-                    },
-                    "typeParameters": [],
-                    "checks": []
-                  }
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" })).check(Schema.isMaxProperties(1).annotate({ "expected": "a value with at most 1 entry" }))`,
+              `{ readonly [x: string]: Schema.Json }`
+            )
           }
         )
       })
@@ -2147,74 +1003,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "Objects",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isPropertyNames",
-                    "payload": null,
-                    "schemas": [
-                      {
-                        "_tag": "String",
-                        "checks": [
-                          {
-                            "_tag": "Filter",
-                            "representation": {
-                              "id": "effect/schema/isPattern",
-                              "payload": {
-                                "source": "^[A-Z]",
-                                "flags": ""
-                              }
-                            },
-                            "annotations": {
-                              "expected": "a string matching the RegExp ^[A-Z]",
-                              "arbitraryConstraint": {
-                                "patterns": [
-                                  {
-                                    "source": "^[A-Z]",
-                                    "flags": ""
-                                  }
-                                ]
-                              }
-                            },
-                            "aborted": false
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  "annotations": {
-                    "expected": "an object with property names matching the schema",
-                    "~structural": true
-                  },
-                  "aborted": false
-                }
-              ],
-              "propertySignatures": [],
-              "indexSignatures": [
-                {
-                  "parameter": {
-                    "_tag": "String",
-                    "checks": []
-                  },
-                  "type": {
-                    "_tag": "Declaration",
-                    "representation": {
-                      "id": "effect/schema/Json",
-                      "payload": null
-                    },
-                    "annotations": {
-                      "expected": "JSON value"
-                    },
-                    "typeParameters": [],
-                    "checks": []
-                  }
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" })).check(Schema.isPropertyNames(Schema.String.check(Schema.isPattern(new RegExp("^[A-Z]")).annotate({ "expected": "a string matching the RegExp ^[A-Z]" }))).annotate({ "expected": "an object with property names matching the schema" }))`,
+              `{ readonly [x: string]: Schema.Json }`
+            )
           }
         )
       })
@@ -2228,51 +1020,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "Objects",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isPropertyNames",
-                    "payload": null,
-                    "schemas": [
-                      {
-                        "_tag": "Never",
-                        "checks": []
-                      }
-                    ]
-                  },
-                  "annotations": {
-                    "expected": "an object with property names matching the schema",
-                    "~structural": true
-                  },
-                  "aborted": false
-                }
-              ],
-              "propertySignatures": [],
-              "indexSignatures": [
-                {
-                  "parameter": {
-                    "_tag": "String",
-                    "checks": []
-                  },
-                  "type": {
-                    "_tag": "Declaration",
-                    "representation": {
-                      "id": "effect/schema/Json",
-                      "payload": null
-                    },
-                    "annotations": {
-                      "expected": "JSON value"
-                    },
-                    "typeParameters": [],
-                    "checks": []
-                  }
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" })).check(Schema.isPropertyNames(Schema.Never).annotate({ "expected": "an object with property names matching the schema" }))`,
+              `{ readonly [x: string]: Schema.Json }`
+            )
           }
         )
       })
@@ -2288,110 +1039,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "Objects",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isPropertyNames",
-                    "payload": null,
-                    "schemas": [
-                      {
-                        "_tag": "String",
-                        "checks": [
-                          {
-                            "_tag": "Filter",
-                            "representation": {
-                              "id": "effect/schema/isPattern",
-                              "payload": {
-                                "source": "^[A-Z]",
-                                "flags": ""
-                              }
-                            },
-                            "annotations": {
-                              "expected": "a string matching the RegExp ^[A-Z]",
-                              "arbitraryConstraint": {
-                                "patterns": [
-                                  {
-                                    "source": "^[A-Z]",
-                                    "flags": ""
-                                  }
-                                ]
-                              }
-                            },
-                            "aborted": false
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  "annotations": {
-                    "expected": "an object with property names matching the schema",
-                    "~structural": true
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isPropertyNames",
-                    "payload": null,
-                    "schemas": [
-                      {
-                        "_tag": "String",
-                        "checks": [
-                          {
-                            "_tag": "Filter",
-                            "representation": {
-                              "id": "effect/schema/isMinLength",
-                              "payload": {
-                                "minLength": 2
-                              }
-                            },
-                            "annotations": {
-                              "expected": "a value with a length of at least 2",
-                              "~structural": true,
-                              "arbitraryConstraint": {
-                                "minLength": 2
-                              }
-                            },
-                            "aborted": false
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  "annotations": {
-                    "expected": "an object with property names matching the schema",
-                    "~structural": true
-                  },
-                  "aborted": false
-                }
-              ],
-              "propertySignatures": [],
-              "indexSignatures": [
-                {
-                  "parameter": {
-                    "_tag": "String",
-                    "checks": []
-                  },
-                  "type": {
-                    "_tag": "Declaration",
-                    "representation": {
-                      "id": "effect/schema/Json",
-                      "payload": null
-                    },
-                    "annotations": {
-                      "expected": "JSON value"
-                    },
-                    "typeParameters": [],
-                    "checks": []
-                  }
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" })).check(Schema.isPropertyNames(Schema.String.check(Schema.isPattern(new RegExp("^[A-Z]")).annotate({ "expected": "a string matching the RegExp ^[A-Z]" }))).annotate({ "expected": "an object with property names matching the schema" })).check(Schema.isPropertyNames(Schema.String.check(Schema.isMinLength(2).annotate({ "expected": "a value with a length of at least 2" }))).annotate({ "expected": "an object with property names matching the schema" }))`,
+              `{ readonly [x: string]: Schema.Json }`
+            )
           }
         )
       })
@@ -2403,24 +1054,7 @@ describe("fromJsonSchemaDocument", () => {
       {
         schema: { type: ["string", "null"] }
       },
-      {
-        "representation": {
-          "_tag": "Union",
-          "checks": [],
-          "types": [
-            {
-              "_tag": "String",
-              "checks": []
-            },
-            {
-              "_tag": "Null",
-              "checks": []
-            }
-          ],
-          "mode": "anyOf"
-        },
-        "references": {}
-      }
+      { codes: makeCode(`Schema.Union([Schema.String, Schema.Null])`, `string | null`) }
     )
     assertFromJsonSchema(
       {
@@ -2430,25 +1064,7 @@ describe("fromJsonSchemaDocument", () => {
         }
       },
       {
-        "representation": {
-          "_tag": "Union",
-          "annotations": {
-            "description": "a"
-          },
-          "checks": [],
-          "types": [
-            {
-              "_tag": "String",
-              "checks": []
-            },
-            {
-              "_tag": "Null",
-              "checks": []
-            }
-          ],
-          "mode": "anyOf"
-        },
-        "references": {}
+        codes: makeCode(`Schema.Union([Schema.String, Schema.Null]).annotate({ "description": "a" })`, `string | null`)
       }
     )
   })
@@ -2456,13 +1072,7 @@ describe("fromJsonSchemaDocument", () => {
   it("ignores true schemas in allOf", () => {
     assertFromJsonSchema(
       { schema: { allOf: [true, { type: "string" }] } },
-      {
-        "representation": {
-          "_tag": "String",
-          "checks": []
-        },
-        "references": {}
-      }
+      { codes: makeCode(`Schema.String`, `string`) }
     )
   })
 
@@ -2470,12 +1080,12 @@ describe("fromJsonSchemaDocument", () => {
     for (const value of [[], {}, { not: "data" }]) {
       throws(
         () => toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({ enum: ["a", value] })),
-        `Unsupported structured JSON Schema value for "enum"\n  at ["schema"]["enum"][1]`
+        `Only primitive values are supported in "const" and "enum".\n  at ["schema"]["enum"][1]`
       )
     }
     throws(
       () => toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({ const: "a", enum: [{}] })),
-      `Unsupported structured JSON Schema value for "enum"\n  at ["schema"]["enum"][0]`
+      `Only primitive values are supported in "const" and "enum".\n  at ["schema"]["enum"][0]`
     )
   })
 
@@ -2491,22 +1101,121 @@ describe("fromJsonSchemaDocument", () => {
         }
       },
       {
-        "representation": {
-          "_tag": "String",
-          "annotations": {
-            "format": "email",
-            "contentEncoding": "base64",
-            "contentMediaType": "application/json",
-            "contentSchema": { "type": "number" }
-          },
-          "checks": []
-        },
-        "references": {}
+        codes: makeCode(
+          `Schema.String.annotate({ "format": "email", "contentEncoding": "base64", "contentMediaType": "application/json", "contentSchema": { "type": "number" } })`,
+          `string`
+        )
       }
     )
   })
 
   describe("$ref", () => {
+    it("rejects local references inside nested resources", () => {
+      const reference = { $ref: "#/$defs/X" }
+      const nested = { $id: "child", $defs: { X: { type: "number" } } }
+      for (
+        const [body, suffix] of [
+          [reference, ""],
+          [{ type: "object", properties: { value: reference } }, `["properties"]["value"]`],
+          [{ properties: { value: reference } }, `["properties"]["value"]`],
+          [{ type: "array", items: reference }, `["items"]`],
+          [{ type: "array", prefixItems: [reference] }, `["prefixItems"][0]`],
+          [{ allOf: [reference] }, `["allOf"][0]`],
+          [{ anyOf: [reference, { type: "null" }] }, `["anyOf"][0]`],
+          [{ oneOf: [reference, { type: "null" }] }, `["oneOf"][0]`],
+          [{ type: "object", additionalProperties: reference }, `["additionalProperties"]`],
+          [{ type: "object", patternProperties: { "^a": reference } }, `["patternProperties"]["^a"]`],
+          [{ type: "object", propertyNames: reference }, `["propertyNames"]`]
+        ] as const
+      ) {
+        throws(
+          () =>
+            toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
+              $id: "https://example.com/root",
+              type: "object",
+              properties: { child: { ...nested, ...body } },
+              $defs: { X: { type: "string" } }
+            })),
+          `Cannot resolve $ref under a nested "$id". Resolve or flatten it first.\n  at ["schema"]["properties"]["child"]${suffix}["$ref"]`
+        )
+      }
+    })
+
+    it("keeps root ids and nested resources without references supported", () => {
+      assertFromJsonSchema({
+        schema: {
+          $id: "https://example.com/root",
+          type: "object",
+          properties: {
+            child: { $id: "child", type: "number", $defs: { Unused: { $ref: "#/$defs/X" } } },
+            value: { $ref: "#/$defs/X" }
+          },
+          $defs: { X: { type: "string" } }
+        }
+      }, {
+        codes: makeCode(
+          `Schema.StructWithRest(Schema.Struct({ "child": Schema.optionalKey(Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" }))), "value": Schema.optionalKey(X) }), [Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" }))])`,
+          `{ readonly "child"?: number, readonly "value"?: X } & { readonly [x: string]: Schema.Json }`
+        ),
+        references: {
+          nonRecursives: [{ $ref: `X`, code: makeCode(`Schema.String.annotate({ "identifier": "X" })`, `string`) }]
+        }
+      })
+    })
+
+    it("determines resource scope from onEnter results", () => {
+      const document = JsonSchema.fromSchemaDraft2020_12({
+        type: "object",
+        properties: { child: { $id: "child", $ref: "#/$defs/X" } },
+        $defs: { X: { type: "string" } }
+      })
+      const schema = toSchemaFromJsonSchemaDocument(document, {
+        onEnter: (schema) => ({ ...schema, $id: undefined })
+      })
+      assertCode(schema, {
+        codes: makeCode(
+          `Schema.StructWithRest(Schema.Struct({ "child": Schema.optionalKey(X) }), [Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" }))])`,
+          `{ readonly "child"?: X } & { readonly [x: string]: Schema.Json }`
+        ),
+        references: {
+          nonRecursives: [{ $ref: "X", code: makeCode(`Schema.String.annotate({ "identifier": "X" })`, `string`) }]
+        }
+      })
+
+      throws(
+        () =>
+          toSchemaFromJsonSchemaDocument(
+            JsonSchema.fromSchemaDraft2020_12({
+              type: "array",
+              items: { $ref: "#/$defs/X" },
+              $defs: { X: { type: "string" } }
+            }),
+            {
+              onEnter: (schema) => schema.$ref === undefined ? schema : { ...schema, $id: "child" }
+            }
+          ),
+        `Cannot resolve $ref under a nested "$id". Resolve or flatten it first.\n  at ["schema"]["items"]["$ref"]`
+      )
+    })
+
+    it("rejects references in a reachable definition with its own id", () => {
+      throws(
+        () =>
+          toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
+            $ref: "#/$defs/Child",
+            $defs: {
+              Child: {
+                $id: "https://example.com/child",
+                type: "object",
+                properties: { value: { $ref: "#/$defs/X" } }
+              },
+              X: { type: "string" }
+            }
+          })),
+        `Cannot resolve $ref under a nested "$id". Resolve or flatten it first.\n  at ["definitions"]["Child"]["properties"]["value"]["$ref"]`
+      )
+    })
+
     it("rejects a reference below a definition instead of resolving its final token", () => {
       throws(
         () =>
@@ -2527,14 +1236,14 @@ describe("fromJsonSchemaDocument", () => {
               }
             })
           ),
-        `Unsupported reference "#/$defs/outer/properties/inner"\n  at ["schema"]["properties"]["copy"]["$ref"]`
+        `Unsupported $ref "#/$defs/outer/properties/inner". Use "#/$defs/Name".\n  at ["schema"]["properties"]["copy"]["$ref"]`
       )
     })
 
     it("rejects an empty reference", () => {
       throws(
         () => toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({ $ref: "" })),
-        `Unsupported reference ""\n  at ["schema"]["$ref"]`
+        `Unsupported $ref "". Use "#/$defs/Name".\n  at ["schema"]["$ref"]`
       )
     })
 
@@ -2547,51 +1256,66 @@ describe("fromJsonSchemaDocument", () => {
               A: { type: "string" }
             }
           })),
-        `Unsupported reference "https://example.com/schema#/$defs/A"\n  at ["schema"]["$ref"]`
+        `Unsupported $ref "https://example.com/schema#/$defs/A". Use "#/$defs/Name".\n  at ["schema"]["$ref"]`
       )
     })
 
     it("reports the full reference when a direct definition is missing", () => {
       throws(
         () => toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({ $ref: "#/$defs/Missing" })),
-        `Invalid reference "#/$defs/Missing"\n  at ["schema"]["$ref"]`
+        `Missing definition "Missing" for $ref "#/$defs/Missing".\n  at ["schema"]["$ref"]`
       )
     })
 
     it("unescapes a direct definition reference", () => {
-      const schema = toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
-        $ref: "#/$defs/A~1B~0C",
-        $defs: {
-          "A/B~C": { type: "string" }
+      assertFromJsonSchema({
+        schema: {
+          $ref: "#/$defs/A~1B~0C",
+          $defs: {
+            "A/B~C": { type: "string" }
+          }
         }
-      }))
-      const is = Schema.is(schema)
-      assertTrue(is("a"))
-      assertFalse(is(1))
+      }, {
+        codes: makeCode(`A_B_C`, `A_B_C`),
+        references: {
+          nonRecursives: [{
+            $ref: `A_B_C`,
+            code: makeCode(`Schema.String.annotate({ "identifier": "A/B~C" })`, `string`)
+          }]
+        }
+      })
     })
 
     it("decodes a direct definition reference", () => {
-      const schema = toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
-        $ref: "#/$defs/A%20B",
-        $defs: {
-          "A B": { type: "string" }
+      assertFromJsonSchema({
+        schema: {
+          $ref: "#/$defs/A%20B",
+          $defs: {
+            "A B": { type: "string" }
+          }
         }
-      }))
-      const is = Schema.is(schema)
-      assertTrue(is("a"))
-      assertFalse(is(1))
+      }, {
+        codes: makeCode(`A_B`, `A_B`),
+        references: {
+          nonRecursives: [{ $ref: `A_B`, code: makeCode(`Schema.String.annotate({ "identifier": "A B" })`, `string`) }]
+        }
+      })
     })
 
     it("resolves a direct reference to an empty definition key", () => {
-      const schema = toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
-        $ref: "#/$defs/",
-        $defs: {
-          "": { type: "string" }
+      assertFromJsonSchema({
+        schema: {
+          $ref: "#/$defs/",
+          $defs: {
+            "": { type: "string" }
+          }
         }
-      }))
-      const is = Schema.is(schema)
-      assertTrue(is("a"))
-      assertFalse(is(1))
+      }, {
+        codes: makeCode(`_`, `_`),
+        references: {
+          nonRecursives: [{ $ref: `_`, code: makeCode(`Schema.String.annotate({ "identifier": "" })`, `string`) }]
+        }
+      })
     })
 
     it("should create a Reference and a definition", () => {
@@ -2607,18 +1331,9 @@ describe("fromJsonSchemaDocument", () => {
           }
         },
         {
-          "representation": {
-            "_tag": "Reference",
-            "$ref": "A"
-          },
-          "references": {
-            "A": {
-              "_tag": "String",
-              "annotations": {
-                "identifier": "A"
-              },
-              "checks": []
-            }
+          codes: makeCode(`A`, `A`),
+          references: {
+            nonRecursives: [{ $ref: `A`, code: makeCode(`Schema.String.annotate({ "identifier": "A" })`, `string`) }]
           }
         }
       )
@@ -2638,50 +1353,35 @@ describe("fromJsonSchemaDocument", () => {
           }
         },
         {
-          "representation": {
-            "_tag": "Suspend",
-            "annotations": {
-              "description": "a"
-            },
-            "checks": [],
-            "thunk": {
-              "_tag": "Reference",
-              "$ref": "A"
-            }
-          },
-          "references": {
-            "A": {
-              "_tag": "String",
-              "annotations": {
-                "identifier": "A"
-              },
-              "checks": []
-            }
+          codes: makeCode(`Schema.suspend((): Schema.Codec<A> => A).annotate({ "description": "a" })`, `A`),
+          references: {
+            nonRecursives: [{ $ref: `A`, code: makeCode(`Schema.String.annotate({ "identifier": "A" })`, `string`) }]
           }
         }
       )
     })
 
     it("does not combine annotation siblings with a $ref", () => {
-      const schema = toSchemaFromJsonSchemaDocument(
-        JsonSchema.fromSchemaDraft2020_12({
+      assertFromJsonSchema({
+        schema: {
           $ref: "#/$defs/A",
           format: "custom",
           $defs: {
             A: { type: "number" }
           }
-        })
-      )
-      const is = Schema.is(schema)
-      assertTrue(is(1))
-      assertFalse(is("a"))
-
-      const document = SchemaRepresentation.toRepresentation(schema.ast)
-      strictEqual(document.representation._tag, "Suspend")
-      if (document.representation._tag === "Suspend") {
-        deepStrictEqual(document.representation.annotations, { format: "custom" })
-        deepStrictEqual(document.representation.thunk, { _tag: "Reference", $ref: "A" })
-      }
+        }
+      }, {
+        codes: makeCode(`Schema.suspend((): Schema.Codec<A> => A).annotate({ "format": "custom" })`, `A`),
+        references: {
+          nonRecursives: [{
+            $ref: `A`,
+            code: makeCode(
+              `Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number", "identifier": "A" }))`,
+              `number`
+            )
+          }]
+        }
+      })
     })
 
     it("should preserve a $ref refined only by annotations as a stable suspend", () => {
@@ -2700,25 +1400,9 @@ describe("fromJsonSchemaDocument", () => {
           }
         },
         {
-          "representation": {
-            "_tag": "Suspend",
-            "annotations": {
-              "description": "a"
-            },
-            "checks": [],
-            "thunk": {
-              "_tag": "Reference",
-              "$ref": "A"
-            }
-          },
-          "references": {
-            "A": {
-              "_tag": "String",
-              "annotations": {
-                "identifier": "A"
-              },
-              "checks": []
-            }
+          codes: makeCode(`Schema.suspend((): Schema.Codec<A> => A).annotate({ "description": "a" })`, `A`),
+          references: {
+            nonRecursives: [{ $ref: `A`, code: makeCode(`Schema.String.annotate({ "identifier": "A" })`, `string`) }]
           }
         }
       )
@@ -2731,77 +1415,35 @@ describe("fromJsonSchemaDocument", () => {
             $ref: "#/$defs/A",
             $defs: {
               A: {
-                "type": "object",
-                "properties": {
-                  "name": {
-                    "type": "string"
+                type: "object",
+                properties: {
+                  name: {
+                    type: "string"
                   },
-                  "children": {
-                    "type": "array",
-                    "items": {
-                      "$ref": "#/$defs/A"
+                  children: {
+                    type: "array",
+                    items: {
+                      $ref: "#/$defs/A"
                     }
                   }
                 },
-                "required": [
+                required: [
                   "name",
                   "children"
                 ],
-                "additionalProperties": false
+                additionalProperties: false
               }
             }
           }
         },
         {
-          "representation": {
-            "_tag": "Reference",
-            "$ref": "A"
-          },
-          "references": {
-            "A": {
-              "_tag": "Objects",
-              "annotations": {
-                "identifier": "A"
-              },
-              "checks": [],
-              "propertySignatures": [
-                {
-                  "name": {
-                    "type": "string",
-                    "value": "name"
-                  },
-                  "type": {
-                    "_tag": "String",
-                    "checks": []
-                  },
-                  "isOptional": false,
-                  "isMutable": false
-                },
-                {
-                  "name": {
-                    "type": "string",
-                    "value": "children"
-                  },
-                  "type": {
-                    "_tag": "Arrays",
-                    "checks": [],
-                    "elements": [],
-                    "rest": [
-                      {
-                        "_tag": "Suspend",
-                        "checks": [],
-                        "thunk": {
-                          "_tag": "Reference",
-                          "$ref": "A"
-                        }
-                      }
-                    ]
-                  },
-                  "isOptional": false,
-                  "isMutable": false
-                }
-              ],
-              "indexSignatures": []
+          codes: makeCode(`A`, `A`),
+          references: {
+            recursives: {
+              A: makeCode(
+                `Schema.Struct({ "name": Schema.String, "children": Schema.Array(Schema.suspend((): Schema.Codec<A> => A)) }).annotate({ "identifier": "A" })`,
+                `{ readonly "name": string, readonly "children": ReadonlyArray<A> }`
+              )
             }
           }
         }
@@ -2829,34 +1471,13 @@ describe("fromJsonSchemaDocument", () => {
           }
         },
         {
-          representation: {
-            _tag: "Reference",
-            $ref: "Node"
-          },
+          codes: makeCode(`Node`, `Node`),
           references: {
-            Node: {
-              _tag: "Objects",
-              annotations: {
-                identifier: "Node"
-              },
-              checks: [],
-              propertySignatures: [{
-                name: { type: "string", value: "child" },
-                type: {
-                  _tag: "Suspend",
-                  annotations: {
-                    description: "recursive child"
-                  },
-                  checks: [],
-                  thunk: {
-                    _tag: "Reference",
-                    $ref: "Node"
-                  }
-                },
-                isOptional: false,
-                isMutable: false
-              }],
-              indexSignatures: []
+            recursives: {
+              Node: makeCode(
+                `Schema.Struct({ "child": Schema.suspend((): Schema.Codec<Node> => Node).annotate({ "description": "recursive child" }) }).annotate({ "identifier": "Node" })`,
+                `{ readonly "child": Node }`
+              )
             }
           }
         }
@@ -2864,26 +1485,21 @@ describe("fromJsonSchemaDocument", () => {
     })
 
     it("combines assertion siblings with a $ref", () => {
-      const schema = toSchemaFromJsonSchemaDocument(
-        JsonSchema.fromSchemaDraft2020_12({
+      assertFromJsonSchema({
+        schema: {
           $ref: "#/$defs/Name",
           minLength: 2,
           description: "name",
           $defs: {
             Name: { type: "string" }
           }
-        })
-      )
-      const is = Schema.is(schema)
-      assertTrue(is("ab"))
-      assertFalse(is("a"))
-
-      const document = SchemaRepresentation.toRepresentation(schema.ast)
-      strictEqual(document.representation._tag, "String")
-      if (document.representation._tag === "String") {
-        deepStrictEqual(document.representation.annotations, { description: "name" })
-      }
-      deepStrictEqual(document.references, {})
+        }
+      }, {
+        codes: makeCode(
+          `Schema.String.annotate({ "description": "name" }).check(Schema.isMinLength(2).annotate({ "expected": "a value with a length of at least 2" }))`,
+          `string`
+        )
+      })
     })
 
     it("rejects assertion siblings on a recursive $ref", () => {
@@ -2905,22 +1521,23 @@ describe("fromJsonSchemaDocument", () => {
               }
             })
           ),
-        `Unsupported assertion siblings on recursive reference Node\n  at ["definitions"]["Node"]["properties"]["child"]["$ref"]`
+        `Recursive $ref "Node" cannot have sibling constraints.\n  at ["definitions"]["Node"]["properties"]["child"]["$ref"]`
       )
     })
   })
 
   describe("allOf", () => {
     it("prunes disjoint lanes before intersecting unions", () => {
-      const representation = fromJsonSchemaRepresentation(
-        JsonSchema.fromSchemaDraft2020_12({
+      assertFromJsonSchema({
+        schema: {
           allOf: [
             { anyOf: [{ type: "string" }, { type: "number" }] },
             { anyOf: [{ type: "number" }, { type: "boolean" }] }
           ]
-        })
-      ).representation
-      strictEqual(representation._tag, "Number")
+        }
+      }, {
+        codes: makeCode(`Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" }))`, `number`)
+      })
     })
 
     it("rejects intersections requiring a Cartesian product", () => {
@@ -2944,7 +1561,7 @@ describe("fromJsonSchemaDocument", () => {
               ]
             })
           ),
-        `Unsupported intersection of overlapping unions\n  at ["schema"]["allOf"][1]`
+        `Cannot intersect these "anyOf" or "oneOf" alternatives without expanding their branches.\n  at ["schema"]["allOf"][1]`
       )
     })
 
@@ -2969,13 +1586,13 @@ describe("fromJsonSchemaDocument", () => {
               ]
             })
           ),
-        `Unsupported intersection of overlapping unions\n  at ["schema"]["allOf"][1]`
+        `Cannot intersect these "anyOf" or "oneOf" alternatives without expanding their branches.\n  at ["schema"]["allOf"][1]`
       )
     })
 
     it("distributes across a nested reference without choices", () => {
-      const schema = toSchemaFromJsonSchemaDocument(
-        JsonSchema.fromSchemaDraft2020_12({
+      assertFromJsonSchema({
+        schema: {
           allOf: [
             {
               anyOf: [
@@ -2994,13 +1611,19 @@ describe("fromJsonSchemaDocument", () => {
           $defs: {
             Value: { type: "string" }
           }
-        })
-      )
-      const is = Schema.is(schema)
-      assertTrue(is({ a: true, value: "a" }))
-      assertTrue(is({ b: true, value: "b" }))
-      assertFalse(is({ a: true, value: 1 }))
-      assertFalse(is({ value: "a" }))
+        }
+      }, {
+        codes: makeCode(
+          `Schema.Union([Schema.StructWithRest(Schema.Struct({ "a": Schema.Json.annotate({ "expected": "JSON value" }), "value": Value }), [Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" }))]), Schema.StructWithRest(Schema.Struct({ "b": Schema.Json.annotate({ "expected": "JSON value" }), "value": Value }), [Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" }))])])`,
+          `{ readonly "a": Schema.Json, readonly "value": Value } & { readonly [x: string]: Schema.Json } | { readonly "b": Schema.Json, readonly "value": Value } & { readonly [x: string]: Schema.Json }`
+        ),
+        references: {
+          nonRecursives: [{
+            $ref: `Value`,
+            code: makeCode(`Schema.String.annotate({ "identifier": "Value" })`, `string`)
+          }]
+        }
+      })
     })
 
     it("reports unsupported keywords after a false schema", () => {
@@ -3011,19 +1634,22 @@ describe("fromJsonSchemaDocument", () => {
               allOf: [false, { contains: {} }]
             })
           ),
-        `Unsupported JSON Schema keyword "contains"\n  at ["schema"]["allOf"][1]["contains"]`
+        `Cannot import JSON Schema keyword "contains": Effect has no equivalent constraint.\n  at ["schema"]["allOf"][1]["contains"]`
       )
     })
 
     it("intersects one constraint with many alternatives linearly", () => {
-      const representation = fromJsonSchemaRepresentation(
-        JsonSchema.fromSchemaDraft2020_12({
+      assertFromJsonSchema({
+        schema: {
           pattern: "^value-",
           anyOf: Array.from({ length: 16 }, (_, index) => ({ const: `value-${index}` }))
-        })
-      ).representation
-      assertTrue(representation._tag === "Union")
-      strictEqual(representation.types.length, 16)
+        }
+      }, {
+        codes: makeCode(
+          `Schema.Literals(["value-0", "value-1", "value-2", "value-3", "value-4", "value-5", "value-6", "value-7", "value-8", "value-9", "value-10", "value-11", "value-12", "value-13", "value-14", "value-15"])`,
+          `"value-0" | "value-1" | "value-2" | "value-3" | "value-4" | "value-5" | "value-6" | "value-7" | "value-8" | "value-9" | "value-10" | "value-11" | "value-12" | "value-13" | "value-14" | "value-15"`
+        )
+      })
     })
 
     it("resolves a root reference before intersecting allOf", () => {
@@ -3035,46 +1661,10 @@ describe("fromJsonSchemaDocument", () => {
           $defs: { A: definition }
         }
       }, {
-        "representation": {
-          "_tag": "String",
-          "checks": [
-            {
-              "_tag": "Filter",
-              "representation": {
-                "id": "effect/schema/isMinLength",
-                "payload": {
-                  "minLength": 1
-                }
-              },
-              "annotations": {
-                "expected": "a value with a length of at least 1",
-                "~structural": true,
-                "arbitraryConstraint": {
-                  "minLength": 1
-                }
-              },
-              "aborted": false
-            },
-            {
-              "_tag": "Filter",
-              "representation": {
-                "id": "effect/schema/isMaxLength",
-                "payload": {
-                  "maxLength": 2
-                }
-              },
-              "annotations": {
-                "expected": "a value with a length of at most 2",
-                "~structural": true,
-                "arbitraryConstraint": {
-                  "maxLength": 2
-                }
-              },
-              "aborted": false
-            }
-          ]
-        },
-        "references": {}
+        codes: makeCode(
+          `Schema.String.check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1" })).check(Schema.isMaxLength(2).annotate({ "expected": "a value with a length of at most 2" }))`,
+          `string`
+        )
       })
     })
 
@@ -3086,46 +1676,10 @@ describe("fromJsonSchemaDocument", () => {
           $defs: { A: definition }
         }
       }, {
-        "representation": {
-          "_tag": "String",
-          "checks": [
-            {
-              "_tag": "Filter",
-              "representation": {
-                "id": "effect/schema/isMinLength",
-                "payload": {
-                  "minLength": 1
-                }
-              },
-              "annotations": {
-                "expected": "a value with a length of at least 1",
-                "~structural": true,
-                "arbitraryConstraint": {
-                  "minLength": 1
-                }
-              },
-              "aborted": false
-            },
-            {
-              "_tag": "Filter",
-              "representation": {
-                "id": "effect/schema/isMaxLength",
-                "payload": {
-                  "maxLength": 2
-                }
-              },
-              "annotations": {
-                "expected": "a value with a length of at most 2",
-                "~structural": true,
-                "arbitraryConstraint": {
-                  "maxLength": 2
-                }
-              },
-              "aborted": false
-            }
-          ]
-        },
-        "references": {}
+        codes: makeCode(
+          `Schema.String.check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1" })).check(Schema.isMaxLength(2).annotate({ "expected": "a value with a length of at most 2" }))`,
+          `string`
+        )
       })
     })
 
@@ -3138,29 +1692,10 @@ describe("fromJsonSchemaDocument", () => {
           }
         },
         {
-          "representation": {
-            "_tag": "Arrays",
-            "annotations": {
-              "description": "a"
-            },
-            "checks": [],
-            "elements": [],
-            "rest": [
-              {
-                "_tag": "Declaration",
-                "representation": {
-                  "id": "effect/schema/Json",
-                  "payload": null
-                },
-                "annotations": {
-                  "expected": "JSON value"
-                },
-                "typeParameters": [],
-                "checks": []
-              }
-            ]
-          },
-          "references": {}
+          codes: makeCode(
+            `Schema.Array(Schema.Json.annotate({ "expected": "JSON value" })).annotate({ "description": "a" })`,
+            `ReadonlyArray<Schema.Json>`
+          )
         }
       )
     })
@@ -3175,27 +1710,10 @@ describe("fromJsonSchemaDocument", () => {
           }
         },
         {
-          "representation": {
-            "_tag": "Objects",
-            "annotations": {
-              "description": "a"
-            },
-            "checks": [],
-            "propertySignatures": [],
-            "indexSignatures": [
-              {
-                "parameter": {
-                  "_tag": "String",
-                  "checks": []
-                },
-                "type": {
-                  "_tag": "Never",
-                  "checks": []
-                }
-              }
-            ]
-          },
-          "references": {}
+          codes: makeCode(
+            `Schema.Record(Schema.String, Schema.Never).annotate({ "description": "a" })`,
+            `{ readonly [x: string]: never }`
+          )
         }
       )
     })
@@ -3208,13 +1726,7 @@ describe("fromJsonSchemaDocument", () => {
             allOf: [{ anyOf: [{ type: "number" }, { type: "boolean" }] }]
           }
         },
-        {
-          "representation": {
-            "_tag": "Never",
-            "checks": []
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Never`, `never`) }
       )
     })
 
@@ -3225,15 +1737,13 @@ describe("fromJsonSchemaDocument", () => {
     ) {
       for (const literal of [valid, invalid]) {
         for (const allOf of [[refinement, { const: literal }], [{ const: literal }, refinement]]) {
-          const schema = toSchemaFromJsonSchemaDocument(
-            JsonSchema.fromSchemaDraft2020_12({ allOf })
+          const value = JSON.stringify(literal)
+          assertFromJsonSchema(
+            { schema: { allOf } },
+            {
+              codes: literal === valid ? makeCode(`Schema.Literal(${value})`, value) : makeCode(`Schema.Never`, `never`)
+            }
           )
-          const is = Schema.is(schema)
-          if (literal === valid) {
-            assertTrue(is(literal))
-          } else {
-            assertFalse(is(literal))
-          }
         }
       }
     }
@@ -3298,34 +1808,14 @@ describe("fromJsonSchemaDocument", () => {
       it("filters enum members when the refinement precedes the enum", () => {
         assertFromJsonSchema(
           { schema: { type: "string", minLength: 2, allOf: [{ enum: ["a", "ab"] }] } },
-          {
-            "representation": {
-              "_tag": "Literal",
-              "checks": [],
-              "literal": {
-                "type": "string",
-                "value": "ab"
-              }
-            },
-            "references": {}
-          }
+          { codes: makeCode(`Schema.Literal("ab")`, `"ab"`) }
         )
       })
 
       it("filters enum members when the enum precedes the refinement", () => {
         assertFromJsonSchema(
           { schema: { enum: ["a", "ab"], allOf: [{ type: "string", minLength: 2 }] } },
-          {
-            "representation": {
-              "_tag": "Literal",
-              "checks": [],
-              "literal": {
-                "type": "string",
-                "value": "ab"
-              }
-            },
-            "references": {}
-          }
+          { codes: makeCode(`Schema.Literal("ab")`, `"ab"`) }
         )
       })
     })
@@ -3339,13 +1829,7 @@ describe("fromJsonSchemaDocument", () => {
             ]
           }
         },
-        {
-          "representation": {
-            "_tag": "String",
-            "checks": []
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.String`, `string`) }
       )
     })
 
@@ -3361,29 +1845,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "String",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMinLength",
-                    "payload": {
-                      "minLength": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at least 1",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "minLength": 1
-                    }
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.String.check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1" }))`,
+              `string`
+            )
           }
         )
       })
@@ -3399,30 +1864,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "String",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMinLength",
-                    "payload": {
-                      "minLength": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at least 1",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "minLength": 1
-                    },
-                    "description": "b"
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.String.check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1", "description": "b" }))`,
+              `string`
+            )
           }
         )
       })
@@ -3439,32 +1884,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "String",
-              "annotations": {
-                "description": "a"
-              },
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMinLength",
-                    "payload": {
-                      "minLength": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at least 1",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "minLength": 1
-                    }
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.String.annotate({ "description": "a" }).check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1" }))`,
+              `string`
+            )
           }
         )
       })
@@ -3480,16 +1903,7 @@ describe("fromJsonSchemaDocument", () => {
               ]
             }
           },
-          {
-            "representation": {
-              "_tag": "String",
-              "annotations": {
-                "description": "b"
-              },
-              "checks": []
-            },
-            "references": {}
-          }
+          { codes: makeCode(`Schema.String.annotate({ "description": "b" })`, `string`) }
         )
       })
 
@@ -3505,33 +1919,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "String",
-              "annotations": {
-                "description": "a"
-              },
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMinLength",
-                    "payload": {
-                      "minLength": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at least 1",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "minLength": 1
-                    },
-                    "description": "b"
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.String.annotate({ "description": "a" }).check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1", "description": "b" }))`,
+              `string`
+            )
           }
         )
       })
@@ -3548,46 +1939,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "String",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMaxLength",
-                    "payload": {
-                      "maxLength": 2
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at most 2",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "maxLength": 2
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMinLength",
-                    "payload": {
-                      "minLength": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at least 1",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "minLength": 1
-                    }
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.String.check(Schema.isMaxLength(2).annotate({ "expected": "a value with a length of at most 2" })).check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1" }))`,
+              `string`
+            )
           }
         )
       })
@@ -3605,110 +1960,31 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "String",
-              "annotations": {
-                "description": "a"
-              },
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMaxLength",
-                    "payload": {
-                      "maxLength": 2
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at most 2",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "maxLength": 2
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMinLength",
-                    "payload": {
-                      "minLength": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at least 1",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "minLength": 1
-                    }
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.String.annotate({ "description": "a" }).check(Schema.isMaxLength(2).annotate({ "expected": "a value with a length of at most 2" })).check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1" }))`,
+              `string`
+            )
           }
         )
       })
 
-      it("description + maxLength & minLength + description", () => {
-        assertFromJsonSchema(
-          {
-            schema: {
-              type: "string",
-              description: "a",
-              maxLength: 2,
-              allOf: [
-                { minLength: 1, description: "b" }
-              ]
-            }
-          },
-          {
-            "representation": {
-              "_tag": "String",
-              "annotations": {
-                "description": "a"
-              },
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMaxLength",
-                    "payload": {
-                      "maxLength": 2
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at most 2",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "maxLength": 2
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMinLength",
-                    "payload": {
-                      "minLength": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at least 1",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "minLength": 1
-                    },
-                    "description": "b"
-                  },
-                  "aborted": false
-                }
+      it("description + maxLength & minLength + description", () => {
+        assertFromJsonSchema(
+          {
+            schema: {
+              type: "string",
+              description: "a",
+              maxLength: 2,
+              allOf: [
+                { minLength: 1, description: "b" }
               ]
-            },
-            "references": {}
+            }
+          },
+          {
+            codes: makeCode(
+              `Schema.String.annotate({ "description": "a" }).check(Schema.isMaxLength(2).annotate({ "expected": "a value with a length of at most 2" })).check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1", "description": "b" }))`,
+              `string`
+            )
           }
         )
       })
@@ -3724,46 +2000,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "String",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMinLength",
-                    "payload": {
-                      "minLength": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at least 1",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "minLength": 1
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMaxLength",
-                    "payload": {
-                      "maxLength": 2
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at most 2",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "maxLength": 2
-                    }
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.String.check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1" })).check(Schema.isMaxLength(2).annotate({ "expected": "a value with a length of at most 2" }))`,
+              `string`
+            )
           }
         )
       })
@@ -3779,54 +2019,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "String",
-              "checks": [
-                {
-                  "_tag": "FilterGroup",
-                  "annotations": {
-                    "description": "b"
-                  },
-                  "checks": [
-                    {
-                      "_tag": "Filter",
-                      "representation": {
-                        "id": "effect/schema/isMinLength",
-                        "payload": {
-                          "minLength": 1
-                        }
-                      },
-                      "annotations": {
-                        "expected": "a value with a length of at least 1",
-                        "~structural": true,
-                        "arbitraryConstraint": {
-                          "minLength": 1
-                        }
-                      },
-                      "aborted": false
-                    },
-                    {
-                      "_tag": "Filter",
-                      "representation": {
-                        "id": "effect/schema/isMaxLength",
-                        "payload": {
-                          "maxLength": 2
-                        }
-                      },
-                      "annotations": {
-                        "expected": "a value with a length of at most 2",
-                        "~structural": true,
-                        "arbitraryConstraint": {
-                          "maxLength": 2
-                        }
-                      },
-                      "aborted": false
-                    }
-                  ]
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.String.check(Schema.makeFilterGroup([Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1" }), Schema.isMaxLength(2).annotate({ "expected": "a value with a length of at most 2" })]).annotate({ "description": "b" }))`,
+              `string`
+            )
           }
         )
       })
@@ -3842,47 +2038,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "String",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMinLength",
-                    "payload": {
-                      "minLength": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at least 1",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "minLength": 1
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMaxLength",
-                    "payload": {
-                      "maxLength": 2
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at most 2",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "maxLength": 2
-                    },
-                    "description": "c"
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.String.check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1" })).check(Schema.isMaxLength(2).annotate({ "expected": "a value with a length of at most 2", "description": "c" }))`,
+              `string`
+            )
           }
         )
       })
@@ -3898,55 +2057,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "String",
-              "checks": [
-                {
-                  "_tag": "FilterGroup",
-                  "annotations": {
-                    "description": "b"
-                  },
-                  "checks": [
-                    {
-                      "_tag": "Filter",
-                      "representation": {
-                        "id": "effect/schema/isMinLength",
-                        "payload": {
-                          "minLength": 1
-                        }
-                      },
-                      "annotations": {
-                        "expected": "a value with a length of at least 1",
-                        "~structural": true,
-                        "arbitraryConstraint": {
-                          "minLength": 1
-                        }
-                      },
-                      "aborted": false
-                    },
-                    {
-                      "_tag": "Filter",
-                      "representation": {
-                        "id": "effect/schema/isMaxLength",
-                        "payload": {
-                          "maxLength": 2
-                        }
-                      },
-                      "annotations": {
-                        "expected": "a value with a length of at most 2",
-                        "~structural": true,
-                        "arbitraryConstraint": {
-                          "maxLength": 2
-                        },
-                        "description": "c"
-                      },
-                      "aborted": false
-                    }
-                  ]
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.String.check(Schema.makeFilterGroup([Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1" }), Schema.isMaxLength(2).annotate({ "expected": "a value with a length of at most 2", "description": "c" })]).annotate({ "description": "b" }))`,
+              `string`
+            )
           }
         )
       })
@@ -3961,17 +2075,7 @@ describe("fromJsonSchemaDocument", () => {
               ]
             }
           },
-          {
-            "representation": {
-              "_tag": "Literal",
-              "checks": [],
-              "literal": {
-                "type": "string",
-                "value": "a"
-              }
-            },
-            "references": {}
-          }
+          { codes: makeCode(`Schema.Literal("a")`, `"a"`) }
         )
         assertFromJsonSchema(
           {
@@ -3983,20 +2087,7 @@ describe("fromJsonSchemaDocument", () => {
               ]
             }
           },
-          {
-            "representation": {
-              "_tag": "Literal",
-              "annotations": {
-                "description": "b"
-              },
-              "checks": [],
-              "literal": {
-                "type": "string",
-                "value": "a"
-              }
-            },
-            "references": {}
-          }
+          { codes: makeCode(`Schema.Literal("a").annotate({ "description": "b" })`, `"a"`) }
         )
       })
 
@@ -4010,32 +2101,7 @@ describe("fromJsonSchemaDocument", () => {
               ]
             }
           },
-          {
-            "representation": {
-              "_tag": "Union",
-              "checks": [],
-              "types": [
-                {
-                  "_tag": "Literal",
-                  "checks": [],
-                  "literal": {
-                    "type": "string",
-                    "value": "a"
-                  }
-                },
-                {
-                  "_tag": "Literal",
-                  "checks": [],
-                  "literal": {
-                    "type": "string",
-                    "value": "b"
-                  }
-                }
-              ],
-              "mode": "anyOf"
-            },
-            "references": {}
-          }
+          { codes: makeCode(`Schema.Literals(["a", "b"])`, `"a" | "b"`) }
         )
       })
 
@@ -4049,17 +2115,7 @@ describe("fromJsonSchemaDocument", () => {
               ]
             }
           },
-          {
-            "representation": {
-              "_tag": "Literal",
-              "checks": [],
-              "literal": {
-                "type": "string",
-                "value": "a"
-              }
-            },
-            "references": {}
-          }
+          { codes: makeCode(`Schema.Literal("a")`, `"a"`) }
         )
       })
     })
@@ -4074,29 +2130,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "Number",
-              "annotations": {
-                "description": "b"
-              },
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isFinite",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "a finite number",
-                    "arbitraryConstraint": {
-                      "number": "finite"
-                    }
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Number.annotate({ "description": "b" }).check(Schema.isFinite().annotate({ "expected": "a finite number" }))`,
+              `number`
+            )
           }
         )
       })
@@ -4112,40 +2149,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "Number",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isFinite",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "a finite number",
-                    "arbitraryConstraint": {
-                      "number": "finite"
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isInt",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "an integer",
-                    "arbitraryConstraint": {
-                      "number": "integer"
-                    }
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" })).check(Schema.isInt().annotate({ "expected": "an integer" }))`,
+              `number`
+            )
           }
         )
       })
@@ -4162,66 +2169,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "Number",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isFinite",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "a finite number",
-                    "arbitraryConstraint": {
-                      "number": "finite"
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isInt",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "an integer",
-                    "arbitraryConstraint": {
-                      "number": "integer"
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isGreaterThanOrEqualTo",
-                    "payload": {
-                      "minimum": 2
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value greater than or equal to 2"
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isLessThanOrEqualTo",
-                    "payload": {
-                      "maximum": 2
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value less than or equal to 2"
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" })).check(Schema.isInt().annotate({ "expected": "an integer" })).check(Schema.isGreaterThanOrEqualTo(2).annotate({ "expected": "a value greater than or equal to 2" })).check(Schema.isLessThanOrEqualTo(2).annotate({ "expected": "a value less than or equal to 2" }))`,
+              `number`
+            )
           }
         )
       })
@@ -4237,40 +2188,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "Number",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isInt",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "an integer",
-                    "arbitraryConstraint": {
-                      "number": "integer"
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isFinite",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "a finite number",
-                    "arbitraryConstraint": {
-                      "number": "finite"
-                    }
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Number.check(Schema.isInt().annotate({ "expected": "an integer" })).check(Schema.isFinite().annotate({ "expected": "a finite number" }))`,
+              `number`
+            )
           }
         )
       })
@@ -4286,61 +2207,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "Number",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isFinite",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "a finite number",
-                    "arbitraryConstraint": {
-                      "number": "finite"
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "FilterGroup",
-                  "annotations": {
-                    "description": "b"
-                  },
-                  "checks": [
-                    {
-                      "_tag": "Filter",
-                      "representation": {
-                        "id": "effect/schema/isGreaterThanOrEqualTo",
-                        "payload": {
-                          "minimum": 1
-                        }
-                      },
-                      "annotations": {
-                        "expected": "a value greater than or equal to 1"
-                      },
-                      "aborted": false
-                    },
-                    {
-                      "_tag": "Filter",
-                      "representation": {
-                        "id": "effect/schema/isLessThanOrEqualTo",
-                        "payload": {
-                          "maximum": 2
-                        }
-                      },
-                      "annotations": {
-                        "expected": "a value less than or equal to 2",
-                        "description": "c"
-                      },
-                      "aborted": false
-                    }
-                  ]
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" })).check(Schema.makeFilterGroup([Schema.isGreaterThanOrEqualTo(1).annotate({ "expected": "a value greater than or equal to 1" }), Schema.isLessThanOrEqualTo(2).annotate({ "expected": "a value less than or equal to 2", "description": "c" })]).annotate({ "description": "b" }))`,
+              `number`
+            )
           }
         )
       })
@@ -4357,74 +2227,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "Number",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isFinite",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "a finite number",
-                    "arbitraryConstraint": {
-                      "number": "finite"
-                    }
-                  },
-                  "aborted": false
-                },
-                {
-                  "_tag": "FilterGroup",
-                  "annotations": {
-                    "description": "range"
-                  },
-                  "checks": [
-                    {
-                      "_tag": "Filter",
-                      "representation": {
-                        "id": "effect/schema/isGreaterThanOrEqualTo",
-                        "payload": {
-                          "minimum": 1
-                        }
-                      },
-                      "annotations": {
-                        "expected": "a value greater than or equal to 1"
-                      },
-                      "aborted": false
-                    },
-                    {
-                      "_tag": "Filter",
-                      "representation": {
-                        "id": "effect/schema/isLessThanOrEqualTo",
-                        "payload": {
-                          "maximum": 2
-                        }
-                      },
-                      "annotations": {
-                        "expected": "a value less than or equal to 2"
-                      },
-                      "aborted": false
-                    }
-                  ]
-                },
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isInt",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "an integer",
-                    "arbitraryConstraint": {
-                      "number": "integer"
-                    }
-                  },
-                  "aborted": false
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" })).check(Schema.makeFilterGroup([Schema.isGreaterThanOrEqualTo(1).annotate({ "expected": "a value greater than or equal to 1" }), Schema.isLessThanOrEqualTo(2).annotate({ "expected": "a value less than or equal to 2" })]).annotate({ "description": "range" })).check(Schema.isInt().annotate({ "expected": "an integer" }))`,
+              `number`
+            )
           }
         )
       })
@@ -4439,17 +2245,7 @@ describe("fromJsonSchemaDocument", () => {
               ]
             }
           },
-          {
-            "representation": {
-              "_tag": "Literal",
-              "checks": [],
-              "literal": {
-                "type": "number",
-                "value": 1
-              }
-            },
-            "references": {}
-          }
+          { codes: makeCode(`Schema.Literal(1)`, `1`) }
         )
         assertFromJsonSchema(
           {
@@ -4461,20 +2257,7 @@ describe("fromJsonSchemaDocument", () => {
               ]
             }
           },
-          {
-            "representation": {
-              "_tag": "Literal",
-              "annotations": {
-                "description": "b"
-              },
-              "checks": [],
-              "literal": {
-                "type": "number",
-                "value": 1
-              }
-            },
-            "references": {}
-          }
+          { codes: makeCode(`Schema.Literal(1).annotate({ "description": "b" })`, `1`) }
         )
       })
 
@@ -4488,32 +2271,7 @@ describe("fromJsonSchemaDocument", () => {
               ]
             }
           },
-          {
-            "representation": {
-              "_tag": "Union",
-              "checks": [],
-              "types": [
-                {
-                  "_tag": "Literal",
-                  "checks": [],
-                  "literal": {
-                    "type": "number",
-                    "value": 1
-                  }
-                },
-                {
-                  "_tag": "Literal",
-                  "checks": [],
-                  "literal": {
-                    "type": "number",
-                    "value": 2
-                  }
-                }
-              ],
-              "mode": "anyOf"
-            },
-            "references": {}
-          }
+          { codes: makeCode(`Schema.Literals([1, 2])`, `1 | 2`) }
         )
       })
     })
@@ -4527,13 +2285,7 @@ describe("fromJsonSchemaDocument", () => {
               allOf: [{ type: "boolean" }]
             }
           },
-          {
-            "representation": {
-              "_tag": "Boolean",
-              "checks": []
-            },
-            "references": {}
-          }
+          { codes: makeCode(`Schema.Boolean`, `boolean`) }
         )
       })
 
@@ -4545,13 +2297,7 @@ describe("fromJsonSchemaDocument", () => {
               allOf: [{ const: 1 }]
             }
           },
-          {
-            "representation": {
-              "_tag": "Never",
-              "checks": []
-            },
-            "references": {}
-          }
+          { codes: makeCode(`Schema.Never`, `never`) }
         )
       })
 
@@ -4565,17 +2311,7 @@ describe("fromJsonSchemaDocument", () => {
               ]
             }
           },
-          {
-            "representation": {
-              "_tag": "Literal",
-              "checks": [],
-              "literal": {
-                "type": "boolean",
-                "value": true
-              }
-            },
-            "references": {}
-          }
+          { codes: makeCode(`Schema.Literal(true)`, `true`) }
         )
         assertFromJsonSchema(
           {
@@ -4587,20 +2323,7 @@ describe("fromJsonSchemaDocument", () => {
               ]
             }
           },
-          {
-            "representation": {
-              "_tag": "Literal",
-              "annotations": {
-                "description": "b"
-              },
-              "checks": [],
-              "literal": {
-                "type": "boolean",
-                "value": true
-              }
-            },
-            "references": {}
-          }
+          { codes: makeCode(`Schema.Literal(true).annotate({ "description": "b" })`, `true`) }
         )
       })
     })
@@ -4609,22 +2332,13 @@ describe("fromJsonSchemaDocument", () => {
       function assertArrayAllOf(
         a: JsonSchema.JsonSchema,
         b: JsonSchema.JsonSchema,
-        expected: Parameters<typeof assertFromJsonSchema>[1],
-        valid: ReadonlyArray<unknown>,
-        invalid: ReadonlyArray<unknown>
+        expected: Expected
       ) {
         for (const [schema, member] of [[a, b], [b, a]]) {
-          const document = assertFromJsonSchema(
+          assertFromJsonSchema(
             { schema: { ...schema, allOf: [member] } },
             expected
           )
-          const is = Schema.is(document)
-          for (const value of valid) {
-            assertTrue(is(value))
-          }
-          for (const value of invalid) {
-            assertFalse(is(value))
-          }
         }
       }
 
@@ -4640,38 +2354,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "Arrays",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isUnique",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "an array with unique items"
-                  },
-                  "aborted": false
-                }
-              ],
-              "elements": [],
-              "rest": [
-                {
-                  "_tag": "Declaration",
-                  "representation": {
-                    "id": "effect/schema/Json",
-                    "payload": null
-                  },
-                  "annotations": {
-                    "expected": "JSON value"
-                  },
-                  "typeParameters": [],
-                  "checks": []
-                }
-              ]
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Array(Schema.Json.annotate({ "expected": "JSON value" })).check(Schema.isUnique().annotate({ "expected": "an array with unique items" }))`,
+              `ReadonlyArray<Schema.Json>`
+            )
           }
         )
       })
@@ -4691,40 +2377,11 @@ describe("fromJsonSchemaDocument", () => {
             items: { type: "string" }
           },
           {
-            "representation": {
-              "_tag": "Arrays",
-              "checks": [],
-              "elements": [
-                {
-                  "isOptional": false,
-                  "type": {
-                    "_tag": "String",
-                    "checks": []
-                  }
-                },
-                {
-                  "isOptional": false,
-                  "type": {
-                    "_tag": "Literal",
-                    "checks": [],
-                    "literal": {
-                      "type": "string",
-                      "value": "tail"
-                    }
-                  }
-                }
-              ],
-              "rest": [
-                {
-                  "_tag": "String",
-                  "checks": []
-                }
-              ]
-            },
-            "references": {}
-          },
-          [["head", "tail"], ["head", "tail", "more"]],
-          [["head"], ["head", "other"], ["head", "tail", 1]]
+            codes: makeCode(
+              `Schema.TupleWithRest(Schema.Tuple([Schema.String, Schema.Literal("tail")]), [Schema.String])`,
+              `readonly [string, "tail", ...Array<string>]`
+            )
+          }
         )
       })
 
@@ -4742,25 +2399,7 @@ describe("fromJsonSchemaDocument", () => {
             minItems: 1,
             maxItems: 2
           },
-          {
-            "representation": {
-              "_tag": "Arrays",
-              "checks": [],
-              "elements": [
-                {
-                  "isOptional": false,
-                  "type": {
-                    "_tag": "String",
-                    "checks": []
-                  }
-                }
-              ],
-              "rest": []
-            },
-            "references": {}
-          },
-          [["head"]],
-          [[], ["head", 1]]
+          { codes: makeCode(`Schema.Tuple([Schema.String])`, `readonly [string]`) }
         )
       })
 
@@ -4778,15 +2417,7 @@ describe("fromJsonSchemaDocument", () => {
             minItems: 2,
             maxItems: 2
           },
-          {
-            "representation": {
-              "_tag": "Never",
-              "checks": []
-            },
-            "references": {}
-          },
-          [],
-          [[], ["head"], ["head", 1]]
+          { codes: makeCode(`Schema.Never`, `never`) }
         )
       })
 
@@ -4804,25 +2435,7 @@ describe("fromJsonSchemaDocument", () => {
             minItems: 1,
             maxItems: 1
           },
-          {
-            "representation": {
-              "_tag": "Arrays",
-              "checks": [],
-              "elements": [
-                {
-                  "isOptional": false,
-                  "type": {
-                    "_tag": "String",
-                    "checks": []
-                  }
-                }
-              ],
-              "rest": []
-            },
-            "references": {}
-          },
-          [["head"]],
-          [[], ["head", 1]]
+          { codes: makeCode(`Schema.Tuple([Schema.String])`, `readonly [string]`) }
         )
       })
 
@@ -4840,25 +2453,7 @@ describe("fromJsonSchemaDocument", () => {
             minItems: 1,
             items: { type: "number" }
           },
-          {
-            "representation": {
-              "_tag": "Arrays",
-              "checks": [],
-              "elements": [
-                {
-                  "isOptional": false,
-                  "type": {
-                    "_tag": "String",
-                    "checks": []
-                  }
-                }
-              ],
-              "rest": []
-            },
-            "references": {}
-          },
-          [["head"]],
-          [[], ["head", "tail"], ["head", 1]]
+          { codes: makeCode(`Schema.Tuple([Schema.String])`, `readonly [string]`) }
         )
       })
 
@@ -4875,15 +2470,7 @@ describe("fromJsonSchemaDocument", () => {
             minItems: 1,
             maxItems: 1
           },
-          {
-            "representation": {
-              "_tag": "Never",
-              "checks": []
-            },
-            "references": {}
-          },
-          [],
-          [[], [0]]
+          { codes: makeCode(`Schema.Never`, `never`) }
         )
       })
 
@@ -4898,17 +2485,7 @@ describe("fromJsonSchemaDocument", () => {
             prefixItems: [{ type: "number", minimum: 1 }],
             maxItems: 1
           },
-          {
-            "representation": {
-              "_tag": "Arrays",
-              "checks": [],
-              "elements": [],
-              "rest": []
-            },
-            "references": {}
-          },
-          [[]],
-          [[0]]
+          { codes: makeCode(`Schema.Tuple([])`, `readonly []`) }
         )
       })
 
@@ -4926,46 +2503,11 @@ describe("fromJsonSchemaDocument", () => {
             maxItems: 1
           },
           {
-            "representation": {
-              "_tag": "Arrays",
-              "checks": [
-                {
-                  "_tag": "Filter",
-                  "representation": {
-                    "id": "effect/schema/isMinLength",
-                    "payload": {
-                      "minLength": 1
-                    }
-                  },
-                  "annotations": {
-                    "expected": "a value with a length of at least 1",
-                    "~structural": true,
-                    "arbitraryConstraint": {
-                      "minLength": 1
-                    }
-                  },
-                  "aborted": false
-                }
-              ],
-              "elements": [
-                {
-                  "isOptional": false,
-                  "type": {
-                    "_tag": "Literal",
-                    "checks": [],
-                    "literal": {
-                      "type": "number",
-                      "value": 2
-                    }
-                  }
-                }
-              ],
-              "rest": []
-            },
-            "references": {}
-          },
-          [[2]],
-          [[], [0]]
+            codes: makeCode(
+              `Schema.Tuple([Schema.Literal(2)]).check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1" }))`,
+              `readonly [2]`
+            )
+          }
         )
       })
     })
@@ -4973,129 +2515,63 @@ describe("fromJsonSchemaDocument", () => {
     it("short-circuits false intersections to Never", () => {
       assertFromJsonSchema(
         { schema: { allOf: [false, { type: "string" }] } },
-        {
-          "representation": {
-            "_tag": "Never",
-            "checks": []
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Never`, `never`) }
       )
     })
 
     it("returns Never when intersecting array and string", () => {
       assertFromJsonSchema(
         { schema: { allOf: [{ type: "array" }, { type: "string" }] } },
-        {
-          "representation": {
-            "_tag": "Never",
-            "checks": []
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Never`, `never`) }
       )
     })
 
     it("returns Never when intersecting object and string", () => {
       assertFromJsonSchema(
         { schema: { allOf: [{ type: "object" }, { type: "string" }] } },
-        {
-          "representation": {
-            "_tag": "Never",
-            "checks": []
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Never`, `never`) }
       )
     })
 
     it("returns Never when intersecting null and string", () => {
       assertFromJsonSchema(
         { schema: { allOf: [{ type: "null" }, { type: "string" }] } },
-        {
-          "representation": {
-            "_tag": "Never",
-            "checks": []
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Never`, `never`) }
       )
     })
 
     it("returns Never when intersecting distinct literals", () => {
       assertFromJsonSchema(
         { schema: { allOf: [{ const: 1 }, { const: 2 }] } },
-        {
-          "representation": {
-            "_tag": "Never",
-            "checks": []
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Never`, `never`) }
       )
     })
 
     it("preserves null when intersecting null types", () => {
       assertFromJsonSchema(
         { schema: { allOf: [{ type: "null" }, { type: "null" }] } },
-        {
-          "representation": {
-            "_tag": "Null",
-            "checks": []
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Null`, `null`) }
       )
     })
 
     it("preserves a literal when intersecting identical literals", () => {
       assertFromJsonSchema(
         { schema: { allOf: [{ const: 1 }, { const: 1 }] } },
-        {
-          "representation": {
-            "_tag": "Literal",
-            "checks": [],
-            "literal": {
-              "type": "number",
-              "value": 1
-            }
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Literal(1)`, `1`) }
       )
     })
 
     it("preserves a matching literal after a boolean type", () => {
       assertFromJsonSchema(
         { schema: { allOf: [{ type: "boolean" }, { const: true }] } },
-        {
-          "representation": {
-            "_tag": "Literal",
-            "checks": [],
-            "literal": {
-              "type": "boolean",
-              "value": true
-            }
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Literal(true)`, `true`) }
       )
     })
 
     it("preserves a matching literal before a boolean type", () => {
       assertFromJsonSchema(
         { schema: { allOf: [{ const: true }, { type: "boolean" }] } },
-        {
-          "representation": {
-            "_tag": "Literal",
-            "checks": [],
-            "literal": {
-              "type": "boolean",
-              "value": true
-            }
-          },
-          "references": {}
-        }
+        { codes: makeCode(`Schema.Literal(true)`, `true`) }
       )
     })
 
@@ -5110,102 +2586,81 @@ describe("fromJsonSchemaDocument", () => {
           }
         },
         {
-          "representation": {
-            "_tag": "String",
-            "checks": [
-              {
-                "_tag": "Filter",
-                "representation": {
-                  "id": "effect/schema/isMinLength",
-                  "payload": {
-                    "minLength": 1
-                  }
-                },
-                "annotations": {
-                  "expected": "a value with a length of at least 1",
-                  "~structural": true,
-                  "arbitraryConstraint": {
-                    "minLength": 1
-                  }
-                },
-                "aborted": false
-              }
-            ]
-          },
-          "references": {}
+          codes: makeCode(
+            `Schema.String.check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1" }))`,
+            `string`
+          )
         }
       )
     })
 
     it("preserves annotations on a reference inside allOf", () => {
       const definition: JsonSchema.JsonSchema = { type: "string", minLength: 1 }
-      const document = fromJsonSchemaRepresentation(
-        JsonSchema.fromSchemaDraft2020_12({
+
+      assertFromJsonSchema({
+        schema: {
           type: "string",
           allOf: [{ $ref: "#/$defs/A", description: "annotated" }],
           $defs: { A: definition }
-        })
-      )
-      strictEqual(document.representation._tag, "String")
-      if (document.representation._tag === "String") {
-        strictEqual(document.representation.annotations?.description, "annotated")
-      }
+        }
+      }, {
+        codes: makeCode(
+          `Schema.String.annotate({ "description": "annotated" }).check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1" }))`,
+          `string`
+        )
+      })
     })
 
     it("preserves annotations on a root reference intersected with allOf", () => {
       const definition: JsonSchema.JsonSchema = { type: "string", minLength: 1 }
-      const document = fromJsonSchemaRepresentation(
-        JsonSchema.fromSchemaDraft2020_12({
+
+      assertFromJsonSchema({
+        schema: {
           $ref: "#/$defs/A",
           description: "annotated",
           allOf: [{ type: "string" }],
           $defs: { A: definition }
-        })
-      )
-      strictEqual(document.representation._tag, "String")
-      if (document.representation._tag === "String") {
-        strictEqual(document.representation.annotations?.description, "annotated")
-      }
+        }
+      }, {
+        codes: makeCode(
+          `Schema.String.annotate({ "description": "annotated" }).check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1" }))`,
+          `string`
+        )
+      })
     })
 
     it("preserves annotations through reference aliases", () => {
-      const aliases = fromJsonSchemaRepresentation(
-        JsonSchema.fromSchemaDraft2020_12({
+      assertFromJsonSchema({
+        schema: {
           type: "string",
           allOf: [{ $ref: "#/$defs/A" }],
           $defs: {
             A: { $ref: "#/$defs/B", description: "alias" },
             B: { type: "string" }
           }
-        })
-      )
-      strictEqual(aliases.representation._tag, "String")
-      if (aliases.representation._tag === "String") {
-        strictEqual(aliases.representation.annotations?.description, "alias")
-      }
+        }
+      }, { codes: makeCode(`Schema.String.annotate({ "description": "alias" })`, `string`) })
     })
 
     it("merges annotations on string intersections", () => {
-      const string = fromJsonSchemaRepresentation(
-        JsonSchema.fromSchemaDraft2020_12({
+      assertFromJsonSchema({
+        schema: {
           allOf: [
             { type: "string", contentMediaType: "application/json" },
             { type: "string", contentSchema: { type: "number" } }
           ]
-        })
-      )
-      strictEqual(string.representation._tag, "String")
-      if (string.representation._tag === "String") {
-        deepStrictEqual(string.representation.annotations, {
-          contentMediaType: "application/json",
-          contentSchema: { type: "number" }
-        })
-      }
+        }
+      }, {
+        codes: makeCode(
+          `Schema.String.annotate({ "contentMediaType": "application/json", "contentSchema": { "type": "number" } })`,
+          `string`
+        )
+      })
     })
 
     it("merges constraints on overlapping required properties", () => {
-      const object = toSchemaFromJsonSchemaDocument(
-        JsonSchema.fromSchemaDraft2020_12({
+      assertFromJsonSchema({
+        schema: {
           type: "object",
           additionalProperties: false,
           properties: { a: { type: "string" } },
@@ -5216,16 +2671,18 @@ describe("fromJsonSchemaDocument", () => {
             properties: { a: { type: "string", minLength: 2 } },
             required: ["a"]
           }]
-        })
-      )
-      const isObject = Schema.is(object)
-      assertTrue(isObject({ a: "ab" }))
-      assertFalse(isObject({ a: "a" }))
+        }
+      }, {
+        codes: makeCode(
+          `Schema.Struct({ "a": Schema.String.check(Schema.isMinLength(2).annotate({ "expected": "a value with a length of at least 2" })) })`,
+          `{ readonly "a": string }`
+        )
+      })
     })
 
     it("preserves optional properties when intersecting object fields", () => {
-      const optionalObject = fromJsonSchemaRepresentation(
-        JsonSchema.fromSchemaDraft2020_12({
+      assertFromJsonSchema({
+        schema: {
           type: "object",
           additionalProperties: false,
           properties: { a: { type: "string" } },
@@ -5234,12 +2691,13 @@ describe("fromJsonSchemaDocument", () => {
             additionalProperties: false,
             properties: { a: { minLength: 1 } }
           }]
-        })
-      )
-      strictEqual(optionalObject.representation._tag, "Objects")
-      if (optionalObject.representation._tag === "Objects") {
-        strictEqual(optionalObject.representation.propertySignatures[0].isOptional, true)
-      }
+        }
+      }, {
+        codes: makeCode(
+          `Schema.Struct({ "a": Schema.optionalKey(Schema.String.check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1" }))) })`,
+          `{ readonly "a"?: string }`
+        )
+      })
     })
 
     it("keeps additionalProperties scopes separate", () => {
@@ -5257,44 +2715,48 @@ describe("fromJsonSchemaDocument", () => {
           }
         ]
       ) {
-        const is = Schema.is(toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12(schema)))
-        assertTrue(is({}))
-        assertFalse(is({ a: "a" }))
+        assertFromJsonSchema({ schema }, {
+          codes: makeCode(`Schema.Struct({ "a": Schema.optionalKey(Schema.Never) })`, `{ readonly "a"?: never }`)
+        })
       }
     })
 
     it("does not move sibling properties into a closed scope", () => {
-      const is = Schema.is(toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
-        type: "object",
-        properties: { a: { type: "string" } },
-        additionalProperties: false,
-        allOf: [{ properties: { b: { type: "number" } } }]
-      })))
-      assertTrue(is({ a: "a" }))
-      assertFalse(is({ b: 1 }))
-      assertFalse(is({ a: "a", b: 1 }))
+      assertFromJsonSchema({
+        schema: {
+          type: "object",
+          properties: { a: { type: "string" } },
+          additionalProperties: false,
+          allOf: [{ properties: { b: { type: "number" } } }]
+        }
+      }, {
+        codes: makeCode(
+          `Schema.Struct({ "a": Schema.optionalKey(Schema.String), "b": Schema.optionalKey(Schema.Never) })`,
+          `{ readonly "a"?: string, readonly "b"?: never }`
+        )
+      })
     })
 
     it("rejects an object when a required sibling property is outside a closed scope", () => {
-      const is = Schema.is(toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
-        type: "object",
-        additionalProperties: false,
-        allOf: [{ properties: { a: { type: "string" } }, required: ["a"] }]
-      })))
-      assertFalse(is({}))
-      assertFalse(is({ a: "a" }))
+      assertFromJsonSchema({
+        schema: {
+          type: "object",
+          additionalProperties: false,
+          allOf: [{ properties: { a: { type: "string" } }, required: ["a"] }]
+        }
+      }, { codes: makeCode(`Schema.Never`, `never`) })
     })
 
     it("keeps object keyword scopes through references", () => {
-      const is = Schema.is(toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
-        $ref: "#/$defs/Closed",
-        allOf: [{ properties: { a: { type: "string" } } }],
-        $defs: {
-          Closed: { type: "object", additionalProperties: false }
+      assertFromJsonSchema({
+        schema: {
+          $ref: "#/$defs/Closed",
+          allOf: [{ properties: { a: { type: "string" } } }],
+          $defs: {
+            Closed: { type: "object", additionalProperties: false }
+          }
         }
-      })))
-      assertTrue(is({}))
-      assertFalse(is({ a: "a" }))
+      }, { codes: makeCode(`Schema.Struct({ "a": Schema.optionalKey(Schema.Never) })`, `{ readonly "a"?: never }`) })
     })
 
     it("applies a sibling additionalProperties schema to fixed properties", () => {
@@ -5303,10 +2765,12 @@ describe("fromJsonSchemaDocument", () => {
         properties: { a: { type: "string" } },
         allOf: [{ additionalProperties: { type: "boolean" } }]
       }))
-      const is = Schema.is(schema)
-      assertTrue(is({ b: true }))
-      assertFalse(is({ a: "a" }))
-      assertFalse(is({ b: "b" }))
+      assertCode(schema, {
+        codes: makeCode(
+          `Schema.StructWithRest(Schema.Struct({ "a": Schema.optionalKey(Schema.Never) }), [Schema.Record(Schema.String, Schema.Boolean)])`,
+          `{ readonly "a"?: never } & { readonly [x: string]: boolean }`
+        )
+      })
       deepStrictEqual(Schema.toJsonSchemaDocument(schema).schema, {
         type: "object",
         properties: { a: { not: {} } },
@@ -5315,44 +2779,117 @@ describe("fromJsonSchemaDocument", () => {
     })
 
     it("lowers open patterns over a finite object domain", () => {
-      const is = Schema.is(toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
-        type: "object",
-        properties: { a: { type: "string" } },
-        additionalProperties: false,
-        allOf: [{ patternProperties: { "^a$": { minLength: 2 } } }]
-      })))
-      assertTrue(is({ a: "aa" }))
-      assertFalse(is({ a: "a" }))
+      assertFromJsonSchema({
+        schema: {
+          type: "object",
+          properties: { a: { type: "string" } },
+          additionalProperties: false,
+          allOf: [{ patternProperties: { "^a$": { minLength: 2 } } }]
+        }
+      }, {
+        codes: makeCode(
+          `Schema.Struct({ "a": Schema.optionalKey(Schema.String.check(Schema.isMinLength(2).annotate({ "expected": "a value with a length of at least 2" }))) })`,
+          `{ readonly "a"?: string }`
+        )
+      })
     })
 
-    it("preserves open pattern scopes", () => {
-      const is = Schema.is(toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
-        type: "object",
-        patternProperties: { "^a": { type: "string" } }
-      })))
-      assertTrue(is({ a: "a", b: 1 }))
-      assertFalse(is({ a: 1 }))
+    it("rejects open pattern scopes", () => {
+      for (const additional of [{}, { additionalProperties: true }, { additionalProperties: {} }] as const) {
+        const schema = {
+          type: "object",
+          patternProperties: { "^a": { type: "number" } },
+          ...additional
+        } as const
+        throws(
+          () => toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12(schema)),
+          `Cannot import open "patternProperties": unmatched keys cannot be typed correctly.\n  at ["schema"]`
+        )
+        assertFromJsonSchema({ schema, options: { patterns: "ignore" } }, {
+          codes: makeCode(
+            `Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" }))`,
+            `{ readonly [x: string]: Schema.Json }`
+          )
+        })
+      }
     })
 
-    it("applies open patterns to fixed properties", () => {
-      const is = Schema.is(toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
-        type: "object",
-        properties: { a: { type: "string" } },
-        patternProperties: { "^a$": { minLength: 2 } }
-      })))
-      assertTrue(is({ a: "aa" }))
-      assertFalse(is({ a: "a" }))
+    it("rejects open patterns with fixed properties", () => {
+      throws(
+        () =>
+          toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
+            type: "object",
+            properties: { a: { type: "string" } },
+            patternProperties: { "^a$": { minLength: 2 } }
+          })),
+        `Cannot import open "patternProperties": unmatched keys cannot be typed correctly.\n  at ["schema"]`
+      )
+    })
+
+    it("rejects nested open pattern scopes with their source paths", () => {
+      const open = { type: "object", patternProperties: { "^a": { type: "number" } } } as const
+      const cases: ReadonlyArray<readonly [JsonSchema.JsonSchema, string]> = [
+        [{ type: "array", items: open }, `["schema"]["items"]`],
+        [{ type: "object", properties: { values: open } }, `["schema"]["properties"]["values"]`],
+        [{ anyOf: [{ type: "string" }, open] }, `["schema"]["anyOf"][1]`],
+        [{ $ref: "#/$defs/Values", $defs: { Values: open } }, `["definitions"]["Values"]`]
+      ]
+      for (const [schema, path] of cases) {
+        throws(
+          () => toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12(schema)),
+          `Cannot import open "patternProperties": unmatched keys cannot be typed correctly.\n  at ${path}`
+        )
+      }
+    })
+
+    it("lowers an initially open pattern over a finite object domain", () => {
+      assertFromJsonSchema({
+        schema: {
+          type: "object",
+          patternProperties: { "^a$": { minLength: 2 } },
+          allOf: [{
+            properties: { a: { type: "string" } },
+            additionalProperties: false
+          }]
+        }
+      }, {
+        codes: makeCode(
+          `Schema.Struct({ "a": Schema.optionalKey(Schema.String.check(Schema.isMinLength(2).annotate({ "expected": "a value with a length of at least 2" }))) })`,
+          `{ readonly "a"?: string }`
+        )
+      })
+    })
+
+    it("lowers a referenced open pattern over a finite object domain", () => {
+      assertFromJsonSchema({
+        schema: {
+          type: "object",
+          properties: { a: { type: "string" } },
+          additionalProperties: false,
+          allOf: [{ $ref: "#/$defs/Pattern" }],
+          $defs: {
+            Pattern: {
+              type: "object",
+              patternProperties: { "^a$": { minLength: 2 } }
+            }
+          }
+        }
+      }, {
+        codes: makeCode(
+          `Schema.Struct({ "a": Schema.optionalKey(Schema.String.check(Schema.isMinLength(2).annotate({ "expected": "a value with a length of at least 2" }))) })`,
+          `{ readonly "a"?: string }`
+        )
+      })
     })
 
     it("rejects object scopes that require pattern complements", () => {
       throws(
         () =>
-          fromJsonSchemaRepresentation(JsonSchema.fromSchemaDraft2020_12({
+          toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({
             type: "object",
             additionalProperties: false,
             patternProperties: { "^a": { type: "string" } },
             allOf: [
-              { type: "object", additionalProperties: true },
               {
                 type: "object",
                 additionalProperties: false,
@@ -5360,10 +2897,30 @@ describe("fromJsonSchemaDocument", () => {
               }
             ]
           })),
-        `Unsupported object keyword scopes\n  at ["schema"]`
+        `Cannot import this closed patterned object: only one pattern without properties is supported.\n  at ["schema"]["allOf"][0]`
       )
     })
 
+    it("preserves a closed pattern scope when intersecting a finite object domain", () => {
+      assertFromJsonSchema({
+        schema: {
+          type: "object",
+          properties: { a: { type: "number" }, b: { type: "number" } },
+          additionalProperties: false,
+          allOf: [{
+            type: "object",
+            patternProperties: { "^a": { type: "number" } },
+            additionalProperties: false
+          }]
+        }
+      }, {
+        codes: makeCode(
+          `Schema.Struct({ "a": Schema.optionalKey(Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" }))), "b": Schema.optionalKey(Schema.Never) })`,
+          `{ readonly "a"?: number, readonly "b"?: never }`
+        )
+      })
+    })
+
     describe("type: object", () => {
       it("add properties", () => {
         assertFromJsonSchema(
@@ -5376,28 +2933,7 @@ describe("fromJsonSchemaDocument", () => {
               ]
             }
           },
-          {
-            "representation": {
-              "_tag": "Objects",
-              "checks": [],
-              "propertySignatures": [
-                {
-                  "name": {
-                    "type": "string",
-                    "value": "a"
-                  },
-                  "type": {
-                    "_tag": "Never",
-                    "checks": []
-                  },
-                  "isOptional": true,
-                  "isMutable": false
-                }
-              ],
-              "indexSignatures": []
-            },
-            "references": {}
-          }
+          { codes: makeCode(`Schema.Struct({ "a": Schema.optionalKey(Schema.Never) })`, `{ readonly "a"?: never }`) }
         )
       })
 
@@ -5411,26 +2947,7 @@ describe("fromJsonSchemaDocument", () => {
               ]
             }
           },
-          {
-            "representation": {
-              "_tag": "Objects",
-              "checks": [],
-              "propertySignatures": [],
-              "indexSignatures": [
-                {
-                  "parameter": {
-                    "_tag": "String",
-                    "checks": []
-                  },
-                  "type": {
-                    "_tag": "Boolean",
-                    "checks": []
-                  }
-                }
-              ]
-            },
-            "references": {}
-          }
+          { codes: makeCode(`Schema.Record(Schema.String, Schema.Boolean)`, `{ readonly [x: string]: boolean }`) }
         )
       })
     })
@@ -5446,7 +2963,7 @@ describe("fromJsonSchemaDocument", () => {
               value: { not: { type: "string" } }
             }
           })),
-        `Unsupported JSON Schema keyword "not"\n  at ["schema"]["properties"]["value"]["not"]`
+        `Cannot import JSON Schema keyword "not": Effect has no equivalent constraint.\n  at ["schema"]["properties"]["value"]["not"]`
       )
     })
 
@@ -5463,7 +2980,9 @@ describe("fromJsonSchemaDocument", () => {
       it(keyword, () => {
         throws(
           () => toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({ [keyword]: value })),
-          `Unsupported JSON Schema keyword "${keyword}"\n  at ["schema"][${JSON.stringify(keyword)}]`
+          `Cannot import JSON Schema keyword "${keyword}": Effect has no equivalent constraint.\n  at ["schema"][${
+            JSON.stringify(keyword)
+          }]`
         )
       })
     }
@@ -5476,7 +2995,7 @@ describe("fromJsonSchemaDocument", () => {
               if: { type: "string" },
               [branch]: false
             })),
-          `Unsupported JSON Schema keyword "if"\n  at ["schema"]["if"]`
+          `Cannot import JSON Schema keyword "if": Effect has no equivalent constraint.\n  at ["schema"]["if"]`
         )
       })
     }
@@ -5491,18 +3010,37 @@ describe("fromJsonSchemaDocument", () => {
           ["maxContains", 2]
         ] as const
       ) {
-        const document = JsonSchema.fromSchemaDraft2020_12({ [keyword]: value })
-        assertTrue(Schema.is(toSchemaFromJsonSchemaDocument(document))({}))
+        assertFromJsonSchema(
+          { schema: { [keyword]: value } },
+          { codes: makeCode(`Schema.Json.annotate({ "expected": "JSON value" })`, `Schema.Json`) }
+        )
       }
     })
 
     it("ignores custom keywords", () => {
-      assertTrue(Schema.is(toSchemaFromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12({ custom: false })))({}))
+      assertFromJsonSchema({ schema: { custom: false } }, {
+        codes: makeCode(`Schema.Json.annotate({ "expected": "JSON value" })`, `Schema.Json`)
+      })
     })
   })
 
   describe("options", () => {
     describe("patterns", () => {
+      it("can reject previously exclusive branches when patterns are ignored", () => {
+        const document = JsonSchema.fromSchemaDraft2020_12({
+          oneOf: [
+            { type: "string", pattern: "^a$" },
+            { type: "string", pattern: "^b$" }
+          ]
+        })
+        const applied = toSchemaFromJsonSchemaDocument(document, { patterns: "apply" })
+        const ignored = toSchemaFromJsonSchemaDocument(document, { patterns: "ignore" })
+        for (const input of ["a", "b"]) {
+          assert.isTrue(Schema.is(applied)(input))
+          assert.isFalse(Schema.is(ignored)(input))
+        }
+      })
+
       it("rejects patterns by default", () => {
         for (
           const [schema, path] of [
@@ -5519,73 +3057,59 @@ describe("fromJsonSchemaDocument", () => {
         ) {
           throws(
             () => SchemaRepresentation.fromJsonSchemaDocument(JsonSchema.fromSchemaDraft2020_12(schema)),
-            `Pattern encountered while patterns is set to "error"\n  at ${path}`
+            `Patterns may block validation and are disabled. Use patterns: "apply" for trusted schemas or "ignore" to discard them.\n  at ${path}`
           )
         }
       })
 
       it("applies patterns explicitly", () => {
-        const schema = SchemaRepresentation.fromJsonSchemaDocument(
-          JsonSchema.fromSchemaDraft2020_12({ type: "string", pattern: "^a+$" }),
-          { patterns: "apply" }
-        )
-        const is = Schema.is(schema)
-        assertTrue(is("aaa"))
-        assertFalse(is("bbb"))
+        assertFromJsonSchema({ schema: { type: "string", pattern: "^a+$" }, options: { patterns: "apply" } }, {
+          codes: makeCode(
+            `Schema.String.check(Schema.isPattern(new RegExp("^a+$")).annotate({ "expected": "a string matching the RegExp ^a+$" }))`,
+            `string`
+          )
+        })
       })
 
       it("ignores patterns explicitly", () => {
-        const schema = SchemaRepresentation.fromJsonSchemaDocument(
-          JsonSchema.fromSchemaDraft2020_12({ type: "string", pattern: "^a+$" }),
-          { patterns: "ignore" }
-        )
-        const is = Schema.is(schema)
-        assertTrue(is("aaa"))
-        assertTrue(is("bbb"))
-        deepStrictEqual(SchemaRepresentation.toRepresentation(schema.ast).representation, {
-          _tag: "String",
-          checks: []
+        assertFromJsonSchema({ schema: { type: "string", pattern: "^a+$" }, options: { patterns: "ignore" } }, {
+          codes: makeCode(`Schema.String`, `string`)
+        })
+        assertFromJsonSchema({ schema: { type: "string", pattern: "[" }, options: { patterns: "ignore" } }, {
+          codes: makeCode(`Schema.String`, `string`)
         })
-
-        const invalidPattern = SchemaRepresentation.fromJsonSchemaDocument(
-          JsonSchema.fromSchemaDraft2020_12({ type: "string", pattern: "[" }),
-          { patterns: "ignore" }
-        )
-        assertTrue(Schema.is(invalidPattern)("anything"))
       })
 
       it("ignores pattern property value constraints explicitly", () => {
-        const schema = SchemaRepresentation.fromJsonSchemaDocument(
-          JsonSchema.fromSchemaDraft2020_12({
+        assertFromJsonSchema({
+          schema: {
             type: "object",
             patternProperties: {
               "^a+$": { type: "string" },
               "^b+$": { type: "number" }
             },
             additionalProperties: false
-          }),
-          { patterns: "ignore" }
-        )
-        const is = Schema.is(schema)
-        assertTrue(is({ aaa: 1, bbb: "b", ccc: true }))
-        const representation = SchemaRepresentation.toRepresentation(schema.ast).representation
-        strictEqual(representation._tag, "Objects")
-        if (representation._tag === "Objects") {
-          deepStrictEqual(representation.indexSignatures.map(({ parameter }) => parameter), [{
-            _tag: "String",
-            checks: []
-          }])
-        }
-
-        const withAdditionalProperties = SchemaRepresentation.fromJsonSchemaDocument(
-          JsonSchema.fromSchemaDraft2020_12({
+          },
+          options: { patterns: "ignore" }
+        }, {
+          codes: makeCode(
+            `Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" }))`,
+            `{ readonly [x: string]: Schema.Json }`
+          )
+        })
+        assertFromJsonSchema({
+          schema: {
             type: "object",
             patternProperties: { "^a+$": { type: "string" } },
             additionalProperties: { type: "boolean" }
-          }),
-          { patterns: "ignore" }
-        )
-        assertTrue(Schema.is(withAdditionalProperties)({ bbb: 1 }))
+          },
+          options: { patterns: "ignore" }
+        }, {
+          codes: makeCode(
+            `Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" }))`,
+            `{ readonly [x: string]: Schema.Json }`
+          )
+        })
       })
     })
 
@@ -5609,28 +3133,7 @@ describe("fromJsonSchemaDocument", () => {
               }
             }
           },
-          {
-            "representation": {
-              "_tag": "Objects",
-              "checks": [],
-              "propertySignatures": [
-                {
-                  "name": {
-                    "type": "string",
-                    "value": "a"
-                  },
-                  "type": {
-                    "_tag": "String",
-                    "checks": []
-                  },
-                  "isOptional": false,
-                  "isMutable": false
-                }
-              ],
-              "indexSignatures": []
-            },
-            "references": {}
-          }
+          { codes: makeCode(`Schema.Struct({ "a": Schema.String })`, `{ readonly "a": string }`) }
         )
       })
 
@@ -5651,21 +3154,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "Declaration",
-              "representation": {
-                "id": "effect/schema/Json",
-                "payload": null
-              },
-              "annotations": {
-                "expected": "JSON value",
-                "title": "a",
-                "description": "b"
-              },
-              "typeParameters": [],
-              "checks": []
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Json.annotate({ "expected": "JSON value", "title": "a", "description": "b" })`,
+              `Schema.Json`
+            )
           }
         )
       })
@@ -5690,21 +3182,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "Declaration",
-              "representation": {
-                "id": "effect/schema/Json",
-                "payload": null
-              },
-              "annotations": {
-                "expected": "JSON value",
-                "title": "a",
-                "default": "c"
-              },
-              "typeParameters": [],
-              "checks": []
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Json.annotate({ "expected": "JSON value", "title": "a", "default": "c" })`,
+              `Schema.Json`
+            )
           }
         )
       })
@@ -5720,25 +3201,10 @@ describe("fromJsonSchemaDocument", () => {
             }
           },
           {
-            "representation": {
-              "_tag": "Declaration",
-              "representation": {
-                "id": "effect/schema/Json",
-                "payload": null
-              },
-              "annotations": {
-                "expected": "JSON value",
-                "title": "a",
-                "description": "b",
-                "default": "c",
-                "examples": [
-                  "d"
-                ]
-              },
-              "typeParameters": [],
-              "checks": []
-            },
-            "references": {}
+            codes: makeCode(
+              `Schema.Json.annotate({ "expected": "JSON value", "title": "a", "description": "b", "default": "c", "examples": ["d"] })`,
+              `Schema.Json`
+            )
           }
         )
       })
diff --git a/repos/effect/packages/effect/test/schema/representation/fromJsonSchemaMultiDocument.test.ts b/repos/effect/packages/effect/test/schema/representation/fromJsonSchemaMultiDocument.test.ts
index 80419f264..b6ebd4a0d 100644
--- a/repos/effect/packages/effect/test/schema/representation/fromJsonSchemaMultiDocument.test.ts
+++ b/repos/effect/packages/effect/test/schema/representation/fromJsonSchemaMultiDocument.test.ts
@@ -1,18 +1,142 @@
 import { assert } from "@effect/vitest"
-import { Schema, type SchemaAST, SchemaRepresentation } from "effect"
+import { type Schema, type SchemaAST, SchemaRepresentation } from "effect"
+import { TestSchema } from "effect/testing"
 import { describe, it } from "vitest"
 import { deepStrictEqual, throws } from "../../utils/assert.ts"
 
-function importAndLower(
-  document: Parameters<typeof SchemaRepresentation.fromJsonSchemaMultiDocument>[0]
-): SchemaRepresentation.MultiDocument {
-  const schemas = SchemaRepresentation.fromJsonSchemaMultiDocument(document)
-  return SchemaRepresentation.toRepresentations(
+const makeCode = SchemaRepresentation.makeCode
+
+type Expected = {
+  readonly codes: ReadonlyArray<SchemaRepresentation.Code>
+  readonly references?: Partial<SchemaRepresentation.CodeDocument["references"]>
+}
+
+function assertCode(schemas: readonly [Schema.Top, ...Array<Schema.Top>], expected: Expected) {
+  const document = SchemaRepresentation.toRepresentations(
     schemas.map((schema) => schema.ast) as [SchemaAST.AST, ...Array<SchemaAST.AST>]
   )
+  deepStrictEqual(SchemaRepresentation.toCodeDocument(document), {
+    codes: expected.codes,
+    references: {
+      nonRecursives: expected.references?.nonRecursives ?? [],
+      recursives: expected.references?.recursives ?? {}
+    },
+    artifacts: []
+  })
 }
 
 describe("SchemaRepresentation.fromJsonSchemaMultiDocument", () => {
+  it("rejects open pattern scopes in roots and shared definitions", () => {
+    const open = { type: "object", patternProperties: { "^a": { type: "number" } } } as const
+    throws(
+      () =>
+        SchemaRepresentation.fromJsonSchemaMultiDocument({
+          dialect: "draft-2020-12",
+          schemas: [{ type: "string" }, { type: "array", items: open }],
+          definitions: {}
+        }, { patterns: "apply" }),
+      `Cannot import open "patternProperties": unmatched keys cannot be typed correctly.\n  at ["schemas"][1]["items"]`
+    )
+    throws(
+      () =>
+        SchemaRepresentation.fromJsonSchemaMultiDocument({
+          dialect: "draft-2020-12",
+          schemas: [{ $ref: "#/$defs/Values" }, { type: "array", items: { $ref: "#/$defs/Values" } }],
+          definitions: { Values: open }
+        }, { patterns: "apply" }),
+      `Cannot import open "patternProperties": unmatched keys cannot be typed correctly.\n  at ["definitions"]["Values"]`
+    )
+  })
+
+  it("imports closed patterned Records through shared definitions", async () => {
+    const schemas = SchemaRepresentation.fromJsonSchemaMultiDocument({
+      dialect: "draft-2020-12",
+      schemas: [{ $ref: "#/$defs/Values" }, { type: "array", items: { $ref: "#/$defs/Values" } }],
+      definitions: {
+        Values: {
+          type: "object",
+          patternProperties: { "^a": { type: "number" } },
+          additionalProperties: false
+        }
+      }
+    }, { patterns: "apply" })
+    const asserts = new TestSchema.Asserts(schemas[0] as unknown as Schema.ConstraintDecoder<unknown>)
+    const decoding = asserts.decoding()
+    await decoding.succeed({ a: 1, z: true }, { a: 1 })
+    await decoding.fail({ a: "x" }, `Expected number\n  at ["a"]`)
+    await asserts.decoding({ parseOptions: { onExcessProperty: "error" } }).fail(
+      { z: true },
+      `Expected no excess property\n  at ["z"]`
+    )
+    const arrayDecoding = new TestSchema.Asserts(schemas[1] as unknown as Schema.ConstraintDecoder<unknown>).decoding()
+    await arrayDecoding.succeed([{ a: 1 }])
+    await arrayDecoding.fail([{ a: "x" }], `Expected number\n  at [0]["a"]`)
+  })
+
+  it("imports Never through shared definitions", () => {
+    const schemas = SchemaRepresentation.fromJsonSchemaMultiDocument({
+      dialect: "draft-2020-12",
+      schemas: [
+        { type: "object", properties: { value: { $ref: "#/$defs/Impossible" } } },
+        { $ref: "#/$defs/Impossible" }
+      ],
+      definitions: { Impossible: { not: {} } }
+    })
+    assertCode(schemas, {
+      codes: [
+        makeCode(
+          `Schema.StructWithRest(Schema.Struct({ "value": Schema.optionalKey(Impossible) }), [Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" }))])`,
+          `{ readonly "value"?: Impossible } & { readonly [x: string]: Schema.Json }`
+        ),
+        makeCode(`Impossible`, `Impossible`)
+      ],
+      references: {
+        nonRecursives: [{
+          $ref: "Impossible",
+          code: makeCode(`Schema.Never.annotate({ "identifier": "Impossible" })`, `never`)
+        }]
+      }
+    })
+  })
+
+  it("keeps resource scope separate for each root", () => {
+    const schemas = SchemaRepresentation.fromJsonSchemaMultiDocument({
+      dialect: "draft-2020-12",
+      schemas: [
+        { type: "object", properties: { child: { $id: "child", type: "number" } } },
+        { $id: "https://example.com/root", $ref: "#/$defs/X" }
+      ],
+      definitions: { X: { type: "string" } }
+    })
+    assertCode(schemas, {
+      codes: [
+        makeCode(
+          `Schema.StructWithRest(Schema.Struct({ "child": Schema.optionalKey(Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number" }))) }), [Schema.Record(Schema.String, Schema.Json.annotate({ "expected": "JSON value" }))])`,
+          `{ readonly "child"?: number } & { readonly [x: string]: Schema.Json }`
+        ),
+        makeCode(`X`, `X`)
+      ],
+      references: {
+        nonRecursives: [{ $ref: "X", code: makeCode(`Schema.String.annotate({ "identifier": "X" })`, `string`) }]
+      }
+    })
+  })
+
+  it("rejects a reference in a nested resource with its multi-root path", () => {
+    throws(
+      () =>
+        SchemaRepresentation.fromJsonSchemaMultiDocument({
+          dialect: "draft-2020-12",
+          schemas: [
+            { type: "string" },
+            { type: "array", items: { $id: "child", $ref: "#/$defs/X" } }
+          ],
+          definitions: { X: { type: "string" } }
+        }),
+      `Cannot resolve $ref under a nested "$id". Resolve or flatten it first.\n  at ["schemas"][1]["items"]["$ref"]`
+    )
+  })
+
   it("propagates the pattern policy through reachable definitions", () => {
     const document: Parameters<typeof SchemaRepresentation.fromJsonSchemaMultiDocument>[0] = {
       dialect: "draft-2020-12" as const,
@@ -24,12 +148,22 @@ describe("SchemaRepresentation.fromJsonSchemaMultiDocument", () => {
 
     throws(
       () => SchemaRepresentation.fromJsonSchemaMultiDocument(document),
-      `Pattern encountered while patterns is set to "error"\n  at ["definitions"]["A"]["pattern"]`
+      `Patterns may block validation and are disabled. Use patterns: "apply" for trusted schemas or "ignore" to discard them.\n  at ["definitions"]["A"]["pattern"]`
     )
 
-    const [schema] = SchemaRepresentation.fromJsonSchemaMultiDocument(document, { patterns: "apply" })
-    assert.isTrue(Schema.is(schema)("aaa"))
-    assert.isFalse(Schema.is(schema)("bbb"))
+    const schemas = SchemaRepresentation.fromJsonSchemaMultiDocument(document, { patterns: "apply" })
+    assertCode(schemas, {
+      codes: [makeCode(`A`, `A`)],
+      references: {
+        nonRecursives: [{
+          $ref: "A",
+          code: makeCode(
+            `Schema.String.check(Schema.isPattern(new RegExp("^a+$")).annotate({ "expected": "a string matching the RegExp ^a+$", "identifier": "A" }))`,
+            `string`
+          )
+        }]
+      }
+    })
   })
 
   it("preserves an onEnter exception by identity", () => {
@@ -54,7 +188,7 @@ describe("SchemaRepresentation.fromJsonSchemaMultiDocument", () => {
   })
 
   it("preserves contentSchema as an annotation without traversing it", () => {
-    const document = importAndLower({
+    const schemas = SchemaRepresentation.fromJsonSchemaMultiDocument({
       dialect: "draft-2020-12",
       schemas: [{
         type: "string",
@@ -71,15 +205,12 @@ describe("SchemaRepresentation.fromJsonSchemaMultiDocument", () => {
       }
     })
 
-    const content = document.representations[0]
-    assert.strictEqual(content._tag, "String")
-    assert.deepStrictEqual(document.references, {})
-    if (content._tag === "String") {
-      assert.deepStrictEqual(content.annotations, {
-        contentMediaType: "application/json",
-        contentSchema: { $ref: "#/$defs/Payload" }
-      })
-    }
+    assertCode(schemas, {
+      codes: [makeCode(
+        `Schema.String.annotate({ "contentMediaType": "application/json", "contentSchema": { "$ref": "#/$defs/Payload" } })`,
+        `string`
+      )]
+    })
   })
 
   it("does not import unreachable definitions", () => {
@@ -96,11 +227,11 @@ describe("SchemaRepresentation.fromJsonSchemaMultiDocument", () => {
       }
     })
 
-    assert.strictEqual(schemas[0].ast._tag, "String")
+    assertCode(schemas, { codes: [makeCode(`Schema.String`, `string`)] })
   })
 
   it("preserves root order and shares definitions", () => {
-    const document = importAndLower({
+    const schemas = SchemaRepresentation.fromJsonSchemaMultiDocument({
       dialect: "draft-2020-12",
       schemas: [
         { $ref: "#/$defs/A" },
@@ -113,52 +244,27 @@ describe("SchemaRepresentation.fromJsonSchemaMultiDocument", () => {
       }
     })
 
-    deepStrictEqual(SchemaRepresentation.toJsonMultiDocument(document), {
-      representations: [
-        { _tag: "Reference", $ref: "A" },
-        {
-          _tag: "Suspend",
-          checks: [],
-          annotations: { description: "second" },
-          thunk: { _tag: "Reference", $ref: "A" }
-        },
-        {
-          _tag: "Arrays",
-          elements: [],
-          rest: [{ _tag: "Reference", $ref: "A" }],
-          checks: []
-        },
-        {
-          _tag: "Suspend",
-          checks: [],
-          annotations: { description: "fourth" },
-          thunk: { _tag: "Reference", $ref: "A" }
-        }
+    assertCode(schemas, {
+      codes: [
+        makeCode(`A`, `A`),
+        makeCode(`Schema.suspend((): Schema.Codec<A> => A).annotate({ "description": "second" })`, `A`),
+        makeCode(`Schema.Array(A)`, `ReadonlyArray<A>`),
+        makeCode(`Schema.suspend((): Schema.Codec<A> => A).annotate({ "description": "fourth" })`, `A`)
       ],
       references: {
-        A: {
-          _tag: "String",
-          checks: [{
-            _tag: "Filter",
-            representation: {
-              id: "effect/schema/isMinLength",
-              payload: { minLength: 1 }
-            },
-            annotations: {
-              identifier: "A",
-              expected: "a value with a length of at least 1",
-              "~structural": true,
-              arbitraryConstraint: { minLength: 1 }
-            },
-            aborted: false
-          }]
-        }
+        nonRecursives: [{
+          $ref: "A",
+          code: makeCode(
+            `Schema.String.check(Schema.isMinLength(1).annotate({ "expected": "a value with a length of at least 1", "identifier": "A" }))`,
+            `string`
+          )
+        }]
       }
     })
   })
 
   it("resolves alias chains when combining a reference", () => {
-    const document = importAndLower({
+    const schemas = SchemaRepresentation.fromJsonSchemaMultiDocument({
       dialect: "draft-2020-12",
       schemas: [{ $ref: "#/$defs/A", description: "root" }],
       definitions: {
@@ -168,33 +274,22 @@ describe("SchemaRepresentation.fromJsonSchemaMultiDocument", () => {
       }
     })
 
-    deepStrictEqual(SchemaRepresentation.toJsonMultiDocument(document), {
-      representations: [{
-        _tag: "Suspend",
-        checks: [],
-        annotations: { description: "root" },
-        thunk: { _tag: "Reference", $ref: "A" }
-      }],
+    assertCode(schemas, {
+      codes: [makeCode(`Schema.suspend((): Schema.Codec<A> => A).annotate({ "description": "root" })`, `A`)],
       references: {
-        A: {
-          _tag: "Number",
-          checks: [{
-            _tag: "Filter",
-            representation: { id: "effect/schema/isFinite", payload: null },
-            annotations: {
-              identifier: "A",
-              expected: "a finite number",
-              arbitraryConstraint: { number: "finite" }
-            },
-            aborted: false
-          }]
-        }
+        nonRecursives: [{
+          $ref: "A",
+          code: makeCode(
+            `Schema.Number.check(Schema.isFinite().annotate({ "expected": "a finite number", "identifier": "A" }))`,
+            `number`
+          )
+        }]
       }
     })
   })
 
   it("tracks recursive definitions independently", () => {
-    const document = importAndLower({
+    const schemas = SchemaRepresentation.fromJsonSchemaMultiDocument({
       dialect: "draft-2020-12",
       schemas: [{ $ref: "#/$defs/A" }, { $ref: "#/$defs/B" }],
       definitions: {
@@ -203,23 +298,12 @@ describe("SchemaRepresentation.fromJsonSchemaMultiDocument", () => {
       }
     })
 
-    deepStrictEqual(SchemaRepresentation.toJsonMultiDocument(document), {
-      representations: [
-        { _tag: "Reference", $ref: "A" },
-        { _tag: "Reference", $ref: "B" }
-      ],
+    assertCode(schemas, {
+      codes: [makeCode(`A`, `A`), makeCode(`B`, `B`)],
       references: {
-        A: {
-          _tag: "Suspend",
-          annotations: { identifier: "A" },
-          checks: [],
-          thunk: { _tag: "Reference", $ref: "A" }
-        },
-        B: {
-          _tag: "Suspend",
-          annotations: { identifier: "B" },
-          checks: [],
-          thunk: { _tag: "Reference", $ref: "B" }
+        recursives: {
+          A: makeCode(`Schema.suspend((): Schema.Codec<A> => A).annotate({ "identifier": "A" })`, `A`),
+          B: makeCode(`Schema.suspend((): Schema.Codec<B> => B).annotate({ "identifier": "B" })`, `B`)
         }
       }
     })
@@ -233,7 +317,7 @@ describe("SchemaRepresentation.fromJsonSchemaMultiDocument", () => {
           schemas: [{ $ref: "#/$defs/Missing", description: "resolve" }],
           definitions: {}
         }),
-      `Invalid reference "#/$defs/Missing"\n  at ["schemas"][0]["$ref"]`
+      `Missing definition "Missing" for $ref "#/$defs/Missing".\n  at ["schemas"][0]["$ref"]`
     )
   })
 
@@ -248,7 +332,7 @@ describe("SchemaRepresentation.fromJsonSchemaMultiDocument", () => {
             B: { $ref: "#/$defs/A" }
           }
         }),
-      "Invalid reference A\n  at [\"schemas\"][0][\"$ref\"]"
+      `Definition "A" is a circular alias.\n  at ["schemas"][0]["$ref"]`
     )
   })
 })
diff --git a/repos/effect/packages/effect/test/schema/representation/fromRepresentation.test.ts b/repos/effect/packages/effect/test/schema/representation/fromRepresentation.test.ts
index 18f46c188..7a670442d 100644
--- a/repos/effect/packages/effect/test/schema/representation/fromRepresentation.test.ts
+++ b/repos/effect/packages/effect/test/schema/representation/fromRepresentation.test.ts
@@ -133,17 +133,19 @@ describe("SchemaRepresentation.fromRepresentation", () => {
     assert.isFalse(Schema.is(schema)("other"))
   })
 
-  it("revives ambiguous Enum values without changing their type", () => {
-    const schema = assertRepresentationRoundtrip(Schema.Enum({
-      StringNaN: "NaN",
-      NumberNaN: Number.NaN,
-      StringInfinity: "Infinity",
-      NumberInfinity: Number.POSITIVE_INFINITY
-    }))
-    assert.isTrue(Schema.is(schema)("NaN"))
-    assert.isTrue(Schema.is(schema)(Number.NaN))
-    assert.isTrue(Schema.is(schema)("Infinity"))
-    assert.isTrue(Schema.is(schema)(Number.POSITIVE_INFINITY))
+  it("rejects non-finite numeric Enum values", () => {
+    throws(
+      () =>
+        SchemaRepresentation.fromRepresentation({
+          representation: {
+            _tag: "Enum",
+            enums: [["NumberNaN", Number.NaN]],
+            checks: []
+          },
+          references: {}
+        }, { revivers: [] }),
+      new Error("A numeric enum value must be finite, got NaN")
+    )
   })
 
   it("revives TemplateLiteral", () => {
@@ -228,9 +230,28 @@ describe("SchemaRepresentation.fromRepresentation", () => {
     assert.isFalse(Schema.is(schema)(true))
   })
 
+  it("revives Union options through live and JSON representation roundtrips", () => {
+    const representation = {
+      _tag: "Union",
+      types: [{ _tag: "String", checks: [] }, { _tag: "Number", checks: [] }],
+      options: { mode: "oneOf" },
+      checks: []
+    } as const satisfies SchemaRepresentation.Representation
+    const document = { representation, references: {} }
+    const revived = SchemaRepresentation.fromRepresentation(document, { revivers: [] })
+    assert.strictEqual(revived.ast._tag, "Union")
+    if (revived.ast._tag === "Union") assert.deepStrictEqual(revived.ast.options, representation.options)
+    const fromJson = SchemaRepresentation.fromRepresentation(
+      SchemaRepresentation.fromJson(SchemaRepresentation.toJson(document)),
+      { revivers: [] }
+    )
+    assert.strictEqual(fromJson.ast._tag, "Union")
+    if (fromJson.ast._tag === "Union") assert.deepStrictEqual(fromJson.ast.options, representation.options)
+  })
+
   it("revives an empty Union as Never", () => {
     const schema = SchemaRepresentation.fromRepresentation({
-      representation: { _tag: "Union", types: [], mode: "anyOf", checks: [] },
+      representation: { _tag: "Union", types: [], options: { mode: "anyOf" }, checks: [] },
       references: {}
     }, { revivers: [] })
     assert.isFalse(Schema.is(schema)(undefined))
diff --git a/repos/effect/packages/effect/test/schema/representation/schemaToJsonSchemaDocument.test.ts b/repos/effect/packages/effect/test/schema/representation/schemaToJsonSchemaDocument.test.ts
index 792a5e66a..d11c42364 100644
--- a/repos/effect/packages/effect/test/schema/representation/schemaToJsonSchemaDocument.test.ts
+++ b/repos/effect/packages/effect/test/schema/representation/schemaToJsonSchemaDocument.test.ts
@@ -30,17 +30,17 @@ describe("Schema.toJsonSchemaDocument", () => {
               type: "object",
               properties: { value: { type: "string" } },
               required: ["value"],
-              additionalProperties: false
+              additionalProperties: true
             },
             second: {
               type: "object",
               properties: { value: { type: "string" } },
               required: ["value"],
-              additionalProperties: false
+              additionalProperties: true
             }
           },
           required: ["first", "second"],
-          additionalProperties: false
+          additionalProperties: true
         },
         definitions: {}
       }
@@ -140,7 +140,7 @@ describe("Schema.toJsonSchemaDocument", () => {
       count: Schema.FiniteFromString
     }).annotate({ description: "root" })
     const options: Schema.ToJsonSchemaOptions = {
-      additionalProperties: true,
+      onExcessProperty: "ignore",
       generateDescriptions: true,
       includeAnnotationKey: (key) => key === "x-consumer"
     }
diff --git a/repos/effect/packages/effect/test/schema/representation/toCodeDocument.annotations.test.ts b/repos/effect/packages/effect/test/schema/representation/toCodeDocument.annotations.test.ts
index e1c2e96b1..eafb5acc7 100644
--- a/repos/effect/packages/effect/test/schema/representation/toCodeDocument.annotations.test.ts
+++ b/repos/effect/packages/effect/test/schema/representation/toCodeDocument.annotations.test.ts
@@ -26,18 +26,18 @@ const NumberRepresentation: SchemaRepresentation.Representation = {
 const EmptyUnionRepresentation: SchemaRepresentation.Representation = {
   _tag: "Union",
   types: [],
-  mode: "anyOf",
+  options: { mode: "anyOf" },
   checks: []
 }
 
 describe("SchemaRepresentation.toCodeDocument annotations", () => {
-  it("compiles an empty union as Never", () => {
+  it("preserves explicit options on an empty union", () => {
     assert.deepStrictEqual(
       SchemaRepresentation.toCodeDocument({
         representations: [EmptyUnionRepresentation],
         references: {}
       }).codes,
-      [{ runtime: "Schema.Never", Type: "never" }]
+      [{ runtime: `Schema.Union([], { mode: "anyOf" })`, Type: "never" }]
     )
   })
 
@@ -319,7 +319,7 @@ describe("SchemaRepresentation.toCodeDocument annotations", () => {
       },
       {
         runtime: `Schema.TupleWithRest(Schema.Tuple([Schema.optionalKey(Schema.String)]), [Schema.Number])`,
-        Type: `readonly [string?, ...Array<number>]`
+        Type: `readonly [(string)?, ...Array<number>]`
       },
       {
         runtime: `Schema.Struct({ 1: Schema.Boolean })`,
@@ -455,7 +455,7 @@ describe("SchemaRepresentation.toCodeDocument annotations", () => {
           checks: [{ _tag: "FilterGroup", checks: [filter] }]
         },
         E: { _tag: "TemplateLiteral", parts: [reference("D")], checks: [] },
-        F: { _tag: "Union", types: [reference("E"), reference("A")], mode: "anyOf", checks: [] },
+        F: { _tag: "Union", types: [reference("E"), reference("A")], options: { mode: "anyOf" }, checks: [] },
         G: {
           _tag: "Arrays",
           elements: [{ type: reference("F"), isOptional: false }],
@@ -527,18 +527,46 @@ describe("SchemaRepresentation.toCodeDocument annotations", () => {
     assert.strictEqual(output.codes[0].Type, `{ readonly [x: string]: number, readonly [x: symbol]: boolean }`)
   })
 
-  it("generates a single-literal Union as Literal", () => {
+  it("preserves explicit options on a single-literal Union", () => {
     const output = SchemaRepresentation.toCodeDocument({
       representations: [{
         _tag: "Union",
         types: [{ _tag: "Literal", literal: "a", checks: [] }],
-        mode: "anyOf",
+        options: { mode: "anyOf" },
         checks: []
       }],
       references: {}
     })
 
-    assert.deepStrictEqual(output.codes[0], { runtime: `Schema.Literal("a")`, Type: `"a"` })
+    assert.deepStrictEqual(output.codes[0], {
+      runtime: `Schema.Union([Schema.Literal("a")], { mode: "anyOf" })`,
+      Type: `"a"`
+    })
+  })
+
+  it("preserves optional Union option properties", () => {
+    const output = SchemaRepresentation.toCodeDocument({
+      representations: [
+        {
+          _tag: "Union",
+          types: [StringRepresentation],
+          options: {},
+          checks: []
+        },
+        {
+          _tag: "Union",
+          types: [NumberRepresentation],
+          options: { mode: undefined },
+          checks: []
+        }
+      ],
+      references: {}
+    })
+
+    assert.deepStrictEqual(output.codes, [
+      { runtime: "Schema.Union([Schema.String], {})", Type: "string" },
+      { runtime: `Schema.Union([Schema.Number], { mode: undefined })`, Type: "number" }
+    ])
   })
 
   it("emits every member of a mutually recursive reference cycle", () => {
diff --git a/repos/effect/packages/effect/test/schema/representation/toCodeDocument.test.ts b/repos/effect/packages/effect/test/schema/representation/toCodeDocument.test.ts
index 206ae1c9e..78b0272e2 100644
--- a/repos/effect/packages/effect/test/schema/representation/toCodeDocument.test.ts
+++ b/repos/effect/packages/effect/test/schema/representation/toCodeDocument.test.ts
@@ -1,4 +1,6 @@
+import { assert } from "@effect/vitest"
 import { JsonSchema, Schema, SchemaRepresentation } from "effect"
+import { TestSchema } from "effect/testing"
 import { describe, it } from "vitest"
 import { assertTrue, deepStrictEqual, strictEqual, throws } from "../../utils/assert.ts"
 
@@ -1067,7 +1069,7 @@ describe("toCodeDocument", () => {
       assertSchema(
         { schema: Schema.Tuple([Schema.optionalKey(Schema.String)]) },
         {
-          codes: makeCode(`Schema.Tuple([Schema.optionalKey(Schema.String)])`, "readonly [string?]")
+          codes: makeCode(`Schema.Tuple([Schema.optionalKey(Schema.String)])`, `readonly [(string)?]`)
         }
       )
       assertSchema(
@@ -1075,12 +1077,60 @@ describe("toCodeDocument", () => {
         {
           codes: makeCode(
             `Schema.Tuple([Schema.optionalKey(Schema.String)]).annotate({ "description": "a" })`,
-            "readonly [string?]"
+            `readonly [(string)?]`
           )
         }
       )
     })
 
+    it("optional union elements", () => {
+      assertSchema(
+        { schema: Schema.Tuple([Schema.optionalKey(Schema.Union([Schema.String, Schema.Number]))]) },
+        {
+          codes: makeCode(
+            `Schema.Tuple([Schema.optionalKey(Schema.Union([Schema.String, Schema.Number]))])`,
+            `readonly [(string | number)?]`
+          )
+        }
+      )
+      assertSchema(
+        { schema: Schema.Tuple([Schema.optionalKey(Schema.Literals(["a", "b"]))]) },
+        {
+          codes: makeCode(
+            `Schema.Tuple([Schema.optionalKey(Schema.Literals(["a", "b"]))])`,
+            `readonly [("a" | "b")?]`
+          )
+        }
+      )
+    })
+
+    it("optional readonly tuple element", () => {
+      assertSchema(
+        { schema: Schema.Tuple([Schema.optionalKey(Schema.Tuple([Schema.String]))]) },
+        {
+          codes: makeCode(
+            `Schema.Tuple([Schema.optionalKey(Schema.Tuple([Schema.String]))])`,
+            `readonly [(readonly [string])?]`
+          )
+        }
+      )
+    })
+
+    it("optional union element imported from JSON Schema", () => {
+      assertJsonSchema({
+        schema: {
+          type: "array",
+          prefixItems: [{ anyOf: [{ type: "string" }, { type: "number" }] }],
+          items: false
+        }
+      }, {
+        codes: makeCode(
+          `Schema.Tuple([Schema.optionalKey(Schema.Union([Schema.String, Schema.Number.check(Schema.isFinite())]))])`,
+          `readonly [(string | number)?]`
+        )
+      })
+    })
+
     it("annotateKey", () => {
       assertSchema(
         { schema: Schema.Tuple([Schema.String.annotateKey({ "description": "a" })]) },
@@ -1113,6 +1163,20 @@ describe("toCodeDocument", () => {
   })
 
   it("TupleWithRest", () => {
+    assertSchema(
+      {
+        schema: Schema.TupleWithRest(
+          Schema.Tuple([Schema.optionalKey(Schema.Union([Schema.String, Schema.Number]))]),
+          [Schema.Boolean]
+        )
+      },
+      {
+        codes: makeCode(
+          `Schema.TupleWithRest(Schema.Tuple([Schema.optionalKey(Schema.Union([Schema.String, Schema.Number]))]), [Schema.Boolean])`,
+          `readonly [(string | number)?, ...Array<boolean>]`
+        )
+      }
+    )
     assertSchema(
       { schema: Schema.TupleWithRest(Schema.Tuple([Schema.String]), [Schema.Number]) },
       {
@@ -1147,6 +1211,42 @@ describe("toCodeDocument", () => {
   })
 
   describe("Struct", () => {
+    it("preserves a required __proto__ property in generated code", async () => {
+      const schema = Schema.Struct({ ["__proto__"]: Schema.String })
+      assertSchema({ schema }, {
+        codes: makeCode(
+          `Schema.Struct({ ["__proto__"]: Schema.String })`,
+          `{ readonly "__proto__": string }`
+        )
+      })
+
+      const document = SchemaRepresentation.toCodeDocument(SchemaRepresentation.toRepresentations([schema.ast]))
+      const generated: typeof schema = new Function("Schema", `return ${document.codes[0].runtime}`)(Schema)
+      assert.deepStrictEqual(Object.keys(generated.fields), ["__proto__"])
+      const decoding = new TestSchema.Asserts(generated).decoding()
+      await decoding.succeed({ ["__proto__"]: "value" })
+      await decoding.fail({}, `Missing key\n  at ["__proto__"]`)
+      await decoding.fail({ ["__proto__"]: 123 }, `Expected string\n  at ["__proto__"]`)
+    })
+
+    it("preserves an optional __proto__ property in generated code", async () => {
+      const schema = Schema.Struct({ ["__proto__"]: Schema.optionalKey(Schema.String) })
+      assertSchema({ schema }, {
+        codes: makeCode(
+          `Schema.Struct({ ["__proto__"]: Schema.optionalKey(Schema.String) })`,
+          `{ readonly "__proto__"?: string }`
+        )
+      })
+
+      const document = SchemaRepresentation.toCodeDocument(SchemaRepresentation.toRepresentations([schema.ast]))
+      const generated: typeof schema = new Function("Schema", `return ${document.codes[0].runtime}`)(Schema)
+      assert.deepStrictEqual(Object.keys(generated.fields), ["__proto__"])
+      const decoding = new TestSchema.Asserts(generated).decoding()
+      await decoding.succeed({})
+      await decoding.succeed({ ["__proto__"]: "value" })
+      await decoding.fail({ ["__proto__"]: 123 }, `Expected string\n  at ["__proto__"]`)
+    })
+
     it("empty struct", () => {
       assertSchema({ schema: Schema.Struct({}) }, {
         codes: makeCode("Schema.Struct({  })", "{  }")
diff --git a/repos/effect/packages/effect/test/schema/representation/toJson.test.ts b/repos/effect/packages/effect/test/schema/representation/toJson.test.ts
index 1d14cc7c7..67c5ecfe7 100644
--- a/repos/effect/packages/effect/test/schema/representation/toJson.test.ts
+++ b/repos/effect/packages/effect/test/schema/representation/toJson.test.ts
@@ -181,7 +181,7 @@ describe("SchemaRepresentation.toJson", () => {
           },
           checks: []
         }],
-        mode: "anyOf",
+        options: { mode: "anyOf" },
         checks: []
       },
       {
@@ -191,7 +191,7 @@ describe("SchemaRepresentation.toJson", () => {
           annotations: { title: "nested" },
           checks: []
         }],
-        mode: "anyOf",
+        options: { mode: "anyOf" },
         checks: []
       }
     )
diff --git a/repos/effect/packages/effect/test/schema/representation/toJsonSchemaDocument.test.ts b/repos/effect/packages/effect/test/schema/representation/toJsonSchemaDocument.test.ts
index 5a82c5a37..2edfe413a 100644
--- a/repos/effect/packages/effect/test/schema/representation/toJsonSchemaDocument.test.ts
+++ b/repos/effect/packages/effect/test/schema/representation/toJsonSchemaDocument.test.ts
@@ -1,5 +1,5 @@
 import { assert, describe, it } from "@effect/vitest"
-import { type JsonSchema, Schema, SchemaAST, SchemaRepresentation } from "effect"
+import { JsonSchema, Schema, SchemaAST, SchemaRepresentation } from "effect"
 import { throws } from "../../utils/assert.ts"
 
 function expectError(thunk: () => void, expected: string | Error): void {
@@ -26,7 +26,7 @@ const NumberRepresentation: SchemaRepresentation.Representation = {
 const EmptyUnionRepresentation: SchemaRepresentation.Representation = {
   _tag: "Union",
   types: [],
-  mode: "anyOf",
+  options: { mode: "anyOf" },
   checks: []
 }
 
@@ -34,9 +34,42 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
   // Representation documents are public, persistable inputs. These tests construct them
   // directly so the compiler is covered independently from Schema-to-Representation lowering.
   function compile(representation: SchemaRepresentation.Representation) {
-    return SchemaRepresentation.toJsonSchemaDocument({ representation, references: {} }).schema
+    return SchemaRepresentation.toJsonSchemaDocument(
+      { representation, references: {} },
+      { onExcessProperty: "error" }
+    ).schema
   }
 
+  describe("local reference round trips", () => {
+    for (
+      const [key, token] of [
+        ["Rate", "Rate"],
+        ["id~a/b", "id~0a~1b"],
+        ["Rate%", "Rate%25"],
+        ["id~a/b%25", "id~0a~1b%2525"]
+      ]
+    ) {
+      it(`preserves the definition named ${key}`, () => {
+        const input = JsonSchema.fromSchemaDraft2020_12({
+          $ref: `#/$defs/${token}`,
+          $defs: { [key]: { type: "string" } }
+        })
+        const imported = SchemaRepresentation.fromJsonSchemaDocument(input)
+        assert.strictEqual(Schema.is(imported)("value"), true)
+        assert.strictEqual(Schema.is(imported)(1), false)
+
+        const output = SchemaRepresentation.toJsonSchemaDocument(
+          SchemaRepresentation.toRepresentation(imported.ast)
+        )
+        assert.deepStrictEqual(Object.keys(output.definitions), [key])
+        const restored = SchemaRepresentation.fromJsonSchemaDocument(output)
+        assert.strictEqual(Schema.is(restored)("value"), true)
+        assert.strictEqual(Schema.is(restored)(1), false)
+        assert.strictEqual(output.schema.$ref, input.schema.$ref)
+      })
+    }
+  })
+
   describe("representation nodes", () => {
     const keywords = [
       ["Any", { _tag: "Any", checks: [] }, {}],
@@ -52,11 +85,11 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
       }],
       ["Symbol", { _tag: "Symbol", checks: [] }, {
         type: "string",
-        allOf: [{ pattern: "^Symbol\\((.*)\\)$" }]
+        allOf: [{ pattern: "^Symbol\\(([\\s\\S]*)\\)$" }]
       }],
       ["UniqueSymbol", { _tag: "UniqueSymbol", symbol: Symbol.for("value"), checks: [] }, {
         type: "string",
-        allOf: [{ pattern: "^Symbol\\((.*)\\)$" }]
+        enum: ["Symbol(value)"]
       }],
       ["Null", { _tag: "Null", checks: [] }, { type: "null" }],
       ["Never", { _tag: "Never", checks: [] }, { not: {} }]
@@ -70,6 +103,13 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
       })
     }
 
+    it("local UniqueSymbol", () => {
+      assert.deepStrictEqual(
+        compile({ _tag: "UniqueSymbol", symbol: Symbol("value"), checks: [] }),
+        { not: {} }
+      )
+    })
+
     it("compiles Suspend", () => {
       assert.deepStrictEqual(
         compile({
@@ -132,26 +172,18 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
       )
     })
 
-    it("preserves ambiguous Enum values", () => {
-      assert.deepStrictEqual(
-        compile({
-          _tag: "Enum",
-          enums: [
-            ["StringNaN", "NaN"],
-            ["NumberNaN", Number.NaN],
-            ["StringInfinity", "Infinity"],
-            ["NumberInfinity", Number.POSITIVE_INFINITY]
-          ],
-          checks: []
-        }),
-        {
-          anyOf: [
-            { type: "string", enum: ["NaN"], title: "StringNaN" },
-            { type: "string", enum: ["NaN"], title: "NumberNaN" },
-            { type: "string", enum: ["Infinity"], title: "StringInfinity" },
-            { type: "string", enum: ["Infinity"], title: "NumberInfinity" }
-          ]
-        }
+    it("rejects non-finite numeric Enum values", () => {
+      expectError(
+        () =>
+          compile({
+            _tag: "Enum",
+            enums: [
+              ["StringNaN", "NaN"],
+              ["NumberNaN", Number.NaN]
+            ],
+            checks: []
+          }),
+        `Invalid numeric enum value NaN\n  at ["representation"]["enums"][1][1]`
       )
     })
 
@@ -171,6 +203,18 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
   })
 
   describe("arrays and objects", () => {
+    it("compiles an empty Objects node as any non-null JSON value", () => {
+      assert.deepStrictEqual(
+        compile({
+          _tag: "Objects",
+          propertySignatures: [],
+          indexSignatures: [],
+          checks: []
+        }),
+        { not: { type: "null" } }
+      )
+    })
+
     it("compiles optional tuple elements", () => {
       assert.deepStrictEqual(
         compile({
@@ -187,9 +231,7 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
           prefixItems: [{ type: "string" }, {
             anyOf: [
               { type: "number" },
-              { type: "string", enum: ["NaN"] },
-              { type: "string", enum: ["Infinity"] },
-              { type: "string", enum: ["-Infinity"] }
+              { type: "string", enum: ["NaN", "Infinity", "-Infinity"] }
             ]
           }],
           maxItems: 2,
@@ -263,7 +305,7 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
             { _tag: "Literal", literal: "a", checks: [] },
             { _tag: "Literal", literal: "b", checks: [] }
           ],
-          mode: "anyOf",
+          options: { mode: "anyOf" },
           checks: []
         }),
         { type: "string", enum: ["a", "b"] }
@@ -278,7 +320,7 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
             { _tag: "Literal", literal: "a", checks: [] },
             { _tag: "Literal", literal: 1, checks: [] }
           ],
-          mode: "anyOf",
+          options: { mode: "anyOf" },
           checks: []
         }),
         {
@@ -455,7 +497,7 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
         compile({
           _tag: "Union",
           types: [StringRepresentation],
-          mode: "anyOf",
+          options: { mode: "anyOf" },
           checks: []
         }),
         { anyOf: [{ type: "string" }] }
@@ -592,7 +634,7 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
       }
 
       assert.deepStrictEqual(SchemaRepresentation.toJsonSchemaDocument(document).schema, {
-        anyOf: [{ type: "object" }, { type: "array" }],
+        not: { type: "null" },
         propertyNames: { type: "string" }
       })
     })
@@ -631,7 +673,7 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
             parameter: {
               _tag: "Union",
               types: [template, pattern],
-              mode: "anyOf",
+              options: { mode: "anyOf" },
               checks: []
             },
             type: StringRepresentation
@@ -645,7 +687,7 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
       assert.deepStrictEqual(Object.keys(schema.patternProperties ?? {}), ["^a[\\s\\S]*?$", "^b"])
     })
 
-    it("ignores boolean members while collecting index-signature patterns", () => {
+    it("does not extract a partial pattern from boolean applicator members", () => {
       const document: SchemaRepresentation.Document = {
         representation: {
           _tag: "Objects",
@@ -670,7 +712,7 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
 
       assert.deepStrictEqual(SchemaRepresentation.toJsonSchemaDocument(document).schema, {
         type: "object",
-        patternProperties: { "^a": { type: "string" } }
+        additionalProperties: true
       })
     })
 
@@ -694,7 +736,7 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
               { _tag: "Literal", literal: "a", checks: [] },
               { _tag: "Literal", literal: "b", checks: [] }
             ],
-            mode: "anyOf",
+            options: { mode: "anyOf" },
             checks: []
           }
         ],
@@ -705,7 +747,7 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
         SchemaRepresentation.toJsonSchemaDocument({ representation, references: {} }).schema,
         {
           type: "string",
-          pattern: `^p${SchemaAST.FINITE_PATTERN}x${SchemaAST.STRING_PATTERN}a|b$`
+          pattern: `^p${SchemaAST.FINITE_PATTERN}x${SchemaAST.STRING_PATTERN}(?:a|b)$`
         }
       )
 
@@ -836,7 +878,7 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
             checks: [check({ propertyNames: { minLength: 1 } })]
           }),
           {
-            anyOf: [{ type: "object" }, { type: "array" }],
+            not: { type: "null" },
             propertyNames: { minLength: 1 }
           }
         )
@@ -854,7 +896,7 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
             ]
           }),
           {
-            anyOf: [{ type: "object" }, { type: "array" }],
+            not: { type: "null" },
             propertyNames: { minLength: 1 },
             allOf: [{ propertyNames: { maxLength: 2 } }]
           }
@@ -889,7 +931,7 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
             }
           },
           required: ["value"],
-          additionalProperties: false
+          additionalProperties: true
         })
       })
 
diff --git a/repos/effect/packages/effect/test/schema/representation/toJsonSchemaMultiDocument.test.ts b/repos/effect/packages/effect/test/schema/representation/toJsonSchemaMultiDocument.test.ts
index af9cf09a1..1fa86fb49 100644
--- a/repos/effect/packages/effect/test/schema/representation/toJsonSchemaMultiDocument.test.ts
+++ b/repos/effect/packages/effect/test/schema/representation/toJsonSchemaMultiDocument.test.ts
@@ -1,7 +1,10 @@
 import { assert, describe, it } from "@effect/vitest"
-import { Schema, SchemaRepresentation, SchemaTransformation } from "effect"
+import { JsonSchema, Schema, SchemaRepresentation, SchemaTransformation } from "effect"
 import { throws } from "../../utils/assert.ts"
 
+// oxlint-disable-next-line @typescript-eslint/no-require-imports
+const AjvDraft07 = require("ajv")
+
 function expectError(thunk: () => void, expected: string | Error): void {
   if (typeof expected === "string") {
     throws(thunk, expected)
@@ -133,7 +136,7 @@ describe("SchemaRepresentation.toJsonSchemaMultiDocument", () => {
             child: { $ref: "#/$defs/ChildEncoded" }
           },
           required: ["child"],
-          additionalProperties: false
+          additionalProperties: true
         }
       })
     })
@@ -158,6 +161,155 @@ describe("SchemaRepresentation.toJsonSchemaMultiDocument", () => {
       })
     })
 
+    for (
+      const [identifier, token] of [
+        ["Rate", "Rate"],
+        ["id~a/b", "id~0a~1b"],
+        ["Rate%", "Rate%25"],
+        ["Rate%2F", "Rate%252F"],
+        ["Rate%25", "Rate%2525"]
+      ]
+    ) {
+      it(`rewrites callback references to the canonical ${identifier} definition`, () => {
+        const Content = Schema.String.annotate({ identifier })
+        const make = () =>
+          Schema.toCodecJson(
+            Schema.String.check(Schema.isMinLength(1)).pipe(
+              Schema.decodeTo(Content, stringIdentityTransformation)
+            )
+          )
+        const first = make()
+        const second = make()
+        const callback = Schema.Unknown.check(Schema.makeFilter(() => true, {
+          toJsonSchema: () => ({ $ref: `#/$defs/${token}Encoded_1` })
+        }))
+        const document = SchemaRepresentation.toRepresentations([first.ast, second.ast, callback.ast])
+        assert.deepStrictEqual(Object.keys(document.references), [`${identifier}Encoded`, `${identifier}Encoded_1`])
+        const output = SchemaRepresentation.toJsonSchemaMultiDocument(document)
+
+        assert.deepStrictEqual(Object.keys(output.definitions), [`${identifier}Encoded`])
+        assert.deepStrictEqual(output.schemas[2], { $ref: `#/$defs/${token}Encoded` })
+        for (const restored of SchemaRepresentation.fromJsonSchemaMultiDocument(output)) {
+          assert.strictEqual(Schema.is(restored)("value"), true)
+          assert.strictEqual(Schema.is(restored)(1), false)
+        }
+      })
+    }
+
+    it("rewrites callback references with encoded leading separators", () => {
+      const Content = Schema.String.annotate({ identifier: "Rate%" })
+      const make = () =>
+        Schema.toCodecJson(
+          Schema.String.check(Schema.isMinLength(1)).pipe(
+            Schema.decodeTo(Content, stringIdentityTransformation)
+          )
+        )
+      const callback = Schema.Unknown.check(Schema.makeFilter(() => true, {
+        toJsonSchema: () => ({ $ref: "#%2F$defs%2FRate%25Encoded_1" })
+      }))
+      const output = SchemaRepresentation.toJsonSchemaMultiDocument(
+        SchemaRepresentation.toRepresentations([make().ast, make().ast, callback.ast])
+      )
+
+      assert.deepStrictEqual(Object.keys(output.definitions), ["Rate%Encoded"])
+      assert.deepStrictEqual(output.schemas[2], { $ref: "#/$defs/Rate%25Encoded" })
+      assert.doesNotThrow(() => SchemaRepresentation.fromJsonSchemaMultiDocument(output))
+    })
+
+    for (
+      const $ref of [
+        "#/$defs/Rate%Encoded_1",
+        "#%2F$defs%2FRate%Encoded_1",
+        "#/$defs/Rate#Encoded_1"
+      ]
+    ) {
+      it(`rejects malformed callback reference ${JSON.stringify($ref)}`, () => {
+        const callback = Schema.Unknown.check(Schema.makeFilter(() => true, {
+          toJsonSchema: () => ({ $ref })
+        }))
+        expectError(
+          () =>
+            SchemaRepresentation.toJsonSchemaMultiDocument(
+              SchemaRepresentation.toRepresentations([callback.ast])
+            ),
+          `Invalid JSON Pointer URI fragment ${JSON.stringify($ref)}`
+        )
+      })
+    }
+
+    for (const separator of ["/", "%2F", "%2f", "~1", "%7E1"]) {
+      it(`distinguishes pointer separators from escaped slashes in ${separator} callback references`, () => {
+        const Content = Schema.String.annotate({ identifier: "Box/properties/value" })
+        const make = () =>
+          Schema.toCodecJson(
+            Schema.String.check(Schema.isMinLength(1)).pipe(
+              Schema.decodeTo(Content, stringIdentityTransformation)
+            )
+          )
+        const Box = Schema.Struct({ valueEncoded_1: Schema.Boolean }).annotate({ identifier: "Box" })
+        const $ref = `#/$defs/Box${separator}properties${separator}valueEncoded_1`
+        const callback = Schema.Unknown.check(Schema.makeFilter(() => true, {
+          toJsonSchema: () => ({ $ref })
+        }))
+        const output = SchemaRepresentation.toJsonSchemaMultiDocument(
+          SchemaRepresentation.toRepresentations([make().ast, make().ast, Box.ast, callback.ast])
+        )
+        // Normalize URI fragments before validation: Ajv alone treats %2F as token contents.
+        const document = JsonSchema.toDocumentDraft07({
+          dialect: output.dialect,
+          schema: output.schemas[3],
+          definitions: output.definitions
+        })
+        const validate = new AjvDraft07.default({ strict: false }).compile({
+          ...document.schema,
+          definitions: document.definitions
+        })
+        const isName = separator === "~1" || separator === "%7E1"
+        assert.strictEqual(validate(true), !isName)
+        assert.strictEqual(validate("value"), isName)
+        assert.strictEqual(output.schemas[3].$ref, isName ? "#/$defs/Box~1properties~1valueEncoded" : $ref)
+      })
+    }
+
+    it("preserves an encoded pointer suffix when rewriting a percent-named alias", () => {
+      const representation = SchemaRepresentation.toRepresentation(
+        Schema.Struct({ "value%2F": Schema.Boolean }).ast
+      ).representation
+      if (representation._tag !== "Objects") throw new Error("Expected an object representation")
+      const definition: SchemaRepresentation.Representation = {
+        ...representation,
+        annotations: { "~identifier": "Box%" }
+      }
+      const $ref = "#/$defs/Box%25_1%2Fproperties%2Fvalue%252F"
+      const reference = Object.freeze({ $ref, default: Object.freeze({ $ref }) })
+      const output = SchemaRepresentation.toJsonSchemaMultiDocument({
+        representations: [{
+          _tag: "Unknown",
+          checks: [{
+            _tag: "Filter",
+            aborted: false,
+            annotations: { toJsonSchema: () => reference }
+          }]
+        }],
+        references: { "Box%": definition, "Box%_1": definition }
+      })
+
+      assert.strictEqual(output.schemas[0].$ref, "#/$defs/Box%25%2Fproperties%2Fvalue%252F")
+      assert.deepStrictEqual(output.schemas[0].default, { $ref })
+      assert.strictEqual(reference.$ref, $ref)
+      const document = JsonSchema.toDocumentDraft07({
+        dialect: output.dialect,
+        schema: output.schemas[0],
+        definitions: output.definitions
+      })
+      const validate = new AjvDraft07.default({ strict: false }).compile({
+        ...document.schema,
+        definitions: document.definitions
+      })
+      assert.strictEqual(validate(true), true)
+      assert.strictEqual(validate("value"), false)
+    })
+
     // JSON Schema callbacks are user-provided and may have effects, so invocation count is observable.
     it("invokes each fallback callback once before deduplicating equivalent output", () => {
       let visits = 0
@@ -216,7 +368,8 @@ describe("SchemaRepresentation.toJsonSchemaMultiDocument", () => {
         type: "object",
         patternProperties: {
           "^key$": { type: "string" }
-        }
+        },
+        additionalProperties: true
       }])
     })
 
@@ -263,7 +416,7 @@ describe("SchemaRepresentation.toJsonSchemaMultiDocument", () => {
               ]
             }
           },
-          additionalProperties: false
+          additionalProperties: true
         },
         NodeEncoded: { $ref: "#/$defs/Objects_" }
       })
@@ -309,7 +462,7 @@ describe("SchemaRepresentation.toJsonSchemaMultiDocument", () => {
             next: { $ref: "#/$defs/Suspend_" }
           },
           required: ["next"],
-          additionalProperties: false
+          additionalProperties: true
         },
         NodeEncoded: {
           type: "object",
@@ -317,7 +470,7 @@ describe("SchemaRepresentation.toJsonSchemaMultiDocument", () => {
             next: { $ref: "#/$defs/Suspend_" }
           },
           required: ["next"],
-          additionalProperties: false
+          additionalProperties: true
         },
         Suspend_1: {
           type: "object",
@@ -325,7 +478,7 @@ describe("SchemaRepresentation.toJsonSchemaMultiDocument", () => {
             next: { $ref: "#/$defs/Suspend_1" }
           },
           required: ["next"],
-          additionalProperties: false
+          additionalProperties: true
         },
         NodeEncoded_1: {
           type: "object",
@@ -333,7 +486,7 @@ describe("SchemaRepresentation.toJsonSchemaMultiDocument", () => {
             next: { $ref: "#/$defs/Suspend_1" }
           },
           required: ["next"],
-          additionalProperties: false
+          additionalProperties: true
         }
       })
     })
@@ -389,7 +542,7 @@ describe("SchemaRepresentation.toJsonSchemaMultiDocument", () => {
           {
             _tag: "Union",
             types: [StringRepresentation, { _tag: "Boolean", checks: [] }],
-            mode: "oneOf",
+            options: { mode: "oneOf" },
             checks: []
           }
         ],
@@ -552,11 +705,12 @@ describe("SchemaRepresentation.toJsonSchemaMultiDocument", () => {
       assert.deepStrictEqual(output.schemas, [
         {
           type: "object",
-          patternProperties: { "^a": { type: "string" } }
+          patternProperties: { "^a": { type: "string" } },
+          additionalProperties: true
         },
         {
           type: "object",
-          additionalProperties: { type: "string" }
+          additionalProperties: true
         }
       ])
 
diff --git a/repos/effect/packages/effect/test/schema/representation/toRepresentation.test.ts b/repos/effect/packages/effect/test/schema/representation/toRepresentation.test.ts
index 16b959a72..55008b828 100644
--- a/repos/effect/packages/effect/test/schema/representation/toRepresentation.test.ts
+++ b/repos/effect/packages/effect/test/schema/representation/toRepresentation.test.ts
@@ -145,12 +145,27 @@ describe("SchemaRepresentation.toRepresentation", () => {
             { _tag: "String", checks: [] },
             { _tag: "BigInt", checks: [] }
           ],
-          mode: "anyOf",
           checks: []
         },
         references: {}
       })
     })
+
+    it("preserves supplied Union options and omits absent options", () => {
+      const unionOptions: SchemaAST.UnionOptions = { mode: "oneOf" }
+      const union = SchemaRepresentation.toRepresentation(
+        new SchemaAST.Union([Schema.String.ast, Schema.Number.ast], unionOptions)
+      ).representation
+
+      assert.strictEqual(union._tag, "Union")
+      if (union._tag === "Union") assert.strictEqual(union.options, unionOptions)
+
+      const withoutOptions = SchemaRepresentation.toRepresentation(
+        Schema.Union([Schema.String, Schema.Number]).ast
+      ).representation
+      assert.strictEqual(withoutOptions._tag, "Union")
+      assert.isFalse(Object.hasOwn(withoutOptions, "options"))
+    })
   })
 
   describe("encoded and type projections", () => {
diff --git a/repos/effect/packages/effect/test/schema/toCodec.test.ts b/repos/effect/packages/effect/test/schema/toCodec.test.ts
index 8e32c0626..0504e63de 100644
--- a/repos/effect/packages/effect/test/schema/toCodec.test.ts
+++ b/repos/effect/packages/effect/test/schema/toCodec.test.ts
@@ -510,6 +510,26 @@ describe("Serializers", () => {
 
         const decoding = asserts.decoding()
         await decoding.succeed("Symbol(a)", Symbol.for("a"))
+        await decoding.fail("Symbol(b)", `Expected "Symbol(a)"`)
+      })
+
+      it("Symbol with a multiline registry key", async () => {
+        const symbol = Symbol.for("a\nb")
+        const asserts = new TestSchema.Asserts(Schema.toCodecJson(Schema.Symbol))
+
+        await asserts.encoding().succeed(symbol, "Symbol(a\nb)")
+        await asserts.decoding().succeed("Symbol(a\nb)", symbol)
+      })
+
+      it("local UniqueSymbol", async () => {
+        const symbol = Symbol("a")
+        const asserts = new TestSchema.Asserts(Schema.toCodecJson(Schema.UniqueSymbol(symbol)))
+
+        const encoding = asserts.encoding()
+        await encoding.fail(symbol, "cannot serialize to string, Symbol is not registered")
+
+        const decoding = asserts.decoding()
+        await decoding.fail("Symbol(a)", "Expected never")
       })
 
       it("BigInt", async () => {
@@ -2053,7 +2073,7 @@ Expected "Infinity" | "-Infinity" | "NaN"`
 
         const decoding = asserts.decoding()
         await decoding.succeed("Symbol(a)", Symbol.for("a"))
-        await decoding.fail("a", `Expected a string representing a symbol`)
+        await decoding.fail("a", `Expected "Symbol(a)"`)
       })
 
       it("BigInt", async () => {
@@ -2857,7 +2877,7 @@ Expected "Infinity" | "-Infinity" | "NaN"`
     async function assertXmlFailure<T, E, RD>(schema: Schema.Codec<T, E, RD>, value: T, message: string) {
       const serializer = Schema.toEncoderXml(Schema.toCodecStringTree(schema))
       const r = await serializer(value).pipe(
-        Effect.mapError((err) => formatIssue(err.issue)),
+        Effect.mapError(formatIssue),
         Effect.result,
         Effect.runPromise
       )
diff --git a/repos/effect/packages/effect/test/schema/toJsonSchemaDocument.test.ts b/repos/effect/packages/effect/test/schema/toJsonSchemaDocument.test.ts
index cf963a934..78726c963 100644
--- a/repos/effect/packages/effect/test/schema/toJsonSchemaDocument.test.ts
+++ b/repos/effect/packages/effect/test/schema/toJsonSchemaDocument.test.ts
@@ -28,7 +28,10 @@ function assertJsonSchemaDocument<T, E, RD>(
   expected: { schema: JsonSchema.JsonSchema; definitions?: JsonSchema.Definitions },
   options?: Schema.ToJsonSchemaOptions
 ) {
-  const document = Schema.toJsonSchemaDocument(schema, options)
+  const document = Schema.toJsonSchemaDocument(schema, {
+    onExcessProperty: "error",
+    ...options
+  })
   deepStrictEqual(document, {
     dialect: "draft-2020-12",
     schema: expected.schema,
@@ -66,8 +69,9 @@ describe("toJsonSchemaDocument", () => {
       schema: {
         type: "object",
         patternProperties: {
-          "^Symbol\\((.*)\\)$": { type: "number" }
-        }
+          "^Symbol\\(([\\s\\S]*)\\)$": { type: "number" }
+        },
+        additionalProperties: false
       }
     })
   })
@@ -114,8 +118,20 @@ describe("toJsonSchemaDocument", () => {
       )
     })
 
-    describe("additionalProperties", () => {
-      it(`false (default)`, () => {
+    describe("onExcessProperty", () => {
+      it("defaults to ignore", () => {
+        deepStrictEqual(Schema.toJsonSchemaDocument(Schema.Struct({})).schema, {
+          not: { type: "null" }
+        })
+        deepStrictEqual(Schema.toJsonSchemaDocument(Schema.Struct({ a: Schema.String })).schema, {
+          type: "object",
+          properties: { a: { type: "string" } },
+          required: ["a"],
+          additionalProperties: true
+        })
+      })
+
+      it(`ignore (default)`, () => {
         const schema = Schema.Struct({ a: Schema.String })
 
         assertJsonSchemaDocument(schema, {
@@ -127,14 +143,14 @@ describe("toJsonSchemaDocument", () => {
               }
             },
             "required": ["a"],
-            "additionalProperties": false
+            "additionalProperties": true
           }
         }, {
-          additionalProperties: false
+          onExcessProperty: "ignore"
         })
       })
 
-      it(`true`, () => {
+      it(`error`, () => {
         const schema = Schema.Struct({ a: Schema.String })
 
         assertJsonSchemaDocument(schema, {
@@ -146,31 +162,43 @@ describe("toJsonSchemaDocument", () => {
               }
             },
             "required": ["a"],
-            "additionalProperties": true
+            "additionalProperties": false
           }
         }, {
-          additionalProperties: true
+          onExcessProperty: "error"
         })
       })
 
-      it(`schema`, () => {
-        const schema = Schema.Struct({ a: Schema.String })
-
-        assertJsonSchemaDocument(schema, {
+      it("applies to properties not covered by patternProperties", () => {
+        assertJsonSchemaDocument(Schema.Record(Schema.TemplateLiteral(["x-", Schema.String]), Schema.Number), {
           schema: {
-            "type": "object",
-            "properties": {
-              "a": {
-                "type": "string"
+            type: "object",
+            patternProperties: {
+              "^x-[\\s\\S]*?$": {
+                anyOf: [
+                  { type: "number" },
+                  { type: "string", enum: ["Infinity", "-Infinity", "NaN"] }
+                ]
               }
             },
-            "required": ["a"],
-            "additionalProperties": {
-              "type": "string"
-            }
+            additionalProperties: false
           }
         }, {
-          additionalProperties: { "type": "string" }
+          onExcessProperty: "error"
+        })
+      })
+
+      it("uses the representable part of an index-signature key", () => {
+        const key = Schema.String.check(Schema.makeFilter((value) => value.startsWith("x-")))
+
+        assertJsonSchemaDocument(Schema.Record(key, Schema.String), {
+          schema: {
+            type: "object",
+            propertyNames: { type: "string" },
+            additionalProperties: { type: "string" }
+          }
+        }, {
+          onExcessProperty: "error"
         })
       })
     })
@@ -749,7 +777,7 @@ describe("toJsonSchemaDocument", () => {
       {
         schema: {
           "type": "string",
-          "pattern": "^Symbol\\((.*)\\)$"
+          "pattern": "^Symbol\\(([\\s\\S]*)\\)$"
         }
       }
     )
@@ -762,7 +790,16 @@ describe("toJsonSchemaDocument", () => {
       {
         schema: {
           "type": "string",
-          "pattern": "^Symbol\\((.*)\\)$"
+          "enum": ["Symbol(a)"]
+        }
+      }
+    )
+
+    assertJsonSchemaDocument(
+      Schema.UniqueSymbol(Symbol("a")),
+      {
+        schema: {
+          "not": {}
         }
       }
     )
@@ -1020,6 +1057,12 @@ describe("toJsonSchemaDocument", () => {
         })
       })
 
+      it("emits isPattern source without RegExp flags", () => {
+        assertJsonSchemaDocument(Schema.String.check(Schema.isPattern(/^abb+$/i)), {
+          schema: { type: "string", pattern: "^abb+$" }
+        })
+      })
+
       it("escapes regexp syntax in literal string checks", () => {
         for (
           const [check, pattern] of [
@@ -1072,7 +1115,7 @@ describe("toJsonSchemaDocument", () => {
         assertJsonSchemaDocument(schema, {
           schema: {
             "type": "string",
-            "pattern": "^[^a-z]?.*$"
+            "pattern": "^(?:[^a-z][\\s\\S]*)?$"
           }
         })
       })
@@ -1082,7 +1125,7 @@ describe("toJsonSchemaDocument", () => {
         assertJsonSchemaDocument(schema, {
           schema: {
             "type": "string",
-            "pattern": "^[^A-Z]?.*$"
+            "pattern": "^(?:[^A-Z][\\s\\S]*)?$"
           }
         })
       })
@@ -1546,6 +1589,15 @@ describe("toJsonSchemaDocument", () => {
             }
           }
         )
+        assertJsonSchemaDocument(
+          Schema.Int.check(Schema.isMultipleOf(-2)),
+          {
+            schema: {
+              "type": "integer",
+              "multipleOf": 2
+            }
+          }
+        )
       })
     })
   })
@@ -2203,10 +2255,7 @@ describe("toJsonSchemaDocument", () => {
         schema,
         {
           schema: {
-            "anyOf": [
-              { "type": "object" },
-              { "type": "array" }
-            ]
+            "not": { "type": "null" }
           }
         }
       )
@@ -2214,14 +2263,7 @@ describe("toJsonSchemaDocument", () => {
         schema.annotate({ description: "a" }),
         {
           schema: {
-            "anyOf": [
-              {
-                "type": "object"
-              },
-              {
-                "type": "array"
-              }
-            ],
+            "not": { "type": "null" },
             "description": "a"
           }
         }
@@ -2707,6 +2749,33 @@ describe("toJsonSchemaDocument", () => {
       )
     })
 
+    it("Record(String, Struct({}))", () => {
+      assertJsonSchemaDocument(
+        Schema.Record(Schema.String, Schema.Struct({})),
+        {
+          schema: {
+            type: "object",
+            additionalProperties: { not: { type: "null" } }
+          }
+        }
+      )
+    })
+
+    it("Record(isStartsWith, Struct({}))", () => {
+      assertJsonSchemaDocument(
+        Schema.Record(Schema.String.check(Schema.isStartsWith("a")), Schema.Struct({})),
+        {
+          schema: {
+            type: "object",
+            patternProperties: {
+              "^a": { not: { type: "null" } }
+            },
+            additionalProperties: false
+          }
+        }
+      )
+    })
+
     it("Record(String, Finite)", () => {
       assertJsonSchemaDocument(
         Schema.Record(Schema.String, Schema.Finite),
@@ -2757,7 +2826,8 @@ describe("toJsonSchemaDocument", () => {
               "^a[\\s\\S]*?$": {
                 "type": "number"
               }
-            }
+            },
+            "additionalProperties": false
           }
         }
       )
@@ -2790,12 +2860,90 @@ describe("toJsonSchemaDocument", () => {
               "^[^a-z]*$": {
                 "type": "number"
               }
-            }
+            },
+            "additionalProperties": false
           }
         }
       )
     })
 
+    it("uses propertyNames for conjunctive record key patterns", () => {
+      assertJsonSchemaDocument(
+        Schema.Record(Schema.String.check(Schema.isPattern(/^ab/)), Schema.Finite),
+        {
+          schema: {
+            type: "object",
+            patternProperties: {
+              "^ab": { type: "number" }
+            },
+            additionalProperties: false
+          }
+        }
+      )
+      assertJsonSchemaDocument(
+        Schema.Record(
+          Schema.String.check(Schema.isPattern(/^ab/), Schema.isEndsWith("z")),
+          Schema.Finite
+        ),
+        {
+          schema: {
+            type: "object",
+            propertyNames: {
+              type: "string",
+              pattern: "^ab",
+              allOf: [{ pattern: "z$" }]
+            },
+            additionalProperties: { type: "number" }
+          }
+        }
+      )
+      assertJsonSchemaDocument(
+        Schema.Record(
+          Schema.String.check(Schema.isStartsWith("A"), Schema.isUppercased()),
+          Schema.Finite
+        ),
+        {
+          schema: {
+            type: "object",
+            propertyNames: {
+              type: "string",
+              pattern: "^A",
+              allOf: [{ pattern: "^[^a-z]*$" }]
+            },
+            additionalProperties: { type: "number" }
+          }
+        }
+      )
+    })
+
+    it("does not use a partial pattern as an index selector", () => {
+      const schema = Schema.Record(
+        Schema.String.check(Schema.isStartsWith("x"), Schema.isMinLength(3)),
+        Schema.Finite
+      )
+      assertJsonSchemaDocument(
+        schema,
+        {
+          schema: {
+            type: "object",
+            additionalProperties: true
+          }
+        },
+        { onExcessProperty: "ignore" }
+      )
+      assertJsonSchemaDocument(schema, {
+        schema: {
+          type: "object",
+          propertyNames: {
+            type: "string",
+            pattern: "^x",
+            minLength: 3
+          },
+          additionalProperties: { type: "number" }
+        }
+      })
+    })
+
     describe("checks", () => {
       it("isMinProperties", () => {
         assertJsonSchemaDocument(
@@ -2885,6 +3033,37 @@ describe("toJsonSchemaDocument", () => {
         }
       )
     })
+
+    it("property and compound pattern index", () => {
+      assertJsonSchemaDocument(
+        Schema.StructWithRest(Schema.Struct({ a: Schema.String }), [
+          Schema.Record(
+            Schema.String.check(Schema.isStartsWith("x"), Schema.isEndsWith("z")),
+            Schema.Finite
+          )
+        ]),
+        {
+          schema: {
+            type: "object",
+            properties: {
+              a: { type: "string" }
+            },
+            required: ["a"],
+            propertyNames: {
+              anyOf: [
+                { enum: ["a"] },
+                {
+                  type: "string",
+                  pattern: "^x",
+                  allOf: [{ pattern: "z$" }]
+                }
+              ]
+            },
+            additionalProperties: { type: "number" }
+          }
+        }
+      )
+    })
   })
 
   describe("Tuple", () => {
@@ -3254,6 +3433,20 @@ describe("toJsonSchemaDocument", () => {
       )
     })
 
+    it("does not compact duplicate enum values", () => {
+      assertJsonSchemaDocument(
+        Schema.Union([Schema.Literal("a"), Schema.Literal("a")]),
+        {
+          schema: {
+            anyOf: [
+              { type: "string", enum: ["a"] },
+              { type: "string", enum: ["a"] }
+            ]
+          }
+        }
+      )
+    })
+
     it("String | Number", () => {
       assertJsonSchemaDocument(
         Schema.Union([
diff --git a/repos/effect/packages/effect/test/schema/toStandardSchemaV1.test.ts b/repos/effect/packages/effect/test/schema/toStandardSchemaV1.test.ts
index 88ee43577..5521a68ec 100644
--- a/repos/effect/packages/effect/test/schema/toStandardSchemaV1.test.ts
+++ b/repos/effect/packages/effect/test/schema/toStandardSchemaV1.test.ts
@@ -1,5 +1,5 @@
 import { assertTrue, deepStrictEqual, strictEqual } from "@effect/vitest/utils"
-import { Context, Effect, Option, Predicate, Schema, SchemaGetter, SchemaIssue } from "effect"
+import { Context, Effect, type Option, Predicate, Schema, SchemaGetter, SchemaIssue } from "effect"
 import type { StandardSchemaV1 } from "effect/StandardSchema"
 import { describe, it } from "vitest"
 
@@ -90,7 +90,7 @@ const expectAsyncFailure = async <I, A>(
 }
 
 const AsyncString = Schema.String.pipe(Schema.decode({
-  decode: new SchemaGetter.Getter((os: Option.Option<string>) =>
+  decode: SchemaGetter.transformOptionalEffect((os: Option.Option<string>) =>
     Effect.gen(function*() {
       yield* Effect.sleep("10 millis")
       return os
@@ -155,10 +155,10 @@ describe("toStandardSchemaV1", () => {
 
     it("sync decoding should throw", () => {
       const DepString = Schema.Number.pipe(Schema.decode({
-        decode: SchemaGetter.onSome((n) =>
+        decode: SchemaGetter.transformEffect((n) =>
           Effect.gen(function*() {
             const magicNumber = yield* MagicNumber
-            return Option.some(n * magicNumber)
+            return n * magicNumber
           })
         ),
         encode: SchemaGetter.passthrough()
@@ -175,11 +175,11 @@ describe("toStandardSchemaV1", () => {
 
     it("async decoding should report a missing dependency", () => {
       const DepString = Schema.Number.pipe(Schema.decode({
-        decode: SchemaGetter.onSome((n) =>
+        decode: SchemaGetter.transformEffect((n) =>
           Effect.gen(function*() {
             const magicNumber = yield* MagicNumber
             yield* Effect.sleep("10 millis")
-            return Option.some(n * magicNumber)
+            return n * magicNumber
           })
         ),
         encode: SchemaGetter.passthrough()
diff --git a/repos/effect/packages/effect/test/testing/TestSchema.test.ts b/repos/effect/packages/effect/test/testing/TestSchema.test.ts
index 8f907885b..db060c20f 100644
--- a/repos/effect/packages/effect/test/testing/TestSchema.test.ts
+++ b/repos/effect/packages/effect/test/testing/TestSchema.test.ts
@@ -5,6 +5,68 @@ import * as SchemaTransformation from "effect/SchemaTransformation"
 import { TestSchema } from "effect/testing"
 
 describe("TestSchema", () => {
+  describe("ast.fields.equals", () => {
+    const equals = TestSchema.Asserts.ast.fields.equals
+
+    it("compares string and symbol fields by AST", () => {
+      const key = Symbol("field")
+      const fields = () => ({ field: Schema.Literal("value"), [key]: Schema.Literal("value") })
+      const left = fields()
+      const right = fields()
+      assert.notStrictEqual(left[key], right[key])
+      equals(left, right)
+    })
+
+    it("rejects missing or structurally different symbol fields", () => {
+      const key = Symbol("field")
+      assert.throws(() => equals({ [key]: Schema.Literal("left") }, { [key]: Schema.Literal("right") }))
+      assert.throws(() => equals({ [key]: Schema.Literal("value") }, {}))
+      assert.throws(() =>
+        equals(
+          { [key]: Schema.Literal("value").annotate({ title: "Field" }) },
+          { [key]: Schema.Literal("value") }
+        )
+      )
+      assert.throws(() =>
+        equals({ [key]: Schema.optionalKey(Schema.Literal("value")) }, { [key]: Schema.Literal("value") })
+      )
+    })
+
+    it("preserves symbol identity even with equal descriptions", () => {
+      const left: symbol = Symbol("field")
+      const right: symbol = Symbol("field")
+      const schema = Schema.Literal("value")
+      assert.notStrictEqual(left, right)
+      assert.throws(() => equals({ [left]: schema }, { [right]: schema }))
+    })
+
+    it("preserves own __proto__ and constructor fields", () => {
+      const fields = () => ({ ["__proto__"]: Schema.Literal("proto"), constructor: Schema.Literal("ctor") })
+      const left = fields()
+      assert.isTrue(Object.hasOwn(left, "__proto__"))
+      assert.isTrue(Object.hasOwn(left, "constructor"))
+      equals(left, fields())
+      assert.throws(() => equals(left, { constructor: Schema.Literal("ctor") }))
+      assert.throws(() => equals(left, { ["__proto__"]: Schema.Literal("other"), constructor: Schema.Literal("ctor") }))
+    })
+
+    it("uses the Struct own-key contract for non-enumerable fields", () => {
+      const key = Symbol("hidden")
+      const fields = (value: string): Schema.Struct.Fields =>
+        Object.defineProperties({}, {
+          hidden: { value: Schema.Literal(value) },
+          [key]: { value: Schema.Literal(value) }
+        })
+      const left = fields("value")
+      const right = fields("value")
+      assert.deepStrictEqual(Object.keys(left), [])
+      assert.deepStrictEqual(Schema.Struct(left).ast.propertySignatures.map((field) => field.name), ["hidden", key])
+      equals(left, right)
+      equals(left, { hidden: Schema.Literal("value"), [key]: Schema.Literal("value") })
+      assert.throws(() => equals(left, fields("other")))
+    })
+  })
+
   it("decoding", async () => {
     const schema = Schema.FiniteFromString.check(Schema.isGreaterThan(0))
     const asserts = new TestSchema.Asserts(schema)
diff --git a/repos/effect/packages/effect/test/unstable/ai/AiError.test.ts b/repos/effect/packages/effect/test/unstable/ai/AiError.test.ts
index 4e0e367ad..6892dfb51 100644
--- a/repos/effect/packages/effect/test/unstable/ai/AiError.test.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/AiError.test.ts
@@ -270,7 +270,6 @@ describe("AiError", () => {
       it("should be retryable", () => {
         const error = new AiError.ToolParameterValidationError({
           toolName: "GetWeather",
-          toolParams: { location: "NYC" },
           description: "Expected string"
         })
         assert.isTrue(error.isRetryable)
@@ -279,7 +278,6 @@ describe("AiError", () => {
       it("should format message with tool name", () => {
         const error = new AiError.ToolParameterValidationError({
           toolName: "GetWeather",
-          toolParams: { location: "NYC" },
           description: "Expected string"
         })
         assert.match(error.message, /Invalid parameters for tool 'GetWeather'/)
@@ -288,26 +286,23 @@ describe("AiError", () => {
       it("should format message with validation message", () => {
         const error = new AiError.ToolParameterValidationError({
           toolName: "GetWeather",
-          toolParams: { location: 123 },
           description: "Expected string, got number"
         })
         assert.match(error.message, /Expected string, got number/)
       })
 
-      it("should store tool params", () => {
-        const params = { location: 123 }
+      it("should construct when validated params contain non-JSON values", () => {
         const error = new AiError.ToolParameterValidationError({
           toolName: "GetWeather",
-          toolParams: params,
-          description: "Expected string"
+          description: `Expected finite number, got NaN at ["city"]`
         })
-        assert.deepStrictEqual(error.toolParams, params)
+        assert.strictEqual(error._tag, "ToolParameterValidationError")
+        assert.match(error.message, /NaN/)
       })
 
       it("should have _tag set correctly", () => {
         const error = new AiError.ToolParameterValidationError({
           toolName: "Test",
-          toolParams: {},
           description: "Error"
         })
         assert.strictEqual(error._tag, "ToolParameterValidationError")
@@ -768,7 +763,6 @@ describe("AiError", () => {
       Effect.gen(function*() {
         const error = new AiError.ToolParameterValidationError({
           toolName: "GetWeather",
-          toolParams: { location: 123 },
           description: "Expected string"
         })
         const encoded = yield* Schema.encodeEffect(AiError.ToolParameterValidationError)(error)
@@ -854,7 +848,6 @@ describe("AiError", () => {
 
         const paramError: AiError.AiErrorReason = new AiError.ToolParameterValidationError({
           toolName: "Test",
-          toolParams: {},
           description: "Error"
         })
         const paramEncoded = yield* Schema.encodeEffect(AiError.AiErrorReason)(paramError)
diff --git a/repos/effect/packages/effect/test/unstable/ai/Chat.test.ts b/repos/effect/packages/effect/test/unstable/ai/Chat.test.ts
index e3f89c046..92f6e8ad7 100644
--- a/repos/effect/packages/effect/test/unstable/ai/Chat.test.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/Chat.test.ts
@@ -1,7 +1,7 @@
 import { assert, describe, it } from "@effect/vitest"
 import { Effect, Layer, Predicate, Ref, Schema } from "effect"
 import { TestClock } from "effect/testing"
-import { Chat, IdGenerator, Prompt } from "effect/unstable/ai"
+import { Chat, IdGenerator, Prompt, Tool, Toolkit } from "effect/unstable/ai"
 import { Persistence } from "effect/unstable/persistence"
 import * as TestUtils from "./utils.ts"
 
@@ -16,6 +16,43 @@ const PersistenceLayer = Layer.provideMerge(
 )
 
 describe("Chat", () => {
+  it.effect("does not replay a completed approved tool", () => {
+    let executions = 0
+    const toolkit = Toolkit.make(Tool.make("Counter", {
+      parameters: Schema.Struct({}),
+      success: Schema.Number,
+      needsApproval: true
+    }))
+
+    return Effect.gen(function*() {
+      const chat = yield* Chat.empty
+      const initial = yield* chat.generateText({ prompt: "Run the counter", toolkit }).pipe(
+        TestUtils.withLanguageModel({
+          generateText: [{ type: "tool-call", id: "counter-call", name: "Counter", params: {} }]
+        })
+      )
+      const approval = initial.content.find((part) => part.type === "tool-approval-request")
+      assert.isDefined(approval)
+
+      yield* chat.generateText({
+        toolkit,
+        prompt: [Prompt.toolMessage({
+          content: [Prompt.toolApprovalResponsePart({ approvalId: approval.approvalId, approved: true })]
+        })]
+      }).pipe(
+        TestUtils.withLanguageModel({ generateText: [{ type: "text", text: "Complete" }] })
+      )
+
+      yield* chat.generateText({ prompt: "Continue", toolkit }).pipe(
+        TestUtils.withLanguageModel({ generateText: [{ type: "text", text: "Continued" }] })
+      )
+
+      assert.strictEqual(executions, 1)
+    }).pipe(
+      Effect.provide(toolkit.toLayer({ Counter: () => Effect.sync(() => ++executions) }))
+    )
+  })
+
   it.effect("should persist chat history to the backing persistence store", () =>
     Effect.gen(function*() {
       const storeId = "chat"
diff --git a/repos/effect/packages/effect/test/unstable/ai/DecisionModel.test.ts b/repos/effect/packages/effect/test/unstable/ai/DecisionModel.test.ts
new file mode 100644
index 000000000..f69b762bc
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/ai/DecisionModel.test.ts
@@ -0,0 +1,759 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Context, Effect, Layer, Schema, SchemaGetter } from "effect"
+import { Decision, DecisionModel, Model } from "effect/unstable/ai"
+import * as AiError from "effect/unstable/ai/AiError"
+
+const Ticket = Schema.Struct({
+  subject: Schema.String,
+  priority: Schema.FiniteFromString
+})
+
+const TicketTriage = Decision.make({
+  input: Ticket,
+  decisions: {
+    department: Decision.classify({
+      instructions: "Which team should handle this",
+      criteria: {
+        billing: "payments",
+        technical: "bugs",
+        sales: "pricing"
+      }
+    }),
+    frustration: Decision.rate({
+      instructions: "How frustrated",
+      criteria: ["calm", "frustrated", "angry"]
+    }),
+    urgent: Decision.probability({
+      instructions: "The message is time-sensitive",
+      criteria: {
+        false: "No time pressure",
+        true: "Needs action now"
+      }
+    })
+  }
+})
+
+const ticket = { subject: "Card was charged twice", priority: 3 }
+
+const expectedAnswers: Decision.Answers<typeof TicketTriage.decisions> = {
+  department: {
+    label: "billing",
+    probabilities: { billing: 0.8, technical: 0.15, sales: 0.05 },
+    confidence: 0.8
+  },
+  frustration: {
+    rating: 1.4,
+    label: "frustrated",
+    probabilities: { calm: 0.1, frustrated: 0.5, angry: 0.4 },
+    confidence: 0.5
+  },
+  urgent: {
+    probability: 0.9
+  }
+}
+
+const triageAnswers = {
+  department: { _tag: "Classify" as const, ...expectedAnswers.department },
+  frustration: { _tag: "Rate" as const, ...expectedAnswers.frustration },
+  urgent: { _tag: "Probability" as const, ...expectedAnswers.urgent }
+}
+
+const makeLayer = (
+  decide: (
+    options: DecisionModel.ProviderOptions
+  ) => Effect.Effect<DecisionModel.ProviderResponse, AiError.AiError>
+) =>
+  Layer.effect(
+    DecisionModel.DecisionModel,
+    DecisionModel.make({ decide })
+  )
+
+const succeedWith = (
+  answers: DecisionModel.ProviderResponse["answers"],
+  usage: DecisionModel.ProviderResponse["usage"] = { inputTokens: undefined, outputTokens: undefined }
+) => makeLayer(() => Effect.succeed({ answers, usage }))
+
+const failureOf = <A, E>(effect: Effect.Effect<A, E, DecisionModel.DecisionModel>) =>
+  effect.pipe(Effect.match({ onFailure: (error) => error, onSuccess: () => undefined }))
+
+class Redactor extends Context.Service<Redactor, {
+  readonly redact: (value: string) => string
+}>()("Redactor") {}
+
+const RedactedString = Schema.String.pipe(
+  Schema.decodeTo(Schema.String, {
+    decode: SchemaGetter.passthrough(),
+    encode: SchemaGetter.transformEffect<string, string, Redactor>((value) =>
+      Effect.map(Effect.service(Redactor), (redactor) => redactor.redact(value))
+    )
+  })
+)
+
+describe("Decision", () => {
+  it("make keeps the input schema and decisions", () => {
+    assert.strictEqual(TicketTriage.input, Ticket)
+    assert.deepStrictEqual(Object.keys(TicketTriage.decisions), ["department", "frustration", "urgent"])
+    assert.strictEqual(TicketTriage.decisions.department._tag, "Classify")
+    assert.strictEqual(TicketTriage.decisions.frustration._tag, "Rate")
+    assert.strictEqual(TicketTriage.decisions.urgent._tag, "Probability")
+  })
+
+  it("constructors keep instructions and criteria", () => {
+    assert.strictEqual(TicketTriage.decisions.department.instructions, "Which team should handle this")
+    assert.deepStrictEqual(TicketTriage.decisions.department.criteria, {
+      billing: "payments",
+      technical: "bugs",
+      sales: "pricing"
+    })
+    assert.deepStrictEqual(TicketTriage.decisions.frustration.criteria, ["calm", "frustrated", "angry"])
+    assert.deepStrictEqual(TicketTriage.decisions.urgent.criteria, {
+      false: "No time pressure",
+      true: "Needs action now"
+    })
+  })
+
+  it("probability accepts omitted criteria", () => {
+    const decision = Decision.probability({ instructions: "Needs action now" })
+
+    assert.strictEqual(decision._tag, "Probability")
+    assert.strictEqual(decision.instructions, "Needs action now")
+    assert.strictEqual(decision.criteria, undefined)
+  })
+
+  it("probability preserves explicit criteria, including empty descriptions", () => {
+    const criteria = { false: "", true: "Needs action now" }
+    const decision = Decision.probability({ instructions: "Is urgent", criteria })
+
+    assert.strictEqual(decision.instructions, "Is urgent")
+    assert.strictEqual(decision.criteria, criteria)
+  })
+
+  it("make fails on empty decisions", () => {
+    assert.throws(() => Decision.make({ input: Schema.String, decisions: {} }))
+  })
+
+  it("rate fails with fewer than two criteria", () => {
+    assert.throws(() => Decision.rate({ instructions: "How much", criteria: ["only"] as any }))
+  })
+})
+
+describe("DecisionModel", () => {
+  it.effect("probability without criteria reaches the provider and returns an answer", () => {
+    const definition = Decision.make({
+      input: Schema.String,
+      decisions: {
+        urgent: Decision.probability({ instructions: "Needs action now" })
+      }
+    })
+    const calls: Array<DecisionModel.ProviderOptions> = []
+
+    return Effect.gen(function*() {
+      const { answers } = yield* DecisionModel.decide(definition, { input: "Help now" })
+
+      assert.strictEqual(calls.length, 1)
+      assert.strictEqual(calls[0].state, "Help now")
+      assert.strictEqual(calls[0].decisions, definition.decisions)
+      assert.strictEqual(calls[0].decisions.urgent.criteria, undefined)
+      assert.deepStrictEqual(answers, { urgent: { probability: 0.9 } })
+    }).pipe(
+      Effect.provide(makeLayer((options) => {
+        calls.push(options)
+        return Effect.succeed({
+          answers: { urgent: triageAnswers.urgent },
+          usage: { inputTokens: undefined, outputTokens: undefined }
+        })
+      }))
+    )
+  })
+
+  for (const key of ["__proto__", "constructor", "toString"]) {
+    it.effect("preserves the own enumerable rate probability " + key, () => {
+      const definition = Decision.make({
+        input: Schema.String,
+        decisions: {
+          intensity: Decision.rate({
+            instructions: "How intense",
+            criteria: ["low", key, "high"]
+          })
+        }
+      })
+
+      return Effect.gen(function*() {
+        const { answers } = yield* DecisionModel.decide(definition, { input: "Help" })
+        const { label, probabilities, rating } = answers.intensity
+
+        assert.isTrue(Object.hasOwn(probabilities, key))
+        assert.isTrue(Object.getOwnPropertyDescriptor(probabilities, key)?.enumerable)
+        assert.deepStrictEqual(Object.keys(probabilities), ["low", key, "high"])
+        assert.deepStrictEqual(probabilities, { low: 0.1, [key]: 0.7, high: 0.2 })
+        assert.strictEqual(label, key)
+        assert.strictEqual(rating, 1.1)
+        assert.strictEqual(Object.getPrototypeOf(probabilities), null)
+      }).pipe(Effect.provide(succeedWith({
+        intensity: { _tag: "Rate", rating: 1.1, probabilities: { low: 0.1, [key]: 0.7, high: 0.2 } }
+      })))
+    })
+
+    it.effect("preserves the own enumerable answer key " + key, () => {
+      const definition = Decision.make({
+        input: Schema.String,
+        decisions: {
+          [key]: Decision.probability({
+            instructions: "Needs action now",
+            criteria: { false: "No", true: "Yes" }
+          })
+        }
+      })
+
+      return Effect.gen(function*() {
+        const { answers } = yield* DecisionModel.decide(definition, { input: "Help" })
+
+        assert.strictEqual(Object.getPrototypeOf(answers), null)
+        assert.isTrue(Object.hasOwn(answers, key))
+        assert.isTrue(Object.getOwnPropertyDescriptor(answers, key)?.enumerable)
+        assert.deepStrictEqual(Object.keys(answers), [key])
+        assert.deepStrictEqual(answers[key], { probability: 0.75 })
+      }).pipe(Effect.provide(succeedWith({ [key]: { _tag: "Probability", probability: 0.75 } })))
+    })
+
+    it.effect("preserves the own enumerable classification probability " + key, () => {
+      const definition = Decision.make({
+        input: Schema.String,
+        decisions: {
+          category: Decision.classify({
+            instructions: "Choose a category",
+            criteria: { [key]: "Special category", ordinary: "Ordinary category" }
+          })
+        }
+      })
+
+      return Effect.gen(function*() {
+        const { answers } = yield* DecisionModel.decide(definition, { input: "Help" })
+        const probabilities = answers.category.probabilities
+
+        assert.strictEqual(Object.getPrototypeOf(probabilities), null)
+        assert.isTrue(Object.hasOwn(probabilities, key))
+        assert.isTrue(Object.getOwnPropertyDescriptor(probabilities, key)?.enumerable)
+        assert.deepStrictEqual(Object.keys(probabilities), [key, "ordinary"])
+        assert.strictEqual(probabilities[key], 0.75)
+        assert.strictEqual(probabilities.ordinary, 0.25)
+        assert.strictEqual(answers.category.label, key)
+      }).pipe(Effect.provide(succeedWith({
+        category: { _tag: "Classify", label: key, probabilities: { [key]: 0.75, ordinary: 0.25 } }
+      })))
+    })
+  }
+
+  it.effect("round trips usage with undefined tokens through JSON", () =>
+    Effect.gen(function*() {
+      const usage = new DecisionModel.DecisionUsage({ inputTokens: undefined, outputTokens: undefined })
+
+      const encoded = yield* Schema.encodeEffect(DecisionModel.DecisionUsage)(usage)
+      const json = JSON.parse(JSON.stringify(encoded))
+      const decoded = yield* Schema.decodeUnknownEffect(DecisionModel.DecisionUsage)(json)
+
+      assert.deepStrictEqual(json, {}, "encoded JSON")
+      assert.deepStrictEqual(decoded, new DecisionModel.DecisionUsage({}), "decoded usage")
+    }))
+
+  it.effect("decide returns answers keyed by decision with usage", () =>
+    Effect.gen(function*() {
+      const { answers, usage } = yield* DecisionModel.decide(TicketTriage, { input: ticket })
+
+      assert.deepStrictEqual(Object.keys(answers).sort(), ["department", "frustration", "urgent"])
+
+      assert.strictEqual(answers.department.label, "billing")
+      assert.deepStrictEqual(answers.department.probabilities, { billing: 0.8, technical: 0.15, sales: 0.05 })
+      assert.strictEqual(answers.department.confidence, 0.8)
+
+      assert.strictEqual(answers.frustration.rating, 1.4)
+      assert.strictEqual(answers.frustration.label, "frustrated")
+      assert.deepStrictEqual(answers.frustration.probabilities, { calm: 0.1, frustrated: 0.5, angry: 0.4 })
+      assert.strictEqual(answers.frustration.confidence, 0.5)
+
+      assert.strictEqual(answers.urgent.probability, 0.9)
+      assert.isFalse("confidence" in answers.urgent)
+      assert.isFalse("probabilities" in answers.urgent)
+
+      assert.strictEqual(usage.inputTokens, 12)
+      assert.strictEqual(usage.outputTokens, undefined)
+    }).pipe(
+      Effect.provide(succeedWith(triageAnswers, { inputTokens: 12, outputTokens: undefined }))
+    ))
+
+  it.effect("classify and rate retain distributions when the provider omits confidence", () =>
+    Effect.gen(function*() {
+      const { answers } = yield* DecisionModel.decide(TicketTriage, { input: ticket })
+
+      assert.deepStrictEqual(answers.department, {
+        label: "billing",
+        probabilities: { billing: 0.8, technical: 0.15, sales: 0.05 }
+      })
+      assert.isFalse("confidence" in answers.department)
+
+      assert.deepStrictEqual(answers.frustration, {
+        rating: 1.4,
+        label: "frustrated",
+        probabilities: { calm: 0.1, frustrated: 0.5, angry: 0.4 }
+      })
+      assert.isFalse("confidence" in answers.frustration)
+    }).pipe(
+      Effect.provide(succeedWith({
+        department: {
+          _tag: "Classify",
+          label: "billing",
+          probabilities: { billing: 0.8, technical: 0.15, sales: 0.05 }
+        },
+        frustration: {
+          _tag: "Rate",
+          rating: 1.4,
+          probabilities: { calm: 0.1, frustrated: 0.5, angry: 0.4 }
+        },
+        urgent: triageAnswers.urgent
+      }))
+    ))
+
+  it.effect("the service exposes the same decide operation", () =>
+    Effect.gen(function*() {
+      const model = yield* DecisionModel.DecisionModel
+      const { answers } = yield* model.decide(TicketTriage, { input: ticket })
+
+      assert.strictEqual(answers.department.label, "billing")
+      assert.strictEqual(answers.urgent.probability, 0.9)
+    }).pipe(
+      Effect.provide(succeedWith(triageAnswers))
+    ))
+
+  it.effect("the provider receives the encoded input as state and every decision in one call", () => {
+    const calls: Array<DecisionModel.ProviderOptions> = []
+
+    return Effect.gen(function*() {
+      yield* DecisionModel.decide(TicketTriage, { input: ticket })
+
+      assert.strictEqual(calls.length, 1)
+      assert.deepStrictEqual(calls[0].state, { subject: "Card was charged twice", priority: "3" })
+      assert.strictEqual(calls[0].decisions, TicketTriage.decisions)
+    }).pipe(
+      Effect.provide(
+        makeLayer((options) => {
+          calls.push(options)
+          return Effect.succeed({
+            answers: triageAnswers,
+            usage: { inputTokens: undefined, outputTokens: undefined }
+          })
+        })
+      )
+    )
+  })
+
+  it.effect("a string input is passed to the provider as a string state", () => {
+    const states: Array<unknown> = []
+    const Sentiment = Decision.make({
+      input: Schema.String,
+      decisions: {
+        tone: Decision.classify({
+          instructions: "Tone of the message",
+          criteria: { positive: "happy", negative: "unhappy" }
+        })
+      }
+    })
+
+    return Effect.gen(function*() {
+      const { answers } = yield* DecisionModel.decide(Sentiment, { input: "I love this" })
+
+      assert.deepStrictEqual(states, ["I love this"])
+      assert.strictEqual(answers.tone.label, "positive")
+    }).pipe(
+      Effect.provide(
+        makeLayer(({ state }) => {
+          states.push(state)
+          return Effect.succeed({
+            answers: {
+              tone: {
+                _tag: "Classify" as const,
+                label: "positive",
+                probabilities: { positive: 0.95, negative: 0.05 },
+                confidence: 0.95
+              }
+            },
+            usage: { inputTokens: undefined, outputTokens: undefined }
+          })
+        })
+      )
+    )
+  })
+
+  it.effect("derives JSON codecs for nested input before calling the provider", () => {
+    const states: Array<unknown> = []
+    const definition = Decision.make({
+      input: Schema.Struct({
+        amount: Schema.BigInt,
+        createdAt: Schema.Date,
+        priority: Schema.FiniteFromString,
+        values: Schema.Array(Schema.BigInt)
+      }),
+      decisions: TicketTriage.decisions
+    })
+
+    return Effect.gen(function*() {
+      yield* DecisionModel.decide(definition, {
+        input: { amount: 42n, createdAt: new Date("2026-01-01T00:00:00.000Z"), priority: 3, values: [1n, 2n] }
+      })
+
+      assert.deepStrictEqual(states, [{
+        amount: "42",
+        createdAt: "2026-01-01T00:00:00.000Z",
+        priority: "3",
+        values: ["1", "2"]
+      }])
+    }).pipe(Effect.provide(makeLayer(({ state }) => {
+      states.push(state)
+      return Effect.succeed({ answers: triageAnswers, usage: { inputTokens: undefined, outputTokens: undefined } })
+    })))
+  })
+
+  it.effect("JSON encoding distinguishes absent optional fields from explicit undefined", () => {
+    const states: Array<unknown> = []
+    const definition = Decision.make({
+      input: Schema.Struct({ note: Schema.optional(Schema.String) }),
+      decisions: TicketTriage.decisions
+    })
+
+    return Effect.gen(function*() {
+      yield* DecisionModel.decide(definition, { input: {} })
+      yield* DecisionModel.decide(definition, { input: { note: undefined } })
+
+      assert.deepStrictEqual(states, [{}, { note: null }])
+    }).pipe(Effect.provide(makeLayer(({ state }) => {
+      states.push(state)
+      return Effect.succeed({ answers: triageAnswers, usage: { inputTokens: undefined, outputTokens: undefined } })
+    })))
+  })
+
+  it.effect("JSON codec encoding failures become InvalidUserInputError before the provider runs", () => {
+    let calls = 0
+    const definition = Decision.make({
+      input: Schema.declare<Date>((value): value is Date => value instanceof Date),
+      decisions: TicketTriage.decisions
+    })
+
+    return Effect.gen(function*() {
+      const error = yield* failureOf(DecisionModel.decide(definition, { input: new Date("2026-01-01") }))
+
+      assert.strictEqual(calls, 0)
+      assert.isTrue(AiError.isAiError(error))
+      assert.strictEqual(error?.reason._tag, "InvalidUserInputError")
+    }).pipe(Effect.provide(makeLayer(() => {
+      calls++
+      return Effect.succeed({ answers: triageAnswers, usage: { inputTokens: undefined, outputTokens: undefined } })
+    })))
+  })
+
+  it.effect("input encoding services are resolved from the environment", () => {
+    const states: Array<unknown> = []
+    const Redacted = Decision.make({
+      input: Schema.Struct({ body: RedactedString }),
+      decisions: {
+        urgent: Decision.probability({
+          instructions: "Needs action now",
+          criteria: { false: "No", true: "Yes" }
+        })
+      }
+    })
+
+    return Effect.gen(function*() {
+      yield* DecisionModel.decide(Redacted, { input: { body: "call me at 555-0100" } })
+
+      assert.deepStrictEqual(states, [{ body: "call me at [redacted]" }])
+    }).pipe(
+      Effect.provide(
+        makeLayer(({ state }) => {
+          states.push(state)
+          return Effect.succeed({
+            answers: { urgent: { _tag: "Probability" as const, probability: 0.5 } },
+            usage: { inputTokens: undefined, outputTokens: undefined }
+          })
+        })
+      ),
+      Effect.provideService(Redactor, {
+        redact: (value) => value.replace(/\d{3}-\d{4}/g, "[redacted]")
+      })
+    )
+  })
+
+  it.effect("input encoding failures surface as AiError", () => {
+    let calls = 0
+    const Strict = Decision.make({
+      input: Schema.String.check(Schema.isMinLength(3)),
+      decisions: {
+        urgent: Decision.probability({
+          instructions: "Needs action now",
+          criteria: { false: "No", true: "Yes" }
+        })
+      }
+    })
+
+    return Effect.gen(function*() {
+      const error = yield* failureOf(DecisionModel.decide(Strict, { input: "hi" }))
+
+      assert.strictEqual(calls, 0)
+      assert.isTrue(AiError.isAiError(error))
+      assert.strictEqual(error?.reason._tag, "InvalidUserInputError")
+    }).pipe(
+      Effect.provide(
+        makeLayer(() => {
+          calls++
+          return Effect.die("provider should not be called")
+        })
+      )
+    )
+  })
+
+  it.effect("provider AiError propagates through decide", () => {
+    const error = AiError.make({
+      module: "DecisionModelTest",
+      method: "decide",
+      reason: new AiError.UnknownError({ description: "boom" })
+    })
+
+    return Effect.gen(function*() {
+      const result = yield* failureOf(DecisionModel.decide(TicketTriage, { input: ticket }))
+
+      assert.strictEqual(result, error)
+    }).pipe(
+      Effect.provide(makeLayer(() => Effect.fail(error)))
+    )
+  })
+
+  it.effect("decide fails with InvalidOutputError when an answer is missing", () =>
+    Effect.gen(function*() {
+      const error = yield* failureOf(DecisionModel.decide(TicketTriage, { input: ticket }))
+
+      assert.strictEqual(error?.reason._tag, "InvalidOutputError")
+    }).pipe(
+      Effect.provide(succeedWith({
+        department: triageAnswers.department,
+        frustration: triageAnswers.frustration
+      }))
+    ))
+
+  it.effect("decide fails with InvalidOutputError when a classify label is not a criteria key", () =>
+    Effect.gen(function*() {
+      const error = yield* failureOf(DecisionModel.decide(TicketTriage, { input: ticket }))
+
+      assert.strictEqual(error?.reason._tag, "InvalidOutputError")
+    }).pipe(
+      Effect.provide(succeedWith({
+        ...triageAnswers,
+        department: { ...triageAnswers.department, label: "legal" }
+      }))
+    ))
+
+  it.effect("decide fails with InvalidOutputError when a classify distribution is incomplete", () =>
+    Effect.gen(function*() {
+      const error = yield* failureOf(DecisionModel.decide(TicketTriage, { input: ticket }))
+
+      assert.strictEqual(error?.reason._tag, "InvalidOutputError")
+    }).pipe(
+      Effect.provide(succeedWith({
+        ...triageAnswers,
+        department: { ...triageAnswers.department, probabilities: { billing: 1 } }
+      }))
+    ))
+
+  it.effect("decide fails with InvalidOutputError when a rate distribution is incomplete", () =>
+    Effect.gen(function*() {
+      const error = yield* failureOf(DecisionModel.decide(TicketTriage, { input: ticket }))
+
+      assert.strictEqual(error?.reason._tag, "InvalidOutputError")
+    }).pipe(
+      Effect.provide(succeedWith({
+        ...triageAnswers,
+        frustration: { ...triageAnswers.frustration, probabilities: { calm: 0.5, angry: 0.5 } }
+      }))
+    ))
+
+  it.effect("decide fails with InvalidOutputError when a probability is outside [0, 1]", () =>
+    Effect.gen(function*() {
+      const error = yield* failureOf(DecisionModel.decide(TicketTriage, { input: ticket }))
+
+      assert.strictEqual(error?.reason._tag, "InvalidOutputError")
+    }).pipe(
+      Effect.provide(succeedWith({
+        ...triageAnswers,
+        urgent: { _tag: "Probability" as const, probability: 1.5 }
+      }))
+    ))
+
+  it.effect("Model.make wraps a DecisionModel layer with provider metadata", () =>
+    Effect.gen(function*() {
+      const provider = yield* Model.ProviderName
+      const modelName = yield* Model.ModelName
+      const { answers } = yield* DecisionModel.decide(TicketTriage, { input: ticket })
+
+      assert.strictEqual(provider, "fake")
+      assert.strictEqual(modelName, "fake-decisions")
+      assert.strictEqual(answers.department.label, "billing")
+    }).pipe(
+      Effect.provide(Model.make("fake", "fake-decisions", succeedWith(triageAnswers)))
+    ))
+})
+
+describe("Decision validation contracts", () => {
+  for (const criteria of [{}, { only: "Only label" }] as Array<Record<string, string>>) {
+    it(`classify rejects ${Object.keys(criteria).length} labels`, () => {
+      assert.throws(() => Decision.classify({ instructions: "Choose", criteria }))
+    })
+  }
+
+  it("rate rejects duplicate levels", () => {
+    assert.throws(() => Decision.rate({ instructions: "Rate", criteria: ["low", "high", "low"] }))
+  })
+
+  it.effect("rate derives the argmax label without a provider label", () =>
+    Effect.gen(function*() {
+      // Exercise untrusted provider output; the positive typetest pins the provider type separately.
+      const { label: _, ...frustration } = triageAnswers.frustration
+      const { answers } = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+        Effect.provide(
+          succeedWith({ ...triageAnswers, frustration } as unknown as DecisionModel.ProviderResponse["answers"])
+        )
+      )
+      assert.strictEqual(answers.frustration.label, "frustrated")
+    }))
+
+  for (
+    const [name, probabilities, expected] of [
+      ["ignores a conflicting provider label", { calm: 0.1, frustrated: 0.5, angry: 0.4 }, "frustrated"],
+      // Deliberately reverse insertion order: ties follow criteria, not provider key order.
+      ["breaks ties in criteria order", { angry: 0.5, frustrated: 0.5, calm: 0 }, "frustrated"]
+    ] as const
+  ) {
+    it.effect(`rate ${name}`, () =>
+      Effect.gen(function*() {
+        const { answers } = yield* DecisionModel.decide(TicketTriage, { input: ticket })
+        assert.strictEqual(answers.frustration.label, expected)
+      }).pipe(Effect.provide(succeedWith(
+        {
+          ...triageAnswers,
+          frustration: { ...triageAnswers.frustration, label: "angry", probabilities }
+        } as unknown as DecisionModel.ProviderResponse["answers"]
+      ))))
+  }
+
+  it.effect("classify retains the provider label even when it is not the argmax", () =>
+    Effect.gen(function*() {
+      const { answers } = yield* DecisionModel.decide(TicketTriage, { input: ticket })
+      assert.strictEqual(answers.department.label, "sales")
+    }).pipe(Effect.provide(succeedWith({
+      ...triageAnswers,
+      department: { ...triageAnswers.department, label: "sales" }
+    }))))
+
+  for (const key of ["department", "frustration"] as const) {
+    for (const confidence of [-Number.EPSILON, 1 + Number.EPSILON, NaN, Infinity, -Infinity]) {
+      it.effect(`${key} rejects confidence ${confidence}`, () =>
+        Effect.gen(function*() {
+          const error = yield* failureOf(DecisionModel.decide(TicketTriage, { input: ticket }))
+          assert.strictEqual(error?.reason._tag, "InvalidOutputError")
+        }).pipe(Effect.provide(succeedWith({
+          ...triageAnswers,
+          [key]: { ...triageAnswers[key], confidence }
+        }))))
+    }
+    for (const confidence of [0, 1]) {
+      it.effect(`${key} accepts confidence boundary ${confidence}`, () =>
+        Effect.gen(function*() {
+          const { answers } = yield* DecisionModel.decide(TicketTriage, { input: ticket })
+          assert.strictEqual(answers[key].confidence, confidence)
+        }).pipe(Effect.provide(succeedWith({
+          ...triageAnswers,
+          [key]: { ...triageAnswers[key], confidence }
+        }))))
+    }
+
+    for (
+      const [total, accepted] of [
+        [1, true],
+        [1 - 0.5e-6, true],
+        [1 + 0.5e-6, true],
+        [1 + 1e-6, true],
+        // Adjacent representable totals straddle the lower tolerance boundary.
+        [0.9999990000000001, true],
+        [0.9999989999999999, false],
+        [1 + 1e-6 + Number.EPSILON, false],
+        [0.99, false],
+        [1.01, false],
+        [0, false]
+      ] as const
+    ) {
+      it.effect(`${key} ${accepted ? "accepts" : "rejects"} distribution total ${total}`, () => {
+        const probabilities = key === "department"
+          ? { billing: total / 2, technical: total / 2, sales: 0 }
+          : { calm: total / 2, frustrated: total / 2, angry: 0 }
+        return Effect.gen(function*() {
+          const result = yield* DecisionModel.decide(TicketTriage, { input: ticket }).pipe(
+            Effect.match({ onFailure: (error) => error, onSuccess: (response) => response })
+          )
+          if (accepted) {
+            assert.isFalse(AiError.isAiError(result))
+            if (!AiError.isAiError(result)) {
+              assert.deepStrictEqual(result.answers[key].probabilities, probabilities)
+            }
+          } else {
+            assert.isTrue(AiError.isAiError(result))
+            if (AiError.isAiError(result)) {
+              assert.strictEqual(result.reason._tag, "InvalidOutputError")
+            }
+          }
+        }).pipe(Effect.provide(succeedWith({
+          ...triageAnswers,
+          [key]: { ...triageAnswers[key], probabilities }
+        })))
+      })
+    }
+  }
+
+  for (const rating of [-Number.EPSILON, 2 + 2 * Number.EPSILON, NaN, Infinity, -Infinity]) {
+    it.effect(`rate rejects rating ${rating}`, () =>
+      Effect.gen(function*() {
+        const error = yield* failureOf(DecisionModel.decide(TicketTriage, { input: ticket }))
+        assert.strictEqual(error?.reason._tag, "InvalidOutputError")
+      }).pipe(Effect.provide(succeedWith({
+        ...triageAnswers,
+        frustration: { ...triageAnswers.frustration, rating }
+      }))))
+  }
+  for (const rating of [0, 1.4, 2]) {
+    it.effect(`rate accepts rating ${rating}`, () =>
+      Effect.gen(function*() {
+        const { answers } = yield* DecisionModel.decide(TicketTriage, { input: ticket })
+        assert.strictEqual(answers.frustration.rating, rating)
+      }).pipe(Effect.provide(succeedWith({
+        ...triageAnswers,
+        frustration: { ...triageAnswers.frustration, rating }
+      }))))
+  }
+
+  it.effect("extra provider keys never leak into answers", () => {
+    const raw = {
+      ...triageAnswers,
+      extraDecision: { _tag: "Probability" as const, probability: 0.5 },
+      department: {
+        ...triageAnswers.department,
+        extra: "discard",
+        probabilities: { ...triageAnswers.department.probabilities, extra: 1 }
+      },
+      frustration: {
+        ...triageAnswers.frustration,
+        extra: "discard",
+        probabilities: { ...triageAnswers.frustration.probabilities, extra: 1 }
+      },
+      urgent: { ...triageAnswers.urgent, confidence: 1, probabilities: { false: 0.1, true: 0.9 }, extra: "discard" }
+    }
+    return Effect.gen(function*() {
+      const { answers } = yield* DecisionModel.decide(TicketTriage, { input: ticket })
+      assert.deepStrictEqual(answers, expectedAnswers)
+    }).pipe(Effect.provide(succeedWith(raw)))
+  })
+})
diff --git a/repos/effect/packages/effect/test/unstable/ai/LanguageModel.test.ts b/repos/effect/packages/effect/test/unstable/ai/LanguageModel.test.ts
index 7cbd2966e..c7ff045b2 100644
--- a/repos/effect/packages/effect/test/unstable/ai/LanguageModel.test.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/LanguageModel.test.ts
@@ -30,6 +30,15 @@ const TransformToolkitLayer = TransformToolkit.toLayer({
   TransformTool: (value) => Effect.succeed(value * 2)
 })
 
+const ReturnModeTool = Tool.make("ReturnModeTool", {
+  failureMode: "return",
+  parameters: Schema.Struct({ testParam: Schema.String }),
+  success: Schema.Struct({ testSuccess: Schema.String }),
+  failure: Schema.Struct({ testFailure: Schema.String })
+})
+
+const ReturnModeToolkit = Toolkit.make(ReturnModeTool)
+
 const ApprovalTool = Tool.make("ApprovalTool", {
   parameters: Schema.Struct({ action: Schema.String }),
   success: Schema.Struct({ result: Schema.String }),
@@ -216,6 +225,99 @@ describe("LanguageModel", () => {
         }),
         Effect.provide(TransformToolkitLayer)
       ))
+
+    it.effect("preserves encoded tool parameters when tool call resolution is enabled", () =>
+      Effect.gen(function*() {
+        const response = yield* LanguageModel.generateText({
+          prompt: [],
+          toolkit: TransformToolkit
+        })
+
+        const toolCall = response.toolCalls[0]!
+        strictEqual(toolCall.params, "21")
+
+        const toolResult = response.toolResults[0]!
+        strictEqual(toolResult.isFailure, false)
+        strictEqual(toolResult.result, 42)
+      }).pipe(
+        TestUtils.withLanguageModel({
+          generateText: [{
+            type: "tool-call",
+            id: "tool-transform",
+            name: "TransformTool",
+            params: "21"
+          }]
+        }),
+        Effect.provide(TransformToolkitLayer)
+      ))
+
+    it.effect("validates provider-executed tool call parameters", () =>
+      Effect.gen(function*() {
+        const calls = yield* Ref.make(0)
+        const handlers = MyToolkit.toLayer({
+          MyTool: () =>
+            Ref.update(calls, (n) => n + 1).pipe(
+              Effect.as({ testSuccess: "test-success" })
+            )
+        })
+
+        const error = yield* LanguageModel.generateText({
+          prompt: [],
+          toolkit: MyToolkit
+        }).pipe(
+          TestUtils.withLanguageModel({
+            generateText: [
+              {
+                type: "tool-call",
+                id: "tool-provider-executed",
+                name: "MyTool",
+                providerExecuted: true,
+                params: { testParam: 123 }
+              } as any,
+              finishPart
+            ]
+          }),
+          Effect.provide(handlers),
+          Effect.flip
+        )
+
+        strictEqual(error.reason._tag, "InvalidOutputError")
+        strictEqual(yield* Ref.get(calls), 0)
+      }))
+
+    it.effect("accepts provider-executed tool calls with valid parameters", () =>
+      Effect.gen(function*() {
+        const calls = yield* Ref.make(0)
+        const handlers = MyToolkit.toLayer({
+          MyTool: () =>
+            Ref.update(calls, (n) => n + 1).pipe(
+              Effect.as({ testSuccess: "test-success" })
+            )
+        })
+
+        const response = yield* LanguageModel.generateText({
+          prompt: [],
+          toolkit: MyToolkit
+        }).pipe(
+          TestUtils.withLanguageModel({
+            generateText: [
+              {
+                type: "tool-call",
+                id: "tool-provider-executed",
+                name: "MyTool",
+                providerExecuted: true,
+                params: { testParam: "test-param" }
+              },
+              finishPart
+            ]
+          }),
+          Effect.provide(handlers)
+        )
+
+        strictEqual(response.toolCalls.length, 1)
+        deepStrictEqual(response.toolCalls[0]!.params, { testParam: "test-param" })
+        strictEqual(yield* Ref.get(calls), 0)
+      }))
   })
 
   describe("streamText", () => {
@@ -233,7 +335,7 @@ describe("LanguageModel", () => {
             )
         })
         const providerQueue = yield* Queue.make<Response.StreamPartEncoded, Cause.Done>()
-        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof MyToolkit>>> = []
+        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof MyToolkit>, "opaque">> = []
 
         const fiber = yield* LanguageModel.streamText({
           prompt: [],
@@ -374,7 +476,7 @@ describe("LanguageModel", () => {
 
     it.effect("keeps results of handlers that completed before an incomplete finish", () =>
       Effect.gen(function*() {
-        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof MyToolkit>>> = []
+        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof MyToolkit>, "opaque">> = []
         const toolCallObserved = yield* Latch.make()
         const resultObserved = yield* Latch.make()
         const providerQueue = yield* Queue.make<Response.StreamPartEncoded, Cause.Done>()
@@ -430,7 +532,7 @@ describe("LanguageModel", () => {
 
     it.effect("does not synthesize results for tool calls awaiting approval on an incomplete finish", () =>
       Effect.gen(function*() {
-        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof ApprovalToolkit>>> = []
+        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof ApprovalToolkit>, "opaque">> = []
         const toolCallObserved = yield* Latch.make()
         const approvalObserved = yield* Latch.make()
         const providerQueue = yield* Queue.make<Response.StreamPartEncoded, Cause.Done>()
@@ -532,9 +634,73 @@ describe("LanguageModel", () => {
         Effect.provide(TransformToolkitLayer)
       ))
 
+    it.effect("preserves encoded tool parameters when tool call resolution is enabled", () =>
+      Effect.gen(function*() {
+        const parts = yield* LanguageModel.streamText({
+          prompt: [],
+          toolkit: TransformToolkit
+        }).pipe(Stream.runCollect)
+
+        const toolCall = parts.find((part) => part.type === "tool-call")!
+        strictEqual(toolCall.params, "21")
+
+        const toolResult = parts.find((part) => part.type === "tool-result")!
+        strictEqual(toolResult.isFailure, false)
+        strictEqual(toolResult.result, 42)
+      }).pipe(
+        TestUtils.withLanguageModel({
+          streamText: [
+            {
+              type: "tool-call",
+              id: "tool-transform",
+              name: "TransformTool",
+              params: "21"
+            },
+            finishPart
+          ]
+        }),
+        Effect.provide(TransformToolkitLayer)
+      ))
+
+    it.effect("validates provider-executed tool call parameters", () =>
+      Effect.gen(function*() {
+        const calls = yield* Ref.make(0)
+        const handlers = MyToolkit.toLayer({
+          MyTool: () =>
+            Ref.update(calls, (n) => n + 1).pipe(
+              Effect.as({ testSuccess: "test-success" })
+            )
+        })
+
+        const error = yield* LanguageModel.streamText({
+          prompt: [],
+          toolkit: MyToolkit
+        }).pipe(
+          Stream.runDrain,
+          TestUtils.withLanguageModel({
+            streamText: [
+              {
+                type: "tool-call",
+                id: "tool-provider-executed",
+                name: "MyTool",
+                providerExecuted: true,
+                params: { testParam: 123 }
+              } as any,
+              finishPart
+            ]
+          }),
+          Effect.provide(handlers),
+          Effect.flip
+        )
+
+        strictEqual(error._tag, "AiError")
+        strictEqual((error as AiError.AiError).reason._tag, "InvalidOutputError")
+        strictEqual(yield* Ref.get(calls), 0)
+      }))
+
     it.effect("executes tool handlers once the stream moves past the tool call", () =>
       Effect.gen(function*() {
-        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof MyToolkit>>> = []
+        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof MyToolkit>, "opaque">> = []
         const toolCallObserved = yield* Latch.make()
         const handlerCalled = yield* Latch.make()
         const providerQueue = yield* Queue.make<Response.StreamPartEncoded, Cause.Done>()
@@ -672,9 +838,83 @@ describe("LanguageModel", () => {
         strictEqual(yield* Ref.get(calls), 0)
       }))
 
+    it.effect("emits a failed tool result and keeps streaming when tool params are invalid and failure mode is return", () =>
+      Effect.gen(function*() {
+        const calls = yield* Ref.make(0)
+        const handlers = ReturnModeToolkit.toLayer({
+          ReturnModeTool: () =>
+            Ref.update(calls, (n) => n + 1).pipe(
+              Effect.as({ testSuccess: "test-success" })
+            )
+        })
+
+        const parts = yield* LanguageModel.streamText({
+          prompt: [],
+          toolkit: ReturnModeToolkit
+        }).pipe(
+          Stream.runCollect,
+          TestUtils.withLanguageModel({
+            streamText: [
+              {
+                type: "tool-call",
+                id: "tool-invalid-params",
+                name: "ReturnModeTool",
+                params: { testParam: 123 }
+              } as any,
+              finishPart
+            ]
+          }),
+          Effect.provide(handlers)
+        )
+
+        const toolResults = parts.filter((part) => part.type === "tool-result")
+        strictEqual(toolResults.length, 1)
+        strictEqual(toolResults[0].isFailure, true)
+        const result = toolResults[0].result as AiError.AiError
+        strictEqual(result._tag, "AiError")
+        strictEqual(result.reason._tag, "ToolParameterValidationError")
+        strictEqual(parts.some((part) => part.type === "finish"), true)
+        strictEqual(yield* Ref.get(calls), 0)
+      }))
+
+    it.effect("fails the stream when tool params are invalid and failure mode is error", () =>
+      Effect.gen(function*() {
+        const calls = yield* Ref.make(0)
+        const handlers = MyToolkit.toLayer({
+          MyTool: () =>
+            Ref.update(calls, (n) => n + 1).pipe(
+              Effect.as({ testSuccess: "test-success" })
+            )
+        })
+
+        const error = yield* LanguageModel.streamText({
+          prompt: [],
+          toolkit: MyToolkit
+        }).pipe(
+          Stream.runDrain,
+          TestUtils.withLanguageModel({
+            streamText: [
+              {
+                type: "tool-call",
+                id: "tool-invalid-params",
+                name: "MyTool",
+                params: { testParam: 123 }
+              } as any,
+              finishPart
+            ]
+          }),
+          Effect.provide(handlers),
+          Effect.flip
+        )
+
+        strictEqual(error._tag, "AiError")
+        strictEqual((error as AiError.AiError).reason._tag, "ToolParameterValidationError")
+        strictEqual(yield* Ref.get(calls), 0)
+      }))
+
     it.effect("emits finish after resolved tool results", () =>
       Effect.gen(function*() {
-        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof MyToolkit>>> = []
+        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof MyToolkit>, "opaque">> = []
         const latch = yield* Latch.make()
 
         const fiber = yield* LanguageModel.streamText({
@@ -993,7 +1233,7 @@ describe("LanguageModel", () => {
           }
         },
         required: ["name"],
-        additionalProperties: false,
+        additionalProperties: true,
         $defs: {
           "PersonEncoded": {
             type: "object",
@@ -1003,7 +1243,7 @@ describe("LanguageModel", () => {
               }
             },
             required: ["name"],
-            additionalProperties: false
+            additionalProperties: true
           }
         }
       })
@@ -1764,7 +2004,7 @@ describe("LanguageModel", () => {
   describe("tool approval", () => {
     it.effect("emits tool-approval-request when tool has needsApproval: true", () =>
       Effect.gen(function*() {
-        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof ApprovalToolkit>>> = []
+        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof ApprovalToolkit>, "opaque">> = []
 
         const toolCallId = "call-123"
         const toolName = "ApprovalTool"
@@ -2207,7 +2447,7 @@ describe("LanguageModel", () => {
 
     it.effect("dynamic needsApproval returns true when condition met", () =>
       Effect.gen(function*() {
-        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof ApprovalToolkit>>> = []
+        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof ApprovalToolkit>, "opaque">> = []
 
         const toolCallId = "call-dyn-1"
 
@@ -2243,7 +2483,7 @@ describe("LanguageModel", () => {
 
     it.effect("dynamic needsApproval returns false when condition not met", () =>
       Effect.gen(function*() {
-        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof ApprovalToolkit>>> = []
+        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof ApprovalToolkit>, "opaque">> = []
 
         const toolCallId = "call-dyn-2"
 
@@ -2279,7 +2519,7 @@ describe("LanguageModel", () => {
 
     it.effect("tool without needsApproval executes normally", () =>
       Effect.gen(function*() {
-        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof MyToolkit>>> = []
+        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof MyToolkit>, "opaque">> = []
 
         const toolCallId = "call-normal"
         const latch = yield* Latch.make()
@@ -2473,7 +2713,7 @@ describe("LanguageModel", () => {
       Effect.gen(function*() {
         const toolCallId = "call-emit"
         const approvalId = "approval-emit"
-        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof ApprovalToolkit>>> = []
+        const parts: Array<Response.StreamPart<Toolkit.Tools<typeof ApprovalToolkit>, "opaque">> = []
 
         const prompt: Array<Prompt.Message> = [
           Prompt.assistantMessage({
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpSchema.test.ts b/repos/effect/packages/effect/test/unstable/ai/McpSchema.test.ts
index 14bd3fd27..f49883046 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpSchema.test.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpSchema.test.ts
@@ -3,6 +3,17 @@ import { Schema } from "effect"
 import * as McpSchema from "effect/unstable/ai/McpSchema"
 
 describe("McpSchema", () => {
+  it("should preserve custom metadata when a request is decoded and encoded", () => {
+    const decode = Schema.decodeUnknownSync(McpSchema.RequestMeta)
+    const encode = Schema.encodeSync(McpSchema.RequestMeta)
+    for (const progress of [{}, { progressToken: "progress-1" }, { progressToken: 1 }]) {
+      const request = {
+        _meta: { ...progress, marker: "request", custom: { values: [null, true, 42, "value"] } }
+      }
+      assert.deepStrictEqual(encode(decode(request)), request)
+    }
+  })
+
   const decodeCreateMessage = Schema.decodeUnknownSync(McpSchema.CreateMessage.payloadSchema)
 
   it("allows create-message metadata to be omitted", () => {
@@ -12,4 +23,27 @@ describe("McpSchema", () => {
   it("requires create-message metadata to be an object", () => {
     assert.throws(() => decodeCreateMessage({ messages: [], maxTokens: 1, metadata: "invalid" }))
   })
+
+  // SEP-1330: https://modelcontextprotocol.io/seps/1330-elicitation-enum-schema-improvements-and-standards
+  // Conformance: elicitation-sep1330-enums
+  it("should preserve every November elicitation enum form when decoding a form request", () => {
+    const decoded = Schema.decodeUnknownSync(McpSchema.ElicitRequestFormParams)({
+      mode: "form",
+      message: "Choose values",
+      requestedSchema: {
+        type: "object",
+        properties: {
+          untitled: { type: "string", enum: ["one", "two"] },
+          titled: { type: "string", oneOf: [{ const: "one", title: "One" }] },
+          legacy: { type: "string", enum: ["one"], enumNames: ["One"] }
+        }
+      }
+    })
+
+    assert.deepStrictEqual(JSON.parse(JSON.stringify(decoded.requestedSchema.properties)), {
+      untitled: { type: "string", enum: ["one", "two"] },
+      titled: { type: "string", oneOf: [{ const: "one", title: "One" }] },
+      legacy: { type: "string", enum: ["one"], enumNames: ["One"] }
+    })
+  })
 })
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/BaseProtocolTest.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/BaseProtocolTest.ts
index b2e9f5b10..ae93f339b 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/BaseProtocolTest.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/BaseProtocolTest.ts
@@ -1,17 +1,293 @@
 import { assert, describe, it } from "@effect/vitest"
 import * as Effect from "effect/Effect"
 import * as Fiber from "effect/Fiber"
+import * as Layer from "effect/Layer"
 import * as Option from "effect/Option"
 import * as Schema from "effect/Schema"
 import { TestClock } from "effect/testing"
 import type * as McpProtocol from "effect/unstable/ai/McpProtocol"
 import * as McpSchema from "effect/unstable/ai/McpSchema"
+import * as McpServer from "effect/unstable/ai/McpServer"
+import * as Tool from "effect/unstable/ai/Tool"
+import * as Toolkit from "effect/unstable/ai/Toolkit"
+import { initializeHttpSession, makeHttpHarness } from "../TestUtils/McpHttpHarness.ts"
+import { readMcpHttpResponse } from "../TestUtils/McpHttpResponse.ts"
+import { makeServerLayer } from "../TestUtils/McpServerLayer.ts"
 import { makeMcpStdioHarness } from "../TestUtils/McpStdioHarness.ts"
 import { McpConformance, type McpConformanceLayer } from "./McpConformance.ts"
 
 export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConformanceLayer) =>
+  it.layer(layer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
+    describe("Base Protocol > General fields", () => {
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic#general-fields
+      it.effect("should preserve additional result metadata fields when decoding a result", () =>
+        Effect.gen(function*() {
+          const result = yield* Schema.decodeUnknownEffect(McpSchema.ReadResourceResult)({
+            contents: [],
+            _meta: {
+              "example/conformance": {
+                enabled: true,
+                labels: ["one", "two"]
+              }
+            }
+          })
+
+          assert.deepStrictEqual(result._meta, {
+            "example/conformance": {
+              enabled: true,
+              labels: ["one", "two"]
+            }
+          })
+        }))
+    })
+  })
+
+export const statelessModernSuite = (
+  protocol: McpProtocol.ProtocolAdapter,
+  layer: McpConformanceLayer
+) =>
+  it.layer(layer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
+    const requestMetadata = {
+      "io.modelcontextprotocol/protocolVersion": protocol.protocolVersion,
+      "io.modelcontextprotocol/clientCapabilities": {},
+      "io.modelcontextprotocol/clientInfo": { name: "stdio-client", version: "1.0.0" }
+    }
+
+    describe("Base Protocol > Stateless messages", () => {
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic#requests
+      it.effect("should preserve string and numeric identifiers when requests succeed", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol)
+          for (const id of ["discover-1", 42] as const) {
+            const message = yield* fixture.sendRequest("server/discover", {}, id)
+            assert.strictEqual(message.id, id)
+          }
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic#requests
+      it.effect("should reject a request when its JSON-RPC version is invalid", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const discovered = yield* test.initialize()
+          const response = yield* test.send(discovered, {
+            jsonrpc: "1.0",
+            id: 2,
+            method: "server/discover",
+            params: {}
+          })
+          const message = yield* test.decodeError(response)
+
+          assert.strictEqual(message.id, 2)
+          assert.strictEqual(message.error.code, McpSchema.INVALID_REQUEST_ERROR_CODE)
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic#requests
+      it.effect("should reject a request when its identifier is not a string or integer", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const discovered = yield* test.initialize()
+          const response = yield* test.send(discovered, {
+            jsonrpc: "2.0",
+            id: true,
+            method: "server/discover",
+            params: {}
+          })
+          const message = yield* test.decodeError(response)
+
+          assert.strictEqual(message.id, null)
+          assert.strictEqual(message.error.code, McpSchema.INVALID_REQUEST_ERROR_CODE)
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic#requests
+      it.effect("should return method not found when the requested method is unknown", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol)
+          const message = yield* fixture.sendRequest("unknown/method", {}, 3)
+
+          assert.strictEqual(message.id, 3)
+          const error = Schema.decodeUnknownSync(McpSchema.McpError)(message.error)
+          assert.strictEqual(error.code, McpSchema.METHOD_NOT_FOUND_ERROR_CODE)
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic#requests
+      it.effect("should return invalid params when request parameters do not match the method schema", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol)
+          const message = yield* fixture.sendRequest("tools/list", { cursor: 1 }, 7)
+
+          assert.strictEqual(message.id, 7)
+          const error = Schema.decodeUnknownSync(McpSchema.McpError)(message.error)
+          assert.strictEqual(error.code, McpSchema.INVALID_PARAMS_ERROR_CODE)
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic#notifications
+      it.effect("should send no response when an unknown notification is received", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol)
+          yield* fixture.sendNotification("unknown/method", {})
+          const response = yield* fixture.takeMessage.pipe(Effect.timeoutOption("1 millis"), Effect.forkChild)
+          yield* TestClock.adjust("1 millis")
+
+          assert.isTrue(Option.isNone(yield* Fiber.join(response)))
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic#notifications
+      it.effect("should send no response when notification parameters are invalid", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol)
+          yield* fixture.sendNotification("notifications/cancelled", { requestId: true })
+          const response = yield* fixture.takeMessage.pipe(Effect.timeoutOption("1 millis"), Effect.forkChild)
+          yield* TestClock.adjust("1 millis")
+
+          assert.isTrue(Option.isNone(yield* Fiber.join(response)))
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic#responses
+      it.effect("should send exactly one result response when a request succeeds", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol)
+          yield* fixture.sendRaw({
+            jsonrpc: "2.0",
+            id: 4,
+            method: "server/discover",
+            params: { _meta: requestMetadata }
+          })
+          const message = yield* fixture.takeMessage
+          assert.strictEqual(message.id, 4)
+          assert.property(message, "result")
+          assert.notProperty(message, "error")
+
+          const duplicate = yield* fixture.takeMessage.pipe(Effect.timeoutOption("1 millis"), Effect.forkChild)
+          yield* TestClock.adjust("1 millis")
+          assert.isTrue(Option.isNone(yield* Fiber.join(duplicate)))
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic#responses
+      it.effect("should send exactly one error response when a request fails", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol)
+          yield* fixture.sendRaw({
+            jsonrpc: "2.0",
+            id: 8,
+            method: "unknown/method",
+            params: { _meta: requestMetadata }
+          })
+          const message = yield* fixture.takeMessage
+          assert.strictEqual(message.id, 8)
+          assert.property(message, "error")
+          assert.notProperty(message, "result")
+
+          const duplicate = yield* fixture.takeMessage.pipe(Effect.timeoutOption("1 millis"), Effect.forkChild)
+          yield* TestClock.adjust("1 millis")
+          assert.isTrue(Option.isNone(yield* Fiber.join(duplicate)))
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic#messages
+      it.effect("should return a parse error when a JSON message is malformed", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const discovered = yield* test.initialize()
+          const response = yield* test.sendText(discovered, "{")
+          const message = yield* test.decodeError(response)
+
+          assert.strictEqual(message.id, null)
+          assert.strictEqual(message.error.code, McpSchema.PARSE_ERROR_CODE)
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic#messages
+      it.effect("should return invalid request when a JSON-RPC message omits its method", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const discovered = yield* test.initialize()
+          const response = yield* test.send(discovered, { jsonrpc: "2.0", id: 10, params: {} })
+          const message = yield* test.decodeError(response)
+
+          assert.strictEqual(message.id, 10)
+          assert.strictEqual(message.error.code, McpSchema.INVALID_REQUEST_ERROR_CODE)
+        }))
+    })
+  })
+
+export const statefulLegacySuite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConformanceLayer) =>
   it.layer(layer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
     describe("Base Protocol", () => {
+      // https://modelcontextprotocol.io/specification/2025-11-25/basic#meta
+      it.effect("should preserve custom request metadata when a legacy tool reads either context API", () =>
+        Effect.gen(function*() {
+          const toolkit = Toolkit.make(Tool.make("Metadata", {
+            parameters: Tool.EmptyParams,
+            success: Schema.String,
+            dependencies: [McpSchema.McpRequestContext, McpSchema.McpServerClient]
+          }))
+          const registration = McpServer.toolkit(toolkit).pipe(Layer.provide(toolkit.toLayer({
+            Metadata: () =>
+              Effect.gen(function*() {
+                const context = yield* McpSchema.McpRequestContext
+                const client = yield* McpSchema.McpServerClient
+                return JSON.stringify({ context: context.requestMetadata, client: client.requestMetadata })
+              })
+          })))
+          const harness = yield* makeHttpHarness(
+            registration.pipe(Layer.provideMerge(makeServerLayer({ name: "RequestMetadata", protocols: [protocol] })))
+          )
+          const headers = yield* initializeHttpSession(harness, protocol)
+          const metadata = { marker: "tool-call", progressToken: "progress-1", custom: { values: [null, true, 42] } }
+          const response = yield* harness.post({
+            jsonrpc: "2.0",
+            id: "call",
+            method: "tools/call",
+            params: { name: "Metadata", arguments: {}, _meta: metadata }
+          }, headers)
+          const message = Schema.decodeUnknownSync(Schema.Struct({
+            result: Schema.Struct({ content: Schema.Array(Schema.Struct({ text: Schema.String })) })
+          }))(yield* readMcpHttpResponse(response))
+          const serialized = Schema.decodeUnknownSync(Schema.String)(JSON.parse(message.result.content[0].text))
+          assert.deepStrictEqual(JSON.parse(serialized), { context: metadata, client: metadata })
+        }))
+
+      // Request metadata is defined by https://modelcontextprotocol.io/specification/2025-11-25/basic#meta.
+      // Exposing the current metadata through both context services is an Effect handler contract.
+      it.effect("should expose current metadata when a legacy resource completion reads either context API", () =>
+        Effect.gen(function*() {
+          const registration = McpServer.resource`file:///metadata/${McpSchema.param("name", Schema.String)}`({
+            name: "metadata",
+            content: () => Effect.succeed("content"),
+            completion: {
+              name: () =>
+                Effect.gen(function*() {
+                  const context = yield* McpSchema.McpRequestContext
+                  const client = yield* McpSchema.McpServerClient
+                  return [JSON.stringify({ context: context.requestMetadata, client: client.requestMetadata })]
+                })
+            }
+          })
+          const harness = yield* makeHttpHarness(
+            registration.pipe(
+              Layer.provideMerge(makeServerLayer({ name: "CompletionMetadata", protocols: [protocol] }))
+            )
+          )
+          const headers = yield* initializeHttpSession(harness, protocol)
+          const metadata = { marker: "completion", progressToken: "progress-1" }
+          const response = yield* harness.post({
+            jsonrpc: "2.0",
+            id: "complete",
+            method: "completion/complete",
+            params: {
+              ref: { type: "ref/resource", uri: "file:///metadata/{name}" },
+              argument: { name: "name", value: "" },
+              _meta: metadata
+            }
+          }, headers)
+          const message = Schema.decodeUnknownSync(Schema.Struct({
+            result: Schema.Struct({ completion: Schema.Struct({ values: Schema.Array(Schema.String) }) })
+          }))(yield* readMcpHttpResponse(response))
+
+          assert.deepStrictEqual(JSON.parse(message.result.completion.values[0]), {
+            context: metadata,
+            client: metadata
+          })
+        }))
+
       // https://modelcontextprotocol.io/specification/2025-06-18/basic
       describe("Messages", () => {
         describe("Requests", () => {
@@ -273,27 +549,5 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
             assert.strictEqual(message.error.code, McpSchema.INVALID_REQUEST_ERROR_CODE)
           }))
       })
-
-      describe("General fields", () => {
-        it.effect("SCHEMA preserves additional result metadata fields", () =>
-          Effect.gen(function*() {
-            const result = yield* Schema.decodeUnknownEffect(McpSchema.ReadResourceResult)({
-              contents: [],
-              _meta: {
-                "example/conformance": {
-                  enabled: true,
-                  labels: ["one", "two"]
-                }
-              }
-            })
-
-            assert.deepStrictEqual(result._meta, {
-              "example/conformance": {
-                enabled: true,
-                labels: ["one", "two"]
-              }
-            })
-          }))
-      })
     })
   })
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/CompletionTest.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/CompletionTest.ts
index 9218120ca..527c6d854 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/CompletionTest.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/CompletionTest.ts
@@ -47,19 +47,15 @@ const completeRaw = (
 export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConformanceLayer) =>
   it.layer(layer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
     describe("Completion", () => {
-      // Shared by the 2025-03-26 and 2025-06-18 specifications, except
-      // completion context, which was added in 2025-06-18.
+      // https://modelcontextprotocol.io/specification/2025-03-26/server/utilities/completion
       describe("Capabilities", () => {
-        it.effect.skipIf(["2024-11-05"].includes(protocol.protocolVersion))(
-          "MUST advertise completions when argument completion is supported",
-          () =>
-            Effect.gen(function*() {
-              const test = yield* McpConformance
-              const initialized = yield* test.initialize({ server: "features" })
+        it.effect("MUST advertise completions when argument completion is supported", () =>
+          Effect.gen(function*() {
+            const test = yield* McpConformance
+            const initialized = yield* test.initialize({ server: "features" })
 
-              assert.property(initialized.message.result.capabilities, "completions")
-            })
-        )
+            assert.property(initialized.message.result.capabilities, "completions")
+          }))
       })
 
       describe("Requesting Completions", () => {
@@ -82,19 +78,6 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
 
             assert.deepStrictEqual(result.completion.values, ["alpha", "beta"])
           }))
-        it.effect.skipIf(["2024-11-05", "2025-03-26"].includes(protocol.protocolVersion))(
-          "MUST pass previously resolved argument context to the completion handler",
-          () =>
-            Effect.gen(function*() {
-              const result = yield* complete(
-                { type: "ref/prompt", name: "ContextCompletionPrompt" },
-                { name: "value", value: "c" },
-                { arguments: { locale: "en" } }
-              )
-
-              assert.deepStrictEqual(result.completion.values, ["context received"])
-            })
-        )
         it.effect("SHOULD reject an unknown prompt reference with Invalid Params", () =>
           Effect.gen(function*() {
             const test = yield* McpConformance
@@ -165,6 +148,21 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
             assert.strictEqual(result.completion.total, 101)
             assert.strictEqual(result.completion.hasMore, true)
           }))
+
+        // https://modelcontextprotocol.io/specification/2025-06-18/server/utilities/completion#completioncontext
+        it.effect.skipIf(["2024-11-05", "2025-03-26"].includes(protocol.protocolVersion))(
+          "should pass previously resolved arguments when completion context is supplied",
+          () =>
+            Effect.gen(function*() {
+              const result = yield* complete(
+                { type: "ref/prompt", name: "ContextCompletionPrompt" },
+                { name: "value", value: "c" },
+                { arguments: { locale: "en" } }
+              )
+
+              assert.deepStrictEqual(result.completion.values, ["context received"])
+            })
+        )
       })
     })
   })
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/ElicitationTest.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/ElicitationTest.ts
index 6c3578085..615898a4b 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/ElicitationTest.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/ElicitationTest.ts
@@ -2,10 +2,16 @@ import { assert, describe, it } from "@effect/vitest"
 import * as Cause from "effect/Cause"
 import * as Effect from "effect/Effect"
 import * as Exit from "effect/Exit"
+import * as Layer from "effect/Layer"
 import * as Schema from "effect/Schema"
 import type * as McpProtocol from "effect/unstable/ai/McpProtocol"
 import * as McpSchema from "effect/unstable/ai/McpSchema"
 import * as McpServer from "effect/unstable/ai/McpServer"
+import * as Tool from "effect/unstable/ai/Tool"
+import * as Toolkit from "effect/unstable/ai/Toolkit"
+import { makeHttpHarness } from "../TestUtils/McpHttpHarness.ts"
+import { makeMcpSseReader, readMcpHttpResponse } from "../TestUtils/McpHttpResponse.ts"
+import { makeServerLayer } from "../TestUtils/McpServerLayer.ts"
 import { McpConformance, type McpConformanceLayer } from "./McpConformance.ts"
 import type { McpTestPeer } from "./McpTestPeer.ts"
 
@@ -40,7 +46,7 @@ const request = {
 
 const runElicitation = <S extends Schema.ConstraintEncoder<Record<string, unknown>, unknown>>(
   client: McpTestPeer["reverseClient"],
-  protocolVersion: McpProtocol.ProtocolVersion,
+  protocolVersion: McpProtocol.StatefulProtocolVersion,
   schema: S
 ) =>
   McpServer.elicit({
@@ -70,9 +76,100 @@ const runElicitation = <S extends Schema.ConstraintEncoder<Record<string, unknow
     )
   )
 
-export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConformanceLayer) =>
+export const suite = (
+  protocol: McpProtocol.ProtocolAdapter<McpProtocol.StatefulProtocolVersion>,
+  layer: McpConformanceLayer
+) =>
   it.layer(layer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
     describe("Elicitation", () => {
+      for (const responseSession of ["missing", "unknown", "unrelated", "owner"] as const) {
+        // https://modelcontextprotocol.io/specification/2025-11-25/basic/transports#session-management
+        // A reverse response must belong to the session that requested the input.
+        it.effect(`MUST preserve elicitation response ownership with a ${responseSession} HTTP session`, () =>
+          Effect.gen(function*() {
+            const toolkit = Toolkit.make(Tool.make("Approve", {
+              parameters: Tool.EmptyParams,
+              success: Schema.Struct({ approved: Schema.Boolean }),
+              dependencies: [McpSchema.McpServerClient]
+            }))
+            const registration = McpServer.toolkit(toolkit).pipe(Layer.provide(
+              toolkit.toLayer({
+                Approve: () =>
+                  McpServer.elicit({
+                    message: "Approve this operation",
+                    schema: Schema.Struct({ approved: Schema.Boolean })
+                  }).pipe(Effect.orDie)
+              })
+            ))
+            const harness = yield* makeHttpHarness(registration.pipe(Layer.provideMerge(
+              makeServerLayer({ name: "ElicitationSessionConformance", protocols: [protocol] })
+            )))
+            const initialize = Effect.fnUntraced(function*() {
+              const response = yield* harness.post({
+                jsonrpc: "2.0",
+                id: "initialize",
+                method: "initialize",
+                params: {
+                  protocolVersion: protocol.protocolVersion,
+                  capabilities: { elicitation: {} },
+                  clientInfo: { name: "approval-client", version: "1.0.0" }
+                }
+              })
+              yield* readMcpHttpResponse(response)
+              const sessionId = response.headers.get("Mcp-Session-Id")
+              assert.isNotNull(sessionId)
+              yield* harness.post({ jsonrpc: "2.0", method: "notifications/initialized" }, {
+                "Mcp-Session-Id": sessionId,
+                "Mcp-Protocol-Version": protocol.protocolVersion
+              })
+              return sessionId
+            })
+            const owner = yield* initialize()
+            const other = responseSession === "unrelated" ? yield* initialize() : undefined
+            const response = yield* harness.post({
+              jsonrpc: "2.0",
+              id: "approval-tool",
+              method: "tools/call",
+              params: { name: "Approve", arguments: {} }
+            }, { "Mcp-Session-Id": owner, "Mcp-Protocol-Version": protocol.protocolVersion })
+            const stream = makeMcpSseReader(response)
+            yield* Effect.addFinalizer(() => stream.cancel)
+            const reverse = yield* stream.take()
+            assert.strictEqual(reverse.method, "elicitation/create")
+            assert.isDefined(reverse.id)
+            const sessionId = responseSession === "owner" ? owner : responseSession === "unknown" ? "unknown" : other
+            const injected = yield* harness.post(
+              {
+                jsonrpc: "2.0",
+                id: reverse.id,
+                result: { action: "accept", content: { approved: true } }
+              },
+              sessionId === undefined ? {} : {
+                "Mcp-Session-Id": sessionId,
+                "Mcp-Protocol-Version": protocol.protocolVersion
+              }
+            )
+            if (responseSession !== "owner") {
+              const legitimate = yield* harness.post({
+                jsonrpc: "2.0",
+                id: reverse.id,
+                result: { action: "accept", content: { approved: false } }
+              }, { "Mcp-Session-Id": owner, "Mcp-Protocol-Version": protocol.protocolVersion })
+              assert.strictEqual(legitimate.status, 202)
+            }
+            const completed = yield* stream.take()
+            assert.strictEqual(completed.id, "approval-tool")
+            const result = yield* Schema.decodeUnknownEffect(McpSchema.CallToolResult)(completed.result)
+            assert.deepStrictEqual(result.content, [{
+              type: "text",
+              text: JSON.stringify({ approved: responseSession === "owner" })
+            }])
+            if (responseSession === "missing") assert.strictEqual(injected.status, 400)
+            if (responseSession === "unknown") assert.strictEqual(injected.status, 404)
+            if (responseSession === "owner") assert.strictEqual(injected.status, 202)
+          }))
+      }
+
       // https://modelcontextprotocol.io/specification/2025-06-18/client/elicitation
       describe("Capabilities", () => {
         it.effect.skipIf(protocol.protocolVersion !== "2025-11-25")(
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/LifecycleTest.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/LifecycleTest.ts
index d069855c7..d10007eb9 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/LifecycleTest.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/LifecycleTest.ts
@@ -14,6 +14,14 @@ export const suite = (
       // version entrypoints that compose this suite.
       describe("Lifecycle Phases", () => {
         describe("Initialization", () => {
+          it.effect("returns configured server instructions", () =>
+            Effect.gen(function*() {
+              const test = yield* McpConformance
+              const { message } = yield* test.initialize({ server: "features" })
+
+              assert.strictEqual(message.result.instructions, "Follow the test server instructions.")
+            }))
+
           it.effect("MUST reject non-ping requests before initialize", () =>
             Effect.gen(function*() {
               const test = yield* McpConformance
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/LoggingTest.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/LoggingTest.ts
index 9aead410d..852d4df99 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/LoggingTest.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/LoggingTest.ts
@@ -1,13 +1,30 @@
 import { assert, describe, it } from "@effect/vitest"
+import * as Context from "effect/Context"
+import * as Deferred from "effect/Deferred"
 import * as Effect from "effect/Effect"
 import * as Fiber from "effect/Fiber"
+import * as Layer from "effect/Layer"
 import * as Schema from "effect/Schema"
 import type * as McpProtocol from "effect/unstable/ai/McpProtocol"
 import * as McpSchema from "effect/unstable/ai/McpSchema"
+import * as McpServer from "effect/unstable/ai/McpServer"
+import { initializeHttpSession, makeHttpHarness } from "../TestUtils/McpHttpHarness.ts"
+import { makeMcpSseReader, readMcpHttpResponse } from "../TestUtils/McpHttpResponse.ts"
+import { makeServerLayer } from "../TestUtils/McpServerLayer.ts"
 import { makeMcpStdioHarness } from "../TestUtils/McpStdioHarness.ts"
 import { McpConformance, type McpConformanceLayer } from "./McpConformance.ts"
 
 const levels = ["debug", "info", "notice", "warning", "error", "critical", "alert", "emergency"] as const
+const effectLevels = {
+  debug: "Debug",
+  info: "Info",
+  notice: "Info",
+  warning: "Warn",
+  error: "Error",
+  critical: "Fatal",
+  alert: "Fatal",
+  emergency: "Fatal"
+} as const
 
 const setLevel = (level: string) =>
   Effect.gen(function*() {
@@ -26,7 +43,7 @@ const setLevel = (level: string) =>
 export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConformanceLayer) =>
   it.layer(layer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
     describe("Logging", () => {
-      // Logging has the same protocol surface in all three dated specifications.
+      // Logging has the same protocol surface in the legacy specifications.
       describe("Capabilities", () => {
         it.effect("MUST advertise logging when log notifications are supported", () =>
           Effect.gen(function*() {
@@ -37,6 +54,158 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
       })
 
       describe("Setting Log Level", () => {
+        // https://modelcontextprotocol.io/specification/2024-11-05/server/utilities/logging#setting-log-level
+        // https://modelcontextprotocol.io/specification/2025-03-26/server/utilities/logging#setting-log-level
+        // https://modelcontextprotocol.io/specification/2025-06-18/server/utilities/logging#setting-log-level
+        // https://modelcontextprotocol.io/specification/2025-11-25/server/utilities/logging#setting-log-level
+        // These HTTP cases exercise the shared logging threshold contract. The 2024 adapter run checks
+        // Effect compatibility through this HTTP harness, not the original 2024 HTTP+SSE transport.
+        for (const level of ["debug", "emergency"] as const) {
+          it.effect(`should filter background HTTP logs when the destination session selects ${level}`, () =>
+            Effect.gen(function*() {
+              const release = yield* Deferred.make<void>()
+              const serverReady = yield* Deferred.make<McpServer.McpServer["Service"]>()
+              const harness = yield* makeHttpHarness(
+                Layer.effectDiscard(Effect.gen(function*() {
+                  const server = yield* McpServer.McpServer
+                  yield* server.addTool({
+                    tool: new McpSchema.Tool({ name: "Wait", inputSchema: { type: "object" } }),
+                    annotations: Context.empty(),
+                    handle: () =>
+                      Effect.gen(function*() {
+                        yield* server.notifications["notifications/message"]({ level: "emergency", data: "ready" })
+                        yield* Deferred.await(release)
+                        return new McpSchema.CallToolResult({ content: [] })
+                      })
+                  })
+                  yield* Deferred.succeed(serverReady, server)
+                })).pipe(Layer.provideMerge(makeServerLayer({ name: "BackgroundLogging", protocols: [protocol] })))
+              )
+              const headers = yield* initializeHttpSession(harness, protocol)
+              const configured = yield* harness.post({
+                jsonrpc: "2.0",
+                id: "set-level",
+                method: "logging/setLevel",
+                params: { level }
+              }, headers).pipe(Effect.flatMap(readMcpHttpResponse))
+              assert.deepInclude(configured, { id: "set-level", result: {} })
+              const response = makeMcpSseReader(
+                yield* harness.post({
+                  jsonrpc: "2.0",
+                  id: "wait",
+                  method: "tools/call",
+                  params: { name: "Wait", arguments: {} }
+                }, headers)
+              )
+              yield* Effect.addFinalizer(() => response.cancel)
+              assert.deepInclude(yield* response.take(), {
+                method: "notifications/message",
+                params: { level: "emergency", data: "ready" }
+              })
+              const server = yield* Deferred.await(serverReady)
+              yield* server.notifications["notifications/message"]({ level: "debug", data: "debug-log" })
+              yield* server.notifications["notifications/message"]({ level: "error", data: "error-log" })
+              yield* server.notifications["notifications/message"]({ level: "emergency", data: "sentinel" })
+              const messages: Array<unknown> = []
+              while (true) {
+                const message = yield* response.take()
+                assert.strictEqual(message.method, "notifications/message")
+                messages.push(message.params)
+                if ((message.params as { data: string }).data === "sentinel") break
+              }
+              assert.deepStrictEqual(
+                messages,
+                level === "debug" ?
+                  [
+                    { level: "debug", data: "debug-log" },
+                    { level: "error", data: "error-log" },
+                    { level: "emergency", data: "sentinel" }
+                  ] :
+                  [{ level: "emergency", data: "sentinel" }]
+              )
+              yield* Deferred.succeed(release, undefined)
+              assert.deepInclude(yield* response.take(), { id: "wait", result: { content: [] } })
+              assert.deepStrictEqual(yield* response.drain(), [])
+            }))
+        }
+
+        it.effect("should isolate background HTTP log levels when concurrent sessions select different thresholds", () =>
+          Effect.gen(function*() {
+            const release = yield* Deferred.make<void>()
+            const serverReady = yield* Deferred.make<McpServer.McpServer["Service"]>()
+            const harness = yield* makeHttpHarness(
+              Layer.effectDiscard(Effect.gen(function*() {
+                const server = yield* McpServer.McpServer
+                yield* server.addTool({
+                  tool: new McpSchema.Tool({ name: "Wait", inputSchema: { type: "object" } }),
+                  annotations: Context.empty(),
+                  handle: () =>
+                    Effect.gen(function*() {
+                      yield* server.notifications["notifications/message"]({ level: "emergency", data: "ready" })
+                      yield* Deferred.await(release)
+                      return new McpSchema.CallToolResult({ content: [] })
+                    })
+                })
+                yield* Deferred.succeed(serverReady, server)
+              })).pipe(
+                Layer.provideMerge(makeServerLayer({ name: "IsolatedBackgroundLogging", protocols: [protocol] }))
+              )
+            )
+            const responses = yield* Effect.forEach(["debug", "emergency"] as const, (level) =>
+              Effect.gen(function*() {
+                const headers = yield* initializeHttpSession(harness, protocol)
+                const configured = yield* harness.post({
+                  jsonrpc: "2.0",
+                  id: "set-level",
+                  method: "logging/setLevel",
+                  params: { level }
+                }, headers).pipe(Effect.flatMap(readMcpHttpResponse))
+                assert.deepInclude(configured, { id: "set-level", result: {} })
+                const response = makeMcpSseReader(
+                  yield* harness.post({
+                    jsonrpc: "2.0",
+                    id: "wait",
+                    method: "tools/call",
+                    params: { name: "Wait", arguments: {} }
+                  }, headers)
+                )
+                yield* Effect.addFinalizer(() => response.cancel)
+                assert.deepInclude(yield* response.take(), {
+                  method: "notifications/message",
+                  params: { level: "emergency", data: "ready" }
+                })
+                return { level, response }
+              }))
+            const server = yield* Deferred.await(serverReady)
+            yield* server.notifications["notifications/message"]({ level: "debug", data: "debug-log" })
+            yield* server.notifications["notifications/message"]({ level: "error", data: "error-log" })
+            yield* server.notifications["notifications/message"]({ level: "emergency", data: "sentinel" })
+            for (const { level, response } of responses) {
+              const messages: Array<unknown> = []
+              while (true) {
+                const message = yield* response.take()
+                assert.strictEqual(message.method, "notifications/message")
+                messages.push(message.params)
+                if ((message.params as { data: string }).data === "sentinel") break
+              }
+              assert.deepStrictEqual(
+                messages,
+                level === "debug" ?
+                  [
+                    { level: "debug", data: "debug-log" },
+                    { level: "error", data: "error-log" },
+                    { level: "emergency", data: "sentinel" }
+                  ] :
+                  [{ level: "emergency", data: "sentinel" }]
+              )
+            }
+            yield* Deferred.succeed(release, undefined)
+            for (const { response } of responses) {
+              assert.deepInclude(yield* response.take(), { id: "wait", result: { content: [] } })
+              assert.deepStrictEqual(yield* response.drain(), [])
+            }
+          }))
+
         it.effect("MUST accept every specified log level", () =>
           Effect.forEach(levels, (level) =>
             Effect.gen(function*() {
@@ -201,3 +370,154 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
       })
     })
   })
+
+export const statelessModernSuite = (
+  protocol: McpProtocol.ProtocolAdapter,
+  layer: McpConformanceLayer
+) =>
+  it.layer(layer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
+    const callLogLevelTool = Effect.fnUntraced(function*(level?: string) {
+      const test = yield* McpConformance
+      const discovered = yield* test.initialize({ server: "features" })
+      const response = yield* test.send(discovered, {
+        jsonrpc: "2.0",
+        id: 2,
+        method: "tools/call",
+        params: {
+          name: "LogLevelTool",
+          arguments: {},
+          ...(level === undefined
+            ? {}
+            : { _meta: { "io.modelcontextprotocol/logLevel": level } })
+        }
+      })
+      return { response, test }
+    })
+
+    describe("Logging > Stateless modern", () => {
+      // https://modelcontextprotocol.io/specification/2026-07-28/server/utilities/logging#per-request-log-level
+      for (const source of ["background", "another request"] as const) {
+        it.effect(`MUST not deliver logs from ${source} on an HTTP subscription stream`, () =>
+          Effect.gen(function*() {
+            const serverReady = yield* Deferred.make<McpServer.McpServer["Service"]>()
+            const harness = yield* makeHttpHarness(
+              Layer.effectDiscard(
+                Effect.gen(function*() {
+                  const server = yield* McpServer.McpServer
+                  yield* server.addTool({
+                    tool: new McpSchema.Tool({ name: "EmitLogs", inputSchema: { type: "object" } }),
+                    annotations: Context.empty(),
+                    handle: () =>
+                      server.notifications["notifications/message"]({ level: "error", data: "private-log" }).pipe(
+                        Effect.as(new McpSchema.CallToolResult({ content: [] }))
+                      )
+                  })
+                  yield* Deferred.succeed(serverReady, server)
+                })
+              ).pipe(Layer.provideMerge(makeServerLayer({ name: "LoggingConformance", protocols: [protocol] })))
+            )
+            const response = yield* harness.post({
+              jsonrpc: "2.0",
+              id: "logs-forbidden",
+              method: "subscriptions/listen",
+              params: {
+                notifications: { toolsListChanged: true },
+                _meta: {
+                  "io.modelcontextprotocol/protocolVersion": protocol.protocolVersion,
+                  "io.modelcontextprotocol/clientCapabilities": {}
+                }
+              }
+            }, {
+              "MCP-Protocol-Version": protocol.protocolVersion,
+              "Mcp-Method": "subscriptions/listen"
+            })
+            const stream = makeMcpSseReader(response)
+            yield* Effect.addFinalizer(() => stream.cancel)
+            assert.strictEqual((yield* stream.take()).method, "notifications/subscriptions/acknowledged")
+            const server = yield* Deferred.await(serverReady)
+            if (source === "background") {
+              yield* server.notifications["notifications/message"]({ level: "error", data: "private-log" })
+            } else {
+              const result = yield* harness.post({
+                jsonrpc: "2.0",
+                id: "originating-request",
+                method: "tools/call",
+                params: {
+                  name: "EmitLogs",
+                  arguments: {},
+                  _meta: {
+                    "io.modelcontextprotocol/protocolVersion": protocol.protocolVersion,
+                    "io.modelcontextprotocol/clientCapabilities": {},
+                    "io.modelcontextprotocol/logLevel": "warning"
+                  }
+                }
+              }, {
+                "MCP-Protocol-Version": protocol.protocolVersion,
+                "Mcp-Method": "tools/call",
+                "Mcp-Name": "EmitLogs"
+              })
+              const originatingStream = makeMcpSseReader(result)
+              yield* Effect.addFinalizer(() => originatingStream.cancel)
+              assert.deepInclude(yield* originatingStream.take(), {
+                method: "notifications/message",
+                params: { level: "error", data: "private-log" }
+              })
+              const completed = yield* originatingStream.take()
+              assert.deepInclude(completed, { id: "originating-request" })
+              assert.property(completed, "result")
+              assert.deepStrictEqual(yield* originatingStream.drain(), [])
+            }
+            // Delivery is acknowledged before publishing the sentinel, so no timing window is needed.
+            yield* server.notifications["notifications/tools/list_changed"]({})
+            assert.strictEqual((yield* stream.take()).method, "notifications/tools/list_changed")
+          }))
+      }
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/server/utilities/logging#capabilities
+      it.effect("should advertise logging when request-scoped log filtering is supported", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const discovered = yield* test.initialize({ server: "features" })
+
+          assert.property(discovered.message.result.capabilities, "logging")
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/server/utilities/logging#log-levels
+      it.effect("should apply every specified log level to the request that declares it", () =>
+        Effect.forEach(levels, (level) =>
+          Effect.gen(function*() {
+            const { response, test } = yield* callLogLevelTool(level)
+            const result = yield* test.decodeResult(response).pipe(
+              Effect.flatMap((message) => Schema.decodeUnknownEffect(McpSchema.CallToolResult)(message.result))
+            )
+            assert.deepStrictEqual(result.content, [{ type: "text", text: JSON.stringify(effectLevels[level]) }])
+          }), { concurrency: 1 }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/server/utilities/logging#log-levels
+      it.effect("should reject a request when its request-scoped log level is unknown", () =>
+        Effect.gen(function*() {
+          const { response, test } = yield* callLogLevelTool("verbose")
+          const error = yield* test.decodeError(response)
+
+          assert.strictEqual(error.error.code, McpSchema.INVALID_PARAMS_ERROR_CODE)
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/server/utilities/logging#log-message-notifications
+      it.effect("should preserve the level, logger, and JSON data when decoding a log notification", () =>
+        Effect.gen(function*() {
+          const payload = yield* Schema.decodeUnknownEffect(
+            McpSchema.LoggingMessageNotification.payloadSchema
+          )({
+            level: "warning",
+            logger: "database",
+            data: { message: "slow query", durationMs: 120 }
+          })
+
+          assert.deepStrictEqual(payload, {
+            level: "warning",
+            logger: "database",
+            data: { message: "slow query", durationMs: 120 }
+          })
+        }))
+    })
+  })
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/McpConformance.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/McpConformance.ts
index 098b4e545..76231328c 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/McpConformance.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/McpConformance.ts
@@ -6,6 +6,7 @@ import * as Schema from "effect/Schema"
 import type * as McpProtocol from "effect/unstable/ai/McpProtocol"
 import * as McpSchema from "effect/unstable/ai/McpSchema"
 import { makeHttpHarness } from "../TestUtils/McpHttpHarness.ts"
+import { readMcpHttpResponse } from "../TestUtils/McpHttpResponse.ts"
 import { makeServerLayer } from "../TestUtils/McpServerLayer.ts"
 import { makeFeaturesServerLayer, type Observations } from "./McpConformanceFixtures.ts"
 import { makeMcpTestPeer, type McpTestPeerOptions } from "./McpTestPeer.ts"
@@ -36,11 +37,83 @@ const BatchResponse = Schema.Array(Schema.Struct({
   result: Schema.Struct({})
 }))
 
+const StatelessDiscoverResponse = Schema.Struct({
+  jsonrpc: Schema.Literal("2.0"),
+  id: Schema.Number,
+  result: Schema.Struct({
+    capabilities: McpSchema.ServerCapabilities,
+    instructions: Schema.optional(Schema.String)
+  })
+})
+
 const decodeInitializeResponse = Schema.decodeUnknownEffect(InitializeResponse)
 const decodeErrorResponse = Schema.decodeUnknownEffect(ErrorResponse)
 const decodeResultResponse = Schema.decodeUnknownEffect(ResultResponse)
 const decodeBatchResponse = Schema.decodeUnknownEffect(BatchResponse)
 
+const statelessBody = (
+  protocol: McpProtocol.ProtocolAdapter,
+  body: unknown,
+  clientCapabilities?: Record<string, unknown>
+): unknown => {
+  if (
+    protocol.runtime._tag !== "Stateless" ||
+    typeof body !== "object" ||
+    body === null ||
+    !("method" in body)
+  ) {
+    return body
+  }
+  const message = body as { readonly params?: unknown }
+  const params = typeof message.params === "object" && message.params !== null
+    ? message.params as Record<string, unknown>
+    : {}
+  const metadata = typeof params._meta === "object" && params._meta !== null && !Array.isArray(params._meta)
+    ? params._meta as Record<string, unknown>
+    : {}
+  return {
+    ...body,
+    params: {
+      ...params,
+      _meta: {
+        ...metadata,
+        "io.modelcontextprotocol/protocolVersion": protocol.protocolVersion,
+        "io.modelcontextprotocol/clientCapabilities": clientCapabilities ?? {
+          elicitation: { form: {} },
+          roots: {},
+          sampling: {}
+        },
+        "io.modelcontextprotocol/clientInfo": { name: "McpConformanceClient", version: "1.0.0" }
+      }
+    }
+  }
+}
+
+const statelessHeaders = (protocol: McpProtocol.ProtocolAdapter, body: unknown): HeadersInit => {
+  if (
+    protocol.runtime._tag !== "Stateless" ||
+    typeof body !== "object" ||
+    body === null ||
+    !("method" in body) ||
+    typeof body.method !== "string"
+  ) {
+    return {}
+  }
+  const params = "params" in body && typeof body.params === "object" && body.params !== null
+    ? body.params as Record<string, unknown>
+    : {}
+  const name = body.method === "resources/read"
+    ? params.uri
+    : body.method === "tools/call" || body.method === "prompts/get"
+    ? params.name
+    : undefined
+  return {
+    "MCP-Protocol-Version": protocol.protocolVersion,
+    "Mcp-Method": body.method,
+    ...(typeof name === "string" ? { "Mcp-Name": name } : {})
+  }
+}
+
 export interface InitializedSession {
   readonly response: Response
   readonly message: typeof InitializeResponse.Type
@@ -57,6 +130,8 @@ export interface InitializeOptions {
 export interface SendOptions {
   readonly includeProtocolVersion?: boolean | undefined
   readonly protocolVersion?: string | undefined
+  readonly clientCapabilities?: Record<string, unknown> | undefined
+  readonly headers?: HeadersInit | undefined
 }
 
 export interface McpConformanceShape {
@@ -115,6 +190,7 @@ export interface McpConformanceShape {
     options?: McpTestPeerOptions
   ) => ReturnType<typeof makeMcpTestPeer>
   readonly observations: Effect.Effect<Observations>
+  readonly requestCount: Effect.Effect<number>
   readonly resetObservations: Effect.Effect<void>
   readonly decodeError: (response: Response) => Effect.Effect<typeof ErrorResponse.Type, Schema.SchemaError>
   readonly decodeResult: (response: Response) => Effect.Effect<typeof ResultResponse.Type, Schema.SchemaError>
@@ -142,7 +218,18 @@ export const layer = (protocol: McpProtocol.ProtocolAdapter) =>
         promptInvocations: 0,
         resourceTemplateInvocations: 0
       })
+      const requestCount = yield* Ref.make(0)
       const featuresHarness = yield* makeHttpHarness(makeFeaturesServerLayer(protocol, observations))
+      const post = (
+        harness: typeof defaultHarness,
+        body: unknown,
+        headers?: HeadersInit
+      ) => Ref.update(requestCount, (count) => count + 1).pipe(Effect.andThen(harness.post(body, headers)))
+      const postText = (
+        harness: typeof defaultHarness,
+        body: string,
+        headers?: HeadersInit
+      ) => Ref.update(requestCount, (count) => count + 1).pipe(Effect.andThen(harness.postText(body, headers)))
 
       const initializeRequest: McpConformanceShape["initializeRequest"] = (options) => ({
         jsonrpc: "2.0",
@@ -173,8 +260,35 @@ export const layer = (protocol: McpProtocol.ProtocolAdapter) =>
       const initialize: McpConformanceShape["initialize"] = Effect.fnUntraced(function*(options) {
         const server = options?.server ?? "default"
         const harness = server === "features" ? featuresHarness : defaultHarness
-        const response = yield* harness.post(initializeRequest(options))
-        const body = yield* Effect.promise<unknown>(() => response.json())
+        if (protocol.runtime._tag === "Stateless") {
+          const request = statelessBody(protocol, {
+            jsonrpc: "2.0",
+            id: options?.id ?? 1,
+            method: "server/discover",
+            params: {}
+          })
+          const response = yield* post(harness, request, statelessHeaders(protocol, request))
+          const decoded = yield* Effect.promise<unknown>(() => response.json()).pipe(
+            Effect.flatMap(Schema.decodeUnknownEffect(StatelessDiscoverResponse))
+          )
+          return {
+            response,
+            message: {
+              jsonrpc: "2.0",
+              id: options?.id ?? 1,
+              result: {
+                protocolVersion: protocol.protocolVersion,
+                capabilities: decoded.result.capabilities,
+                instructions: decoded.result.instructions,
+                serverInfo: { name: SERVER_NAME, version: SERVER_VERSION }
+              }
+            },
+            sessionId: null,
+            server
+          }
+        }
+        const response = yield* post(harness, initializeRequest(options))
+        const body = yield* readMcpHttpResponse(response)
         return {
           response,
           message: yield* decodeInitializeResponse(body),
@@ -189,20 +303,31 @@ export const layer = (protocol: McpProtocol.ProtocolAdapter) =>
           ? {
             "Mcp-Protocol-Version": options?.protocolVersion ?? session.message.result.protocolVersion
           }
-          : {})
+          : {}),
+        ...options?.headers
       })
 
       const harnessFor = (session: InitializedSession) =>
         session.server === "features" ? featuresHarness : defaultHarness
 
       const sendText: McpConformanceShape["sendText"] = (session, body, options) =>
-        harnessFor(session).postText(body, sessionHeaders(session, options))
+        postText(harnessFor(session), body, sessionHeaders(session, options))
 
-      const send: McpConformanceShape["send"] = (session, body, options) =>
-        harnessFor(session).post(body, sessionHeaders(session, options))
+      const send: McpConformanceShape["send"] = (session, body, options) => {
+        if (protocol.runtime._tag !== "Stateless") {
+          return post(harnessFor(session), body, sessionHeaders(session, options))
+        }
+        const request = statelessBody(protocol, body, options?.clientCapabilities)
+        return post(harnessFor(session), request, {
+          ...statelessHeaders(protocol, request),
+          ...options?.headers
+        })
+      }
 
       const notifyInitialized: McpConformanceShape["notifyInitialized"] = (session, options) =>
-        send(session, initializedNotification, options)
+        protocol.runtime._tag === "Stateless"
+          ? Effect.succeed(new Response(null, { status: 202 }))
+          : send(session, initializedNotification, options)
 
       const ping: McpConformanceShape["ping"] = (session, options) => send(session, pingRequest(options?.id), options)
 
@@ -215,7 +340,7 @@ export const layer = (protocol: McpProtocol.ProtocolAdapter) =>
         initializeRequest,
         initializedNotification,
         pingRequest,
-        post: defaultHarness.post,
+        post: (body, headers) => post(defaultHarness, body, headers),
         request: (request) => Effect.promise(() => defaultHarness.handler(request)),
         initialize,
         send,
@@ -224,21 +349,22 @@ export const layer = (protocol: McpProtocol.ProtocolAdapter) =>
         ping,
         makePeer: (options) => makeMcpTestPeer(protocol, options),
         observations: Ref.get(observations),
+        requestCount: Ref.get(requestCount),
         resetObservations: Ref.set(observations, {
           toolInvocations: 0,
           promptInvocations: 0,
           resourceTemplateInvocations: 0
         }),
         decodeError: (response) =>
-          Effect.promise<unknown>(() => response.json()).pipe(
+          readMcpHttpResponse(response).pipe(
             Effect.flatMap(decodeErrorResponse)
           ),
         decodeResult: (response) =>
-          Effect.promise<unknown>(() => response.json()).pipe(
+          readMcpHttpResponse(response).pipe(
             Effect.flatMap(decodeResultResponse)
           ),
         decodeBatchResponseIds: (response) =>
-          Effect.promise<unknown>(() => response.json()).pipe(
+          readMcpHttpResponse(response).pipe(
             Effect.flatMap(decodeBatchResponse),
             Effect.map((responses) => responses.map((message) => message.id))
           )
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/McpConformanceFixtures.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/McpConformanceFixtures.ts
index e5353e574..985f09e3d 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/McpConformanceFixtures.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/McpConformanceFixtures.ts
@@ -17,6 +17,14 @@ export interface Observations {
   readonly resourceTemplateInvocations: number
 }
 
+export const MrtrToolName = "MrtrTool"
+export const MrtrStateOnlyToolName = "MrtrStateOnlyTool"
+export const MrtrInvalidStateToolName = "MrtrInvalidStateTool"
+export const MrtrPromptName = "MrtrPrompt"
+export const MrtrSamplingToolsToolName = "MrtrSamplingToolsTool"
+export const MrtrSamplingToolChoiceToolName = "MrtrSamplingToolChoiceTool"
+export const mrtrRequestState = "opaque:+/=\u0000é"
+
 const TestTool = Tool.make("TestTool", {
   description: "A test tool",
   parameters: Schema.Struct({
@@ -42,8 +50,14 @@ const LogLevelTool = Tool.make("LogLevelTool", {
   dependencies: [CurrentLogLevel]
 })
 
+const RequestMetadataTool = Tool.make("RequestMetadataTool", {
+  parameters: Tool.EmptyParams,
+  success: Schema.String,
+  dependencies: [McpSchema.McpRequestContext]
+})
+
 const makeTestToolkitLayer = (observations: Ref.Ref<Observations>, protocolVersion: string) => {
-  const TestToolkit = Toolkit.make(TestTool, makeStructuredTool(protocolVersion), LogLevelTool)
+  const TestToolkit = Toolkit.make(TestTool, makeStructuredTool(protocolVersion), LogLevelTool, RequestMetadataTool)
   return McpServer.toolkit(TestToolkit).pipe(
     Layer.provide(TestToolkit.toLayer({
       TestTool: ({ value }) =>
@@ -52,7 +66,9 @@ const makeTestToolkitLayer = (observations: Ref.Ref<Observations>, protocolVersi
           toolInvocations: current.toolInvocations + 1
         })).pipe(Effect.as(value)),
       StructuredTool: () => Effect.succeed({ value: "structured" }),
-      LogLevelTool: () => CurrentLogLevel
+      LogLevelTool: () => CurrentLogLevel,
+      RequestMetadataTool: () =>
+        McpSchema.McpRequestContext.useSync((context) => JSON.stringify(context.requestMetadata))
     }))
   )
 }
@@ -121,6 +137,25 @@ const makeContentToolsLayer = Layer.effectDiscard(
       handle: () => Effect.die("private defect details")
     })
 
+    yield* server.addTool({
+      tool: new McpSchema.Tool({
+        name: "JsonSchema2020Tool",
+        inputSchema: {
+          $schema: "https://json-schema.org/draft/2020-12/schema",
+          type: "object",
+          $defs: { identifier: { type: "string" } },
+          properties: { value: { $ref: "#/$defs/identifier" } },
+          allOf: [{ required: ["value"] }],
+          unevaluatedProperties: false
+        }
+      }),
+      annotations: Context.make(
+        McpSchema.EnabledWhen,
+        (client) => client.protocolVersion === "2026-07-28"
+      ),
+      handle: () => Effect.succeed(new McpSchema.CallToolResult({ content: [] }))
+    })
+
     yield* add(
       "AudioTool",
       new McpSchema.CallToolResult({
@@ -145,6 +180,213 @@ const makeContentToolsLayer = Layer.effectDiscard(
   })
 )
 
+const makeHeaderToolLayer = (observations: Ref.Ref<Observations>) =>
+  Layer.effectDiscard(
+    Effect.gen(function*() {
+      const server = yield* McpServer.McpServer
+      yield* server.addTool({
+        tool: new McpSchema.Tool({
+          name: "HeaderTool",
+          inputSchema: {
+            type: "object",
+            properties: {
+              region: {
+                type: "string",
+                "x-mcp-header": "Region"
+              },
+              shard: {
+                type: "integer",
+                "x-mcp-header": "Shard"
+              },
+              routing: {
+                type: "object",
+                properties: { region: { type: "string", "x-mcp-header": "Nested-Region" } }
+              },
+              dryRun: {
+                type: "boolean",
+                "x-mcp-header": "Dry-Run"
+              }
+            },
+            required: ["region"]
+          }
+        }),
+        annotations: Context.make(
+          McpSchema.EnabledWhen,
+          (client) => client.protocolVersion === "2026-07-28"
+        ),
+        handle: () =>
+          Ref.update(observations, (current) => ({
+            ...current,
+            toolInvocations: current.toolInvocations + 1
+          })).pipe(Effect.as(new McpSchema.CallToolResult({ content: [] })))
+      })
+    })
+  )
+
+const mrtrToolLayer = Layer.effectDiscard(
+  Effect.gen(function*() {
+    const server = yield* McpServer.McpServer
+    yield* server.addTool({
+      tool: new McpSchema.Tool({
+        name: MrtrToolName,
+        description: "Requests confirmation before completing",
+        inputSchema: { type: "object" }
+      }),
+      annotations: Context.make(
+        McpSchema.EnabledWhen,
+        (client) => client.protocolVersion === "2026-07-28"
+      ),
+      handle: () =>
+        McpSchema.McpRequestContext.useSync((context) => {
+          const approval = context.inputResponses?.approval
+          const sample = context.inputResponses?.sample
+          const roots = context.inputResponses?.roots
+          if (
+            context.requestState === mrtrRequestState && approval?.action === "accept" &&
+            sample !== undefined && roots !== undefined
+          ) {
+            return new McpSchema.CallToolResult({
+              content: [{
+                type: "text",
+                text: JSON.stringify({ approval: approval.content, sample, roots })
+              }]
+            })
+          }
+          return new McpSchema.InputRequired({
+            inputRequests: {
+              approval: {
+                method: "elicitation/create",
+                params: {
+                  message: "Approve the operation",
+                  requestedSchema: {
+                    type: "object",
+                    properties: {
+                      approved: { type: "boolean" },
+                      color: { type: "string", enum: ["red", "blue"] },
+                      titled: {
+                        type: "string",
+                        oneOf: [{ const: "red", title: "Red" }, { const: "blue", title: "Blue" }]
+                      },
+                      legacy: { type: "string", enum: ["red", "blue"], enumNames: ["Red", "Blue"] }
+                    },
+                    required: ["approved"]
+                  }
+                }
+              },
+              sample: {
+                method: "sampling/createMessage",
+                params: {
+                  messages: [{ role: "user", content: { type: "text", text: "Suggest a title" } }],
+                  maxTokens: 20
+                }
+              },
+              roots: {
+                method: "roots/list"
+              }
+            },
+            requestState: mrtrRequestState
+          })
+        })
+    })
+    yield* server.addTool({
+      tool: new McpSchema.Tool({
+        name: MrtrStateOnlyToolName,
+        description: "Requests a retry without client input",
+        inputSchema: { type: "object" }
+      }),
+      annotations: Context.make(
+        McpSchema.EnabledWhen,
+        (client) => client.protocolVersion === "2026-07-28"
+      ),
+      handle: () => Effect.succeed(new McpSchema.InputRequired({ requestState: mrtrRequestState }))
+    })
+    yield* server.addTool({
+      tool: new McpSchema.Tool({
+        name: MrtrInvalidStateToolName,
+        description: "Rejects an invalid continuation state",
+        inputSchema: { type: "object" }
+      }),
+      annotations: Context.make(
+        McpSchema.EnabledWhen,
+        (client) => client.protocolVersion === "2026-07-28"
+      ),
+      handle: () => Effect.fail(new McpSchema.InvalidParams({ message: "requestState integrity check failed" }))
+    })
+    const samplingToolRequests = [
+      [
+        MrtrSamplingToolsToolName,
+        {
+          messages: [{ role: "user", content: { type: "text", text: "Check the weather" } }],
+          maxTokens: 20,
+          tools: [{ name: "weather", inputSchema: { type: "object" } }]
+        }
+      ],
+      [
+        MrtrSamplingToolChoiceToolName,
+        {
+          messages: [{ role: "user", content: { type: "text", text: "Check the weather" } }],
+          maxTokens: 20,
+          toolChoice: { mode: "required" }
+        }
+      ]
+    ] as const
+    for (const [name, params] of samplingToolRequests) {
+      yield* server.addTool({
+        tool: new McpSchema.Tool({
+          name,
+          description: "Requests tool-enabled sampling before completing",
+          inputSchema: { type: "object" }
+        }),
+        annotations: Context.make(
+          McpSchema.EnabledWhen,
+          (client) => client.protocolVersion === "2026-07-28"
+        ),
+        handle: () =>
+          Effect.succeed(
+            new McpSchema.InputRequired({
+              inputRequests: {
+                sample: { method: "sampling/createMessage", params }
+              }
+            })
+          )
+      })
+    }
+    yield* server.addPrompt({
+      prompt: new McpSchema.Prompt({
+        name: MrtrPromptName,
+        description: "Requests client input before returning a prompt"
+      }),
+      annotations: Context.make(
+        McpSchema.EnabledWhen,
+        (client) => client.protocolVersion === "2026-07-28"
+      ),
+      completions: {},
+      handle: () =>
+        McpSchema.McpRequestContext.useSync((context) =>
+          context.inputResponses?.userContext === undefined
+            ? new McpSchema.InputRequired({
+              inputRequests: {
+                userContext: {
+                  method: "elicitation/create",
+                  params: {
+                    message: "What context should the prompt use?",
+                    requestedSchema: {
+                      type: "object",
+                      properties: { context: { type: "string" } },
+                      required: ["context"]
+                    }
+                  }
+                }
+              }
+            })
+            : new McpSchema.GetPromptResult({
+              messages: [{ role: "user", content: { type: "text", text: "Prompt completed" } }]
+            })
+        )
+    })
+  })
+)
+
 const templatePath = McpSchema.param("path", Schema.String)
 const TestResourceTemplate = McpServer.resource`file:///template/${templatePath}`({
   name: "TestResourceTemplate",
@@ -225,6 +467,8 @@ export const makeFeaturesServerLayer = (
   Layer.mergeAll(
     makeTestToolkitLayer(observations, protocol.protocolVersion),
     makeContentToolsLayer,
+    makeHeaderToolLayer(observations),
+    mrtrToolLayer,
     McpServer.resource({
       uri: "file:///test",
       name: "TestResource",
@@ -272,6 +516,7 @@ export const makeFeaturesServerLayer = (
     makeNumericResourceTemplate(observations),
     McpServer.prompt({
       name: "TestPrompt",
+      title: "Test prompt",
       description: "A test prompt",
       parameters: {
         required: Schema.String,
@@ -302,6 +547,7 @@ export const makeFeaturesServerLayer = (
   ).pipe(
     Layer.provide(makeServerLayer({
       name: "McpConformance",
+      instructions: "Follow the test server instructions.",
       protocols: [protocol],
       extensions: { "example/lifecycle": { enabled: true } }
     }))
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/MultiRoundTripTest.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/MultiRoundTripTest.ts
new file mode 100644
index 000000000..cb4f60375
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/MultiRoundTripTest.ts
@@ -0,0 +1,350 @@
+import { assert, describe, it } from "@effect/vitest"
+import * as Context from "effect/Context"
+import * as Effect from "effect/Effect"
+import * as Layer from "effect/Layer"
+import * as Schema from "effect/Schema"
+import type * as McpProtocol from "effect/unstable/ai/McpProtocol"
+import * as McpSchema from "effect/unstable/ai/McpSchema"
+import * as McpServer from "effect/unstable/ai/McpServer"
+import { makeHttpHarness } from "../TestUtils/McpHttpHarness.ts"
+import { readMcpHttpResponse } from "../TestUtils/McpHttpResponse.ts"
+import { makeServerLayer } from "../TestUtils/McpServerLayer.ts"
+import { McpConformance, type McpConformanceLayer } from "./McpConformance.ts"
+import { MrtrPromptName, mrtrRequestState, MrtrStateOnlyToolName, MrtrToolName } from "./McpConformanceFixtures.ts"
+
+const decodeInputRequired = Schema.decodeUnknownEffect(Schema.Struct({
+  resultType: Schema.Literal("input_required"),
+  inputRequests: Schema.Record(Schema.String, Schema.Unknown),
+  requestState: Schema.String
+}))
+
+const decodeComplete = Schema.decodeUnknownEffect(Schema.Struct({
+  resultType: Schema.Literal("complete"),
+  content: Schema.Array(Schema.Struct({
+    type: Schema.Literal("text"),
+    text: Schema.String
+  }))
+}))
+
+const inputResponses = {
+  approval: { action: "accept", content: { approved: true } },
+  sample: {
+    role: "assistant",
+    content: { type: "text", text: "Suggested title", _meta: {} },
+    model: "fixture-model",
+    _meta: {}
+  },
+  roots: { roots: [{ uri: "file:///workspace" }] }
+} as const
+
+export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConformanceLayer) =>
+  it.layer(layer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
+    // SEP-2322: https://modelcontextprotocol.io/seps/2322-MRTR
+    // https://modelcontextprotocol.io/specification/2026-07-28/basic/patterns/mrtr
+    describe("Multi round-trip requests", () => {
+      // Follow the sampling SHOULD NOT recommendation by rejecting context requests without client support.
+      // https://modelcontextprotocol.io/specification/2026-07-28/client/sampling#capabilities
+      it.effect("should require context capability when sampling requests include server context", () =>
+        Effect.gen(function*() {
+          for (const includeContext of ["thisServer", "allServers"] as const) {
+            const sample = {
+              method: "sampling/createMessage",
+              params: {
+                messages: [{ role: "user", content: { type: "text", text: "Summarize context" } }],
+                includeContext,
+                maxTokens: 20
+              }
+            } as const
+            const registration = Layer.effectDiscard(McpServer.McpServer.use((server) =>
+              server.addTool({
+                tool: new McpSchema.Tool({ name: "Context", inputSchema: { type: "object" } }),
+                annotations: Context.empty(),
+                handle: () => Effect.succeed(new McpSchema.InputRequired({ inputRequests: { sample } }))
+              })
+            ))
+            const harness = yield* makeHttpHarness(registration.pipe(Layer.provideMerge(
+              makeServerLayer({ name: "SamplingContext", protocols: [protocol] })
+            )))
+            for (const supported of [false, true]) {
+              const response = yield* harness.post({
+                jsonrpc: "2.0",
+                id: supported ? "supported" : "unsupported",
+                method: "tools/call",
+                params: {
+                  name: "Context",
+                  arguments: {},
+                  _meta: {
+                    "io.modelcontextprotocol/protocolVersion": protocol.protocolVersion,
+                    "io.modelcontextprotocol/clientCapabilities": { sampling: supported ? { context: {} } : {} }
+                  }
+                }
+              }, {
+                "Mcp-Protocol-Version": protocol.protocolVersion,
+                "Mcp-Method": "tools/call",
+                "Mcp-Name": "Context"
+              })
+              const message = yield* readMcpHttpResponse(response)
+              if (supported) {
+                assert.strictEqual(response.status, 200)
+                const result = Schema.decodeUnknownSync(Schema.Struct({
+                  result: Schema.Struct({ resultType: Schema.String, inputRequests: Schema.JsonObject })
+                }))(message).result
+                assert.strictEqual(result.resultType, "input_required")
+                assert.deepStrictEqual(result.inputRequests, { sample })
+              } else {
+                assert.strictEqual(response.status, 400)
+                const error = Schema.decodeUnknownSync(Schema.Struct({
+                  error: Schema.Struct({ code: Schema.Number, data: Schema.JsonObject })
+                }))(message).error
+                assert.strictEqual(error.code, -32021)
+                assert.deepStrictEqual(error.data, { requiredCapabilities: { sampling: { context: {} } } })
+              }
+            }
+          }
+        }))
+
+      // Conformance: input-required-result-non-tool-request
+      it.effect("should return input_required and then complete when prompts/get is retried with client input", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const initialized = yield* test.initialize({ server: "features" })
+          const firstResponse = yield* test.send(initialized, {
+            jsonrpc: "2.0",
+            id: 30,
+            method: "prompts/get",
+            params: { name: MrtrPromptName, arguments: {} }
+          })
+          const first = yield* test.decodeResult(firstResponse).pipe(
+            Effect.flatMap((message) =>
+              Schema.decodeUnknownEffect(Schema.Struct({
+                resultType: Schema.Literal("input_required"),
+                inputRequests: Schema.Record(Schema.String, Schema.Unknown)
+              }))(message.result)
+            )
+          )
+          assert.deepStrictEqual(first.inputRequests.userContext, {
+            method: "elicitation/create",
+            params: {
+              message: "What context should the prompt use?",
+              requestedSchema: {
+                type: "object",
+                properties: { context: { type: "string" } },
+                required: ["context"]
+              }
+            }
+          })
+
+          const completedResponse = yield* test.send(initialized, {
+            jsonrpc: "2.0",
+            id: 31,
+            method: "prompts/get",
+            params: {
+              name: MrtrPromptName,
+              arguments: {},
+              inputResponses: {
+                userContext: { action: "accept", content: { context: "test context" } }
+              }
+            }
+          })
+          const completed = yield* test.decodeResult(completedResponse).pipe(
+            Effect.flatMap((message) =>
+              Schema.decodeUnknownEffect(Schema.Struct({
+                resultType: Schema.Literal("complete"),
+                messages: Schema.Array(Schema.Struct({
+                  role: Schema.Literal("user"),
+                  content: Schema.Struct({
+                    type: Schema.Literal("text"),
+                    text: Schema.String
+                  })
+                }))
+              }))(message.result)
+            )
+          )
+          assert.deepStrictEqual(completed.messages, [{
+            role: "user",
+            content: { type: "text", text: "Prompt completed" }
+          }])
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic/patterns/mrtr#server-requirements-basic-workflow
+      it.effect("should reject prompt input requests when the client omits their required capabilities", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const initialized = yield* test.initialize({ server: "features" })
+          const response = yield* test.send(initialized, {
+            jsonrpc: "2.0",
+            id: 32,
+            method: "prompts/get",
+            params: { name: MrtrPromptName, arguments: {} }
+          }, { clientCapabilities: {} })
+          const error = yield* test.decodeError(response)
+
+          assert.strictEqual(response.status, 400)
+          assert.strictEqual(error.error.code, -32021)
+          assert.deepStrictEqual(error.error.data, {
+            requiredCapabilities: { elicitation: { form: {} } }
+          })
+        }))
+
+      // Elicitation choices must survive the input-required result sent to the client.
+      // https://modelcontextprotocol.io/specification/2026-07-28/client/elicitation#requested-schema
+      it.effect("should return supported keyed input requests and resume when matching responses are supplied", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const initialized = yield* test.initialize({ server: "features" })
+          const firstResponse = yield* test.send(initialized, {
+            jsonrpc: "2.0",
+            id: 1,
+            method: "tools/call",
+            params: { name: MrtrToolName, arguments: {} }
+          })
+          const first = yield* test.decodeResult(firstResponse).pipe(
+            Effect.flatMap((message) => decodeInputRequired(message.result))
+          )
+
+          assert.strictEqual(first.requestState, mrtrRequestState)
+          assert.deepStrictEqual(first.inputRequests, {
+            approval: {
+              method: "elicitation/create",
+              params: {
+                message: "Approve the operation",
+                requestedSchema: {
+                  type: "object",
+                  properties: {
+                    approved: { type: "boolean" },
+                    color: { type: "string", enum: ["red", "blue"] },
+                    titled: {
+                      type: "string",
+                      oneOf: [{ const: "red", title: "Red" }, { const: "blue", title: "Blue" }]
+                    },
+                    legacy: { type: "string", enum: ["red", "blue"], enumNames: ["Red", "Blue"] }
+                  },
+                  required: ["approved"]
+                }
+              }
+            },
+            sample: {
+              method: "sampling/createMessage",
+              params: {
+                messages: [{ role: "user", content: { type: "text", text: "Suggest a title" } }],
+                maxTokens: 20
+              }
+            },
+            roots: {
+              method: "roots/list"
+            }
+          })
+
+          const completedResponse = yield* test.send(initialized, {
+            jsonrpc: "2.0",
+            id: 3,
+            method: "tools/call",
+            params: {
+              name: MrtrToolName,
+              arguments: {},
+              inputResponses,
+              requestState: first.requestState
+            }
+          })
+          const completed = yield* test.decodeResult(completedResponse).pipe(
+            Effect.flatMap((message) => decodeComplete(message.result))
+          )
+
+          const content = completed.content[0]
+          assert.isDefined(content)
+          assert.deepStrictEqual(JSON.parse(content.text), {
+            approval: { approved: true },
+            sample: {
+              role: "assistant",
+              content: { type: "text", text: "Suggested title", _meta: {} },
+              model: "fixture-model",
+              _meta: {}
+            },
+            roots: { roots: [{ uri: "file:///workspace" }] }
+          })
+        }))
+
+      it.effect("should return a retry state without requesting client input", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const initialized = yield* test.initialize({ server: "features" })
+          const response = yield* test.send(initialized, {
+            jsonrpc: "2.0",
+            id: 2,
+            method: "tools/call",
+            params: { name: MrtrStateOnlyToolName, arguments: {} }
+          })
+          const result = yield* test.decodeResult(response).pipe(
+            Effect.flatMap((message) =>
+              Schema.decodeUnknownEffect(Schema.Struct({
+                resultType: Schema.Literal("input_required"),
+                inputRequests: Schema.optionalKey(Schema.Record(Schema.String, Schema.Unknown)),
+                requestState: Schema.String
+              }))(message.result)
+            )
+          )
+
+          assert.strictEqual(result.requestState, mrtrRequestState)
+          assert.isUndefined(result.inputRequests)
+        }))
+
+      it.effect("should remain input-required when continuation keys or request state do not match", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const initialized = yield* test.initialize({ server: "features" })
+          const cases = [
+            {
+              inputResponses: { other: { action: "accept", content: { approved: true } } },
+              requestState: mrtrRequestState
+            },
+            {
+              inputResponses,
+              requestState: `${mrtrRequestState}:mismatch`
+            }
+          ] as const
+
+          for (const [index, continuation] of cases.entries()) {
+            const response = yield* test.send(initialized, {
+              jsonrpc: "2.0",
+              id: index + 10,
+              method: "tools/call",
+              params: {
+                name: MrtrToolName,
+                arguments: {},
+                ...continuation
+              }
+            })
+            const result = yield* test.decodeResult(response).pipe(
+              Effect.flatMap((message) => decodeInputRequired(message.result))
+            )
+            assert.strictEqual(result.requestState, mrtrRequestState)
+          }
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic/patterns/mrtr#server-requirements-validation-and-security
+      it.effect("should reject a continuation when its input responses or request state are malformed", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const initialized = yield* test.initialize({ server: "features" })
+          const cases = [
+            { inputResponses: { approval: "accepted" }, requestState: mrtrRequestState },
+            { inputResponses, requestState: 42 }
+          ] as const
+
+          for (const [index, continuation] of cases.entries()) {
+            const response = yield* test.send(initialized, {
+              jsonrpc: "2.0",
+              id: index + 20,
+              method: "tools/call",
+              params: {
+                name: MrtrToolName,
+                arguments: {},
+                ...continuation
+              }
+            })
+            const error = yield* test.decodeError(response)
+            assert.strictEqual(error.error.code, -32602)
+          }
+        }))
+    })
+  })
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/PromptsTest.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/PromptsTest.ts
index a96ce3406..c71c4c8e1 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/PromptsTest.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/PromptsTest.ts
@@ -30,10 +30,14 @@ const getPromptWire = (name: string) =>
     return yield* test.decodeResult(response)
   })
 
-export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConformanceLayer) =>
+export const suite = (
+  protocol: McpProtocol.ProtocolAdapter,
+  layer: McpConformanceLayer,
+  options?: { readonly additionalPromptNames?: ReadonlyArray<string> }
+) =>
   it.layer(layer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
     describe("Prompts", () => {
-      // Identical requirements in the 2024-11-05, 2025-03-26, and 2025-06-18 specifications.
+      // Shared capability contract; each dated entrypoint owns its normative specification revision.
       describe("Capabilities", () => {
         it.effect("MUST advertise prompts when prompts are registered", () =>
           Effect.gen(function*() {
@@ -50,89 +54,95 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
 
             assert.notProperty(initialized.message.result.capabilities, "prompts")
           }))
-
-        it.effect("MUST advertise listChanged when prompt list change notifications are supported", () =>
-          Effect.gen(function*() {
-            const test = yield* McpConformance
-            const initialized = yield* test.initialize({ server: "features" })
-
-            assert.strictEqual(initialized.message.result.capabilities.prompts?.listChanged, true)
-          }))
       })
 
       describe("Listing Prompts", () => {
-        it.effect("MUST list every prompt visible to the initialized client", () =>
-          Effect.gen(function*() {
-            const test = yield* McpConformance
-            const initialized = yield* test.initialize({ server: "features" })
-            yield* test.notifyInitialized(initialized)
-            const response = yield* test.send(initialized, {
-              jsonrpc: "2.0",
-              id: 2,
-              method: "prompts/list",
-              params: {}
+        it.effect(
+          "MUST list every prompt visible to the initialized client",
+          () =>
+            Effect.gen(function*() {
+              const test = yield* McpConformance
+              const initialized = yield* test.initialize({ server: "features" })
+              yield* test.notifyInitialized(initialized)
+              const response = yield* test.send(initialized, {
+                jsonrpc: "2.0",
+                id: 2,
+                method: "prompts/list",
+                params: {}
+              })
+              const result = yield* test.decodeResult(response).pipe(
+                Effect.flatMap((message) => decodePrompts(message.result))
+              )
+
+              const expected = [
+                "AudioPrompt",
+                "ContextCompletionPrompt",
+                "EmbeddedResourcePrompt",
+                "ImagePrompt",
+                "NoArgumentPrompt",
+                "TestPrompt",
+                ...(options?.additionalPromptNames ?? [])
+              ].sort()
+              assert.deepStrictEqual(result.prompts.map((prompt) => prompt.name).sort(), expected)
             })
-            const result = yield* test.decodeResult(response).pipe(
-              Effect.flatMap((message) => decodePrompts(message.result))
-            )
+        )
 
-            const expected = [
-              "AudioPrompt",
-              "ContextCompletionPrompt",
-              "EmbeddedResourcePrompt",
-              "ImagePrompt",
-              "NoArgumentPrompt",
-              "TestPrompt"
-            ].sort()
-            assert.deepStrictEqual(result.prompts.map((prompt) => prompt.name).sort(), expected)
-          }))
+        it.effect(
+          "SCHEMA preserves prompt names, titles, descriptions, and arguments",
+          () =>
+            Effect.gen(function*() {
+              const test = yield* McpConformance
+              const initialized = yield* test.initialize({ server: "features" })
+              yield* test.notifyInitialized(initialized)
+              const response = yield* test.send(initialized, {
+                jsonrpc: "2.0",
+                id: 2,
+                method: "prompts/list",
+                params: {}
+              })
+              const result = yield* test.decodeResult(response).pipe(
+                Effect.flatMap((message) => decodePrompts(message.result))
+              )
 
-        it.effect("SCHEMA preserves prompt names, descriptions, and arguments", () =>
-          Effect.gen(function*() {
-            const test = yield* McpConformance
-            const initialized = yield* test.initialize({ server: "features" })
-            yield* test.notifyInitialized(initialized)
-            const response = yield* test.send(initialized, {
-              jsonrpc: "2.0",
-              id: 2,
-              method: "prompts/list",
-              params: {}
+              const prompt = result.prompts.find((prompt) => prompt.name === "TestPrompt")
+              assert.isDefined(prompt)
+              assert.strictEqual(
+                prompt.title,
+                ["2024-11-05", "2025-03-26"].includes(protocol.protocolVersion) ? undefined : "Test prompt"
+              )
+              assert.strictEqual(prompt.description, "A test prompt")
+              assert.deepStrictEqual(prompt.arguments?.map((argument) => argument.name), [
+                "required",
+                "optional"
+              ])
             })
-            const result = yield* test.decodeResult(response).pipe(
-              Effect.flatMap((message) => decodePrompts(message.result))
-            )
+        )
 
-            const prompt = result.prompts.find((prompt) => prompt.name === "TestPrompt")
-            assert.isDefined(prompt)
-            assert.strictEqual(prompt.description, "A test prompt")
-            assert.deepStrictEqual(prompt.arguments?.map((argument) => argument.name), [
-              "required",
-              "optional"
-            ])
-          }))
+        it.effect(
+          "MUST mark required and optional prompt arguments correctly",
+          () =>
+            Effect.gen(function*() {
+              const test = yield* McpConformance
+              const initialized = yield* test.initialize({ server: "features" })
+              yield* test.notifyInitialized(initialized)
+              const response = yield* test.send(initialized, {
+                jsonrpc: "2.0",
+                id: 2,
+                method: "prompts/list",
+                params: {}
+              })
+              const result = yield* test.decodeResult(response).pipe(
+                Effect.flatMap((message) => decodePrompts(message.result))
+              )
 
-        it.effect("MUST mark required and optional prompt arguments correctly", () =>
-          Effect.gen(function*() {
-            const test = yield* McpConformance
-            const initialized = yield* test.initialize({ server: "features" })
-            yield* test.notifyInitialized(initialized)
-            const response = yield* test.send(initialized, {
-              jsonrpc: "2.0",
-              id: 2,
-              method: "prompts/list",
-              params: {}
+              const prompt = result.prompts.find((prompt) => prompt.name === "TestPrompt")
+              assert.isDefined(prompt)
+              assert.deepStrictEqual(prompt.arguments, [
+                { name: "required", required: true },
+                { name: "optional", required: false }
+              ])
             })
-            const result = yield* test.decodeResult(response).pipe(
-              Effect.flatMap((message) => decodePrompts(message.result))
-            )
-
-            const prompt = result.prompts.find((prompt) => prompt.name === "TestPrompt")
-            assert.isDefined(prompt)
-            assert.deepStrictEqual(prompt.arguments, [
-              { name: "required", required: true },
-              { name: "optional", required: false }
-            ])
-          }))
+        )
       })
 
       describe("Getting Prompts", () => {
@@ -318,21 +328,6 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
               }
             }])
           }))
-        it.effect.skipIf(["2024-11-05"].includes(protocol.protocolVersion))(
-          "MUST return audio message content",
-          () =>
-            Effect.gen(function*() {
-              const result = yield* getPromptWire("AudioPrompt")
-              assert.deepStrictEqual(result.result.messages, [{
-                role: "user",
-                content: {
-                  type: "audio",
-                  data: "BAUG",
-                  mimeType: "audio/wav"
-                }
-              }])
-            })
-        )
         it.effect("MUST return embedded resource message content", () =>
           Effect.gen(function*() {
             const result = yield* getPrompt("EmbeddedResourcePrompt")
@@ -348,41 +343,68 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
               }
             }])
           }))
-      })
 
-      describe("List Changed Notification", () => {
-        it.effect("SHOULD send a prompt list changed notification when the advertised list changes", () =>
-          Effect.gen(function*() {
-            const fixture = yield* makeMcpStdioHarness(protocol)
-            const makePrompt = (name: string) => ({
-              prompt: new McpSchema.Prompt({ name }),
-              annotations: Context.empty(),
-              completions: {},
-              handle: () =>
-                Effect.succeed(
-                  new McpSchema.GetPromptResult({
-                    messages: [{ role: "user", content: { type: "text", text: name } }]
-                  })
-                )
+        it.effect.skipIf(protocol.protocolVersion === "2024-11-05")(
+          "should return base64 audio content when an audio prompt is requested",
+          () =>
+            Effect.gen(function*() {
+              const result = yield* getPromptWire("AudioPrompt")
+              assert.deepStrictEqual(result.result.messages, [{
+                role: "user",
+                content: {
+                  type: "audio",
+                  data: "BAUG",
+                  mimeType: "audio/wav"
+                }
+              }])
             })
-            yield* fixture.server.addPrompt(makePrompt("baseline-list-changed-prompt"))
-            const initialized = yield* fixture.initialize()
-            const initializeResult = yield* Schema.decodeUnknownEffect(McpSchema.InitializeResult)(initialized.result)
-            assert.strictEqual(
-              initializeResult.capabilities.prompts?.listChanged,
-              true
-            )
+        )
+      })
+    })
+  })
+
+export const statefulLegacySuite = (
+  protocol: McpProtocol.ProtocolAdapter<McpProtocol.StatefulProtocolVersion>,
+  layer: McpConformanceLayer
+) =>
+  it.layer(layer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
+    // https://modelcontextprotocol.io/specification/2025-11-25/server/prompts
+    describe("Prompts > Legacy notifications", () => {
+      it.effect("should advertise prompt list-change notifications when supported", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const initialized = yield* test.initialize({ server: "features" })
 
-            yield* fixture.server.addPrompt(makePrompt("dynamic-list-changed-prompt"))
-            const notification = yield* fixture.awaitOutboundMethod("notifications/prompts/list_changed")
-            assert.strictEqual(notification.jsonrpc, "2.0")
-            assert.strictEqual(notification.method, "notifications/prompts/list_changed")
-            assert.notProperty(notification, "id")
+          assert.strictEqual(initialized.message.result.capabilities.prompts?.listChanged, true)
+        }))
 
-            const response = yield* fixture.sendRequest("prompts/list", {})
-            const result = yield* decodePrompts(response.result)
-            assert.isTrue(result.prompts.some((prompt) => prompt.name === "dynamic-list-changed-prompt"))
-          }))
-      })
+      it.effect("should send a prompt list-change notification when the advertised list changes", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol)
+          const makePrompt = (name: string) => ({
+            prompt: new McpSchema.Prompt({ name }),
+            annotations: Context.empty(),
+            completions: {},
+            handle: () =>
+              Effect.succeed(
+                new McpSchema.GetPromptResult({
+                  messages: [{ role: "user", content: { type: "text", text: name } }]
+                })
+              )
+          })
+          yield* fixture.server.addPrompt(makePrompt("baseline-list-changed-prompt"))
+          yield* fixture.initialize()
+          yield* fixture.server.addPrompt(makePrompt("dynamic-list-changed-prompt"))
+          yield* fixture.flushListChanged
+
+          const notification = yield* fixture.awaitOutboundMethod("notifications/prompts/list_changed")
+          assert.strictEqual(notification.jsonrpc, "2.0")
+          assert.strictEqual(notification.method, "notifications/prompts/list_changed")
+          assert.notProperty(notification, "id")
+
+          const response = yield* fixture.sendRequest("prompts/list", {})
+          const result = yield* decodePrompts(response.result)
+          assert.isTrue(result.prompts.some((prompt) => prompt.name === "dynamic-list-changed-prompt"))
+        }))
     })
   })
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/ResourcesTest.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/ResourcesTest.ts
index bdbf71c03..c7dd83f25 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/ResourcesTest.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/ResourcesTest.ts
@@ -24,7 +24,7 @@ const makeResource = (uri: string, name: string) => ({
 export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConformanceLayer) =>
   it.layer(layer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
     describe("Resources", () => {
-      // Identical requirements in the 2024-11-05, 2025-03-26, and 2025-06-18 specifications.
+      // Shared capability contract; each dated entrypoint owns its normative specification revision.
       describe("Capabilities", () => {
         it.effect("MUST advertise resources when resources are registered", () =>
           Effect.gen(function*() {
@@ -41,22 +41,6 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
 
             assert.notProperty(initialized.message.result.capabilities, "resources")
           }))
-
-        it.effect("MUST NOT advertise resource subscriptions when they are unsupported", () =>
-          Effect.gen(function*() {
-            const test = yield* McpConformance
-            const initialized = yield* test.initialize({ server: "features" })
-
-            assert.strictEqual(initialized.message.result.capabilities.resources?.subscribe, false)
-          }))
-
-        it.effect("MUST advertise listChanged when resource list change notifications are supported", () =>
-          Effect.gen(function*() {
-            const test = yield* McpConformance
-            const initialized = yield* test.initialize({ server: "features" })
-
-            assert.strictEqual(initialized.message.result.capabilities.resources?.listChanged, true)
-          }))
       })
 
       describe("Listing Resources", () => {
@@ -196,7 +180,8 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
               "file:///multiple#second"
             ])
           }))
-        it.effect("SHOULD return resource not found for an unknown resource URI", () =>
+
+        it.effect("should return the revision-specific error when the resource URI is unknown", () =>
           Effect.gen(function*() {
             const test = yield* McpConformance
             const initialized = yield* test.initialize({ server: "features" })
@@ -209,7 +194,10 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
             })
             const error = yield* test.decodeError(response)
 
-            assert.strictEqual(error.error.code, -32002)
+            assert.strictEqual(
+              error.error.code,
+              protocol.protocolVersion === "2026-07-28" ? -32602 : -32002
+            )
           }))
       })
 
@@ -286,154 +274,113 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
             assert.strictEqual((yield* test.observations).resourceTemplateInvocations, 0)
           }))
       })
+    })
+  })
 
-      describe("List Changed Notification", () => {
-        it.effect("SHOULD send a resource list changed notification when the advertised list changes", () =>
-          Effect.gen(function*() {
-            const fixture = yield* makeMcpStdioHarness(protocol)
-            yield* fixture.server.addResource(
-              makeResource("file:///baseline-list-changed", "baseline-list-changed-resource")
-            )
-            const initialized = yield* fixture.initialize()
-            const initializeResult = yield* Schema.decodeUnknownEffect(McpSchema.InitializeResult)(initialized.result)
-            assert.strictEqual(
-              initializeResult.capabilities.resources?.listChanged,
-              true
-            )
-
-            yield* fixture.server.addResource(
-              makeResource("file:///dynamic-list-changed", "dynamic-list-changed-resource")
-            )
-            const notification = yield* fixture.awaitOutboundMethod("notifications/resources/list_changed")
-            assert.strictEqual(notification.jsonrpc, "2.0")
-            assert.strictEqual(notification.method, "notifications/resources/list_changed")
-            assert.notProperty(notification, "id")
-
-            const response = yield* fixture.sendRequest("resources/list", {})
-            const result = yield* decodeResources(response.result)
-            assert.isTrue(result.resources.some((resource) => resource.uri === "file:///dynamic-list-changed"))
-          }))
-      })
-
-      describe("Subscriptions", () => {
-        it.effect("MUST subscribe to a resource when subscriptions are advertised", () =>
-          Effect.gen(function*() {
-            const fixture = yield* makeMcpStdioHarness(protocol)
-            yield* fixture.server.addResource(makeResource("file:///subscription-target", "subscription-target"))
-            const initialized = yield* fixture.initialize()
-            const initializeResult = yield* Schema.decodeUnknownEffect(McpSchema.InitializeResult)(initialized.result)
-            assert.strictEqual(initializeResult.capabilities.resources?.subscribe, true)
-
-            const response = yield* fixture.sendRequest("resources/subscribe", {
-              uri: "file:///subscription-target"
-            })
-            assert.notProperty(response, "error")
-            assert.deepStrictEqual(response.result, {})
-
-            yield* fixture.server.notifications["notifications/resources/updated"]({
-              uri: "file:///subscription-target"
-            })
-            const notification = yield* fixture.awaitOutboundMethod("notifications/resources/updated")
-            const payload = yield* decodeResourceUpdated(notification.params)
-            assert.strictEqual(payload.uri, "file:///subscription-target")
-          }))
-
-        it.effect("MUST send update notifications only for subscribed resources", () =>
-          Effect.gen(function*() {
-            const fixture = yield* makeMcpStdioHarness(protocol)
-            yield* fixture.server.addResource(makeResource("file:///subscription-target", "subscription-target"))
-            yield* fixture.initialize()
-            yield* fixture.sendRequest("resources/subscribe", {
-              uri: "file:///subscription-target"
-            })
-
-            yield* fixture.server.notifications["notifications/resources/updated"]({
-              uri: "file:///not-subscribed"
-            })
-            yield* fixture.server.notifications["notifications/resources/updated"]({
-              uri: "file:///subscription-target"
-            })
-            const notification = yield* fixture.awaitOutboundMethod("notifications/resources/updated")
-            const payload = yield* decodeResourceUpdated(notification.params)
-            assert.strictEqual(payload.uri, "file:///subscription-target")
-          }))
-
-        it.effect("MUST include the updated resource URI in each notification", () =>
-          Effect.gen(function*() {
-            const fixture = yield* makeMcpStdioHarness(protocol)
-            yield* fixture.server.addResource(makeResource("file:///subscription-target", "subscription-target"))
-            yield* fixture.initialize()
-            yield* fixture.sendRequest("resources/subscribe", {
-              uri: "file:///subscription-target"
-            })
-
-            yield* fixture.server.notifications["notifications/resources/updated"]({
-              uri: "file:///subscription-target"
-            })
-            const notification = yield* fixture.awaitOutboundMethod("notifications/resources/updated")
-            assert.strictEqual(notification.jsonrpc, "2.0")
-            assert.strictEqual(notification.method, "notifications/resources/updated")
-            assert.notProperty(notification, "id")
-            const payload = yield* decodeResourceUpdated(notification.params)
-            assert.strictEqual(payload.uri, "file:///subscription-target")
-          }))
-
-        it.effect("MUST unsubscribe from resource updates", () =>
-          Effect.gen(function*() {
-            const fixture = yield* makeMcpStdioHarness(protocol)
-            yield* fixture.server.addResource(makeResource("file:///subscription-target", "subscription-target"))
-            yield* fixture.server.addResource(makeResource("file:///subscription-sentinel", "subscription-sentinel"))
-            yield* fixture.initialize()
-            yield* fixture.sendRequest("resources/subscribe", {
-              uri: "file:///subscription-target"
-            })
-            yield* fixture.sendRequest("resources/subscribe", {
-              uri: "file:///subscription-sentinel"
-            })
-
-            const response = yield* fixture.sendRequest("resources/unsubscribe", {
-              uri: "file:///subscription-target"
-            })
-            assert.notProperty(response, "error")
-            assert.deepStrictEqual(response.result, {})
-
-            yield* fixture.server.notifications["notifications/resources/updated"]({
-              uri: "file:///subscription-target"
-            })
-            yield* fixture.server.notifications["notifications/resources/updated"]({
-              uri: "file:///subscription-sentinel"
-            })
-            const notification = yield* fixture.awaitOutboundMethod("notifications/resources/updated")
-            const payload = yield* decodeResourceUpdated(notification.params)
-            assert.strictEqual(payload.uri, "file:///subscription-sentinel")
-          }))
-
-        it.effect("MUST not send updates after a resource is unsubscribed", () =>
-          Effect.gen(function*() {
-            const fixture = yield* makeMcpStdioHarness(protocol)
-            yield* fixture.server.addResource(makeResource("file:///subscription-target", "subscription-target"))
-            yield* fixture.server.addResource(makeResource("file:///subscription-sentinel", "subscription-sentinel"))
-            yield* fixture.initialize()
-            yield* fixture.sendRequest("resources/subscribe", {
-              uri: "file:///subscription-target"
-            })
-            yield* fixture.sendRequest("resources/subscribe", {
-              uri: "file:///subscription-sentinel"
-            })
-            yield* fixture.sendRequest("resources/unsubscribe", {
-              uri: "file:///subscription-target"
-            })
+export const statefulLegacySuite = (
+  protocol: McpProtocol.ProtocolAdapter<McpProtocol.StatefulProtocolVersion>,
+  layer: McpConformanceLayer
+) =>
+  it.layer(layer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
+    // https://modelcontextprotocol.io/specification/2025-11-25/server/resources
+    describe("Resources > Legacy notifications", () => {
+      it.effect("should advertise resource list-change notifications when supported", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const initialized = yield* test.initialize({ server: "features" })
+
+          assert.strictEqual(initialized.message.result.capabilities.resources?.listChanged, true)
+        }))
+
+      it.effect("should send a resource list-change notification when the advertised list changes", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol)
+          yield* fixture.server.addResource(
+            makeResource("file:///baseline-list-changed", "baseline-list-changed-resource")
+          )
+          yield* fixture.initialize()
+          yield* fixture.server.addResource(
+            makeResource("file:///dynamic-list-changed", "dynamic-list-changed-resource")
+          )
+          yield* fixture.flushListChanged
+
+          const notification = yield* fixture.awaitOutboundMethod("notifications/resources/list_changed")
+          assert.strictEqual(notification.jsonrpc, "2.0")
+          assert.strictEqual(notification.method, "notifications/resources/list_changed")
+          assert.notProperty(notification, "id")
+
+          const response = yield* fixture.sendRequest("resources/list", {})
+          const result = yield* decodeResources(response.result)
+          assert.isTrue(result.resources.some((resource) => resource.uri === "file:///dynamic-list-changed"))
+        }))
+    })
 
-            yield* fixture.server.notifications["notifications/resources/updated"]({
-              uri: "file:///subscription-target"
-            })
-            yield* fixture.server.notifications["notifications/resources/updated"]({
-              uri: "file:///subscription-sentinel"
-            })
-            const notification = yield* fixture.awaitOutboundMethod("notifications/resources/updated")
-            const payload = yield* decodeResourceUpdated(notification.params)
-            assert.strictEqual(payload.uri, "file:///subscription-sentinel")
-          }))
-      })
+    describe("Resources > Legacy subscriptions", () => {
+      it.effect("should deliver a resource update with its URI when the resource is subscribed", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol)
+          yield* fixture.server.addResource(makeResource("file:///subscription-target", "subscription-target"))
+          const initialized = yield* fixture.initialize()
+          const initializeResult = yield* Schema.decodeUnknownEffect(McpSchema.InitializeResult)(initialized.result)
+          assert.strictEqual(initializeResult.capabilities.resources?.subscribe, true)
+
+          const response = yield* fixture.sendRequest("resources/subscribe", {
+            uri: "file:///subscription-target"
+          })
+          assert.notProperty(response, "error")
+          assert.deepStrictEqual(response.result, {})
+
+          yield* fixture.server.notifications["notifications/resources/updated"]({
+            uri: "file:///subscription-target"
+          })
+          const notification = yield* fixture.awaitOutboundMethod("notifications/resources/updated")
+          assert.strictEqual(notification.jsonrpc, "2.0")
+          assert.strictEqual(notification.method, "notifications/resources/updated")
+          assert.notProperty(notification, "id")
+          const payload = yield* decodeResourceUpdated(notification.params)
+          assert.strictEqual(payload.uri, "file:///subscription-target")
+        }))
+
+      it.effect("should deliver updates only for subscribed resource URIs", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol)
+          yield* fixture.server.addResource(makeResource("file:///subscription-target", "subscription-target"))
+          yield* fixture.initialize()
+          yield* fixture.sendRequest("resources/subscribe", { uri: "file:///subscription-target" })
+
+          yield* fixture.server.notifications["notifications/resources/updated"]({ uri: "file:///not-subscribed" })
+          yield* fixture.server.notifications["notifications/resources/updated"]({
+            uri: "file:///subscription-target"
+          })
+          const notification = yield* fixture.awaitOutboundMethod("notifications/resources/updated")
+          const payload = yield* decodeResourceUpdated(notification.params)
+          assert.strictEqual(payload.uri, "file:///subscription-target")
+        }))
+
+      it.effect("should stop delivering updates after a resource is unsubscribed", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol)
+          yield* fixture.server.addResource(makeResource("file:///subscription-target", "subscription-target"))
+          yield* fixture.server.addResource(makeResource("file:///subscription-sentinel", "subscription-sentinel"))
+          yield* fixture.initialize()
+          yield* fixture.sendRequest("resources/subscribe", { uri: "file:///subscription-target" })
+          yield* fixture.sendRequest("resources/subscribe", { uri: "file:///subscription-sentinel" })
+
+          const response = yield* fixture.sendRequest("resources/unsubscribe", {
+            uri: "file:///subscription-target"
+          })
+          assert.notProperty(response, "error")
+          assert.deepStrictEqual(response.result, {})
+
+          yield* fixture.server.notifications["notifications/resources/updated"]({
+            uri: "file:///subscription-target"
+          })
+          yield* fixture.server.notifications["notifications/resources/updated"]({
+            uri: "file:///subscription-sentinel"
+          })
+          const notification = yield* fixture.awaitOutboundMethod("notifications/resources/updated")
+          const payload = yield* decodeResourceUpdated(notification.params)
+          assert.strictEqual(payload.uri, "file:///subscription-sentinel")
+        }))
     })
   })
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/RootsTest.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/RootsTest.ts
index 615134940..3d374b8ba 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/RootsTest.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/RootsTest.ts
@@ -2,7 +2,6 @@ import { assert, describe, it } from "@effect/vitest"
 import * as Effect from "effect/Effect"
 import type * as McpProtocol from "effect/unstable/ai/McpProtocol"
 import * as McpSchema from "effect/unstable/ai/McpSchema"
-import { makeMcpStdioHarness } from "../TestUtils/McpStdioHarness.ts"
 import { McpConformance, type McpConformanceLayer } from "./McpConformance.ts"
 
 const rootsHandler = (roots: ReadonlyArray<{ readonly uri: string; readonly name?: string }>) => () =>
@@ -109,26 +108,5 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
             assert.strictEqual(error.message, "Roots unavailable")
           }))
       })
-
-      describe("Root List Changes", () => {
-        it.effect("SHOULD refresh roots after a capable client reports a list change", () =>
-          Effect.gen(function*() {
-            const fixture = yield* makeMcpStdioHarness(protocol)
-            yield* fixture.initialize({ roots: { listChanged: true } })
-
-            yield* fixture.sendNotification("notifications/roots/list_changed")
-
-            const request = yield* fixture.awaitOutboundMethod("roots/list")
-            assert.strictEqual(request.jsonrpc, "2.0")
-            assert.strictEqual(request.method, "roots/list")
-            if (typeof request.id !== "string" && typeof request.id !== "number") {
-              return assert.fail("roots/list request must include an identifier")
-            }
-
-            yield* fixture.respond(request.id, {
-              roots: [{ uri: "file:///updated", name: "Updated" }]
-            })
-          }))
-      })
     })
   })
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/SubscriptionsTest.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/SubscriptionsTest.ts
new file mode 100644
index 000000000..a02146fcd
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/SubscriptionsTest.ts
@@ -0,0 +1,618 @@
+import { assert, describe, it } from "@effect/vitest"
+import type * as Arr from "effect/Array"
+import * as Context from "effect/Context"
+import * as Deferred from "effect/Deferred"
+import * as Effect from "effect/Effect"
+import * as Fiber from "effect/Fiber"
+import * as Layer from "effect/Layer"
+import * as Predicate from "effect/Predicate"
+import * as PubSub from "effect/PubSub"
+import * as Queue from "effect/Queue"
+import * as Schema from "effect/Schema"
+import * as McpCore from "effect/unstable/ai/internal/mcpCore"
+import type * as McpProtocolInternal from "effect/unstable/ai/internal/mcpProtocol"
+import * as McpProtocol2026 from "effect/unstable/ai/internal/mcpProtocol/v2026_07_28"
+import * as McpSchema2026 from "effect/unstable/ai/internal/mcpSchema/v2026_07_28"
+import * as McpProtocol from "effect/unstable/ai/McpProtocol"
+import * as McpSchema from "effect/unstable/ai/McpSchema"
+import * as McpServer from "effect/unstable/ai/McpServer"
+import * as Rpc from "effect/unstable/rpc/Rpc"
+import type * as RpcMessage from "effect/unstable/rpc/RpcMessage"
+import { RequestId } from "effect/unstable/rpc/RpcMessage"
+import type * as RpcSerialization from "effect/unstable/rpc/RpcSerialization"
+import * as RpcServer from "effect/unstable/rpc/RpcServer"
+import { makeHttpHarness } from "../TestUtils/McpHttpHarness.ts"
+import { makeMcpSseReader } from "../TestUtils/McpHttpResponse.ts"
+import { makeServerLayer } from "../TestUtils/McpServerLayer.ts"
+import { type JsonRpcMessage, makeMcpStdioHarness, type McpStdioHarness } from "../TestUtils/McpStdioHarness.ts"
+import { McpConformance, type McpConformanceLayer } from "./McpConformance.ts"
+
+const subscriptionIdKey = "io.modelcontextprotocol/subscriptionId"
+
+const paramsOf = (message: JsonRpcMessage): Record<string, unknown> => {
+  assert.isObject(message.params)
+  return message.params as Record<string, unknown>
+}
+
+const subscriptionIdOf = (message: JsonRpcMessage): string | number => {
+  const params = paramsOf(message)
+  assert.isObject(params._meta)
+  const subscriptionId = (params._meta as Record<string, unknown>)[subscriptionIdKey]
+  if (typeof subscriptionId === "string" || typeof subscriptionId === "number") {
+    return subscriptionId
+  }
+  return assert.fail("Expected a string or numeric subscription identifier")
+}
+
+const makeTool = (name: string) => ({
+  tool: new McpSchema.Tool({ name, inputSchema: { type: "object", properties: {} } }),
+  annotations: Context.empty(),
+  handle: () => Effect.succeed(new McpSchema.CallToolResult({ content: [] }))
+})
+
+const makePrompt = (name: string) => ({
+  prompt: new McpSchema.Prompt({ name }),
+  annotations: Context.empty(),
+  completions: {},
+  handle: () =>
+    Effect.succeed(
+      new McpSchema.GetPromptResult({
+        messages: [{ role: "user", content: { type: "text", text: name } }]
+      })
+    )
+})
+
+const makeResource = (uri: string) => ({
+  resource: new McpSchema.Resource({ uri, name: uri }),
+  annotations: Context.empty(),
+  handle: Effect.succeed(McpSchema.ReadResourceResult.make({ contents: [] }))
+})
+
+const subscriptionRegistrations = Layer.effectDiscard(
+  Effect.gen(function*() {
+    const server = yield* McpServer.McpServer
+    yield* server.addTool(makeTool("subscription-registration-tool"))
+    yield* server.addPrompt(makePrompt("subscription-registration-prompt"))
+    yield* server.addResource(makeResource("file:///subscription-registration-resource"))
+  })
+)
+
+const toolOnlyRegistration = Layer.effectDiscard(
+  McpServer.McpServer.use((server) => server.addTool(makeTool("tool-only-registration")))
+)
+
+const makeSubscriptionHarness = (
+  protocol: McpProtocol.ProtocolAdapter,
+  protocols: Arr.NonEmptyReadonlyArray<McpProtocol.ProtocolAdapter> = [protocol]
+) => makeMcpStdioHarness(protocol, protocols, subscriptionRegistrations)
+
+const listen = (
+  fixture: McpStdioHarness,
+  id: string | number,
+  notifications: Record<string, unknown>
+) =>
+  fixture.flushListChanged.pipe(
+    Effect.andThen(fixture.startRequest("subscriptions/listen", { notifications }, id))
+  )
+
+const assertAcknowledged = (
+  message: JsonRpcMessage,
+  id: string | number,
+  notifications: Record<string, unknown>
+) => {
+  assert.strictEqual(message.method, "notifications/subscriptions/acknowledged")
+  assert.notProperty(message, "id")
+  assert.strictEqual(subscriptionIdOf(message), id)
+  assert.deepStrictEqual(paramsOf(message).notifications, notifications)
+}
+
+const httpMetadata = (protocol: McpProtocol.ProtocolAdapter) => ({
+  "io.modelcontextprotocol/protocolVersion": protocol.protocolVersion,
+  "io.modelcontextprotocol/clientCapabilities": {},
+  "io.modelcontextprotocol/clientInfo": { name: "subscription-http-client", version: "1.0.0" }
+})
+
+const httpListenRequest = (protocol: McpProtocol.ProtocolAdapter, id: string | number) => ({
+  jsonrpc: "2.0",
+  id,
+  method: "subscriptions/listen",
+  params: {
+    notifications: { toolsListChanged: true },
+    _meta: httpMetadata(protocol)
+  }
+})
+
+const httpHeaders = (protocol: McpProtocol.ProtocolAdapter): HeadersInit => ({
+  "MCP-Protocol-Version": protocol.protocolVersion,
+  "Mcp-Method": "subscriptions/listen"
+})
+
+const makeHttpSubscriptionHarness = Effect.fnUntraced(function*(protocol: McpProtocol.ProtocolAdapter) {
+  const serverReady = yield* Deferred.make<McpServer.McpServer["Service"]>()
+  const registrations = Layer.effectDiscard(
+    Effect.gen(function*() {
+      const server = yield* McpServer.McpServer
+      yield* server.addTool(makeTool("http-subscription-baseline"))
+      yield* Deferred.succeed(serverReady, server)
+    })
+  )
+  const harness = yield* makeHttpHarness(
+    registrations.pipe(Layer.provideMerge(makeServerLayer({
+      name: "SubscriptionConformance",
+      protocols: [protocol]
+    })))
+  )
+  return { harness, serverReady }
+})
+
+export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConformanceLayer) =>
+  it.layer(layer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
+    describe("Subscriptions", () => {
+      // SEP-2575 replaces unsolicited list-change notifications and resources/subscribe with subscriptions/listen.
+      // https://modelcontextprotocol.io/seps/2575-stateless-mcp
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic/patterns/subscriptions
+      it.effect("should advertise supported subscription capabilities when features are registered", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const discovered = yield* test.initialize({ server: "features" })
+
+          assert.deepStrictEqual(discovered.message.result.capabilities.tools, { listChanged: true })
+          assert.deepStrictEqual(discovered.message.result.capabilities.resources, {
+            listChanged: true,
+            subscribe: true
+          })
+          assert.deepStrictEqual(discovered.message.result.capabilities.prompts, { listChanged: true })
+        }))
+
+      it.effect("should update discovery and subscription capabilities after late registration", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol)
+          const before = yield* fixture.initialize()
+          const beforeResult = before.result
+          if (!Predicate.isObject(beforeResult)) {
+            return assert.fail("Expected discovery result before late registration")
+          }
+          const beforeCapabilities = beforeResult.capabilities
+          if (!Predicate.isObject(beforeCapabilities)) {
+            return assert.fail("Expected discovery capabilities before late registration")
+          }
+          assert.notProperty(beforeCapabilities, "tools")
+
+          yield* fixture.server.addTool(makeTool("late-registration"))
+
+          const after = yield* fixture.initialize()
+          const afterResult = after.result
+          if (!Predicate.isObject(afterResult)) {
+            return assert.fail("Expected discovery result after late registration")
+          }
+          const afterCapabilities = afterResult.capabilities
+          if (!Predicate.isObject(afterCapabilities)) {
+            return assert.fail("Expected discovery capabilities after late registration")
+          }
+          assert.deepStrictEqual(afterCapabilities.tools, { listChanged: true })
+
+          const request = yield* listen(fixture, "late-registration-listener", { toolsListChanged: true })
+          assertAcknowledged(
+            yield* fixture.takeMessage,
+            "late-registration-listener",
+            { toolsListChanged: true }
+          )
+          yield* request.cancel("test complete")
+        }))
+
+      it.effect("should not advertise subscriptions and should reject listen when the transport cannot send notifications", () =>
+        Effect.gen(function*() {
+          const outbound = yield* Queue.unbounded<RpcMessage.FromServerEncoded>()
+          const disconnects = yield* Queue.unbounded<number>()
+          const writeRequest = yield* Deferred.make<
+            (clientId: number, message: RpcMessage.FromClientEncoded) => Effect.Effect<void>
+          >()
+          const transport = yield* RpcServer.Protocol.make((write) =>
+            Deferred.succeed(writeRequest, write).pipe(
+              Effect.as({
+                disconnects,
+                send: (_clientId, message) => Queue.offer(outbound, message).pipe(Effect.asVoid),
+                end: (_clientId) => Effect.void,
+                clientIds: Effect.succeed(new Set([0])),
+                initialMessage: Effect.succeedNone,
+                supportsAck: false,
+                supportsTransferables: false,
+                supportsSpanPropagation: false,
+                supportsNotifications: false,
+                codecFor: Schema.toCodecJson as RpcSerialization.CodecFor
+              })
+            )
+          )
+          yield* Effect.gen(function*() {
+            yield* Layer.build(
+              subscriptionRegistrations.pipe(
+                Layer.provideMerge(
+                  McpServer.layer({
+                    name: "SubscriptionConformance",
+                    version: "1.0.0",
+                    protocols: [protocol]
+                  }).pipe(Layer.provide(Layer.succeed(RpcServer.Protocol, transport)))
+                )
+              )
+            )
+            return yield* Effect.never
+          }).pipe(Effect.scoped, Effect.forkScoped)
+          const send = yield* Deferred.await(writeRequest)
+          const metadata = httpMetadata(protocol)
+
+          yield* send(0, {
+            _tag: "Request",
+            id: 1,
+            tag: "server/discover",
+            payload: { _meta: metadata },
+            headers: []
+          })
+          const discovery = yield* Queue.take(outbound)
+          if (discovery._tag !== "Exit" || discovery.exit._tag !== "Success") {
+            return assert.fail("Expected successful discovery response")
+          }
+          assert(Predicate.isObject(discovery.exit.value))
+          assert(Predicate.isObject(discovery.exit.value.capabilities))
+          assert.deepStrictEqual(discovery.exit.value.capabilities.tools, { listChanged: false })
+          assert.deepStrictEqual(discovery.exit.value.capabilities.resources, {
+            listChanged: false,
+            subscribe: false
+          })
+          assert.deepStrictEqual(discovery.exit.value.capabilities.prompts, { listChanged: false })
+
+          yield* send(0, {
+            _tag: "Request",
+            id: 2,
+            tag: "subscriptions/listen",
+            payload: { notifications: { toolsListChanged: true }, _meta: metadata },
+            headers: []
+          })
+          const listenResponse = yield* Queue.take(outbound)
+          if (listenResponse._tag !== "Exit" || listenResponse.exit._tag !== "Failure") {
+            return assert.fail("Expected failed subscription response")
+          }
+          const failure = listenResponse.exit.cause.find((cause) => cause._tag === "Fail")
+          assert(failure !== undefined && failure._tag === "Fail")
+          assert(Predicate.isObject(failure.error))
+          assert.strictEqual(failure.error.code, McpSchema.METHOD_NOT_FOUND_ERROR_CODE)
+        }))
+
+      it.effect("should buffer matching events while the subscription acknowledgment is blocked", () =>
+        Effect.gen(function*() {
+          const core = yield* McpCore.make
+          const events = yield* PubSub.unbounded<McpProtocolInternal.CanonicalServerNotification>()
+          const released = yield* Deferred.make<void>()
+          const acknowledgmentStarted = yield* Deferred.make<void>()
+          const releaseAcknowledgment = yield* Deferred.make<void>()
+          const sent = yield* Queue.unbounded<McpProtocol.ProjectedNotification>()
+          const handlers = McpProtocol2026.makeHandlers(core, undefined, {
+            subscribeServerNotifications: Effect.acquireRelease(
+              PubSub.subscribe(events),
+              () => Deferred.succeed(released, undefined)
+            ),
+            sendNotification: (_protocolVersion, _clientId, notification) =>
+              Effect.gen(function*() {
+                if (notification.tag === McpSchema2026.SubscriptionsAcknowledgedNotification._tag) {
+                  yield* Deferred.succeed(acknowledgmentStarted, undefined)
+                  yield* Deferred.await(releaseAcknowledgment)
+                }
+                yield* Queue.offer(sent, notification)
+              }),
+            supportedVersions: [McpSchema2026.protocolVersion],
+            serverInfo: { name: "SubscriptionConformance", version: "1.0.0" },
+            registrationPresence: Effect.succeed({ tools: true, resources: false, prompts: false })
+          })
+          const listener = yield* handlers["subscriptions/listen"](
+            { notifications: { toolsListChanged: true }, _meta: httpMetadata(protocol) },
+            { client: new Rpc.ServerClient(1), requestId: RequestId("blocked-acknowledgment") }
+          ).pipe(Effect.scoped, Effect.forkScoped)
+
+          yield* Deferred.await(acknowledgmentStarted)
+          yield* PubSub.publish(events, {
+            notification: McpCore.ServerNotification.ToolsChanged({})
+          })
+          yield* Deferred.succeed(releaseAcknowledgment, undefined)
+
+          const acknowledgment = yield* Queue.take(sent)
+          const notification = yield* Queue.take(sent)
+          assert.strictEqual(acknowledgment.tag, McpSchema2026.SubscriptionsAcknowledgedNotification._tag)
+          assert.strictEqual(notification.tag, McpSchema2026.ToolListChangedNotification._tag)
+
+          yield* Fiber.interrupt(listener)
+          yield* Deferred.await(released)
+        }))
+
+      it.effect("should release the scoped subscription when a blocked listener is interrupted", () =>
+        Effect.gen(function*() {
+          const core = yield* McpCore.make
+          const events = yield* PubSub.unbounded<McpProtocolInternal.CanonicalServerNotification>()
+          const released = yield* Deferred.make<void>()
+          const waitingForEvent = yield* Deferred.make<void>()
+          const handlers = McpProtocol2026.makeHandlers(core, undefined, {
+            subscribeServerNotifications: Effect.acquireRelease(
+              PubSub.subscribe(events).pipe(
+                Effect.map((subscription) =>
+                  new Proxy(subscription, {
+                    get(target, property, receiver) {
+                      if (property !== "subscription") {
+                        return Reflect.get(target, property, receiver)
+                      }
+                      return new Proxy(target.subscription, {
+                        get(backing, backingProperty, backingReceiver) {
+                          if (backingProperty !== "poll") {
+                            return Reflect.get(backing, backingProperty, backingReceiver)
+                          }
+                          return () => {
+                            Deferred.doneUnsafe(waitingForEvent, Effect.void)
+                            return backing.poll()
+                          }
+                        }
+                      })
+                    }
+                  })
+                )
+              ),
+              () => Deferred.succeed(released, undefined)
+            ),
+            sendNotification: () => Effect.void,
+            supportedVersions: [McpSchema2026.protocolVersion],
+            serverInfo: { name: "SubscriptionConformance", version: "1.0.0" },
+            registrationPresence: Effect.succeed({ tools: true, resources: false, prompts: false })
+          })
+          const listener = yield* handlers["subscriptions/listen"](
+            { notifications: { toolsListChanged: true }, _meta: httpMetadata(protocol) },
+            { client: new Rpc.ServerClient(1), requestId: RequestId("blocked-listener") }
+          ).pipe(Effect.scoped, Effect.forkScoped)
+
+          yield* Deferred.await(waitingForEvent)
+          yield* Fiber.interrupt(listener)
+          yield* Deferred.await(released)
+        }))
+
+      it.effect("should acknowledge with the exact identifier when it is numeric or string-valued", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeSubscriptionHarness(protocol)
+          yield* fixture.server.addTool(makeTool("subscription-baseline"))
+          yield* fixture.initialize()
+
+          for (const id of [42, "subscription-42"] as const) {
+            const notifications = { toolsListChanged: true }
+            const request = yield* listen(fixture, id, notifications)
+            assertAcknowledged(yield* fixture.takeMessage, id, notifications)
+            yield* request.cancel("test complete")
+          }
+        }))
+
+      it.effect("should deliver a change notification when its kind is requested", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeSubscriptionHarness(protocol)
+          yield* fixture.server.addTool(makeTool("subscription-tool-baseline"))
+          yield* fixture.server.addPrompt(makePrompt("subscription-prompt-baseline"))
+          yield* fixture.initialize()
+          const id = "filtered-subscription"
+          const notifications = {
+            toolsListChanged: true,
+            resourcesListChanged: true
+          }
+          const request = yield* listen(fixture, id, notifications)
+          assertAcknowledged(yield* fixture.takeMessage, id, notifications)
+
+          yield* fixture.server.addPrompt(makePrompt("must-not-be-delivered"))
+          yield* fixture.server.addTool(makeTool("must-be-delivered"))
+          yield* fixture.flushListChanged
+
+          const toolsChanged = yield* fixture.takeMessage
+          assert.strictEqual(toolsChanged.method, "notifications/tools/list_changed")
+          assert.strictEqual(subscriptionIdOf(toolsChanged), id)
+
+          yield* fixture.server.addResource(makeResource("file:///list-change-sentinel"))
+          yield* fixture.flushListChanged
+          const resourcesChanged = yield* fixture.takeMessage
+          assert.strictEqual(resourcesChanged.method, "notifications/resources/list_changed")
+          assert.strictEqual(subscriptionIdOf(resourcesChanged), id)
+
+          yield* request.cancel()
+        }))
+
+      it.effect("should deliver a resource update when its URI is subscribed", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeSubscriptionHarness(protocol)
+          yield* fixture.initialize()
+          const id = "resource-uri-subscription"
+          const notifications = { resourceSubscriptions: ["file:///subscribed"] }
+          const request = yield* listen(fixture, id, notifications)
+          assertAcknowledged(yield* fixture.takeMessage, id, notifications)
+
+          yield* fixture.server.notifications["notifications/resources/updated"]({ uri: "file:///other" })
+          yield* fixture.server.notifications["notifications/resources/updated"]({ uri: "file:///subscribed" })
+          const resourceUpdated = yield* fixture.takeMessage
+          assert.strictEqual(resourceUpdated.method, "notifications/resources/updated")
+          assert.strictEqual(subscriptionIdOf(resourceUpdated), id)
+          assert.strictEqual(paramsOf(resourceUpdated).uri, "file:///subscribed")
+          yield* request.cancel()
+        }))
+
+      it.effect("should acknowledge only the supported subset when requested filters exceed server capabilities", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol, [protocol], toolOnlyRegistration)
+          yield* fixture.initialize()
+          const request = yield* listen(fixture, "honored-subset", {
+            toolsListChanged: true,
+            promptsListChanged: true
+          })
+
+          assertAcknowledged(yield* fixture.takeMessage, request.id, { toolsListChanged: true })
+          yield* request.cancel()
+
+          const unsupported = yield* listen(fixture, "unsupported-filters", {
+            toolsListChanged: false,
+            promptsListChanged: true
+          })
+          assertAcknowledged(yield* fixture.takeMessage, unsupported.id, {})
+          yield* unsupported.cancel()
+        }))
+
+      it.effect("should deliver a matching event to each subscription", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeSubscriptionHarness(protocol)
+          yield* fixture.initialize()
+          const first = yield* listen(fixture, "fanout-first", { toolsListChanged: true })
+          const second = yield* listen(fixture, "fanout-second", { toolsListChanged: true })
+          assertAcknowledged(yield* fixture.takeMessage, first.id, { toolsListChanged: true })
+          assertAcknowledged(yield* fixture.takeMessage, second.id, { toolsListChanged: true })
+
+          yield* fixture.server.addTool(makeTool("fanout-event"))
+          yield* fixture.flushListChanged
+          const delivered = [yield* fixture.takeMessage, yield* fixture.takeMessage]
+          assert.deepStrictEqual(
+            delivered.map(subscriptionIdOf).sort(),
+            [first.id, second.id].sort()
+          )
+          yield* first.cancel()
+          yield* second.cancel()
+        }))
+
+      it.effect("should keep another subscription active when its peer is cancelled", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeSubscriptionHarness(protocol)
+          yield* fixture.server.addTool(makeTool("concurrent-tool-baseline"))
+          yield* fixture.initialize()
+          const tools = yield* listen(fixture, "tools-subscription", { toolsListChanged: true })
+          const resources = yield* listen(fixture, "resources-subscription", {
+            resourceSubscriptions: ["file:///sentinel"]
+          })
+          assertAcknowledged(yield* fixture.takeMessage, tools.id, { toolsListChanged: true })
+          assertAcknowledged(yield* fixture.takeMessage, resources.id, {
+            resourceSubscriptions: ["file:///sentinel"]
+          })
+
+          yield* fixture.server.addTool(makeTool("concurrent-tool-event"))
+          yield* fixture.flushListChanged
+          const toolsChanged = yield* fixture.takeMessage
+          assert.strictEqual(toolsChanged.method, "notifications/tools/list_changed")
+          assert.strictEqual(subscriptionIdOf(toolsChanged), tools.id)
+
+          yield* fixture.server.notifications["notifications/resources/updated"]({ uri: "file:///sentinel" })
+          const resourceUpdated = yield* fixture.takeMessage
+          assert.strictEqual(resourceUpdated.method, "notifications/resources/updated")
+          assert.strictEqual(subscriptionIdOf(resourceUpdated), resources.id)
+
+          yield* tools.cancel("only tools are no longer needed")
+          yield* fixture.sendRequest("ping", {})
+          yield* fixture.server.addTool(makeTool("cancelled-tools-must-not-receive"))
+          yield* fixture.flushListChanged
+          yield* fixture.server.notifications["notifications/resources/updated"]({ uri: "file:///sentinel" })
+
+          const surviving = yield* fixture.takeMessage
+          assert.strictEqual(surviving.method, "notifications/resources/updated")
+          assert.strictEqual(subscriptionIdOf(surviving), resources.id)
+          yield* resources.cancel()
+        }))
+
+      it.effect("should preserve notification metadata and own the subscription identifier", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeSubscriptionHarness(protocol)
+          yield* fixture.initialize()
+          const request = yield* listen(fixture, "authoritative-subscription", { toolsListChanged: true })
+          assertAcknowledged(yield* fixture.takeMessage, request.id, { toolsListChanged: true })
+
+          yield* fixture.server.notifications["notifications/tools/list_changed"]({
+            _meta: {
+              source: "metadata-sentinel",
+              [subscriptionIdKey]: "untrusted-subscription"
+            }
+          })
+          const notification = yield* fixture.takeMessage
+          const params = paramsOf(notification)
+          const metadata = params._meta
+          assert.strictEqual(notification.method, "notifications/tools/list_changed")
+          assert(Predicate.isObject(metadata))
+          assert.strictEqual(metadata.source, "metadata-sentinel")
+          assert.strictEqual(metadata[subscriptionIdKey], request.id)
+          yield* request.cancel()
+        }))
+
+      it.effect("should deliver modern changes only when an active subscription matches", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeSubscriptionHarness(protocol)
+          yield* fixture.initialize()
+          yield* fixture.server.addTool(makeTool("unsolicited-modern-tool"))
+          yield* fixture.flushListChanged
+
+          const request = yield* listen(fixture, "prompt-sentinel", { promptsListChanged: true })
+          assertAcknowledged(yield* fixture.takeMessage, request.id, { promptsListChanged: true })
+          yield* fixture.server.addPrompt(makePrompt("prompt-sentinel"))
+          yield* fixture.flushListChanged
+          const notification = yield* fixture.takeMessage
+          assert.strictEqual(notification.method, "notifications/prompts/list_changed")
+          assert.strictEqual(subscriptionIdOf(notification), request.id)
+          yield* request.cancel()
+        }))
+
+      it.effect("should preserve legacy notification delivery when modern and legacy adapters are configured", () =>
+        Effect.gen(function*() {
+          const legacy = McpProtocol.v2025_06_18
+          const fixture = yield* makeSubscriptionHarness(legacy, [protocol, legacy])
+          yield* fixture.server.addTool(makeTool("mixed-era-baseline"))
+          yield* fixture.initialize()
+          yield* fixture.sendRequest("tools/list", {})
+          yield* fixture.server.addTool(makeTool("mixed-era-legacy-event"))
+          yield* fixture.flushListChanged
+
+          const notification = yield* fixture.awaitOutboundMethod("notifications/tools/list_changed")
+          assert.notProperty(notification, "id")
+          assert.notProperty(paramsOf(notification), "_meta")
+        }))
+
+      it.effect("should stream acknowledgment before matching events when using HTTP", () =>
+        Effect.gen(function*() {
+          const { harness, serverReady } = yield* makeHttpSubscriptionHarness(protocol)
+          const id = "reusable-http-subscription"
+
+          const firstResponse = yield* harness.post(httpListenRequest(protocol, id), httpHeaders(protocol))
+          const server = yield* Deferred.await(serverReady)
+          const first = makeMcpSseReader(firstResponse)
+          assertAcknowledged(yield* first.take(), id, { toolsListChanged: true })
+          yield* server.addTool(makeTool("http-subscription-event"))
+          const notification = yield* first.take()
+          assert.strictEqual(notification.method, "notifications/tools/list_changed")
+          assert.strictEqual(subscriptionIdOf(notification), id)
+          yield* first.cancel
+        }))
+
+      it.effect("should close only the HTTP subscription stream when its pending backlog overflows", () =>
+        Effect.gen(function*() {
+          const { harness, serverReady } = yield* makeHttpSubscriptionHarness(protocol)
+          const response = yield* harness.post(
+            httpListenRequest(protocol, "overflowing-http-subscription"),
+            httpHeaders(protocol)
+          )
+          const server = yield* Deferred.await(serverReady)
+          const subscription = makeMcpSseReader(response)
+          assertAcknowledged(
+            yield* subscription.take(),
+            "overflowing-http-subscription",
+            { toolsListChanged: true }
+          )
+
+          for (let index = 0; index < 1_000; index++) {
+            yield* server.notifications["notifications/tools/list_changed"]({})
+            yield* Effect.yieldNow
+          }
+
+          const remaining = yield* subscription.drain()
+          assert.notInclude(remaining.map((message) => message.method), "notifications/cancelled")
+
+          const discovery = yield* harness.post({
+            jsonrpc: "2.0",
+            id: "server-remains-available",
+            method: "server/discover",
+            params: { _meta: httpMetadata(protocol) }
+          }, {
+            "MCP-Protocol-Version": protocol.protocolVersion,
+            "Mcp-Method": "server/discover"
+          })
+          assert.strictEqual(discovery.status, 200)
+        }))
+    })
+  })
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/ToolsTest.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/ToolsTest.ts
index 9c711f423..21b26d5ef 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/ToolsTest.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/ToolsTest.ts
@@ -1,14 +1,27 @@
 import { assert, describe, it } from "@effect/vitest"
+import { assertTrue } from "@effect/vitest/utils"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
+import * as Layer from "effect/Layer"
 import * as Schema from "effect/Schema"
 import type * as McpProtocol from "effect/unstable/ai/McpProtocol"
 import * as McpSchema from "effect/unstable/ai/McpSchema"
+import * as McpServer from "effect/unstable/ai/McpServer"
+import { makeHttpHarness } from "../TestUtils/McpHttpHarness.ts"
+import { readMcpHttpResponse } from "../TestUtils/McpHttpResponse.ts"
+import { makeServerLayer } from "../TestUtils/McpServerLayer.ts"
 import { makeMcpStdioHarness } from "../TestUtils/McpStdioHarness.ts"
 import { McpConformance, type McpConformanceLayer } from "./McpConformance.ts"
 
 const decodeTools = Schema.decodeUnknownEffect(McpSchema.ListToolsResult)
 const decodeCallTool = Schema.decodeUnknownEffect(McpSchema.CallToolResult)
+const decodeJsonSchema2020Tools = Schema.decodeUnknownEffect(Schema.Struct({
+  tools: Schema.Array(Schema.Struct({
+    name: Schema.String,
+    inputSchema: Schema.JsonObject,
+    outputSchema: Schema.optional(Schema.JsonObject)
+  }))
+}))
 
 const callTool = (name: string, arguments_: Record<string, unknown> = {}) =>
   Effect.gen(function*() {
@@ -43,7 +56,7 @@ const callToolWire = (name: string) =>
 export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConformanceLayer) =>
   it.layer(layer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
     describe("Tools", () => {
-      // Identical requirements in the 2024-11-05, 2025-03-26, and 2025-06-18 specifications.
+      // Shared capability contract; each dated entrypoint owns its normative specification revision.
       describe("Capabilities", () => {
         it.effect("MUST advertise the tools capability when tools are registered", () =>
           Effect.gen(function*() {
@@ -60,87 +73,34 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
 
             assert.notProperty(initialized.message.result.capabilities, "tools")
           }))
-
-        it.effect("MUST advertise listChanged when tool list change notifications are supported", () =>
-          Effect.gen(function*() {
-            const test = yield* McpConformance
-            const initialized = yield* test.initialize({ server: "features" })
-
-            assert.strictEqual(initialized.message.result.capabilities.tools?.listChanged, true)
-          }))
       })
 
       describe("Listing Tools", () => {
-        it.effect("MUST list every tool visible to the initialized client", () =>
-          Effect.gen(function*() {
-            const test = yield* McpConformance
-            const initialized = yield* test.initialize({ server: "features" })
-            yield* test.notifyInitialized(initialized)
-
-            const response = yield* test.send(initialized, {
-              jsonrpc: "2.0",
-              id: 2,
-              method: "tools/list",
-              params: {}
-            })
-            const result = yield* test.decodeResult(response).pipe(
-              Effect.flatMap((message) => decodeTools(message.result))
-            )
-
-            const expected = [
-              "AudioTool",
-              "DefectTool",
-              "EmbeddedResourceTool",
-              "ErrorTool",
-              "ImageTool",
-              "LogLevelTool",
-              "MultipleContentTool",
-              "ResourceLinkTool",
-              "StructuredTool",
-              "TestTool"
-            ].sort()
-            assert.deepStrictEqual(result.tools.map((tool) => tool.name).sort(), expected)
-          }))
+        it.effect(
+          "SCHEMA preserves tool names and descriptions",
+          () =>
+            Effect.gen(function*() {
+              const test = yield* McpConformance
+              const initialized = yield* test.initialize({ server: "features" })
+              yield* test.notifyInitialized(initialized)
+              const response = yield* test.send(initialized, {
+                jsonrpc: "2.0",
+                id: 2,
+                method: "tools/list",
+                params: {}
+              })
+              const result = yield* test.decodeResult(response).pipe(
+                Effect.flatMap((message) => decodeTools(message.result))
+              )
 
-        it.effect("SCHEMA preserves tool names and descriptions", () =>
-          Effect.gen(function*() {
-            const test = yield* McpConformance
-            const initialized = yield* test.initialize({ server: "features" })
-            yield* test.notifyInitialized(initialized)
-            const response = yield* test.send(initialized, {
-              jsonrpc: "2.0",
-              id: 2,
-              method: "tools/list",
-              params: {}
+              const tool = result.tools.find((tool) => tool.name === "TestTool")
+              assert.isDefined(tool)
+              assert.strictEqual(tool.description, "A test tool")
             })
-            const result = yield* test.decodeResult(response).pipe(
-              Effect.flatMap((message) => decodeTools(message.result))
-            )
-
-            const tool = result.tools.find((tool) => tool.name === "TestTool")
-            assert.isDefined(tool)
-            assert.strictEqual(tool.description, "A test tool")
-          }))
-
-        it.effect("MUST return each tool input schema", () =>
-          Effect.gen(function*() {
-            const test = yield* McpConformance
-            const initialized = yield* test.initialize({ server: "features" })
-            yield* test.notifyInitialized(initialized)
-            const response = yield* test.send(initialized, {
-              jsonrpc: "2.0",
-              id: 2,
-              method: "tools/list",
-              params: {}
-            })
-            const result = yield* test.decodeResult(response).pipe(
-              Effect.flatMap((message) => decodeTools(message.result))
-            )
+        )
 
-            assert.isTrue(result.tools.every((tool) => tool.inputSchema.type === "object"))
-          }))
-        it.effect.skipIf(["2024-11-05", "2025-03-26"].includes(protocol.protocolVersion))(
-          "MUST return each declared tool output schema",
+        it.effect(
+          "MUST return each tool input schema",
           () =>
             Effect.gen(function*() {
               const test = yield* McpConformance
@@ -156,15 +116,32 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
                 Effect.flatMap((message) => decodeTools(message.result))
               )
 
-              assert.strictEqual(
-                result.tools.find((tool) => tool.name === "StructuredTool")?.outputSchema?.type,
-                "object"
-              )
-              const scalarTool = result.tools.find((tool) => tool.name === "TestTool")
-              assert.isDefined(scalarTool)
-              assert.notProperty(scalarTool, "outputSchema")
+              assert.isTrue(result.tools.every((tool) => tool.inputSchema.type === "object"))
             })
         )
+
+        it.effect("should list shared tools and gate modern-only tools by era", () =>
+          Effect.gen(function*() {
+            const test = yield* McpConformance
+            const initialized = yield* test.initialize({ server: "features" })
+            yield* test.notifyInitialized(initialized)
+            const response = yield* test.send(initialized, {
+              jsonrpc: "2.0",
+              id: 2,
+              method: "tools/list",
+              params: {}
+            })
+            const result = yield* test.decodeResult(response).pipe(
+              Effect.flatMap((message) => decodeTools(message.result))
+            )
+            const names = new Set(result.tools.map((tool) => tool.name))
+            for (const name of ["TestTool", "StructuredTool", "LogLevelTool", "RequestMetadataTool"]) {
+              assert.isTrue(names.has(name))
+            }
+            for (const name of ["JsonSchema2020Tool", "MrtrTool"]) {
+              assert.strictEqual(names.has(name), protocol.runtime._tag === "Stateless")
+            }
+          }))
       })
 
       describe("Calling Tools", () => {
@@ -211,67 +188,6 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
             assert.strictEqual((yield* test.observations).toolInvocations, before)
           }))
 
-        it.effect("MUST reject malformed tool params without invoking a handler", () =>
-          Effect.gen(function*() {
-            const test = yield* McpConformance
-            const initialized = yield* test.initialize({ server: "features" })
-            yield* test.notifyInitialized(initialized)
-            const before = (yield* test.observations).toolInvocations
-            const response = yield* test.send(initialized, {
-              jsonrpc: "2.0",
-              id: 2,
-              method: "tools/call",
-              params: { arguments: { value: "called" } }
-            })
-            const error = yield* test.decodeError(response)
-
-            assert.strictEqual(error.error.code, McpSchema.INVALID_PARAMS_ERROR_CODE)
-            assert.strictEqual((yield* test.observations).toolInvocations, before)
-          }))
-
-        it.effect("MUST handle arguments that do not match the input schema for the revision", () =>
-          Effect.gen(function*() {
-            const test = yield* McpConformance
-            const initialized = yield* test.initialize({ server: "features" })
-            yield* test.notifyInitialized(initialized)
-            const response = yield* test.send(initialized, {
-              jsonrpc: "2.0",
-              id: 2,
-              method: "tools/call",
-              params: {
-                name: "TestTool",
-                arguments: { value: 123 }
-              }
-            })
-            if (protocol.protocolVersion === "2025-11-25") {
-              const result = yield* test.decodeResult(response).pipe(
-                Effect.flatMap((message) => decodeCallTool(message.result))
-              )
-              assert.strictEqual(result.isError, true)
-              assert.strictEqual(result.content[0]?.type, "text")
-            } else {
-              const error = yield* test.decodeError(response)
-              assert.strictEqual(error.error.code, McpSchema.INVALID_PARAMS_ERROR_CODE)
-            }
-          }))
-        it.effect("MUST not invoke a tool handler when argument validation fails", () =>
-          Effect.gen(function*() {
-            const test = yield* McpConformance
-            const before = (yield* test.observations).toolInvocations
-            const initialized = yield* test.initialize({ server: "features" })
-            yield* test.notifyInitialized(initialized)
-            yield* test.send(initialized, {
-              jsonrpc: "2.0",
-              id: 2,
-              method: "tools/call",
-              params: {
-                name: "TestTool",
-                arguments: { value: 123 }
-              }
-            })
-
-            assert.strictEqual((yield* test.observations).toolInvocations, before)
-          }))
         it.effect("SCHEMA returns text content", () =>
           Effect.gen(function*() {
             const test = yield* McpConformance
@@ -301,31 +217,6 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
               mimeType: "image/png"
             }])
           }))
-        it.effect.skipIf(["2024-11-05"].includes(protocol.protocolVersion))(
-          "SCHEMA returns audio content",
-          () =>
-            Effect.gen(function*() {
-              const result = yield* callToolWire("AudioTool")
-              assert.deepStrictEqual(result.result.content, [{
-                type: "audio",
-                data: "BAUG",
-                mimeType: "audio/wav"
-              }])
-            })
-        )
-        it.effect.skipIf(["2024-11-05", "2025-03-26"].includes(protocol.protocolVersion))(
-          "SCHEMA returns resource links",
-          () =>
-            Effect.gen(function*() {
-              const result = yield* callTool("ResourceLinkTool")
-              assert.deepStrictEqual(result.content, [{
-                type: "resource_link",
-                uri: "file:///test",
-                name: "TestResource",
-                mimeType: "text/plain"
-              }])
-            })
-        )
         it.effect("SCHEMA returns embedded resources", () =>
           Effect.gen(function*() {
             const result = yield* callTool("EmbeddedResourceTool")
@@ -346,14 +237,6 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
               { type: "text", text: "second" }
             ])
           }))
-        it.effect.skipIf(["2024-11-05", "2025-03-26"].includes(protocol.protocolVersion))(
-          "SCHEMA returns structured content",
-          () =>
-            Effect.gen(function*() {
-              const result = yield* callTool("StructuredTool")
-              assert.deepStrictEqual(result.structuredContent, { value: "structured" })
-            })
-        )
         it.effect("MUST return tool execution failures with isError", () =>
           Effect.gen(function*() {
             const result = yield* callTool("ErrorTool")
@@ -396,38 +279,445 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
             assert.strictEqual(result.error.message, "Internal error")
             assert.notMatch(JSON.stringify(result), /private defect details/)
           }))
-      })
 
-      describe("List Changed Notification", () => {
-        it.effect("SHOULD send a tool list changed notification when the advertised list changes", () =>
+        it.effect.skipIf(protocol.protocolVersion === "2024-11-05")(
+          "should return base64 audio content when an audio tool is called",
+          () =>
+            Effect.gen(function*() {
+              const result = yield* callToolWire("AudioTool")
+              assert.deepStrictEqual(result.result.content, [{
+                type: "audio",
+                data: "BAUG",
+                mimeType: "audio/wav"
+              }])
+            })
+        )
+
+        describe.skipIf(["2024-11-05", "2025-03-26"].includes(protocol.protocolVersion))(
+          "Structured content",
+          () => {
+            it.effect("should advertise an object output schema when a tool declares one", () =>
+              Effect.gen(function*() {
+                const test = yield* McpConformance
+                const initialized = yield* test.initialize({ server: "features" })
+                yield* test.notifyInitialized(initialized)
+                const response = yield* test.send(initialized, {
+                  jsonrpc: "2.0",
+                  id: 2,
+                  method: "tools/list",
+                  params: {}
+                })
+                const result = yield* test.decodeResult(response).pipe(
+                  Effect.flatMap((message) => decodeTools(message.result))
+                )
+
+                assert.strictEqual(
+                  result.tools.find((tool) => tool.name === "StructuredTool")?.outputSchema?.type,
+                  "object"
+                )
+              }))
+
+            it.effect("should return a resource link when a resource-link tool is called", () =>
+              Effect.gen(function*() {
+                const result = yield* callTool("ResourceLinkTool")
+                assert.deepStrictEqual(result.content, [{
+                  type: "resource_link",
+                  uri: "file:///test",
+                  name: "TestResource",
+                  mimeType: "text/plain"
+                }])
+              }))
+
+            it.effect("should return structured content when a structured tool is called", () =>
+              Effect.gen(function*() {
+                const result = yield* callTool("StructuredTool")
+                assert.deepStrictEqual(result.structuredContent, { value: "structured" })
+              }))
+          }
+        )
+
+        it.effect("distinguishes malformed requests from tool validation errors by protocol revision", () =>
           Effect.gen(function*() {
-            const fixture = yield* makeMcpStdioHarness(protocol)
-            const makeTool = (name: string) => ({
+            const test = yield* McpConformance
+            const initialized = yield* test.initialize({ server: "features" })
+            yield* test.notifyInitialized(initialized)
+            const before = (yield* test.observations).toolInvocations
+            const request = (arguments_: unknown) =>
+              test.send(initialized, {
+                jsonrpc: "2.0",
+                id: 2,
+                method: "tools/call",
+                params: { name: "TestTool", arguments: arguments_ }
+              })
+            const malformed = yield* request("invalid").pipe(Effect.flatMap(test.decodeError))
+            assert.strictEqual(malformed.error.code, McpSchema.INVALID_PARAMS_ERROR_CODE)
+
+            const response = yield* request({ value: 123 })
+            let text: string
+            if (["2024-11-05", "2025-03-26", "2025-06-18"].includes(protocol.protocolVersion)) {
+              const error = yield* test.decodeError(response)
+              assert.strictEqual(error.error.code, McpSchema.INVALID_PARAMS_ERROR_CODE)
+              text = error.error.message
+            } else {
+              const result = yield* test.decodeResult(response).pipe(
+                Effect.flatMap((message) => decodeCallTool(message.result))
+              )
+              assert.isTrue(result.isError)
+              assert.isUndefined(result.structuredContent)
+              assert.lengthOf(result.content, 1)
+              const content = result.content[0]
+              assertTrue(content.type === "text")
+              text = content.text
+            }
+            assert.include(text, "Invalid parameters for tool 'TestTool'")
+            assert.include(text, "Expected string")
+            assert.notMatch(text, /AiError|ToolParameterValidationError|Toolkit|TestTool\.handle/)
+            assert.strictEqual((yield* test.observations).toolInvocations, before)
+          }))
+      })
+    })
+  })
+
+export const statelessModernSuite = (
+  protocol: McpProtocol.ProtocolAdapter,
+  layer: McpConformanceLayer
+) =>
+  it.layer(layer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
+    describe("Tools > JSON Schema 2020-12", () => {
+      // SEP-2106: https://modelcontextprotocol.io/seps/2106-json-schema-2020-12
+      // https://modelcontextprotocol.io/specification/2026-07-28/server/tools#tool
+      it.effect("should preserve 2020-12 keywords when listing an input schema", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const initialized = yield* test.initialize({ server: "features" })
+          const response = yield* test.send(initialized, {
+            jsonrpc: "2.0",
+            id: 1,
+            method: "tools/list",
+            params: {}
+          })
+          const result = yield* test.decodeResult(response).pipe(
+            Effect.flatMap((message) => decodeJsonSchema2020Tools(message.result))
+          )
+          const tool = result.tools.find((tool) => tool.name === "JsonSchema2020Tool")
+
+          assert.isDefined(tool)
+          assert.deepStrictEqual(tool.inputSchema, {
+            $schema: "https://json-schema.org/draft/2020-12/schema",
+            type: "object",
+            $defs: { identifier: { type: "string" } },
+            properties: { value: { $ref: "#/$defs/identifier" } },
+            allOf: [{ required: ["value"] }],
+            unevaluatedProperties: false
+          })
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/server/tools#output-schema
+      it.effect("should list a non-object output schema when the tool declares one", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const initialized = yield* test.initialize({ server: "features" })
+          const response = yield* test.send(initialized, {
+            jsonrpc: "2.0",
+            id: 1,
+            method: "tools/list",
+            params: {}
+          })
+          const result = yield* test.decodeResult(response).pipe(
+            Effect.flatMap((message) => decodeJsonSchema2020Tools(message.result))
+          )
+          const tool = result.tools.find((tool) => tool.name === "TestTool")
+
+          assert.isDefined(tool)
+          assert.deepStrictEqual(tool.outputSchema, { type: "string" })
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/server/tools#structured-content
+      it.effect("should return primitive structured content when declared by the tool", () =>
+        Effect.gen(function*() {
+          const result = yield* callTool("TestTool", { value: "called" })
+
+          assert.strictEqual(result.structuredContent, "called")
+        }))
+    })
+
+    describe("Tools > Modern request headers", () => {
+      // SEP-2243: https://modelcontextprotocol.io/seps/2243-http-standardization
+      // The final 2026-07-28 specification assigns the HeaderMismatch error code.
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic/transports#request-metadata
+      it.effect("should reject a tools/call request when its required routing name is missing", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const initialized = yield* test.initialize({ server: "features" })
+          const before = (yield* test.observations).toolInvocations
+          const response = yield* test.send(initialized, {
+            jsonrpc: "2.0",
+            id: 2,
+            method: "tools/call",
+            params: { arguments: { value: "called" } }
+          })
+          const error = yield* test.decodeError(response)
+
+          assert.strictEqual(error.error.code, McpSchema.HEADER_MISMATCH_ERROR_CODE)
+          assert.strictEqual((yield* test.observations).toolInvocations, before)
+        }))
+
+      it.effect("should reject a tool call when a required parameter header is missing", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const initialized = yield* test.initialize({ server: "features" })
+          const before = (yield* test.observations).toolInvocations
+          const response = yield* test.send(initialized, {
+            jsonrpc: "2.0",
+            id: "missing-parameter-header",
+            method: "tools/call",
+            params: {
+              name: "HeaderTool",
+              arguments: { region: "eu-central-1" }
+            }
+          })
+
+          assert.strictEqual(response.status, 400)
+          const error = yield* test.decodeError(response)
+          assert.strictEqual(error.id, "missing-parameter-header")
+          assert.strictEqual(error.error.code, McpSchema.HEADER_MISMATCH_ERROR_CODE)
+          assert.strictEqual((yield* test.observations).toolInvocations, before)
+        }))
+
+      // Header extraction uses the exact JSON property path; absent parameters do not require headers.
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic/transports/streamable-http#server-behavior-for-custom-headers
+      it.effect("should accept omitted routing headers when optional parameters have prototype property names", () =>
+        Effect.gen(function*() {
+          const registration = Layer.effectDiscard(McpServer.McpServer.use((server) =>
+            server.addTool({
               tool: new McpSchema.Tool({
-                name,
-                inputSchema: { type: "object", properties: {} }
+                name: "OptionalRouting",
+                inputSchema: {
+                  type: "object",
+                  properties: {
+                    toString: { type: "string", "x-mcp-header": "Route" },
+                    nested: {
+                      type: "object",
+                      properties: { constructor: { type: "string", "x-mcp-header": "Nested-Route" } }
+                    }
+                  }
+                }
               }),
               annotations: Context.empty(),
-              handle: () => Effect.succeed(new McpSchema.CallToolResult({ content: [] }))
+              handle: () =>
+                Effect.succeed(
+                  new McpSchema.CallToolResult({
+                    content: [{ type: "text", text: "called" }]
+                  })
+                )
+            })
+          ))
+          const harness = yield* makeHttpHarness(registration.pipe(Layer.provideMerge(
+            makeServerLayer({ name: "OptionalRouting", protocols: [protocol] })
+          )))
+          for (const args of [{}, { nested: {} }]) {
+            const response = yield* harness.post({
+              jsonrpc: "2.0",
+              id: "optional-routing",
+              method: "tools/call",
+              params: {
+                name: "OptionalRouting",
+                arguments: args,
+                _meta: {
+                  "io.modelcontextprotocol/protocolVersion": protocol.protocolVersion,
+                  "io.modelcontextprotocol/clientCapabilities": {}
+                }
+              }
+            }, {
+              "Mcp-Protocol-Version": protocol.protocolVersion,
+              "Mcp-Method": "tools/call",
+              "Mcp-Name": "OptionalRouting"
             })
-            yield* fixture.server.addTool(makeTool("baseline-list-changed-tool"))
-            const initialized = yield* fixture.initialize()
-            const initializeResult = yield* Schema.decodeUnknownEffect(McpSchema.InitializeResult)(initialized.result)
-            assert.strictEqual(
-              initializeResult.capabilities.tools?.listChanged,
-              true
+            assert.strictEqual(response.status, 200)
+            const message = Schema.decodeUnknownSync(Schema.Struct({ result: McpSchema.CallToolResult }))(
+              yield* readMcpHttpResponse(response)
             )
+            assert.deepStrictEqual(message.result.content, [{ type: "text", text: "called" }])
+          }
+        }))
+
+      // Plain values permit interior HTAB; non-ASCII and other control characters require Base64 encoding.
+      // Decoding must preserve the complete string, including a leading U+FEFF, before comparing it with the body.
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic/transports/streamable-http#value-encoding
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic/transports/streamable-http#server-validation
+      it.effect("should validate parameter headers when values use plain or Base64 encoding", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const initialized = yield* test.initialize({ server: "features" })
+          const cases = [
+            {
+              id: "integer-missing",
+              arguments: { region: "eu-central-1", shard: 42 },
+              headers: { "Mcp-Param-Region": "eu-central-1" },
+              status: 400
+            },
+            {
+              id: "integer-mismatch",
+              arguments: { region: "eu-central-1", shard: 42 },
+              headers: { "Mcp-Param-Region": "eu-central-1", "Mcp-Param-Shard": "7" },
+              status: 400
+            },
+            {
+              id: "boolean-mismatch",
+              arguments: { region: "eu-central-1", dryRun: true },
+              headers: { "Mcp-Param-Region": "eu-central-1", "Mcp-Param-Dry-Run": "false" },
+              status: 400
+            },
+            {
+              id: "encoded-string",
+              arguments: { region: "Hello, 世界" },
+              headers: { "Mcp-Param-Region": "=?base64?SGVsbG8sIOS4lueVjA==?=" },
+              status: 200
+            },
+            {
+              id: "encoded-invalid-utf8",
+              arguments: { region: "\uFFFD" },
+              headers: { "Mcp-Param-Region": "=?base64?/w==?=" },
+              status: 400
+            },
+            {
+              id: "encoded-replacement-character",
+              arguments: { region: "\uFFFD" },
+              headers: { "Mcp-Param-Region": "=?base64?77+9?=" },
+              status: 200
+            },
+            {
+              id: "encoded-leading-bom",
+              arguments: { region: "\uFEFFeu-west" },
+              headers: { "Mcp-Param-Region": "=?base64?77u/ZXUtd2VzdA==?=" },
+              status: 200
+            },
+            {
+              id: "encoded-leading-bom-mismatch",
+              arguments: { region: "eu-west" },
+              headers: { "Mcp-Param-Region": "=?base64?77u/ZXUtd2VzdA==?=" },
+              status: 400
+            },
+            {
+              id: "encoded-tab",
+              arguments: { region: "eu\twest" },
+              headers: { "Mcp-Param-Region": "=?base64?ZXUJd2VzdA==?=" },
+              status: 200
+            },
+            {
+              id: "plain-tab",
+              arguments: { region: "eu\twest" },
+              headers: { "Mcp-Param-Region": "eu\twest" },
+              status: 200
+            },
+            {
+              id: "plain-control-character",
+              arguments: { region: "eu\u000bwest" },
+              headers: { "Mcp-Param-Region": "eu\u000bwest" },
+              status: 400
+            }
+          ] as const
 
-            yield* fixture.server.addTool(makeTool("dynamic-list-changed-tool"))
-            const notification = yield* fixture.awaitOutboundMethod("notifications/tools/list_changed")
-            assert.strictEqual(notification.jsonrpc, "2.0")
-            assert.strictEqual(notification.method, "notifications/tools/list_changed")
-            assert.notProperty(notification, "id")
+          for (const testCase of cases) {
+            yield* test.resetObservations
+            const response = yield* test.send(initialized, {
+              jsonrpc: "2.0",
+              id: testCase.id,
+              method: "tools/call",
+              params: {
+                name: "HeaderTool",
+                arguments: testCase.arguments
+              }
+            }, { headers: testCase.headers })
 
-            const response = yield* fixture.sendRequest("tools/list", {})
-            const result = yield* decodeTools(response.result)
-            assert.isTrue(result.tools.some((tool) => tool.name === "dynamic-list-changed-tool"))
-          }))
-      })
+            assert.strictEqual(response.status, testCase.status, testCase.id)
+            assert.strictEqual((yield* test.observations).toolInvocations, testCase.status === 400 ? 0 : 1, testCase.id)
+            if (testCase.status === 400) {
+              const error = yield* test.decodeError(response)
+              assert.strictEqual(error.error.code, McpSchema.HEADER_MISMATCH_ERROR_CODE)
+            } else {
+              yield* test.decodeResult(response)
+            }
+          }
+        }))
+    })
+
+    describe("Tools > Modern listing", () => {
+      // https://modelcontextprotocol.io/specification/2026-07-28/server/tools#listing-tools
+      it.effect("should return tools in the same order when the registered inventory has not changed", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const initialized = yield* test.initialize({ server: "features" })
+          const list = Effect.fnUntraced(function*() {
+            const response = yield* test.send(initialized, {
+              jsonrpc: "2.0",
+              id: 20,
+              method: "tools/list",
+              params: {}
+            })
+            const result = yield* test.decodeResult(response).pipe(
+              Effect.flatMap((message) => decodeTools(message.result))
+            )
+            return result.tools.map((tool) => tool.name)
+          })
+
+          assert.deepStrictEqual(yield* list(), yield* list())
+        }))
+    })
+  })
+
+export const statefulLegacySuite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConformanceLayer) =>
+  it.layer(layer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
+    describe("Tools > Legacy validation", () => {
+      it.effect("should reject malformed tool parameters without invoking a handler", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const initialized = yield* test.initialize({ server: "features" })
+          yield* test.notifyInitialized(initialized)
+          const before = (yield* test.observations).toolInvocations
+          const response = yield* test.send(initialized, {
+            jsonrpc: "2.0",
+            id: 2,
+            method: "tools/call",
+            params: { arguments: { value: "called" } }
+          })
+          const error = yield* test.decodeError(response)
+
+          assert.strictEqual(error.error.code, McpSchema.INVALID_PARAMS_ERROR_CODE)
+          assert.strictEqual((yield* test.observations).toolInvocations, before)
+        }))
+    })
+
+    // https://modelcontextprotocol.io/specification/2025-11-25/server/tools
+    describe("Tools > Legacy notifications", () => {
+      it.effect("should advertise tool list-change notifications when supported", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const discovered = yield* test.initialize({ server: "features" })
+          assert.strictEqual(discovered.message.result.capabilities.tools?.listChanged, true)
+        }))
+
+      it.effect("should send a tool list-change notification when the advertised list changes", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol)
+          const makeTool = (name: string) => ({
+            tool: new McpSchema.Tool({ name, inputSchema: { type: "object", properties: {} } }),
+            annotations: Context.empty(),
+            handle: () => Effect.succeed(new McpSchema.CallToolResult({ content: [] }))
+          })
+          yield* fixture.server.addTool(makeTool("baseline-list-changed-tool"))
+          yield* fixture.initialize()
+          yield* fixture.server.addTool(makeTool("dynamic-list-changed-tool"))
+          yield* fixture.flushListChanged
+
+          const notification = yield* fixture.awaitOutboundMethod("notifications/tools/list_changed")
+          assert.strictEqual(notification.jsonrpc, "2.0")
+          assert.strictEqual(notification.method, "notifications/tools/list_changed")
+          assert.notProperty(notification, "id")
+
+          const response = yield* fixture.sendRequest("tools/list", {})
+          const result = yield* decodeTools(response.result)
+          assert.isTrue(result.tools.some((tool) => tool.name === "dynamic-list-changed-tool"))
+        }))
     })
   })
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/TransportsTest.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/TransportsTest.ts
index 9593fec3a..c1a376643 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/TransportsTest.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/TransportsTest.ts
@@ -3,18 +3,12 @@ import * as Cause from "effect/Cause"
 import * as Effect from "effect/Effect"
 import * as Exit from "effect/Exit"
 import * as Fiber from "effect/Fiber"
-import * as Schema from "effect/Schema"
 import type * as McpProtocol from "effect/unstable/ai/McpProtocol"
 import * as McpSchema from "effect/unstable/ai/McpSchema"
 import { MCP_ENDPOINT } from "../TestUtils/McpHttpHarness.ts"
 import { makeMcpStdioHarness } from "../TestUtils/McpStdioHarness.ts"
 import { McpConformance, type McpConformanceLayer } from "./McpConformance.ts"
 
-const decodeErrorFrame = Schema.decodeUnknownEffect(Schema.Struct({
-  id: Schema.Null,
-  error: McpSchema.McpError
-}))
-
 const jsonRequest = (method: string, body?: unknown, headers?: HeadersInit) => {
   const requestHeaders = new Headers({
     accept: "application/json, text/event-stream",
@@ -135,9 +129,14 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
                 { jsonrpc: "2.0", id: 2, method: "ping", params: {} },
                 { jsonrpc: "2.0", id: 3, method: "ping", params: {} }
               ])
-              const error = yield* fixture.takeFrame.pipe(Effect.flatMap(decodeErrorFrame))
-              assert.strictEqual(error.id, null)
-              assert.strictEqual(error.error.code, McpSchema.INVALID_REQUEST_ERROR_CODE)
+              assert.deepStrictEqual(yield* fixture.takeFrame, {
+                jsonrpc: "2.0",
+                id: null,
+                error: {
+                  code: McpSchema.INVALID_REQUEST_ERROR_CODE,
+                  message: "JSON-RPC batches are not supported"
+                }
+              })
             })
         )
 
@@ -449,3 +448,150 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
       })
     })
   })
+
+export const statelessModernSuite = (
+  protocol: McpProtocol.ProtocolAdapter,
+  layer: McpConformanceLayer
+) =>
+  it.layer(layer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
+    const metadata = {
+      "io.modelcontextprotocol/protocolVersion": protocol.protocolVersion,
+      "io.modelcontextprotocol/clientCapabilities": {},
+      "io.modelcontextprotocol/clientInfo": { name: "transport-client", version: "1.0.0" }
+    }
+    const request = (id: string | number, method = "server/discover") => ({
+      jsonrpc: "2.0",
+      id,
+      method,
+      params: { _meta: metadata }
+    })
+    const headers = (method = "server/discover"): HeadersInit => ({
+      "MCP-Protocol-Version": protocol.protocolVersion,
+      "Mcp-Method": method
+    })
+
+    describe("Transports > Stateless modern", () => {
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic/transports/stdio
+      it.effect("should exchange one compact newline-delimited JSON-RPC message per stdio line", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol)
+          const response = yield* fixture.sendRequest("server/discover", {}, 1).pipe(Effect.forkChild)
+          const frame = yield* fixture.takeRawStdout
+
+          assert.strictEqual(frame.endsWith("\n"), true)
+          assert.strictEqual(frame.slice(0, -1).includes("\n"), false)
+          assert.deepInclude(JSON.parse(frame), { jsonrpc: "2.0", id: 1 })
+          yield* Fiber.join(response)
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic/transports/stdio
+      it.effect("should reconstruct a UTF-8 stdio message when its bytes arrive in separate chunks", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol)
+          const bytes = new TextEncoder().encode(`${JSON.stringify(request("stdio-🧪"))}\n`)
+          const splitAt = bytes.indexOf(0xf0) + 2
+
+          yield* fixture.sendChunk(bytes.slice(0, splitAt))
+          yield* fixture.sendChunk(bytes.slice(splitAt))
+
+          assert.deepInclude(yield* fixture.takeFrame, { jsonrpc: "2.0", id: "stdio-🧪" })
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic/transports/stdio
+      it.effect("should process consecutive stateless stdio requests independently", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol)
+          yield* fixture.sendRaw(request(2))
+          yield* fixture.sendRaw(request(3))
+
+          assert.deepInclude(yield* fixture.takeFrame, { jsonrpc: "2.0", id: 2 })
+          assert.deepInclude(yield* fixture.takeFrame, { jsonrpc: "2.0", id: 3 })
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic/transports/stdio
+      it.effect("should shut down the stdio server when the client closes stdin", () =>
+        Effect.gen(function*() {
+          const fixture = yield* makeMcpStdioHarness(protocol)
+          yield* fixture.close
+          const exit = yield* Fiber.await(fixture.serverFiber)
+
+          assert.isTrue(Exit.isSuccess(exit) || (Exit.isFailure(exit) && Cause.hasInterruptsOnly(exit.cause)))
+        }))
+
+      // MethodNotFound also covers unadvertised capabilities, and modern HTTP maps it to 404.
+      // https://modelcontextprotocol.io/specification/2026-07-28/schema#methodnotfounderror
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic/transports/streamable-http#protocol-version-header
+      it.effect("should return HTTP 404 when a request needs an unavailable server capability", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const discovered = yield* test.initialize()
+          assert.isUndefined(discovered.message.result.capabilities.prompts)
+
+          const response = yield* test.post(request("unavailable", "prompts/list"), headers("prompts/list"))
+          const error = yield* test.decodeError(response)
+          assert.strictEqual(error.id, "unavailable")
+          assert.strictEqual(error.error.code, McpSchema.METHOD_NOT_FOUND_ERROR_CODE)
+          assert.strictEqual(response.status, 404)
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic/transports#sending-messages-to-the-server
+      it.effect("should require application/json content and both supported response media types for HTTP POST", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const body = request(4)
+          const accepted = yield* test.request(jsonRequest("POST", body, {
+            ...headers(),
+            "content-type": "Application/JSON; charset=utf-8",
+            accept: "Text/Event-Stream, Application/JSON"
+          }))
+          assert.strictEqual(accepted.status, 200)
+
+          for (const contentType of ["text/plain", "application/json-malicious", ""]) {
+            const response = yield* test.request(jsonRequest("POST", body, {
+              ...headers(),
+              "content-type": contentType
+            }))
+            assert.strictEqual(response.status, 415)
+          }
+          for (const accept of ["application/json", "text/event-stream", "*/*", ""]) {
+            const response = yield* test.request(jsonRequest("POST", body, { ...headers(), accept }))
+            assert.strictEqual(response.status, 406)
+          }
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic/transports#sending-messages-to-the-server
+      it.effect("should return application/json when an HTTP request has one JSON-RPC response", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          const response = yield* test.request(jsonRequest("POST", request(5), headers()))
+
+          assert.strictEqual(response.status, 200)
+          assert.match(response.headers.get("content-type") ?? "", /^application\/json\b/)
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic/transports#listening-for-messages-from-the-server
+      it.effect("should reject GET and unsupported HTTP methods when only POST is available", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          for (const method of ["GET", "PUT", "PATCH", "HEAD"] as const) {
+            const response = yield* test.request(jsonRequest(method))
+            assert.strictEqual(response.status, 405)
+            assert.strictEqual(response.headers.get("allow"), "POST")
+          }
+        }))
+
+      // https://modelcontextprotocol.io/specification/2026-07-28/basic/transports#security-warning
+      it.effect("should reject every MCP HTTP route when its Origin is not explicitly allowed", () =>
+        Effect.gen(function*() {
+          const test = yield* McpConformance
+          for (const method of ["POST", "GET", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS"] as const) {
+            const response = yield* test.request(jsonRequest(
+              method,
+              method === "POST" ? request(6) : undefined,
+              { ...headers(), origin: "https://attacker.example" }
+            ))
+            assert.strictEqual(response.status, 403)
+          }
+        }))
+    })
+  })
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/UtilitiesTest.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/UtilitiesTest.ts
index 08194faeb..17a118d6a 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/UtilitiesTest.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpConformance/UtilitiesTest.ts
@@ -3,8 +3,14 @@ import * as Context from "effect/Context"
 import * as Deferred from "effect/Deferred"
 import * as Effect from "effect/Effect"
 import * as Exit from "effect/Exit"
+import * as Fiber from "effect/Fiber"
+import * as Layer from "effect/Layer"
 import type * as McpProtocol from "effect/unstable/ai/McpProtocol"
 import * as McpSchema from "effect/unstable/ai/McpSchema"
+import * as McpServer from "effect/unstable/ai/McpServer"
+import { initializeHttpSession, makeHttpHarness } from "../TestUtils/McpHttpHarness.ts"
+import { makeMcpSseReader } from "../TestUtils/McpHttpResponse.ts"
+import { makeServerLayer } from "../TestUtils/McpServerLayer.ts"
 import { makeMcpStdioHarness } from "../TestUtils/McpStdioHarness.ts"
 import { McpConformance, type McpConformanceLayer } from "./McpConformance.ts"
 
@@ -221,3 +227,288 @@ export const suite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConforman
       })
     })
   })
+
+export const statelessModernSuite = (
+  protocol: McpProtocol.ProtocolAdapter,
+  layer: McpConformanceLayer
+) =>
+  it.layer(layer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
+    describe("Utilities > Stateless modern", () => {
+      describe("Cancellation", () => {
+        // https://modelcontextprotocol.io/specification/2026-07-28/basic/utilities/cancellation
+        it.effect("should send no response when a cancellation notification is received", () =>
+          Effect.gen(function*() {
+            const test = yield* McpConformance
+            const discovered = yield* test.initialize()
+            const response = yield* test.send(discovered, {
+              jsonrpc: "2.0",
+              method: "notifications/cancelled",
+              params: { requestId: "unknown-request", reason: "No longer needed" }
+            })
+
+            assert.strictEqual(response.status, 202)
+            assert.strictEqual(yield* Effect.promise(() => response.text()), "")
+          }))
+
+        // https://modelcontextprotocol.io/specification/2026-07-28/basic/utilities/cancellation
+        it.effect("should interrupt work and suppress its response when an active request is cancelled", () =>
+          Effect.gen(function*() {
+            const entered = yield* Deferred.make<void>()
+            const release = yield* Deferred.make<void>()
+            const interrupted = yield* Deferred.make<void>()
+            yield* Effect.addFinalizer(() => Deferred.succeed(release, void 0))
+            const fixture = yield* makeMcpStdioHarness(protocol)
+            const cancelledRequestId = "cancelled-tool-call"
+
+            yield* fixture.server.addTool({
+              tool: new McpSchema.Tool({
+                name: "ModernGatedTool",
+                inputSchema: { type: "object", properties: {} }
+              }),
+              annotations: Context.empty(),
+              handle: () =>
+                Deferred.succeed(entered, void 0).pipe(
+                  Effect.andThen(Deferred.await(release)),
+                  Effect.onInterrupt(() => Deferred.succeed(interrupted, void 0)),
+                  Effect.as(new McpSchema.CallToolResult({ content: [{ type: "text", text: "released" }] }))
+                )
+            })
+
+            yield* fixture.initialize()
+            yield* fixture.startRequest("tools/call", {
+              name: "ModernGatedTool",
+              arguments: {}
+            }, cancelledRequestId)
+            yield* Deferred.await(entered)
+            yield* fixture.sendNotification("notifications/cancelled", {
+              requestId: cancelledRequestId,
+              reason: "No longer needed"
+            })
+            yield* Deferred.await(interrupted)
+
+            const control = yield* fixture.sendRequest("server/discover", {}, "post-cancellation-discover")
+            assert.strictEqual(control.id, "post-cancellation-discover")
+          }))
+
+        // https://modelcontextprotocol.io/specification/2026-07-28/basic/utilities/cancellation
+        it.effect("should allow a later request to reuse an identifier cancelled before it was active", () =>
+          Effect.gen(function*() {
+            const fixture = yield* makeMcpStdioHarness(protocol)
+            yield* fixture.initialize()
+            yield* fixture.sendNotification("notifications/cancelled", { requestId: "reused-id" })
+
+            const reused = yield* fixture.sendRequest("server/discover", {}, "reused-id")
+            assert.strictEqual(reused.id, "reused-id")
+            assert.property(reused, "result")
+          }))
+      })
+    })
+  })
+
+export const statefulLegacySuite = (protocol: McpProtocol.ProtocolAdapter, layer: McpConformanceLayer) =>
+  it.layer(layer, { excludeTestServices: true })(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
+    if (protocol.runtime.transport.jsonRpc.acceptsBatches) {
+      describe("Utilities > Cancellation > STDIO", () => {
+        // Cancellation recipients SHOULD stop work and not send the cancelled request's response.
+        // Batch-capable transports must still deliver the remaining requests' responses.
+        // https://modelcontextprotocol.io/specification/2025-03-26/basic/utilities/cancellation#behavior-requirements
+        // https://modelcontextprotocol.io/specification/2025-03-26/basic/transports#stdio
+        it.effect("should preserve the remaining batch result when a sibling STDIO request is cancelled", () =>
+          Effect.gen(function*() {
+            const entered = yield* Deferred.make<void>()
+            const interrupted = yield* Deferred.make<void>()
+            const fixture = yield* makeMcpStdioHarness(protocol)
+            yield* fixture.server.addTool({
+              tool: new McpSchema.Tool({ name: "Wait", inputSchema: { type: "object" } }),
+              annotations: Context.empty(),
+              handle: () =>
+                Deferred.succeed(entered, void 0).pipe(
+                  Effect.andThen(Effect.never),
+                  Effect.onInterrupt(() => Deferred.succeed(interrupted, void 0))
+                )
+            })
+            yield* fixture.initialize()
+            yield* fixture.takeFrame
+            yield* fixture.sendRaw([
+              { jsonrpc: "2.0", id: 1, method: "tools/call", params: { name: "Wait" } },
+              { jsonrpc: "2.0", id: "1", method: "ping" }
+            ])
+            yield* Deferred.await(entered)
+            yield* fixture.sendNotification("notifications/cancelled", { requestId: 1 })
+            yield* Deferred.await(interrupted)
+            const response = yield* fixture.takeFrame.pipe(Effect.timeout("1 second"))
+            assert.deepStrictEqual([response].flat(), [{ jsonrpc: "2.0", id: "1", result: {} }])
+          }))
+      })
+    }
+    describe("Utilities > Cancellation > HTTP", () => {
+      const serverLayer = makeServerLayer({ name: "HttpCancellation", protocols: [protocol] })
+      // https://modelcontextprotocol.io/specification/2025-11-25/basic/utilities/cancellation
+      it.effect("should cancel only the owning request when HTTP sessions reuse a request ID", () =>
+        Effect.gen(function*() {
+          const interrupted = yield* Deferred.make<void>()
+          const otherInterrupted = yield* Deferred.make<void>()
+          const releaseOther = yield* Deferred.make<void>()
+          const registration = Layer.effectDiscard(Effect.gen(function*() {
+            const server = yield* McpServer.McpServer
+            for (const name of ["Wait", "Keep"] as const) {
+              yield* server.addTool({
+                tool: new McpSchema.Tool({ name, inputSchema: { type: "object" } }),
+                annotations: Context.empty(),
+                handle: () =>
+                  server.notifications["notifications/message"]({ level: "error", data: name }).pipe(
+                    Effect.andThen(name === "Wait" ? Effect.never : Deferred.await(releaseOther)),
+                    Effect.onInterrupt(() =>
+                      Deferred.succeed(name === "Wait" ? interrupted : otherInterrupted, void 0)
+                    ),
+                    Effect.as(new McpSchema.CallToolResult({ content: [{ type: "text", text: "kept" }] }))
+                  )
+              })
+            }
+          }))
+          const harness = yield* makeHttpHarness(registration.pipe(Layer.provideMerge(serverLayer)))
+          const otherHeaders = yield* initializeHttpSession(harness, protocol)
+          const otherResponse = yield* harness.post({
+            jsonrpc: "2.0",
+            id: "wait",
+            method: "tools/call",
+            params: { name: "Keep", arguments: {} }
+          }, otherHeaders)
+          const otherStream = makeMcpSseReader(otherResponse)
+          yield* Effect.addFinalizer(() => otherStream.cancel)
+          assert.strictEqual((yield* otherStream.take()).method, "notifications/message")
+          const headers = yield* initializeHttpSession(harness, protocol)
+          const response = yield* harness.post({
+            jsonrpc: "2.0",
+            id: "wait",
+            method: "tools/call",
+            params: { name: "Wait", arguments: {} }
+          }, headers)
+          const stream = makeMcpSseReader(response)
+          yield* Effect.addFinalizer(() => stream.cancel)
+          assert.strictEqual((yield* stream.take()).method, "notifications/message")
+          const cancelled = yield* harness.post({
+            jsonrpc: "2.0",
+            method: "notifications/cancelled",
+            params: { requestId: "wait" }
+          }, headers)
+          assert.strictEqual(cancelled.status, 202)
+          yield* Deferred.await(interrupted).pipe(Effect.timeout("1 second"))
+          assert.deepStrictEqual(yield* stream.drain().pipe(Effect.timeout("1 second")), [])
+          yield* Deferred.succeed(releaseOther, void 0)
+          assert.deepStrictEqual(yield* otherStream.drain().pipe(Effect.timeout("1 second")), [{
+            jsonrpc: "2.0",
+            id: "wait",
+            result: { content: [{ type: "text", text: "kept" }] }
+          }])
+          assert.isFalse(yield* Deferred.isDone(otherInterrupted))
+        }))
+
+      it.effect("should close without a reply when a tool is cancelled before emitting HTTP output", () =>
+        Effect.gen(function*() {
+          const entered = yield* Deferred.make<void>()
+          const interrupted = yield* Deferred.make<void>()
+          const registration = Layer.effectDiscard(McpServer.McpServer.use((server) =>
+            server.addTool({
+              tool: new McpSchema.Tool({ name: "Wait", inputSchema: { type: "object" } }),
+              annotations: Context.empty(),
+              handle: () =>
+                Deferred.succeed(entered, void 0).pipe(
+                  Effect.andThen(Effect.never),
+                  Effect.onInterrupt(() => Deferred.succeed(interrupted, void 0))
+                )
+            })
+          ))
+          const harness = yield* makeHttpHarness(registration.pipe(Layer.provideMerge(serverLayer)))
+          const headers = yield* initializeHttpSession(harness, protocol)
+          const pending = yield* harness.post({
+            jsonrpc: "2.0",
+            id: "wait",
+            method: "tools/call",
+            params: { name: "Wait", arguments: {} }
+          }, headers).pipe(Effect.forkChild)
+          yield* Deferred.await(entered)
+          const cancelled = yield* harness.post({
+            jsonrpc: "2.0",
+            method: "notifications/cancelled",
+            params: { requestId: "wait" }
+          }, headers)
+          assert.strictEqual(cancelled.status, 202)
+          yield* Deferred.await(interrupted).pipe(Effect.timeout("1 second"))
+          const response = yield* Fiber.join(pending).pipe(Effect.timeout("1 second"))
+          assert.strictEqual(yield* Effect.promise(() => response.text()), "")
+        }))
+
+      if (protocol.runtime.transport.jsonRpc.acceptsBatches) {
+        // https://modelcontextprotocol.io/specification/2025-03-26/basic/utilities/cancellation
+        // https://modelcontextprotocol.io/specification/2025-03-26/basic/transports#sending-messages-to-the-server
+        for (const cancelled of ["one", "all"] as const) {
+          it.effect(`should omit cancelled replies and preserve remaining results when cancellation affects ${cancelled} of the batch requests`, () =>
+            Effect.gen(function*() {
+              const release = yield* Deferred.make<void>()
+              const interrupted = yield* Deferred.make<void>()
+              const otherInterrupted = yield* Deferred.make<void>()
+              const registration = Layer.effectDiscard(Effect.gen(function*() {
+                const server = yield* McpServer.McpServer
+                for (const name of ["Cancel", "Keep"] as const) {
+                  yield* server.addTool({
+                    tool: new McpSchema.Tool({ name, inputSchema: { type: "object" } }),
+                    annotations: Context.empty(),
+                    handle: () =>
+                      server.notifications["notifications/message"]({ level: "error", data: name }).pipe(
+                        Effect.andThen(name === "Cancel" ? Effect.never : Deferred.await(release)),
+                        Effect.onInterrupt(() =>
+                          Deferred.succeed(name === "Cancel" ? interrupted : otherInterrupted, void 0)
+                        ),
+                        Effect.as(new McpSchema.CallToolResult({ content: [{ type: "text", text: name }] }))
+                      )
+                  })
+                }
+              }))
+              const harness = yield* makeHttpHarness(registration.pipe(Layer.provideMerge(
+                makeServerLayer({ name: "BatchCancellation", protocols: [protocol] })
+              )))
+              const headers = yield* initializeHttpSession(harness, protocol)
+              const response = yield* harness.post(
+                ["Cancel", "Keep"].map((name) => ({
+                  jsonrpc: "2.0",
+                  id: name === "Cancel" ? 1 : "1",
+                  method: "tools/call",
+                  params: { name, arguments: {} }
+                })),
+                headers
+              )
+              const stream = makeMcpSseReader(response)
+              yield* Effect.addFinalizer(() => stream.cancel)
+              assert.strictEqual((yield* stream.take()).method, "notifications/message")
+              assert.strictEqual((yield* stream.take()).method, "notifications/message")
+              yield* harness.post(
+                { jsonrpc: "2.0", method: "notifications/cancelled", params: { requestId: 1 } },
+                headers
+              )
+              yield* Deferred.await(interrupted).pipe(Effect.timeout("1 second"))
+              assert.isFalse(yield* Deferred.isDone(otherInterrupted))
+              if (cancelled === "all") {
+                yield* harness.post(
+                  { jsonrpc: "2.0", method: "notifications/cancelled", params: { requestId: "1" } },
+                  headers
+                )
+                yield* Deferred.await(otherInterrupted).pipe(Effect.timeout("1 second"))
+              } else {
+                yield* Deferred.succeed(release, void 0)
+              }
+              const messages = yield* stream.drain().pipe(Effect.timeout("1 second"))
+              assert.deepStrictEqual(
+                messages.flat(),
+                cancelled === "all" ? [] : [{
+                  jsonrpc: "2.0",
+                  id: "1",
+                  result: { content: [{ type: "text", text: "Keep" }] }
+                }]
+              )
+              assert.strictEqual(yield* Deferred.isDone(otherInterrupted), cancelled === "all")
+            }))
+        }
+      }
+    })
+  })
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpProtocol.test.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpProtocol.test.ts
index 4db2240b5..26cd8b225 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpProtocol.test.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpProtocol.test.ts
@@ -2,6 +2,7 @@ import { assert, describe, it } from "@effect/vitest"
 import { Effect, Schema } from "effect"
 import * as McpProtocol from "effect/unstable/ai/internal/mcpProtocol"
 import * as McpProtocolRegistry from "effect/unstable/ai/internal/mcpProtocolRegistry"
+import * as McpRuntime from "effect/unstable/ai/internal/mcpRuntime"
 import * as McpSchema2025_06_18 from "effect/unstable/ai/internal/mcpSchema/v2025_06_18"
 import type * as PublicMcpProtocol from "effect/unstable/ai/McpProtocol"
 import * as McpSchema from "effect/unstable/ai/McpSchema"
@@ -29,10 +30,10 @@ const makeTestProtocol = <
 
   return McpProtocol.make({
     protocolVersion,
-    transport: {
-      acceptsJsonRpcBatches: false,
-      requiresVersionHeader: true
-    },
+    runtime: McpRuntime.stateful({
+      jsonRpc: { acceptsBatches: false },
+      http: { requiresVersionHeader: true }
+    }),
     clientRpcs: RpcGroup.make(TestRequest),
     clientNotificationRpcs: RpcGroup.make(),
     serverRequestRpcs: RpcGroup.make(),
@@ -198,3 +199,20 @@ describe("MCP v2025-06-18 schema", () => {
     assert.notProperty(capabilities, "extensions")
   })
 })
+
+describe("McpProtocol errors", () => {
+  it("should preserve tagged unsupported errors without requiring the local class prototype", () => {
+    const unsupported = {
+      _tag: "McpReverseOperationUnsupported",
+      operation: "roots/list",
+      protocolVersion: "2025-06-18",
+      reason: "Client did not advertise roots"
+    }
+    assert.strictEqual<unknown>(McpProtocol.reverseError("roots/list")(unsupported), unsupported)
+
+    const cause = new Error("Transport failed")
+    const wrapped = McpProtocol.reverseError("roots/list")(cause)
+    assert.strictEqual(wrapped._tag, "McpReverseOperationError")
+    assert.propertyVal(wrapped, "cause", cause)
+  })
+})
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpServer.test.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpServer.test.ts
index 89844e5b9..e463688b1 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/McpServer.test.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/McpServer.test.ts
@@ -1,16 +1,27 @@
 import { assert, describe, it } from "@effect/vitest"
 import { assertTrue, strictEqual } from "@effect/vitest/utils"
+import * as Cause from "effect/Cause"
 import * as Context from "effect/Context"
 import * as Deferred from "effect/Deferred"
 import * as Effect from "effect/Effect"
+import * as ErrorReporter from "effect/ErrorReporter"
+import * as Fiber from "effect/Fiber"
 import * as Layer from "effect/Layer"
+import * as Logger from "effect/Logger"
 import * as Option from "effect/Option"
+import * as PubSub from "effect/PubSub"
 import * as Queue from "effect/Queue"
+import * as Ref from "effect/Ref"
 import * as Schema from "effect/Schema"
 import * as Sink from "effect/Sink"
 import * as Stdio from "effect/Stdio"
 import * as Stream from "effect/Stream"
+import * as TestClock from "effect/testing/TestClock"
 import * as AiError from "effect/unstable/ai/AiError"
+import * as McpCore from "effect/unstable/ai/internal/mcpCore"
+import type * as McpProtocolInternal from "effect/unstable/ai/internal/mcpProtocol"
+import * as McpProtocol2026 from "effect/unstable/ai/internal/mcpProtocol/v2026_07_28"
+import * as McpSchema2026 from "effect/unstable/ai/internal/mcpSchema/v2026_07_28"
 import * as McpProtocol from "effect/unstable/ai/McpProtocol"
 import * as McpSchema from "effect/unstable/ai/McpSchema"
 import * as McpServer from "effect/unstable/ai/McpServer"
@@ -21,22 +32,45 @@ import * as HttpClient from "effect/unstable/http/HttpClient"
 import * as HttpClientRequest from "effect/unstable/http/HttpClientRequest"
 import * as HttpRouter from "effect/unstable/http/HttpRouter"
 import { RpcSerialization } from "effect/unstable/rpc"
+import * as Rpc from "effect/unstable/rpc/Rpc"
 import * as RpcClient from "effect/unstable/rpc/RpcClient"
 import type * as RpcMessage from "effect/unstable/rpc/RpcMessage"
+import { RequestId } from "effect/unstable/rpc/RpcMessage"
 import * as RpcServer from "effect/unstable/rpc/RpcServer"
-import { makeHttpHarness } from "./TestUtils/McpHttpHarness.ts"
+import { collectGarbage } from "../../../utils/gc.ts"
+import { initializeHttpSession, makeHttpHarness } from "./TestUtils/McpHttpHarness.ts"
+import { makeMcpSseReader, readMcpHttpResponse } from "./TestUtils/McpHttpResponse.ts"
 import { makeServerLayer } from "./TestUtils/McpServerLayer.ts"
+import { makeMcpStdioHarness } from "./TestUtils/McpStdioHarness.ts"
 
 const OptionalStringTool = Tool.make("OptionalStringTool", {
   parameters: Schema.Struct({ signature: Schema.optional(Schema.String) }),
   success: Schema.String
 })
 
+const StrictObjectTool = Tool.make("StrictObjectTool", {
+  parameters: Schema.Struct({
+    config: Schema.Struct({ value: Schema.FiniteFromString })
+  }).annotate({ identifier: "Strict / ~ % Input" }),
+  success: Schema.String,
+  failureMode: "return"
+}).annotate(Tool.Strict, true)
+
 const PublicFailureTool = Tool.make("PublicFailureTool", {
   success: Schema.String,
   failure: Schema.ErrorInstance()
 })
 
+const StructuredFailureTool = Tool.make("StructuredFailureTool", {
+  success: Schema.Struct({ answer: Schema.String }),
+  failure: Schema.Struct({
+    reason: Schema.String,
+    retryAfter: Schema.FiniteFromString,
+    detail: Schema.optional(Schema.Unknown)
+  }),
+  failureMode: "error"
+})
+
 const InternalAiErrorTool = Tool.make("InternalAiErrorTool", {
   success: Schema.String
 })
@@ -45,6 +79,10 @@ const DefectTool = Tool.make("DefectTool", {
   success: Schema.String
 })
 
+const UnserializableResultTool = Tool.make("UnserializableResultTool", {
+  success: Schema.Unknown
+})
+
 const UntypedTool = Tool.make("UntypedTool")
 
 const StructuredResultTool = Tool.make("StructuredResultTool", {
@@ -65,9 +103,12 @@ const ArrayResultTool = Tool.make("ArrayResultTool", {
 
 const TestToolkit = Toolkit.make(
   OptionalStringTool,
+  StrictObjectTool,
   PublicFailureTool,
+  StructuredFailureTool,
   InternalAiErrorTool,
   DefectTool,
+  UnserializableResultTool,
   UntypedTool,
   StructuredResultTool,
   AnnotatedVoidTool,
@@ -76,16 +117,27 @@ const TestToolkit = Toolkit.make(
 )
 type TestToolkitHandlers = Toolkit.HandlersFrom<Toolkit.Tools<typeof TestToolkit>>
 
+const publicFailure = new Error("Public failure")
+const internalAiError = AiError.make({
+  module: "TestToolkit",
+  method: "InternalAiErrorTool",
+  reason: new AiError.RateLimitError({})
+})
+const privateDefect = new Error("private defect details")
+
 const testToolkitHandlers = TestToolkit.of({
   OptionalStringTool: ({ signature }) => Effect.succeed(signature ?? "omitted"),
-  PublicFailureTool: () => Effect.fail(new Error("Public failure")),
-  InternalAiErrorTool: () => Effect.fail(new AiError.RateLimitError({})),
-  DefectTool: () => Effect.die("private defect details"),
+  StrictObjectTool: ({ config }) => Effect.succeed(config.value.toFixed(0)),
+  PublicFailureTool: () => Effect.fail(publicFailure),
+  StructuredFailureTool: () => Effect.fail({ reason: "busy", retryAfter: 5 }),
+  InternalAiErrorTool: () => Effect.fail(internalAiError),
+  DefectTool: () => Effect.die(privateDefect),
   UntypedTool: () => Effect.void,
   StructuredResultTool: () => Effect.succeed({ answer: "result" }),
   AnnotatedVoidTool: () => Effect.void,
   NullableResultTool: () => Effect.succeed(null),
-  ArrayResultTool: () => Effect.succeed(["first", "second"])
+  ArrayResultTool: () => Effect.succeed(["first", "second"]),
+  UnserializableResultTool: () => Effect.succeed(1n)
 })
 
 const INTERNAL_TOOL_ERROR_MESSAGE = "Tool execution failed due to an internal server error."
@@ -153,10 +205,24 @@ const makeRouterTestClient = (
   router: Layer.Layer<never, never, HttpRouter.HttpRouter>
 ) => makeTestClientWith(TestServerLayer, { routerLayer: router })
 
-const makeToolkitTestClient = Effect.fnUntraced(function*(handlers: TestToolkitHandlers = testToolkitHandlers) {
+const makeToolkitTestClient = Effect.fnUntraced(function*(
+  handlers: TestToolkitHandlers = testToolkitHandlers,
+  options?: { readonly reportErrors?: boolean }
+) {
+  const reported: Array<Cause.Cause<unknown>> = []
+  const logged: Array<Cause.Cause<unknown>> = []
+  const loggerLayer = Logger.layer([Logger.make(({ cause, logLevel }) => {
+    if (logLevel === "Error") logged.push(cause)
+  })])
+  const reporterLayer = ErrorReporter.layer(
+    options?.reportErrors === false ? [] : [ErrorReporter.make(({ cause }) => {
+      reported.push(cause)
+    })]
+  )
   const serverLayer = McpServer.toolkit(TestToolkit).pipe(
     Layer.provideMerge(TestToolkit.toLayer(handlers)),
-    Layer.provide(TestServerLayer)
+    Layer.provide(Layer.mergeAll(TestServerLayer, loggerLayer)),
+    Layer.provide(reporterLayer)
   )
   const { client } = yield* makeTestClientWith(serverLayer)
   yield* client.initialize({
@@ -167,7 +233,7 @@ const makeToolkitTestClient = Effect.fnUntraced(function*(handlers: TestToolkitH
       version: "1.0.0"
     }
   })
-  return client
+  return { client, reported, logged }
 })
 
 const toolResultText = (result: McpSchema.CallToolResult): string => {
@@ -177,7 +243,1012 @@ const toolResultText = (result: McpSchema.CallToolResult): string => {
 }
 
 describe("McpServer", () => {
+  // Effect delivery contract: an unavailable destination must not leave the caller waiting.
+  it.effect("should return from completion notification when the target client is absent", () =>
+    Effect.gen(function*() {
+      const fixture = yield* makeMcpStdioHarness(McpProtocol.v2025_11_25)
+      yield* fixture.initialize()
+      yield* fixture.server.notifyElicitationComplete({ clientId: 999, elicitationId: "not-connected" })
+      assert.deepInclude(yield* fixture.sendRequest("ping", {}), { result: {} })
+    }))
+
+  // URL completion is unavailable in June; this checks that the Effect call returns, not wire suppression.
+  it.effect("should return from completion notification when the target protocol does not support it", () =>
+    Effect.gen(function*() {
+      const fixture = yield* makeMcpStdioHarness(McpProtocol.v2025_06_18)
+      yield* fixture.initialize()
+      yield* fixture.server.notifyElicitationComplete({ clientId: 0, elicitationId: "unsupported" })
+      assert.deepInclude(yield* fixture.sendRequest("ping", {}), { result: {} })
+    }))
+
+  // https://modelcontextprotocol.io/specification/2025-11-25/client/elicitation#completion-notifications-for-url-mode-elicitation
+  // MCP defines the completion notification and its recipient. Awaiting delivery before returning is the Effect API contract.
+  it.effect("should deliver URL elicitation completion before the tool result when the tool awaits notification delivery", () =>
+    Effect.gen(function*() {
+      const authorizationCompleted = yield* Deferred.make<void>()
+      const registration = Layer.effectDiscard(Effect.gen(function*() {
+        const server = yield* McpServer.McpServer
+        yield* server.addTool({
+          tool: new McpSchema.Tool({ name: "Authorize", inputSchema: { type: "object" } }),
+          annotations: Context.empty(),
+          handle: () =>
+            Effect.gen(function*() {
+              const client = yield* Effect.serviceOption(McpSchema.McpServerClient).pipe(
+                Effect.flatMap(Effect.fromOption)
+              )
+              yield* client.getClient.pipe(
+                Effect.flatMap((reverseClient) =>
+                  reverseClient.elicit(
+                    Schema.decodeUnknownSync(McpSchema.Elicit.payloadSchema)({
+                      mode: "url",
+                      message: "Authorize access",
+                      url: "https://example.com/authorize",
+                      elicitationId: "authorization-1"
+                    })
+                  )
+                ),
+                Effect.scoped
+              )
+              yield* Deferred.await(authorizationCompleted)
+              yield* server.notifyElicitationComplete({
+                clientId: client.clientId,
+                elicitationId: "authorization-1"
+              })
+              return new McpSchema.CallToolResult({ content: [{ type: "text", text: "Authorized" }] })
+            }).pipe(Effect.orDie)
+        })
+      }))
+      const harness = yield* makeHttpHarness(registration.pipe(Layer.provideMerge(
+        makeServerLayer({ name: "UrlElicitationCompletion", protocols: [McpProtocol.v2025_11_25] })
+      )))
+      const initialized = yield* harness.post({
+        jsonrpc: "2.0",
+        id: "initialize",
+        method: "initialize",
+        params: {
+          protocolVersion: "2025-11-25",
+          capabilities: { elicitation: { url: {} } },
+          clientInfo: { name: "authorization-client", version: "1.0.0" }
+        }
+      })
+      yield* readMcpHttpResponse(initialized)
+      const sessionId = initialized.headers.get("Mcp-Session-Id")
+      assert.isNotNull(sessionId)
+      const headers = { "Mcp-Session-Id": sessionId, "Mcp-Protocol-Version": "2025-11-25" }
+      yield* harness.post({ jsonrpc: "2.0", method: "notifications/initialized" }, headers)
+      const response = yield* harness.post({
+        jsonrpc: "2.0",
+        id: "authorize-tool",
+        method: "tools/call",
+        params: { name: "Authorize", arguments: {} }
+      }, headers)
+      const stream = makeMcpSseReader(response)
+      yield* Effect.addFinalizer(() => stream.cancel)
+      const elicitation = yield* stream.take()
+      assert.strictEqual(elicitation.method, "elicitation/create")
+      assert.isDefined(elicitation.id)
+      const accepted = yield* harness.post({
+        jsonrpc: "2.0",
+        id: elicitation.id,
+        result: { action: "accept" }
+      }, headers)
+      assert.strictEqual(accepted.status, 202)
+      yield* Deferred.succeed(authorizationCompleted, undefined)
+
+      const completed = yield* stream.take()
+      assert.strictEqual(completed.method, "notifications/elicitation/complete")
+      assert.deepStrictEqual(completed.params, { elicitationId: "authorization-1" })
+      const result = yield* stream.take()
+      assert.strictEqual(result.id, "authorize-tool")
+      assert.deepStrictEqual(result.result, { content: [{ type: "text", text: "Authorized" }] })
+      assert.deepStrictEqual(yield* stream.drain(), [])
+    }))
+
+  // Request metadata retention is a server lifecycle concern, not an MCP wire requirement.
+  // This collection hook is Node-specific; other runtimes still run the request lifecycle tests below.
+  it.effect.skipIf(process.versions.bun !== undefined || process.versions.deno !== undefined)(
+    "should release request metadata when HTTP requests complete without server notifications",
+    () =>
+      Effect.gen(function*() {
+        const references: Array<WeakRef<object>> = []
+        const controls: Array<WeakRef<object>> = []
+        const harness = yield* makeHttpHarness(
+          Layer.effectDiscard(Effect.gen(function*() {
+            const server = yield* McpServer.McpServer
+            yield* server.addTool({
+              tool: new McpSchema.Tool({ name: "Capture", inputSchema: { type: "object" } }),
+              annotations: Context.empty(),
+              handle: () =>
+                Effect.gen(function*() {
+                  const context = yield* McpSchema.McpRequestContext
+                  references.push(new WeakRef(context.requestMetadata!))
+                  controls.push(new WeakRef({ unrelated: true }))
+                  return new McpSchema.CallToolResult({ content: [] })
+                })
+            })
+          })).pipe(Layer.provideMerge(makeServerLayer({
+            name: "HttpRequestLifecycle",
+            protocols: [McpProtocol.v2026_07_28]
+          })))
+        )
+        for (let id = 0; id < 4; id++) {
+          const response = yield* harness.post({
+            jsonrpc: "2.0",
+            id,
+            method: "tools/call",
+            params: {
+              name: "Capture",
+              arguments: {},
+              _meta: {
+                "io.modelcontextprotocol/protocolVersion": "2026-07-28",
+                "io.modelcontextprotocol/clientCapabilities": {},
+                marker: `request-${id}`
+              }
+            }
+          }, { "mcp-protocol-version": "2026-07-28", "mcp-method": "tools/call", "mcp-name": "Capture" })
+          assert.strictEqual(response.status, 200)
+          yield* Effect.promise(() => response.text())
+        }
+        assert.strictEqual(references.length, 4)
+        yield* collectGarbage
+        assert.isTrue(controls.every((ref) => ref.deref() === undefined), "GC must collect unreachable controls")
+        assert.isTrue(
+          references.every((ref) => ref.deref() === undefined),
+          "completed request metadata must be collectable"
+        )
+      })
+  )
+
+  // Cancelled reverse requests may never receive a reply. Releasing their routing state is
+  // a server lifecycle concern, so this GC regression belongs here rather than conformance.
+  // https://modelcontextprotocol.io/specification/2025-11-25/basic/utilities/cancellation#behavior-requirements
+  it.effect.skipIf(process.versions.bun !== undefined || process.versions.deno !== undefined)(
+    "should release disconnected clients when a reverse request is cancelled without a reply",
+    () =>
+      Effect.gen(function*() {
+        const refs = new Map<number, WeakRef<object>>()
+        const connected = new Set([1, 2])
+        const outbound = yield* Queue.unbounded<RpcMessage.FromServerEncoded>()
+        const disconnects = yield* Queue.unbounded<number>()
+        type Receive = (
+          clientId: number,
+          message: RpcMessage.FromClientEncoded | RpcMessage.FromServerEncoded
+        ) => Effect.Effect<void>
+        const ready = yield* Deferred.make<Receive>()
+        const cancelled = yield* Deferred.make<void>()
+        const transport = yield* RpcServer.Protocol.make((write) =>
+          Deferred.succeed(ready, write as Receive).pipe(Effect.as({
+            disconnects,
+            send: (_clientId, message) => Queue.offer(outbound, message).pipe(Effect.asVoid),
+            end: () => Effect.void,
+            clientIds: Effect.succeed(connected),
+            initialMessage: Effect.succeedNone,
+            supportsAck: false,
+            supportsTransferables: false,
+            supportsSpanPropagation: false,
+            supportsNotifications: true,
+            codecFor: Schema.toCodecJson as RpcSerialization.CodecFor
+          }))
+        )
+        const toolkit = Toolkit.make(Tool.make("Probe", {
+          success: Schema.String,
+          dependencies: [McpSchema.McpServerClient]
+        }))
+        yield* Layer.build(
+          McpServer.toolkit(toolkit).pipe(
+            Layer.provide(toolkit.toLayer({
+              Probe: () =>
+                Effect.gen(function*() {
+                  const client = yield* McpSchema.McpServerClient
+                  refs.set(client.clientId, new WeakRef(client.clientInfo))
+                  if (client.clientId === 2) return "control"
+                  yield* McpServer.elicit({ message: "Approve", schema: Schema.Struct({ approved: Schema.Boolean }) })
+                    .pipe(
+                      Effect.orDie,
+                      Effect.onInterrupt(() => Deferred.succeed(cancelled, undefined))
+                    )
+                  return "done"
+                })
+            })),
+            Layer.provide(
+              McpServer.layer({ name: "ReverseLifetime", version: "1", protocols: [McpProtocol.v2025_11_25] }).pipe(
+                Layer.provide(Layer.succeed(RpcServer.Protocol, transport))
+              )
+            )
+          )
+        )
+        const send = yield* Deferred.await(ready)
+        for (const clientId of [1, 2]) {
+          yield* send(clientId, {
+            _tag: "Request",
+            id: clientId,
+            tag: "initialize",
+            payload: {
+              protocolVersion: "2025-11-25",
+              capabilities: { elicitation: { form: {} } },
+              clientInfo: { name: `client-${clientId}`, version: "1" }
+            },
+            headers: []
+          })
+          assert.strictEqual((yield* Queue.take(outbound))._tag, "Exit")
+          yield* send(clientId, {
+            _tag: "Request",
+            id: 10 + clientId,
+            tag: "tools/call",
+            payload: { name: "Probe" },
+            headers: []
+          })
+          const outboundMessage = yield* Queue.take(outbound)
+          assert.strictEqual(outboundMessage._tag, clientId === 1 ? "Request" : "Exit")
+          if (clientId === 1) {
+            yield* send(clientId, {
+              _tag: "Request",
+              id: "",
+              tag: "notifications/cancelled",
+              isNotification: true,
+              payload: { requestId: 11 },
+              headers: []
+            })
+            yield* Deferred.await(cancelled)
+            // The reverse client emits a control Interrupt; consume it before the next connection.
+            assert.strictEqual((yield* Queue.take(outbound))._tag, "Interrupt")
+          }
+          yield* send(clientId, { _tag: "Eof" })
+          connected.delete(clientId)
+          yield* Queue.offer(disconnects, clientId)
+        }
+        // Allow the reverse-client cache to expire its 10-second idle entries.
+        yield* TestClock.adjust("11 seconds")
+        yield* collectGarbage
+        assert.strictEqual(refs.get(2)!.deref(), undefined, "control client must be collectible")
+        assert.strictEqual(refs.get(1)!.deref(), undefined, "cancelled reverse client must be collectible")
+      })
+  )
+
+  // This server interrupts non-resumable HTTP work on disconnect; this is not an MCP conformance requirement.
+  it.effect("should interrupt tool work when its non-resumable HTTP response is disconnected", () =>
+    Effect.gen(function*() {
+      const interrupted = yield* Deferred.make<void>()
+      const protocol = McpProtocol.v2025_03_26
+      const registration = Layer.effectDiscard(McpServer.McpServer.use((server) =>
+        server.addTool({
+          tool: new McpSchema.Tool({ name: "Wait", inputSchema: { type: "object" } }),
+          annotations: Context.empty(),
+          handle: () =>
+            server.notifications["notifications/message"]({ level: "error", data: "running" }).pipe(
+              Effect.andThen(Effect.never),
+              Effect.onInterrupt(() => Deferred.succeed(interrupted, void 0))
+            )
+        })
+      ))
+      const harness = yield* makeHttpHarness(registration.pipe(Layer.provideMerge(
+        makeServerLayer({ name: "HttpDisconnect", protocols: [protocol] })
+      )))
+      const headers = yield* initializeHttpSession(harness, protocol)
+      const response = yield* harness.post({
+        jsonrpc: "2.0",
+        id: "wait",
+        method: "tools/call",
+        params: { name: "Wait", arguments: {} }
+      }, headers)
+      const stream = makeMcpSseReader(response)
+      yield* Effect.addFinalizer(() => stream.cancel)
+      assert.strictEqual((yield* stream.take()).method, "notifications/message")
+      yield* stream.cancel
+      yield* Deferred.await(interrupted)
+    }))
+
+  it.effect("should frame HTTP batch notifications and results as separate SSE events", () =>
+    Effect.gen(function*() {
+      const harness = yield* makeHttpHarness(
+        Layer.effectDiscard(McpServer.McpServer.use((server) =>
+          server.addTool({
+            tool: new McpSchema.Tool({ name: "Emit", inputSchema: { type: "object" } }),
+            annotations: Context.empty(),
+            handle: () =>
+              server.notifications["notifications/message"]({ level: "error", data: "batch-log" }).pipe(
+                Effect.as(new McpSchema.CallToolResult({ content: [] }))
+              )
+          })
+        )).pipe(Layer.provideMerge(makeServerLayer({
+          name: "BatchNotificationFraming",
+          protocols: [McpProtocol.v2025_03_26]
+        })))
+      )
+      const initialized = yield* harness.post({
+        jsonrpc: "2.0",
+        id: 1,
+        method: "initialize",
+        params: {
+          protocolVersion: "2025-03-26",
+          capabilities: {},
+          clientInfo: { name: "legacy", version: "1.0.0" }
+        }
+      })
+      const sessionId = initialized.headers.get("mcp-session-id")
+      assert.isNotNull(sessionId)
+      const response = yield* harness.post([{
+        jsonrpc: "2.0",
+        id: 2,
+        method: "tools/call",
+        params: { name: "Emit" }
+      }], { "mcp-session-id": sessionId, "mcp-protocol-version": "2025-03-26" })
+      assert.strictEqual(response.status, 200)
+      const reader = makeMcpSseReader(response)
+      yield* Effect.addFinalizer(() => reader.cancel)
+      const messages: ReadonlyArray<unknown> = yield* reader.drain()
+      assert.deepStrictEqual(messages, [
+        { jsonrpc: "2.0", method: "notifications/message", params: { level: "error", data: "batch-log" } },
+        [{ jsonrpc: "2.0", id: 2, result: { content: [] } }]
+      ])
+    }))
+
+  it.effect("should honor the legacy HTTP session log level when delivering notifications", () =>
+    Effect.gen(function*() {
+      const harness = yield* makeHttpHarness(
+        Layer.effectDiscard(McpServer.McpServer.use((server) =>
+          server.addTool({
+            tool: new McpSchema.Tool({ name: "Emit", inputSchema: { type: "object" } }),
+            annotations: Context.empty(),
+            handle: () =>
+              Effect.gen(function*() {
+                yield* server.notifications["notifications/message"]({ level: "warning", data: "filtered" })
+                yield* server.notifications["notifications/message"]({ level: "error", data: "delivered" })
+                return new McpSchema.CallToolResult({ content: [] })
+              })
+          })
+        )).pipe(Layer.provideMerge(makeServerLayer({
+          name: "SessionLogLevel",
+          protocols: [McpProtocol.v2025_11_25]
+        })))
+      )
+      const initialized = yield* harness.post({
+        jsonrpc: "2.0",
+        id: 1,
+        method: "initialize",
+        params: {
+          protocolVersion: "2025-11-25",
+          capabilities: {},
+          clientInfo: { name: "legacy", version: "1.0.0" }
+        }
+      })
+      const sessionId = initialized.headers.get("mcp-session-id")
+      assert.isNotNull(sessionId)
+      const headers = { "mcp-session-id": sessionId, "mcp-protocol-version": "2025-11-25" }
+      const configured = yield* harness.post({
+        jsonrpc: "2.0",
+        id: 2,
+        method: "logging/setLevel",
+        params: { level: "error" }
+      }, headers)
+      assert.strictEqual(configured.status, 200)
+      const response = makeMcpSseReader(
+        yield* harness.post({
+          jsonrpc: "2.0",
+          id: 3,
+          method: "tools/call",
+          params: { name: "Emit" }
+        }, headers)
+      )
+      yield* Effect.addFinalizer(() => response.cancel)
+      const messages = yield* response.drain()
+      assert.deepStrictEqual(
+        messages.filter((message) => message.method === "notifications/message").map(
+          (message) => message.params
+        ),
+        [{ level: "error", data: "delivered" }]
+      )
+      assert.deepInclude(messages.at(-1), { id: 3, result: { content: [] } })
+    }))
+
+  for (const transport of ["http", "stdio"] as const) {
+    it.effect(`should reject stateless requests inside a legacy ${transport} batch`, () =>
+      Effect.gen(function*() {
+        const calls = yield* Ref.make(0)
+        const protocols = [McpProtocol.v2026_07_28, McpProtocol.v2025_03_26] as const
+        const registrations = Layer.effectDiscard(McpServer.McpServer.use((server) =>
+          server.addTool({
+            tool: new McpSchema.Tool({ name: "Count", inputSchema: { type: "object" } }),
+            annotations: Context.empty(),
+            handle: () =>
+              Ref.update(calls, (n) => n + 1).pipe(
+                Effect.as(new McpSchema.CallToolResult({ content: [] }))
+              )
+          })
+        ))
+        const batch = [{
+          jsonrpc: "2.0",
+          id: 2,
+          method: "tools/call",
+          params: {
+            name: "Count",
+            _meta: {
+              "io.modelcontextprotocol/protocolVersion": "2026-07-28",
+              "io.modelcontextprotocol/clientCapabilities": {}
+            }
+          }
+        }, { jsonrpc: "2.0", id: 3, method: "ping" }]
+        if (transport === "stdio") {
+          const fixture = yield* makeMcpStdioHarness(McpProtocol.v2025_03_26, protocols, registrations)
+          yield* fixture.initialize()
+          yield* fixture.takeFrame
+          yield* fixture.sendRaw(batch)
+          assert.deepInclude(yield* fixture.takeFrame, {
+            id: null,
+            error: { code: -32600, message: "JSON-RPC batches are not supported" }
+          })
+        } else {
+          const harness = yield* makeHttpHarness(registrations.pipe(Layer.provideMerge(makeServerLayer({
+            name: "BatchAdmission",
+            protocols
+          }))))
+          const initialized = yield* harness.post({
+            jsonrpc: "2.0",
+            id: 1,
+            method: "initialize",
+            params: {
+              protocolVersion: "2025-03-26",
+              capabilities: {},
+              clientInfo: { name: "legacy", version: "1.0.0" }
+            }
+          })
+          const sessionId = initialized.headers.get("mcp-session-id")
+          assert.isNotNull(sessionId)
+          const response = yield* harness.post(batch, {
+            "mcp-session-id": sessionId,
+            "mcp-protocol-version": "2025-03-26"
+          })
+          assert.strictEqual(response.status, 400)
+        }
+        assert.strictEqual(yield* Ref.get(calls), 0)
+      }))
+  }
+
+  it.effect("should isolate request notifications across mixed HTTP protocols", () =>
+    Effect.gen(function*() {
+      const holding = yield* Deferred.make<void>()
+      const release = yield* Deferred.make<void>()
+      const ready = yield* Deferred.make<McpServer.McpServer["Service"]>()
+      const harness = yield* makeHttpHarness(
+        Layer.effectDiscard(Effect.gen(function*() {
+          const server = yield* McpServer.McpServer
+          for (const name of ["Hold", "Emit"]) {
+            yield* server.addTool({
+              tool: new McpSchema.Tool({ name, inputSchema: { type: "object" } }),
+              annotations: Context.empty(),
+              handle: () =>
+                (name === "Hold"
+                  ? Deferred.succeed(holding, undefined).pipe(Effect.andThen(Deferred.await(release)))
+                  : Effect.gen(function*() {
+                    yield* server.notifications["notifications/message"]({ level: "error", data: "request-log" })
+                    yield* server.notifications["notifications/progress"]({ progressToken: "token", progress: 1 })
+                  })).pipe(Effect.as(new McpSchema.CallToolResult({ content: [] })))
+            })
+          }
+          yield* Deferred.succeed(ready, server)
+        })).pipe(Layer.provideMerge(makeServerLayer({
+          name: "NotificationOwnership",
+          protocols: [McpProtocol.v2026_07_28, McpProtocol.v2025_11_25]
+        })))
+      )
+      const server = yield* Deferred.await(ready)
+      const initialized = yield* harness.post({
+        jsonrpc: "2.0",
+        id: 1,
+        method: "initialize",
+        params: {
+          protocolVersion: "2025-11-25",
+          capabilities: {},
+          clientInfo: { name: "legacy", version: "1.0.0" }
+        }
+      })
+      const sessionId = initialized.headers.get("mcp-session-id")
+      assert.isNotNull(sessionId)
+      const held = yield* harness.post({
+        jsonrpc: "2.0",
+        id: 2,
+        method: "tools/call",
+        params: { name: "Hold" }
+      }, { "mcp-session-id": sessionId, "mcp-protocol-version": "2025-11-25" }).pipe(Effect.forkChild)
+      yield* Deferred.await(holding)
+      const postModern = (id: number, method: string, params: Record<string, unknown>) =>
+        harness.post({
+          jsonrpc: "2.0",
+          id,
+          method,
+          params: {
+            ...params,
+            _meta: {
+              "io.modelcontextprotocol/protocolVersion": "2026-07-28",
+              "io.modelcontextprotocol/clientCapabilities": {},
+              "io.modelcontextprotocol/logLevel": "warning",
+              progressToken: "token"
+            }
+          }
+        }, { "mcp-protocol-version": "2026-07-28", "mcp-method": method, "mcp-name": "Emit" })
+      const subscription = makeMcpSseReader(
+        yield* postModern(3, "subscriptions/listen", {
+          notifications: { toolsListChanged: true }
+        })
+      )
+      yield* Effect.addFinalizer(() => subscription.cancel)
+      assert.strictEqual((yield* subscription.take()).method, "notifications/subscriptions/acknowledged")
+      const response = makeMcpSseReader(yield* postModern(4, "tools/call", { name: "Emit" }))
+      yield* Effect.addFinalizer(() => response.cancel)
+      const messages = yield* response.drain()
+      assert.deepStrictEqual(messages.map((message) => message.method ?? message.id), [
+        "notifications/message",
+        "notifications/progress",
+        4
+      ])
+      yield* Deferred.succeed(release, undefined)
+      const unrelated = yield* Fiber.join(held)
+      assert.match(unrelated.headers.get("content-type") ?? "", /^application\/json/)
+      assert.deepInclude(yield* Effect.promise(() => unrelated.json()), { id: 2, result: { content: [] } })
+      yield* server.notifications["notifications/tools/list_changed"]({})
+      assert.strictEqual((yield* subscription.take()).method, "notifications/tools/list_changed")
+    }))
+
+  it.effect("should deliver notifications and results to other clients when one client stops reading", () =>
+    Effect.gen(function*() {
+      const outbound = yield* Queue.unbounded<{ clientId: number; message: RpcMessage.FromServerEncoded }>()
+      const disconnects = yield* Queue.unbounded<number>()
+      const blocked = yield* Deferred.make<void>()
+      const release = yield* Deferred.make<void>()
+      const ready = yield* Deferred.make<
+        (clientId: number, message: RpcMessage.FromClientEncoded) => Effect.Effect<void>
+      >()
+      const transport = yield* RpcServer.Protocol.make((write) =>
+        Deferred.succeed(ready, write).pipe(Effect.as({
+          disconnects,
+          send: (clientId, message) =>
+            Effect.gen(function*() {
+              if (
+                clientId === 1 && message._tag === "Request" && (message.payload as { data?: string }).data === "first"
+              ) {
+                yield* Deferred.succeed(blocked, undefined)
+                yield* Deferred.await(release)
+              }
+              yield* Queue.offer(outbound, { clientId, message })
+            }),
+          end: () => Effect.void,
+          clientIds: Effect.succeed(new Set([1, 2])),
+          initialMessage: Effect.succeedNone,
+          supportsAck: false,
+          supportsTransferables: false,
+          supportsSpanPropagation: false,
+          supportsNotifications: true,
+          codecFor: Schema.toCodecJson as RpcSerialization.CodecFor
+        }))
+      )
+      const context = yield* Layer.build(
+        McpServer.layer({ name: "NotificationIsolation", version: "1.0.0", protocols: [McpProtocol.v2025_11_25] })
+          .pipe(Layer.provide(Layer.succeed(RpcServer.Protocol, transport)))
+      )
+      const server = Context.get(context, McpServer.McpServer)
+      yield* server.addTool({
+        tool: new McpSchema.Tool({ name: "Log", inputSchema: { type: "object" } }),
+        annotations: Context.empty(),
+        handle: () =>
+          Effect.gen(function*() {
+            yield* Effect.forEach(["first", "second"], (data) =>
+              server.notifications["notifications/message"]({ level: "error", data }), { concurrency: "unbounded" })
+            if ((yield* McpSchema.McpRequestContext).clientId === 2) {
+              yield* server.addTool({
+                tool: new McpSchema.Tool({ name: "Dynamic", inputSchema: { type: "object" } }),
+                annotations: Context.empty(),
+                handle: () =>
+                  Effect.succeed(new McpSchema.CallToolResult({ content: [] }))
+              })
+            }
+            return new McpSchema.CallToolResult({ content: [] })
+          })
+      })
+      const take = Effect.fnUntraced(function*(clientId: number) {
+        const event = yield* Queue.take(outbound)
+        assert.strictEqual(event.clientId, clientId)
+        return event.message
+      })
+      const send = yield* Deferred.await(ready)
+      for (const clientId of [1, 2]) {
+        yield* send(clientId, {
+          _tag: "Request",
+          id: "initialize",
+          tag: "initialize",
+          headers: [],
+          payload: { protocolVersion: "2025-11-25", capabilities: {}, clientInfo: { name: "client", version: "1" } }
+        })
+        assert.deepInclude(yield* take(clientId), { _tag: "Exit", requestId: "initialize" })
+        yield* send(clientId, {
+          _tag: "Request",
+          id: "",
+          tag: "notifications/initialized",
+          payload: {},
+          headers: [],
+          isNotification: true
+        })
+      }
+      const request = { _tag: "Request", id: "log", tag: "tools/call", payload: { name: "Log" }, headers: [] } as const
+      yield* send(1, request)
+      yield* Deferred.await(blocked)
+      yield* send(2, request)
+      for (const data of ["first", "second"]) {
+        assert.deepInclude(yield* take(2), {
+          _tag: "Request",
+          tag: "notifications/message",
+          payload: { level: "error", data }
+        })
+      }
+      assert.deepInclude(yield* take(2), { _tag: "Request", tag: "notifications/tools/list_changed" })
+      assert.deepInclude(yield* take(2), { _tag: "Exit", requestId: "log" })
+      yield* Deferred.succeed(release, undefined)
+      for (const data of ["first", "second"]) {
+        assert.deepInclude(yield* take(1), {
+          _tag: "Request",
+          tag: "notifications/message",
+          payload: { level: "error", data }
+        })
+      }
+      const remaining = yield* Effect.all([take(1), take(1)])
+      assert.strictEqual(remaining.filter((message) => message._tag === "Exit").length, 1)
+      assert.deepInclude(remaining.find((message) => message._tag === "Exit"), { requestId: "log" })
+      assert.deepInclude(remaining.find((message) => message._tag === "Request"), {
+        tag: "notifications/tools/list_changed"
+      })
+    }))
+
+  it.effect("should suppress cancelled responses when a custom transport handles MCP messages", () =>
+    Effect.gen(function*() {
+      const outbound = yield* Queue.unbounded<RpcMessage.FromServerEncoded>()
+      const disconnects = yield* Queue.unbounded<number>()
+      const ready = yield* Deferred.make<
+        (clientId: number, message: RpcMessage.FromClientEncoded) => Effect.Effect<void>
+      >()
+      const transport = yield* RpcServer.Protocol.make((write) =>
+        Deferred.succeed(ready, write).pipe(Effect.as({
+          disconnects,
+          send: (_clientId, message) => Queue.offer(outbound, message).pipe(Effect.asVoid),
+          end: () => Effect.void,
+          clientIds: Effect.succeed(new Set([1])),
+          initialMessage: Effect.succeedNone,
+          supportsAck: false,
+          supportsTransferables: false,
+          supportsSpanPropagation: false,
+          supportsNotifications: true,
+          codecFor: Schema.toCodecJson as RpcSerialization.CodecFor
+        }))
+      )
+      const context = yield* Layer.build(
+        McpServer.layer({
+          name: "CustomCancellation",
+          version: "1.0.0",
+          protocols: [McpProtocol.v2025_03_26]
+        }).pipe(Layer.provide(Layer.succeed(RpcServer.Protocol, transport)))
+      )
+      const entered = yield* Deferred.make<void>()
+      const interrupted = yield* Deferred.make<void>()
+      yield* Context.get(context, McpServer.McpServer).addTool({
+        tool: new McpSchema.Tool({ name: "Wait", inputSchema: { type: "object" } }),
+        annotations: Context.empty(),
+        handle: () =>
+          Deferred.succeed(entered, void 0).pipe(
+            Effect.andThen(Effect.never),
+            Effect.onInterrupt(() => Deferred.succeed(interrupted, void 0))
+          )
+      })
+      const send = yield* Deferred.await(ready)
+      yield* send(1, {
+        _tag: "Request",
+        id: "initialize",
+        tag: "initialize",
+        payload: {
+          protocolVersion: "2025-03-26",
+          capabilities: {},
+          clientInfo: { name: "client", version: "1.0.0" }
+        },
+        headers: []
+      })
+      assert.deepInclude(yield* Queue.take(outbound), { _tag: "Exit", requestId: "initialize" })
+      yield* send(1, { _tag: "Request", id: "wait", tag: "tools/call", payload: { name: "Wait" }, headers: [] })
+      yield* Deferred.await(entered)
+      yield* send(1, {
+        _tag: "Request",
+        id: "",
+        tag: "notifications/cancelled",
+        payload: { requestId: "wait" },
+        headers: [],
+        isNotification: true
+      })
+      yield* Deferred.await(interrupted)
+      yield* send(1, { _tag: "Request", id: "ping", tag: "ping", payload: {}, headers: [] })
+      assert.deepInclude(yield* Queue.take(outbound), { _tag: "Exit", requestId: "ping" })
+    }))
+
+  it.effect("should match reverse responses to their originating connection", () =>
+    Effect.gen(function*() {
+      const outbound = yield* Queue.unbounded<{
+        readonly clientId: number
+        readonly message: RpcMessage.FromServerEncoded
+      }>()
+      const disconnects = yield* Queue.unbounded<number>()
+      type Receive = (
+        clientId: number,
+        message: RpcMessage.FromClientEncoded | RpcMessage.FromServerEncoded
+      ) => Effect.Effect<void>
+      const ready = yield* Deferred.make<Receive>()
+      const transport = yield* RpcServer.Protocol.make((write) =>
+        // MCP also receives reverse replies through the ordinary RPC client-message boundary.
+        Deferred.succeed(ready, write as Receive).pipe(Effect.as({
+          disconnects,
+          send: (clientId, message) => Queue.offer(outbound, { clientId, message }).pipe(Effect.asVoid),
+          end: () => Effect.void,
+          clientIds: Effect.succeed(new Set([1, 2])),
+          initialMessage: Effect.succeedNone,
+          supportsAck: false,
+          supportsTransferables: false,
+          supportsSpanPropagation: false,
+          supportsNotifications: true,
+          codecFor: Schema.toCodecJson as RpcSerialization.CodecFor
+        }))
+      )
+      const toolkit = Toolkit.make(Tool.make("Approve", {
+        success: Schema.Struct({ approved: Schema.Boolean }),
+        dependencies: [McpSchema.McpServerClient]
+      }))
+      yield* Layer.build(
+        McpServer.toolkit(toolkit).pipe(
+          Layer.provide(toolkit.toLayer({
+            Approve: () =>
+              McpServer.elicit({
+                message: "Approve",
+                schema: Schema.Struct({ approved: Schema.Boolean })
+              }).pipe(Effect.orDie)
+          })),
+          Layer.provide(
+            McpServer.layer({
+              name: "ResponseOwnership",
+              version: "1.0.0",
+              protocols: [McpProtocol.v2025_11_25]
+            }).pipe(Layer.provide(Layer.succeed(RpcServer.Protocol, transport)))
+          )
+        )
+      )
+      const send = yield* Deferred.await(ready)
+      for (const clientId of [1, 2]) {
+        yield* send(clientId, {
+          _tag: "Request",
+          id: clientId,
+          tag: "initialize",
+          payload: {
+            protocolVersion: "2025-11-25",
+            capabilities: { elicitation: { form: {} } },
+            clientInfo: { name: `client-${clientId}`, version: "1.0.0" }
+          },
+          headers: []
+        })
+        assert.strictEqual((yield* Queue.take(outbound)).message._tag, "Exit")
+      }
+      yield* send(1, { _tag: "Request", id: 10, tag: "tools/call", payload: { name: "Approve" }, headers: [] })
+      const reverse = yield* Queue.take(outbound)
+      assert.strictEqual(reverse.clientId, 1)
+      if (reverse.message._tag !== "Request") return assert.fail("Expected an elicitation request")
+      assert.strictEqual(reverse.message.tag, "elicitation/create")
+      const requestId = reverse.message.id
+      for (const clientId of [2, 1]) {
+        yield* send(clientId, {
+          _tag: "Exit",
+          requestId,
+          exit: { _tag: "Success", value: { action: "accept", content: { approved: clientId === 1 } } }
+        })
+      }
+      const result = yield* Queue.take(outbound)
+      assert.strictEqual(result.clientId, 1)
+      assert.deepInclude(result.message, { _tag: "Exit", requestId: 10 })
+      if (result.message._tag !== "Exit" || result.message.exit._tag !== "Success") {
+        return assert.fail("Expected the tool to complete")
+      }
+      const decoded = yield* Schema.decodeUnknownEffect(McpSchema.CallToolResult)(result.message.exit.value)
+      assert.deepStrictEqual(decoded.structuredContent, { approved: true })
+    }))
+
   describe("direct service", () => {
+    it.effect("should return from completion notification when no transport is running", () =>
+      Effect.gen(function*() {
+        const server = yield* McpServer.McpServer.make
+        yield* server.notifyElicitationComplete({ clientId: 0, elicitationId: "not-connected" })
+      }))
+
+    it.effect("inlines identified elicitation schemas", () =>
+      Effect.gen(function*() {
+        let observed: Parameters<McpSchema.McpReverseClient["elicit"]>[0] | undefined
+        const reverseClient: McpSchema.McpReverseClient = {
+          listRoots: () => Effect.die("Not used"),
+          createMessage: () => Effect.die("Not used"),
+          elicit: (request) => {
+            observed = request
+            return Effect.succeed({ action: "accept", content: { name: "Ada" } })
+          }
+        }
+        const client = McpSchema.McpServerClient.of({
+          clientId: 1,
+          protocolVersion: "2025-11-25",
+          clientCapabilities: { elicitation: { form: {} } },
+          clientInfo: { name: "client", version: "1" },
+          initializePayload: {
+            protocolVersion: "2025-11-25",
+            capabilities: { elicitation: { form: {} } },
+            clientInfo: { name: "client", version: "1" }
+          },
+          getClient: Effect.succeed(reverseClient)
+        })
+
+        const result = yield* McpServer.elicit({
+          message: "Profile",
+          schema: Schema.Struct({ name: Schema.String }).annotate({ identifier: "Profile" })
+        }).pipe(Effect.provideService(McpSchema.McpServerClient, client))
+
+        assert.deepStrictEqual(result, { name: "Ada" })
+        assert.isDefined(observed)
+        if (observed.mode !== "form") return assert.fail("Expected a form elicitation request")
+        assert.deepStrictEqual(JSON.parse(JSON.stringify(observed.requestedSchema)), {
+          type: "object",
+          properties: { name: { type: "string" } },
+          required: ["name"]
+        })
+      }))
+
+    describe("registration context", () => {
+      class RegistrationLabel extends Context.Service<RegistrationLabel, string>()("test/RegistrationLabel") {}
+
+      const client = (clientId: number, name: string) =>
+        McpSchema.McpServerClient.of({
+          clientId,
+          protocolVersion: "2025-06-18",
+          clientCapabilities: {},
+          clientInfo: { name, version: "1" },
+          initializePayload: {
+            protocolVersion: "2025-06-18",
+            capabilities: {},
+            clientInfo: { name, version: "1" }
+          },
+          requestMetadata: { owner: name },
+          getClient: Effect.die("No reverse requests are needed")
+        })
+
+      const alice = client(1, "Alice")
+      const bob = client(2, "Bob")
+      const currentOwner = Effect.gen(function*() {
+        const request = yield* McpSchema.McpRequestContext
+        const label = yield* RegistrationLabel
+        return `${label}:${request.clientId}:${request.clientInfo?.name}:${request.requestMetadata?.owner}`
+      })
+
+      const toolkit = Toolkit.make(Tool.make("owner", {
+        success: Schema.String,
+        dependencies: [McpSchema.McpRequestContext, RegistrationLabel]
+      }))
+
+      // Registration captures application services, but each invocation owns its request identity.
+      // This contract belongs to the public server helpers rather than wire conformance.
+      const makeRegisteredServer = Effect.gen(function*() {
+        const server = yield* McpServer.McpServer.make
+        yield* server.addTool({
+          tool: new McpSchema.Tool({ name: "register", inputSchema: { type: "object" } }),
+          annotations: Context.empty(),
+          handle: () =>
+            Effect.gen(function*() {
+              yield* McpServer.registerResource({ uri: "file:///owner", name: "owner", content: currentOwner })
+              yield* McpServer.registerResource`file:///owners/${Schema.String}`({
+                name: "owners",
+                content: () => currentOwner,
+                completion: { param0: () => Effect.map(currentOwner, (owner) => [owner]) }
+              })
+              yield* McpServer.registerPrompt({
+                name: "owner",
+                parameters: { name: Schema.String },
+                content: () => currentOwner,
+                completion: { name: () => Effect.map(currentOwner, (owner) => [owner]) }
+              })
+              yield* McpServer.registerToolkit(toolkit).pipe(
+                Effect.provide(toolkit.toLayer({ owner: () => currentOwner }))
+              )
+              return new McpSchema.CallToolResult({ content: [] })
+            }).pipe(
+              Effect.provideService(McpServer.McpServer, server),
+              Effect.provideService(RegistrationLabel, "registered")
+            )
+        })
+        yield* server.callTool({ name: "register" }).pipe(Effect.provideService(McpSchema.McpServerClient, alice))
+        return server
+      })
+
+      const expectedOwner = "registered:2:Bob:Bob"
+
+      it.effect("should use the current request when a resource was registered by another client", () =>
+        Effect.gen(function*() {
+          const server = yield* makeRegisteredServer
+          const result = yield* server.findResource("file:///owner").pipe(
+            Effect.provideService(McpSchema.McpServerClient, bob),
+            Effect.provideService(RegistrationLabel, "invocation")
+          )
+          assert.deepStrictEqual(result.contents, [{ uri: "file:///owner", text: expectedOwner }])
+        }))
+
+      it.effect("should use the current request when a resource template was registered by another client", () =>
+        Effect.gen(function*() {
+          const server = yield* makeRegisteredServer
+          const result = yield* server.findResource("file:///owners/bob").pipe(
+            Effect.provideService(McpSchema.McpServerClient, bob),
+            Effect.provideService(RegistrationLabel, "invocation")
+          )
+          assert.deepStrictEqual(result.contents, [{ uri: "file:///owners/bob", text: expectedOwner }])
+        }))
+
+      it.effect("should use the current request when a prompt was registered by another client", () =>
+        Effect.gen(function*() {
+          const server = yield* makeRegisteredServer
+          const result = yield* server.getPromptResult({ name: "owner", arguments: { name: "bob" } }).pipe(
+            Effect.provideService(McpSchema.McpServerClient, bob),
+            Effect.provideService(RegistrationLabel, "invocation")
+          )
+          assert.deepStrictEqual(result.messages, [{ role: "user", content: { type: "text", text: expectedOwner } }])
+        }))
+
+      it.effect("should use the current request when a resource completion was registered by another client", () =>
+        Effect.gen(function*() {
+          const server = yield* makeRegisteredServer
+          const result = yield* server.completion({
+            ref: { type: "ref/resource", uri: "file:///owners/{param0}" },
+            argument: { name: "param0", value: "b" }
+          }).pipe(
+            Effect.provideService(McpSchema.McpServerClient, bob),
+            Effect.provideService(RegistrationLabel, "invocation")
+          )
+          assert.deepStrictEqual(result.completion.values, [expectedOwner])
+        }))
+
+      it.effect("should use the current request when a prompt completion was registered by another client", () =>
+        Effect.gen(function*() {
+          const server = yield* makeRegisteredServer
+          const result = yield* server.completion({
+            ref: { type: "ref/prompt", name: "owner" },
+            argument: { name: "name", value: "b" }
+          }).pipe(
+            Effect.provideService(McpSchema.McpServerClient, bob),
+            Effect.provideService(RegistrationLabel, "invocation")
+          )
+          assert.deepStrictEqual(result.completion.values, [expectedOwner])
+        }))
+
+      it.effect("should use the current request when a toolkit was registered by another client", () =>
+        Effect.gen(function*() {
+          const server = yield* makeRegisteredServer
+          const result = yield* server.callTool({ name: "owner" }).pipe(
+            Effect.provideService(McpSchema.McpServerClient, bob),
+            Effect.provideService(RegistrationLabel, "invocation")
+          )
+          assert.strictEqual(result.isError, false)
+          assert.strictEqual(result.structuredContent, expectedOwner)
+        }))
+    })
+
+    it.effect("should complete notification-emitting tools without a running transport", () =>
+      Effect.gen(function*() {
+        const server = yield* McpServer.McpServer.make
+        yield* server.addTool({
+          tool: new McpSchema.Tool({ name: "Emit", inputSchema: { type: "object" } }),
+          annotations: Context.empty(),
+          handle: () =>
+            server.notifications["notifications/message"]({ level: "error", data: "diagnostic" }).pipe(
+              Effect.as(new McpSchema.CallToolResult({ content: [] }))
+            )
+        })
+        const result = yield* server.callTool({ name: "Emit" }).pipe(
+          Effect.provideService(McpSchema.McpServerClient, directClient)
+        )
+        assert.deepStrictEqual(result.content, [])
+      }))
+
     it.effect("should fail when a resource URI is unknown", () =>
       Effect.gen(function*() {
         const server = yield* McpServer.McpServer.make
@@ -191,6 +1262,22 @@ describe("McpServer", () => {
         assert.strictEqual(error.message, "Resource 'file:///unknown' not found")
       }))
 
+    it.effect("should resolve an HTTP resource template", () =>
+      Effect.gen(function*() {
+        const server = yield* McpServer.McpServer.make
+        yield* McpServer.registerResource`https://example.test/docs/${Schema.String}`({
+          name: "document",
+          content: (_uri, name) => Effect.succeed(name)
+        }).pipe(Effect.provideService(McpServer.McpServer, server))
+
+        const uri = "https://example.test/docs/alice"
+        const result = yield* server.findResource(uri).pipe(
+          Effect.provideService(McpSchema.McpServerClient, directClient)
+        )
+
+        assert.deepStrictEqual(result.contents, [{ uri, text: "alice" }])
+      }))
+
     it.effect("should preserve a registered resource handler's typed failure", () =>
       Effect.gen(function*() {
         const server = yield* McpServer.McpServer.make
@@ -212,6 +1299,28 @@ describe("McpServer", () => {
         assert.strictEqual(error, failure)
       }))
 
+    it.effect("should pass decoded values to prompt handlers", () =>
+      Effect.gen(function*() {
+        const server = yield* McpServer.McpServer.make
+        yield* McpServer.registerPrompt({
+          name: "count",
+          parameters: { count: Schema.FiniteFromString },
+          completion: { count: () => Effect.succeed([13]) },
+          content: ({ count }) => Effect.succeed(count.toFixed(0))
+        }).pipe(Effect.provideService(McpServer.McpServer, server))
+
+        const result = yield* server.getPromptResult({ name: "count", arguments: { count: "12" } }).pipe(
+          Effect.provideService(McpSchema.McpServerClient, directClient)
+        )
+        const completion = yield* server.completion({
+          ref: { type: "ref/prompt", name: "count" },
+          argument: { name: "count", value: "1" }
+        }).pipe(Effect.provideService(McpSchema.McpServerClient, directClient))
+
+        assert.deepStrictEqual(result.messages, [{ role: "user", content: { type: "text", text: "12" } }])
+        assert.deepStrictEqual(completion.completion.values, ["13"])
+      }))
+
     it.effect("should pass undefined to a low-level tool handler when arguments are omitted", () =>
       Effect.gen(function*() {
         const server = yield* McpServer.McpServer.make
@@ -237,6 +1346,30 @@ describe("McpServer", () => {
 
         assert.isUndefined(received)
       }))
+
+    it.effect("should provide the neutral request service to handlers", () =>
+      Effect.gen(function*() {
+        const server = yield* McpServer.McpServer.make
+        let received: string | undefined
+        yield* server.addTool({
+          tool: new McpSchema.Tool({
+            name: "request-services",
+            inputSchema: { type: "object" }
+          }),
+          annotations: Context.empty(),
+          handle: () =>
+            McpSchema.McpRequestContext.useSync((request) => {
+              received = request.protocolVersion
+              return new McpSchema.CallToolResult({ content: [] })
+            })
+        })
+
+        yield* server.callTool({ name: "request-services" }).pipe(
+          Effect.provideService(McpSchema.McpServerClient, directClient)
+        )
+
+        assert.strictEqual(received, "2025-06-18")
+      }))
   })
 
   it.effect("should reject browser Origins by default while accepting Origin-less clients", () =>
@@ -311,9 +1444,186 @@ describe("McpServer", () => {
     }))
 
   describe("registerToolkit", () => {
+    it.effect("registers non-strict tools with identified input schemas", () =>
+      Effect.gen(function*() {
+        const IdentifiedTool = Tool.make("IdentifiedTool", {
+          parameters: Schema.Struct({ value: Schema.String }).annotate({ identifier: "Input / ~ %" }),
+          success: Schema.String
+        })
+        const toolkit = Toolkit.make(IdentifiedTool)
+        const server = yield* McpServer.McpServer.make
+        yield* McpServer.registerToolkit(toolkit).pipe(
+          Effect.provideService(McpServer.McpServer, server),
+          Effect.provide(toolkit.toLayer({ IdentifiedTool: ({ value }) => Effect.succeed(value) }))
+        )
+
+        const { inputSchema } = server.tools[0].tool
+        assert.strictEqual(inputSchema.type, "object")
+        assert.deepStrictEqual(inputSchema.properties, { value: { type: "string" } })
+        assert.strictEqual(inputSchema.additionalProperties, true)
+
+        const result = yield* server.callTool({
+          name: "IdentifiedTool",
+          arguments: { value: "ok", typo: true }
+        }).pipe(Effect.provideService(McpSchema.McpServerClient, directClient))
+
+        assert.strictEqual(toolResultText(result), JSON.stringify("ok"))
+      }))
+
+    it.effect("registers tools with identified output schemas", () =>
+      Effect.gen(function*() {
+        const IdentifiedResultTool = Tool.make("IdentifiedResultTool", {
+          success: Schema.Struct({ value: Schema.String }).annotate({ identifier: "IdentifiedResult" })
+        })
+        const toolkit = Toolkit.make(IdentifiedResultTool)
+        const server = yield* McpServer.McpServer.make
+        yield* McpServer.registerToolkit(toolkit).pipe(
+          Effect.provideService(McpServer.McpServer, server),
+          Effect.provide(toolkit.toLayer({
+            IdentifiedResultTool: () => Effect.succeed({ value: "ok" })
+          }))
+        )
+
+        assert.deepStrictEqual(server.tools[0].tool.outputSchema, {
+          type: "object",
+          properties: { value: { type: "string" } },
+          required: ["value"],
+          additionalProperties: true,
+          $defs: {
+            IdentifiedResult: {
+              type: "object",
+              properties: { value: { type: "string" } },
+              required: ["value"],
+              additionalProperties: true
+            }
+          }
+        })
+      }))
+
+    it.effect("advertises closed strict input schemas with escaped identifiers", () =>
+      Effect.gen(function*() {
+        const { client } = yield* makeToolkitTestClient()
+
+        const listed = yield* client["tools/list"]({})
+        const tool = listed.tools.find((tool) => tool.name === "StrictObjectTool")
+        assert.isDefined(tool)
+        assert.strictEqual(tool.inputSchema.type, "object")
+        assert.strictEqual(tool.inputSchema.additionalProperties, false)
+        assert.deepInclude(tool.inputSchema.properties, {
+          config: {
+            type: "object",
+            properties: { value: { type: "string" } },
+            required: ["value"],
+            additionalProperties: false
+          }
+        })
+      }))
+
+    it.effect("validates strict return-mode arguments before invoking the handler and decodes them once", () =>
+      Effect.gen(function*() {
+        let handlerInvoked = false
+        const { client } = yield* makeToolkitTestClient(TestToolkit.of({
+          ...testToolkitHandlers,
+          StrictObjectTool: ({ config }) => {
+            handlerInvoked = true
+            return Effect.succeed(config.value.toFixed(0))
+          }
+        }))
+
+        for (
+          const args of [
+            { config: { value: "1" }, typo: true },
+            { config: { value: "1", typo: true } },
+            { config: { value: 1 } }
+          ]
+        ) {
+          const error = yield* client["tools/call"]({
+            name: "StrictObjectTool",
+            arguments: args
+          }).pipe(Effect.flip)
+
+          assert.isFalse(handlerInvoked)
+          assertTrue("code" in error)
+          assert.strictEqual(error.code, McpSchema.INVALID_PARAMS_ERROR_CODE)
+          assert.include(error.message, "Invalid parameters for tool 'StrictObjectTool'")
+          assert.notMatch(error.message, /AiError|ToolParameterValidationError|Toolkit/)
+        }
+        const result = yield* client["tools/call"]({
+          name: "StrictObjectTool",
+          arguments: { config: { value: "1" } }
+        })
+        assert.isTrue(handlerInvoked)
+        assert.strictEqual(toolResultText(result), JSON.stringify("1"))
+      }))
+
+    it.effect("dies on strict raw JSON Schema tools before registering any tools", () =>
+      Effect.gen(function*() {
+        const ValidTool = Tool.make("ValidTool", { success: Schema.String })
+        const DynamicTool = Tool.dynamic("DynamicTool", {
+          parameters: { type: "object" },
+          success: Schema.String
+        }).annotate(Tool.Strict, true)
+        const toolkit = Toolkit.make(ValidTool, DynamicTool)
+        const server = yield* McpServer.McpServer.make
+
+        const exit = yield* McpServer.registerToolkit(toolkit).pipe(
+          Effect.provideService(McpServer.McpServer, server),
+          Effect.provide(toolkit.toLayer({
+            ValidTool: () => Effect.succeed("ok"),
+            DynamicTool: () => Effect.succeed("ok")
+          })),
+          Effect.exit
+        )
+
+        assertTrue(exit._tag === "Failure")
+        assert.isTrue(Cause.hasDies(exit.cause))
+        assert.match(
+          String(Cause.squash(exit.cause)),
+          /cannot strictly validate the raw JSON Schema for tool 'DynamicTool'/
+        )
+        assert.deepStrictEqual(server.tools, [])
+      }))
+
+    it.effect("preserves existing tools when a later toolkit schema is invalid for MCP", () =>
+      Effect.gen(function*() {
+        const ValidTool = Tool.make("ValidTool", { success: Schema.String })
+        const InvalidTool = Tool.make("InvalidTool", {
+          parameters: Schema.String,
+          success: Schema.String
+        }).annotate(Tool.Strict, true)
+        const toolkit = Toolkit.make(ValidTool, InvalidTool)
+        const server = yield* McpServer.McpServer.make
+        yield* server.addTool({
+          tool: new McpSchema.Tool({ name: "ValidTool", inputSchema: { type: "object" } }),
+          annotations: Context.empty(),
+          handle: () =>
+            Effect.succeed(
+              new McpSchema.CallToolResult({
+                content: [{ type: "text", text: "existing" }]
+              })
+            )
+        })
+
+        const exit = yield* McpServer.registerToolkit(toolkit).pipe(
+          Effect.provideService(McpServer.McpServer, server),
+          Effect.provide(toolkit.toLayer({
+            ValidTool: () => Effect.succeed("replacement"),
+            InvalidTool: () => Effect.succeed("invalid")
+          })),
+          Effect.exit
+        )
+        const existing = yield* server.callTool({ name: "ValidTool" }).pipe(
+          Effect.provideService(McpSchema.McpServerClient, directClient)
+        )
+
+        assertTrue(exit._tag === "Failure")
+        assert.deepStrictEqual(server.tools.map(({ tool }) => tool.name), ["ValidTool"])
+        assert.deepStrictEqual(existing.content, [{ type: "text", text: "existing" }])
+      }))
+
     it.effect("lists output schemas only for structured tool results", () =>
       Effect.gen(function*() {
-        const client = yield* makeToolkitTestClient()
+        const { client } = yield* makeToolkitTestClient()
 
         const result = yield* client["tools/list"]({})
         const structuredTool = result.tools.find((tool) => tool.name === "StructuredResultTool")
@@ -325,7 +1635,7 @@ describe("McpServer", () => {
           type: "object",
           properties: { answer: { type: "string" } },
           required: ["answer"],
-          additionalProperties: false
+          additionalProperties: true
         })
         assertTrue(scalarTool !== undefined)
         assert.isFalse("outputSchema" in scalarTool)
@@ -338,7 +1648,7 @@ describe("McpServer", () => {
     it.effect("returns concise parameter-validation errors without invoking the handler", () =>
       Effect.gen(function*() {
         let handlerInvoked = false
-        const client = yield* makeToolkitTestClient(TestToolkit.of({
+        const { client, reported } = yield* makeToolkitTestClient(TestToolkit.of({
           ...testToolkitHandlers,
           OptionalStringTool: ({ signature }) => {
             handlerInvoked = true
@@ -357,12 +1667,19 @@ describe("McpServer", () => {
         assert.match(error.message, /Invalid parameters for tool 'OptionalStringTool'/)
         assert.match(error.message, /Expected string \| undefined/)
         assert.match(error.message, /at \["signature"\]/)
+        assert.lengthOf(reported, 1)
+        assert.isTrue(Cause.hasFails(reported[0]))
+        assert.deepInclude(Cause.squash(reported[0]), {
+          _tag: "ProtocolError",
+          code: McpSchema.INVALID_PARAMS_ERROR_CODE,
+          message: error.message
+        })
       }))
 
     it.effect("preserves successful results when optional parameters are omitted", () =>
       Effect.gen(function*() {
         let handlerInvoked = false
-        const client = yield* makeToolkitTestClient(TestToolkit.of({
+        const { client } = yield* makeToolkitTestClient(TestToolkit.of({
           ...testToolkitHandlers,
           OptionalStringTool: ({ signature }) => {
             handlerInvoked = true
@@ -387,7 +1704,7 @@ describe("McpServer", () => {
 
     it.effect("keeps void tool results successful", () =>
       Effect.gen(function*() {
-        const client = yield* makeToolkitTestClient()
+        const { client, reported } = yield* makeToolkitTestClient()
 
         const result = yield* client["tools/call"]({
           name: "UntypedTool",
@@ -401,11 +1718,12 @@ describe("McpServer", () => {
             content: []
           })
         )
+        assert.deepStrictEqual(reported, [])
       }))
 
     it.effect("carries object tool results as structured content", () =>
       Effect.gen(function*() {
-        const client = yield* makeToolkitTestClient()
+        const { client } = yield* makeToolkitTestClient()
 
         const result = yield* client["tools/call"]({
           name: "StructuredResultTool",
@@ -421,7 +1739,7 @@ describe("McpServer", () => {
 
     it.effect("omits structured content for null and array tool results", () =>
       Effect.gen(function*() {
-        const client = yield* makeToolkitTestClient()
+        const { client } = yield* makeToolkitTestClient()
 
         const nullResult = yield* client["tools/call"]({
           name: "NullableResultTool",
@@ -445,7 +1763,7 @@ describe("McpServer", () => {
 
     it.effect("returns schema-validated messages for declared handler failures", () =>
       Effect.gen(function*() {
-        const client = yield* makeToolkitTestClient()
+        const { client, logged, reported } = yield* makeToolkitTestClient()
 
         const result = yield* client["tools/call"]({
           name: "PublicFailureTool",
@@ -455,11 +1773,121 @@ describe("McpServer", () => {
         assert.strictEqual(result.isError, true)
         const text = toolResultText(result)
         assert.strictEqual(text, "Public failure")
+        assert.isUndefined(result.structuredContent)
+        assert.deepStrictEqual(reported, [])
+        assert.deepStrictEqual(logged, [])
+      }))
+
+    it.effect("encodes declared non-Error failures without structured content or internal diagnostics", () =>
+      Effect.gen(function*() {
+        const { client, logged, reported } = yield* makeToolkitTestClient()
+        const result = yield* client["tools/call"]({ name: "StructuredFailureTool" })
+
+        assert.isTrue(result.isError)
+        assert.isUndefined(result.structuredContent)
+        assert.deepStrictEqual(result.content, [{
+          type: "text",
+          text: JSON.stringify({ reason: "busy", retryAfter: "5" })
+        }])
+        assert.deepStrictEqual(reported, [])
+        assert.deepStrictEqual(logged, [])
+      }))
+
+    it.effect("scrubs and records serialization failures in declared non-Error failures", () =>
+      Effect.gen(function*() {
+        const { client, logged, reported } = yield* makeToolkitTestClient(TestToolkit.of({
+          ...testToolkitHandlers,
+          StructuredFailureTool: () => Effect.fail({ reason: "busy", retryAfter: 5, detail: 1n })
+        }))
+        const result = yield* client["tools/call"]({ name: "StructuredFailureTool" })
+
+        assert.isTrue(result.isError)
+        assert.isUndefined(result.structuredContent)
+        assert.deepStrictEqual(result.content, [{ type: "text", text: INTERNAL_TOOL_ERROR_MESSAGE }])
+        assert.lengthOf(reported, 1)
+        assert.instanceOf(Cause.squash(reported[0]), TypeError)
+        assert.lengthOf(logged, 1)
+        assert.strictEqual(Cause.squash(logged[0]), Cause.squash(reported[0]))
       }))
 
+    for (
+      const [origin, failureMode] of [
+        ["handler", "error"],
+        ["handler", "return"],
+        ["ToolResultEncodingError", "error"],
+        ["InvalidToolResultError", "return"]
+      ] as const
+    ) {
+      it.effect(`distinguishes ${origin} failures from decoding failures in ${failureMode} mode`, () =>
+        Effect.gen(function*() {
+          let receivedValue: string | undefined
+          const reported: Array<Cause.Cause<unknown>> = []
+          const logged: Array<Cause.Cause<unknown>> = []
+          const failure = AiError.make({
+            module: "Toolkit",
+            method: "NestedTool.handle",
+            reason: new AiError.ToolParameterValidationError({
+              toolName: "NestedTool",
+              description: "Nested arguments failed validation"
+            })
+          })
+          const toolkit = Toolkit.make(Tool.make("OriginTool", {
+            parameters: Schema.Struct({ value: Schema.String }),
+            success: Schema.Struct({ answer: Schema.String.check(Schema.isMinLength(10)) }),
+            failure: AiError.AiError,
+            failureMode
+          }))
+          const server = yield* McpServer.McpServer.make
+          yield* McpServer.registerToolkit(toolkit).pipe(
+            Effect.provideService(McpServer.McpServer, server),
+            Effect.provide(toolkit.toLayer({
+              OriginTool: ({ value }) => {
+                receivedValue = value
+                return origin === "handler" ? Effect.fail(failure) : origin === "ToolResultEncodingError"
+                  ? Effect.succeed({ answer: "short" })
+                  : Schema.decodeUnknownEffect(Schema.Struct({ answer: Schema.String }))({ privateDetail: "invalid" })
+                    .pipe(
+                      Effect.mapError((error) => error as never)
+                    )
+              }
+            })),
+            Effect.provide(ErrorReporter.layer([ErrorReporter.make(({ cause }) => {
+              reported.push(cause)
+            })])),
+            Effect.provide(Logger.layer([Logger.make(({ cause, logLevel }) => {
+              if (logLevel === "Error") logged.push(cause)
+            })]))
+          )
+          const result = yield* server.callTool({ name: "OriginTool", arguments: { value: "valid" } }).pipe(
+            Effect.provideService(McpSchema.McpServerClient, directClient)
+          )
+
+          assert.strictEqual(receivedValue, "valid")
+          assert.isTrue(result.isError)
+          assert.isUndefined(result.structuredContent)
+          if (origin === "handler") {
+            assert.strictEqual(
+              toolResultText(result),
+              failureMode === "error"
+                ? failure.message
+                : JSON.stringify(yield* Schema.encodeEffect(AiError.AiError)(failure))
+            )
+            assert.deepStrictEqual(reported, [])
+            assert.deepStrictEqual(logged, [])
+          } else {
+            assert.strictEqual(toolResultText(result), INTERNAL_TOOL_ERROR_MESSAGE)
+            assert.lengthOf(reported, 1)
+            const error = Cause.squash(reported[0])
+            assertTrue(AiError.isAiError(error))
+            assert.strictEqual(error.reason._tag, origin)
+            assert.lengthOf(logged, 1)
+          }
+        }))
+    }
+
     it.effect("returns a generic message for non-validation AiError failures", () =>
       Effect.gen(function*() {
-        const client = yield* makeToolkitTestClient()
+        const { client, logged, reported } = yield* makeToolkitTestClient()
 
         const result = yield* client["tools/call"]({
           name: "InternalAiErrorTool",
@@ -469,25 +1897,57 @@ describe("McpServer", () => {
         assert.strictEqual(result.isError, true)
         const text = toolResultText(result)
         assert.strictEqual(text, INTERNAL_TOOL_ERROR_MESSAGE)
+        assert.lengthOf(reported, 1)
+        assert.isTrue(Cause.hasFails(reported[0]))
+        assert.strictEqual(Cause.squash(reported[0]), internalAiError)
+        assert.lengthOf(logged, 1)
+        assert.strictEqual(Cause.squash(logged[0]), internalAiError)
       }))
 
-    it.effect("returns a generic message for handler defects", () =>
+    for (const reportErrors of [true, false]) {
+      it.effect(`logs handler defects with reportErrors=${reportErrors} and scrubs the client message`, () =>
+        Effect.gen(function*() {
+          const { client, logged, reported } = yield* makeToolkitTestClient(undefined, { reportErrors })
+
+          const result = yield* client["tools/call"]({
+            name: "DefectTool",
+            arguments: {}
+          })
+
+          assert.strictEqual(result.isError, true)
+          const text = toolResultText(result)
+          assert.strictEqual(text, INTERNAL_TOOL_ERROR_MESSAGE)
+          assert.isUndefined(result.structuredContent)
+          assert.lengthOf(reported, reportErrors ? 1 : 0)
+          if (reportErrors) {
+            assert.isTrue(Cause.hasDies(reported[0]))
+            assert.strictEqual(Cause.squash(reported[0]), privateDefect)
+          }
+          assert.lengthOf(logged, 1)
+          assert.isTrue(Cause.hasDies(logged[0]))
+          assert.strictEqual(Cause.squash(logged[0]), privateDefect)
+        }))
+    }
+
+    it.effect("reports response serialization defects before returning a generic message", () =>
       Effect.gen(function*() {
-        const client = yield* makeToolkitTestClient()
+        const { client, reported } = yield* makeToolkitTestClient()
 
         const result = yield* client["tools/call"]({
-          name: "DefectTool",
+          name: "UnserializableResultTool",
           arguments: {}
         })
 
         assert.strictEqual(result.isError, true)
-        const text = toolResultText(result)
-        assert.strictEqual(text, INTERNAL_TOOL_ERROR_MESSAGE)
+        assert.strictEqual(toolResultText(result), INTERNAL_TOOL_ERROR_MESSAGE)
+        assert.lengthOf(reported, 1)
+        assert.isTrue(Cause.hasDies(reported[0]))
+        assert.instanceOf(Cause.squash(reported[0]), TypeError)
       }))
 
     it.effect("keeps unknown tools as protocol errors", () =>
       Effect.gen(function*() {
-        const client = yield* makeToolkitTestClient()
+        const { client } = yield* makeToolkitTestClient()
 
         const error = yield* client["tools/call"]({
           name: "UnknownTool",
@@ -724,8 +2184,223 @@ describe("McpServer", () => {
       }))
   })
 
+  describe("list-change notification scheduling", () => {
+    it.effect("should coalesce notifications when one registration kind changes repeatedly in a scheduling window", () =>
+      Effect.gen(function*() {
+        const fixture = yield* makeMcpStdioHarness(McpProtocol.v2026_07_28)
+        const makeTool = (name: string) => ({
+          tool: new McpSchema.Tool({ name, inputSchema: { type: "object", properties: {} } }),
+          annotations: Context.empty(),
+          handle: () => Effect.succeed(new McpSchema.CallToolResult({ content: [] }))
+        })
+        const makePrompt = (name: string) => ({
+          prompt: new McpSchema.Prompt({ name }),
+          annotations: Context.empty(),
+          completions: {},
+          handle: () =>
+            Effect.succeed(
+              new McpSchema.GetPromptResult({
+                messages: [{ role: "user", content: { type: "text", text: name } }]
+              })
+            )
+        })
+
+        yield* fixture.server.addTool(makeTool("baseline-tool"))
+        yield* fixture.server.addPrompt(makePrompt("baseline-prompt"))
+        yield* fixture.flushListChanged
+        yield* fixture.initialize()
+        const subscription = yield* fixture.startRequest("subscriptions/listen", {
+          notifications: { toolsListChanged: true, promptsListChanged: true }
+        }, "coalesced-list-change")
+        assert.strictEqual((yield* fixture.takeMessage).method, "notifications/subscriptions/acknowledged")
+
+        yield* fixture.server.addTool(makeTool("coalesced-tool-first"))
+        yield* fixture.server.addTool(makeTool("coalesced-tool-second"))
+        yield* fixture.server.addPrompt(makePrompt("coalescing-sentinel"))
+        yield* fixture.flushListChanged
+
+        assert.strictEqual((yield* fixture.takeMessage).method, "notifications/tools/list_changed")
+        assert.strictEqual((yield* fixture.takeMessage).method, "notifications/prompts/list_changed")
+
+        yield* fixture.server.addTool(makeTool("next-window-tool"))
+        yield* fixture.flushListChanged
+        assert.strictEqual((yield* fixture.takeMessage).method, "notifications/tools/list_changed")
+
+        yield* subscription.cancel()
+      }))
+  })
+
   describe("resource subscriptions", () => {
-    it.effect("should isolate resource update subscriptions between sessions", () =>
+    // Releasing the upstream listener on overflow is this server's memory-bound policy,
+    // not an MCP conformance requirement. Transport writes may stay blocked indefinitely.
+    for (const blockedWrite of ["acknowledgment", "cancellation"] as const) {
+      it.effect(`should release the overflowing listener when its ${blockedWrite} write remains blocked`, () =>
+        Effect.gen(function*() {
+          const core = yield* McpCore.make
+          const events = yield* PubSub.unbounded<McpProtocolInternal.CanonicalServerNotification>()
+          const acknowledgmentStarted = yield* Deferred.make<void>()
+          const releaseWrite = yield* Deferred.make<void>()
+          const overflowed = yield* Deferred.make<void>()
+          const subscriptionReleased = yield* Deferred.make<void>()
+          const sent = yield* Queue.unbounded<"acknowledged" | "cancelled">()
+          const handlers = McpProtocol2026.makeHandlers(core, undefined, {
+            subscribeServerNotifications: Effect.acquireRelease(
+              PubSub.subscribe(events),
+              () => Deferred.succeed(subscriptionReleased, undefined)
+            ),
+            sendNotification: (_protocolVersion, _clientId, notification) =>
+              notification.tag === McpSchema2026.SubscriptionsAcknowledgedNotification._tag
+                ? Deferred.succeed(acknowledgmentStarted, undefined).pipe(
+                  Effect.andThen(blockedWrite === "acknowledgment" ? Deferred.await(releaseWrite) : Effect.void),
+                  Effect.andThen(Queue.offer(sent, "acknowledged")),
+                  Effect.asVoid
+                )
+                : Effect.never,
+            markSubscriptionCancelled: () => Deferred.succeed(overflowed, undefined).pipe(Effect.asVoid),
+            terminateSubscription: () =>
+              (blockedWrite === "cancellation" ? Deferred.await(releaseWrite) : Effect.void).pipe(
+                Effect.andThen(Queue.offer(sent, "cancelled")),
+                Effect.asVoid
+              ),
+            supportedVersions: [McpSchema2026.protocolVersion],
+            serverInfo: { name: "SubscriptionBacklogTest", version: "1.0.0" },
+            registrationPresence: Effect.succeed({ tools: true, resources: false, prompts: false })
+          })
+          yield* handlers["subscriptions/listen"](
+            {
+              notifications: { toolsListChanged: true },
+              _meta: {
+                "io.modelcontextprotocol/protocolVersion": McpSchema2026.protocolVersion,
+                "io.modelcontextprotocol/clientCapabilities": {}
+              }
+            },
+            { client: new Rpc.ServerClient(1), requestId: RequestId("blocked-write") }
+          ).pipe(Effect.scoped, Effect.forkScoped)
+          yield* Deferred.await(acknowledgmentStarted)
+
+          for (let index = 0; index <= 65; index++) {
+            yield* PubSub.publish(events, {
+              notification: McpCore.ServerNotification.ToolsChanged({})
+            })
+            yield* Effect.yieldNow
+          }
+          yield* Deferred.await(overflowed)
+          assert.isTrue(yield* Deferred.isDone(subscriptionReleased))
+          yield* Deferred.succeed(releaseWrite, undefined)
+
+          assert.strictEqual(yield* Queue.take(sent), "acknowledged")
+          assert.strictEqual(yield* Queue.take(sent), "cancelled")
+        }))
+    }
+
+    it.effect("should terminate only the slow subscription when its pending backlog overflows", () =>
+      Effect.gen(function*() {
+        const pendingNotificationLimit = 64
+        const core = yield* McpCore.make
+        const events = yield* PubSub.unbounded<McpProtocolInternal.CanonicalServerNotification>()
+        const slowAcknowledged = yield* Deferred.make<void>()
+        const fastAcknowledged = yield* Deferred.make<void>()
+        const slowWriteStarted = yield* Deferred.make<void>()
+        const blockSlowWrite = yield* Deferred.make<void>()
+        const slowSubscriptionReleased = yield* Deferred.make<void>()
+        const fastSubscriptionReleased = yield* Deferred.make<void>()
+        const slowTerminated = yield* Deferred.make<readonly [string, number, RpcMessage.RequestId, string]>()
+        const subscriptionsStarted = yield* Ref.make(0)
+        const fastDeliveries = yield* Ref.make(0)
+        const fastDeliveryCompleted = yield* Queue.unbounded<void>()
+        const handlers = McpProtocol2026.makeHandlers(core, undefined, {
+          subscribeServerNotifications: Effect.acquireRelease(
+            Effect.all([
+              PubSub.subscribe(events),
+              Ref.getAndUpdate(subscriptionsStarted, (count) => count + 1)
+            ]),
+            ([, subscriptionIndex]) =>
+              Deferred.succeed(
+                subscriptionIndex === 0 ? slowSubscriptionReleased : fastSubscriptionReleased,
+                undefined
+              )
+          ).pipe(Effect.map(([subscription]) => subscription)),
+          sendNotification: (_protocolVersion, clientId, notification) => {
+            if (notification.tag === McpSchema2026.SubscriptionsAcknowledgedNotification._tag) {
+              return Deferred.succeed(clientId === 1 ? slowAcknowledged : fastAcknowledged, undefined)
+            }
+            if (clientId === 1) {
+              return Deferred.succeed(slowWriteStarted, undefined).pipe(
+                Effect.andThen(Deferred.await(blockSlowWrite))
+              )
+            }
+            return Ref.update(fastDeliveries, (count) => count + 1).pipe(
+              Effect.andThen(Queue.offer(fastDeliveryCompleted, undefined)),
+              Effect.asVoid
+            )
+          },
+          terminateSubscription: (protocolVersion, clientId, requestId, reason) =>
+            Deferred.succeed(slowTerminated, [protocolVersion, clientId, requestId, reason]),
+          supportedVersions: [McpSchema2026.protocolVersion],
+          serverInfo: { name: "SubscriptionBacklogTest", version: "1.0.0" },
+          registrationPresence: Effect.succeed({ tools: true, resources: false, prompts: false })
+        })
+        const listen = (clientId: number, requestId: string) =>
+          handlers["subscriptions/listen"](
+            {
+              notifications: { toolsListChanged: true },
+              _meta: {
+                "io.modelcontextprotocol/protocolVersion": McpSchema2026.protocolVersion,
+                "io.modelcontextprotocol/clientCapabilities": {}
+              }
+            },
+            { client: new Rpc.ServerClient(clientId), requestId: RequestId(requestId) }
+          ).pipe(Effect.scoped, Effect.forkScoped)
+
+        yield* listen(1, "slow-subscription")
+        yield* Deferred.await(slowAcknowledged)
+        yield* listen(2, "responsive-subscription")
+        yield* Deferred.await(fastAcknowledged)
+
+        for (let index = 0; index <= pendingNotificationLimit; index++) {
+          yield* PubSub.publish(events, {
+            notification: McpCore.ServerNotification.PromptsChanged({})
+          })
+        }
+        yield* PubSub.publish(events, {
+          notification: McpCore.ServerNotification.ToolsChanged({})
+        })
+        yield* Deferred.await(slowWriteStarted)
+        yield* Queue.take(fastDeliveryCompleted)
+
+        for (let index = 0; index < pendingNotificationLimit; index++) {
+          yield* PubSub.publish(events, {
+            notification: McpCore.ServerNotification.ToolsChanged({})
+          })
+          yield* Queue.take(fastDeliveryCompleted)
+        }
+        assert.isTrue(Option.isNone(yield* Deferred.poll(slowSubscriptionReleased)))
+        assert.isTrue(Option.isNone(yield* Deferred.poll(slowTerminated)))
+
+        yield* PubSub.publish(events, {
+          notification: McpCore.ServerNotification.ToolsChanged({})
+        })
+        yield* Queue.take(fastDeliveryCompleted)
+
+        assert.deepStrictEqual(yield* Deferred.await(slowTerminated), [
+          McpSchema2026.protocolVersion,
+          1,
+          RequestId("slow-subscription"),
+          "Pending notification limit exceeded"
+        ])
+        yield* Effect.yieldNow
+        assert.isTrue(yield* Deferred.isDone(slowSubscriptionReleased))
+        assert.isTrue(Option.isNone(yield* Deferred.poll(fastSubscriptionReleased)))
+
+        yield* PubSub.publish(events, {
+          notification: McpCore.ServerNotification.ToolsChanged({})
+        })
+        yield* Queue.take(fastDeliveryCompleted)
+        assert.strictEqual(yield* Ref.get(fastDeliveries), pendingNotificationLimit + 3)
+        assert.isTrue(Option.isNone(yield* Deferred.poll(fastSubscriptionReleased)))
+      }))
+
+    it.effect("should isolate resource subscriptions and clear disconnected sessions", () =>
       Effect.gen(function*() {
         const clientIds = new Set([1, 2])
         const client1Outbound = yield* Queue.unbounded<RpcMessage.FromServerEncoded>()
@@ -827,10 +2502,93 @@ describe("McpServer", () => {
         assert.strictEqual((yield* nextResourceUpdate(2)).uri, "file:///sentinel")
         assert.isTrue(Option.isNone(yield* Queue.poll(client1Outbound)))
         assert.isTrue(Option.isNone(yield* Queue.poll(client2Outbound)))
+
+        clientIds.delete(1)
+        yield* server.notifications["notifications/resources/updated"]({ uri: "file:///sentinel" })
+        assert.strictEqual((yield* nextResourceUpdate(2)).uri, "file:///sentinel")
+        clientIds.add(1)
+        yield* send(1, {
+          _tag: "Request",
+          id: 30,
+          tag: "ping",
+          payload: {},
+          headers: []
+        })
+        const afterSweep = yield* nextResponse(1, 30)
+        assert.strictEqual(afterSweep.exit._tag, "Failure")
+
+        yield* initialize(1)
+        yield* send(1, { _tag: "Eof" })
+        yield* send(1, {
+          _tag: "Request",
+          id: 31,
+          tag: "ping",
+          payload: {},
+          headers: []
+        })
+        const afterReconnect = yield* nextResponse(1, 31)
+        assert.strictEqual(afterReconnect.exit._tag, "Failure")
       }))
   })
 
   describe("stdio", () => {
+    it.effect("should deliver stateless request notifications over stdio", () =>
+      Effect.gen(function*() {
+        const fixture = yield* makeMcpStdioHarness(McpProtocol.v2026_07_28)
+        yield* fixture.server.addTool({
+          tool: new McpSchema.Tool({ name: "Emit", inputSchema: { type: "object" } }),
+          annotations: Context.empty(),
+          handle: () =>
+            Effect.gen(function*() {
+              yield* fixture.server.notifications["notifications/message"]({ level: "info", data: "filtered" })
+              yield* fixture.server.notifications["notifications/message"]({ level: "error", data: "delivered" })
+              yield* fixture.server.notifications["notifications/progress"]({ progressToken: "token", progress: 1 })
+              return new McpSchema.CallToolResult({ content: [] })
+            })
+        })
+        yield* fixture.initialize()
+        yield* fixture.takeFrame
+        yield* fixture.sendRequest("tools/call", {
+          name: "Emit",
+          _meta: { "io.modelcontextprotocol/logLevel": "warning", progressToken: "token" }
+        }, 2)
+        assert.deepInclude(yield* fixture.takeFrame, {
+          method: "notifications/message",
+          params: { level: "error", data: "delivered" }
+        })
+        assert.deepInclude(yield* fixture.takeFrame, {
+          method: "notifications/progress",
+          params: { progressToken: "token", progress: 1 }
+        })
+        assert.deepInclude(yield* fixture.takeFrame, { id: 2 })
+      }))
+
+    it.effect("should accept batches after falling back to a stateful protocol", () =>
+      Effect.gen(function*() {
+        const fixture = yield* makeMcpStdioHarness(McpProtocol.v2025_03_26, [
+          McpProtocol.v2026_07_28,
+          McpProtocol.v2025_03_26
+        ])
+        const initialized = yield* fixture.sendRequest("initialize", {
+          protocolVersion: "2025-11-25",
+          capabilities: {},
+          clientInfo: { name: "fallback-client", version: "1.0.0" }
+        }, 1)
+        assert.deepInclude(initialized.result, { protocolVersion: "2025-03-26" })
+        yield* fixture.sendNotification("notifications/initialized")
+        yield* fixture.takeFrame
+        yield* fixture.sendRaw([
+          { jsonrpc: "2.0", id: 2, method: "ping" },
+          { jsonrpc: "2.0", id: 3, method: "ping" }
+        ])
+        const batch = yield* fixture.takeFrame
+        assert(Array.isArray(batch))
+        assert.sameDeepMembers(batch, [
+          { jsonrpc: "2.0", id: 2, result: {} },
+          { jsonrpc: "2.0", id: 3, result: {} }
+        ])
+      }))
+
     it.effect("should preserve the June wire transcript when requests use stdio", () =>
       Effect.gen(function*() {
         const stdin = yield* Queue.unbounded<Uint8Array>()
@@ -910,5 +2668,111 @@ describe("McpServer", () => {
           result: {}
         })
       }))
+
+    it.effect("should emit correlated cancellation when a STDIO subscription backlog overflows", () =>
+      Effect.gen(function*() {
+        const stdin = yield* Queue.unbounded<Uint8Array>()
+        const stdout = yield* Queue.unbounded<string | Uint8Array>()
+        const blockedWriteStarted = yield* Deferred.make<void>()
+        const releaseBlockedWrite = yield* Deferred.make<void>()
+        const serverReady = yield* Deferred.make<McpServer.McpServer["Service"]>()
+        const encoder = new TextEncoder()
+        const decoder = new TextDecoder()
+        let blocked = false
+        const stdioLayer = Stdio.layerTest({
+          stdin: Stream.fromQueue(stdin),
+          stdout: () =>
+            Sink.forEach((chunk) => {
+              const frame = typeof chunk === "string" ? chunk : decoder.decode(chunk)
+              const message = JSON.parse(frame)
+              if (!blocked && message.method === "notifications/tools/list_changed") {
+                blocked = true
+                return Deferred.succeed(blockedWriteStarted, undefined).pipe(
+                  Effect.andThen(Deferred.await(releaseBlockedWrite))
+                )
+              }
+              return Queue.offer(stdout, chunk)
+            })
+        })
+        yield* Effect.gen(function*() {
+          const context = yield* Layer.build(
+            McpServer.layerStdio({
+              name: "TestServer",
+              version: "1.0.0",
+              protocols: [McpProtocol.v2026_07_28]
+            }).pipe(
+              Layer.provide(stdioLayer),
+              Layer.provideMerge(HttpRouter.layer)
+            )
+          )
+          yield* Deferred.succeed(serverReady, Context.get(context, McpServer.McpServer))
+          return yield* Effect.never
+        }).pipe(Effect.scoped, Effect.forkScoped)
+        const server = yield* Deferred.await(serverReady)
+        yield* server.addTool({
+          tool: new McpSchema.Tool({ name: "subscription-tool", inputSchema: { type: "object" } }),
+          annotations: Context.empty(),
+          handle: () => Effect.succeed(new McpSchema.CallToolResult({ content: [] }))
+        })
+
+        const metadata = {
+          "io.modelcontextprotocol/protocolVersion": "2026-07-28",
+          "io.modelcontextprotocol/clientCapabilities": {},
+          "io.modelcontextprotocol/clientInfo": { name: "TestClient", version: "1.0.0" }
+        }
+        const write = (message: unknown) => Queue.offer(stdin, encoder.encode(`${JSON.stringify(message)}\n`))
+        const read = Effect.fnUntraced(function*() {
+          const chunk = yield* Queue.take(stdout)
+          return JSON.parse(typeof chunk === "string" ? chunk : decoder.decode(chunk))
+        })
+
+        yield* write({
+          jsonrpc: "2.0",
+          id: 0,
+          method: "initialize",
+          params: {
+            protocolVersion: "2026-07-28",
+            capabilities: {},
+            clientInfo: metadata["io.modelcontextprotocol/clientInfo"]
+          }
+        })
+        yield* read()
+        yield* write({
+          jsonrpc: "2.0",
+          id: "slow-subscription",
+          method: "subscriptions/listen",
+          params: {
+            notifications: { toolsListChanged: true },
+            _meta: metadata
+          }
+        })
+        assert.strictEqual((yield* read()).method, "notifications/subscriptions/acknowledged")
+
+        yield* server.notifications["notifications/tools/list_changed"]({})
+        yield* Deferred.await(blockedWriteStarted)
+        // Exceed both the 64-message subscription backlog and the STDIO output buffer.
+        for (let index = 0; index < 128; index++) {
+          yield* server.notifications["notifications/tools/list_changed"]({})
+          yield* Effect.yieldNow
+        }
+        yield* Deferred.succeed(releaseBlockedWrite, undefined)
+
+        let cancellation = yield* read()
+        while (cancellation.method !== "notifications/cancelled") {
+          cancellation = yield* read()
+        }
+        assert.strictEqual(cancellation.method, "notifications/cancelled")
+        assert.strictEqual(cancellation.params.requestId, "slow-subscription")
+
+        yield* write({
+          jsonrpc: "2.0",
+          id: 1,
+          method: "tools/list",
+          params: { _meta: metadata }
+        })
+        const tools = yield* read()
+        assert.strictEqual(tools.id, 1)
+        assert.isArray(tools.result.tools)
+      }))
   })
 })
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/ProtocolAdapters.test.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/ProtocolAdapters.test.ts
index ab7f03d67..9a7bd8864 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/ProtocolAdapters.test.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/ProtocolAdapters.test.ts
@@ -2,6 +2,7 @@ import { assert, describe, it } from "@effect/vitest"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
+import * as Option from "effect/Option"
 import { CurrentLogLevel } from "effect/References"
 import * as Schema from "effect/Schema"
 import * as McpCore from "effect/unstable/ai/internal/mcpCore"
@@ -10,9 +11,12 @@ import * as McpSchema from "effect/unstable/ai/McpSchema"
 import * as McpServer from "effect/unstable/ai/McpServer"
 import * as Tool from "effect/unstable/ai/Tool"
 import * as Toolkit from "effect/unstable/ai/Toolkit"
+import * as HttpServerRequest from "effect/unstable/http/HttpServerRequest"
 import * as RpcClient from "effect/unstable/rpc/RpcClient"
 import type * as RpcSerialization from "effect/unstable/rpc/RpcSerialization"
 import { makeHttpHarness } from "./TestUtils/McpHttpHarness.ts"
+import { readMcpHttpResponse } from "./TestUtils/McpHttpResponse.ts"
+import { makeServerLayer } from "./TestUtils/McpServerLayer.ts"
 
 const ServerIcon = McpSchema.Icon.make({
   src: "https://example.com/server.svg",
@@ -29,6 +33,11 @@ const SharedTool = Tool.make("shared", {
   success: Schema.String
 }).annotate(Tool.Title, "Shared tool title")
 
+const JsonArrayTool = Tool.make("json-array", {
+  parameters: Tool.EmptyParams,
+  success: Schema.Tuple([Schema.String, Schema.Null])
+})
+
 const StructuredOnlyTool = Tool.make("structured-only", {
   parameters: Tool.EmptyParams,
   success: Schema.Struct({ value: Schema.String })
@@ -37,6 +46,19 @@ const StructuredOnlyTool = Tool.make("structured-only", {
   (client) => client.protocolVersion === "2025-06-18"
 )
 
+const UnionResultTool = Tool.make("union-result", {
+  parameters: Tool.EmptyParams,
+  success: Schema.Union([
+    Schema.Struct({ _tag: Schema.Literal("a"), a: Schema.Number }),
+    Schema.Struct({ _tag: Schema.Literal("b"), b: Schema.String })
+  ])
+})
+
+const IdentifiedResultTool = Tool.make("identified-result", {
+  parameters: Tool.EmptyParams,
+  success: Schema.Struct({ value: Schema.String }).annotate({ identifier: "IdentifiedResult" })
+})
+
 const ValidatedTool = Tool.make("validated", {
   parameters: Schema.Struct({
     value: Schema.String
@@ -47,13 +69,13 @@ const ValidatedTool = Tool.make("validated", {
 const CapabilityTool = Tool.make("capability", {
   parameters: Tool.EmptyParams,
   success: Schema.String,
-  dependencies: [McpSchema.McpServerClient]
+  dependencies: [McpSchema.McpRequestContext]
 })
 
 const InitializeMetadataTool = Tool.make("initialize-metadata", {
   parameters: Tool.EmptyParams,
   success: Schema.String,
-  dependencies: [McpSchema.McpServerClient]
+  dependencies: [McpSchema.McpRequestContext]
 })
 
 const LogLevelTool = Tool.make("log-level", {
@@ -68,13 +90,16 @@ const CapabilityGatedTool = Tool.make("capability-gated", {
 }).annotate(
   McpSchema.EnabledWhen,
   (client) =>
-    client.clientInfo.name === "allowed-client" &&
+    client.clientInfo?.name === "allowed-client" &&
     client.capabilities.roots !== undefined
 )
 
 const TestToolkit = Toolkit.make(
   SharedTool,
+  JsonArrayTool,
   StructuredOnlyTool,
+  UnionResultTool,
+  IdentifiedResultTool,
   ValidatedTool,
   CapabilityTool,
   InitializeMetadataTool,
@@ -102,6 +127,22 @@ const FamilyPrompt = McpServer.prompt({
   content: ({ style }) => Effect.succeed(`Use the ${style} style`)
 })
 
+const InputResource = McpServer.resource({
+  uri: "file:///input-context.txt",
+  name: "input-context",
+  content: McpSchema.McpRequestContext.useSync((context) =>
+    JSON.stringify({ inputResponses: context.inputResponses, requestState: context.requestState })
+  )
+})
+
+const InputPrompt = McpServer.prompt({
+  name: "input-context",
+  content: () =>
+    McpSchema.McpRequestContext.useSync((context) =>
+      JSON.stringify({ inputResponses: context.inputResponses, requestState: context.requestState })
+    )
+})
+
 const AudioPrompt = McpServer.prompt({
   name: "audio-prompt",
   content: () =>
@@ -126,6 +167,12 @@ const ResourceLinkPrompt = McpServer.prompt({
     }])
 })
 
+const MrtrTool = new McpSchema.Tool({
+  name: "mrtr-elicitation",
+  description: "Requires client input before completing",
+  inputSchema: { type: "object" }
+})
+
 interface TestState {
   sharedInvocations: number
   structuredInvocations: number
@@ -145,11 +192,14 @@ const makeFixture = Effect.fnUntraced(function*() {
           state.sharedInvocations++
           return "shared-result"
         }),
+      "json-array": () => Effect.succeed(["array", null] as const),
       "structured-only": () =>
         Effect.sync(() => {
           state.structuredInvocations++
           return { value: "structured-result" }
         }),
+      "union-result": () => Effect.succeed({ _tag: "a" as const, a: 1 }),
+      "identified-result": () => Effect.succeed({ value: "identified" }),
       validated: ({ value }) => Effect.succeed(value),
       capability: () =>
         McpServer.clientCapabilities.pipe(
@@ -159,15 +209,33 @@ const makeFixture = Effect.fnUntraced(function*() {
           })
         ),
       "initialize-metadata": () =>
-        McpSchema.McpServerClient.useSync((client) => JSON.stringify(client.initializePayload._meta)),
+        McpSchema.McpRequestContext.useSync((context) => JSON.stringify(context.requestMetadata)),
       "log-level": () => CurrentLogLevel,
       "capability-gated": () => Effect.succeed("visible")
     })))
   )
+  const mrtrToolLayer = Layer.effectDiscard(
+    Effect.gen(function*() {
+      const server = yield* McpServer.McpServer
+      yield* server.addTool({
+        tool: MrtrTool,
+        annotations: Context.empty(),
+        handle: () =>
+          Effect.succeed(
+            new McpSchema.InputRequired({
+              inputRequests: { roots: { method: "roots/list" } }
+            })
+          )
+      })
+    })
+  )
   const serverLayer = Layer.mergeAll(
     toolkitLayer,
+    mrtrToolLayer,
     FamilyResource,
     FamilyPrompt,
+    InputResource,
+    InputPrompt,
     AudioPrompt,
     ResourceLinkPrompt
   ).pipe(
@@ -183,6 +251,7 @@ const makeFixture = Effect.fnUntraced(function*() {
       })],
       path: "/mcp",
       protocols: [
+        McpProtocol.v2026_07_28,
         McpProtocol.v2025_11_25,
         McpProtocol.v2025_06_18,
         McpProtocol.v2025_03_26,
@@ -434,6 +503,15 @@ const makeLowLevelFixture = Effect.fnUntraced(function*() {
             })
           )
       })
+      yield* server.addTool({
+        tool: makeTool("invalid-structured-content", "Non-JSON structured content"),
+        annotations: Context.empty(),
+        handle: () =>
+          Effect.succeed({
+            content: [{ type: "text", text: "invalid" }],
+            structuredContent: Symbol("not-json")
+          } as unknown as McpSchema.CallToolResult)
+      })
       yield* server.addTool({
         tool: makeTool("resource-link", "Current-revision resource link"),
         annotations: Context.empty(),
@@ -491,6 +569,7 @@ const makeLowLevelFixture = Effect.fnUntraced(function*() {
       icons: [ServerIcon],
       path: "/mcp",
       protocols: [
+        McpProtocol.v2026_07_28,
         McpProtocol.v2025_11_25,
         McpProtocol.v2025_06_18,
         McpProtocol.v2025_03_26,
@@ -513,7 +592,8 @@ const JsonRpcResponse = Schema.Union([
     id: Schema.NullOr(Schema.Number),
     error: Schema.Struct({
       code: Schema.Number,
-      message: Schema.String
+      message: Schema.String,
+      data: Schema.optionalKey(Schema.Unknown)
     })
   })
 ])
@@ -521,6 +601,41 @@ type JsonRpcResponse = typeof JsonRpcResponse.Type
 
 const decodeJsonRpcResponse = Schema.decodeUnknownEffect(JsonRpcResponse)
 
+const readJsonRpcResponse = (response: Response) =>
+  readMcpHttpResponse(response).pipe(Effect.flatMap(decodeJsonRpcResponse))
+
+const modernMetadata = (
+  capabilities: Record<string, unknown> = {},
+  clientInfo: { readonly name: string; readonly version: string } = {
+    name: "ModernProtocolAdapterClient",
+    version: "1.0.0"
+  }
+) => ({
+  "io.modelcontextprotocol/protocolVersion": McpProtocol.v2026_07_28.protocolVersion,
+  "io.modelcontextprotocol/clientCapabilities": capabilities,
+  "io.modelcontextprotocol/clientInfo": clientInfo
+})
+
+const modernRequest = (
+  id: number,
+  method: string,
+  params: Record<string, unknown> = {},
+  metadata: Record<string, unknown> = modernMetadata()
+) => ({
+  jsonrpc: "2.0",
+  id,
+  method,
+  params: { ...params, _meta: metadata }
+})
+
+const modernHeaders = (
+  method: string,
+  protocolVersion: string = McpProtocol.v2026_07_28.protocolVersion
+): HeadersInit => ({
+  "MCP-Protocol-Version": protocolVersion,
+  "Mcp-Method": method
+})
+
 const initialize = Effect.fnUntraced(function*(
   post: Effect.Success<ReturnType<typeof makeFixture>>["post"],
   protocolVersion: "2025-11-25" | "2025-06-18" | "2025-03-26" | "2024-11-05",
@@ -545,9 +660,7 @@ const initialize = Effect.fnUntraced(function*(
       }
     }
   })
-  const body = yield* Effect.promise<unknown>(() => response.json()).pipe(
-    Effect.flatMap(decodeJsonRpcResponse)
-  )
+  const body = yield* readJsonRpcResponse(response)
   if (!("result" in body)) {
     return yield* Effect.die(`Initialization failed: ${body.error.message}`)
   }
@@ -566,12 +679,10 @@ const initialize = Effect.fnUntraced(function*(
       "Mcp-Protocol-Version": protocolVersion,
       "Mcp-Session-Id": sessionId
     })
-    return yield* Effect.promise<unknown>(() => response.json()).pipe(
-      Effect.flatMap(decodeJsonRpcResponse)
-    )
+    return yield* readJsonRpcResponse(response)
   })
 
-  return { initializeResult: body.result, protocolVersion, request }
+  return { initializeResult: body.result, protocolVersion, request, sessionId }
 })
 
 const resultOf = (message: JsonRpcResponse): Record<string, unknown> => {
@@ -607,6 +718,103 @@ const textResult = (message: JsonRpcResponse): string => {
 }
 
 describe("McpServer protocol adapters", () => {
+  it.effect("should negotiate a stateful protocol when initialize offers the stateless revision", () =>
+    Effect.gen(function*() {
+      const fixture = yield* makeFixture()
+      const response = yield* fixture.post({
+        jsonrpc: "2.0",
+        id: 1,
+        method: "initialize",
+        params: {
+          protocolVersion: "2026-07-28",
+          capabilities: {},
+          clientInfo: { name: "legacy-client", version: "1.0.0" }
+        }
+      })
+      const message = yield* readJsonRpcResponse(response)
+
+      assert.strictEqual(response.status, 200)
+      assert.isNotNull(response.headers.get("Mcp-Session-Id"))
+      assert.strictEqual(resultOf(message).protocolVersion, "2025-11-25")
+    }))
+
+  // https://modelcontextprotocol.io/specification/2026-07-28/basic/transports/streamable-http#backward-compatibility
+  it.effect("should ignore a recognized legacy session when dispatching a modern request", () =>
+    Effect.gen(function*() {
+      const fixture = yield* makeFixture()
+      const legacy = yield* initialize(fixture.post, "2025-11-25")
+      const body = modernRequest(19, "server/discover")
+      const withoutSession = yield* fixture.post(body, modernHeaders("server/discover"))
+      const expected = resultOf(yield* readJsonRpcResponse(withoutSession))
+      const withSession = yield* fixture.post(body, {
+        ...modernHeaders("server/discover"),
+        "Mcp-Session-Id": legacy.sessionId
+      })
+      const actual = yield* readJsonRpcResponse(withSession)
+
+      assert.deepStrictEqual(resultOf(actual), expected)
+      assert.isNull(withSession.headers.get("Mcp-Session-Id"))
+      assert.deepStrictEqual(resultOf(yield* legacy.request("ping", {})), {})
+    }))
+
+  it.effect("should discover the modern server without initialization or a session", () =>
+    Effect.gen(function*() {
+      const fixture = yield* makeFixture()
+      const response = yield* fixture.post(
+        modernRequest(19, "server/discover"),
+        modernHeaders("server/discover")
+      )
+      const message = yield* readJsonRpcResponse(response)
+      const result = resultOf(message)
+
+      assert.strictEqual(response.status, 200)
+      assert.isNull(response.headers.get("Mcp-Session-Id"))
+      assert.deepStrictEqual(result.supportedVersions, [
+        "2026-07-28",
+        "2025-11-25",
+        "2025-06-18",
+        "2025-03-26",
+        "2024-11-05"
+      ])
+    }))
+
+  it.effect("should expose continuation input to modern resource and prompt handlers", () =>
+    Effect.gen(function*() {
+      const fixture = yield* makeFixture()
+      const continuation = {
+        inputResponses: { roots: { roots: [{ uri: "file:///workspace" }] } },
+        requestState: "round-2"
+      }
+      const cases = [
+        {
+          method: "resources/read",
+          params: { uri: "file:///input-context.txt", ...continuation },
+          read: (result: Record<string, unknown>) =>
+            (result.contents as ReadonlyArray<{ readonly text: string }>)[0]!.text
+        },
+        {
+          method: "prompts/get",
+          params: { name: "input-context", ...continuation },
+          read: (result: Record<string, unknown>) =>
+            (result.messages as ReadonlyArray<{ readonly content: { readonly text: string } }>)[0]!.content.text
+        }
+      ] as const
+
+      for (const [index, testCase] of cases.entries()) {
+        const response = yield* fixture.post(
+          modernRequest(index + 30, testCase.method, testCase.params),
+          {
+            ...modernHeaders(testCase.method),
+            "Mcp-Name": testCase.method === "resources/read" ?
+              "file:///input-context.txt" :
+              "input-context"
+          }
+        )
+        const message = yield* readJsonRpcResponse(response)
+        assert.deepStrictEqual(JSON.parse(testCase.read(resultOf(message))), continuation)
+      }
+    }))
+
   it.effect("should keep log levels isolated when one session updates its level", () =>
     Effect.gen(function*() {
       const fixture = yield* makeFixture()
@@ -625,6 +833,276 @@ describe("McpServer protocol adapters", () => {
       )
     }))
 
+  describe("registration request context", () => {
+    // https://modelcontextprotocol.io/specification/2026-07-28/basic/transports/streamable-http#earlier-streamable-http-revisions
+    // Effect must not expose a captured legacy client service to a stateless invocation.
+    it.effect("should omit a legacy client when a toolkit registered in a session handles a stateless request", () =>
+      Effect.gen(function*() {
+        const sessionToolkit = Toolkit.make(Tool.make("session-owner", {
+          success: Schema.Struct({ client: Schema.String, hasSession: Schema.Boolean }),
+          dependencies: [McpSchema.McpRequestContext]
+        }))
+        const registration = Layer.effectDiscard(McpServer.McpServer.use((server) =>
+          server.addTool({
+            tool: new McpSchema.Tool({ name: "register", inputSchema: { type: "object" } }),
+            annotations: Context.empty(),
+            handle: () =>
+              McpServer.registerToolkit(sessionToolkit).pipe(
+                Effect.provide(sessionToolkit.toLayer({
+                  "session-owner": () =>
+                    Effect.gen(function*() {
+                      const request = yield* McpSchema.McpRequestContext
+                      const session = yield* Effect.serviceOption(McpSchema.McpServerClient)
+                      return { client: request.clientInfo!.name, hasSession: Option.isSome(session) }
+                    })
+                })),
+                Effect.provideService(McpServer.McpServer, server),
+                Effect.as(new McpSchema.CallToolResult({ content: [] }))
+              )
+          })
+        ))
+        const harness = yield* makeHttpHarness(registration.pipe(Layer.provideMerge(makeServerLayer({
+          name: "RegistrationContext",
+          protocols: [McpProtocol.v2026_07_28, McpProtocol.v2025_06_18]
+        }))))
+        const initialized = yield* harness.post({
+          jsonrpc: "2.0",
+          id: 1,
+          method: "initialize",
+          params: {
+            protocolVersion: "2025-06-18",
+            capabilities: {},
+            clientInfo: { name: "Alice", version: "1" }
+          }
+        })
+        yield* readMcpHttpResponse(initialized)
+        const sessionId = initialized.headers.get("mcp-session-id")
+        assert.isNotNull(sessionId)
+        const legacyHeaders = { "mcp-session-id": sessionId, "mcp-protocol-version": "2025-06-18" }
+        // https://modelcontextprotocol.io/specification/2025-06-18/basic/lifecycle#initialization
+        yield* harness.post({ jsonrpc: "2.0", method: "notifications/initialized" }, legacyHeaders)
+        const registered = yield* harness.post({
+          jsonrpc: "2.0",
+          id: 2,
+          method: "tools/call",
+          params: { name: "register" }
+        }, legacyHeaders).pipe(
+          Effect.flatMap(readMcpHttpResponse)
+        )
+        assert.deepNestedPropertyVal(registered, "result.content", [])
+        const invoked = yield* harness.post({
+          jsonrpc: "2.0",
+          id: 3,
+          method: "tools/call",
+          params: {
+            name: "session-owner",
+            _meta: {
+              "io.modelcontextprotocol/protocolVersion": "2026-07-28",
+              "io.modelcontextprotocol/clientCapabilities": {},
+              "io.modelcontextprotocol/clientInfo": { name: "Bob", version: "1" }
+            }
+          }
+        }, {
+          "mcp-protocol-version": "2026-07-28",
+          "mcp-method": "tools/call",
+          "mcp-name": "session-owner"
+        }).pipe(Effect.flatMap(readMcpHttpResponse))
+        assert.deepNestedPropertyVal(invoked, "result.structuredContent", { client: "Bob", hasSession: false })
+      }))
+
+    // https://modelcontextprotocol.io/specification/2026-07-28/server/utilities/logging#per-request-log-level
+    // Effect registration must preserve the invoking request's metadata, HTTP headers, and derived log level.
+    it.effect("should use the current HTTP request when another request registered the resource", () =>
+      Effect.gen(function*() {
+        const registration = Layer.effectDiscard(McpServer.McpServer.use((server) =>
+          server.addTool({
+            tool: new McpSchema.Tool({ name: "register", inputSchema: { type: "object" } }),
+            annotations: Context.empty(),
+            handle: () =>
+              McpServer.registerResource({
+                uri: "file:///http-owner",
+                name: "http-owner",
+                content: Effect.gen(function*() {
+                  const request = yield* McpSchema.McpRequestContext
+                  const http = Option.getOrThrow(yield* Effect.serviceOption(HttpServerRequest.HttpServerRequest))
+                  const level = yield* CurrentLogLevel
+                  return `${request.clientInfo?.name}:${request.requestMetadata?.owner}:${
+                    http.headers["x-owner"]
+                  }:${level}`
+                })
+              }).pipe(
+                Effect.provideService(McpServer.McpServer, server),
+                Effect.as(new McpSchema.CallToolResult({ content: [] }))
+              )
+          })
+        ))
+        const harness = yield* makeHttpHarness(registration.pipe(Layer.provideMerge(makeServerLayer({
+          name: "RegistrationContext",
+          protocols: [McpProtocol.v2026_07_28]
+        }))))
+        const request = (name: string, method: string, params: Record<string, unknown>) =>
+          harness.post({
+            jsonrpc: "2.0",
+            id: name,
+            method,
+            params: {
+              ...params,
+              _meta: {
+                "io.modelcontextprotocol/protocolVersion": "2026-07-28",
+                "io.modelcontextprotocol/clientCapabilities": {},
+                "io.modelcontextprotocol/clientInfo": { name, version: "1" },
+                "io.modelcontextprotocol/logLevel": name === "Alice" ? "error" : "debug",
+                owner: name
+              }
+            }
+          }, {
+            "mcp-protocol-version": "2026-07-28",
+            "mcp-method": method,
+            "mcp-name": method === "tools/call" ? "register" : "file:///http-owner",
+            "x-owner": name
+          }).pipe(Effect.flatMap(readMcpHttpResponse))
+        assert.deepNestedPropertyVal(yield* request("Alice", "tools/call", { name: "register" }), "result.content", [])
+        assert.deepNestedPropertyVal(
+          yield* request("Bob", "resources/read", { uri: "file:///http-owner" }),
+          "result.contents",
+          [
+            { uri: "file:///http-owner", text: "Bob:Bob:Bob:Debug" }
+          ]
+        )
+      }))
+  })
+
+  it.effect("should isolate interleaved stateful and stateless request contexts", () =>
+    Effect.gen(function*() {
+      const fixture = yield* makeFixture()
+      const legacy = yield* initialize(fixture.post, "2025-11-25", {
+        capabilities: { roots: {} },
+        clientInfo: { name: "legacy-client", version: "1.0.0" }
+      })
+
+      assert.strictEqual(
+        textResult(yield* legacy.request("tools/call", { name: "capability" })),
+        JSON.stringify({ roots: {} })
+      )
+
+      const modernResponse = yield* fixture.post(
+        modernRequest(
+          20,
+          "tools/call",
+          { name: "capability", arguments: {} },
+          modernMetadata({ sampling: {} }, {
+            name: "modern-client",
+            version: "2.0.0"
+          })
+        ),
+        { ...modernHeaders("tools/call"), "Mcp-Name": "capability", "Mcp-Session-Id": "ignored-modern-session" }
+      )
+      const modern = yield* Effect.promise<unknown>(() => modernResponse.json()).pipe(
+        Effect.flatMap(decodeJsonRpcResponse)
+      )
+
+      assert.isNull(modernResponse.headers.get("Mcp-Session-Id"))
+      assert.strictEqual(textResult(modern), JSON.stringify({ sampling: {} }))
+      assert.strictEqual(
+        textResult(yield* legacy.request("tools/call", { name: "capability" })),
+        JSON.stringify({ roots: {} })
+      )
+    }))
+
+  it.effect("should keep requests out of legacy routing when modern metadata is malformed", () =>
+    Effect.gen(function*() {
+      const fixture = yield* makeFixture()
+      const unsupportedVersion = "2099-01-01"
+      const cases = [
+        {
+          name: "missing request metadata",
+          body: { jsonrpc: "2.0", id: 30, method: "tools/list", params: {} },
+          headers: modernHeaders("tools/list"),
+          status: 400,
+          code: McpSchema.INVALID_PARAMS_ERROR_CODE
+        },
+        {
+          name: "missing protocol header",
+          body: modernRequest(31, "tools/list"),
+          headers: { "Mcp-Method": "tools/list" },
+          status: 400,
+          code: McpSchema.HEADER_MISMATCH_ERROR_CODE
+        },
+        {
+          name: "malformed client identity",
+          body: modernRequest(32, "tools/list", {}, {
+            ...modernMetadata(),
+            "io.modelcontextprotocol/clientInfo": true
+          }),
+          headers: modernHeaders("tools/list"),
+          status: 200,
+          code: McpSchema.INVALID_PARAMS_ERROR_CODE
+        },
+        {
+          name: "unsupported protocol version",
+          body: modernRequest(33, "tools/list", {}, {
+            ...modernMetadata(),
+            "io.modelcontextprotocol/protocolVersion": unsupportedVersion
+          }),
+          headers: modernHeaders("tools/list", unsupportedVersion),
+          status: 400,
+          code: -32022,
+          supported: [
+            "2026-07-28",
+            "2025-11-25",
+            "2025-06-18",
+            "2025-03-26",
+            "2024-11-05"
+          ]
+        },
+        {
+          name: "modern metadata on initialize",
+          body: {
+            jsonrpc: "2.0",
+            id: 34,
+            method: "initialize",
+            params: {
+              protocolVersion: "2025-11-25",
+              capabilities: {},
+              clientInfo: { name: "legacy-shape", version: "1.0.0" },
+              _meta: modernMetadata()
+            }
+          },
+          headers: modernHeaders("initialize"),
+          status: 404,
+          code: McpSchema.METHOD_NOT_FOUND_ERROR_CODE
+        }
+      ] as const
+
+      for (const testCase of cases) {
+        const response = yield* fixture.post(testCase.body, testCase.headers)
+        const message = yield* readJsonRpcResponse(response)
+        if (!("error" in message)) {
+          assert.fail(`${testCase.name}: expected error, received result`)
+        }
+        const error = message.error
+
+        assert.strictEqual(response.status, testCase.status, testCase.name)
+        assert.strictEqual(error.code, testCase.code, testCase.name)
+        if ("supported" in testCase) {
+          assert.deepStrictEqual(
+            (error.data as { readonly supported?: ReadonlyArray<string> } | undefined)?.supported,
+            testCase.supported,
+            testCase.name
+          )
+        }
+      }
+    }))
+
+  it.effect("should reject client input when the selected protocol cannot encode it", () =>
+    Effect.gen(function*() {
+      const fixture = yield* makeFixture()
+      const legacy = yield* initialize(fixture.post, "2025-11-25")
+      const legacyError = errorOf(yield* legacy.request("tools/call", { name: MrtrTool.name, arguments: {} }))
+      assert.strictEqual(legacyError.code, McpSchema.INVALID_PARAMS_ERROR_CODE)
+      assert.match(legacyError.message, /Client input is not supported/)
+    }))
+
   it.effect("should reject prompt content when the negotiated schema cannot represent it", () =>
     Effect.gen(function*() {
       const fixture = yield* makeFixture()
@@ -750,7 +1228,8 @@ describe("McpServer protocol adapters", () => {
       }
     }))
 
-  it.effect("should preserve initialize metadata when creating the public request context", () =>
+  // Conformance: tools-call-with-progress
+  it.effect("should expose current request metadata when invoking a handler", () =>
     Effect.gen(function*() {
       const fixture = yield* makeFixture()
       for (const protocolVersion of ["2024-11-05", "2025-03-26", "2025-06-18"] as const) {
@@ -771,15 +1250,16 @@ describe("McpServer protocol adapters", () => {
           jsonrpc: "2.0",
           id: 2,
           method: "tools/call",
-          params: { name: "initialize-metadata" }
+          params: {
+            name: "initialize-metadata",
+            _meta: { progressToken: `call-${protocolVersion}` }
+          }
         }, {
           "Mcp-Protocol-Version": protocolVersion,
           "Mcp-Session-Id": sessionId
         })
-        const body = yield* Effect.promise<unknown>(() => toolResponse.json()).pipe(
-          Effect.flatMap(decodeJsonRpcResponse)
-        )
-        assert.strictEqual(textResult(body), JSON.stringify({ progressToken: protocolVersion }))
+        const body = yield* readJsonRpcResponse(toolResponse)
+        assert.strictEqual(textResult(body), JSON.stringify({ progressToken: `call-${protocolVersion}` }))
       }
     }))
 
@@ -822,6 +1302,64 @@ describe("McpServer protocol adapters", () => {
       assert.strictEqual(sends, 0)
     }).pipe(Effect.scoped))
 
+  it.effect("should reject direct reverse operations when the selected protocol is stateless", () =>
+    Effect.gen(function*() {
+      let sends = 0
+      const reverseProtocol = yield* RpcClient.Protocol.make(() =>
+        Effect.succeed({
+          send: () =>
+            Effect.sync(() => {
+              sends++
+            }),
+          supportsAck: true,
+          supportsTransferables: false,
+          supportsStructuredClone: false,
+          codecFor: Schema.toCodecJson as RpcSerialization.CodecFor
+        })
+      )
+      const protocol = McpProtocol.v2026_07_28
+      const client = yield* protocol.makeReverseClient({
+        protocolVersion: protocol.protocolVersion,
+        clientCapabilities: {},
+        clientInfo: { name: "test", version: "1.0.0" }
+      }).pipe(
+        Effect.provideService(RpcClient.Protocol, reverseProtocol)
+      )
+      const operations: ReadonlyArray<
+        readonly [
+          string,
+          Effect.Effect<
+            unknown,
+            McpSchema.McpReverseOperationError | McpSchema.McpReverseOperationUnsupported
+          >
+        ]
+      > = [
+        ["roots/list", client.listRoots()],
+        [
+          "sampling/createMessage",
+          client.createMessage(McpSchema.CreateMessage.payloadSchema.make({
+            messages: [{ role: "user", content: { type: "text", text: "sample" } }],
+            maxTokens: 64
+          }))
+        ],
+        [
+          "elicitation/create",
+          client.elicit({
+            message: "test",
+            requestedSchema: { type: "object", properties: {} }
+          })
+        ]
+      ]
+
+      for (const [operation, effect] of operations) {
+        const error = yield* effect.pipe(Effect.flip)
+        assert.instanceOf(error, McpSchema.McpReverseOperationUnsupported)
+        assert.strictEqual(error.operation, operation)
+        assert.strictEqual(error.protocolVersion, protocol.protocolVersion)
+      }
+      assert.strictEqual(sends, 0)
+    }).pipe(Effect.scoped))
+
   it.effect("should omit June fields when projecting a March tool descriptor", () =>
     Effect.gen(function*() {
       const fixture = yield* makeFixture()
@@ -971,6 +1509,118 @@ describe("McpServer protocol adapters", () => {
       assert.notProperty(oldSchemaOutput, "_meta")
     }))
 
+  it.effect("should inline identified output schemas on the 2025 wire", () =>
+    Effect.gen(function*() {
+      const fixture = yield* makeFixture()
+
+      for (const protocolVersion of ["2025-06-18", "2025-11-25"] as const) {
+        const client = yield* initialize(fixture.post, protocolVersion)
+        const tools = listedTools(yield* client.request("tools/list"))
+        const tool = tools.find((tool) => tool.name === "identified-result")
+        assert.isDefined(tool)
+        assert.deepStrictEqual(tool.outputSchema, {
+          type: "object",
+          properties: { value: { type: "string" } },
+          required: ["value"],
+          additionalProperties: true,
+          $defs: {
+            IdentifiedResult: {
+              type: "object",
+              properties: { value: { type: "string" } },
+              required: ["value"],
+              additionalProperties: true
+            }
+          }
+        })
+      }
+    }))
+
+  it.effect("should project non-object JSON Toolkit outputs only for the July protocol", () =>
+    Effect.gen(function*() {
+      const fixture = yield* makeFixture()
+
+      for (const protocolVersion of ["2025-06-18", "2025-11-25"] as const) {
+        const client = yield* initialize(fixture.post, protocolVersion)
+        const tools = listedTools(yield* client.request("tools/list"))
+        for (const name of ["shared", "json-array", "union-result"]) {
+          const tool = tools.find((tool) => tool.name === name)
+          assert.isDefined(tool)
+          assert.notProperty(tool, "outputSchema")
+        }
+
+        for (const name of ["shared", "json-array"]) {
+          const result = resultOf(yield* client.request("tools/call", { name }))
+          assert.notProperty(result, "structuredContent")
+        }
+      }
+
+      const listResponse = yield* fixture.post(
+        modernRequest(42, "tools/list"),
+        { ...modernHeaders("tools/list"), "Mcp-Name": "toolkit-output" }
+      )
+      const listResult = listedTools(
+        yield* Effect.promise<unknown>(() => listResponse.json()).pipe(
+          Effect.flatMap(decodeJsonRpcResponse)
+        )
+      )
+      assert.deepStrictEqual(listResult.find((tool) => tool.name === "shared")?.outputSchema, { type: "string" })
+      assert.deepStrictEqual(listResult.find((tool) => tool.name === "json-array")?.outputSchema, {
+        type: "array",
+        prefixItems: [{ type: "string" }, { type: "null" }],
+        minItems: 2,
+        maxItems: 2
+      })
+      assert.deepStrictEqual(listResult.find((tool) => tool.name === "union-result")?.outputSchema, {
+        anyOf: [
+          {
+            type: "object",
+            properties: {
+              _tag: { type: "string", enum: ["a"] },
+              a: {
+                anyOf: [
+                  { type: "number" },
+                  { type: "string", enum: ["Infinity", "-Infinity", "NaN"] }
+                ]
+              }
+            },
+            required: ["_tag", "a"],
+            additionalProperties: true
+          },
+          {
+            type: "object",
+            properties: {
+              _tag: { type: "string", enum: ["b"] },
+              b: { type: "string" }
+            },
+            required: ["_tag", "b"],
+            additionalProperties: true
+          }
+        ]
+      })
+
+      const callResponse = yield* fixture.post(
+        modernRequest(43, "tools/call", { name: "shared", arguments: {} }),
+        { ...modernHeaders("tools/call"), "Mcp-Name": "shared" }
+      )
+      const callResult = resultOf(
+        yield* Effect.promise<unknown>(() => callResponse.json()).pipe(
+          Effect.flatMap(decodeJsonRpcResponse)
+        )
+      )
+      assert.strictEqual(callResult.structuredContent, "shared-result")
+
+      const arrayCallResponse = yield* fixture.post(
+        modernRequest(44, "tools/call", { name: "json-array", arguments: {} }),
+        { ...modernHeaders("tools/call"), "Mcp-Name": "json-array" }
+      )
+      const arrayCallResult = resultOf(
+        yield* Effect.promise<unknown>(() => arrayCallResponse.json()).pipe(
+          Effect.flatMap(decodeJsonRpcResponse)
+        )
+      )
+      assert.deepStrictEqual(arrayCallResult.structuredContent, ["array", null])
+    }))
+
   it.effect("should encode binary content for every revision that can represent it", () =>
     Effect.gen(function*() {
       const fixture = yield* makeLowLevelFixture()
@@ -1022,17 +1672,28 @@ describe("McpServer protocol adapters", () => {
         assert.notProperty(scalarResult, "structuredContent")
       }
 
-      const currentClient = yield* initialize(fixture.post, "2025-06-18")
-      const objectResult = resultOf(
-        yield* currentClient.request("tools/call", { name: "structured-object" })
-      )
-      assert.deepStrictEqual(objectResult.structuredContent, { value: "fixture" })
+      for (const protocolVersion of ["2025-06-18", "2025-11-25"] as const) {
+        const client = yield* initialize(fixture.post, protocolVersion)
+        const objectResult = resultOf(
+          yield* client.request("tools/call", { name: "structured-object" })
+        )
+        const scalarResult = resultOf(
+          yield* client.request("tools/call", { name: "structured-scalar" })
+        )
+        assert.deepStrictEqual(objectResult.structuredContent, { value: "fixture" })
+        assert.notProperty(scalarResult, "structuredContent")
+      }
 
-      const scalarError = errorOf(
-        yield* currentClient.request("tools/call", { name: "structured-scalar" })
+      const modernResponse = yield* fixture.post(
+        modernRequest(41, "tools/call", { name: "structured-scalar", arguments: {} }),
+        { ...modernHeaders("tools/call"), "Mcp-Name": "structured-scalar" }
       )
-      assert.strictEqual(scalarError.code, McpSchema.INVALID_PARAMS_ERROR_CODE)
-      assert.match(scalarError.message, /non-object structured tool content is not supported by MCP 2025-06-18/)
+      const modernResult = resultOf(
+        yield* Effect.promise<unknown>(() => modernResponse.json()).pipe(
+          Effect.flatMap(decodeJsonRpcResponse)
+        )
+      )
+      assert.strictEqual(modernResult.structuredContent, "fixture")
     }))
 
   it.effect("should preserve only supported metadata when projecting embedded resource content", () =>
@@ -1204,58 +1865,17 @@ describe("McpServer protocol adapters", () => {
       assert.strictEqual(fixture.state.resourceLinkInvocations, 1)
     }))
 
-  it.effect("should return a typed failure when structured tool content is not valid JSON", () =>
+  it.effect("should reject invalid structured content at the protocol serialization boundary", () =>
     Effect.gen(function*() {
-      const server = yield* McpServer.McpServer.make
-      yield* server.addTool({
-        tool: new McpSchema.Tool({
-          name: "invalid-structured-content",
-          inputSchema: {
-            type: "object",
-            properties: {}
-          }
-        }),
-        annotations: Context.empty(),
-        handle: () =>
-          Effect.succeed({
-            content: [{ type: "text", text: "invalid" }],
-            structuredContent: Symbol("not-json")
-          } as unknown as McpSchema.CallToolResult)
-      })
-
-      const error = yield* server.callTool({
-        name: "invalid-structured-content",
-        arguments: {}
-      }).pipe(
-        Effect.provideService(
-          McpSchema.McpServerClient,
-          McpSchema.McpServerClient.of({
-            clientId: 1,
-            protocolVersion: "2025-06-18",
-            clientCapabilities: {},
-            clientInfo: {
-              name: "direct-client",
-              version: "1.0.0"
-            },
-            initializePayload: {
-              protocolVersion: "2025-06-18",
-              capabilities: {},
-              clientInfo: {
-                name: "direct-client",
-                version: "1.0.0"
-              }
-            },
-            getClient: Effect.die("not used")
-          })
-        ),
-        Effect.flip
+      const fixture = yield* makeLowLevelFixture()
+      const response = yield* fixture.post(
+        modernRequest(50, "tools/call", { name: "invalid-structured-content", arguments: {} }),
+        { ...modernHeaders("tools/call"), "Mcp-Name": "invalid-structured-content" }
       )
+      const message = yield* readJsonRpcResponse(response)
 
-      assert.instanceOf(error, McpSchema.InvalidParams)
-      assert.strictEqual(
-        error.message,
-        "Tool 'invalid-structured-content' returned structured content that is not valid JSON"
-      )
+      assert.strictEqual(response.status, 200)
+      assert.strictEqual(errorOf(message).code, McpSchema.INTERNAL_ERROR_CODE)
     }))
 
   it("should reject a tool schema when inputSchema is not an object", () => {
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/TestUtils/McpHttpHarness.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/TestUtils/McpHttpHarness.ts
index d2f41aab6..9edf94323 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/TestUtils/McpHttpHarness.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/TestUtils/McpHttpHarness.ts
@@ -1,6 +1,9 @@
+import { assert } from "@effect/vitest"
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
+import type * as McpProtocol from "effect/unstable/ai/McpProtocol"
 import * as HttpRouter from "effect/unstable/http/HttpRouter"
+import { readMcpHttpResponse } from "./McpHttpResponse.ts"
 
 export const MCP_ENDPOINT = "http://localhost/mcp"
 
@@ -58,3 +61,25 @@ export const makeHttpHarness = Effect.fnUntraced(function*<A, E>(
     responses
   } as const
 })
+
+export const initializeHttpSession = Effect.fnUntraced(function*(
+  harness: Effect.Success<ReturnType<typeof makeHttpHarness>>,
+  selectedProtocol: McpProtocol.ProtocolAdapter
+) {
+  const response = yield* harness.post({
+    jsonrpc: "2.0",
+    id: "initialize",
+    method: "initialize",
+    params: {
+      protocolVersion: selectedProtocol.protocolVersion,
+      capabilities: {},
+      clientInfo: { name: "test", version: "1.0.0" }
+    }
+  })
+  yield* readMcpHttpResponse(response)
+  const sessionId = response.headers.get("Mcp-Session-Id")
+  assert.isNotNull(sessionId)
+  const headers = { "Mcp-Session-Id": sessionId, "Mcp-Protocol-Version": selectedProtocol.protocolVersion }
+  yield* harness.post({ jsonrpc: "2.0", method: "notifications/initialized" }, headers)
+  return headers
+})
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/TestUtils/McpHttpResponse.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/TestUtils/McpHttpResponse.ts
new file mode 100644
index 000000000..62b38f175
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/TestUtils/McpHttpResponse.ts
@@ -0,0 +1,65 @@
+import { assert } from "@effect/vitest"
+import * as Effect from "effect/Effect"
+import type { JsonRpcMessage } from "./McpStdioHarness.ts"
+
+export const readMcpHttpResponse = (response: Response): Effect.Effect<unknown> =>
+  Effect.promise(async () => {
+    if (!response.headers.get("content-type")?.includes("text/event-stream")) {
+      return response.json()
+    }
+    const messages = (await response.text())
+      .split("\n")
+      .filter((line) => line.startsWith("data: "))
+      .map((line) => JSON.parse(line.slice(6)))
+    return messages.at(-1)
+  })
+
+export const makeMcpSseReader = (response: Response) => {
+  assert.match(response.headers.get("content-type") ?? "", /^text\/event-stream(?:;|$)/)
+  const body = response.body
+  assert.isNotNull(body)
+  const reader = body.getReader()
+  const decoder = new TextDecoder()
+  let pending = ""
+  const takeOrEnd = Effect.fnUntraced(function*() {
+    while (true) {
+      const boundary = pending.indexOf("\n\n")
+      if (boundary !== -1) {
+        const event = pending.slice(0, boundary)
+        pending = pending.slice(boundary + 2)
+        const data = event.split("\n")
+          .filter((line) => line.startsWith("data:"))
+          .map((line) => line.slice(5).trimStart())
+          .join("\n")
+        if (data.length > 0) {
+          return JSON.parse(data) as JsonRpcMessage
+        }
+        continue
+      }
+      const chunk = yield* Effect.promise(() => reader.read())
+      if (chunk.done) {
+        return undefined
+      }
+      pending += decoder.decode(chunk.value, { stream: true }).replaceAll("\r\n", "\n")
+    }
+  })
+  const take = Effect.fnUntraced(function*() {
+    const message = yield* takeOrEnd()
+    assert.isDefined(message)
+    return message
+  })
+  return {
+    take,
+    drain: Effect.fnUntraced(function*() {
+      const messages: Array<JsonRpcMessage> = []
+      while (true) {
+        const message = yield* takeOrEnd()
+        if (message === undefined) {
+          return messages
+        }
+        messages.push(message)
+      }
+    }),
+    cancel: Effect.promise(() => reader.cancel())
+  }
+}
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/TestUtils/McpServerLayer.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/TestUtils/McpServerLayer.ts
index 78f29cca6..db7dd6b5d 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/TestUtils/McpServerLayer.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/TestUtils/McpServerLayer.ts
@@ -11,6 +11,7 @@ const noopLogger = Logger.make(constVoid)
 export const makeServerLayer = (options: {
   readonly name: string
   readonly version?: string | undefined
+  readonly instructions?: string | undefined
   readonly protocols?:
     | readonly [
       McpProtocol.ProtocolAdapter,
@@ -23,6 +24,7 @@ export const makeServerLayer = (options: {
   McpServer.layerHttp({
     name: options.name,
     version: options.version ?? "1.0.0",
+    instructions: options.instructions,
     path: "/mcp",
     protocols: options.protocols ?? [McpProtocol.v2025_06_18],
     allowedOrigins: ["https://allowed.example"],
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/TestUtils/McpStdioHarness.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/TestUtils/McpStdioHarness.ts
index 40bf916ec..612924ee2 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/TestUtils/McpStdioHarness.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/TestUtils/McpStdioHarness.ts
@@ -1,3 +1,4 @@
+import type * as Arr from "effect/Array"
 import type * as Cause from "effect/Cause"
 import * as Context from "effect/Context"
 import * as Deferred from "effect/Deferred"
@@ -21,6 +22,12 @@ export interface JsonRpcMessage {
   readonly error?: unknown
 }
 
+export interface McpStdioRequestHandle {
+  readonly id: string | number
+  readonly response: Effect.Effect<JsonRpcMessage>
+  readonly cancel: (reason?: string) => Effect.Effect<void>
+}
+
 export interface McpStdioHarness {
   readonly server: McpServer.McpServer["Service"]
   readonly serverFiber: Fiber.Fiber<never, Cause.IllegalArgumentError>
@@ -32,6 +39,11 @@ export interface McpStdioHarness {
     params?: unknown,
     id?: string | number
   ) => Effect.Effect<JsonRpcMessage>
+  readonly startRequest: (
+    method: string,
+    params?: unknown,
+    id?: string | number
+  ) => Effect.Effect<McpStdioRequestHandle>
   readonly sendNotification: (method: string, params?: unknown) => Effect.Effect<void>
   readonly initialize: (
     capabilities?: typeof McpSchema.ClientCapabilities.Type
@@ -41,6 +53,7 @@ export interface McpStdioHarness {
   readonly takeRawStdout: Effect.Effect<string>
   readonly takeStderr: Effect.Effect<string>
   readonly awaitOutboundMethod: (method: string) => Effect.Effect<JsonRpcMessage>
+  readonly flushListChanged: Effect.Effect<void>
   readonly respond: (id: string | number, result: unknown) => Effect.Effect<void>
 }
 
@@ -55,9 +68,10 @@ const isResponse = (
 
 const requestKey = (id: string | number) => `${typeof id}:${id}`
 
-export const makeMcpStdioHarness = Effect.fnUntraced(function*(
+export const makeMcpStdioHarness = Effect.fnUntraced(function*<A>(
   protocol: McpProtocol.ProtocolAdapter,
-  protocols: ReadonlyArray<McpProtocol.ProtocolAdapter> = [protocol]
+  protocols: Arr.NonEmptyReadonlyArray<McpProtocol.ProtocolAdapter> = [protocol],
+  registrations?: Layer.Layer<A, never, McpServer.McpServer>
 ) {
   const stdin = yield* Queue.unbounded<Uint8Array, Cause.Done>()
   const stdout = yield* Queue.unbounded<string | Uint8Array>()
@@ -80,15 +94,15 @@ export const makeMcpStdioHarness = Effect.fnUntraced(function*(
   })
   const ready = yield* Deferred.make<McpServer.McpServer["Service"]>()
   const serverFiber = yield* Effect.gen(function*() {
+    const serverLayer = McpServer.layerStdio({
+      name: "McpConformance",
+      version: "1.0.0",
+      protocols
+    }).pipe(Layer.provide(stdioLayer))
     const context = yield* Layer.build(
-      McpServer.layerStdio({
-        name: "McpConformance",
-        version: "1.0.0",
-        protocols: protocols as [
-          McpProtocol.ProtocolAdapter,
-          ...Array<McpProtocol.ProtocolAdapter>
-        ]
-      }).pipe(Layer.provide(stdioLayer))
+      registrations === undefined
+        ? serverLayer
+        : registrations.pipe(Layer.provideMerge(serverLayer))
     )
     yield* Deferred.succeed(ready, Context.get(context, McpServer.McpServer))
     return yield* Effect.never
@@ -144,13 +158,33 @@ export const makeMcpStdioHarness = Effect.fnUntraced(function*(
   const sendChunk = (chunk: string | Uint8Array) =>
     Queue.offer(stdin, typeof chunk === "string" ? encoder.encode(chunk) : chunk)
   const sendRaw = (message: unknown) => sendChunk(`${JSON.stringify(message)}\n`)
+  const requestMetadata = {
+    "io.modelcontextprotocol/protocolVersion": protocol.protocolVersion,
+    "io.modelcontextprotocol/clientCapabilities": {},
+    "io.modelcontextprotocol/clientInfo": { name: "stdio-client", version: "1.0.0" }
+  }
+  const withRequestMetadata = (params: unknown) =>
+    protocol.runtime._tag === "Stateless"
+      ? {
+        ...(typeof params === "object" && params !== null ? params : {}),
+        _meta: {
+          ...requestMetadata,
+          ...(typeof params === "object" && params !== null && "_meta" in params &&
+              typeof params._meta === "object" && params._meta !== null
+            ? params._meta
+            : {})
+        }
+      }
+      : params
   const sendNotification = (method: string, params?: unknown) =>
     sendRaw({
       jsonrpc: "2.0",
       method,
-      ...(params === undefined ? {} : { params })
+      ...(params === undefined && protocol.runtime._tag !== "Stateless"
+        ? {}
+        : { params: withRequestMetadata(params) })
     })
-  const sendRequest = Effect.fnUntraced(function*(
+  const startRequest = Effect.fnUntraced(function*(
     method: string,
     params?: unknown,
     id: string | number = nextRequestId++
@@ -162,11 +196,29 @@ export const makeMcpStdioHarness = Effect.fnUntraced(function*(
       jsonrpc: "2.0",
       id,
       method,
-      ...(params === undefined ? {} : { params })
+      ...(params === undefined && protocol.runtime._tag !== "Stateless"
+        ? {}
+        : { params: withRequestMetadata(params) })
     })
-    return yield* Queue.take(responseQueue).pipe(
-      Effect.ensuring(Effect.sync(() => responseQueues.delete(key)))
-    )
+    return {
+      id,
+      response: Queue.take(responseQueue).pipe(
+        Effect.ensuring(Effect.sync(() => responseQueues.delete(key)))
+      ),
+      cancel: (reason?: string) =>
+        sendNotification("notifications/cancelled", {
+          requestId: id,
+          ...(reason === undefined ? {} : { reason })
+        })
+    }
+  })
+  const sendRequest = Effect.fnUntraced(function*(
+    method: string,
+    params?: unknown,
+    id?: string | number
+  ) {
+    const request = yield* startRequest(method, params, id)
+    return yield* request.response
   })
   const takeMessage = Effect.suspend(() => {
     const retained = retainedMessages.shift()
@@ -193,8 +245,17 @@ export const makeMcpStdioHarness = Effect.fnUntraced(function*(
     sendRaw,
     sendChunk,
     sendRequest,
+    startRequest,
     sendNotification,
     initialize: Effect.fnUntraced(function*(capabilities = {}) {
+      if (protocol.runtime._tag === "Stateless") {
+        return yield* sendRequest("server/discover", {
+          _meta: {
+            ...requestMetadata,
+            "io.modelcontextprotocol/clientCapabilities": capabilities
+          }
+        })
+      }
       const response = yield* sendRequest("initialize", {
         protocolVersion: protocol.protocolVersion,
         capabilities,
@@ -208,6 +269,7 @@ export const makeMcpStdioHarness = Effect.fnUntraced(function*(
     takeRawStdout: Queue.take(rawStdout),
     takeStderr: Queue.take(rawStderr),
     awaitOutboundMethod,
+    flushListChanged: Effect.yieldNow,
     respond: (id, result) => sendRaw({ jsonrpc: "2.0", id, result })
   } satisfies McpStdioHarness
 })
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/v2024_11_05.test.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/v2024_11_05.test.ts
index 288e61c51..2fc6843bb 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/v2024_11_05.test.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/v2024_11_05.test.ts
@@ -2,7 +2,6 @@ import { assert, describe, it } from "@effect/vitest"
 import * as Effect from "effect/Effect"
 import * as McpProtocol from "effect/unstable/ai/McpProtocol"
 import * as BaseProtocolTest from "./McpConformance/BaseProtocolTest.ts"
-import * as CompletionTest from "./McpConformance/CompletionTest.ts"
 import * as LifecycleTest from "./McpConformance/LifecycleTest.ts"
 import * as LoggingTest from "./McpConformance/LoggingTest.ts"
 import * as McpConformance from "./McpConformance/McpConformance.ts"
@@ -19,13 +18,17 @@ const testLayer = McpConformance.layer(protocol)
 
 LifecycleTest.suite(protocol, testLayer)
 BaseProtocolTest.suite(protocol, testLayer)
+BaseProtocolTest.statefulLegacySuite(protocol, testLayer)
 TransportsTest.suite(protocol, testLayer)
 UtilitiesTest.suite(protocol, testLayer)
+UtilitiesTest.statefulLegacySuite(protocol, testLayer)
 LoggingTest.suite(protocol, testLayer)
-CompletionTest.suite(protocol, testLayer)
 ToolsTest.suite(protocol, testLayer)
+ToolsTest.statefulLegacySuite(protocol, testLayer)
 ResourcesTest.suite(protocol, testLayer)
+ResourcesTest.statefulLegacySuite(protocol, testLayer)
 PromptsTest.suite(protocol, testLayer)
+PromptsTest.statefulLegacySuite(protocol, testLayer)
 RootsTest.suite(protocol, testLayer)
 SamplingTest.suite(protocol, testLayer)
 
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/v2025_03_26.test.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/v2025_03_26.test.ts
index d30326ff7..f3ad89753 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/v2025_03_26.test.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/v2025_03_26.test.ts
@@ -21,13 +21,18 @@ const testLayer = makeMcpConformanceLayer(protocol)
 
 LifecycleTest.suite(protocol, testLayer)
 BaseProtocolTest.suite(protocol, testLayer)
+BaseProtocolTest.statefulLegacySuite(protocol, testLayer)
 TransportsTest.suite(protocol, testLayer)
 UtilitiesTest.suite(protocol, testLayer)
+UtilitiesTest.statefulLegacySuite(protocol, testLayer)
 LoggingTest.suite(protocol, testLayer)
 CompletionTest.suite(protocol, testLayer)
 ToolsTest.suite(protocol, testLayer)
+ToolsTest.statefulLegacySuite(protocol, testLayer)
 ResourcesTest.suite(protocol, testLayer)
+ResourcesTest.statefulLegacySuite(protocol, testLayer)
 PromptsTest.suite(protocol, testLayer)
+PromptsTest.statefulLegacySuite(protocol, testLayer)
 RootsTest.suite(protocol, testLayer)
 SamplingTest.suite(protocol, testLayer)
 
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/v2025_06_18.test.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/v2025_06_18.test.ts
index 93fd7adc0..6de27a6f0 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/v2025_06_18.test.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/v2025_06_18.test.ts
@@ -18,11 +18,16 @@ const testLayer = makeMcpConformanceLayer(protocol)
 
 LifecycleTest.suite(protocol, testLayer)
 BaseProtocolTest.suite(protocol, testLayer)
+BaseProtocolTest.statefulLegacySuite(protocol, testLayer)
 TransportsTest.suite(protocol, testLayer)
 UtilitiesTest.suite(protocol, testLayer)
+UtilitiesTest.statefulLegacySuite(protocol, testLayer)
 ToolsTest.suite(protocol, testLayer)
+ToolsTest.statefulLegacySuite(protocol, testLayer)
 ResourcesTest.suite(protocol, testLayer)
+ResourcesTest.statefulLegacySuite(protocol, testLayer)
 PromptsTest.suite(protocol, testLayer)
+PromptsTest.statefulLegacySuite(protocol, testLayer)
 CompletionTest.suite(protocol, testLayer)
 LoggingTest.suite(protocol, testLayer)
 RootsTest.suite(protocol, testLayer)
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/v2025_11_25.test.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/v2025_11_25.test.ts
index 17ea38eda..7de33f520 100644
--- a/repos/effect/packages/effect/test/unstable/ai/McpServer/v2025_11_25.test.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/v2025_11_25.test.ts
@@ -10,6 +10,7 @@ import * as LoggingTest from "./McpConformance/LoggingTest.ts"
 import { layer as makeMcpConformanceLayer, McpConformance } from "./McpConformance/McpConformance.ts"
 import * as PromptsTest from "./McpConformance/PromptsTest.ts"
 import * as ResourcesTest from "./McpConformance/ResourcesTest.ts"
+import * as RootsTest from "./McpConformance/RootsTest.ts"
 import * as SamplingTest from "./McpConformance/SamplingTest.ts"
 import * as ToolsTest from "./McpConformance/ToolsTest.ts"
 import * as TransportsTest from "./McpConformance/TransportsTest.ts"
@@ -20,13 +21,19 @@ const testLayer = makeMcpConformanceLayer(protocol)
 
 LifecycleTest.suite(protocol, testLayer)
 BaseProtocolTest.suite(protocol, testLayer)
+BaseProtocolTest.statefulLegacySuite(protocol, testLayer)
 TransportsTest.suite(protocol, testLayer)
 UtilitiesTest.suite(protocol, testLayer)
+UtilitiesTest.statefulLegacySuite(protocol, testLayer)
 ToolsTest.suite(protocol, testLayer)
+ToolsTest.statefulLegacySuite(protocol, testLayer)
 ResourcesTest.suite(protocol, testLayer)
+ResourcesTest.statefulLegacySuite(protocol, testLayer)
 PromptsTest.suite(protocol, testLayer)
+PromptsTest.statefulLegacySuite(protocol, testLayer)
 CompletionTest.suite(protocol, testLayer)
 LoggingTest.suite(protocol, testLayer)
+RootsTest.suite(protocol, testLayer)
 SamplingTest.suite(protocol, testLayer)
 ElicitationTest.suite(protocol, testLayer)
 
diff --git a/repos/effect/packages/effect/test/unstable/ai/McpServer/v2026_07_28.test.ts b/repos/effect/packages/effect/test/unstable/ai/McpServer/v2026_07_28.test.ts
new file mode 100644
index 000000000..00246eeaf
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/ai/McpServer/v2026_07_28.test.ts
@@ -0,0 +1,659 @@
+import { assert, describe, it } from "@effect/vitest"
+import * as Effect from "effect/Effect"
+import * as Encoding from "effect/Encoding"
+import * as Schema from "effect/Schema"
+import * as McpProtocol from "effect/unstable/ai/McpProtocol"
+import * as McpSchema from "effect/unstable/ai/McpSchema"
+import * as BaseProtocolTest from "./McpConformance/BaseProtocolTest.ts"
+import * as CompletionTest from "./McpConformance/CompletionTest.ts"
+import * as LoggingTest from "./McpConformance/LoggingTest.ts"
+import { layer as makeMcpConformanceLayer, McpConformance } from "./McpConformance/McpConformance.ts"
+import {
+  MrtrInvalidStateToolName,
+  MrtrSamplingToolChoiceToolName,
+  MrtrSamplingToolsToolName,
+  MrtrToolName
+} from "./McpConformance/McpConformanceFixtures.ts"
+import * as MultiRoundTripTest from "./McpConformance/MultiRoundTripTest.ts"
+import * as PromptsTest from "./McpConformance/PromptsTest.ts"
+import * as ResourcesTest from "./McpConformance/ResourcesTest.ts"
+import * as SubscriptionsTest from "./McpConformance/SubscriptionsTest.ts"
+import * as ToolsTest from "./McpConformance/ToolsTest.ts"
+import * as TransportsTest from "./McpConformance/TransportsTest.ts"
+import * as UtilitiesTest from "./McpConformance/UtilitiesTest.ts"
+import { makeHttpHarness } from "./TestUtils/McpHttpHarness.ts"
+import { readMcpHttpResponse } from "./TestUtils/McpHttpResponse.ts"
+import { makeServerLayer } from "./TestUtils/McpServerLayer.ts"
+import { makeMcpStdioHarness } from "./TestUtils/McpStdioHarness.ts"
+
+const protocol = McpProtocol.v2026_07_28
+const testLayer = makeMcpConformanceLayer(protocol)
+
+const metadata = {
+  "io.modelcontextprotocol/protocolVersion": "2026-07-28",
+  "io.modelcontextprotocol/clientCapabilities": {},
+  "io.modelcontextprotocol/clientInfo": { name: "McpConformanceClient", version: "1.0.0" }
+} as const
+
+const request = (
+  id: string | number,
+  method: string,
+  params: Record<string, unknown> = {}
+) => ({
+  jsonrpc: "2.0",
+  id,
+  method,
+  params: { ...params, _meta: metadata }
+})
+
+const headers = (method: string, name?: string): HeadersInit => ({
+  "MCP-Protocol-Version": protocol.protocolVersion,
+  "Mcp-Method": method,
+  ...(name === undefined ? {} : { "Mcp-Name": name })
+})
+
+const decodeError = (response: Response) =>
+  Effect.promise<unknown>(() => response.json()).pipe(
+    Effect.flatMap(Schema.decodeUnknownEffect(Schema.Struct({
+      id: Schema.NullOr(Schema.Union([Schema.String, Schema.Number])),
+      error: McpSchema.McpError
+    })))
+  )
+
+BaseProtocolTest.suite(protocol, testLayer)
+BaseProtocolTest.statelessModernSuite(protocol, testLayer)
+TransportsTest.statelessModernSuite(protocol, testLayer)
+UtilitiesTest.statelessModernSuite(protocol, testLayer)
+ToolsTest.suite(protocol, testLayer)
+ToolsTest.statelessModernSuite(protocol, testLayer)
+ResourcesTest.suite(protocol, testLayer)
+PromptsTest.suite(protocol, testLayer, { additionalPromptNames: ["MrtrPrompt"] })
+CompletionTest.suite(protocol, testLayer)
+LoggingTest.statelessModernSuite(protocol, testLayer)
+MultiRoundTripTest.suite(protocol, testLayer)
+SubscriptionsTest.suite(protocol, testLayer)
+
+it.layer(testLayer)(`Mcp Conformance (${protocol.protocolVersion})`, (it) => {
+  describe("Lifecycle", () => {
+    // SEP-2575: https://modelcontextprotocol.io/seps/2575-stateless-mcp
+    // https://modelcontextprotocol.io/specification/2026-07-28/server/discovery
+    it.effect("should discover the server when no initialization or session exists", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const discovered = yield* test.initialize({ server: "features" })
+
+        assert.strictEqual(discovered.response.status, 200)
+        assert.isNull(discovered.sessionId)
+        assert.strictEqual(discovered.message.result.protocolVersion, protocol.protocolVersion)
+        assert.strictEqual(discovered.message.result.instructions, "Follow the test server instructions.")
+      }))
+
+    // Modern extension settings are JSON objects; legacy-only scalar settings must not break discovery.
+    // https://modelcontextprotocol.io/specification/2026-07-28/schema#servercapabilities
+    it.effect("should advertise supported extension settings when discovering a server with legacy configuration", () =>
+      Effect.gen(function*() {
+        const extensions = {
+          "example/settings": { enabled: true, formats: ["text/html"], nested: { value: null } },
+          "example/empty": {}
+        }
+        const harness = yield* makeHttpHarness(makeServerLayer({
+          name: "ExtensionServer",
+          protocols: [protocol, McpProtocol.v2025_06_18],
+          extensions: {
+            ...extensions,
+            "example/boolean": true,
+            "example/array": [],
+            "example/null": null
+          }
+        }))
+        const response = yield* harness.post(request("discovery", "server/discover"), headers("server/discover"))
+        assert.strictEqual(response.status, 200)
+        const message = Schema.decodeUnknownSync(Schema.Struct({ result: Schema.JsonObject }))(
+          yield* readMcpHttpResponse(response)
+        )
+        assert.deepStrictEqual(message.result.capabilities, { completions: {}, logging: {}, extensions })
+      }))
+
+    it.effect("should serve independent requests when no discovery or session exists", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const first = yield* test.post(request(1, "tools/list"), headers("tools/list"))
+        const second = yield* test.post(request(2, "tools/list"), {
+          ...headers("tools/list"),
+          "Mcp-Session-Id": "ignored-modern-session"
+        })
+
+        assert.strictEqual(first.status, 200)
+        assert.strictEqual(second.status, 200)
+        assert.isNull(first.headers.get("Mcp-Session-Id"))
+      }))
+
+    it.effect("should return method not found when the removed initialize method is requested", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const response = yield* test.post(request(10, "initialize"), headers("initialize"))
+        const message = yield* decodeError(response)
+
+        assert.strictEqual(response.status, 404)
+        assert.strictEqual(message.error.code, McpSchema.METHOD_NOT_FOUND_ERROR_CODE)
+      }))
+
+    it.effect("should accept cancellation notifications without request metadata", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const response = yield* test.post({
+          jsonrpc: "2.0",
+          method: "notifications/cancelled",
+          params: { requestId: "already-complete" }
+        }, headers("notifications/cancelled"))
+
+        assert.strictEqual(response.status, 202)
+        assert.strictEqual(yield* Effect.promise(() => response.text()), "")
+      }))
+  })
+
+  describe("Transports", () => {
+    // Required headers must produce HeaderMismatch even when body metadata is also absent.
+    // https://modelcontextprotocol.io/specification/2026-07-28/basic/transports/streamable-http#server-validation
+    it.effect("should return HeaderMismatch when a July-only request omits headers and metadata", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const cases = [
+          { jsonrpc: "2.0", id: "missing", method: "tools/list", params: {} },
+          {
+            jsonrpc: "2.0",
+            id: "legacy-initialize",
+            method: "initialize",
+            params: {
+              protocolVersion: "2025-11-25",
+              capabilities: {},
+              clientInfo: { name: "legacy-client", version: "1.0.0" }
+            }
+          }
+        ]
+        for (const body of cases) {
+          const response = yield* test.post(body)
+          assert.strictEqual(response.status, 400, body.id)
+          const error = yield* decodeError(response)
+          assert.strictEqual(error.id, body.id)
+          assert.strictEqual(error.error.code, McpSchema.HEADER_MISMATCH_ERROR_CODE)
+        }
+      }))
+
+    // Nested properties may mirror parameters; missing or mismatched headers must prevent execution.
+    // https://modelcontextprotocol.io/specification/2026-07-28/basic/transports/streamable-http#server-behavior-for-custom-headers
+    it.effect("should validate nested mirrored parameters before executing a tool", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const initialized = yield* test.initialize({ server: "features" })
+        for (const header of [undefined, "us", "eu", "=?base64?ZXU=?="]) {
+          yield* test.resetObservations
+          const response = yield* test.send(initialized, {
+            jsonrpc: "2.0",
+            id: "nested",
+            method: "tools/call",
+            params: { name: "HeaderTool", arguments: { region: "eu", routing: { region: "eu" } } }
+          }, {
+            headers: {
+              "Mcp-Param-Region": "eu",
+              ...(header === undefined ? {} : { "Mcp-Param-Nested-Region": header })
+            }
+          })
+          if (header === undefined || header === "us") {
+            assert.strictEqual((yield* test.observations).toolInvocations, 0)
+            assert.strictEqual(response.status, 400)
+            const error = yield* decodeError(response)
+            assert.strictEqual(error.error.code, McpSchema.HEADER_MISMATCH_ERROR_CODE)
+          } else {
+            assert.strictEqual((yield* test.observations).toolInvocations, 1)
+            assert.strictEqual(response.status, 200)
+          }
+        }
+      }))
+
+    // SEP-2567: https://modelcontextprotocol.io/seps/2567-remove-sessions
+    it.effect("should exchange self-contained newline-delimited requests over stdio", () =>
+      Effect.gen(function*() {
+        const fixture = yield* makeMcpStdioHarness(protocol)
+        const response = yield* fixture.sendRequest("server/discover", {})
+        const result = Schema.decodeUnknownSync(Schema.Struct({
+          supportedVersions: Schema.Array(Schema.String),
+          capabilities: Schema.Record(Schema.String, Schema.Unknown),
+          resultType: Schema.Literal("complete"),
+          ttlMs: Schema.Number,
+          cacheScope: Schema.Literal("private"),
+          _meta: Schema.Struct({
+            "io.modelcontextprotocol/serverInfo": Schema.Struct({
+              name: Schema.String,
+              version: Schema.String
+            })
+          })
+        }))(response.result)
+
+        assert.deepStrictEqual(result.supportedVersions, ["2026-07-28"])
+        assert.deepStrictEqual(result.capabilities, { completions: {}, logging: {} })
+        assert.strictEqual(result.ttlMs, 0)
+        assert.deepStrictEqual(result._meta["io.modelcontextprotocol/serverInfo"], {
+          name: "McpConformance",
+          version: "1.0.0"
+        })
+      }))
+
+    it.effect("should accept every required routing name when the header matches the request", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const cases = [
+          ["tools/call", { name: "ConformanceTool", arguments: {} }, "ConformanceTool"],
+          ["resources/read", { uri: "file:///conformance.txt" }, "file:///conformance.txt"],
+          ["prompts/get", { name: "ConformancePrompt", arguments: {} }, "ConformancePrompt"]
+        ] as const
+
+        for (const [index, [method, params, name]] of cases.entries()) {
+          const response = yield* test.post(request(index + 1, method, params), headers(method, name))
+          assert.strictEqual(response.status, 200)
+        }
+
+        const encodedName = `=?base64?${Encoding.encodeBase64("file:///conformance.txt")}?=`
+        const encoded = yield* test.post(
+          request(4, "resources/read", { uri: "file:///conformance.txt" }),
+          headers("resources/read", encodedName)
+        )
+        assert.strictEqual(encoded.status, 200)
+      }))
+
+    // Conformance: http-header-validation
+    it.effect("should treat an unmatched Base64 wrapper as a literal when routing a request", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const value = "=?base64?SGVsbG8="
+        const response = yield* test.post(
+          request(5, "tools/call", { name: "HeaderTool", arguments: { region: value } }),
+          { ...headers("tools/call", "HeaderTool"), "Mcp-Param-region": value }
+        )
+
+        assert.strictEqual(response.status, 200)
+      }))
+
+    it.effect("should reject routing headers when they are missing, malformed, or mismatched", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const cases = [
+          [request("missing", "tools/list"), { "MCP-Protocol-Version": protocol.protocolVersion }],
+          [request("mismatch", "tools/list"), headers("tools/call")],
+          [
+            request("malformed", "resources/read", { uri: "file:///conformance.txt" }),
+            headers("resources/read", "=?base64?not-valid!?=")
+          ],
+          [
+            request("invalid-utf8", "resources/read", { uri: "\uFFFD" }),
+            headers("resources/read", "=?base64?/w==?=")
+          ]
+        ] as const
+
+        // SEP-2243: https://modelcontextprotocol.io/seps/2243-http-standardization
+        // The final specification assigns the HeaderMismatch error code.
+        // https://modelcontextprotocol.io/specification/2026-07-28/basic/transports#request-metadata
+        for (const [body, requestHeaders] of cases) {
+          const response = yield* test.post(body, requestHeaders)
+          const error = yield* decodeError(response)
+          assert.strictEqual(response.status, 400)
+          assert.strictEqual(error.id, body.id)
+          assert.strictEqual(error.error.code, McpSchema.HEADER_MISMATCH_ERROR_CODE)
+        }
+      }))
+
+    it.effect("should reject an unsupported request version with the supported versions", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const body = {
+          ...request(5, "tools/list"),
+          params: {
+            _meta: {
+              ...metadata,
+              "io.modelcontextprotocol/protocolVersion": "2099-01-01"
+            }
+          }
+        }
+        const response = yield* test.post(body, {
+          "MCP-Protocol-Version": "2099-01-01",
+          "Mcp-Method": "tools/list"
+        })
+        const error = yield* decodeError(response)
+
+        assert.strictEqual(response.status, 400)
+        assert.strictEqual(error.id, 5)
+        assert.strictEqual(error.error.code, -32022)
+        assert.deepStrictEqual(error.error.data, {
+          supported: ["2026-07-28"],
+          requested: "2099-01-01"
+        })
+      }))
+
+    // https://modelcontextprotocol.io/specification/2026-07-28/changelog#removals
+    it.effect("should return method not found when a request uses an unknown or removed method", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const methods = [
+          "unknown/method",
+          "ping",
+          "logging/setLevel",
+          "resources/subscribe",
+          "resources/unsubscribe",
+          "tasks/get"
+        ] as const
+
+        for (const [index, method] of methods.entries()) {
+          const id = index + 6
+          const response = yield* test.post(request(id, method), headers(method))
+          const error = yield* decodeError(response)
+          assert.strictEqual(response.status, 404, method)
+          assert.strictEqual(error.id, id, method)
+          assert.strictEqual(error.error.code, McpSchema.METHOD_NOT_FOUND_ERROR_CODE, method)
+        }
+      }))
+  })
+
+  describe("Request metadata", () => {
+    it.effect("should return InvalidParams when required request metadata is missing", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const body = request(20, "tools/list")
+        const cases = [
+          { ...body, params: {} },
+          {
+            ...body,
+            params: {
+              _meta: {
+                "io.modelcontextprotocol/clientCapabilities": {},
+                "io.modelcontextprotocol/clientInfo": metadata["io.modelcontextprotocol/clientInfo"]
+              }
+            }
+          },
+          {
+            ...body,
+            params: {
+              _meta: { "io.modelcontextprotocol/protocolVersion": protocol.protocolVersion }
+            }
+          }
+        ]
+
+        for (const requestBody of cases) {
+          const response = yield* test.post(requestBody, headers("tools/list"))
+          const error = yield* decodeError(response)
+          assert.strictEqual(response.status, 400)
+          assert.strictEqual(error.id, body.id)
+          assert.strictEqual(error.error.code, McpSchema.INVALID_PARAMS_ERROR_CODE)
+        }
+      }))
+
+    it.effect("should accept a request when optional client identity is omitted", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const body = request(22, "tools/list")
+        const response = yield* test.post({
+          ...body,
+          params: {
+            _meta: {
+              "io.modelcontextprotocol/protocolVersion": protocol.protocolVersion,
+              "io.modelcontextprotocol/clientCapabilities": {}
+            }
+          }
+        }, headers("tools/list"))
+
+        assert.strictEqual(response.status, 200)
+      }))
+
+    it.effect("should preserve caller metadata alongside authoritative protocol facts", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const discovered = yield* test.initialize({ server: "features" })
+        const response = yield* test.send(discovered, {
+          jsonrpc: "2.0",
+          id: 8,
+          method: "tools/call",
+          params: {
+            name: "RequestMetadataTool",
+            arguments: {},
+            _meta: { sentinel: "preserved" }
+          }
+        })
+        const message = yield* test.decodeResult(response)
+        const result = Schema.decodeUnknownSync(Schema.Struct({ structuredContent: Schema.String }))(message.result)
+        const observed = Schema.decodeUnknownSync(Schema.Record(Schema.String, Schema.Unknown))(
+          JSON.parse(result.structuredContent)
+        )
+
+        assert.strictEqual(observed.sentinel, "preserved")
+        assert.strictEqual(observed["io.modelcontextprotocol/protocolVersion"], protocol.protocolVersion)
+        assert.deepStrictEqual(observed["io.modelcontextprotocol/clientCapabilities"], {
+          elicitation: { form: {} },
+          roots: {},
+          sampling: {}
+        })
+        assert.deepStrictEqual(observed["io.modelcontextprotocol/clientInfo"], {
+          name: "McpConformanceClient",
+          version: "1.0.0"
+        })
+      }))
+  })
+
+  describe("Result envelopes", () => {
+    // Conformance: sep-2164-resource-not-found
+    it.effect("should include the requested URI when a resource is not found", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const uri = "test://nonexistent-resource-for-conformance-testing"
+        const response = yield* test.post(
+          request(29, "resources/read", { uri }),
+          headers("resources/read", uri)
+        )
+        const error = yield* decodeError(response)
+
+        assert.strictEqual(error.error.code, McpSchema.INVALID_PARAMS_ERROR_CODE)
+        assert.deepStrictEqual(error.error.data, { uri })
+      }))
+
+    // SEP-2322 requires every successful result to declare its result type.
+    // SEP-2549 requires cache metadata on discovery, list, and resource-read results.
+    it.effect("should attach modern result and cache metadata to every cacheable operation", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const discovered = yield* test.initialize({ server: "features" })
+        const cases = [
+          ["server/discover", {}],
+          ["tools/list", {}],
+          ["prompts/list", {}],
+          ["resources/list", {}],
+          ["resources/templates/list", {}],
+          ["resources/read", { uri: "file:///test" }]
+        ] as const
+
+        for (const [index, [method, params]] of cases.entries()) {
+          const response = yield* test.send(discovered, {
+            jsonrpc: "2.0",
+            id: index + 30,
+            method,
+            params
+          })
+          assert.strictEqual(response.status, 200, method)
+          const body = yield* Effect.promise<unknown>(() => response.json())
+          assert.isObject(body, method)
+          assert.property(body, "result", method)
+          const result = Schema.decodeUnknownSync(Schema.Struct({
+            resultType: Schema.Literal("complete"),
+            ttlMs: Schema.Int,
+            cacheScope: Schema.Literals(["public", "private"]),
+            _meta: Schema.Struct({
+              "io.modelcontextprotocol/serverInfo": Schema.Struct({
+                name: Schema.String,
+                version: Schema.String
+              })
+            })
+          }))((body as { result: unknown }).result)
+
+          assert.isAtLeast(result.ttlMs, 0)
+          assert.deepStrictEqual(result._meta["io.modelcontextprotocol/serverInfo"], {
+            name: "McpConformance",
+            version: "1.0.0"
+          })
+        }
+      }))
+
+    // https://modelcontextprotocol.io/specification/2026-07-28/basic#results
+    it.effect("should attach a complete result type and server identity to every non-cacheable operation", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const discovered = yield* test.initialize({ server: "features" })
+        const cases = [
+          ["tools/call", { name: "TestTool", arguments: { value: "called" } }],
+          ["prompts/get", { name: "NoArgumentPrompt", arguments: {} }],
+          [
+            "completion/complete",
+            {
+              ref: { type: "ref/prompt", name: "TestPrompt" },
+              argument: { name: "required", value: "f" }
+            }
+          ]
+        ] as const
+
+        for (const [index, [method, params]] of cases.entries()) {
+          const response = yield* test.send(discovered, {
+            jsonrpc: "2.0",
+            id: index + 50,
+            method,
+            params
+          })
+          const message = yield* test.decodeResult(response)
+          const result = Schema.decodeUnknownSync(Schema.Struct({
+            resultType: Schema.Literal("complete"),
+            _meta: Schema.Struct({
+              "io.modelcontextprotocol/serverInfo": Schema.Struct({
+                name: Schema.String,
+                version: Schema.String
+              })
+            })
+          }))(message.result)
+
+          assert.deepStrictEqual(result._meta["io.modelcontextprotocol/serverInfo"], {
+            name: "McpConformance",
+            version: "1.0.0"
+          })
+        }
+      }))
+  })
+
+  describe("Multi round-trip request capabilities", () => {
+    // Conformance: input-required-result-tampered-state
+    it.effect("should return InvalidParams when a resumed tool rejects its requestState", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const discovered = yield* test.initialize({ server: "features" })
+        const response = yield* test.send(discovered, {
+          jsonrpc: "2.0",
+          id: 37,
+          method: "tools/call",
+          params: {
+            name: MrtrInvalidStateToolName,
+            arguments: {},
+            inputResponses: { approval: { action: "accept", content: { approved: true } } },
+            requestState: "tampered"
+          }
+        })
+        const error = yield* decodeError(response)
+
+        assert.strictEqual(response.status, 200)
+        assert.strictEqual(error.error.code, McpSchema.INVALID_PARAMS_ERROR_CODE)
+      }))
+
+    // https://modelcontextprotocol.io/specification/2026-07-28/client/sampling#tools-in-sampling
+    it.effect("should reject tool-enabled sampling when the client omits sampling.tools", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const discovered = yield* test.initialize({ server: "features" })
+        const cases = [MrtrSamplingToolsToolName, MrtrSamplingToolChoiceToolName] as const
+        for (const [index, name] of cases.entries()) {
+          const response = yield* test.send(discovered, {
+            jsonrpc: "2.0",
+            id: index + 38,
+            method: "tools/call",
+            params: { name, arguments: {} }
+          }, { clientCapabilities: { sampling: {} } })
+          const error = yield* decodeError(response)
+
+          assert.strictEqual(response.status, 400)
+          assert.strictEqual(error.error.code, -32021)
+          assert.deepStrictEqual(error.error.data, {
+            requiredCapabilities: { sampling: { tools: {} } }
+          })
+        }
+      }))
+
+    // https://modelcontextprotocol.io/specification/2026-07-28/client/elicitation#capabilities
+    it.effect("should treat an empty elicitation capability as form support", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const discovered = yield* test.initialize({ server: "features" })
+        const response = yield* test.send(discovered, {
+          jsonrpc: "2.0",
+          id: 39,
+          method: "tools/call",
+          params: { name: MrtrToolName, arguments: {} }
+        }, {
+          clientCapabilities: {
+            elicitation: {},
+            sampling: {},
+            roots: {}
+          }
+        })
+        const message = yield* test.decodeResult(response)
+        const result = Schema.decodeUnknownSync(Schema.Struct({
+          resultType: Schema.Literal("input_required"),
+          inputRequests: Schema.Record(Schema.String, Schema.Unknown)
+        }))(message.result)
+
+        assert.deepStrictEqual(result.inputRequests.approval, {
+          method: "elicitation/create",
+          params: {
+            message: "Approve the operation",
+            requestedSchema: {
+              type: "object",
+              properties: {
+                approved: { type: "boolean" },
+                color: { type: "string", enum: ["red", "blue"] },
+                titled: { type: "string", oneOf: [{ const: "red", title: "Red" }, { const: "blue", title: "Blue" }] },
+                legacy: { type: "string", enum: ["red", "blue"], enumNames: ["Red", "Blue"] }
+              },
+              required: ["approved"]
+            }
+          }
+        })
+      }))
+
+    // https://modelcontextprotocol.io/specification/2026-07-28/basic/patterns/mrtr#server-requirements-capability-validation
+    it.effect("should reject input requests when the client omits their required capabilities", () =>
+      Effect.gen(function*() {
+        const test = yield* McpConformance
+        const discovered = yield* test.initialize({ server: "features" })
+        const response = yield* test.send(discovered, {
+          jsonrpc: "2.0",
+          id: 40,
+          method: "tools/call",
+          params: { name: MrtrToolName, arguments: {} }
+        }, { clientCapabilities: {} })
+        const error = yield* decodeError(response)
+
+        assert.strictEqual(response.status, 400)
+        assert.strictEqual(error.error.code, -32021)
+        const data = Schema.decodeUnknownSync(Schema.Struct({
+          requiredCapabilities: Schema.JsonObject
+        }))(error.error.data)
+        assert.deepStrictEqual(data, {
+          requiredCapabilities: {
+            elicitation: { form: {} },
+            sampling: {},
+            roots: {}
+          }
+        })
+      }))
+  })
+})
diff --git a/repos/effect/packages/effect/test/unstable/ai/Prompt.test.ts b/repos/effect/packages/effect/test/unstable/ai/Prompt.test.ts
index a246f86e5..4037b88fa 100644
--- a/repos/effect/packages/effect/test/unstable/ai/Prompt.test.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/Prompt.test.ts
@@ -3,6 +3,29 @@ import { Schema } from "effect"
 import { Prompt, Response } from "effect/unstable/ai"
 
 describe("Prompt", () => {
+  describe("serialization", () => {
+    it("preserves text parts during serialization", () => {
+      const prompt = Prompt.make([
+        {
+          role: "user",
+          content: [
+            { type: "text", text: "first" },
+            { type: "text", text: "second" }
+          ]
+        },
+        {
+          role: "assistant",
+          content: [{ type: "text", text: "response", options: { test: { cache: "ephemeral" } } }]
+        }
+      ])
+
+      assert.deepStrictEqual(
+        Schema.decodeSync(Prompt.Prompt)(Schema.encodeSync(Prompt.Prompt)(prompt)),
+        prompt
+      )
+    })
+  })
+
   describe("part schemas", () => {
     it("exports schemas for all parts and message-specific parts", () => {
       const parts = {
@@ -55,6 +78,27 @@ describe("Prompt", () => {
   })
 
   describe("fromResponseParts", () => {
+    it("preserves file-only responses as assistant messages", () => {
+      const file = Response.makePart("file", {
+        data: new Uint8Array([0, 127, 128, 255]),
+        mediaType: "application/octet-stream",
+        metadata: { example: { id: "attachment-1", generated: true } }
+      })
+
+      assert.deepStrictEqual(
+        Prompt.fromResponseParts([file]),
+        Prompt.make([{
+          role: "assistant",
+          content: [{
+            type: "file",
+            data: "AH+A/w==",
+            mediaType: "application/octet-stream",
+            options: { example: { id: "attachment-1", generated: true } }
+          }]
+        }])
+      )
+    })
+
     it("folds streamed text and reasoning deltas into an assistant message", () => {
       const parts = [
         Response.makePart("text-start", { id: "1" }),
diff --git a/repos/effect/packages/effect/test/unstable/ai/Response.test.ts b/repos/effect/packages/effect/test/unstable/ai/Response.test.ts
index 466413496..d62f50e7a 100644
--- a/repos/effect/packages/effect/test/unstable/ai/Response.test.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/Response.test.ts
@@ -1,9 +1,204 @@
 import { describe, it } from "@effect/vitest"
-import { deepStrictEqual } from "@effect/vitest/utils"
-import { Effect, Schema } from "effect"
-import { Response } from "effect/unstable/ai"
+import { assertInstanceOf, assertTrue, deepStrictEqual } from "@effect/vitest/utils"
+import { Effect, Schema, Stream } from "effect"
+import { TestSchema } from "effect/testing"
+import { AiError, Response, Tool, Toolkit } from "effect/unstable/ai"
 
 describe("Response", () => {
+  for (
+    const [name, failureSchema] of [
+      [
+        "struct",
+        Schema.Struct({
+          type: Schema.Literal("execution-denied"),
+          reason: Schema.String,
+          detail: Schema.String
+        })
+      ],
+      ["unknown", Schema.Unknown],
+      ["record", Schema.Record(Schema.String, Schema.Unknown)]
+    ] as const
+  ) {
+    it.effect(`preserves user failure fields with the ${name} schema`, () =>
+      Effect.gen(function*() {
+        const failure = { type: "execution-denied" as const, reason: "r", detail: "IMPORTANT" }
+        const tool = Tool.make("UserFailure", {
+          success: Schema.Number,
+          failure: failureSchema,
+          failureMode: "return"
+        })
+        const toolkit = Toolkit.make(tool)
+        const handlers = yield* toolkit.pipe(Effect.provide(toolkit.toLayer({
+          UserFailure: () => Effect.fail(failure)
+        })))
+        const results = yield* handlers.handle(tool.name, {}).pipe(Effect.flatMap(Stream.runCollect))
+
+        deepStrictEqual(results, [{
+          result: failure,
+          encodedResult: failure,
+          isFailure: true,
+          failureOrigin: "handler",
+          preliminary: false
+        }], "Toolkit preserves user failure fields")
+
+        const schema = Response.AllParts(toolkit)
+        const decoded = yield* Schema.decodeUnknownEffect(schema)({
+          type: "tool-result",
+          id: "tool-123",
+          name: tool.name,
+          isFailure: true,
+          result: failure
+        })
+
+        assertTrue(decoded.type === "tool-result")
+        assertTrue(decoded.isFailure)
+        deepStrictEqual(decoded.result, failure, "decoded user failure")
+        deepStrictEqual(decoded.encodedResult, failure, "decoded encodedResult")
+
+        const encoded = yield* Schema.encodeEffect(schema)(decoded)
+        assertTrue(encoded.type === "tool-result")
+        deepStrictEqual(encoded.result, failure, "re-encoded user failure")
+      }))
+  }
+
+  it.effect("round trips a returned AiError through Toolkit and AllParts JSON with an unknown failure schema", () =>
+    Effect.gen(function*() {
+      const tool = Tool.make("FrameworkFailure", {
+        success: Schema.Number,
+        failure: Schema.Unknown,
+        failureMode: "return"
+      })
+      const toolkit = Toolkit.make(tool)
+      const failure = new AiError.AiError({
+        module: "Test",
+        method: "FrameworkFailure",
+        reason: new AiError.RateLimitError({})
+      })
+      const handlers = yield* toolkit.pipe(Effect.provide(toolkit.toLayer({
+        FrameworkFailure: () => Effect.fail(failure)
+      })))
+      const results = yield* handlers.handle(tool.name, {}).pipe(Effect.flatMap(Stream.runCollect))
+      const encodedFailure = yield* Schema.encodeEffect(AiError.AiError)(failure)
+
+      deepStrictEqual(results, [{
+        result: failure,
+        encodedResult: encodedFailure,
+        isFailure: true,
+        failureOrigin: "handler",
+        preliminary: false
+      }], "Toolkit failure result")
+
+      const part = Response.makePart("tool-result", {
+        ...results[0],
+        id: "tool-123",
+        name: tool.name,
+        providerExecuted: false
+      })
+      const schema = Response.AllParts(toolkit)
+      const encoded = yield* Schema.encodeEffect(schema)(part)
+      const decoded = yield* Schema.decodeUnknownEffect(schema)(JSON.parse(JSON.stringify(encoded)))
+
+      assertTrue(decoded.type === "tool-result")
+      assertTrue(decoded.isFailure)
+      assertInstanceOf(decoded.result, AiError.AiError)
+      assertInstanceOf(decoded.result.reason, AiError.RateLimitError)
+      deepStrictEqual(decoded.result.module, failure.module)
+      deepStrictEqual(decoded.result.method, failure.method)
+      deepStrictEqual(decoded.encodedResult, encodedFailure, "round-tripped encoded AiError")
+    }))
+
+  describe("provider-defined tool execution failures", () => {
+    const tool = Tool.providerDefined({
+      id: "test.provider_tool",
+      customName: "ProviderTool",
+      providerName: "provider_tool",
+      success: Schema.Unknown
+    })()
+    const schema = Response.AllParts(Toolkit.make(tool))
+
+    for (
+      const result of [
+        { type: "execution-denied", reason: "User declined" },
+        {
+          type: "execution-interrupted",
+          reason: "Tool call execution was interrupted because the response finished with reason \"length\""
+        }
+      ]
+    ) {
+      it.effect(`round trips ${result.type} through AllParts JSON`, () =>
+        Effect.gen(function*() {
+          const part = Response.makePart("tool-result", {
+            id: "tool-123",
+            name: tool.name,
+            isFailure: true,
+            result,
+            encodedResult: result,
+            providerExecuted: false,
+            preliminary: false
+          })
+
+          const encoded = yield* Schema.encodeUnknownEffect(schema)(part)
+          const decoded = yield* Schema.decodeUnknownEffect(schema)(JSON.parse(JSON.stringify(encoded)))
+
+          deepStrictEqual<unknown>(decoded, part, "decoded execution failure")
+        }))
+    }
+  })
+
+  describe("tool results with overlapping success and failure types", () => {
+    const tool = Tool.make("ResultEncoding", {
+      success: Schema.Number,
+      failure: Schema.NumberFromString,
+      failureMode: "return"
+    })
+    const schema = Response.ToolResultPart(tool.name, tool.successSchema, tool.failureSchema)
+    const allParts = Response.AllParts(Toolkit.make(tool))
+
+    for (const isFailure of [false, true]) {
+      const branch = isFailure ? "failure" : "success"
+      const encodedResult = isFailure ? "404" : 404
+      const part = Response.makePart("tool-result", {
+        id: "tool-123",
+        name: "ResultEncoding",
+        isFailure,
+        result: 404,
+        encodedResult,
+        providerExecuted: false,
+        preliminary: false
+      })
+
+      it.effect(`encodes a ${branch} with the ${branch} schema`, () =>
+        Effect.gen(function*() {
+          const encoded = yield* Schema.encodeEffect(schema)(part)
+
+          deepStrictEqual(encoded, {
+            type: "tool-result",
+            id: "tool-123",
+            name: "ResultEncoding",
+            isFailure,
+            result: encodedResult,
+            providerExecuted: false,
+            preliminary: false,
+            metadata: {}
+          }, "encoded tool result")
+        }))
+
+      it(`rejects an encodedResult from the other branch for a ${branch}`, () =>
+        new TestSchema.Asserts(schema).encoding().fail(
+          { ...part, encodedResult: isFailure ? 404 : "404" },
+          `Expected ${isFailure ? "string" : "number"}\n  at ["encodedResult"]`
+        ))
+
+      it.effect(`preserves a ${branch} encodedResult through an AllParts JSON round trip`, () =>
+        Effect.gen(function*() {
+          const encoded = yield* Schema.encodeEffect(allParts)(part)
+          const decoded = yield* Schema.decodeUnknownEffect(allParts)(JSON.parse(JSON.stringify(encoded)))
+
+          deepStrictEqual(decoded, part, "decoded tool result")
+        }))
+    }
+  })
+
   it.effect("decodes response metadata with omitted optional fields", () =>
     Effect.gen(function*() {
       const encoded: Response.ResponseMetadataPartEncoded = {
diff --git a/repos/effect/packages/effect/test/unstable/ai/Tokenizer.test.ts b/repos/effect/packages/effect/test/unstable/ai/Tokenizer.test.ts
new file mode 100644
index 000000000..1c228ab4d
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/ai/Tokenizer.test.ts
@@ -0,0 +1,24 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Effect } from "effect"
+import { Prompt, Tokenizer } from "effect/unstable/ai"
+
+describe("Tokenizer", () => {
+  it.effect("truncate accounts for costs between messages", () =>
+    Effect.gen(function*() {
+      const tokenizer = Tokenizer.make({
+        tokenize: (prompt) =>
+          Effect.succeed(
+            Array.from({ length: Math.max(0, prompt.content.length * 2 - 1) }, (_, index) => index)
+          )
+      })
+      const input = Prompt.make([
+        { role: "user", content: "a" },
+        { role: "assistant", content: "b" }
+      ])
+
+      const output = yield* tokenizer.truncate(input, 2)
+
+      assert.deepStrictEqual(output.content, [input.content[1]])
+      assert.isAtMost((yield* tokenizer.tokenize(output)).length, 2)
+    }))
+})
diff --git a/repos/effect/packages/effect/test/unstable/ai/Tool.test.ts b/repos/effect/packages/effect/test/unstable/ai/Tool.test.ts
index b92d2d5c3..b2d46fe3f 100644
--- a/repos/effect/packages/effect/test/unstable/ai/Tool.test.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/Tool.test.ts
@@ -87,6 +87,21 @@ describe("Tool", () => {
         ])
       }))
 
+    it.effect("should encode returned failures with the failure schema", () =>
+      Effect.gen(function*() {
+        const toolkit = Toolkit.make(Tool.make("FailureEncoding", {
+          success: Schema.Number,
+          failure: Schema.NumberFromString,
+          failureMode: "return"
+        }))
+        const handlers = yield* toolkit.pipe(Effect.provide(toolkit.toLayer({
+          FailureEncoding: () => Effect.fail(404)
+        })))
+        const results = yield* handlers.handle("FailureEncoding", {}).pipe(Effect.flatMap(Stream.runCollect))
+
+        strictEqual(results[0].encodedResult, "404")
+      }))
+
     it.effect("should return tool call handler failures with failure mode return using OpenAI transformer", () =>
       Effect.gen(function*() {
         const toolkit = Toolkit.make(FailureModeReturn)
@@ -158,7 +173,7 @@ describe("Tool", () => {
         deepStrictEqual(response, toolResult)
       }))
 
-    it.effect("should raise an error when tool call parameters are invalid", () =>
+    it.effect("should return a failed tool result when tool call parameters are invalid and failure mode is return", () =>
       Effect.gen(function*() {
         const toolkit = Toolkit.make(FailureModeReturn)
 
@@ -182,6 +197,96 @@ describe("Tool", () => {
               params: {}
             }]
           }),
+          Effect.provide(handlers)
+        )
+
+        const description = `Missing key\n  at ["testParam"]`
+        deepStrictEqual(response.toolResults, [
+          Response.toolResultPart({
+            id: toolCallId,
+            name: toolName,
+            isFailure: true,
+            providerExecuted: false,
+            preliminary: false,
+            result: AiError.make({
+              module: "Toolkit",
+              method: "FailureModeReturn.handle",
+              reason: new AiError.ToolParameterValidationError({
+                toolName,
+                description
+              })
+            }),
+            encodedResult: {
+              _tag: "AiError",
+              module: "Toolkit",
+              method: "FailureModeReturn.handle",
+              reason: {
+                _tag: "ToolParameterValidationError",
+                toolName,
+                description
+              }
+            }
+          })
+        ])
+      }))
+
+    it.effect("should return a failed tool result when tool call parameters contain NaN and failure mode is return", () =>
+      Effect.gen(function*() {
+        const toolkit = Toolkit.make(FailureModeReturn)
+
+        const handlers = toolkit.toLayer({
+          FailureModeReturn: () => Effect.succeed({ testSuccess: "unused" })
+        })
+
+        const toolCallId = "tool-123"
+        const toolName = "FailureModeReturn"
+
+        const response = yield* LanguageModel.generateText({
+          prompt: "Test",
+          toolkit
+        }).pipe(
+          TestUtils.withLanguageModel({
+            generateText: [{
+              type: "tool-call",
+              id: toolCallId,
+              name: toolName,
+              params: { testParam: NaN }
+            }]
+          }),
+          Effect.provide(handlers)
+        )
+
+        strictEqual(response.toolResults.length, 1)
+        const toolResult = response.toolResults[0]
+        strictEqual(toolResult.isFailure, true)
+        const result = toolResult.result as AiError.AiError
+        strictEqual(result._tag, "AiError")
+        strictEqual(result.reason._tag, "ToolParameterValidationError")
+      }))
+
+    it.effect("should raise an error when tool call parameters are invalid and failure mode is error", () =>
+      Effect.gen(function*() {
+        const toolkit = Toolkit.make(FailureModeError)
+
+        const handlers = toolkit.toLayer({
+          FailureModeError: () => Effect.succeed({ testSuccess: "unused" })
+        })
+
+        const toolCallId = "tool-123"
+        const toolName = "FailureModeError"
+
+        const response = yield* LanguageModel.generateText({
+          prompt: "Test",
+          toolkit
+        }).pipe(
+          TestUtils.withLanguageModel({
+            generateText: [{
+              type: "tool-call",
+              id: toolCallId,
+              name: toolName,
+              params: { testParam: NaN }
+            }]
+          }),
           Effect.provide(handlers),
           Effect.flip
         )
@@ -190,11 +295,10 @@ describe("Tool", () => {
           response,
           AiError.make({
             module: "Toolkit",
-            method: "FailureModeReturn.handle",
+            method: "FailureModeError.handle",
             reason: new AiError.ToolParameterValidationError({
-              toolName: "FailureModeReturn",
-              toolParams: {},
-              description: `Missing key\n  at ["testParam"]`
+              toolName: "FailureModeError",
+              description: `Expected string\n  at ["testParam"]`
             })
           })
         )
@@ -870,7 +974,7 @@ describe("Tool", () => {
         deepStrictEqual(response, toolResult)
       }))
 
-    it.effect("should raise an error when tool call parameters are invalid", () =>
+    it.effect("should return a failed tool result when tool call parameters are invalid and failure mode is return", () =>
       Effect.gen(function*() {
         const tool = HandlerRequired({
           failureMode: "return",
@@ -902,22 +1006,37 @@ describe("Tool", () => {
               }
             ]
           }),
-          Effect.provide(handlers),
-          Effect.flip
+          Effect.provide(handlers)
         )
 
-        deepStrictEqual(
-          response,
-          AiError.make({
-            module: "Toolkit",
-            method: "HandlerRequired.handle",
-            reason: new AiError.ToolParameterValidationError({
-              toolName: "HandlerRequired",
-              toolParams: {},
-              description: `Missing key\n  at ["testParam"]`
-            })
+        const description = `Missing key\n  at ["testParam"]`
+        deepStrictEqual(response.toolResults, [
+          Response.toolResultPart({
+            id: toolCallId,
+            name: tool.name,
+            isFailure: true,
+            providerExecuted: false,
+            preliminary: false,
+            result: AiError.make({
+              module: "Toolkit",
+              method: "HandlerRequired.handle",
+              reason: new AiError.ToolParameterValidationError({
+                toolName: "HandlerRequired",
+                description
+              })
+            }),
+            encodedResult: {
+              _tag: "AiError",
+              module: "Toolkit",
+              method: "HandlerRequired.handle",
+              reason: {
+                _tag: "ToolParameterValidationError",
+                toolName: "HandlerRequired",
+                description
+              }
+            }
           })
-        )
+        ])
       }))
 
     describe("addDependency", () => {
@@ -1077,6 +1196,18 @@ describe("setNeedsApproval", () => {
 })
 
 describe("Dynamic", () => {
+  it("setParameters replaces a raw JSON Schema", () => {
+    const tool = Tool.dynamic("TestTool", {
+      parameters: {
+        type: "object",
+        properties: { query: { type: "string" } },
+        required: ["query"]
+      }
+    }).setParameters(Schema.Struct({ count: Schema.Number }))
+
+    deepStrictEqual(Tool.getJsonSchema(tool).required, ["count"], "expected the replacement schema")
+  })
+
   describe("isDynamic", () => {
     it.effect("returns true for dynamic tools with Effect Schema", () =>
       Effect.gen(function*() {
@@ -1291,6 +1422,7 @@ describe("Dynamic", () => {
         )
 
         const toolResult = response.toolResults[0]
+        assertTrue(!toolResult.isFailure, "expected a successful tool result")
         deepStrictEqual(toolResult.result.timestamp, DateTime.makeUnsafe(new Date(1000)))
       }))
   })
diff --git a/repos/effect/packages/effect/test/unstable/ai/ToolRepresentation.test.ts b/repos/effect/packages/effect/test/unstable/ai/ToolRepresentation.test.ts
index 01d81b05d..47c6326a2 100644
--- a/repos/effect/packages/effect/test/unstable/ai/ToolRepresentation.test.ts
+++ b/repos/effect/packages/effect/test/unstable/ai/ToolRepresentation.test.ts
@@ -29,7 +29,7 @@ describe("Tool representation v2", () => {
         }
       },
       required: ["value"],
-      additionalProperties: false
+      additionalProperties: true
     })
   })
 })
diff --git a/repos/effect/packages/effect/test/unstable/arbitrary/Arbitrary.array.test.ts b/repos/effect/packages/effect/test/unstable/arbitrary/Arbitrary.array.test.ts
new file mode 100644
index 000000000..999455f23
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/arbitrary/Arbitrary.array.test.ts
@@ -0,0 +1,309 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Effect, Result, Schema } from "effect"
+import * as Arbitrary from "effect/unstable/arbitrary/Arbitrary"
+
+describe("Arbitrary array shrinking", () => {
+  const item = Arbitrary.schema(Schema.Literals([8, 27, 0, 1]), { shrink: (n) => n === 8 ? [1] as const : [] })
+  it.effect("reduces custom command sequences to Reset followed by Stop", () =>
+    Effect.gen(function*() {
+      const command = Arbitrary.map(item, (n) =>
+        n === 27
+          ? { _tag: "Reset" } as const
+          : n === 0
+          ? { _tag: "Stop" } as const
+          : { _tag: "Add", value: n } as const)
+      const commands = Arbitrary.array(command, { maxLength: 50 })
+      const property = (values: ReadonlyArray<{ readonly _tag: string }>) => {
+        const reset = values.findIndex((value) => value._tag === "Reset")
+        return reset === -1 || !values.slice(reset + 1).some((value) => value._tag === "Stop")
+      }
+      const result = yield* Arbitrary.checkEffect(commands, property, { runs: 1, size: 4, seed: 395 })
+      assert.strictEqual(result._tag, "Falsified")
+      if (result._tag === "Falsified") {
+        assert.strictEqual(result.initialInput.length, 4)
+        assert.deepStrictEqual(result.shrunkInput, [{ _tag: "Reset" }, { _tag: "Stop" }])
+        assert.deepStrictEqual(yield* Arbitrary.checkEffect(commands, property, { replay: result.replay }), result)
+      }
+    }))
+  for (
+    const [name, arbitrary, seed] of [
+      ["schema", item, 30],
+      [
+        "validated shrink",
+        Arbitrary.schema(Schema.Literals([8, 27, 0, 1]), {
+          shrink: (n) => n === 8 ? [99 as 8, 1] as const : []
+        }),
+        30
+      ],
+      ["map", Arbitrary.map(item, (n) => n), 30],
+      ["filter", Arbitrary.filter(item, (n) => n >= 0), 30],
+      ["filterMap", Arbitrary.filterMap(item, Result.succeed), 30],
+      ["flatMap", Arbitrary.flatMap(item, Arbitrary.Constant), 30],
+      ["all", Arbitrary.map(Arbitrary.all([item, Arbitrary.Constant("tag")]), ([n]) => n), 597]
+    ] as const
+  ) {
+    it.effect(`retries a previously passing element shrink after deletion (${name})`, () =>
+      Effect.gen(function*() {
+        const array = Arbitrary.array(arbitrary, { minLength: 2, maxLength: 4 })
+        const evaluated: Array<ReadonlyArray<number>> = []
+        const property = (values: ReadonlyArray<number>) => {
+          assert.isFalse(values.includes(99))
+          evaluated.push(values)
+          return !["8,27,0", "8,0", "1,0"].includes(values.join(","))
+        }
+        const result = yield* Arbitrary.checkEffect(array, property, { runs: 1, size: 4, seed })
+        assert.strictEqual(result._tag, "Falsified")
+        if (result._tag === "Falsified") {
+          assert.deepStrictEqual(result.initialInput, [8, 27, 0])
+          assert.deepStrictEqual(result.shrunkInput, [1, 0])
+          assert.isTrue(evaluated.some((values) => values.join(",") === "1,27,0"))
+          assert.deepStrictEqual(yield* Arbitrary.checkEffect(array, property, { replay: result.replay }), result)
+        }
+      }))
+  }
+
+  for (
+    const [name, arbitrary, seed] of [
+      ["Schema", Arbitrary.schema(Schema.Array(Schema.Literals([8, 27, 0, 1])).check(Schema.isMinLength(2))), 1967],
+      ["custom", Arbitrary.array(item, { minLength: 2, maxLength: 4 }), 395]
+    ] as const
+  ) {
+    it.effect(`removes a middle block when no single deletion fails (${name})`, () =>
+      Effect.gen(function*() {
+        const property = (values: ReadonlyArray<number>) => {
+          assert.isAtLeast(values.length, 2)
+          return !["8,27,0,1", "8,1"].includes(values.join(","))
+        }
+        const result = yield* Arbitrary.checkEffect(arbitrary, property, { runs: 1, size: 4, seed })
+        assert.strictEqual(result._tag, "Falsified")
+        if (result._tag === "Falsified") {
+          assert.deepStrictEqual(result.initialInput, [8, 27, 0, 1])
+          assert.deepStrictEqual(result.shrunkInput, [8, 1])
+          assert.deepStrictEqual(yield* Arbitrary.checkEffect(arbitrary, property, { replay: result.replay }), result)
+        }
+      }))
+  }
+
+  it("rejects invalid length bounds immediately", () => {
+    for (const length of [-1, 0.5, NaN, Infinity, 0x100000000]) {
+      assert.throws(() => Arbitrary.array(item, { minLength: length }), RangeError)
+      assert.throws(() => Arbitrary.array(item, { maxLength: length }), RangeError)
+    }
+    assert.throws(() => Arbitrary.array(item, { minLength: 3, maxLength: 2 }), RangeError)
+    assert.doesNotThrow(() => Arbitrary.array(item, { maxLength: 0xffffffff }))
+  })
+
+  it.effect("honors minima at size zero, maxima and exact lengths", () =>
+    Effect.gen(function*() {
+      for (const options of [{}, { minLength: 3 }, { maxLength: 2 }, { minLength: 2, maxLength: 2 }]) {
+        for (const size of [0, 1, 10]) {
+          const arbitrary = Arbitrary.array(item, options)
+          const values = yield* Arbitrary.sampleEffect(arbitrary, { size, count: 50, seed: "array-bounds" })
+          assert.isTrue(values.every((value) =>
+            value.length >= (options.minLength ?? 0) &&
+            value.length <= Math.min(options.maxLength ?? Infinity, Math.max(size, options.minLength ?? 0))
+          ))
+          const result = yield* Arbitrary.checkEffect(arbitrary, () => false, { size, runs: 1, seed: "array-bounds" })
+          assert.strictEqual(result._tag, "Falsified")
+          if (result._tag === "Falsified") {
+            assert.deepStrictEqual(result.initialInput, values[0])
+            assert.strictEqual(result.shrunkInput.length, options.minLength ?? 0)
+          }
+        }
+      }
+    }))
+
+  it.effect("does not generate elements for an empty array or shorten a discarded generation", () =>
+    Effect.gen(function*() {
+      let calls = 0
+      const rejected = Arbitrary.filter(item, () => {
+        calls++
+        return false
+      })
+      const empty = Arbitrary.array(rejected, { maxLength: 0 })
+      assert.deepStrictEqual(yield* Arbitrary.sampleEffect(empty, { count: 1, seed: 0 }), [[]])
+      assert.strictEqual(calls, 0)
+      const result = yield* Arbitrary.checkEffect(
+        Arbitrary.array(rejected, { minLength: 2 }),
+        () => true,
+        { runs: 1, maxDiscards: 0, seed: 0 }
+      )
+      assert.strictEqual(result._tag, "Exhausted")
+      assert.strictEqual(calls, 1)
+    }))
+
+  it.effect("preserves retained object identities and order without generating replacements", () =>
+    Effect.gen(function*() {
+      const arbitrary = Arbitrary.array(
+        Arbitrary.map(Arbitrary.Constant(null), () => ({ command: "Stop" })),
+        { minLength: 2, maxLength: 8 }
+      )
+      const seen: Array<ReadonlyArray<object>> = []
+      const result = yield* Arbitrary.checkEffect(arbitrary, (values) => {
+        seen.push(values)
+        return false
+      }, { runs: 1, size: 8, seed: 0 })
+      assert.strictEqual(result._tag, "Falsified")
+      if (result._tag === "Falsified") {
+        assert.isAbove(result.initialInput.length, 2)
+        assert.strictEqual(result.shrunkInput.length, 2)
+        for (const values of seen) {
+          const indexes = values.map((value) => result.initialInput.indexOf(value as { command: string }))
+          assert.isTrue(indexes.every((index, i) => index >= 0 && (i === 0 || index > indexes[i - 1])))
+        }
+        assert.strictEqual(result.shrunkInput[0], result.initialInput[result.initialInput.length - 2])
+        assert.strictEqual(result.shrunkInput[1], result.initialInput[result.initialInput.length - 1])
+      }
+    }))
+
+  it.effect("counts rejected element candidates against maxShrinks and replays past them", () =>
+    Effect.gen(function*() {
+      const filtered = Arbitrary.schema(Schema.Literals([8, 1, 0]), {
+        shrink: (value) => value === 8 ? [1, 0] as const : []
+      }).pipe(Arbitrary.filter((value) => value !== 1))
+      const arbitrary = Arbitrary.array(filtered, { minLength: 1, maxLength: 1 })
+      const evaluated: Array<Array<number>> = []
+      const property = (values: Array<number>) => {
+        evaluated.push(values)
+        return false
+      }
+      const limited = yield* Arbitrary.checkEffect(arbitrary, property, { runs: 1, seed: 0, maxShrinks: 1 })
+      assert.strictEqual(limited._tag, "Falsified")
+      if (limited._tag === "Falsified") {
+        assert.deepStrictEqual(limited.initialInput, [8])
+        assert.deepStrictEqual(limited.shrunkInput, [8])
+        assert.deepStrictEqual(evaluated, [[8]])
+      }
+      const result = yield* Arbitrary.checkEffect(arbitrary, property, { runs: 1, seed: 0, maxShrinks: 20 })
+      assert.strictEqual(result._tag, "Falsified")
+      if (result._tag === "Falsified") {
+        assert.deepStrictEqual(result.shrunkInput, [0])
+        assert.deepStrictEqual(yield* Arbitrary.checkEffect(arbitrary, property, { replay: result.replay }), result)
+      }
+    }))
+
+  it.effect("does not inspect element shrinking during sampling or successful checks", () =>
+    Effect.gen(function*() {
+      let shrinks = 0
+      const arbitrary = Arbitrary.array(
+        Arbitrary.schema(Schema.Literal(8), {
+          shrink: () => {
+            shrinks++
+            return []
+          }
+        }),
+        { minLength: 10, maxLength: 10 }
+      )
+      yield* Arbitrary.sampleEffect(arbitrary, { count: 10, seed: 0 })
+      yield* Arbitrary.checkEffect(arbitrary, () => true, { runs: 10, seed: 0 })
+      yield* Arbitrary.checkEffect(arbitrary, () => false, { runs: 1, seed: 0, maxShrinks: 0 })
+      assert.strictEqual(shrinks, 0)
+    }))
+
+  it.effect("shares the recursion budget across array elements and reserves required siblings", () =>
+    Effect.gen(function*() {
+      interface Chain {
+        readonly next: Chain | null
+      }
+      const Chain: Schema.Codec<Chain> = Schema.Struct({
+        next: Schema.suspend(() => Schema.Union([Schema.Null, Chain]))
+      })
+      const arbitrary = Arbitrary.all([
+        Arbitrary.array(Arbitrary.schema(Chain), { minLength: 3, maxLength: 3 }),
+        Arbitrary.schema(Chain)
+      ])
+      const depth = (chain: Chain): number => chain.next === null ? 0 : 1 + depth(chain.next)
+      const values = yield* Arbitrary.sampleEffect(arbitrary, {
+        count: 100,
+        maxDiscards: 0,
+        seed: "array-recursion-budget",
+        size: 5
+      })
+      assert.isTrue(
+        values.every(([array, last]) => array.reduce((total, chain) => total + depth(chain), depth(last)) <= 5)
+      )
+    }))
+
+  it.effect("protects fixed tuple prefixes, tails and the order of optional positions", () =>
+    Effect.gen(function*() {
+      for (
+        const schema of [
+          Schema.TupleWithRest(Schema.Tuple([Schema.Literal("head")]), [Schema.Int, Schema.Literal("tail")]),
+          Schema.Tuple([
+            Schema.Literal("head"),
+            Schema.optionalKey(Schema.Literal(27)),
+            Schema.optionalKey(Schema.Literal(0))
+          ])
+        ]
+      ) {
+        for (let seed = 0; seed < 10; seed++) {
+          const result = yield* Arbitrary.checkEffect(Arbitrary.schema(schema), (values) => {
+            assert.isTrue(Schema.is(schema)(values))
+            return false
+          }, { runs: 1, size: 8, seed })
+          assert.strictEqual(result._tag, "Falsified")
+          if (result._tag === "Falsified") {
+            assert.deepStrictEqual(
+              result.shrunkInput,
+              result.initialInput.some((value) => value === "tail")
+                ? ["head", "tail"]
+                : ["head"]
+            )
+          }
+        }
+      }
+    }))
+
+  it.effect("handles wide exact-length arrays", () =>
+    Effect.gen(function*() {
+      const arbitrary = Arbitrary.array(Arbitrary.Constant(0), { minLength: 20_000, maxLength: 20_000 })
+      const result = yield* Arbitrary.checkEffect(arbitrary, () => false, { runs: 1, seed: 0 })
+      assert.strictEqual(result._tag, "Falsified")
+      if (result._tag === "Falsified") assert.strictEqual(result.shrunkInput.length, 20_000)
+    }))
+
+  it.effect("keeps unique arrays and decoded collections valid during shrinking", () =>
+    Effect.gen(function*() {
+      for (
+        const schema of [
+          Schema.Array(Schema.Int).check(Schema.isUnique(), Schema.isMinLength(2)),
+          Schema.ReadonlySet(Schema.Int),
+          Schema.ReadonlyMap(Schema.Int, Schema.Int),
+          Schema.Uint8Array
+        ]
+      ) {
+        const result = yield* Arbitrary.checkEffect(Arbitrary.schema(schema), (value) => {
+          assert.isTrue(Schema.is(schema)(value))
+          return false
+        }, { runs: 1, size: 10, seed: 0 })
+        assert.strictEqual(result._tag, "Falsified")
+      }
+    }))
+
+  for (
+    const [name, needed] of [
+      ["prefix", [27, 0]],
+      ["middle", [8, 0]],
+      ["suffix", [8, 27]]
+    ] as const
+  ) {
+    it.effect(`removes an irrelevant ${name} from a Schema array`, () =>
+      Effect.gen(function*() {
+        const arbitrary = Arbitrary.schema(Schema.Array(Schema.Literals([8, 27, 0, 1])))
+        const property = (values: ReadonlyArray<number>) =>
+          !(values.includes(needed[0]) && values.indexOf(needed[1]) > values.indexOf(needed[0]))
+        const result = yield* Arbitrary.checkEffect(arbitrary, property, {
+          runs: 1,
+          size: 4,
+          seed: 1967,
+          maxShrinks: 1000
+        })
+        assert.strictEqual(result._tag, "Falsified")
+        if (result._tag === "Falsified") {
+          assert.deepStrictEqual(result.initialInput, [8, 27, 0, 1])
+          assert.deepStrictEqual(result.shrunkInput, needed)
+          assert.deepStrictEqual(yield* Arbitrary.checkEffect(arbitrary, property, { replay: result.replay }), result)
+        }
+      }))
+  }
+})
diff --git a/repos/effect/packages/effect/test/unstable/arbitrary/Arbitrary.composition.test.ts b/repos/effect/packages/effect/test/unstable/arbitrary/Arbitrary.composition.test.ts
new file mode 100644
index 000000000..fdf1a57d7
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/arbitrary/Arbitrary.composition.test.ts
@@ -0,0 +1,117 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Effect, Result, Schema } from "effect"
+import * as Arbitrary from "effect/unstable/arbitrary/Arbitrary"
+
+describe("Arbitrary shared shrink contexts", () => {
+  const field = Arbitrary.schema(Schema.Literals([8, 1]), { shrink: (n) => n === 8 ? [1] as const : [] })
+  const int = Schema.Int.check(Schema.isBetween({ minimum: 1, maximum: 8 }))
+
+  for (
+    const [name, pair, seed, initial] of [
+      ["all tuple", Arbitrary.all([field, field]), 0, [8, 8]],
+      ["all record", Arbitrary.all({ a: field, b: field }).pipe(Arbitrary.map(({ a, b }) => [a, b])), 0, [8, 8]],
+      ["Schema tuple", Arbitrary.schema(Schema.Tuple([int, int])), 47, [8, 3]],
+      [
+        "Schema struct",
+        Arbitrary.schema(Schema.Struct({ a: int, b: int })).pipe(Arbitrary.map(({ a, b }) => [a, b])),
+        47,
+        [8, 3]
+      ]
+    ] as const
+  ) {
+    it.effect(`preserves a sibling after promoting a filtered descendant (${name})`, () =>
+      Effect.gen(function*() {
+        const arbitrary = Arbitrary.filter(pair, ([a, b]: ReadonlyArray<number>) => a === 8 || b === 1)
+        const seen: Array<ReadonlyArray<number>> = []
+        const property = (value: ReadonlyArray<number>) => {
+          seen.push(value)
+          return value[0] !== 8
+        }
+        const result = yield* Arbitrary.checkEffect(arbitrary, property, { runs: 1, seed, maxShrinks: 100 })
+        assert.strictEqual(result._tag, "Falsified")
+        if (result._tag === "Falsified") {
+          assert.deepStrictEqual(result.initialInput, initial)
+          assert.deepStrictEqual(result.shrunkInput, [8, 1])
+          assert.isTrue(seen.some(([a, b]) => a === 1 && b === 1))
+          assert.deepStrictEqual(yield* Arbitrary.checkEffect(arbitrary, property, { replay: result.replay }), result)
+        }
+      }))
+  }
+
+  const first = Arbitrary.schema(Schema.Literals([8, 27, 0, 1]), { shrink: (n) => n === 8 ? [1] as const : [] })
+  const pair = Arbitrary.all([first, field])
+  for (
+    const [name, element, seed] of [
+      ["all", pair, 25],
+      ["map", pair.pipe(Arbitrary.map((value) => value)), 25],
+      ["filter", pair.pipe(Arbitrary.filter(() => true)), 25],
+      ["filterMap", pair.pipe(Arbitrary.filterMap(Result.succeed)), 25],
+      ["flatMap source", pair.pipe(Arbitrary.flatMap(Arbitrary.Constant)), 25],
+      ["flatMap target", Arbitrary.flatMap(Arbitrary.Constant(null), () => pair), 25],
+      ["nested all", Arbitrary.all([pair, Arbitrary.Constant("tag")]).pipe(Arbitrary.map(([value]) => value)), 611],
+      ["rejecting filter", pair.pipe(Arbitrary.filter(([a, b]) => !(a === 1 && b === 8))), 25]
+    ] as const
+  ) {
+    it.effect(`preserves descendants of a command retried after deletion (${name})`, () =>
+      Effect.gen(function*() {
+        const arbitrary = Arbitrary.array(element, { minLength: 2, maxLength: 3 })
+        const initial = [[8, 8], [27, seed === 611 ? 8 : 1], [0, 8]]
+        const failures = [initial, [[8, 8], [0, 8]], [[1, 8], [0, 8]], [[1, 1], [0, 8]]]
+          .map((value) => JSON.stringify(value))
+        const property = (value: ReadonlyArray<ReadonlyArray<number>>) => !failures.includes(JSON.stringify(value))
+        const result = yield* Arbitrary.checkEffect(arbitrary, property, { runs: 1, size: 3, seed })
+        assert.strictEqual(result._tag, "Falsified")
+        if (result._tag === "Falsified") {
+          assert.deepStrictEqual(result.initialInput, initial)
+          assert.deepStrictEqual(result.shrunkInput, [[1, 1], [0, 8]])
+          assert.deepStrictEqual(yield* Arbitrary.checkEffect(arbitrary, property, { replay: result.replay }), result)
+        }
+      }))
+  }
+
+  it.effect("preserves a sibling key after exploring a rejected key change", () =>
+    Effect.gen(function*() {
+      const schema = Schema.Record(
+        Schema.String.check(Schema.isPattern(/^[a-c]$/)),
+        Schema.Null
+      ).check(Schema.isPropertiesLengthBetween(2, 2))
+      const record = Arbitrary.schema(schema)
+      const options = { runs: 1, count: 1, seed: 13, size: 2 }
+      const [initial] = yield* Arbitrary.sampleEffect(record, options)
+      const [firstKey, secondKey] = Object.keys(initial)
+      assert.notStrictEqual(firstKey, "a")
+      assert.notStrictEqual(secondKey, "a")
+      // Reject changing the first key alone. Exploring that branch tries the
+      // second key's "a" candidate too, which must remain available at the root.
+      const arbitrary = record.pipe(
+        Arbitrary.filter((value) =>
+          Object.hasOwn(value, firstKey) || Object.hasOwn(value, "a") && !Object.hasOwn(value, secondKey)
+        )
+      )
+      const property = (value: Record<string, null>) => {
+        assert.isTrue(Schema.is(schema)(value))
+        return !Object.hasOwn(value, firstKey)
+      }
+      const result = yield* Arbitrary.checkEffect(arbitrary, property, { ...options, maxShrinks: 100 })
+      assert.strictEqual(result._tag, "Falsified")
+      if (result._tag === "Falsified") {
+        assert.deepStrictEqual(result.initialInput, initial)
+        assert.deepStrictEqual(result.shrunkInput, { [firstKey]: null, a: null })
+        assert.deepStrictEqual(yield* Arbitrary.checkEffect(arbitrary, property, { replay: result.replay }), result)
+      }
+    }))
+
+  it.effect("continues in field order while promoting rejected product descendants", () =>
+    Effect.gen(function*() {
+      const field = Arbitrary.schema(Schema.Literals([1, 0]), { shrink: (n) => n === 1 ? [0] as const : [] })
+      const arbitrary = Arbitrary.all(Array.from({ length: 7 }, () => field)).pipe(
+        Arbitrary.filter((value) => value[0] === 1)
+      )
+      const result = yield* Arbitrary.checkEffect(arbitrary, () => false, { runs: 1, seed: 198, maxShrinks: 100 })
+      assert.strictEqual(result._tag, "Falsified")
+      if (result._tag === "Falsified") {
+        assert.deepStrictEqual(result.initialInput, [1, 1, 1, 1, 1, 1, 1])
+        assert.deepStrictEqual(result.shrunkInput, [1, 0, 0, 0, 0, 0, 0])
+      }
+    }))
+})
diff --git a/repos/effect/packages/effect/test/unstable/arbitrary/Arbitrary.test.ts b/repos/effect/packages/effect/test/unstable/arbitrary/Arbitrary.test.ts
index a9f3164f3..4dca93203 100644
--- a/repos/effect/packages/effect/test/unstable/arbitrary/Arbitrary.test.ts
+++ b/repos/effect/packages/effect/test/unstable/arbitrary/Arbitrary.test.ts
@@ -394,6 +394,173 @@ describe("Arbitrary", () => {
         }
       }))
 
+    it.effect("covers independent BigDecimal precision and exponent ranges", () =>
+      Effect.gen(function*() {
+        const values = yield* Arbitrary.sampleEffect(Arbitrary.schema(Schema.BigDecimal), {
+          count: 1_000,
+          maxDiscards: 0,
+          seed: "big-decimal-precision-and-exponent",
+          size: 1
+        })
+
+        assert.isTrue(values.some((value) => Math.abs(value.scale) > 20))
+        assert.isTrue(values.some((value) => {
+          const magnitude = value.value < 0n ? -value.value : value.value
+          return magnitude.toString().length > 20
+        }))
+      }))
+
+    it.effect("constructs BigDecimals in narrow and extreme-scale intervals", () =>
+      Effect.gen(function*() {
+        const narrow = Schema.BigDecimal.check(Schema.isBetweenBigDecimal({
+          minimum: BigDecimal.make(123_456_789n, 1_000),
+          maximum: BigDecimal.make(123_456_799n, 1_000),
+          exclusiveMinimum: true,
+          exclusiveMaximum: true
+        }))
+        const narrowValues = yield* Arbitrary.sampleEffect(Arbitrary.schema(narrow), {
+          count: 200,
+          maxDiscards: 0,
+          seed: "big-decimal-narrow-extreme"
+        })
+        assert.isTrue(narrowValues.every(Schema.is(narrow)))
+
+        const maximumScale = Schema.BigDecimal.check(Schema.isBetweenBigDecimal({
+          minimum: BigDecimal.make(0n, Number.MAX_SAFE_INTEGER),
+          maximum: BigDecimal.make(1n, Number.MAX_SAFE_INTEGER)
+        }))
+        const maximumScaleValues = yield* Arbitrary.sampleEffect(Arbitrary.schema(maximumScale), {
+          count: 50,
+          maxDiscards: 0,
+          seed: "big-decimal-maximum-scale"
+        })
+        assert.isTrue(maximumScaleValues.every(Schema.is(maximumScale)))
+      }))
+
+    it.effect("recognizes equivalent BigDecimal singleton bounds", () =>
+      Effect.gen(function*() {
+        for (
+          const [minimum, maximum] of [
+            [BigDecimal.make(1n, 0), BigDecimal.make(10n, 1)],
+            [BigDecimal.make(10n ** 4097n, 0), BigDecimal.make(1n, -4097)],
+            [BigDecimal.make(-1n, -4097), BigDecimal.make(-(10n ** 4097n), 0)],
+            [BigDecimal.make(0n, Number.MIN_SAFE_INTEGER), BigDecimal.make(0n, Number.MAX_SAFE_INTEGER)]
+          ]
+        ) {
+          const schema = Schema.BigDecimal.check(Schema.isBetweenBigDecimal({ minimum, maximum }))
+          const values = yield* Arbitrary.sampleEffect(Arbitrary.schema(schema), {
+            count: 20,
+            maxDiscards: 0,
+            seed: "big-decimal-singleton"
+          })
+
+          assert.isTrue(values.every((value) => BigDecimal.Equivalence(value, minimum)))
+        }
+      }))
+
+    it.effect("preserves both BigDecimal bounds across large scale differences", () =>
+      Effect.gen(function*() {
+        const near = BigDecimal.make(10n ** 4097n - 1n, 0)
+        const far = BigDecimal.make(1n, -4097)
+        for (const [minimum, maximum] of [[near, far], [BigDecimal.negate(far), BigDecimal.negate(near)]]) {
+          for (const exclusive of [false, true]) {
+            const schema = Schema.BigDecimal.check(Schema.isBetweenBigDecimal({
+              minimum,
+              maximum,
+              exclusiveMinimum: exclusive,
+              exclusiveMaximum: exclusive
+            }))
+            const values = yield* Arbitrary.sampleEffect(Arbitrary.schema(schema), {
+              count: 100,
+              maxDiscards: 0,
+              seed: "big-decimal-large-scale-difference"
+            })
+
+            assert.isTrue(values.every(Schema.is(schema)))
+            assert.isTrue(
+              values.some((value) => BigDecimal.Order(value, minimum) > 0 && BigDecimal.Order(value, maximum) < 0)
+            )
+          }
+        }
+      }))
+
+    it("rejects empty BigDecimal intervals at the maximum scale", () => {
+      const schema = Schema.BigDecimal.check(Schema.isBetweenBigDecimal({
+        minimum: BigDecimal.make(0n, Number.MAX_SAFE_INTEGER),
+        maximum: BigDecimal.make(1n, Number.MAX_SAFE_INTEGER),
+        exclusiveMinimum: true,
+        exclusiveMaximum: true
+      }))
+
+      assert.throws(() => Arbitrary.schema(schema), /Unable to derive an arbitrary for BigDecimal constraints/)
+    })
+
+    it.effect("shrinks BigDecimals by numeric value across representations", () =>
+      Effect.gen(function*() {
+        const one = BigDecimal.make(1n, 0)
+        const onePointOne = BigDecimal.make(11n, 1)
+        const schema = Schema.BigDecimal.check(Schema.isGreaterThanOrEqualToBigDecimal(BigDecimal.make(1n, 1)))
+        const arbitrary = Arbitrary.schema(schema)
+        const result = yield* Arbitrary.checkEffect(arbitrary, (value) => BigDecimal.Order(value, one) <= 0, {
+          runs: 100,
+          maxDiscards: 0,
+          maxShrinks: 100,
+          seed: "big-decimal-numeric-shrink"
+        })
+
+        assert.strictEqual(result._tag, "Falsified")
+        if (result._tag === "Falsified") {
+          assert.isTrue(BigDecimal.Order(result.shrunkInput, one) > 0)
+          assert.isTrue(BigDecimal.Order(result.shrunkInput, onePointOne) <= 0)
+          const replayed = yield* Arbitrary.checkEffect(arbitrary, (value) => BigDecimal.Order(value, one) <= 0, {
+            replay: result.replay
+          })
+          assert.strictEqual(replayed._tag, "Falsified")
+          if (replayed._tag === "Falsified") {
+            assert.isTrue(BigDecimal.Equivalence(replayed.initialInput, result.initialInput))
+            assert.isTrue(BigDecimal.Equivalence(replayed.shrunkInput, result.shrunkInput))
+            assert.strictEqual(replayed.shrinks, result.shrinks)
+          }
+        }
+      }))
+
+    it.effect("shrinks BigDecimals toward ordinary thresholds between simple candidates", () =>
+      Effect.gen(function*() {
+        for (const [low, high, boundary] of [[1, 10, 7], [100, 101, 100.5], [0.1, 10, 1]]) {
+          for (const sign of [1, -1]) {
+            const minimum = BigDecimal.fromNumberUnsafe(sign > 0 ? low : -high)
+            const maximum = BigDecimal.fromNumberUnsafe(sign > 0 ? high : -low)
+            const threshold = BigDecimal.fromNumberUnsafe(sign * boundary)
+            const tolerance = BigDecimal.fromNumberUnsafe(sign * (boundary + 0.01))
+            const schema = Schema.BigDecimal.check(Schema.isBetweenBigDecimal({ minimum, maximum }))
+            const arbitrary = Arbitrary.schema(schema)
+            const property = (value: BigDecimal.BigDecimal) => sign * BigDecimal.Order(value, threshold) <= 0
+            const result = yield* Arbitrary.checkEffect(arbitrary, property, {
+              seed: "b",
+              runs: 100,
+              maxShrinks: 100,
+              maxDiscards: 0
+            })
+
+            assert.strictEqual(result._tag, "Falsified")
+            if (result._tag === "Falsified") {
+              assert.isTrue(sign * BigDecimal.Order(result.initialInput, tolerance) > 0)
+              assert.isTrue(sign * BigDecimal.Order(result.shrunkInput, threshold) > 0)
+              assert.isTrue(sign * BigDecimal.Order(result.shrunkInput, tolerance) <= 0)
+              assert.isTrue(Schema.is(schema)(result.shrunkInput))
+              const replayed = yield* Arbitrary.checkEffect(arbitrary, property, { replay: result.replay })
+              assert.strictEqual(replayed._tag, "Falsified")
+              if (replayed._tag === "Falsified") {
+                assert.isTrue(BigDecimal.Equivalence(replayed.initialInput, result.initialInput))
+                assert.isTrue(BigDecimal.Equivalence(replayed.shrunkInput, result.shrunkInput))
+                assert.strictEqual(replayed.shrinks, result.shrinks)
+                assert.strictEqual(replayed.replay, result.replay)
+              }
+            }
+          }
+        }
+      }))
+
     it.effect("generates and shrinks DateTime.Utc declarations constructively", () =>
       Effect.gen(function*() {
         const arbitrary = Arbitrary.schema(Schema.DateTimeUtc)
@@ -874,6 +1041,279 @@ describe("Arbitrary", () => {
         assert.isTrue(prototypes.has(null))
       }))
 
+    describe("indexed objects", () => {
+      it.effect("combines fixed field constraints at size zero and starts progressive checks", () =>
+        Effect.gen(function*() {
+          const schema = Schema.StructWithRest(
+            Schema.Struct({ fixed: Schema.String }),
+            [Schema.Record(Schema.String, Schema.NonEmptyString)]
+          )
+          const arbitrary = Arbitrary.schema(schema)
+          const values = yield* Arbitrary.sampleEffect(arbitrary, {
+            count: 128,
+            maxDiscards: 0,
+            seed: "indexed-fixed-fields",
+            size: 0
+          })
+          assert.isTrue(values.every(Schema.is(schema)))
+          assert.isTrue(values.every((value) => value.fixed.length === 1))
+          const prototypes = new Set(values.map(Object.getPrototypeOf))
+          assert.isTrue(prototypes.has(null))
+          assert.isTrue(prototypes.has(Object.prototype))
+
+          const result = yield* Arbitrary.checkEffect(arbitrary, Schema.is(schema), {
+            runs: 100,
+            maxDiscards: 128,
+            seed: "indexed-fixed-fields"
+          })
+          assert.strictEqual(result._tag, "Passed")
+        }))
+
+      it.effect("does not generate omitted fixed property names from indexes", () =>
+        Effect.gen(function*() {
+          const cases = [
+            ["a", Schema.Struct({ a: Schema.optionalKey(Schema.Never) })],
+            [0, Schema.Record(Schema.Literal(0), Schema.optionalKey(Schema.Never))]
+          ] as const
+          for (const [key, fields] of cases) {
+            const schema = Schema.StructWithRest(fields, [
+              Schema.Record(Schema.String.check(Schema.isPattern(new RegExp(`^${key}$`))), Schema.Boolean)
+            ])
+            const values = yield* Arbitrary.sampleEffect(Arbitrary.schema(schema), {
+              count: 20,
+              maxDiscards: 100,
+              seed: "indexed-optional-never",
+              size: 1
+            })
+
+            assert.isTrue(values.every(Schema.is(schema)))
+            assert.isTrue(values.every((value) => !(key in value)))
+
+            const shrinkingSchema = Schema.StructWithRest(fields, [
+              Schema.Record(Schema.String.check(Schema.isPattern(new RegExp(`^${key}+$`))), Schema.Boolean)
+            ]).check(Schema.isPropertiesLengthBetween(1, 1))
+            const result = yield* Arbitrary.checkEffect(Arbitrary.schema(shrinkingSchema), () => false, {
+              runs: 1,
+              maxDiscards: 100,
+              maxShrinks: 100,
+              seed: 0,
+              size: 4
+            })
+
+            assert.strictEqual(result._tag, "Falsified")
+            if (result._tag === "Falsified") {
+              assert.deepStrictEqual(result.shrunkInput, { [`${key}${key}`]: false })
+              assert.isTrue(Schema.is(shrinkingSchema)(result.shrunkInput))
+            }
+          }
+        }))
+
+      it.effect("uses indexes when optional properties cannot satisfy the minimum", () =>
+        Effect.gen(function*() {
+          const schema = Schema.StructWithRest(
+            Schema.Struct({ a: Schema.optionalKey(Schema.Never) }),
+            [Schema.Record(Schema.String.check(Schema.isPattern(/^b$/)), Schema.Boolean)]
+          ).check(Schema.isPropertiesLengthBetween(1, 1))
+          const values = yield* Arbitrary.sampleEffect(Arbitrary.schema(schema), {
+            count: 20,
+            maxDiscards: 0,
+            seed: "indexed-optional-never-minimum",
+            size: 0
+          })
+
+          assert.isTrue(values.every(Schema.is(schema)))
+          assert.isTrue(values.every((value) => "b" in value && !("a" in value)))
+        }))
+
+      it.effect("shrinks and replays fixed fields within the combined constraints", () =>
+        Effect.gen(function*() {
+          const schema = Schema.StructWithRest(
+            Schema.Struct({ fixed: Schema.String }),
+            [Schema.Record(Schema.String, Schema.NonEmptyString)]
+          )
+          const arbitrary = Arbitrary.schema(schema)
+          const seen: Array<typeof schema.Type> = []
+          const property = (value: typeof schema.Type) => {
+            seen.push(value)
+            return false
+          }
+          const result = yield* Arbitrary.checkEffect(arbitrary, property, {
+            runs: 1,
+            maxDiscards: 128,
+            maxShrinks: 64,
+            seed: "indexed-object-shrinking",
+            size: 8
+          })
+          assert.strictEqual(result._tag, "Falsified")
+          if (result._tag !== "Falsified") return
+          assert.isAbove(result.shrinks, 0)
+          assert.strictEqual(result.shrunkInput.fixed.length, 1)
+          assert.strictEqual(Object.getPrototypeOf(result.shrunkInput), Object.getPrototypeOf(result.initialInput))
+          const replayed = yield* Arbitrary.checkEffect(arbitrary, property, { replay: result.replay })
+          assert.strictEqual(replayed._tag, "Falsified")
+          if (replayed._tag === "Falsified") {
+            assert.deepStrictEqual(replayed.shrunkInput, result.shrunkInput)
+            assert.strictEqual(replayed.shrinks, result.shrinks)
+          }
+          assert.isTrue(seen.every(Schema.is(schema)))
+        }))
+
+      it.effect("combines numeric and bigint bounds with fixed field constraints", () =>
+        Effect.gen(function*() {
+          const schemas = [
+            Schema.StructWithRest(
+              Schema.Struct({ fixed: Schema.Number }),
+              [Schema.Record(Schema.String, Schema.Int.check(Schema.isBetween({ minimum: 10, maximum: 20 })))]
+            ),
+            Schema.StructWithRest(
+              Schema.Struct({ fixed: Schema.BigInt.check(Schema.isLessThanOrEqualToBigInt(BigInt(15))) }),
+              [Schema.Record(Schema.String, Schema.BigInt.check(Schema.isGreaterThanOrEqualToBigInt(BigInt(10))))]
+            )
+          ]
+          for (const schema of schemas) {
+            const values = yield* Arbitrary.sampleEffect(Arbitrary.schema(schema), {
+              count: 32,
+              maxDiscards: 0,
+              seed: "indexed-numeric-bounds",
+              size: 0
+            })
+            assert.isTrue(values.every(Schema.is(schema)))
+          }
+        }))
+
+      it.effect("combines overlapping index constraints after generating the key", () =>
+        Effect.gen(function*() {
+          const schema = Schema.StructWithRest(Schema.Struct({}), [
+            Schema.Record(Schema.String, Schema.String),
+            Schema.Record(Schema.String, Schema.NonEmptyString)
+          ]).check(Schema.isMinProperties(1))
+          const values = yield* Arbitrary.sampleEffect(Arbitrary.schema(schema), {
+            count: 128,
+            maxDiscards: 0,
+            seed: "indexed-overlap",
+            size: 0
+          })
+          assert.isTrue(values.every(Schema.is(schema)))
+        }))
+
+      it.effect("discards empty scalar intersections without failing compilation", () =>
+        Effect.gen(function*() {
+          const schemas = [
+            Schema.StructWithRest(
+              Schema.Struct({ fixed: Schema.String.check(Schema.isMaxLength(0)) }),
+              [Schema.Record(Schema.String, Schema.NonEmptyString)]
+            ),
+            Schema.StructWithRest(
+              Schema.Struct({ fixed: Schema.Int }),
+              [Schema.Record(Schema.String, Schema.Number.check(Schema.isBetween({ minimum: 0.2, maximum: 0.8 })))]
+            ),
+            Schema.StructWithRest(
+              Schema.Struct({ fixed: Schema.BigInt.check(Schema.isLessThanOrEqualToBigInt(BigInt(1))) }),
+              [Schema.Record(Schema.String, Schema.BigInt.check(Schema.isGreaterThanBigInt(BigInt(1))))]
+            )
+          ]
+          for (const schema of schemas) {
+            const result = yield* Effect.result(Arbitrary.sampleEffect(Arbitrary.schema(schema), {
+              count: 1,
+              maxDiscards: 0,
+              seed: "indexed-empty-intersection",
+              size: 0
+            }))
+            assert.isTrue(Result.isFailure(result))
+            if (Result.isFailure(result)) assert.strictEqual(result.failure._tag, "SampleError")
+          }
+        }))
+
+      it.effect("selects matching pattern, template, numeric and symbol indexes", () =>
+        Effect.gen(function*() {
+          const symbol = Symbol.for("indexed-field")
+          const schema = Schema.StructWithRest(
+            Schema.Struct({
+              a: Schema.String,
+              other: Schema.String,
+              "pre_x": Schema.String,
+              0: Schema.String,
+              [symbol]: Schema.String
+            }),
+            [
+              Schema.Record(Schema.String.check(Schema.isPattern(/^a/)), Schema.NonEmptyString),
+              Schema.Record(Schema.TemplateLiteral(["pre_", Schema.String]), Schema.NonEmptyString),
+              Schema.Record(Schema.Int, Schema.NonEmptyString),
+              Schema.Record(Schema.Symbol, Schema.NonEmptyString)
+            ]
+          )
+          const values = yield* Arbitrary.sampleEffect(Arbitrary.schema(schema), {
+            count: 32,
+            maxDiscards: 0,
+            seed: "indexed-key-matching",
+            size: 0
+          })
+          assert.isTrue(values.every(Schema.is(schema)))
+          assert.isTrue(values.every((value) => value.other === ""))
+        }))
+
+      it.effect("validates residual index filters without constructive constraints", () =>
+        Effect.gen(function*() {
+          const schema = Schema.StructWithRest(
+            Schema.Struct({ fixed: Schema.String }),
+            [Schema.Record(Schema.String, Schema.String.check(Schema.makeFilter((value) => value.length > 0)))]
+          )
+          const arbitrary = Arbitrary.schema(schema)
+          const result = yield* Effect.result(Arbitrary.sampleEffect(arbitrary, {
+            count: 1,
+            maxDiscards: 0,
+            seed: "indexed-residual-filter",
+            size: 0
+          }))
+          assert.isTrue(Result.isFailure(result))
+          if (Result.isFailure(result)) assert.strictEqual(result.failure._tag, "SampleError")
+          const values = yield* Arbitrary.sampleEffect(arbitrary, {
+            count: 32,
+            maxDiscards: 128,
+            seed: "indexed-residual-filter",
+            size: 4
+          })
+          assert.isTrue(values.every(Schema.is(schema)))
+          const seen: Array<typeof schema.Type> = []
+          const checked = yield* Arbitrary.checkEffect(arbitrary, (value) => {
+            seen.push(value)
+            return false
+          }, {
+            runs: 1,
+            maxDiscards: 128,
+            maxShrinks: 64,
+            seed: "indexed-residual-filter",
+            size: 4
+          })
+          assert.strictEqual(checked._tag, "Falsified")
+          if (checked._tag === "Falsified") assert.isAbove(checked.shrinks, 0)
+          assert.isTrue(seen.every(Schema.is(schema)))
+        }))
+
+      it.effect("rejects key shrinks that enter an incompatible index", () =>
+        Effect.gen(function*() {
+          const schema = Schema.StructWithRest(Schema.Struct({}), [
+            Schema.Record(Schema.String, Schema.String.check(Schema.isMaxLength(0))),
+            Schema.Record(Schema.String.check(Schema.isMaxLength(1)), Schema.NonEmptyString)
+          ]).check(Schema.isMinProperties(1), Schema.isMaxProperties(1))
+          const seen: Array<typeof schema.Type> = []
+          const result = yield* Arbitrary.checkEffect(Arbitrary.schema(schema), (value) => {
+            seen.push(value)
+            return false
+          }, {
+            runs: 1,
+            maxDiscards: 128,
+            maxShrinks: 64,
+            seed: "indexed-key-shrinking",
+            size: 8
+          })
+          assert.strictEqual(result._tag, "Falsified")
+          if (result._tag === "Falsified") assert.isAbove(result.shrinks, 0)
+          assert.isTrue(seen.every(Schema.is(schema)))
+          assert.isTrue(seen.every((value) => Object.keys(value)[0].length > 1))
+        }))
+    })
+
     it.effect("preserves special Record keys with null-prototype objects", () =>
       Effect.gen(function*() {
         const schema = Schema.Record(Schema.Literal("__proto__"), Schema.Literal("value"))
@@ -1076,6 +1516,91 @@ describe("Arbitrary", () => {
         assert.isTrue(values.some((value) => value > BigInt(Number.MAX_SAFE_INTEGER)))
       }))
 
+    it.effect("generates unbounded BigInts across intermediate bit lengths", () =>
+      Effect.gen(function*() {
+        const values = yield* Arbitrary.sampleEffect(Arbitrary.schema(Schema.BigInt), {
+          count: 1_000,
+          maxDiscards: 0,
+          seed: "unbounded-bigint-bit-lengths",
+          size: 1
+        })
+        const bitLengths = values.map((value) => {
+          const magnitude = value < 0n ? -value : value
+          return magnitude === 0n ? 0 : magnitude.toString(2).length
+        })
+
+        assert.isTrue(values.some((value) => value < 0n))
+        assert.isTrue(values.some((value) => value > 0n))
+        assert.isTrue(bitLengths.some((length) => length > 512))
+        assert.isAtLeast(new Set(bitLengths).size, 100)
+      }))
+
+    it.effect("constructs one-sided BigInts beyond a large finite bound", () =>
+      Effect.gen(function*() {
+        const minimum = 1n << 4_096n
+        const schema = Schema.BigInt.check(Schema.isGreaterThanOrEqualToBigInt(minimum))
+        const values = yield* Arbitrary.sampleEffect(Arbitrary.schema(schema), {
+          count: 100,
+          maxDiscards: 0,
+          seed: "one-sided-large-bigint"
+        })
+
+        assert.isTrue(values.every((value) => value >= minimum))
+        assert.isTrue(values.some((value) => value > minimum))
+      }))
+
+    it.effect("covers intermediate BigInt magnitudes on the finite side of one-sided bounds", () =>
+      Effect.gen(function*() {
+        const bound = 1n << 4096n
+        for (const sign of [1n, -1n]) {
+          const schema = Schema.BigInt.check(
+            sign > 0n
+              ? Schema.isLessThanBigInt(bound)
+              : Schema.isGreaterThanBigInt(-bound)
+          )
+          for (const seed of ["one-sided-intermediate", "one-sided-intermediate-2"]) {
+            const values = yield* Arbitrary.sampleEffect(Arbitrary.schema(schema), {
+              count: 1_000,
+              maxDiscards: 0,
+              seed,
+              size: 1
+            })
+
+            assert.isTrue(values.every(Schema.is(schema)))
+            assert.isTrue(values.some((value) => sign * value > (1n << 2500n) && sign * value < (1n << 3500n)))
+            assert.isTrue(values.some((value) => value < 0n))
+            assert.isTrue(values.some((value) => value > 0n))
+            assert.isTrue(values.some((value) => value !== 0n && value > -100n && value < 100n))
+          }
+        }
+      }))
+
+    it.effect("shrinks BigInts to a common semantic boundary", () =>
+      Effect.gen(function*() {
+        const boundary = BigInt(Number.MAX_SAFE_INTEGER)
+        const arbitrary = Arbitrary.schema(Schema.BigInt)
+        const result = yield* Arbitrary.checkEffect(arbitrary, (value) => value <= boundary, {
+          runs: 200,
+          maxDiscards: 0,
+          maxShrinks: 100,
+          seed: "bigint-semantic-boundary"
+        })
+
+        assert.strictEqual(result._tag, "Falsified")
+        if (result._tag === "Falsified") {
+          assert.strictEqual(result.shrunkInput, boundary + 1n)
+          const replayed = yield* Arbitrary.checkEffect(arbitrary, (value) => value <= boundary, {
+            replay: result.replay
+          })
+          assert.strictEqual(replayed._tag, "Falsified")
+          if (replayed._tag === "Falsified") {
+            assert.strictEqual(replayed.initialInput, result.initialInput)
+            assert.strictEqual(replayed.shrunkInput, result.shrunkInput)
+            assert.strictEqual(replayed.shrinks, result.shrinks)
+          }
+        }
+      }))
+
     it.effect("generates the sole Number between adjacent exclusive IEEE-754 bounds", () =>
       Effect.gen(function*() {
         const minimum = 2 ** 100
@@ -1251,6 +1776,34 @@ describe("Arbitrary", () => {
         assert.isTrue(values.every(Schema.is(schema)))
       }))
 
+    it.effect("omits optional Never properties", () =>
+      Effect.gen(function*() {
+        const schema = Schema.Struct({ value: Schema.optionalKey(Schema.Never) })
+        const values = yield* Arbitrary.sampleEffect(Arbitrary.schema(schema), {
+          count: 1,
+          maxDiscards: 0,
+          seed: "optional-never"
+        })
+
+        assert.deepStrictEqual(values, [{}])
+      }))
+
+    it.effect("uses inhabited branches around Never", () =>
+      Effect.gen(function*() {
+        const union = yield* Arbitrary.sampleEffect(
+          Arbitrary.schema(Schema.Union([Schema.Never, Schema.Literal("value")])),
+          { count: 1, maxDiscards: 0, seed: "never-union" }
+        )
+        const array = yield* Arbitrary.sampleEffect(Arbitrary.schema(Schema.Array(Schema.Never)), {
+          count: 1,
+          maxDiscards: 0,
+          seed: "never-array"
+        })
+
+        assert.deepStrictEqual(union, ["value"])
+        assert.deepStrictEqual(array, [[]])
+      }))
+
     it.effect("constructively selects optional properties affordable by the recursion budget", () =>
       Effect.gen(function*() {
         interface Node {
@@ -1319,6 +1872,29 @@ describe("Arbitrary", () => {
         assert.isTrue(values.every(Schema.is(schema)))
       }))
 
+    it.effect("generates bit templates and preserves checked numeric template shrinks", () =>
+      Effect.gen(function*() {
+        const bits = Schema.TemplateLiteral([Schema.Literals([0, 1])])
+        const values = yield* Arbitrary.sampleEffect(Arbitrary.schema(bits), {
+          count: 50,
+          maxDiscards: 0,
+          seed: 0
+        })
+        assert.deepStrictEqual(new Set(values), new Set(["0", "1"]))
+
+        const schema = Schema.TemplateLiteral(["a", Schema.Int.check(Schema.isBetween({ minimum: 1, maximum: 100 }))])
+        const seen: Array<string> = []
+        const result = yield* Arbitrary.checkEffect(Arbitrary.schema(schema), (value) => {
+          seen.push(value)
+          return false
+        }, { runs: 1, maxDiscards: 0, maxShrinks: 100, seed: 0, size: 10 })
+
+        assert.strictEqual(result._tag, "Falsified")
+        assert.isAbove(seen.length, 1)
+        assert.isTrue(seen.every(Schema.is(schema)))
+        if (result._tag === "Falsified") assert.strictEqual(result.shrunkInput, "a1")
+      }))
+
     it.effect("validates overlapping oneOf Union members", () =>
       Effect.gen(function*() {
         const schema = Schema.Union([Schema.String, Schema.Literal("a")], { mode: "oneOf" })
@@ -1539,7 +2115,7 @@ describe("Arbitrary", () => {
             toCodec: () =>
               Schema.link<number>()(
                 encoded,
-                SchemaTransformation.transformOrFail({
+                SchemaTransformation.transformEffect({
                   decode: (value) =>
                     value === 25 || value === 100
                       ? Effect.succeed(value)
@@ -1571,7 +2147,7 @@ describe("Arbitrary", () => {
           toCodecArbitrary: () =>
             Schema.link<number>()(
               Schema.Literal(1),
-              SchemaTransformation.transformOrFail<number, 1>({
+              SchemaTransformation.transformEffect<number, 1>({
                 decode: () => {
                   Deferred.doneUnsafe(started, Effect.void)
                   return Effect.never
@@ -1845,7 +2421,14 @@ describe("Arbitrary", () => {
         ]))
 
       it("rejects uninhabited structural schemas", () => {
-        assert.throws(() => Arbitrary.schema(Schema.Never), /Unable to derive an arbitrary for Never/)
+        assert.throws(
+          () => Arbitrary.schema(Schema.Never),
+          /Unable to derive an arbitrary for a schema without a finite generation path/
+        )
+        assert.throws(
+          () => Arbitrary.schema(Schema.Struct({ value: Schema.Never })),
+          /Unable to derive an arbitrary for a schema without a finite generation path/
+        )
         assert.throws(
           () => Arbitrary.schema(Schema.Array(Schema.String).check(Schema.isMinLength(2), Schema.isMaxLength(1))),
           /Unable to derive an arbitrary for array constraints/
@@ -2081,7 +2664,7 @@ describe("Arbitrary", () => {
 
       assert.throws(
         () => Arbitrary.schema(schema),
-        /Unable to derive an arbitrary for a recursive schema without a finite generation path/
+        /Unable to derive an arbitrary for a schema without a finite generation path/
       )
     })
 
@@ -2593,7 +3176,7 @@ describe("Arbitrary", () => {
           toCodecArbitrary: () =>
             Schema.link<number>()(
               Schema.Literal(1),
-              SchemaTransformation.transformOrFail<number, 1>({
+              SchemaTransformation.transformEffect<number, 1>({
                 decode: () => {
                   Deferred.doneUnsafe(started, Effect.void)
                   return Effect.never
diff --git a/repos/effect/packages/effect/test/unstable/cli/Arguments.test.ts b/repos/effect/packages/effect/test/unstable/cli/Arguments.test.ts
index 02c20473f..44f825adc 100644
--- a/repos/effect/packages/effect/test/unstable/cli/Arguments.test.ts
+++ b/repos/effect/packages/effect/test/unstable/cli/Arguments.test.ts
@@ -56,14 +56,14 @@ describe("Command arguments", () => {
 
       // Create test command with various argument types
       const testCommand = Command.make("test", {
-        name: Argument.string("name"),
-        count: Argument.integer("count"),
-        ratio: Argument.float("ratio"),
-        env: Argument.choice("env", ["dev", "prod"]),
-        config: Argument.file("config", { mustExist: false }),
-        workspace: Argument.directory("workspace", { mustExist: false }),
-        startDate: Argument.date("start-date"),
-        verbose: Flag.boolean("verbose")
+        name: Argument.String("name"),
+        count: Argument.Int("count"),
+        ratio: Argument.Finite("ratio"),
+        env: Argument.Literals("env", ["dev", "prod"]),
+        config: Argument.File("config", { mustExist: false }),
+        workspace: Argument.Directory("workspace", { mustExist: false }),
+        startDate: Argument.Date("start-date"),
+        verbose: Flag.Boolean("verbose")
       }, (config) => Ref.set(resultRef, config))
 
       // Test parsing with valid arguments
@@ -94,7 +94,7 @@ describe("Command arguments", () => {
       // Test 1: mustExist: true with existing file - should pass
       const result1Ref = yield* Ref.make<string | null>(null)
       const existingFileCommand = Command.make("test", {
-        file: Argument.file("file", { mustExist: true })
+        file: Argument.File("file", { mustExist: true })
       }, ({ file }) => Ref.set(result1Ref, file))
 
       yield* Command.runWith(existingFileCommand, { version: "1.0.0" })(["/file.txt"])
@@ -119,7 +119,7 @@ describe("Command arguments", () => {
       // Test 3: mustExist: false - should always pass
       const result3Ref = yield* Ref.make<string | null>(null)
       const optionalFileCommand = Command.make("test", {
-        file: Argument.file("file", { mustExist: false })
+        file: Argument.File("file", { mustExist: false })
       }, ({ file }) => Ref.set(result3Ref, file))
 
       yield* Command.runWith(optionalFileCommand, { version: "1.0.0" })([
@@ -132,8 +132,8 @@ describe("Command arguments", () => {
   it.effect("should fail with invalid arguments", () =>
     Effect.gen(function*() {
       const testCommand = Command.make("test", {
-        count: Argument.integer("count"),
-        env: Argument.choice("env", ["dev", "prod"])
+        count: Argument.Int("count"),
+        env: Argument.Literals("env", ["dev", "prod"])
       }, (config) => Effect.succeed(config))
 
       // Test invalid integer - should display help and error
@@ -165,7 +165,7 @@ describe("Command arguments", () => {
       let result: { readonly files: ReadonlyArray<string> } | undefined
 
       const testCommand = Command.make("test", {
-        files: Argument.variadic(Argument.string("files"))
+        files: Argument.variadic(Argument.String("files"))
       }, (parsedConfig) =>
         Effect.sync(() => {
           result = parsedConfig
@@ -186,7 +186,7 @@ describe("Command arguments", () => {
       const resultRef = yield* Ref.make<any>(null)
 
       const testCommand = Command.make("test", {
-        level: Argument.choiceWithValue(
+        level: Argument.ChoiceWithValue(
           "level",
           [
             ["debug", 0],
@@ -206,7 +206,7 @@ describe("Command arguments", () => {
       const resultRef = yield* Ref.make<any>(null)
 
       const testCommand = Command.make("test", {
-        port: Argument.integer("port").pipe(
+        port: Argument.Int("port").pipe(
           Argument.filter(
             (n) => n >= 1 && n <= 65535,
             (n) => `Port ${n} out of range (1-65535)`
@@ -222,7 +222,7 @@ describe("Command arguments", () => {
   it.effect("should handle filter combinator - invalid", () =>
     Effect.gen(function*() {
       const testCommand = Command.make("test", {
-        port: Argument.integer("port").pipe(
+        port: Argument.Int("port").pipe(
           Argument.filter(
             (n) => n >= 1 && n <= 65535,
             (n) => `Port ${n} out of range (1-65535)`
@@ -242,7 +242,7 @@ describe("Command arguments", () => {
       const resultRef = yield* Ref.make<any>(null)
 
       const testCommand = Command.make("test", {
-        positiveInt: Argument.integer("num").pipe(
+        positiveInt: Argument.Int("num").pipe(
           Argument.filterMap(
             (n) => n > 0 ? Option.some(n) : Option.none(),
             (n) => `Expected positive integer, got ${n}`
@@ -258,7 +258,7 @@ describe("Command arguments", () => {
   it.effect("should handle filterMap combinator - invalid", () =>
     Effect.gen(function*() {
       const testCommand = Command.make("test", {
-        positiveInt: Argument.integer("num").pipe(
+        positiveInt: Argument.Int("num").pipe(
           Argument.filterMap(
             (n) => n > 0 ? Option.some(n) : Option.none(),
             (n) => `Expected positive integer, got ${n}`
@@ -279,8 +279,8 @@ describe("Command arguments", () => {
 
       // Try parsing as integer first, fallback to 0
       const testCommand = Command.make("test", {
-        value: Argument.integer("value").pipe(
-          Argument.orElse(() => Argument.string("value").pipe(Argument.map(() => -1)))
+        value: Argument.Int("value").pipe(
+          Argument.orElse(() => Argument.String("value").pipe(Argument.map(() => -1)))
         )
       }, (config) => Ref.set(resultRef, config))
 
@@ -301,8 +301,8 @@ describe("Command arguments", () => {
       const resultRef = yield* Ref.make<any>(null)
 
       const testCommand = Command.make("test", {
-        value: Argument.integer("value").pipe(
-          Argument.orElseResult(() => Argument.string("value"))
+        value: Argument.Int("value").pipe(
+          Argument.orElseResult(() => Argument.String("value"))
         )
       }, (config) => Ref.set(resultRef, config))
 
@@ -323,7 +323,7 @@ describe("Command arguments", () => {
   it.effect("should handle withMetavar combinator", () =>
     Effect.gen(function*() {
       const testCommand = Command.make("test", {
-        file: Argument.string("file").pipe(
+        file: Argument.String("file").pipe(
           Argument.withMetavar("FILE_PATH")
         )
       }, () => Effect.void)
@@ -341,7 +341,7 @@ describe("Command arguments", () => {
 
       const testCommand = Command.make("test", {
         label: Argument.optional(
-          Argument.string("label").pipe(
+          Argument.String("label").pipe(
             Argument.withDescription("Optional label name")
           )
         )
@@ -358,7 +358,7 @@ describe("Command arguments", () => {
     Effect.gen(function*() {
       // BUG TEST: Argument.optional() should work for positional arguments
       // Currently it only catches MissingOption, not MissingArgument
-      const optionalArg = Argument.optional(Argument.string("label"))
+      const optionalArg = Argument.optional(Argument.String("label"))
 
       // Parse with empty arguments - should succeed with Option.none()
       const result = yield* optionalArg.parse({ flags: {}, arguments: [] })
@@ -372,7 +372,7 @@ describe("Command arguments", () => {
     Effect.gen(function*() {
       // When a positional argument has an invalid value, the error should say "argument"
       // not "flag" (which would be confusing)
-      const intArg = Argument.integer("count")
+      const intArg = Argument.Int("count")
 
       const result = yield* Effect.exit(
         intArg.parse({ flags: {}, arguments: ["not-a-number"] })
diff --git a/repos/effect/packages/effect/test/unstable/cli/Command.test.ts b/repos/effect/packages/effect/test/unstable/cli/Command.test.ts
index 6dfe708fd..f8fe5221d 100644
--- a/repos/effect/packages/effect/test/unstable/cli/Command.test.ts
+++ b/repos/effect/packages/effect/test/unstable/cli/Command.test.ts
@@ -120,8 +120,8 @@ describe("Command", () => {
       Effect.gen(function*() {
         const captured: Array<ReadonlyArray<string>> = []
         const target = Command.make("greet", {
-          name: Flag.string("name"),
-          count: Argument.integer("count")
+          name: Flag.String("name"),
+          count: Argument.Int("count")
         })
         const command = Command.make("launcher", {}, () =>
           Effect.flatMap(Command.wizard(target), (args) =>
@@ -143,7 +143,7 @@ describe("Command", () => {
       Effect.gen(function*() {
         const captured: Array<string> = []
         const command = Command.make("greet", {
-          name: Flag.string("name")
+          name: Flag.String("name")
         }, ({ name }) => Effect.sync(() => captured.push(name)))
 
         const fiber = yield* Command.runWith(command, { version: "1.0.0" })(["--wizard"]).pipe(Effect.forkChild)
@@ -165,13 +165,83 @@ describe("Command", () => {
         assert.include(output, "Run this command?")
       }).pipe(Effect.provide(TestLayer)))
 
-    it.effect("should redact values in wizard command output", () =>
+    it.effect("should run negative integer flag values with --wizard", () =>
       Effect.gen(function*() {
-        const secret = "hunter2-secret"
+        const captured: Array<number> = []
+        const command = Command.make("demo", {
+          offset: Flag.Int("offset")
+        }, ({ offset }) => Effect.sync(() => captured.push(offset)))
+
+        const fiber = yield* Command.runWith(command, { version: "1.0.0" })(["--wizard"]).pipe(Effect.forkChild)
+        yield* MockTerminal.inputText("-2")
+        yield* MockTerminal.inputKey("enter")
+        yield* MockTerminal.inputKey("enter")
+        yield* Fiber.join(fiber)
+
+        assert.deepStrictEqual(captured, [-2])
+        const output = [...yield* TestConsole.logLines, ...yield* MockTerminal.displayLines].join("\n")
+        assert.include(output, "$ demo --offset=-2")
+      }).pipe(Effect.provide(TestLayer)))
+
+    for (
+      const { args: expectedArgs, value } of [
+        { value: "-v", args: ["--value=-v"] },
+        { value: "--verbose", args: ["--value=--verbose"] },
+        { value: "--", args: ["--value=--"] },
+        { value: "--mode=x=y", args: ["--value=--mode=x=y"] },
+        { value: "plain", args: ["--value", "plain"] },
+        { value: "", args: ["--value", ""] },
+        { value: "-", args: ["--value", "-"] }
+      ]
+    ) {
+      it.effect(`should round trip wizard flag value ${JSON.stringify(value)}`, () =>
+        Effect.gen(function*() {
+          const captured: Array<string> = []
+          const command = Command.make("demo", {
+            value: Flag.String("value")
+          }, ({ value }) => Effect.sync(() => captured.push(value)))
+
+          const fiber = yield* Command.wizard(command).pipe(Effect.forkChild)
+          yield* MockTerminal.inputText(value)
+          yield* MockTerminal.inputKey("enter")
+          const args = yield* Fiber.join(fiber)
+
+          assert.deepStrictEqual(args, ["demo", ...expectedArgs])
+          yield* Command.runWith(command, { version: "1.0.0" })(args.slice(1))
+          assert.deepStrictEqual(captured, [value])
+        }).pipe(Effect.provide(TestLayer)))
+    }
+
+    it.effect("should round trip mixed repeated wizard flag values", () =>
+      Effect.gen(function*() {
+        const values = ["-v", "plain", "--name=x", ""]
+        const captured: Array<ReadonlyArray<string>> = []
+        const command = Command.make("demo", {
+          value: Flag.String("value").pipe(Flag.atLeast(1))
+        }, ({ value }) => Effect.sync(() => captured.push(value)))
+
+        const fiber = yield* Command.wizard(command).pipe(Effect.forkChild)
+        yield* MockTerminal.inputKey("backspace")
+        yield* MockTerminal.inputText("4")
+        yield* MockTerminal.inputKey("enter")
+        for (const value of values) {
+          yield* MockTerminal.inputText(value)
+          yield* MockTerminal.inputKey("enter")
+        }
+        const args = yield* Fiber.join(fiber)
+
+        assert.deepStrictEqual(args, ["demo", "--value=-v", "--value", "plain", "--value=--name=x", "--value", ""])
+        yield* Command.runWith(command, { version: "1.0.0" })(args.slice(1))
+        assert.deepStrictEqual(captured, [values])
+      }).pipe(Effect.provide(TestLayer)))
+
+    it.effect("should redact option-looking values in wizard command output", () =>
+      Effect.gen(function*() {
+        const secret = "-hunter2-secret"
         const captured: Array<readonly [string, string]> = []
         const command = Command.make("login", {
-          password: Flag.redacted("password"),
-          account: Argument.string("account")
+          password: Flag.Redacted("password"),
+          account: Argument.String("account")
         }, ({ account, password }) =>
           Effect.sync(() => {
             captured.push([Redacted.value(password), account])
@@ -190,10 +260,8 @@ describe("Command", () => {
         const commandReady = output.slice(output.indexOf("Command ready"))
 
         assert.deepStrictEqual(captured, [[secret, "alice"]])
-        assert.include(currentCommand, "--password")
-        assert.include(currentCommand, "<redacted>")
-        assert.include(commandReady, "--password")
-        assert.include(commandReady, "<redacted>")
+        assert.include(currentCommand, "--password=<redacted>")
+        assert.include(commandReady, "--password=<redacted>")
         assert.notInclude(output, secret)
       }).pipe(Effect.provide(TestLayer)))
 
@@ -201,7 +269,7 @@ describe("Command", () => {
       Effect.gen(function*() {
         let invoked = false
         const command = Command.make("greet", {
-          name: Flag.string("name")
+          name: Flag.String("name")
         }, () =>
           Effect.sync(() => {
             invoked = true
@@ -220,7 +288,7 @@ describe("Command", () => {
       Effect.gen(function*() {
         const captured: Array<boolean> = []
         const command = Command.make("deploy", {
-          dryRun: Flag.boolean("dry-run")
+          dryRun: Flag.Boolean("dry-run")
         }, ({ dryRun }) => Effect.sync(() => captured.push(dryRun)))
 
         const fiber = yield* Command.runWith(command, { version: "1.0.0" })(["--wizard"]).pipe(Effect.forkChild)
@@ -239,7 +307,7 @@ describe("Command", () => {
       Effect.gen(function*() {
         const captured: Array<string> = []
         const child = Command.make("child", {
-          value: Argument.string("value")
+          value: Argument.String("value")
         }, ({ value }) => Effect.sync(() => captured.push(value)))
         const command = Command.make("root").pipe(Command.withSubcommands([child]))
 
@@ -278,10 +346,10 @@ describe("Command", () => {
       readonly name: string
       readonly expected: string
     }> = [
-      { flag: Flag.string("name").pipe(Flag.optional), name: "name", expected: "string" },
-      { flag: Flag.integer("count").pipe(Flag.optional), name: "count", expected: "integer" },
-      { flag: Flag.path("config").pipe(Flag.optional), name: "config", expected: "path" },
-      { flag: Flag.keyValuePair("env").pipe(Flag.optional), name: "env", expected: "key=value" }
+      { flag: Flag.String("name").pipe(Flag.optional), name: "name", expected: "string" },
+      { flag: Flag.Int("count").pipe(Flag.optional), name: "count", expected: "integer" },
+      { flag: Flag.Path("config").pipe(Flag.optional), name: "config", expected: "path" },
+      { flag: Flag.KeyValuePair("env").pipe(Flag.optional), name: "env", expected: "key=value" }
     ]
 
     for (const { expected, flag, name } of missingValueCases) {
@@ -307,7 +375,7 @@ describe("Command", () => {
       Effect.gen(function*() {
         let invoked = false
         const command = Command.make("demo", {
-          size: Flag.choice("size", ["small", "medium", "large"])
+          size: Flag.Literals("size", ["small", "medium", "large"])
         }, () =>
           Effect.sync(() => {
             invoked = true
@@ -401,7 +469,7 @@ describe("Command", () => {
         const captured: Array<Record<string, string>> = []
 
         const command = Command.make("env", {
-          env: Flag.keyValuePair("env")
+          env: Flag.KeyValuePair("env")
         }, (config) =>
           Effect.sync(() => {
             captured.push(config.env)
@@ -426,9 +494,9 @@ describe("Command", () => {
         const captured: Array<Record<string, unknown>> = []
 
         const command = Command.make("env", {
-          env: Flag.keyValuePair("env"),
-          verbose: Flag.boolean("verbose"),
-          profile: Flag.string("profile")
+          env: Flag.KeyValuePair("env"),
+          verbose: Flag.Boolean("verbose"),
+          profile: Flag.String("profile")
         }, (config) =>
           Effect.sync(() => {
             captured.push(config)
@@ -459,8 +527,8 @@ describe("Command", () => {
 
     it.effect("should expose setting global flags to command handlers", () =>
       Effect.gen(function*() {
-        const Region = GlobalFlag.setting("region")({
-          flag: Flag.string("region").pipe(Flag.optional)
+        const Region = GlobalFlag.Setting("region")({
+          flag: Flag.String("region").pipe(Flag.optional)
         })
         const captured: Array<Option.Option<string>> = []
 
@@ -483,8 +551,8 @@ describe("Command", () => {
 
     it.effect("should expose setting global flags with Flag.withDefault", () =>
       Effect.gen(function*() {
-        const Region = GlobalFlag.setting("region")({
-          flag: Flag.string("region").pipe(Flag.withDefault("us-west-2"))
+        const Region = GlobalFlag.Setting("region")({
+          flag: Flag.String("region").pipe(Flag.withDefault("us-west-2"))
         })
         const captured: Array<string> = []
 
@@ -537,15 +605,15 @@ describe("Command", () => {
         const captured: Array<string> = []
         let handlerInvocations = 0
 
-        const VerboseAction = GlobalFlag.action({
-          flag: Flag.boolean("verbose").pipe(Flag.withDefault(false)),
+        const VerboseAction = GlobalFlag.Action({
+          flag: Flag.Boolean("verbose").pipe(Flag.withDefault(false)),
           run: (value) =>
             Effect.sync(() => {
               actions.push(value)
             })
         })
-        const Format = GlobalFlag.setting("format")({
-          flag: Flag.string("format").pipe(Flag.withDefault("text"))
+        const Format = GlobalFlag.Setting("format")({
+          flag: Flag.String("format").pipe(Flag.withDefault("text"))
         })
 
         const command = Command.make("deploy", {}, () =>
@@ -571,8 +639,8 @@ describe("Command", () => {
     it.effect("should reject explicit values for canonical negated global flags", () =>
       Effect.gen(function*() {
         let handlerInvoked = false
-        const Verbose = GlobalFlag.setting("verbose")({
-          flag: Flag.boolean("verbose")
+        const Verbose = GlobalFlag.Setting("verbose")({
+          flag: Flag.Boolean("verbose")
         })
 
         const command = Command.make("deploy", {}, () =>
@@ -596,8 +664,8 @@ describe("Command", () => {
 
     it.effect("should expose setting global flags in Command.provide APIs", () =>
       Effect.gen(function*() {
-        const Region = GlobalFlag.setting("region")({
-          flag: Flag.string("region").pipe(Flag.optional)
+        const Region = GlobalFlag.Setting("region")({
+          flag: Flag.String("region").pipe(Flag.optional)
         })
         const RegionFromProvide = Context.Service<never, Option.Option<string>>(
           "effect/test/unstable/cli/RegionFromProvide"
@@ -637,8 +705,8 @@ describe("Command", () => {
 
     it.effect("should reject global flags that are out of scope for selected subcommand", () =>
       Effect.gen(function*() {
-        const Region = GlobalFlag.setting("region")({
-          flag: Flag.string("region").pipe(Flag.withDefault("us-east-1"))
+        const Region = GlobalFlag.Setting("region")({
+          flag: Flag.String("region").pipe(Flag.withDefault("us-east-1"))
         })
         let dbInvoked = false
         let deployInvoked = false
@@ -676,8 +744,8 @@ describe("Command", () => {
 
     it.effect("should show only path-active global flags in subcommand help", () =>
       Effect.gen(function*() {
-        const Region = GlobalFlag.setting("region")({
-          flag: Flag.string("region").pipe(Flag.withDefault("us-east-1"))
+        const Region = GlobalFlag.Setting("region")({
+          flag: Flag.String("region").pipe(Flag.withDefault("us-east-1"))
         })
 
         const deploy = Command.make("deploy", {}, () => Effect.void).pipe(
@@ -705,7 +773,7 @@ describe("Command", () => {
         let invoked = false
 
         const command = Command.make("env", {
-          env: Flag.keyValuePair("env")
+          env: Flag.KeyValuePair("env")
         }, () =>
           Effect.sync(() => {
             invoked = true
@@ -810,7 +878,7 @@ describe("Command", () => {
     it.effect("should render UserError argument failures with command help", () =>
       Effect.gen(function*() {
         const command = Command.make("deploy", {
-          target: Argument.string("target").pipe(
+          target: Argument.String("target").pipe(
             Argument.mapEffect(() =>
               Effect.fail(
                 new CliError.UserError({
@@ -873,7 +941,7 @@ describe("Command", () => {
     it("preserves unlisted metadata when adding shared flags", () => {
       const withShared = Command.make("internal").pipe(
         Command.unlisted,
-        Command.withSharedFlags({ verbose: Flag.boolean("verbose") })
+        Command.withSharedFlags({ verbose: Flag.Boolean("verbose") })
       )
 
       assert.isTrue(withShared.unlisted)
@@ -1028,13 +1096,13 @@ describe("Command", () => {
 
         const parent = Command.make("parent").pipe(
           Command.withSharedFlags({
-            verbose: Flag.boolean("verbose"),
-            config: Flag.string("config")
+            verbose: Flag.Boolean("verbose"),
+            config: Flag.String("config")
           })
         )
 
         // Create subcommand that accesses parent context
-        const child = Command.make("child", { action: Flag.string("action") }, (config) =>
+        const child = Command.make("child", { action: Flag.String("action") }, (config) =>
           Effect.gen(function*() {
             const parentConfig = yield* parent
             messages.push(`child: parent.verbose=${parentConfig.verbose}`)
@@ -1070,12 +1138,12 @@ describe("Command", () => {
 
         const root = Command.make("npm").pipe(
           Command.withSharedFlags({
-            global: Flag.boolean("global")
+            global: Flag.Boolean("global")
           })
         )
 
         const install = Command.make("install", {
-          pkg: Flag.string("pkg")
+          pkg: Flag.String("pkg")
         }, (config) =>
           Effect.gen(function*() {
             const parentConfig = yield* root
@@ -1100,10 +1168,10 @@ describe("Command", () => {
         const messages: Array<string> = []
 
         const root = Command.make("tool", {
-          workspace: Flag.string("workspace")
+          workspace: Flag.String("workspace")
         }).pipe(
           Command.withSharedFlags({
-            model: Flag.string("model")
+            model: Flag.String("model")
           }),
           Command.withHandler((config) =>
             Effect.sync(() => {
@@ -1123,15 +1191,15 @@ describe("Command", () => {
         const messages: Array<string> = []
 
         const root = Command.make("tool", {
-          model: Flag.string("model")
+          model: Flag.String("model")
         }).pipe(
           Command.withSharedFlags({
-            workspace: Flag.string("workspace")
+            workspace: Flag.String("workspace")
           })
         )
 
         const chat = Command.make("chat", {
-          model: Flag.string("model")
+          model: Flag.String("model")
         }, (config) =>
           Effect.gen(function*() {
             const parent = yield* root
@@ -1149,15 +1217,15 @@ describe("Command", () => {
     it.effect("should reject parent local flags on subcommand paths", () =>
       Effect.gen(function*() {
         const root = Command.make("tool", {
-          model: Flag.string("model")
+          model: Flag.String("model")
         }).pipe(
           Command.withSharedFlags({
-            workspace: Flag.string("workspace")
+            workspace: Flag.String("workspace")
           })
         )
 
         const chat = Command.make("chat", {
-          topic: Flag.string("topic")
+          topic: Flag.String("topic")
         })
 
         const cli = root.pipe(Command.withSubcommands([chat]))
@@ -1178,12 +1246,12 @@ describe("Command", () => {
 
         const root = Command.make("npm").pipe(
           Command.withSharedFlags({
-            global: Flag.boolean("global")
+            global: Flag.Boolean("global")
           })
         )
 
         const install = Command.make("install", {
-          pkg: Flag.string("pkg")
+          pkg: Flag.String("pkg")
         }, (config) =>
           Effect.gen(function*() {
             const parentConfig = yield* root
@@ -1206,7 +1274,7 @@ describe("Command", () => {
 
         const root = Command.make("app").pipe(
           Command.withSharedFlags({
-            env: Flag.string("env")
+            env: Flag.String("env")
           }),
           Command.withHandler((config) =>
             Effect.gen(function*() {
@@ -1217,7 +1285,7 @@ describe("Command", () => {
 
         const service = Command.make("service").pipe(
           Command.withSharedFlags({
-            name: Flag.string("name")
+            name: Flag.String("name")
           }),
           Command.withHandler((config) =>
             Effect.gen(function*() {
@@ -1229,7 +1297,7 @@ describe("Command", () => {
         )
 
         const deploy = Command.make("deploy", {
-          targetVersion: Flag.string("target-version")
+          targetVersion: Flag.String("target-version")
         }, (config) =>
           Effect.gen(function*() {
             const rootConfig = yield* root
@@ -1272,8 +1340,8 @@ describe("Command", () => {
 
         const parent = Command.make("app").pipe(
           Command.withSharedFlags({
-            verbose: Flag.boolean("verbose"),
-            config: Flag.string("config")
+            verbose: Flag.Boolean("verbose"),
+            config: Flag.String("config")
           }),
           Command.withHandler((config) =>
             Effect.gen(function*() {
@@ -1283,7 +1351,7 @@ describe("Command", () => {
         )
 
         const deploy = Command.make("deploy", {
-          targetVersion: Flag.string("target-version")
+          targetVersion: Flag.String("target-version")
         }, (config) =>
           Effect.gen(function*() {
             const parentConfig = yield* parent
@@ -1316,13 +1384,13 @@ describe("Command", () => {
         const messages: Array<string> = []
 
         const root = Command.make("tool", {
-          dryRun: Flag.boolean("dry-run")
+          dryRun: Flag.Boolean("dry-run")
         }).pipe(
           Command.withSharedFlags({
-            verbose: Flag.boolean("verbose")
+            verbose: Flag.Boolean("verbose")
           }),
           Command.withSharedFlags({
-            format: Flag.string("format")
+            format: Flag.String("format")
           })
         )
 
@@ -1347,10 +1415,10 @@ describe("Command", () => {
         const DbUrl = Context.Service<never, string>("effect/test/unstable/cli/DbUrl")
 
         const root = Command.make("app", {
-          dryRun: Flag.boolean("dry-run")
+          dryRun: Flag.Boolean("dry-run")
         }).pipe(
           Command.withSharedFlags({
-            env: Flag.string("env")
+            env: Flag.String("env")
           })
         )
 
@@ -1375,14 +1443,14 @@ describe("Command", () => {
     it.effect("should reject shared/child flag collisions when withSharedFlags is applied after withSubcommands", () =>
       Effect.sync(() => {
         const child = Command.make("run", {
-          verbose: Flag.boolean("verbose")
+          verbose: Flag.Boolean("verbose")
         })
 
         assert.throws(() =>
           Command.make("tool").pipe(
             Command.withSubcommands([child]),
             Command.withSharedFlags({
-              verbose: Flag.boolean("verbose")
+              verbose: Flag.Boolean("verbose")
             })
           )
         )
@@ -1395,7 +1463,7 @@ describe("Command", () => {
         // withSharedFlags BEFORE withSubcommands — correct ordering
         const root = Command.make("tool").pipe(
           Command.withSharedFlags({
-            verbose: Flag.boolean("verbose")
+            verbose: Flag.Boolean("verbose")
           })
         )
 
@@ -1421,14 +1489,14 @@ describe("Command", () => {
         let childInvoked = false
 
         const root = Command.make("tool", {
-          rest: Argument.string("rest").pipe(Argument.variadic())
+          rest: Argument.String("rest").pipe(Argument.variadic())
         }, (config) =>
           Effect.sync(() => {
             captured.push(config.rest)
           }))
 
         const child = Command.make("child", {
-          value: Flag.string("value")
+          value: Flag.String("value")
         }, () =>
           Effect.sync(() => {
             childInvoked = true
@@ -1448,7 +1516,7 @@ describe("Command", () => {
         const captured: Array<ReadonlyArray<string>> = []
 
         const child = Command.make("child", {
-          values: Argument.string("value").pipe(Argument.variadic())
+          values: Argument.String("value").pipe(Argument.variadic())
         }, ({ values }) => Effect.sync(() => captured.push(values)))
 
         const cli = Command.make("tool").pipe(Command.withSubcommands([child]))
@@ -1469,7 +1537,7 @@ describe("Command", () => {
         const captured: Array<string> = []
 
         const child = Command.make("child", {
-          value: Argument.string("value")
+          value: Argument.String("value")
         }, ({ value }) => Effect.sync(() => captured.push(value)))
         const group = Command.make("group").pipe(Command.withSubcommands([child]))
         const cli = Command.make("tool").pipe(Command.withSubcommands([group]))
@@ -1499,7 +1567,7 @@ describe("Command", () => {
         const captured: Array<ReadonlyArray<string>> = []
 
         const command = Command.make("tool", {
-          values: Argument.string("value").pipe(Argument.variadic())
+          values: Argument.String("value").pipe(Argument.variadic())
         }, ({ values }) => Effect.sync(() => captured.push(values)))
 
         yield* Command.runWith(command, { version: "1.0.0" })(["--", "--literal", "-x"])
@@ -1513,12 +1581,12 @@ describe("Command", () => {
 
         const root = Command.make("tool").pipe(
           Command.withSharedFlags({
-            before: Flag.boolean("before"),
-            after: Flag.boolean("after")
+            before: Flag.Boolean("before"),
+            after: Flag.Boolean("after")
           })
         )
         const child = Command.make("child", {
-          value: Argument.string("value")
+          value: Argument.String("value")
         }, ({ value }) =>
           Effect.gen(function*() {
             const parent = yield* root
@@ -1542,7 +1610,7 @@ describe("Command", () => {
         const captured: Array<boolean> = []
 
         const cmd = Command.make("tool", {
-          verbose: Flag.boolean("verbose")
+          verbose: Flag.Boolean("verbose")
         }, (config) => Effect.sync(() => captured.push(config.verbose)))
 
         const runCmd = Command.runWith(cmd, { version: "1.0.0" })
@@ -1558,7 +1626,7 @@ describe("Command", () => {
         const captured: Array<boolean> = []
 
         const cmd = Command.make("tool", {
-          verbose: Flag.boolean("verbose")
+          verbose: Flag.Boolean("verbose")
         }, (config) => Effect.sync(() => captured.push(config.verbose)))
 
         const runCmd = Command.runWith(cmd, { version: "1.0.0" })
@@ -1574,7 +1642,7 @@ describe("Command", () => {
         const captured: Array<Option.Option<boolean>> = []
 
         const cmd = Command.make("tool", {
-          open: Flag.boolean("open").pipe(Flag.optional)
+          open: Flag.Boolean("open").pipe(Flag.optional)
         }, (config) => Effect.sync(() => captured.push(config.open)))
 
         const runCmd = Command.runWith(cmd, { version: "1.0.0" })
@@ -1595,8 +1663,8 @@ describe("Command", () => {
         const captured: Array<readonly [boolean, boolean]> = []
 
         const cmd = Command.make("tool", {
-          prompt: Flag.boolean("prompt"),
-          force: Flag.boolean("force").pipe(
+          prompt: Flag.Boolean("prompt"),
+          force: Flag.Boolean("force").pipe(
             Flag.withAlias("no-prompt"),
             Flag.withDefault(false)
           )
@@ -1614,7 +1682,7 @@ describe("Command", () => {
         let invoked = false
 
         const cmd = Command.make("tool", {
-          open: Flag.boolean("open")
+          open: Flag.Boolean("open")
         }, () =>
           Effect.sync(() => {
             invoked = true
@@ -1642,7 +1710,7 @@ describe("Command", () => {
           }))
 
         const root = Command.make("tool", {
-          open: Flag.boolean("open")
+          open: Flag.Boolean("open")
         }, () =>
           Effect.sync(() => {
             parentInvoked = true
@@ -1666,7 +1734,7 @@ describe("Command", () => {
         let invoked = false
 
         const cmd = Command.make("tool", {
-          pkg: Flag.string("pkg")
+          pkg: Flag.String("pkg")
         }, () =>
           Effect.sync(() => {
             invoked = true
@@ -1687,9 +1755,9 @@ describe("Command", () => {
         const captured: Array<{ all: boolean; verbose: boolean; pkg: string }> = []
 
         const cmd = Command.make("tool", {
-          all: Flag.boolean("all").pipe(Flag.withAlias("a")),
-          verbose: Flag.boolean("verbose").pipe(Flag.withAlias("v")),
-          pkg: Flag.string("pkg").pipe(Flag.withAlias("p"))
+          all: Flag.Boolean("all").pipe(Flag.withAlias("a")),
+          verbose: Flag.Boolean("verbose").pipe(Flag.withAlias("v")),
+          pkg: Flag.String("pkg").pipe(Flag.withAlias("p"))
         }, (config) =>
           Effect.sync(() => {
             captured.push(config)
@@ -1707,12 +1775,12 @@ describe("Command", () => {
         const captured: Array<{ global: boolean; rest: ReadonlyArray<string> }> = []
 
         const root = Command.make("tool", {
-          global: Flag.boolean("global"),
-          rest: Argument.string("rest").pipe(Argument.variadic())
+          global: Flag.Boolean("global"),
+          rest: Argument.String("rest").pipe(Argument.variadic())
         }, (config) => Effect.sync(() => captured.push({ global: config.global, rest: config.rest })))
 
         const child = Command.make("child", {
-          value: Flag.string("value")
+          value: Flag.String("value")
         })
 
         const cli = root.pipe(Command.withSubcommands([child]))
@@ -1743,8 +1811,8 @@ describe("Command", () => {
         const captured: Array<{ files: ReadonlyArray<string>; verbose: boolean }> = []
 
         const cmd = Command.make("copy", {
-          verbose: Flag.boolean("verbose"),
-          files: Argument.string("file").pipe(Argument.variadic())
+          verbose: Flag.Boolean("verbose"),
+          files: Argument.String("file").pipe(Argument.variadic())
         }, (config) => Effect.sync(() => captured.push({ files: config.files, verbose: config.verbose })))
 
         const runCmd = Command.runWith(cmd, { version: "1.0.0" })
@@ -1900,7 +1968,7 @@ describe("Command", () => {
             childInvoked = true
           }))
         const command = Command.make("tool", {
-          version: Flag.boolean("version")
+          version: Flag.Boolean("version")
         }, (config) =>
           Effect.sync(() => {
             captured.push(config.version)
@@ -1921,7 +1989,7 @@ describe("Command", () => {
         const captured: Array<boolean> = []
         const root = Command.make("tool", {}, () => Effect.void).pipe(
           Command.withSharedFlags({
-            version: Flag.boolean("version")
+            version: Flag.Boolean("version")
           })
         )
         const child = Command.make("child", {}, () =>
@@ -1949,7 +2017,7 @@ describe("Command", () => {
         const captured: Array<string> = []
         const child = Command.make("child", {}, () => Effect.void)
         const command = Command.make("tool", {
-          version: Flag.string("version")
+          version: Flag.String("version")
         }, (config) =>
           Effect.sync(() => {
             captured.push(config.version)
@@ -1973,8 +2041,8 @@ describe("Command", () => {
             childInvoked = true
           }))
         const command = Command.make("tool", {
-          name: Flag.string("name"),
-          version: Flag.boolean("version")
+          name: Flag.String("name"),
+          version: Flag.Boolean("version")
         }, (config) =>
           Effect.sync(() => {
             captured.push(config)
@@ -1999,8 +2067,8 @@ describe("Command", () => {
             childInvoked = true
           }))
         const command = Command.make("tool", {
-          files: Argument.string("file").pipe(Argument.variadic()),
-          version: Flag.boolean("version")
+          files: Argument.String("file").pipe(Argument.variadic()),
+          version: Flag.Boolean("version")
         }, (config) =>
           Effect.sync(() => {
             captured.push(config)
@@ -2025,8 +2093,8 @@ describe("Command", () => {
             childInvoked = true
           }))
         const command = Command.make("tool", {
-          name: Flag.string("name"),
-          version: Flag.boolean("version")
+          name: Flag.String("name"),
+          version: Flag.Boolean("version")
         }, (config) =>
           Effect.sync(() => {
             captured.push(config)
@@ -2046,7 +2114,7 @@ describe("Command", () => {
       Effect.gen(function*() {
         const captured: Array<string> = []
         const release = Command.make("release", {
-          version: Flag.string("version")
+          version: Flag.String("version")
         }, (config) =>
           Effect.sync(() => {
             captured.push(config.version)
@@ -2065,15 +2133,15 @@ describe("Command", () => {
 
     it.effect("should let local short aliases override global short aliases on the selected command", () =>
       Effect.gen(function*() {
-        const Output = GlobalFlag.setting("output")({
-          flag: Flag.choice("output", ["pretty", "json", "yaml"] as const).pipe(
+        const Output = GlobalFlag.Setting("output")({
+          flag: Flag.Literals("output", ["pretty", "json", "yaml"] as const).pipe(
             Flag.withAlias("o"),
             Flag.withDefault("pretty")
           )
         })
         const captured: Array<"summary" | "json" | "csv"> = []
         const report = Command.make("report", {
-          output: Flag.choice("output", ["summary", "json", "csv"] as const).pipe(
+          output: Flag.Literals("output", ["summary", "json", "csv"] as const).pipe(
             Flag.withAlias("o"),
             Flag.withDefault("summary")
           )
@@ -2094,8 +2162,8 @@ describe("Command", () => {
 
     it.effect("should let local flags override scoped global flags from another command branch", () =>
       Effect.gen(function*() {
-        const Region = GlobalFlag.setting("region")({
-          flag: Flag.choice("region", ["us", "eu"] as const).pipe(Flag.withDefault("us"))
+        const Region = GlobalFlag.Setting("region")({
+          flag: Flag.Literals("region", ["us", "eu"] as const).pipe(Flag.withDefault("us"))
         })
         const captured: Array<string> = []
         let deployInvoked = false
@@ -2104,7 +2172,7 @@ describe("Command", () => {
             deployInvoked = true
           })).pipe(Command.withGlobalFlags([Region]))
         const status = Command.make("status", {
-          region: Flag.string("region")
+          region: Flag.String("region")
         }, (config) =>
           Effect.sync(() => {
             captured.push(config.region)
@@ -2226,10 +2294,10 @@ describe("Command", () => {
     it.effect("should include flag choices in help doc descriptions", () =>
       Effect.gen(function*() {
         const command = Command.make("tool", {
-          mode: Flag.choice("mode", ["dev", "prod"]).pipe(
+          mode: Flag.Literals("mode", ["dev", "prod"]).pipe(
             Flag.withDescription("Execution mode")
           ),
-          format: Flag.choice("format", ["json", "yaml"])
+          format: Flag.Literals("format", ["json", "yaml"])
         })
 
         const helpDoc = toImpl(command).buildHelpDoc(["tool"])
@@ -2255,7 +2323,7 @@ describe("Command", () => {
     it.effect("should render flag choices in formatted help output", () =>
       Effect.gen(function*() {
         const command = Command.make("tool", {
-          mode: Flag.choice("mode", ["dev", "prod"]).pipe(
+          mode: Flag.Literals("mode", ["dev", "prod"]).pipe(
             Flag.withDescription("Execution mode")
           )
         })
diff --git a/repos/effect/packages/effect/test/unstable/cli/Errors.test.ts b/repos/effect/packages/effect/test/unstable/cli/Errors.test.ts
index 8c6cd3ea3..78d474970 100644
--- a/repos/effect/packages/effect/test/unstable/cli/Errors.test.ts
+++ b/repos/effect/packages/effect/test/unstable/cli/Errors.test.ts
@@ -38,7 +38,7 @@ describe("Command errors", () => {
     it.effect("fails with MissingOption when a required flag is absent", () =>
       Effect.gen(function*() {
         const command = Command.make("needs-value", {
-          value: Flag.string("value")
+          value: Flag.String("value")
         })
 
         const parsedInput = yield* Parser.parseArgs(Lexer.lex([]), command)
@@ -50,12 +50,12 @@ describe("Command errors", () => {
     it("throws DuplicateOption when shared parent and child flags reuse a name", () => {
       const parent = Command.make("parent").pipe(
         Command.withSharedFlags({
-          shared: Flag.string("shared")
+          shared: Flag.String("shared")
         })
       )
 
       const child = Command.make("child", {
-        shared: Flag.string("shared")
+        shared: Flag.String("shared")
       })
 
       try {
@@ -72,11 +72,11 @@ describe("Command errors", () => {
 
     it("allows parent local flags to reuse child flag names", () => {
       const parent = Command.make("parent", {
-        shared: Flag.string("shared")
+        shared: Flag.String("shared")
       })
 
       const child = Command.make("child", {
-        shared: Flag.string("shared")
+        shared: Flag.String("shared")
       })
 
       try {
@@ -89,7 +89,7 @@ describe("Command errors", () => {
     it.effect("accumulates multiple UnrecognizedOption errors", () =>
       Effect.gen(function*() {
         const command = Command.make("test", {
-          verbose: Flag.boolean("verbose")
+          verbose: Flag.Boolean("verbose")
         })
 
         const parsedInput = yield* Parser.parseArgs(
@@ -127,7 +127,7 @@ describe("Command errors", () => {
     it.effect("fails with UnexpectedArgument when a bounded variadic leaves operands", () =>
       Effect.gen(function*() {
         const command = Command.make("test", {
-          values: Argument.string("value").pipe(Argument.variadic({ max: 2 }))
+          values: Argument.String("value").pipe(Argument.variadic({ max: 2 }))
         })
 
         const parsedInput = yield* Parser.parseArgs(
@@ -143,8 +143,8 @@ describe("Command errors", () => {
     it.effect("allows a bounded variadic to leave an operand for a following argument", () =>
       Effect.gen(function*() {
         const command = Command.make("test", {
-          values: Argument.string("value").pipe(Argument.variadic({ max: 2 })),
-          destination: Argument.string("destination")
+          values: Argument.String("value").pipe(Argument.variadic({ max: 2 })),
+          destination: Argument.String("destination")
         })
 
         const parsedInput = yield* Parser.parseArgs(
@@ -162,7 +162,7 @@ describe("Command errors", () => {
     it.effect("fails with UnexpectedArgument when a fixed argument leaves operands", () =>
       Effect.gen(function*() {
         const command = Command.make("test", {
-          value: Argument.string("value")
+          value: Argument.String("value")
         })
 
         const parsedInput = yield* Parser.parseArgs(
diff --git a/repos/effect/packages/effect/test/unstable/cli/Help.test.ts b/repos/effect/packages/effect/test/unstable/cli/Help.test.ts
index bb5eff2bf..c85a52b60 100644
--- a/repos/effect/packages/effect/test/unstable/cli/Help.test.ts
+++ b/repos/effect/packages/effect/test/unstable/cli/Help.test.ts
@@ -41,9 +41,9 @@ const runCommand = Effect.fnUntraced(
 describe("Command help output", () => {
   it("marks omittable flags as not required in structured help", () => {
     const command = Command.make("app", {
-      required: Flag.string("required"),
-      optional: Flag.string("optional").pipe(Flag.optional),
-      defaulted: Flag.string("defaulted").pipe(Flag.withDefault("output.txt"))
+      required: Flag.String("required"),
+      optional: Flag.String("optional").pipe(Flag.optional),
+      defaulted: Flag.String("defaulted").pipe(Flag.withDefault("output.txt"))
     })
     const help = toImpl(command).buildHelpDoc(["app"])
 
@@ -52,13 +52,13 @@ describe("Command help output", () => {
 
   it("marks omittable arguments as not required in structured help", () => {
     const requiredVariadic = Command.make("app", {
-      files: Argument.string("files").pipe(Argument.variadic({ min: 1 }))
+      files: Argument.String("files").pipe(Argument.variadic({ min: 1 }))
     })
     const optionalVariadic = Command.make("app", {
-      files: Argument.string("files").pipe(Argument.variadic())
+      files: Argument.String("files").pipe(Argument.variadic())
     })
     const defaulted = Command.make("app", {
-      output: Argument.string("output").pipe(Argument.withDefault("output.txt"))
+      output: Argument.String("output").pipe(Argument.withDefault("output.txt"))
     })
 
     assert.deepStrictEqual(
@@ -111,8 +111,8 @@ describe("Command help output", () => {
   it.effect("aligns flag descriptions when flag names are long", () =>
     Effect.gen(function*() {
       const command = Command.make("tool", {
-        short: Flag.string("short").pipe(Flag.withDescription("Short flag description")),
-        veryLong: Flag.string("this-is-a-very-very-long-flag-name").pipe(
+        short: Flag.String("short").pipe(Flag.withDescription("Short flag description")),
+        veryLong: Flag.String("this-is-a-very-very-long-flag-name").pipe(
           Flag.withDescription("Long flag description")
         )
       })
@@ -130,10 +130,44 @@ describe("Command help output", () => {
       expect(shortLine!.indexOf("Short flag description")).toBe(longLine!.indexOf("Long flag description"))
     }).pipe(Effect.provide(TestLayer)))
 
+  it.effect("aligns flag descriptions when flag names contain wide graphemes", () =>
+    Effect.gen(function*() {
+      const command = Command.make("tool", {
+        file: Flag.Boolean("ファイル").pipe(Flag.withDescription("Wide flag description")),
+        emoji: Flag.Boolean("👩‍💻").pipe(Flag.withDescription("Emoji flag description")),
+        verbose: Flag.Boolean("verbose").pipe(Flag.withDescription("ASCII flag description"))
+      })
+      const run = Command.runWith(command, { version: "1.0.0" })
+
+      yield* run(["--help"])
+
+      const lines = (yield* TestConsole.logLines).join("\n").split("\n")
+      assert.include(lines, "  --ファイル    Wide flag description")
+      assert.include(lines, "  --👩‍💻          Emoji flag description")
+      assert.include(lines, "  --verbose     ASCII flag description")
+    }).pipe(Effect.provide(TestLayer)))
+
+  it.effect("aligns flag descriptions when flag names contain zero-width code points", () =>
+    Effect.gen(function*() {
+      const command = Command.make("tool", {
+        combining: Flag.Boolean("e\u0301").pipe(Flag.withDescription("Combining flag description")),
+        zeroWidth: Flag.Boolean("a\u200Bb").pipe(Flag.withDescription("Zero-width flag description")),
+        ascii: Flag.Boolean("abcd").pipe(Flag.withDescription("ASCII flag description"))
+      })
+      const run = Command.runWith(command, { version: "1.0.0" })
+
+      yield* run(["--help"])
+
+      const lines = (yield* TestConsole.logLines).join("\n").split("\n")
+      assert.include(lines, "  --e\u0301       Combining flag description")
+      assert.include(lines, "  --a\u200Bb      Zero-width flag description")
+      assert.include(lines, "  --abcd    ASCII flag description")
+    }).pipe(Effect.provide(TestLayer)))
+
   it.effect("separates long subcommand and argument names from their descriptions", () =>
     Effect.gen(function*() {
       const child = Command.make("account:set-password", {
-        account: Argument.string("existing-account-identifier").pipe(
+        account: Argument.String("existing-account-identifier").pipe(
           Argument.withDescription("Account to update")
         )
       }).pipe(Command.withDescription("Rewrite the credential hash"))
@@ -156,8 +190,8 @@ describe("Command help output", () => {
   it.effect("hides flags marked with withHidden from help output", () =>
     Effect.gen(function*() {
       const command = Command.make("tool", {
-        visible: Flag.string("visible").pipe(Flag.withDescription("Visible flag")),
-        secret: Flag.string("experimental-foo").pipe(
+        visible: Flag.String("visible").pipe(Flag.withDescription("Visible flag")),
+        secret: Flag.String("experimental-foo").pipe(
           Flag.withDescription("Should not appear"),
           Flag.withHidden
         )
@@ -176,7 +210,7 @@ describe("Command help output", () => {
     Effect.gen(function*() {
       let captured: string | undefined
       const command = Command.make("tool", {
-        secret: Flag.string("experimental-foo").pipe(Flag.withHidden)
+        secret: Flag.String("experimental-foo").pipe(Flag.withHidden)
       }, (config) =>
         Effect.sync(() => {
           captured = config.secret
@@ -191,7 +225,7 @@ describe("Command help output", () => {
   it.effect("hidden flag name does not leak through unrecognized-flag suggestions", () =>
     Effect.gen(function*() {
       const command = Command.make("tool", {
-        secret: Flag.string("experimental-foo").pipe(Flag.withHidden)
+        secret: Flag.String("experimental-foo").pipe(Flag.withHidden)
       }, () => Effect.void)
       const run = Command.runWith(command, { version: "1.0.0" })
 
@@ -514,14 +548,14 @@ describe("Command help output", () => {
   it.effect("shared flags are visible in subcommand help while local flags stay local", () =>
     Effect.gen(function*() {
       const root = Command.make("tool", {
-        workspace: Flag.string("workspace")
+        workspace: Flag.String("workspace")
       }).pipe(
         Command.withSharedFlags({
-          model: Flag.string("model")
+          model: Flag.String("model")
         }),
         Command.withSubcommands([
           Command.make("chat", {
-            topic: Flag.string("topic")
+            topic: Flag.String("topic")
           })
         ])
       )
@@ -541,6 +575,28 @@ describe("Command help output", () => {
       expect(chatHelp.some((line) => String(line).includes("--topic"))).toBe(true)
     }).pipe(Effect.provide(TestLayer)))
 
+  it.effect("includes inherited shared flags in subcommand completions", () =>
+    Effect.gen(function*() {
+      const root = Command.make("tool").pipe(
+        Command.withSharedFlags({
+          workspace: Flag.String("workspace").pipe(Flag.withAlias("w"))
+        }),
+        Command.withSubcommands([
+          Command.make("chat", {
+            topic: Flag.String("topic").pipe(Flag.withAlias("t"))
+          })
+        ])
+      )
+      const runRoot = Command.runWith(root, { version: "1.0.0" })
+
+      yield* runRoot(["--completions", "bash"])
+
+      const completionScript = (yield* TestConsole.logLines).join("\n")
+      const chatCompletions = completionScript.slice(completionScript.indexOf("_tool_chat()"))
+      expect(chatCompletions).toContain(`_filtered_flags+=" --topic -t"`)
+      expect(chatCompletions).toContain(`_filtered_flags+=" --workspace -w"`)
+    }).pipe(Effect.provide(TestLayer)))
+
   it.effect("renders grouped subcommands", () =>
     Effect.gen(function*() {
       const ungrouped = Command.make("ungrouped").pipe(
@@ -635,4 +691,19 @@ describe("Command help output", () => {
           plan, p    Draft a plan in your editor"
       `)
     }).pipe(Effect.provide(TestLayer)))
+
+  it.effect("keeps subcommand flags in aliased completion contexts", () =>
+    Effect.gen(function*() {
+      const list = Command.make("list", {
+        format: Flag.Literals("format", ["json", "text"])
+      }).pipe(Command.withAlias("ls"))
+      const root = Command.make("ctl").pipe(Command.withSubcommands([list]))
+      const runRoot = Command.runWith(root, { version: "1.0.0" })
+
+      yield* runRoot(["--completions", "bash"])
+
+      const completion = (yield* TestConsole.logLines).join("\n")
+      const aliasContext = completion.split("_ctl_ls()")[1]?.split("\n}")[0] ?? ""
+      expect(aliasContext).toContain("--format")
+    }).pipe(Effect.provide(TestLayer)))
 })
diff --git a/repos/effect/packages/effect/test/unstable/cli/LogLevel.test.ts b/repos/effect/packages/effect/test/unstable/cli/LogLevel.test.ts
index 909ea38e9..c403e5d85 100644
--- a/repos/effect/packages/effect/test/unstable/cli/LogLevel.test.ts
+++ b/repos/effect/packages/effect/test/unstable/cli/LogLevel.test.ts
@@ -154,7 +154,7 @@ describe("LogLevel", () => {
   it.effect("applies the selected log level to subcommands", () =>
     Effect.gen(function*() {
       const parentCommand = Command.make("parent", {
-        verbose: Flag.boolean("verbose")
+        verbose: Flag.Boolean("verbose")
       })
 
       const childCommand = Command.make("child", {}, () =>
diff --git a/repos/effect/packages/effect/test/unstable/cli/Param.test.ts b/repos/effect/packages/effect/test/unstable/cli/Param.test.ts
index 4f2ace47f..c93854bc7 100644
--- a/repos/effect/packages/effect/test/unstable/cli/Param.test.ts
+++ b/repos/effect/packages/effect/test/unstable/cli/Param.test.ts
@@ -27,11 +27,31 @@ const TestLayer = Layer.mergeAll(
 )
 
 describe("Param", () => {
+  it.effect("Never remains an always-failing flag sentinel", () =>
+    Effect.gen(function*() {
+      for (const sentinel of [Flag.Never, Param.Never(Param.flagKind)]) {
+        const missing = yield* Effect.flip(sentinel.parse({ flags: {}, arguments: [] }))
+        assert.instanceOf(missing, CliError.MissingOption)
+        const supplied = yield* Effect.flip(sentinel.parse({ flags: { __never__: ["value"] }, arguments: [] }))
+        assert.instanceOf(supplied, CliError.InvalidValue)
+      }
+    }).pipe(Effect.provide(TestLayer)))
+
+  it.effect("Never remains an always-failing argument sentinel", () =>
+    Effect.gen(function*() {
+      for (const sentinel of [Argument.Never, Param.Never(Param.argumentKind)]) {
+        const missing = yield* Effect.flip(sentinel.parse({ flags: {}, arguments: [] }))
+        assert.instanceOf(missing, CliError.MissingArgument)
+        const supplied = yield* Effect.flip(sentinel.parse({ flags: {}, arguments: ["value"] }))
+        assert.instanceOf(supplied, CliError.InvalidValue)
+      }
+    }).pipe(Effect.provide(TestLayer)))
+
   describe("boolean", () => {
     it.effect("returns MissingOption when a boolean flag is omitted", () =>
       Effect.gen(function*() {
         const error = yield* Effect.flip(
-          Flag.boolean("verbose").parse({
+          Flag.Boolean("verbose").parse({
             flags: {},
             arguments: []
           })
@@ -42,7 +62,7 @@ describe("Param", () => {
 
     it.effect("uses the requested default when a boolean flag is omitted", () =>
       Effect.gen(function*() {
-        const flag = Flag.boolean("verbose").pipe(Flag.withDefault(true))
+        const flag = Flag.Boolean("verbose").pipe(Flag.withDefault(true))
 
         const [, value] = yield* flag.parse({
           flags: {},
@@ -54,7 +74,7 @@ describe("Param", () => {
 
     it.effect("restores switch behavior with a false default", () =>
       Effect.gen(function*() {
-        const flag = Flag.boolean("verbose").pipe(Flag.withDefault(false))
+        const flag = Flag.Boolean("verbose").pipe(Flag.withDefault(false))
 
         const [, value] = yield* flag.parse({
           flags: {},
@@ -68,8 +88,8 @@ describe("Param", () => {
   it.effect("recognizes the alternate flag declared by orElse", () =>
     Effect.gen(function*() {
       const command = Command.make("app", {
-        config: Flag.string("config").pipe(
-          Flag.orElse(() => Flag.string("config-url"))
+        config: Flag.String("config").pipe(
+          Flag.orElse(() => Flag.String("config-url"))
         )
       })
 
@@ -81,8 +101,8 @@ describe("Param", () => {
 
   it.effect("registers and parses the alternate flag declared by orElseResult", () =>
     Effect.gen(function*() {
-      const flag = Flag.string("config").pipe(
-        Flag.orElseResult(() => Flag.string("config-url"))
+      const flag = Flag.String("config").pipe(
+        Flag.orElseResult(() => Flag.String("config-url"))
       )
 
       assert.deepStrictEqual(Param.extractSingleParams(flag).map((param) => param.name), ["config", "config-url"])
@@ -101,7 +121,7 @@ describe("Param", () => {
       ["__proto__"]: value,
       kind: Param.flagKind,
       name: "name",
-      primitiveType: Primitive.string
+      primitiveType: Primitive.String
     } as any)
 
     assert.isTrue(Param.isParam(param))
@@ -112,7 +132,7 @@ describe("Param", () => {
   describe("optional", () => {
     it.effect("returns none when an optional boolean flag is omitted", () =>
       Effect.gen(function*() {
-        const flag = Flag.boolean("verbose").pipe(Flag.optional)
+        const flag = Flag.Boolean("verbose").pipe(Flag.optional)
 
         const [, value] = yield* flag.parse({
           flags: {},
@@ -124,7 +144,7 @@ describe("Param", () => {
 
     it.effect("returns some false when an optional boolean flag is explicitly disabled", () =>
       Effect.gen(function*() {
-        const flag = Flag.boolean("verbose").pipe(Flag.optional)
+        const flag = Flag.Boolean("verbose").pipe(Flag.optional)
 
         const [, value] = yield* flag.parse({
           flags: { verbose: ["false"] },
@@ -133,13 +153,37 @@ describe("Param", () => {
 
         assert.deepStrictEqual(value, Option.some(false))
       }).pipe(Effect.provide(TestLayer)))
+
+    it.effect("supports alternative flags", () =>
+      Effect.gen(function*() {
+        const flag = Flag.String("config").pipe(
+          Flag.orElse(() => Flag.String("config-url")),
+          Flag.optional
+        )
+
+        const [, value] = yield* flag.parse({ flags: { config: ["config.json"] }, arguments: [] })
+
+        assert.deepStrictEqual(value, Option.some("config.json"))
+      }).pipe(Effect.provide(TestLayer)))
   })
 
+  it.effect("uses the default when a required variadic argument is omitted", () =>
+    Effect.gen(function*() {
+      const argument = Argument.String("files").pipe(
+        Argument.atLeast(1),
+        Argument.withDefault(["README.md"])
+      )
+
+      const result = yield* argument.parse({ flags: {}, arguments: [] })
+
+      assert.deepStrictEqual(result, [[], ["README.md"]])
+    }).pipe(Effect.provide(TestLayer)))
+
   describe("withFallbackPrompt", () => {
     it.effect("prompts for missing flag values and preserves remaining args", () =>
       Effect.gen(function*() {
-        const prompt = Prompt.text({ message: "Name" })
-        const flag = Flag.string("name").pipe(Flag.withFallbackPrompt(prompt))
+        const prompt = Prompt.String({ message: "Name" })
+        const flag = Flag.String("name").pipe(Flag.withFallbackPrompt(prompt))
 
         yield* MockTerminal.inputText("Chandra")
         yield* MockTerminal.inputKey("enter")
@@ -155,8 +199,8 @@ describe("Param", () => {
 
     it.effect("does not prompt when flag value is provided", () =>
       Effect.gen(function*() {
-        const prompt = Prompt.text({ message: "Name" })
-        const flag = Flag.string("name").pipe(Flag.withFallbackPrompt(prompt))
+        const prompt = Prompt.String({ message: "Name" })
+        const flag = Flag.String("name").pipe(Flag.withFallbackPrompt(prompt))
 
         const [, value] = yield* flag.parse({
           flags: { name: ["Ava"] },
@@ -168,8 +212,8 @@ describe("Param", () => {
 
     it.effect("prompts for missing arguments", () =>
       Effect.gen(function*() {
-        const prompt = Prompt.text({ message: "File" })
-        const argument = Argument.string("file").pipe(Argument.withFallbackPrompt(prompt))
+        const prompt = Prompt.String({ message: "File" })
+        const argument = Argument.String("file").pipe(Argument.withFallbackPrompt(prompt))
 
         yield* MockTerminal.inputText("notes.txt")
         yield* MockTerminal.inputKey("enter")
@@ -188,10 +232,10 @@ describe("Param", () => {
         const calls = yield* Ref.make(0)
         const prompt = Effect.gen(function*() {
           yield* Ref.update(calls, (n) => n + 1)
-          return Prompt.text({ message: "Name from effect" })
+          return Prompt.String({ message: "Name from effect" })
         })
 
-        const flag = Flag.string("name").pipe(Flag.withFallbackPrompt(prompt))
+        const flag = Flag.String("name").pipe(Flag.withFallbackPrompt(prompt))
 
         const [, provided] = yield* flag.parse({
           flags: { name: ["Ava"] },
@@ -218,10 +262,10 @@ describe("Param", () => {
         const calls = yield* Ref.make(0)
         const prompt = Effect.gen(function*() {
           yield* Ref.update(calls, (n) => n + 1)
-          return Prompt.text({ message: "File from effect" })
+          return Prompt.String({ message: "File from effect" })
         })
 
-        const argument = Argument.string("file").pipe(Argument.withFallbackPrompt(prompt))
+        const argument = Argument.String("file").pipe(Argument.withFallbackPrompt(prompt))
 
         const [providedRemaining, provided] = yield* argument.parse({
           flags: {},
@@ -251,7 +295,7 @@ describe("Param", () => {
         })
         const prompt = Effect.fail(failure)
 
-        const flag = Flag.string("name").pipe(Flag.withFallbackPrompt(prompt))
+        const flag = Flag.String("name").pipe(Flag.withFallbackPrompt(prompt))
 
         const error = yield* Effect.flip(
           flag.parse({
@@ -265,8 +309,8 @@ describe("Param", () => {
 
     it.effect("prefers defaults over fallback prompts", () =>
       Effect.gen(function*() {
-        const prompt = Prompt.text({ message: "Name" })
-        const flag = Flag.string("name").pipe(
+        const prompt = Prompt.String({ message: "Name" })
+        const flag = Flag.String("name").pipe(
           Flag.withDefault("guest"),
           Flag.withFallbackPrompt(prompt)
         )
@@ -281,8 +325,8 @@ describe("Param", () => {
 
     it.effect("does not prompt for invalid flag values", () =>
       Effect.gen(function*() {
-        const prompt = Prompt.text({ message: "Count" })
-        const flag = Flag.integer("count").pipe(Flag.withFallbackPrompt(prompt))
+        const prompt = Prompt.String({ message: "Count" })
+        const flag = Flag.Int("count").pipe(Flag.withFallbackPrompt(prompt))
 
         const error = yield* Effect.flip(
           flag.parse({
@@ -296,8 +340,8 @@ describe("Param", () => {
 
     it.effect("does not prompt for invalid argument values", () =>
       Effect.gen(function*() {
-        const prompt = Prompt.text({ message: "Count" })
-        const argument = Argument.integer("count").pipe(Argument.withFallbackPrompt(prompt))
+        const prompt = Prompt.String({ message: "Count" })
+        const argument = Argument.Int("count").pipe(Argument.withFallbackPrompt(prompt))
 
         const error = yield* Effect.flip(
           argument.parse({
@@ -311,8 +355,8 @@ describe("Param", () => {
 
     it.effect("prompts for missing boolean flags", () =>
       Effect.gen(function*() {
-        const prompt = Prompt.confirm({ message: "Verbose" })
-        const flag = Flag.boolean("verbose").pipe(Flag.withFallbackPrompt(prompt))
+        const prompt = Prompt.Confirm({ message: "Verbose" })
+        const flag = Flag.Boolean("verbose").pipe(Flag.withFallbackPrompt(prompt))
 
         yield* MockTerminal.inputKey("y")
 
@@ -326,8 +370,8 @@ describe("Param", () => {
 
     it.effect("uses an explicitly disabled boolean before prompting", () =>
       Effect.gen(function*() {
-        const prompt = Prompt.confirm({ message: "Verbose" })
-        const flag = Flag.boolean("verbose").pipe(Flag.withFallbackPrompt(prompt))
+        const prompt = Prompt.Confirm({ message: "Verbose" })
+        const flag = Flag.Boolean("verbose").pipe(Flag.withFallbackPrompt(prompt))
 
         const [, value] = yield* flag.parse({
           flags: { verbose: ["false"] },
@@ -339,8 +383,8 @@ describe("Param", () => {
 
     it.effect("returns MissingOption when prompt is cancelled", () =>
       Effect.gen(function*() {
-        const prompt = Prompt.text({ message: "Name" })
-        const flag = Flag.string("name").pipe(Flag.withFallbackPrompt(prompt))
+        const prompt = Prompt.String({ message: "Name" })
+        const flag = Flag.String("name").pipe(Flag.withFallbackPrompt(prompt))
 
         yield* MockTerminal.inputKey("c", { ctrl: true })
 
@@ -356,8 +400,8 @@ describe("Param", () => {
 
     it.effect("returns MissingArgument when argument prompt is cancelled", () =>
       Effect.gen(function*() {
-        const prompt = Prompt.text({ message: "File" })
-        const argument = Argument.string("file").pipe(Argument.withFallbackPrompt(prompt))
+        const prompt = Prompt.String({ message: "File" })
+        const argument = Argument.String("file").pipe(Argument.withFallbackPrompt(prompt))
 
         yield* MockTerminal.inputKey("c", { ctrl: true })
 
@@ -381,7 +425,7 @@ describe("Param", () => {
       })
 
       return Effect.gen(function*() {
-        const flag = Flag.boolean("verbose").pipe(
+        const flag = Flag.Boolean("verbose").pipe(
           Flag.withFallbackConfig(Config.Boolean("VERBOSE"))
         )
 
@@ -405,7 +449,7 @@ describe("Param", () => {
       })
 
       return Effect.gen(function*() {
-        const flag = Flag.boolean("verbose").pipe(
+        const flag = Flag.Boolean("verbose").pipe(
           Flag.withFallbackConfig(Config.Boolean("VERBOSE"))
         )
 
@@ -429,7 +473,7 @@ describe("Param", () => {
       })
 
       return Effect.gen(function*() {
-        const flag = Flag.string("name").pipe(
+        const flag = Flag.String("name").pipe(
           Flag.withFallbackConfig(Config.String("NAME"))
         )
 
@@ -453,7 +497,7 @@ describe("Param", () => {
       })
 
       return Effect.gen(function*() {
-        const flag = Flag.string("name").pipe(
+        const flag = Flag.String("name").pipe(
           Flag.withFallbackConfig(Config.String("NAME"))
         )
 
@@ -477,7 +521,7 @@ describe("Param", () => {
       })
 
       return Effect.gen(function*() {
-        const argument = Argument.string("repository").pipe(
+        const argument = Argument.String("repository").pipe(
           Argument.withFallbackConfig(Config.String("REPOSITORY"))
         )
 
@@ -497,7 +541,7 @@ describe("Param", () => {
       const provider = ConfigProvider.fromEnv({ env: {} })
 
       return Effect.gen(function*() {
-        const flag = Flag.string("name").pipe(
+        const flag = Flag.String("name").pipe(
           Flag.withFallbackConfig(Config.String("NAME"))
         )
 
@@ -523,7 +567,7 @@ describe("Param", () => {
       })
 
       return Effect.gen(function*() {
-        const flag = Flag.integer("count").pipe(
+        const flag = Flag.Int("count").pipe(
           Flag.withFallbackConfig(Config.Int("COUNT"))
         )
 
diff --git a/repos/effect/packages/effect/test/unstable/cli/Primitive.test.ts b/repos/effect/packages/effect/test/unstable/cli/Primitive.test.ts
index a3d2503a4..dfe97d13c 100644
--- a/repos/effect/packages/effect/test/unstable/cli/Primitive.test.ts
+++ b/repos/effect/packages/effect/test/unstable/cli/Primitive.test.ts
@@ -1,5 +1,5 @@
 import { assert, describe, it } from "@effect/vitest"
-import { Effect, FileSystem, Layer, Path, PlatformError, Redacted, Stdio } from "effect"
+import { Effect, FileSystem, Layer, Path, PlatformError, Redacted, Schema, Stdio } from "effect"
 import { TestConsole } from "effect/testing"
 import { Primitive } from "effect/unstable/cli"
 import { ChildProcessSpawner } from "effect/unstable/process"
@@ -61,10 +61,10 @@ const expectValidDates = (
   }) as Effect.Effect<void, string, never>
 
 describe("Primitive", () => {
-  describe("boolean", () => {
+  describe("Boolean", () => {
     it.layer(TestLayer)((it) => {
       it.effect("should parse true values correctly", () =>
-        expectValidValues(Primitive.boolean, [
+        expectValidValues(Primitive.Boolean, [
           ["true", true],
           ["1", true],
           ["y", true],
@@ -73,7 +73,7 @@ describe("Primitive", () => {
         ]))
 
       it.effect("should parse false values correctly", () =>
-        expectValidValues(Primitive.boolean, [
+        expectValidValues(Primitive.Boolean, [
           ["false", false],
           ["0", false],
           ["n", false],
@@ -83,21 +83,21 @@ describe("Primitive", () => {
 
       it.effect("should fail for invalid values", () =>
         expectInvalidValues(
-          Primitive.boolean,
+          Primitive.Boolean,
           ["invalid"],
           [`Expected "true" | "yes" | "on" | "1" | "y" | "false" | "no" | "off" | "0" | "n"`]
         ))
 
       it("should have correct _tag", () => {
-        assert.strictEqual(Primitive.boolean._tag, "Boolean")
+        assert.strictEqual(Primitive.Boolean._tag, "Boolean")
       })
     })
   })
 
-  describe("float", () => {
+  describe("Finite", () => {
     it.layer(TestLayer)((it) => {
-      it.effect("should parse valid float values", () =>
-        expectValidValues(Primitive.float, [
+      it.effect("should parse valid finite numbers", () =>
+        expectValidValues(Primitive.Finite, [
           ["42", 42],
           ["3.14", 3.14],
           ["-42.5", -42.5],
@@ -106,20 +106,28 @@ describe("Primitive", () => {
         ]))
 
       it.effect("should fail for invalid values", () =>
-        expectInvalidValues(Primitive.float, ["not-a-number"], [
+        expectInvalidValues(Primitive.Finite, ["not-a-number"], [
           `Expected a string representing a finite number`
         ]))
 
+      it.effect("should reject non-finite numbers and overflow", () =>
+        Effect.gen(function*() {
+          for (const input of ["NaN", "Infinity", "-Infinity", "1e309"]) {
+            const error = yield* Effect.flip(Primitive.Finite.parse(input))
+            assert.include(error, "finite number")
+          }
+        }))
+
       it("should have correct _tag", () => {
-        assert.strictEqual(Primitive.float._tag, "Float")
+        assert.strictEqual(Primitive.Finite._tag, "Finite")
       })
     })
   })
 
-  describe("date", () => {
+  describe("Date", () => {
     it.layer(TestLayer)((it) => {
       it.effect("should parse valid date values", () =>
-        expectValidDates(Primitive.date, [
+        expectValidDates(Primitive.Date, [
           // ISO date
           [
             "2024-01-15",
@@ -145,18 +153,18 @@ describe("Primitive", () => {
         ]))
 
       it.effect("should fail for invalid values", () =>
-        expectInvalidValues(Primitive.date, ["not-a-date"], [`Expected a valid Date`]))
+        expectInvalidValues(Primitive.Date, ["not-a-date"], [`Expected a valid Date`]))
 
       it("should have correct _tag", () => {
-        assert.strictEqual(Primitive.date._tag, "Date")
+        assert.strictEqual(Primitive.Date._tag, "Date")
       })
     })
   })
 
-  describe("integer", () => {
+  describe("Int", () => {
     it.layer(TestLayer)((it) => {
       it.effect("should parse valid integer values", () =>
-        expectValidValues(Primitive.integer, [
+        expectValidValues(Primitive.Int, [
           ["42", 42],
           ["-123", -123],
           ["0", 0],
@@ -166,21 +174,21 @@ describe("Primitive", () => {
 
       it.effect("should fail for invalid values", () =>
         expectInvalidValues(
-          Primitive.integer,
+          Primitive.Int,
           ["3.14", "not-a-number"],
           [`Expected an integer`, `Expected a string representing a finite number`]
         ))
 
       it("should have correct _tag", () => {
-        assert.strictEqual(Primitive.integer._tag, "Integer")
+        assert.strictEqual(Primitive.Int._tag, "Int")
       })
     })
   })
 
-  describe("string", () => {
+  describe("String", () => {
     it.layer(TestLayer)((it) => {
       it.effect("should parse string values", () =>
-        expectValidValues(Primitive.string, [
+        expectValidValues(Primitive.String, [
           ["hello", "hello"],
           ["", ""],
           [" spaces ", " spaces "],
@@ -189,13 +197,13 @@ describe("Primitive", () => {
         ]))
 
       it("should have correct _tag", () => {
-        assert.strictEqual(Primitive.string._tag, "String")
+        assert.strictEqual(Primitive.String._tag, "String")
       })
     })
   })
 
-  describe("choice", () => {
-    const colorChoice = Primitive.choice([
+  describe("Choice", () => {
+    const colorChoice = Primitive.Choice([
       ["red", "RED"],
       ["green", "GREEN"],
       ["blue", "BLUE"]
@@ -224,7 +232,7 @@ describe("Primitive", () => {
         assert.strictEqual(colorChoice._tag, "Choice")
       })
 
-      const numberChoice = Primitive.choice([
+      const numberChoice = Primitive.Choice([
         ["one", 1],
         ["two", 2],
         ["three", 3]
@@ -239,11 +247,11 @@ describe("Primitive", () => {
     })
   })
 
-  describe("path", () => {
+  describe("Path", () => {
     it.layer(TestLayer)((it) => {
       it.effect("should resolve paths without requiring existence", () =>
         Effect.gen(function*() {
-          const pathPrimitive = Primitive.path("either")
+          const pathPrimitive = Primitive.Path("either")
           const result1 = yield* pathPrimitive.parse("./test.txt")
           const result2 = yield* pathPrimitive.parse("/absolute/path")
           const result3 = yield* pathPrimitive.parse("relative/path")
@@ -255,12 +263,12 @@ describe("Primitive", () => {
         }))
 
       it("should have correct _tag", () => {
-        assert.strictEqual(Primitive.path("either")._tag, "Path")
+        assert.strictEqual(Primitive.Path("either")._tag, "Path")
       })
 
       it.effect("should fail when a required file path does not exist", () =>
         Effect.gen(function*() {
-          const filePath = Primitive.path("file", true)
+          const filePath = Primitive.Path("file", true)
 
           // Test non-existent file - should fail validation
           const error = yield* Effect.flip(
@@ -285,7 +293,7 @@ describe("Primitive", () => {
 
       it.effect("should fail when a required directory path does not exist", () =>
         Effect.gen(function*() {
-          const dirPath = Primitive.path("directory", true)
+          const dirPath = Primitive.Path("directory", true)
 
           // Test non-existent directory - should fail validation
           const error = yield* Effect.flip(
@@ -310,11 +318,11 @@ describe("Primitive", () => {
     })
   })
 
-  describe("redacted", () => {
+  describe("Redacted", () => {
     it.layer(TestLayer)((it) => {
       it.effect("should parse and redact values", () =>
         Effect.gen(function*() {
-          const result = yield* Primitive.redacted.parse("secret123")
+          const result = yield* Primitive.Redacted.parse("secret123")
           // Check if it's a Redacted value
           assert.isTrue(Redacted.isRedacted(result))
           // The toString method should return a redacted representation
@@ -322,14 +330,73 @@ describe("Primitive", () => {
         }))
 
       it("should have correct _tag", () => {
-        assert.strictEqual(Primitive.redacted._tag, "Redacted")
+        assert.strictEqual(Primitive.Redacted._tag, "Redacted")
       })
 
       it.effect("should handle empty strings", () =>
         Effect.gen(function*() {
-          const result = yield* Primitive.redacted.parse("")
+          const result = yield* Primitive.Redacted.parse("")
           assert.isTrue(Redacted.isRedacted(result))
         }))
     })
   })
+
+  describe("KeyValuePair", () => {
+    it.layer(TestLayer)((it) => {
+      it.effect("should preserve '=' in URL query parameters", () =>
+        Effect.gen(function*() {
+          const url = yield* Primitive.KeyValuePair.parse(
+            "DATABASE_URL=postgres://user:pass@host:5432/db?sslmode=require"
+          )
+          assert.deepStrictEqual(url, {
+            DATABASE_URL: "postgres://user:pass@host:5432/db?sslmode=require"
+          })
+        }))
+
+      it.effect("should preserve trailing '=' in padded values", () =>
+        Effect.gen(function*() {
+          const padded = yield* Primitive.KeyValuePair.parse("TOKEN=YWJjZA==")
+          assert.deepStrictEqual(padded, { TOKEN: "YWJjZA==" })
+        }))
+
+      it.effect("should fail when the input is malformed", () =>
+        expectInvalidValues(
+          Primitive.KeyValuePair,
+          ["invalid", "=value", "key="],
+          [
+            "Invalid key=value format. Expected format: key=value, got: invalid",
+            "Invalid key=value format. Both key and value must be non-empty. Got: =value",
+            "Invalid key=value format. Both key and value must be non-empty. Got: key="
+          ]
+        ))
+    })
+  })
+
+  it.effect("file constructors preserve text, parsed content, and schema decoding", () =>
+    Effect.gen(function*() {
+      assert.strictEqual(yield* Primitive.FileText.parse("/config.json"), "{\"enabled\":true}")
+      assert.deepStrictEqual(yield* Primitive.FileParse().parse("/config.json"), { enabled: true })
+      assert.deepStrictEqual(
+        yield* Primitive.FileSchema(Schema.Struct({ enabled: Schema.Boolean })).parse("/config.json"),
+        { enabled: true }
+      )
+      const error = yield* Effect.flip(Primitive.FileSchema(Schema.String).parse("/config.json"))
+      assert.include(error, "string")
+    }).pipe(
+      Effect.provide(FileSystem.layerNoop({
+        exists: () => Effect.succeed(true),
+        stat: () => Effect.succeed({ type: "File" } as FileSystem.File.Info),
+        readFileString: () => Effect.succeed("{\"enabled\":true}")
+      })),
+      Effect.provide(TestLayer)
+    ))
+
+  it("Never has the matching primitive tag", () => {
+    assert.strictEqual(Primitive.Never._tag, "Never")
+  })
+
+  it.effect("Never remains an always-failing sentinel", () =>
+    expectInvalidValues(Primitive.Never, ["value"], ["This option does not accept values"]).pipe(
+      Effect.provide(TestLayer)
+    ))
 })
diff --git a/repos/effect/packages/effect/test/unstable/cli/Prompt.test.ts b/repos/effect/packages/effect/test/unstable/cli/Prompt.test.ts
index 095de7883..078081a56 100644
--- a/repos/effect/packages/effect/test/unstable/cli/Prompt.test.ts
+++ b/repos/effect/packages/effect/test/unstable/cli/Prompt.test.ts
@@ -1,5 +1,5 @@
 import { assert, describe, it } from "@effect/vitest"
-import { Data, DateTime, Effect, Fiber, FileSystem, Layer, Match, Path, Queue, Redacted } from "effect"
+import { Data, DateTime, Deferred, Effect, Fiber, FileSystem, Layer, Match, Path, Queue, Redacted } from "effect"
 import { Prompt } from "effect/unstable/cli"
 import * as MockTerminal from "./services/MockTerminal.ts"
 
@@ -49,7 +49,7 @@ const toRawFrames = (lines: ReadonlyArray<unknown>) =>
 
 const findFrame = (frames: ReadonlyArray<string>, text: string) => frames.find((frame) => frame.includes(text))
 
-describe("Prompt.date", () => {
+describe("Prompt.Date", () => {
   it.effect("renders two-digit years, teen ordinals, and noon meridiem correctly", () =>
     Effect.gen(function*() {
       const initial = DateTime.toDateUtc(DateTime.makeZonedUnsafe(
@@ -58,11 +58,62 @@ describe("Prompt.date", () => {
       ))
       yield* MockTerminal.inputKey("enter")
 
-      yield* Prompt.run(Prompt.date({ message: "When", initial, dateMask: "YY Do A" }))
+      yield* Prompt.run(Prompt.Date({ message: "When", initial, dateMask: "YY Do A" }))
       const output = (yield* MockTerminal.displayLines).map(String).join("\n")
 
       assert.include(output, "24 11th PM")
     }).pipe(Effect.provide(TestLayer)))
+
+  it.effect("starts a fresh typed buffer when Tab advances to the next field", () =>
+    Effect.gen(function*() {
+      const initial = new Date(2024, 0, 1, 12)
+      yield* MockTerminal.inputText("1")
+      yield* MockTerminal.inputKey("tab")
+      yield* MockTerminal.inputText("5")
+      yield* MockTerminal.inputKey("enter")
+
+      const result = yield* Prompt.run(Prompt.Date({ message: "When", initial, dateMask: "MM-DD" }))
+
+      assert.deepStrictEqual(result, new Date(2024, 0, 5, 12))
+    }).pipe(Effect.provide(TestLayer)))
+
+  it.effect("starts a fresh typed buffer when Tab wraps to the first field", () =>
+    Effect.gen(function*() {
+      const initial = new Date(2024, 0, 1, 12)
+      yield* MockTerminal.inputKey("tab")
+      yield* MockTerminal.inputText("1")
+      yield* MockTerminal.inputKey("tab")
+      yield* MockTerminal.inputText("5")
+      yield* MockTerminal.inputKey("enter")
+
+      const result = yield* Prompt.run(Prompt.Date({ message: "When", initial, dateMask: "DD-MM" }))
+
+      assert.deepStrictEqual(result, new Date(2024, 0, 5, 12))
+    }).pipe(Effect.provide(TestLayer)))
+
+  it.effect("accumulates multiple digits while staying in the same field", () =>
+    Effect.gen(function*() {
+      const initial = new Date(2024, 0, 1, 12)
+      yield* MockTerminal.inputText("15")
+      yield* MockTerminal.inputKey("enter")
+
+      const result = yield* Prompt.run(Prompt.Date({ message: "When", initial, dateMask: "DD" }))
+
+      assert.deepStrictEqual(result, new Date(2024, 0, 15, 12))
+    }).pipe(Effect.provide(TestLayer)))
+
+  it.effect("starts a fresh typed buffer when Tab wraps a single editable field", () =>
+    Effect.gen(function*() {
+      const initial = new Date(2024, 0, 1, 12)
+      yield* MockTerminal.inputText("1")
+      yield* MockTerminal.inputKey("tab")
+      yield* MockTerminal.inputText("5")
+      yield* MockTerminal.inputKey("enter")
+
+      const result = yield* Prompt.run(Prompt.Date({ message: "When", initial, dateMask: "DD" }))
+
+      assert.deepStrictEqual(result, new Date(2024, 0, 5, 12))
+    }).pipe(Effect.provide(TestLayer)))
 })
 
 describe("Prompt.all", () => {
@@ -79,10 +130,10 @@ describe("Prompt.all", () => {
     }).pipe(Effect.provide(TestLayer)))
 })
 
-describe("Prompt.integer", () => {
+describe("Prompt.Int", () => {
   it.effect("submits the default value", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.integer({ message: "Count", default: 42 })
+      const prompt = Prompt.Int({ message: "Count", default: 42 })
 
       yield* MockTerminal.inputKey("enter")
 
@@ -92,7 +143,7 @@ describe("Prompt.integer", () => {
 
   it.effect("starts from the default value so it can be edited", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.integer({ message: "Count", default: 4 })
+      const prompt = Prompt.Int({ message: "Count", default: 4 })
 
       yield* MockTerminal.inputText("2")
       yield* MockTerminal.inputKey("enter")
@@ -103,7 +154,7 @@ describe("Prompt.integer", () => {
 
   it.effect("clears the default value on ctrl-u", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.integer({ message: "Count", default: 42 })
+      const prompt = Prompt.Int({ message: "Count", default: 42 })
 
       yield* MockTerminal.inputKey("u", { ctrl: true })
       yield* MockTerminal.inputText("7")
@@ -114,20 +165,20 @@ describe("Prompt.integer", () => {
     }).pipe(Effect.provide(TestLayer)))
 })
 
-describe("Prompt.float", () => {
+describe("Prompt.Number", () => {
   it.effect("preserves a leading zero in the fractional part", () =>
     Effect.gen(function*() {
       yield* MockTerminal.inputText("0.05")
       yield* MockTerminal.inputKey("enter")
 
-      const value = yield* Prompt.run(Prompt.float({ message: "Rate" }))
+      const value = yield* Prompt.run(Prompt.Number({ message: "Rate" }))
 
       assert.strictEqual(value, 0.05)
     }).pipe(Effect.provide(TestLayer)))
 
   it.effect("renders appended input without literal parsed", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.float({ message: "Rate" })
+      const prompt = Prompt.Number({ message: "Rate" })
 
       yield* MockTerminal.inputText("12.5")
       yield* MockTerminal.inputKey("enter")
@@ -145,7 +196,7 @@ describe("Prompt.float", () => {
 
   it.effect("clears the current input on ctrl-u", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.float({ message: "Rate" })
+      const prompt = Prompt.Number({ message: "Rate" })
 
       yield* MockTerminal.inputText("12.5")
       yield* MockTerminal.inputKey("u", { ctrl: true })
@@ -157,12 +208,12 @@ describe("Prompt.float", () => {
     }).pipe(Effect.provide(TestLayer)))
 })
 
-describe("Prompt.text", () => {
+describe("Prompt.String", () => {
   it.effect("renders the default prompt theme", () =>
     Effect.gen(function*() {
       yield* MockTerminal.inputKey("enter")
 
-      yield* Prompt.run(Prompt.text({ message: "Name" }))
+      yield* Prompt.run(Prompt.String({ message: "Name" }))
 
       const frames = toFrames(yield* MockTerminal.displayLines)
       assert.include(frames[0] ?? "", "? Name")
@@ -172,7 +223,7 @@ describe("Prompt.text", () => {
     Effect.gen(function*() {
       yield* MockTerminal.inputKey("enter")
 
-      yield* Prompt.run(Prompt.text({ message: "Name" })).pipe(
+      yield* Prompt.run(Prompt.String({ message: "Name" })).pipe(
         Effect.provideService(
           Prompt.Theme,
           Prompt.makeTheme({
@@ -194,7 +245,7 @@ describe("Prompt.text", () => {
       yield* MockTerminal.inputText("A")
       yield* MockTerminal.inputKey("enter")
 
-      yield* Prompt.run(Prompt.text({
+      yield* Prompt.run(Prompt.String({
         message: "Name",
         theme: { primaryColor: `${escape}[35m` }
       })).pipe(
@@ -225,7 +276,7 @@ describe("Prompt.text", () => {
       yield* MockTerminal.inputText("ok")
       yield* MockTerminal.inputKey("enter")
 
-      yield* Prompt.run(Prompt.text({
+      yield* Prompt.run(Prompt.String({
         message: "Name",
         validate: (value) => value === "bad" ? Effect.fail("Try again") : Effect.succeed(value),
         theme: { errorColor: `${escape}[35m` }
@@ -241,7 +292,7 @@ describe("Prompt.text", () => {
     Effect.gen(function*() {
       yield* MockTerminal.inputKey("enter")
 
-      yield* Prompt.run(Prompt.text({
+      yield* Prompt.run(Prompt.String({
         message: "Name",
         theme: { prefix: "", pointerSmall: "" }
       }))
@@ -252,7 +303,7 @@ describe("Prompt.text", () => {
 
   it.effect("starts from the default value so it can be edited", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.text({
+      const prompt = Prompt.String({
         message: "Name",
         default: "Jane"
       })
@@ -266,7 +317,7 @@ describe("Prompt.text", () => {
 
   it.effect("clears the current input on ctrl-u", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.text({
+      const prompt = Prompt.String({
         message: "Name",
         default: "Jane"
       })
@@ -282,7 +333,7 @@ describe("Prompt.text", () => {
 
   it.effect("moves the cursor to the beginning on ctrl-a", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.text({
+      const prompt = Prompt.String({
         message: "Name",
         default: "Jane"
       })
@@ -298,7 +349,7 @@ describe("Prompt.text", () => {
 
   it.effect("moves the cursor to the end on ctrl-e", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.text({
+      const prompt = Prompt.String({
         message: "Name"
       })
 
@@ -315,7 +366,7 @@ describe("Prompt.text", () => {
 
   it.effect("does not insert characters for unsupported ctrl key combinations", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.text({
+      const prompt = Prompt.String({
         message: "Name"
       })
 
@@ -330,7 +381,7 @@ describe("Prompt.text", () => {
 
   it.effect("does not render or submit the cleared default value", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.text({
+      const prompt = Prompt.String({
         message: "Name",
         default: "Jane"
       })
@@ -350,13 +401,46 @@ describe("Prompt.text", () => {
     }).pipe(Effect.provide(TestLayer)))
 })
 
-describe("Prompt.select", () => {
+describe("Prompt.Select", () => {
+  it.effect("renders only the choice list when message is omitted", () =>
+    Effect.gen(function*() {
+      yield* MockTerminal.inputKey("down")
+      yield* MockTerminal.inputKey("enter")
+
+      const result = yield* Prompt.run(Prompt.Select({
+        choices: [
+          { title: "First", value: "first" },
+          { title: "Second", value: "second" }
+        ]
+      }))
+
+      assert.strictEqual(result, "second")
+      const output = yield* MockTerminal.displayLines
+      const frames = toFrames(output)
+      assert.deepStrictEqual(frames, [
+        "❯ First \n  Second ",
+        "  First \n❯ Second ",
+        "✔ Second\n"
+      ])
+      assert.isTrue(toRawFrames(output)[1]?.startsWith(`${escape}[2K${escape}[1A${escape}[2K${escape}[G`))
+    }).pipe(Effect.provide(TestLayer)))
+
+  it.effect("keeps the header when message is empty", () =>
+    Effect.gen(function*() {
+      yield* MockTerminal.inputKey("enter")
+
+      yield* Prompt.run(Prompt.Select({ message: "", choices: [{ title: "First", value: "first" }] }))
+
+      const frames = toFrames(yield* MockTerminal.displayLines)
+      assert.strictEqual(frames[0]?.split("\n")[0], "?  › ")
+    }).pipe(Effect.provide(TestLayer)))
+
   it.effect("renders a per-prompt theme across redraws", () =>
     Effect.gen(function*() {
       yield* MockTerminal.inputKey("down")
       yield* MockTerminal.inputKey("enter")
 
-      const result = yield* Prompt.run(Prompt.select({
+      const result = yield* Prompt.run(Prompt.Select({
         message: "Pick item",
         theme: {
           prefix: "!",
@@ -379,7 +463,7 @@ describe("Prompt.select", () => {
     Effect.gen(function*() {
       yield* MockTerminal.inputKey("enter")
 
-      yield* Prompt.run(Prompt.select({
+      yield* Prompt.run(Prompt.Select({
         message: "Pick item",
         theme: {
           primaryColor: `${escape}[35m`,
@@ -401,7 +485,7 @@ describe("Prompt.select", () => {
     Effect.gen(function*() {
       yield* MockTerminal.inputKey("enter")
 
-      yield* Prompt.run(Prompt.select({
+      yield* Prompt.run(Prompt.Select({
         message: "Pick item",
         theme: {
           descriptionSeparator: "",
@@ -424,7 +508,7 @@ describe("Prompt.select", () => {
       yield* MockTerminal.inputKey("down")
       yield* MockTerminal.inputKey("enter")
 
-      yield* Prompt.run(Prompt.select({
+      yield* Prompt.run(Prompt.Select({
         message: "Pick item",
         maxPerPage: 2,
         theme: { arrowUp: "", arrowDown: "vvv" },
@@ -441,13 +525,13 @@ describe("Prompt.select", () => {
     }).pipe(Effect.provide(TestLayer)))
 })
 
-describe("Prompt.password", () => {
+describe("Prompt.Password", () => {
   it.effect("renders the password mask from the prompt theme", () =>
     Effect.gen(function*() {
       yield* MockTerminal.inputText("abc")
       yield* MockTerminal.inputKey("enter")
 
-      yield* Prompt.run(Prompt.password({ message: "Password" })).pipe(
+      yield* Prompt.run(Prompt.Password({ message: "Password" })).pipe(
         Effect.provideService(Prompt.Theme, Prompt.makeTheme({ passwordMask: "•" }))
       )
 
@@ -462,7 +546,7 @@ describe("Prompt.password", () => {
       yield* MockTerminal.inputKey("left")
       yield* MockTerminal.inputKey("enter")
 
-      yield* Prompt.run(Prompt.password({
+      yield* Prompt.run(Prompt.Password({
         message: "Password",
         theme: { passwordMask: "**" }
       }))
@@ -473,7 +557,7 @@ describe("Prompt.password", () => {
 
   it.effect("starts from the default value so it can be edited", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.password({
+      const prompt = Prompt.Password({
         message: "Password",
         default: "secret"
       })
@@ -487,7 +571,7 @@ describe("Prompt.password", () => {
 
   it.effect("does not submit the cleared default value", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.password({
+      const prompt = Prompt.Password({
         message: "Password",
         default: "secret"
       })
@@ -500,12 +584,12 @@ describe("Prompt.password", () => {
     }).pipe(Effect.provide(TestLayer)))
 })
 
-describe("Prompt.toggle", () => {
+describe("Prompt.Toggle", () => {
   it.effect("renders the separator from the prompt theme", () =>
     Effect.gen(function*() {
       yield* MockTerminal.inputKey("enter")
 
-      yield* Prompt.run(Prompt.toggle({
+      yield* Prompt.run(Prompt.Toggle({
         message: "Enabled",
         theme: { toggleSeparator: "|" }
       }))
@@ -519,7 +603,7 @@ describe("Prompt.toggle", () => {
     Effect.gen(function*() {
       yield* MockTerminal.inputKey("enter")
 
-      yield* Prompt.run(Prompt.toggle({
+      yield* Prompt.run(Prompt.Toggle({
         message: "Enabled",
         theme: { toggleSeparator: "" }
       }))
@@ -530,10 +614,10 @@ describe("Prompt.toggle", () => {
     }).pipe(Effect.provide(TestLayer)))
 })
 
-describe("Prompt.autoComplete", () => {
+describe("Prompt.AutoComplete", () => {
   it.effect("filters choices as you type", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.autoComplete({
+      const prompt = Prompt.AutoComplete({
         message: "Pick fruit",
         choices: [
           { title: "Apple", value: "apple" },
@@ -559,7 +643,7 @@ describe("Prompt.autoComplete", () => {
 
   it.effect("removes the last character on backspace", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.autoComplete({
+      const prompt = Prompt.AutoComplete({
         message: "Pick item",
         choices: [
           { title: "Alpha", value: "alpha" },
@@ -588,7 +672,7 @@ describe("Prompt.autoComplete", () => {
 
   it.effect("clears the filter input on ctrl-u", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.autoComplete({
+      const prompt = Prompt.AutoComplete({
         message: "Pick item",
         choices: [
           { title: "Alpha", value: "alpha" },
@@ -617,7 +701,7 @@ describe("Prompt.autoComplete", () => {
 
   it.effect("renders empty message and beeps on submit with no matches", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.autoComplete({
+      const prompt = Prompt.AutoComplete({
         message: "Pick pet",
         choices: [
           { title: "Cat", value: "cat" },
@@ -644,7 +728,7 @@ describe("Prompt.autoComplete", () => {
 
   it.effect("beeps when submitting a disabled choice", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.autoComplete({
+      const prompt = Prompt.AutoComplete({
         message: "Pick mode",
         choices: [
           { title: "Slow", value: "slow", disabled: true },
@@ -665,7 +749,7 @@ describe("Prompt.autoComplete", () => {
 
   it.effect("renders empty message with no choices", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.autoComplete({
+      const prompt = Prompt.AutoComplete({
         message: "Pick option",
         choices: []
       })
@@ -682,7 +766,7 @@ describe("Prompt.autoComplete", () => {
 
   it.effect("keeps `j` and `k` in the filter query instead of moving the cursor", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.autoComplete({
+      const prompt = Prompt.AutoComplete({
         message: "Pick a branch",
         choices: [
           { title: "feat/jira-fetch-tool", value: "feat/jira-fetch-tool" },
@@ -708,7 +792,7 @@ describe("Prompt.autoComplete", () => {
 
   it.effect("filters a query that merely contains a `k`", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.autoComplete({
+      const prompt = Prompt.AutoComplete({
         message: "Pick a branch",
         choices: [
           { title: "main", value: "main" },
@@ -734,7 +818,7 @@ describe("Prompt.autoComplete", () => {
 
   it.effect("moves the cursor with ctrl-n and ctrl-p", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.autoComplete({
+      const prompt = Prompt.AutoComplete({
         message: "Pick item",
         choices: [
           { title: "Alpha", value: "alpha" },
@@ -754,7 +838,7 @@ describe("Prompt.autoComplete", () => {
 
   it.effect("moves the cursor up with ctrl-k", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.autoComplete({
+      const prompt = Prompt.AutoComplete({
         message: "Pick item",
         choices: [
           { title: "Alpha", value: "alpha" },
@@ -773,7 +857,7 @@ describe("Prompt.autoComplete", () => {
     }).pipe(Effect.provide(TestLayer)))
 })
 
-describe("Prompt.file", () => {
+describe("Prompt.File", () => {
   const FilePromptLayer = Layer.mergeAll(
     FileSystem.layerNoop({
       exists: () => Effect.succeed(true),
@@ -796,7 +880,7 @@ describe("Prompt.file", () => {
 
   it.effect("starts from the default value so it can be submitted", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.file({
+      const prompt = Prompt.File({
         message: "Pick file",
         default: "/workspace/banana.txt"
       })
@@ -809,7 +893,7 @@ describe("Prompt.file", () => {
 
   it.effect("filters files as you type", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.file({
+      const prompt = Prompt.File({
         message: "Pick file",
         startingPath: "/workspace"
       })
@@ -832,7 +916,7 @@ describe("Prompt.file", () => {
 
   it.effect("removes the last character on backspace", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.file({
+      const prompt = Prompt.File({
         message: "Pick file",
         startingPath: "/workspace"
       })
@@ -872,7 +956,7 @@ describe("Prompt.file", () => {
 
   it.effect("keeps `j` in the filter query instead of moving the cursor", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.file({
+      const prompt = Prompt.File({
         message: "Pick file",
         startingPath: "/workspace"
       })
@@ -894,7 +978,7 @@ describe("Prompt.file", () => {
 
   it.effect("keeps `k` in the filter query instead of moving the cursor", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.file({
+      const prompt = Prompt.File({
         message: "Pick file",
         startingPath: "/workspace"
       })
@@ -916,7 +1000,7 @@ describe("Prompt.file", () => {
 
   it.effect("moves the cursor with ctrl-n and ctrl-p", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.file({
+      const prompt = Prompt.File({
         message: "Pick file",
         startingPath: "/workspace"
       })
@@ -932,7 +1016,7 @@ describe("Prompt.file", () => {
 
   it.effect("moves the cursor up with ctrl-k", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.file({
+      const prompt = Prompt.File({
         message: "Pick file",
         startingPath: "/workspace"
       })
@@ -947,10 +1031,61 @@ describe("Prompt.file", () => {
     }).pipe(Effect.provide(FilePromptLayer)))
 })
 
-describe("Prompt.multiSelect", () => {
+describe("Prompt.MultiSelect", () => {
+  it.effect("renders only the choice list when message is omitted", () =>
+    Effect.gen(function*() {
+      yield* MockTerminal.inputKey("space")
+      yield* MockTerminal.inputKey("enter")
+
+      const result = yield* Prompt.run(Prompt.MultiSelect({
+        choices: [
+          { title: "First", value: "first" },
+          { title: "Second", value: "second" }
+        ]
+      }))
+
+      assert.deepStrictEqual(result, ["first", "second"])
+      const output = yield* MockTerminal.displayLines
+      const frames = toFrames(output)
+      assert.deepStrictEqual(frames, [
+        "  Select All\n  Inverse Selection\n  ☐ First \n  ☐ Second ",
+        "  Select None\n  Inverse Selection\n  ☒ First \n  ☒ Second ",
+        "✔ First, Second\n"
+      ])
+      const clearChoices = `${escape}[2K${escape}[1A`.repeat(3) + `${escape}[2K${escape}[G`
+      assert.isTrue(toRawFrames(output)[1]?.startsWith(clearChoices))
+    }).pipe(Effect.provide(TestLayer)))
+
+  it.effect("clears validation errors without a message", () =>
+    Effect.gen(function*() {
+      yield* MockTerminal.inputKey("enter")
+      yield* MockTerminal.inputKey("space")
+      yield* MockTerminal.inputKey("enter")
+
+      const result = yield* Prompt.run(Prompt.MultiSelect({
+        min: 1,
+        choices: [
+          { title: "First", value: "first" },
+          { title: "Second", value: "second" }
+        ]
+      }))
+
+      assert.deepStrictEqual(result, ["first", "second"])
+      const output = yield* MockTerminal.displayLines
+      const frames = toFrames(output)
+      assert.isTrue(frames[1]?.endsWith("\n❯ At least 1 are required"))
+      assert.strictEqual(frames.at(-1), "✔ First, Second\n")
+
+      const clearError = `${escape}[1B${escape}[2K${escape}[1A${escape}[2K${escape}[G`
+      const clearChoices = `${escape}[2K${escape}[1A`.repeat(3) + `${escape}[2K${escape}[G`
+      const rawFrames = toRawFrames(output)
+      assert.isTrue(rawFrames[2]?.startsWith(clearError + clearChoices))
+      assert.isTrue(rawFrames[3]?.startsWith(clearError + clearChoices))
+    }).pipe(Effect.provide(TestLayer)))
+
   it.effect("renders paging and checkbox symbols from the prompt theme", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.multiSelect({
+      const prompt = Prompt.MultiSelect({
         message: "Pick items",
         maxPerPage: 3,
         theme: {
@@ -978,7 +1113,7 @@ describe("Prompt.multiSelect", () => {
 
   it.effect("aligns choices when checkbox symbols have different widths", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.multiSelect({
+      const prompt = Prompt.MultiSelect({
         message: "Pick items",
         theme: { checkboxOn: "[x]", checkboxOff: "" },
         choices: [
@@ -1001,7 +1136,7 @@ describe("Prompt.multiSelect", () => {
 
   it.effect("does not allow a disabled multi-select choice to be selected", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.multiSelect({
+      const prompt = Prompt.MultiSelect({
         message: "Pick items",
         choices: [{ title: "Unavailable", value: "unavailable", disabled: true }]
       })
@@ -1019,7 +1154,7 @@ describe("Prompt.multiSelect", () => {
 
   it.effect("does not select disabled choices when selecting all", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.multiSelect({
+      const prompt = Prompt.MultiSelect({
         message: "Pick items",
         choices: [
           { title: "Available", value: "available" },
@@ -1038,7 +1173,7 @@ describe("Prompt.multiSelect", () => {
 
   it.effect("does not select disabled choices when inverting the selection", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.multiSelect({
+      const prompt = Prompt.MultiSelect({
         message: "Pick items",
         choices: [
           { title: "Available", value: "available" },
@@ -1056,7 +1191,7 @@ describe("Prompt.multiSelect", () => {
 
   it.effect("ignores disabled preselected choices when validating and submitting", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.multiSelect({
+      const prompt = Prompt.MultiSelect({
         message: "Pick items",
         choices: [
           { title: "Available", value: "available", selected: true },
@@ -1078,7 +1213,7 @@ describe("Prompt.multiSelect", () => {
 
   it.effect("underlines the active label", () =>
     Effect.gen(function*() {
-      const prompt = Prompt.multiSelect({
+      const prompt = Prompt.MultiSelect({
         message: "Pick items",
         choices: [
           { title: "Alpha", value: "alpha" },
@@ -1109,12 +1244,70 @@ describe("Prompt.multiSelect", () => {
     }).pipe(Effect.provide(TestLayer)))
 })
 
-describe("Prompt.custom", () => {
+describe("Prompt.Custom", () => {
+  for (const transition of ["NextFrame", "Submit"] as const) {
+    it.effect(`keeps the previous frame visible while rendering ${transition}`, () =>
+      Effect.gen(function*() {
+        const rendering = yield* Deferred.make<void>()
+        const resume = yield* Deferred.make<void>()
+        const calls: Array<string> = []
+        const clear = `${escape}[2K\r`
+        const prompt = Prompt.Custom<number, number>(0, {
+          render: (state, action) =>
+            Effect.gen(function*() {
+              calls.push(`render ${state} ${action._tag}`)
+              if (action._tag === transition && (state > 0 || action._tag === "Submit")) {
+                yield* Deferred.succeed(rendering, undefined)
+                yield* Deferred.await(resume)
+              }
+              return action._tag === "Submit" ? `Done ${state}` : action._tag === "Beep" ? bell : `Frame ${state}`
+            }),
+          clear: (state, action) =>
+            Effect.sync(() => {
+              calls.push(`clear ${state} ${action._tag}`)
+              return clear
+            }),
+          process: (input, state) =>
+            Effect.succeed(
+              input.key.name === "q"
+                ? Action.Submit({ value: 42 })
+                : input.key.name === "b"
+                ? Action.Beep()
+                : Action.NextFrame({ state: state + 1 })
+            )
+        })
+
+        if (transition === "NextFrame") {
+          yield* MockTerminal.inputKey("enter")
+          yield* MockTerminal.inputKey("b")
+        }
+        yield* MockTerminal.inputKey("q")
+        const fiber = yield* Prompt.run(prompt).pipe(Effect.forkChild)
+        yield* Deferred.await(rendering)
+
+        assert.deepStrictEqual(yield* MockTerminal.displayLines, ["Frame 0"])
+        assert.deepStrictEqual(calls, [
+          "render 0 NextFrame",
+          `clear 0 ${transition}`,
+          `render ${transition === "NextFrame" ? 1 : 0} ${transition}`
+        ])
+
+        yield* Deferred.succeed(resume, undefined)
+        assert.strictEqual(yield* Fiber.join(fiber), 42)
+        assert.deepStrictEqual(
+          yield* MockTerminal.displayLines,
+          transition === "NextFrame"
+            ? ["Frame 0", `${clear}Frame 1`, bell, `${clear}Done 1`, `${escape}[?25h`]
+            : ["Frame 0", `${clear}Done 0`, `${escape}[?25h`]
+        )
+      }).pipe(Effect.provide(TestLayer)))
+  }
+
   it.effect("receive handles events from external dequeue", () =>
     Effect.gen(function*() {
       const eventQueue = yield* Queue.make<string>()
 
-      const prompt = Prompt.custom(
+      const prompt = Prompt.Custom(
         { count: 0 },
         Queue.asDequeue(eventQueue),
         {
@@ -1156,7 +1349,7 @@ describe("Prompt.custom", () => {
     Effect.gen(function*() {
       const eventQueue = yield* Queue.make<string>()
 
-      const prompt = Prompt.custom(
+      const prompt = Prompt.Custom(
         { keys: 0 },
         Queue.asDequeue(eventQueue),
         {
@@ -1188,7 +1381,7 @@ describe("Prompt.custom", () => {
     Effect.gen(function*() {
       const eventQueue = yield* Queue.make<string>()
 
-      const prompt = Prompt.custom(
+      const prompt = Prompt.Custom(
         { captured: "" },
         Queue.asDequeue(eventQueue),
         {
diff --git a/repos/effect/packages/effect/test/unstable/cli/completions/completions.test.ts b/repos/effect/packages/effect/test/unstable/cli/completions/completions.test.ts
index 7d473f046..f8a1ab5e6 100644
--- a/repos/effect/packages/effect/test/unstable/cli/completions/completions.test.ts
+++ b/repos/effect/packages/effect/test/unstable/cli/completions/completions.test.ts
@@ -12,14 +12,14 @@ import { ComprehensiveCli } from "../fixtures/ComprehensiveCli.ts"
 // ---------------------------------------------------------------------------
 
 const simpleCmd = Command.make("greet", {
-  name: Argument.string("name").pipe(
+  name: Argument.String("name").pipe(
     Argument.withDescription("Name to greet")
   ),
-  loud: Flag.boolean("loud").pipe(
+  loud: Flag.Boolean("loud").pipe(
     Flag.withAlias("l"),
     Flag.withDescription("Shout the greeting")
   ),
-  times: Flag.integer("times").pipe(
+  times: Flag.Int("times").pipe(
     Flag.withDescription("Repeat count"),
     Flag.withDefault(1)
   )
@@ -27,25 +27,25 @@ const simpleCmd = Command.make("greet", {
 
 const withSubcommands = (() => {
   const start = Command.make("start", {
-    port: Flag.integer("port").pipe(
+    port: Flag.Int("port").pipe(
       Flag.withAlias("p"),
       Flag.withDescription("Port number")
     ),
-    daemon: Flag.boolean("daemon").pipe(
+    daemon: Flag.Boolean("daemon").pipe(
       Flag.withDescription("Run as daemon")
     )
   }).pipe(Command.withDescription("Start the server"))
 
   const stop = Command.make("stop", {
-    force: Flag.boolean("force").pipe(
+    force: Flag.Boolean("force").pipe(
       Flag.withAlias("f"),
       Flag.withDescription("Force stop")
     )
   }).pipe(Command.withDescription("Stop the server"))
 
   return Command.make("server", {
-    verbose: Flag.boolean("verbose").pipe(Flag.withAlias("v")),
-    config: Flag.string("config")
+    verbose: Flag.Boolean("verbose").pipe(Flag.withAlias("v")),
+    config: Flag.String("config")
   }).pipe(
     Command.withDescription("Server management"),
     Command.withSubcommands([start, stop])
@@ -53,10 +53,10 @@ const withSubcommands = (() => {
 })()
 
 const withChoices = Command.make("deploy", {
-  env: Flag.choice("env", ["dev", "staging", "prod"]).pipe(
+  env: Flag.Literals("env", ["dev", "staging", "prod"]).pipe(
     Flag.withDescription("Target environment")
   ),
-  region: Argument.choice("region", ["us-east", "eu-west", "ap-south"]).pipe(
+  region: Argument.Literals("region", ["us-east", "eu-west", "ap-south"]).pipe(
     Argument.withDescription("Deployment region")
   )
 }).pipe(Command.withDescription("Deploy application"))
@@ -79,24 +79,24 @@ const trickyValues = [
 ]
 
 const withTrickyChoices = Command.make("deploy", {
-  mode: Flag.choice("mode", trickyValues).pipe(
+  mode: Flag.Literals("mode", trickyValues).pipe(
     Flag.withDescription("Deploy mode")
   ),
-  target: Argument.choice("target", ["o'clock", "a:b", "{x,y}", "a\u{1F600}b"]).pipe(
+  target: Argument.Literals("target", ["o'clock", "a:b", "{x,y}", "a\u{1F600}b"]).pipe(
     Argument.withDescription("Deployment target")
   )
 }).pipe(Command.withDescription("Deploy application"))
 
 const withPaths = Command.make("process", {
-  input: Flag.file("input").pipe(Flag.withDescription("Input file")),
-  outDir: Flag.directory("output-dir").pipe(Flag.withDescription("Output directory")),
-  source: Argument.file("source", { mustExist: false }).pipe(
+  input: Flag.File("input").pipe(Flag.withDescription("Input file")),
+  outDir: Flag.Directory("output-dir").pipe(Flag.withDescription("Output directory")),
+  source: Argument.File("source", { mustExist: false }).pipe(
     Argument.withDescription("Source file")
   )
 }).pipe(Command.withDescription("Process files"))
 
 const withOptionalDirectoryAndSubcommands = Command.make("example", {
-  directory: Argument.directory("directory").pipe(
+  directory: Argument.Directory("directory").pipe(
     Argument.withDescription("Directory to start in"),
     Argument.optional
   )
@@ -108,7 +108,7 @@ const withOptionalDirectoryAndSubcommands = Command.make("example", {
 
 const nested3Levels = (() => {
   const leaf = Command.make("action", {
-    dryRun: Flag.boolean("dry-run").pipe(Flag.withDescription("Dry run mode"))
+    dryRun: Flag.Boolean("dry-run").pipe(Flag.withDescription("Dry run mode"))
   }).pipe(Command.withDescription("Perform action"))
 
   const mid = Command.make("sub").pipe(
@@ -625,7 +625,7 @@ describe("Fish completions", () => {
 
   it("escapes backslashes in descriptions before quotes", () => {
     const trailingBackslash = Command.make("deploy", {
-      mode: Flag.choice("mode", ["a"]).pipe(Flag.withDescription("Path like C:\\"))
+      mode: Flag.Literals("mode", ["a"]).pipe(Flag.withDescription("Path like C:\\"))
     })
     const script = Fish.generate("deploy", fromCommand(trailingBackslash))
     assert.include(script, `-d 'Path like C:\\\\'`)
diff --git a/repos/effect/packages/effect/test/unstable/cli/completions/descriptor.test.ts b/repos/effect/packages/effect/test/unstable/cli/completions/descriptor.test.ts
index f7b3ceeee..5b8ca73a8 100644
--- a/repos/effect/packages/effect/test/unstable/cli/completions/descriptor.test.ts
+++ b/repos/effect/packages/effect/test/unstable/cli/completions/descriptor.test.ts
@@ -16,7 +16,7 @@ describe("CommandDescriptor", () => {
 
     it("extracts string flags with aliases", () => {
       const cmd = Command.make("test", {
-        output: Flag.string("output").pipe(
+        output: Flag.String("output").pipe(
           Flag.withAlias("o"),
           Flag.withDescription("Output directory")
         )
@@ -31,7 +31,7 @@ describe("CommandDescriptor", () => {
 
     it("extracts boolean flags", () => {
       const cmd = Command.make("test", {
-        verbose: Flag.boolean("verbose").pipe(Flag.withAlias("v"))
+        verbose: Flag.Boolean("verbose").pipe(Flag.withAlias("v"))
       })
       const desc = fromCommand(cmd)
       assert.strictEqual(desc.flags.length, 1)
@@ -42,22 +42,22 @@ describe("CommandDescriptor", () => {
 
     it("extracts integer and float flags", () => {
       const cmd = Command.make("test", {
-        port: Flag.integer("port"),
-        ratio: Flag.float("ratio")
+        port: Flag.Int("port"),
+        ratio: Flag.Finite("ratio")
       })
       const desc = fromCommand(cmd)
       assert.strictEqual(desc.flags.length, 2)
       const portFlag = desc.flags.find((f) => f.name === "port")!
       const ratioFlag = desc.flags.find((f) => f.name === "ratio")!
-      assert.strictEqual(portFlag.type._tag, "Integer")
-      assert.strictEqual(ratioFlag.type._tag, "Float")
+      assert.strictEqual(portFlag.type._tag, "Int")
+      assert.strictEqual(ratioFlag.type._tag, "Finite")
     })
 
     it("extracts file, directory, and path flags", () => {
       const cmd = Command.make("test", {
-        input: Flag.file("input"),
-        outDir: Flag.directory("out-dir"),
-        config: Flag.path("config", { pathType: "either" })
+        input: Flag.File("input"),
+        outDir: Flag.Directory("out-dir"),
+        config: Flag.Path("config", { pathType: "either" })
       })
       const desc = fromCommand(cmd)
       assert.strictEqual(desc.flags.length, 3)
@@ -71,8 +71,8 @@ describe("CommandDescriptor", () => {
 
     it("retains path semantics when a path has a custom metavar", () => {
       const command = Command.make("app", {
-        directory: Flag.path("directory", { pathType: "directory", typeName: "DIR" }),
-        file: Argument.path("file", { pathType: "file" }).pipe(Argument.withMetavar("INPUT"))
+        directory: Flag.Path("directory", { pathType: "directory", typeName: "DIR" }),
+        file: Argument.Path("file", { pathType: "file" }).pipe(Argument.withMetavar("INPUT"))
       })
       const descriptor = fromCommand(command)
 
@@ -82,12 +82,12 @@ describe("CommandDescriptor", () => {
 
     it("classifies file-backed flags and arguments as file paths", () => {
       const command = Command.make("app", {
-        flagText: Flag.fileText("flag-text"),
-        flagParse: Flag.fileParse("flag-parse"),
-        flagSchema: Flag.fileSchema("flag-schema", Schema.Unknown),
-        argumentText: Argument.fileText("argument-text"),
-        argumentParse: Argument.fileParse("argument-parse"),
-        argumentSchema: Argument.fileSchema("argument-schema", Schema.Unknown)
+        flagText: Flag.FileText("flag-text"),
+        flagParse: Flag.FileParse("flag-parse"),
+        flagSchema: Flag.FileSchema("flag-schema", Schema.Unknown),
+        argumentText: Argument.FileText("argument-text"),
+        argumentParse: Argument.FileParse("argument-parse"),
+        argumentSchema: Argument.FileSchema("argument-schema", Schema.Unknown)
       })
       const descriptor = fromCommand(command)
       const fileType = { _tag: "Path", pathType: "file" } as const
@@ -98,7 +98,7 @@ describe("CommandDescriptor", () => {
 
     it("extracts choice flags with values", () => {
       const cmd = Command.make("test", {
-        color: Flag.choice("color", ["red", "green", "blue"])
+        color: Flag.Literals("color", ["red", "green", "blue"])
       })
       const desc = fromCommand(cmd)
       assert.strictEqual(desc.flags.length, 1)
@@ -110,7 +110,7 @@ describe("CommandDescriptor", () => {
 
     it("extracts optional flags", () => {
       const cmd = Command.make("test", {
-        name: Flag.string("name").pipe(Flag.optional)
+        name: Flag.String("name").pipe(Flag.optional)
       })
       const desc = fromCommand(cmd)
       assert.strictEqual(desc.flags.length, 1)
@@ -120,22 +120,22 @@ describe("CommandDescriptor", () => {
 
     it("extracts positional arguments with types", () => {
       const cmd = Command.make("test", {
-        name: Argument.string("name"),
-        count: Argument.integer("count")
+        name: Argument.String("name"),
+        count: Argument.Int("count")
       })
       const desc = fromCommand(cmd)
       assert.strictEqual(desc.arguments.length, 2)
       const nameArg = desc.arguments.find((a) => a.name === "name")!
       const countArg = desc.arguments.find((a) => a.name === "count")!
       assert.strictEqual(nameArg.type._tag, "String")
-      assert.strictEqual(countArg.type._tag, "Integer")
+      assert.strictEqual(countArg.type._tag, "Int")
       assert.strictEqual(nameArg.required, true)
       assert.strictEqual(countArg.required, true)
     })
 
     it("extracts variadic arguments", () => {
       const cmd = Command.make("test", {
-        files: Argument.string("files").pipe(Argument.variadic({ min: 1 }))
+        files: Argument.String("files").pipe(Argument.variadic({ min: 1 }))
       })
       const desc = fromCommand(cmd)
       assert.strictEqual(desc.arguments.length, 1)
@@ -146,7 +146,7 @@ describe("CommandDescriptor", () => {
 
     it("extracts optional arguments", () => {
       const cmd = Command.make("test", {
-        email: Argument.string("email").pipe(Argument.optional)
+        email: Argument.String("email").pipe(Argument.optional)
       })
       const desc = fromCommand(cmd)
       assert.strictEqual(desc.arguments.length, 1)
@@ -174,10 +174,10 @@ describe("CommandDescriptor", () => {
 
     it("extracts descriptions from flags and arguments", () => {
       const cmd = Command.make("test", {
-        port: Flag.integer("port").pipe(
+        port: Flag.Int("port").pipe(
           Flag.withDescription("Port number")
         ),
-        host: Argument.string("host").pipe(
+        host: Argument.String("host").pipe(
           Argument.withDescription("Hostname")
         )
       })
@@ -197,7 +197,7 @@ describe("CommandDescriptor", () => {
 
     it("handles deeply nested command trees", () => {
       const level3 = Command.make("level3", {
-        flag: Flag.boolean("deep")
+        flag: Flag.Boolean("deep")
       })
       const level2 = Command.make("level2").pipe(
         Command.withSubcommands([level3])
@@ -218,7 +218,7 @@ describe("CommandDescriptor", () => {
 
     it("extracts choice arguments", () => {
       const cmd = Command.make("test", {
-        env: Argument.choice("env", ["dev", "staging", "prod"])
+        env: Argument.Literals("env", ["dev", "staging", "prod"])
       })
       const desc = fromCommand(cmd)
       assert.strictEqual(desc.arguments.length, 1)
@@ -230,8 +230,8 @@ describe("CommandDescriptor", () => {
 
     it("extracts file/directory arguments", () => {
       const cmd = Command.make("test", {
-        input: Argument.file("input", { mustExist: false }),
-        outDir: Argument.directory("output", { mustExist: false })
+        input: Argument.File("input", { mustExist: false }),
+        outDir: Argument.Directory("output", { mustExist: false })
       })
       const desc = fromCommand(cmd)
       assert.strictEqual(desc.arguments.length, 2)
diff --git a/repos/effect/packages/effect/test/unstable/cli/fixtures/ComprehensiveCli.ts b/repos/effect/packages/effect/test/unstable/cli/fixtures/ComprehensiveCli.ts
index 20b864977..94711da18 100644
--- a/repos/effect/packages/effect/test/unstable/cli/fixtures/ComprehensiveCli.ts
+++ b/repos/effect/packages/effect/test/unstable/cli/fixtures/ComprehensiveCli.ts
@@ -6,17 +6,17 @@ import { logAction } from "../services/TestActions.ts"
 // Deeply nested admin commands
 const usersList = Command.make("list", {
   // Optional option with default
-  format: Flag.string("format").pipe(
+  format: Flag.String("format").pipe(
     Flag.withDescription("Output format (json, table, csv)"),
     Flag.withDefault("table")
   ),
   // Boolean flag
-  active: Flag.boolean("active").pipe(
+  active: Flag.Boolean("active").pipe(
     Flag.withDescription("Show only active users"),
     Flag.withDefault(false)
   ),
   // Option with both short and long aliases
-  verbose: Flag.boolean("verbose").pipe(
+  verbose: Flag.Boolean("verbose").pipe(
     Flag.withAlias("v"),
     Flag.withDescription("Show detailed information"),
     Flag.withDefault(false)
@@ -32,20 +32,20 @@ const usersList = Command.make("list", {
 
 const usersCreate = Command.make("create", {
   // Required positional argument
-  username: Argument.string("username").pipe(
+  username: Argument.String("username").pipe(
     Argument.withDescription("Username for the new user")
   ),
   // Optional positional argument
-  email: Argument.string("email").pipe(
+  email: Argument.String("email").pipe(
     Argument.withDescription("Email address (optional)"),
     Argument.optional
   ),
   // Required option
-  role: Flag.string("role").pipe(
+  role: Flag.String("role").pipe(
     Flag.withDescription("User role (admin, user, guest)")
   ),
   // Boolean with explicit value support
-  notify: Flag.boolean("notify").pipe(
+  notify: Flag.Boolean("notify").pipe(
     Flag.withAlias("n"),
     Flag.withDescription("Send notification email"),
     Flag.withDefault(false)
@@ -67,12 +67,12 @@ const users = Command.make("users").pipe(
 
 const configSet = Command.make("set", {
   // Variadic positional arguments
-  pairs: Argument.string("key=value").pipe(
+  pairs: Argument.String("key=value").pipe(
     Argument.withDescription("Configuration key-value pairs"),
     Argument.variadic({ min: 1 })
   ),
   // File path option
-  file: Flag.file("config-file").pipe(
+  file: Flag.File("config-file").pipe(
     Flag.withAlias("f"),
     Flag.withDescription("Write to specific config file"),
     Flag.optional
@@ -87,11 +87,11 @@ const configSet = Command.make("set", {
 
 const configGet = Command.make("get", {
   // Single required positional
-  key: Argument.string("key").pipe(
+  key: Argument.String("key").pipe(
     Argument.withDescription("Configuration key to retrieve")
   ),
   // Options with different types
-  source: Flag.string("source").pipe(
+  source: Flag.String("source").pipe(
     Flag.withDescription("Configuration source (local, global, system)"),
     Flag.withDefault("local")
   )
@@ -106,7 +106,7 @@ const configGet = Command.make("get", {
 const config = Command.make("config").pipe(
   Command.withSharedFlags({
     // Parent command options shared with config subcommands
-    profile: Flag.string("profile").pipe(
+    profile: Flag.String("profile").pipe(
       Flag.withAlias("p"),
       Flag.withDescription("Configuration profile to use"),
       Flag.optional
@@ -119,7 +119,7 @@ const config = Command.make("config").pipe(
 const admin = Command.make("admin").pipe(
   Command.withSharedFlags({
     // Boolean that can be set to false explicitly
-    sudo: Flag.boolean("sudo").pipe(
+    sudo: Flag.Boolean("sudo").pipe(
       Flag.withDescription("Run with elevated privileges"),
       Flag.withDefault(false)
     )
@@ -131,25 +131,25 @@ const admin = Command.make("admin").pipe(
 // File operations commands
 const copy = Command.make("copy", {
   // Multiple required positional arguments (do not require actual filesystem presence in tests)
-  source: Argument.file("source", { mustExist: false }).pipe(
+  source: Argument.File("source", { mustExist: false }).pipe(
     Argument.withDescription("Source file or directory")
   ),
-  destination: Argument.file("destination", { mustExist: false }).pipe(
+  destination: Argument.File("destination", { mustExist: false }).pipe(
     Argument.withDescription("Destination path")
   ),
   // Boolean flags with short aliases
-  recursive: Flag.boolean("recursive").pipe(
+  recursive: Flag.Boolean("recursive").pipe(
     Flag.withAlias("r"),
     Flag.withDescription("Copy directories recursively"),
     Flag.withDefault(false)
   ),
-  force: Flag.boolean("force").pipe(
+  force: Flag.Boolean("force").pipe(
     Flag.withAlias("f"),
     Flag.withDescription("Overwrite existing files"),
     Flag.withDefault(false)
   ),
   // Integer option
-  buffer: Flag.integer("buffer-size").pipe(
+  buffer: Flag.Int("buffer-size").pipe(
     Flag.withDescription("Buffer size in KB"),
     Flag.withDefault(64)
   )
@@ -166,12 +166,12 @@ const copy = Command.make("copy", {
 
 const move = Command.make("move", {
   // Variadic sources with at least 2 items
-  paths: Argument.string("paths").pipe(
+  paths: Argument.String("paths").pipe(
     Argument.withDescription("Source path(s) and destination"),
     Argument.variadic({ min: 2 })
   ),
   // Options
-  interactive: Flag.boolean("interactive").pipe(
+  interactive: Flag.Boolean("interactive").pipe(
     Flag.withAlias("i"),
     Flag.withDescription("Prompt before overwrite"),
     Flag.withDefault(false)
@@ -186,22 +186,22 @@ const move = Command.make("move", {
 
 const remove = Command.make("remove", {
   // Variadic with no upper limit
-  files: Argument.string("files").pipe(
+  files: Argument.String("files").pipe(
     Argument.withDescription("Files to remove"),
     Argument.variadic({ min: 1 })
   ),
   // Multiple boolean options
-  recursive: Flag.boolean("recursive").pipe(
+  recursive: Flag.Boolean("recursive").pipe(
     Flag.withAlias("r"),
     Flag.withDescription("Remove directories and contents"),
     Flag.withDefault(false)
   ),
-  force: Flag.boolean("force").pipe(
+  force: Flag.Boolean("force").pipe(
     Flag.withAlias("f"),
     Flag.withDescription("Force removal without prompts"),
     Flag.withDefault(false)
   ),
-  verbose: Flag.boolean("verbose").pipe(
+  verbose: Flag.Boolean("verbose").pipe(
     Flag.withAlias("v"),
     Flag.withDescription("Explain what is being done"),
     Flag.withDefault(false)
@@ -218,16 +218,16 @@ const remove = Command.make("remove", {
 
 // Build command for testing option aliases
 const build = Command.make("build", {
-  output: Flag.string("output").pipe(
+  output: Flag.String("output").pipe(
     Flag.withAlias("o"),
     Flag.withDescription("Output directory")
   ),
-  verbose: Flag.boolean("verbose").pipe(
+  verbose: Flag.Boolean("verbose").pipe(
     Flag.withAlias("v"),
     Flag.withDescription("Enable verbose output"),
     Flag.withDefault(false)
   ),
-  configFile: Flag.string("config-file").pipe(
+  configFile: Flag.String("config-file").pipe(
     Flag.withAlias("f"),
     Flag.withDescription("Configuration file path"),
     Flag.optional
@@ -243,10 +243,10 @@ const build = Command.make("build", {
 
 // Git-style commands for testing subcommands and context sharing
 const gitClone = Command.make("clone", {
-  repository: Argument.string("repository").pipe(
+  repository: Argument.String("repository").pipe(
     Argument.withDescription("Repository URL or path")
   ),
-  branch: Flag.string("branch").pipe(
+  branch: Flag.String("branch").pipe(
     Flag.withDefault("main"),
     Flag.withDescription("Branch to clone")
   )
@@ -259,10 +259,10 @@ const gitClone = Command.make("clone", {
   )
 
 const gitAdd = Command.make("add", {
-  files: Argument.string("files").pipe(
+  files: Argument.String("files").pipe(
     Argument.withDescription("Files to add")
   ),
-  update: Flag.boolean("update").pipe(
+  update: Flag.Boolean("update").pipe(
     Flag.withDescription("Update tracked files"),
     Flag.withDefault(false)
   )
@@ -275,7 +275,7 @@ const gitAdd = Command.make("add", {
   )
 
 const gitStatus = Command.make("status", {
-  short: Flag.boolean("short").pipe(
+  short: Flag.Boolean("short").pipe(
     Flag.withDescription("Show short format"),
     Flag.withDefault(false)
   )
@@ -288,7 +288,7 @@ const gitStatus = Command.make("status", {
 
 const git = Command.make("git").pipe(
   Command.withSharedFlags({
-    verbose: Flag.boolean("verbose").pipe(
+    verbose: Flag.Boolean("verbose").pipe(
       Flag.withDescription("Enable verbose output"),
       Flag.withDefault(false)
     )
@@ -304,7 +304,7 @@ const git = Command.make("git").pipe(
 
 // Commands for testing error handling
 const testRequired = Command.make("test-required", {
-  required: Flag.string("required").pipe(
+  required: Flag.String("required").pipe(
     Flag.withDescription("A required option for testing")
   )
 }, (config) =>
@@ -321,7 +321,7 @@ const testFailing: Command.Command<
   string,
   TestActions
 > = Command.make("test-failing", {
-  input: Flag.string("input").pipe(
+  input: Flag.String("input").pipe(
     Flag.withDescription("Input that will cause handler to fail")
   )
 }, (config) =>
@@ -334,21 +334,21 @@ const testFailing: Command.Command<
 
 // Deploy command for testing complex nested structures
 const deployCommand = Command.make("deploy", {
-  service: Argument.string("service").pipe(
+  service: Argument.String("service").pipe(
     Argument.withDescription("Service to deploy")
   ),
-  environment: Argument.string("environment").pipe(
+  environment: Argument.String("environment").pipe(
     Argument.withDescription("Target environment")
   ),
   database: {
-    host: Flag.string("db-host").pipe(
+    host: Flag.String("db-host").pipe(
       Flag.withDescription("Database host")
     ),
-    port: Flag.integer("db-port").pipe(
+    port: Flag.Int("db-port").pipe(
       Flag.withDescription("Database port")
     )
   },
-  dryRun: Flag.boolean("dry-run").pipe(
+  dryRun: Flag.Boolean("dry-run").pipe(
     Flag.withDescription("Perform a dry run"),
     Flag.withDefault(false)
   )
@@ -364,7 +364,7 @@ const deployCommand = Command.make("deploy", {
 
 const app = Command.make("app").pipe(
   Command.withSharedFlags({
-    env: Flag.string("env").pipe(
+    env: Flag.String("env").pipe(
       Flag.withDescription("Environment setting"),
       Flag.optional
     )
@@ -381,7 +381,7 @@ const app = Command.make("app").pipe(
 // Service command for nested context sharing tests
 const serviceCommand = Command.make("service").pipe(
   Command.withSharedFlags({
-    name: Flag.string("name").pipe(
+    name: Flag.String("name").pipe(
       Flag.withDescription("Service name")
     )
   }),
@@ -396,7 +396,7 @@ const serviceCommand = Command.make("service").pipe(
 
 const appWithService = Command.make("app-nested").pipe(
   Command.withSharedFlags({
-    env: Flag.string("env").pipe(
+    env: Flag.String("env").pipe(
       Flag.withDescription("Environment setting")
     )
   }),
@@ -414,17 +414,17 @@ const appWithService = Command.make("app-nested").pipe(
 export const ComprehensiveCli = Command.make("mycli").pipe(
   Command.withSharedFlags({
     // Global options available to all subcommands
-    debug: Flag.boolean("debug").pipe(
+    debug: Flag.Boolean("debug").pipe(
       Flag.withAlias("d"),
       Flag.withDescription("Enable debug logging"),
       Flag.withDefault(false)
     ),
-    config: Flag.file("config").pipe(
+    config: Flag.File("config").pipe(
       Flag.withAlias("c"),
       Flag.withDescription("Path to configuration file"),
       Flag.optional
     ),
-    quiet: Flag.boolean("quiet").pipe(
+    quiet: Flag.Boolean("quiet").pipe(
       Flag.withAlias("q"),
       Flag.withDescription("Suppress non-error output"),
       Flag.withDefault(false)
diff --git a/repos/effect/packages/effect/test/unstable/encoding/SchemaBinary.test.ts b/repos/effect/packages/effect/test/unstable/encoding/SchemaBinary.test.ts
index 9f1239ff3..ee2014e1f 100644
--- a/repos/effect/packages/effect/test/unstable/encoding/SchemaBinary.test.ts
+++ b/repos/effect/packages/effect/test/unstable/encoding/SchemaBinary.test.ts
@@ -255,6 +255,12 @@ describe("SchemaBinary", () => {
     })
   })
 
+  describe("string content", () => {
+    it("preserves a leading U+FEFF in strings", () => {
+      assert.strictEqual(roundtrip(Schema.String, "\uFEFFreport"), "\uFEFFreport")
+    })
+  })
+
   describe("output arena", () => {
     it("keeps an earlier result stable through later encodes and arena rollover", () => {
       const codec = SchemaBinary.toCodec(Schema.String)
@@ -1577,12 +1583,12 @@ describe("SchemaBinary", () => {
       )
     })
 
-    it.effect("round-trips a yielding transformOrFail through SchemaParser Effect APIs", () =>
+    it.effect("round-trips a yielding transformEffect through SchemaParser Effect APIs", () =>
       Effect.gen(function*() {
         const schema = Schema.String.pipe(
           Schema.decodeTo(
             Schema.Number,
-            SchemaTransformation.transformOrFail({
+            SchemaTransformation.transformEffect({
               decode: (s) => Effect.yieldNow.pipe(Effect.as(Number(s))),
               encode: (n) => Effect.yieldNow.pipe(Effect.as(String(n)))
             })
@@ -1674,7 +1680,7 @@ describe("SchemaBinary", () => {
       assert.strictEqual(error.message.match(/Missing key/g)?.length, 2)
     })
 
-    it("ignores excess-property and property-order options at the binary boundary", () => {
+    it("ignores excess-property options at the binary boundary", () => {
       const Writer = Schema.Struct({ extra: Schema.String, known: Schema.Number })
       const Reader = Schema.Struct({ known: Schema.Number })
       const bytes = encode(Writer, { extra: "drop", known: 1 })
@@ -1684,7 +1690,7 @@ describe("SchemaBinary", () => {
         { known: 1 }
       )
       assert.deepStrictEqual(
-        SchemaBinary.parser(Reader, { onExcessProperty: "preserve", propertyOrder: "original" }).feedSync(bytes),
+        SchemaBinary.parser(Reader, { onExcessProperty: "error" }).feedSync(bytes),
         [{ known: 1 }]
       )
     })
@@ -3261,7 +3267,7 @@ describe("SchemaBinary", () => {
     const AsyncName = Schema.String.pipe(
       Schema.decodeTo(
         Schema.String,
-        SchemaTransformation.transformOrFail({
+        SchemaTransformation.transformEffect({
           decode: (value) => Effect.promise(() => Promise.resolve(value.toUpperCase())),
           encode: (value) => Effect.promise(() => Promise.resolve(value.toLowerCase()))
         })
@@ -3313,7 +3319,7 @@ describe("SchemaBinary", () => {
           name: Schema.String.pipe(
             Schema.decodeTo(
               Schema.String,
-              SchemaTransformation.transformOrFail({
+              SchemaTransformation.transformEffect({
                 decode: (value, options) =>
                   value === "bob"
                     ? Effect.fail(new SchemaIssue.InvalidValue({ expected: "not bob" }, value, options))
diff --git a/repos/effect/packages/effect/test/unstable/encoding/Sse.test.ts b/repos/effect/packages/effect/test/unstable/encoding/Sse.test.ts
index f3de53102..978fb5c4f 100644
--- a/repos/effect/packages/effect/test/unstable/encoding/Sse.test.ts
+++ b/repos/effect/packages/effect/test/unstable/encoding/Sse.test.ts
@@ -4,6 +4,20 @@ import * as Schema from "effect/Schema"
 import * as Sse from "effect/unstable/encoding/Sse"
 
 describe("Sse", () => {
+  it("parses mixed CRLF and LF line endings", () => {
+    const events: Array<Sse.AnyEvent> = []
+    const parser = Sse.makeParser((event) => events.push(event))
+
+    parser.feed("data: first\r\ndata: second\n\n")
+
+    assert.deepStrictEqual(events, [{
+      _tag: "Event",
+      event: "message",
+      id: undefined,
+      data: "first\nsecond"
+    }])
+  })
+
   it("treats CRLF split across chunks as one line ending", () => {
     const events: Array<Sse.AnyEvent> = []
     const parser = Sse.makeParser((event) => events.push(event))
diff --git a/repos/effect/packages/effect/test/unstable/encoding/Toml.test.ts b/repos/effect/packages/effect/test/unstable/encoding/Toml.test.ts
index dde14d5f9..2d15b91cc 100644
--- a/repos/effect/packages/effect/test/unstable/encoding/Toml.test.ts
+++ b/repos/effect/packages/effect/test/unstable/encoding/Toml.test.ts
@@ -45,6 +45,19 @@ started = 2026-08-05
     )
   })
 
+  it("parses child tables under distinct array entries", () => {
+    assert.deepStrictEqual(
+      Toml.parse(`
+[[servers]]
+[servers.tls]
+
+[[servers]]
+[servers.tls]
+`),
+      { servers: [{ tls: {} }, { tls: {} }] }
+    )
+  })
+
   it("parses multiline strings and numeric formats", () => {
     assert.deepStrictEqual(
       Toml.parse(`
diff --git a/repos/effect/packages/effect/test/unstable/encoding/Yaml.test.ts b/repos/effect/packages/effect/test/unstable/encoding/Yaml.test.ts
index 4ecf73a65..131eda56f 100644
--- a/repos/effect/packages/effect/test/unstable/encoding/Yaml.test.ts
+++ b/repos/effect/packages/effect/test/unstable/encoding/Yaml.test.ts
@@ -50,6 +50,45 @@ folded: >-
     )
   })
 
+  it("preserves paragraph and indentation breaks in folded block scalars", () => {
+    assert.deepStrictEqual(
+      Yaml.parse(`
+paragraph: >-
+  first
+
+  second
+indented: >-
+  first
+    second
+  third
+`),
+      {
+        paragraph: "first\nsecond",
+        indented: "first\n  second\nthird"
+      }
+    )
+  })
+
+  it.each([
+    [
+      "leading blanks before a more-indented first line",
+      "message: >-2\n\n    first\n  second\n",
+      "\n  first\nsecond"
+    ],
+    [
+      "keep chomping after a more-indented final line",
+      "message: >+2\n  first\n    second\n",
+      "first\n  second\n"
+    ],
+    [
+      "multiple blank paragraph lines",
+      "message: >-\n  first\n\n\n  second\n",
+      "first\n\nsecond"
+    ]
+  ])("preserves %s", (_, source, expected) => {
+    assert.deepStrictEqual(Yaml.parse(source), { message: expected })
+  })
+
   it("resolves aliases", () => {
     assert.deepStrictEqual(
       Yaml.parse(`
@@ -69,4 +108,272 @@ development:
   it("rejects invalid indentation", () => {
     assert.throws(() => Yaml.parse("root:\n   child: true\n  sibling: false\n"))
   })
+
+  // YAML 1.2.2 §8.2.1: a mapping value's block sequence may be indentless.
+  describe("indentless sequences", () => {
+    it.each([
+      {
+        name: "top-level mapping value",
+        source: "allowed-tools:\n- Read\n- Bash\n",
+        expected: { "allowed-tools": ["Read", "Bash"] }
+      },
+      {
+        name: "nested mapping value",
+        source: "metadata:\n  tools:\n  - Read\n",
+        expected: { metadata: { tools: ["Read"] } }
+      },
+      {
+        name: "multiple sequences and sibling keys",
+        source: "tools:\n- Read\n- Bash\nroles:\n- admin\nenabled: true\n",
+        expected: { tools: ["Read", "Bash"], roles: ["admin"], enabled: true }
+      },
+      {
+        name: "comments and blank lines before and between items",
+        source: "tools: # key comment\n# before sequence\n\n- Read # item comment\n  # between items\n\n- Bash\n",
+        expected: { tools: ["Read", "Bash"] }
+      },
+      {
+        name: "nested mapping items and their indentless sequences",
+        source: "steps:\n- name: deploy\n  tools:\n  - Read\n  - Bash\n  enabled: true\n- name: verify\n",
+        expected: { steps: [{ name: "deploy", tools: ["Read", "Bash"], enabled: true }, { name: "verify" }] }
+      },
+      {
+        name: "nested sequences ending at mapping boundaries",
+        source: "metadata:\n  tools:\n  - Read\n  roles:\n  - admin\n  enabled: true\nname: deploy\n",
+        expected: { metadata: { tools: ["Read"], roles: ["admin"], enabled: true }, name: "deploy" }
+      },
+      {
+        name: "multiline descriptions alongside sequences",
+        source:
+          "description: Deploy the service\n  and verify it.\ntools:\n- Read\nmetadata:\n  description: 'Check\n    the logs'\n  tools:\n  - Bash\n",
+        expected: {
+          description: "Deploy the service and verify it.",
+          tools: ["Read"],
+          metadata: { description: "Check the logs", tools: ["Bash"] }
+        }
+      }
+    ])("parses $name", ({ source, expected }) => {
+      assert.deepStrictEqual(Yaml.parse(source), expected)
+    })
+  })
+
+  // YAML 1.2.2 §§6.5–6.7 and 7.3.1–7.3.3: flow scalar folding and comments.
+  // Expected values and rejection fixtures were checked with yaml 2.9.1.
+  describe("multiline flow scalars", () => {
+    it.each([
+      [
+        "plain scalar starting below the key",
+        "description:\n  Deploy the service\n  and verify it.\n",
+        "Deploy the service and verify it."
+      ],
+      [
+        "plain scalar starting on the key line",
+        "description: Deploy the service\n  and verify it.\n",
+        "Deploy the service and verify it."
+      ],
+      [
+        "varying continuation indentation",
+        "description:\n    Deploy\n  the service\n      and verify it.\n",
+        "Deploy the service and verify it."
+      ],
+      ["one blank line", "description: Deploy\n\n  and verify.\n", "Deploy\nand verify."],
+      ["multiple blank lines", "description: Deploy\n\n\n  and verify.\n", "Deploy\n\nand verify."],
+      ["whitespace-only blank line", "description: Deploy\n   \n  and verify.\n", "Deploy\nand verify."],
+      [
+        "leading and trailing comments",
+        "# before key\ndescription: # before value\n  # before scalar\n  Deploy\n  and verify. # after scalar\n# after value\n",
+        "Deploy and verify."
+      ],
+      ["trailing whitespace", "description: Deploy  \n    and verify.  \n", "Deploy and verify."],
+      ["CRLF line breaks", "description: Deploy\r\n  and verify.\r\n", "Deploy and verify."],
+      ["double-quoted scalar", "description: \"Deploy it\n  and more\"\n", "Deploy it and more"],
+      ["single-quoted scalar", "description: 'Deploy it\n  and more'\n", "Deploy it and more"],
+      ["single-quoted apostrophe", "description: 'Deploy it\n  and don''t stop'\n", "Deploy it and don't stop"],
+      ["double-quoted blank lines", "description: \"Deploy\n\n\n  and verify.\"\n", "Deploy\n\nand verify."],
+      ["single-quoted blank line", "description: 'Deploy\n\n  and verify.'\n", "Deploy\nand verify."],
+      ["quoted whitespace folding", "description: \"Deploy  \n    and verify.\"\n", "Deploy and verify."],
+      ["double-quoted escaped line break", "description: \"De\\\n  ploy\"\n", "Deploy"],
+      ["space before escaped line break", "description: \"Deploy \\\n  it\"\n", "Deploy it"],
+      ["escaped line break followed by blank line", "description: \"Deploy\\\n\n  it\"\n", "Deploy it"],
+      ["space before escaped line break followed by blank line", "description: \"Deploy \\\n\n  it\"\n", "Deploy  it"],
+      ["escaped leading space after line break", "description: \"Deploy\\\n  \\ it\"\n", "Deploy it"],
+      ["escaped trailing space before a folded break", "description: \"Deploy\\ \n  it\"\n", "Deploy  it"],
+      ["escaped break followed by multiple blank lines", "description: \"Deploy\\\n\n\n  it\"\n", "Deploy\nit"],
+      ["hash inside double quotes", "description: \"Deploy\n  # still text\" # comment\n", "Deploy # still text"],
+      ["hash inside single quotes", "description: 'Deploy\n  # still text' # comment\n", "Deploy # still text"],
+      [
+        "colon and hash without separating spaces",
+        "description: Visit https://example.com\n  for issue#123\n",
+        "Visit https://example.com for issue#123"
+      ],
+      ["apostrophe in plain text before a comment", "description: Don't deploy # comment\n", "Don't deploy"],
+      ["quote in plain text before a comment", "description: Use a \"quote # comment\n", "Use a \"quote"],
+      ["single quote starting a plain continuation", "description: Deploy\n  'it # end\n", "Deploy 'it"],
+      ["double quote starting a plain continuation", "description: Deploy\n  \"it # end\n", "Deploy \"it"],
+      ["bracket and quote inside plain text", "description: plain [ a 'quote # comment\n", "plain [ a 'quote"]
+    ])("folds %s", (_, source, expected) => {
+      assert.deepStrictEqual(Yaml.parse(source), { description: expected })
+      const nested = source.split(/\r?\n/).map((line) => `  ${line}`).join("\n")
+      assert.deepStrictEqual(Yaml.parse(`metadata:\n${nested}`), { metadata: { description: expected } })
+    })
+
+    it("ends plain scalars at sibling keys after terminating comments", () => {
+      assert.deepStrictEqual(
+        Yaml.parse("description: Deploy\n  and verify. # end\n# between keys\nenabled: true\n"),
+        { description: "Deploy and verify.", enabled: true }
+      )
+    })
+
+    it("folds plain sequence items", () => {
+      assert.deepStrictEqual(Yaml.parse("- Deploy\n  and verify.\n- Finish\n"), ["Deploy and verify.", "Finish"])
+    })
+  })
+
+  describe("scalar conformance boundaries", () => {
+    it.each([
+      ["colon followed by space", "description: Use when: deploy\n"],
+      ["colon at end of plain scalar", "description: Deploy:\n"],
+      ["colon followed by tab", "description: Use when:\tdeploy\n"],
+      ["colon in a continuation", "description: Deploy\n  when: ready\n"],
+      ["continuation after an inline comment", "description: Deploy # end\n  and verify.\n"],
+      ["continuation after a comment line", "description: Deploy\n  # end\n  and verify.\n"],
+      ["continuation after a trailing continuation comment", "description: Deploy\n  and verify # end\n  again\n"],
+      ["continuation after a comment following a literal single quote", "description: Deploy\n  'it # end\n  again\n"],
+      ["continuation after a comment following a literal double quote", "description: Deploy\n  \"it # end\n  again\n"],
+      ["unterminated double quote", "description: \"Deploy\n  and verify\n"],
+      ["unterminated single quote", "description: 'Deploy\n  and verify\n"],
+      ["content after closing double quote", "description: \"Deploy\n  it\" extra\n"],
+      ["content after closing single quote", "description: 'Deploy\n  it' extra\n"],
+      ["tab-indented scalar", "description:\n\tDeploy\n"],
+      ["duplicate key", "description: first\ndescription: second\n"]
+    ])("rejects %s", (_, source) => {
+      assert.throws(() => Yaml.parse(source), SyntaxError)
+    })
+
+    it("preserves numeric decoding and quoted colon content", () => {
+      assert.deepStrictEqual(
+        Yaml.parse("description: 123\nquoted: 'Use when: deploy'\ntrailing: \"Deploy:\"\n"),
+        { description: 123, quoted: "Use when: deploy", trailing: "Deploy:" }
+      )
+    })
+  })
+
+  describe("malformed content around compatibility shapes", () => {
+    const shapes = [
+      ["indentless sequence", "tools:\n- Read\n- Bash\n"],
+      ["nested indentless sequence", "metadata:\n  tools:\n  - Read\n"],
+      ["multiline plain scalar", "description: Deploy\n  and verify.\n"],
+      ["multiline quoted scalar", "description: \"Deploy\n  and verify.\"\n"]
+    ]
+    it.each([
+      ["unterminated flow sequence", "broken: [one, two\n"],
+      ["unterminated flow mapping", "broken: {one: two\n"],
+      ["unmatched top-level line", "broken: true\nunmatched\n"],
+      ["tab indentation", "broken:\n\tchild: true\n"],
+      ["invalid mapping indentation", "broken:\n   child: true\n  sibling: false\n"],
+      ["duplicate keys", "broken: one\nbroken: two\n"]
+    ])("rejects %s alone and before or after valid shapes", (_, malformed) => {
+      assert.throws(() => Yaml.parse(malformed), SyntaxError)
+      for (const [name, source] of shapes) {
+        assert.throws(() => Yaml.parse(malformed + source), SyntaxError, undefined, `before ${name}`)
+        assert.throws(() => Yaml.parse(source + malformed), SyntaxError, undefined, `after ${name}`)
+      }
+    })
+  })
+
+  describe("unsupported compact nested block sequences", () => {
+    // Valid YAML, deliberately rejected as unsupported.
+    it.each([
+      ["indentless mapping value", "a:\n- - 1\n  - 2\n"],
+      ["indented mapping value", "a:\n  - - 1\n    - 2\n"],
+      ["root sequence", "- - 1\n  - 2\n"],
+      ["blank line between nested entries", "- - 1\n\n  - 2\n"],
+      ["nested entry after a scalar item", "a:\n- 1\n- - 2\n"],
+      ["nested mapping item", "a:\n- - b: 1\n"],
+      ["single-line nested sequence", "- - 1\n"],
+      ["empty nested entry", "- -\n"]
+    ])("rejects %s", (_, source) => {
+      assert.throws(() => Yaml.parse(source), SyntaxError)
+    })
+
+    it.each(
+      [
+        ["mapping value", "a: one\n  - two\n", { a: "one - two" }],
+        ["sequence item", "- one\n  - two\n", ["one - two"]]
+      ] as const
+    )("preserves a dash in a plain continuation of a %s", (_, source, expected) => {
+      assert.deepStrictEqual(Yaml.parse(source), expected)
+    })
+  })
+
+  describe("document boundaries", () => {
+    // YAML 1.2.2 §9.1.2: document markers must start at column zero.
+    it.each([
+      ["---", ""],
+      ["---", " # comment"],
+      ["...", ""],
+      ["...", " # comment"]
+    ])("preserves indented %s%s as a mapping value", (marker, suffix) => {
+      assert.deepStrictEqual(Yaml.parse(`a:\n  ${marker}${suffix}\n`), { a: marker })
+      assert.deepStrictEqual(Yaml.parse(`metadata:\n  a:\n    ${marker}${suffix}\n`), { metadata: { a: marker } })
+    })
+
+    it.each([
+      ["mappings", "a: 1\n---\nb: 2\n"],
+      ["sequences", "- one\n---\n- two\n"],
+      ["plain scalars", "one\n---\ntwo\n"],
+      ["explicit initial marker", "---\na: 1\n--- # second document\nb: 2\n"],
+      ["empty first document", "---\n---\nb: 2\n"],
+      ["empty trailing document", "a: 1\n---\n"]
+    ])("rejects a document stream containing %s", (_, source) => {
+      assert.throws(() => Yaml.parse(source), SyntaxError)
+    })
+
+    it.each(
+      [
+        ["mapping", "# before\n--- # start\na: 1\n... # end\n# after\n", { a: 1 }],
+        ["sequence", "---\n- one\n- two\n...\n", ["one", "two"]],
+        ["plain scalar", "---\none\n...\n", "one"],
+        ["empty document", "---\n...\n", null]
+      ] as const
+    )("preserves single-document markers around a %s", (_, source, expected) => {
+      assert.deepStrictEqual(Yaml.parse(source), expected)
+    })
+  })
+
+  describe("anchors and quoted comment boundaries", () => {
+    it.each([
+      ["plain", "description: &text Deploy\n  and verify.\nalias: *text\n", "Deploy and verify."],
+      [
+        "single-quoted",
+        "description: &text 'Deploy # first\n  # second' # end\nalias: *text\n",
+        "Deploy # first # second"
+      ],
+      [
+        "double-quoted",
+        "description: &text \"Deploy # first\n  # second\" # end\nalias: *text\n",
+        "Deploy # first # second"
+      ]
+    ])("resolves anchored multiline %s scalars", (_, source, expected) => {
+      assert.deepStrictEqual(Yaml.parse(source), { description: expected, alias: expected })
+    })
+
+    it("resolves anchored nested indentless sequences", () => {
+      assert.deepStrictEqual(
+        Yaml.parse("metadata:\n  tools: &tools\n  - Read\n  - Bash\n  alias: *tools\n"),
+        { metadata: { tools: ["Read", "Bash"], alias: ["Read", "Bash"] } }
+      )
+    })
+
+    it("preserves hashes in JSON-style flow strings without colon spacing", () => {
+      assert.deepStrictEqual(Yaml.parse("{\"description\":\"Deploy # now\"} # end\n"), { description: "Deploy # now" })
+    })
+
+    it("preserves hashes in single- and double-quoted flow sequence items", () => {
+      assert.deepStrictEqual(
+        Yaml.parse("descriptions: [\"Deploy # now\", 'Verify # later'] # end\n"),
+        { descriptions: ["Deploy # now", "Verify # later"] }
+      )
+    })
+  })
 })
diff --git a/repos/effect/packages/effect/test/unstable/eventlog/EventLogMessage.test.ts b/repos/effect/packages/effect/test/unstable/eventlog/EventLogMessage.test.ts
index 7f5ee4f45..b0b33a3d6 100644
--- a/repos/effect/packages/effect/test/unstable/eventlog/EventLogMessage.test.ts
+++ b/repos/effect/packages/effect/test/unstable/eventlog/EventLogMessage.test.ts
@@ -2,6 +2,13 @@ import { assert, describe, it } from "@effect/vitest"
 import { ChunkedMessage } from "effect/unstable/eventlog/EventLogMessage"
 
 describe("EventLogMessage", () => {
+  it("splits empty data into one chunk", () => {
+    assert.deepStrictEqual(
+      ChunkedMessage.split(1, new Uint8Array()),
+      [new ChunkedMessage({ id: 1, part: [0, 1], data: new Uint8Array() })]
+    )
+  })
+
   it("ignores duplicate chunks when joining", () => {
     const state = ChunkedMessage.initialJoinState()
     const chunk = new ChunkedMessage({
diff --git a/repos/effect/packages/effect/test/unstable/eventlog/EventLogRemote.test.ts b/repos/effect/packages/effect/test/unstable/eventlog/EventLogRemote.test.ts
index 8128569b5..e69fba667 100644
--- a/repos/effect/packages/effect/test/unstable/eventlog/EventLogRemote.test.ts
+++ b/repos/effect/packages/effect/test/unstable/eventlog/EventLogRemote.test.ts
@@ -12,6 +12,44 @@ import type * as RpcGroup from "effect/unstable/rpc/RpcGroup"
 import * as RpcTest from "effect/unstable/rpc/RpcTest"
 
 describe("EventLogRemote", () => {
+  it.effect("retries wrapped Forbidden authentication errors", () =>
+    Effect.gen(function*() {
+      const harness = yield* makeHarness(EventLogRemote.makeUnencrypted)
+      const identity = yield* EventLog.makeIdentity
+      let authenticationAttempts = 0
+
+      yield* Effect.forever(Effect.gen(function*() {
+        const request = yield* harness.take
+        if (request._tag === "EventLog.Hello") {
+          request.resume(Effect.succeed(new EventLogMessage.HelloResponse({ remoteId, challenge })))
+        } else if (request._tag === "EventLog.Authenticate") {
+          authenticationAttempts++
+          request.resume(
+            authenticationAttempts === 1
+              ? Effect.fail(
+                new EventLogMessage.EventLogProtocolError({
+                  requestTag: "Authenticate",
+                  publicKey: undefined,
+                  code: "Forbidden",
+                  message: "Session auth challenge has expired"
+                })
+              )
+              : Effect.void
+          )
+        } else if (request._tag === "EventLog.WriteSingle") {
+          request.resume(Effect.void)
+        }
+      })).pipe(Effect.forkChild)
+
+      yield* harness.remote.write({
+        identity,
+        storeId: defaultStoreId,
+        entries: [makeEntry()]
+      })
+
+      assert.strictEqual(authenticationAttempts, 2)
+    }).pipe(Effect.provide(EventLogEncryption.layerSubtle)))
+
   it.effect("makeUnencrypted authenticates before writing plaintext entries", () =>
     Effect.gen(function*() {
       const harness = yield* makeHarness(EventLogRemote.makeUnencrypted)
diff --git a/repos/effect/packages/effect/test/unstable/http/Cookies.test.ts b/repos/effect/packages/effect/test/unstable/http/Cookies.test.ts
index e524d7d86..ec27c4910 100644
--- a/repos/effect/packages/effect/test/unstable/http/Cookies.test.ts
+++ b/repos/effect/packages/effect/test/unstable/http/Cookies.test.ts
@@ -101,9 +101,9 @@ describe("Cookies", () => {
     )
   })
 
-  describe("CookiesSchema", () => {
+  describe("Schema.Cookies", () => {
     it("serializerIso annotation", () => {
-      const _sessionId = Schema.toIso(Cookies.CookiesSchema).at("sessionId")
+      const _sessionId = Schema.toIso(Schema.Cookies).at("sessionId")
       const cookies = Cookies.fromSetCookie([
         "sessionId=abc123; Path=/; HttpOnly; Secure",
         "theme=dark; Path=/; Max-Age=3600",
@@ -116,7 +116,7 @@ describe("Cookies", () => {
     })
 
     it("toCodecJson", async () => {
-      const schema = Cookies.CookiesSchema
+      const schema = Schema.Cookies
       const asserts = new TestSchema.Asserts(Schema.toCodecJson(Schema.toType(schema)))
 
       const encoding = asserts.encoding()
@@ -136,6 +136,21 @@ describe("Cookies", () => {
     })
   })
 
+  it("RecordFromCookies converts cookies to decoded string values", () => {
+    const cookies = Cookies.fromSetCookie(["session=abc", "theme=dark"])
+
+    deepStrictEqual(Schema.decodeSync(Schema.RecordFromCookies)(cookies), {
+      session: "abc",
+      theme: "dark"
+    })
+    deepStrictEqual(
+      Cookies.toSetCookieHeaders(
+        Schema.encodeSync(Schema.RecordFromCookies)({ session: "abc", theme: "dark" })
+      ),
+      ["session=abc", "theme=dark"]
+    )
+  })
+
   it("get and getValue return Option", () => {
     const cookies = Cookies.fromSetCookie("session=abc; Path=/")
     assert.isTrue(Option.isSome(Cookies.get(cookies, "session")))
diff --git a/repos/effect/packages/effect/test/unstable/http/FetchHttpClient.test.ts b/repos/effect/packages/effect/test/unstable/http/FetchHttpClient.test.ts
new file mode 100644
index 000000000..3f6c42139
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/http/FetchHttpClient.test.ts
@@ -0,0 +1,25 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Effect } from "effect"
+import { FetchHttpClient, HttpClient, HttpClientRequest } from "effect/unstable/http"
+
+describe("FetchHttpClient", () => {
+  it.effect("sends bodies from Web requests", () =>
+    Effect.gen(function*() {
+      const request = HttpClientRequest.fromWeb(
+        new Request("https://example.test/?existing=1#fragment", { method: "POST", body: "hello" })
+      ).pipe(HttpClientRequest.setUrlParam("value", "a#b"))
+      const client = yield* HttpClient.HttpClient
+      const response = yield* client.execute(request)
+      assert.strictEqual(response.url, "https://example.test/?existing=1&value=a%23b")
+      assert.strictEqual(yield* response.text, "hello")
+    }).pipe(
+      Effect.provide(FetchHttpClient.layer),
+      Effect.provideService(
+        FetchHttpClient.Fetch,
+        Object.assign(
+          async (...args: Parameters<typeof globalThis.fetch>) => new Response(await new Request(...args).text()),
+          { preconnect: () => {} }
+        )
+      )
+    ))
+})
diff --git a/repos/effect/packages/effect/test/unstable/http/Headers.test.ts b/repos/effect/packages/effect/test/unstable/http/Headers.test.ts
index d91fca60d..7ba53daba 100644
--- a/repos/effect/packages/effect/test/unstable/http/Headers.test.ts
+++ b/repos/effect/packages/effect/test/unstable/http/Headers.test.ts
@@ -1,13 +1,13 @@
 import { describe, it } from "@effect/vitest"
-import { assertNone, assertSome, deepStrictEqual, doesNotThrow, strictEqual } from "@effect/vitest/utils"
-import { Schema } from "effect"
+import { assertNone, assertSome, assertTrue, deepStrictEqual, doesNotThrow, strictEqual } from "@effect/vitest/utils"
+import { Redacted, Schema } from "effect"
 import { Headers } from "effect/unstable/http"
 import { assertSuccess } from "../../utils/assert.ts"
 
 describe("Headers", () => {
-  describe("HeadersSchema", () => {
+  describe("Schema.Headers", () => {
     it("serializer annotation", () => {
-      const _Accept = Schema.toIso(Headers.HeadersSchema).at("Accept")
+      const _Accept = Schema.toIso(Schema.Headers).at("Accept")
       const headers = Headers.fromRecordUnsafe({
         "Accept": "application/json, text/plain, */*",
         "Cache-Control": "no-cache"
@@ -52,6 +52,10 @@ describe("Headers", () => {
     deepStrictEqual({ ...result }, { keep: "me" })
   })
 
+  it("isRedactedName compares string patterns case-insensitively", () => {
+    strictEqual(Headers.isRedactedName("Authorization", ["authorization"]), true)
+  })
+
   it("works with for..in based headers polyfills", () => {
     const effectHeaders = Headers.fromInput({ foo: "bar" })
     const nativeHeaders = new globalThis.Headers()
@@ -70,4 +74,34 @@ describe("Headers", () => {
     assertSome(Headers.get(headers, "foo"), "bar")
     assertNone(Headers.get(headers, "missing"))
   })
+
+  it("redacts each header independently with a global pattern", () => {
+    const result = Headers.redact(
+      Headers.fromInput({ "x-secret-one": "one", "x-secret-two": "two" }),
+      /^x-secret-/g
+    )
+
+    assertTrue(Redacted.isRedacted(result["x-secret-one"]))
+    assertTrue(Redacted.isRedacted(result["x-secret-two"]))
+  })
+
+  it("checks each header independently with a sticky pattern", () => {
+    const pattern = /^x-secret-/y
+
+    assertTrue(Headers.isRedactedName("x-secret-one", [pattern]))
+    assertTrue(Headers.isRedactedName("x-secret-two", [pattern]))
+  })
+
+  it("preserves caller-owned stateful pattern cursors", () => {
+    const redactPattern = /^x-secret/g
+    const namePattern = /^x-secret/y
+    redactPattern.lastIndex = 3
+    namePattern.lastIndex = 4
+
+    Headers.redact(Headers.fromInput({ "x-secret": "value" }), redactPattern)
+    Headers.isRedactedName("x-secret", [namePattern])
+
+    strictEqual(redactPattern.lastIndex, 3)
+    strictEqual(namePattern.lastIndex, 4)
+  })
 })
diff --git a/repos/effect/packages/effect/test/unstable/http/HttpBody.test.ts b/repos/effect/packages/effect/test/unstable/http/HttpBody.test.ts
index 8429ebc35..710359f8b 100644
--- a/repos/effect/packages/effect/test/unstable/http/HttpBody.test.ts
+++ b/repos/effect/packages/effect/test/unstable/http/HttpBody.test.ts
@@ -1,14 +1,110 @@
 import { assert, it } from "@effect/vitest"
-import { Effect, FileSystem, Stream } from "effect"
+import { ByteSize, Effect, FileSystem, Stream } from "effect"
 import { HttpBody } from "effect/unstable/http"
 
-it.effect("uses the selected byte count as partial file content length", () =>
-  Effect.gen(function*() {
-    const body = yield* HttpBody.fileFromInfo("x", { size: 6n } as any, { offset: 2, bytesToRead: 2 }).pipe(
-      Effect.provideService(FileSystem.FileSystem, {
-        stream: () => Stream.succeed(new Uint8Array([3, 4]))
-      } as any)
+const maxSafe = BigInt(Number.MAX_SAFE_INTEGER)
+const oversized = 9007199254740993n
+const fileInfo = (size: bigint): FileSystem.File.Info => ({ size: ByteSize.bytes(size) }) as FileSystem.File.Info
+const fromInfo = (size: bigint, options?: Parameters<typeof HttpBody.fileFromInfo>[2]) =>
+  HttpBody.fileFromInfo("x", fileInfo(size), options).pipe(
+    Effect.provideService(FileSystem.FileSystem, FileSystem.makeNoop({ stream: () => Stream.empty }))
+  )
+
+it.each([
+  { name: "maximum safe final length", size: oversized, options: { offset: 2 }, expected: Number.MAX_SAFE_INTEGER },
+  {
+    name: "exact subtraction before clamping",
+    size: oversized + 3n,
+    options: { offset: oversized, bytesToRead: 4 },
+    expected: 3
+  },
+  { name: "safe byte count on an oversized file", size: oversized, options: { bytesToRead: 2 }, expected: 2 },
+  { name: "oversized byte count clamped to a small file", size: 6n, options: { bytesToRead: oversized }, expected: 6 },
+  { name: "offset at EOF", size: 6n, options: { offset: 6 }, expected: 0 },
+  { name: "offset past EOF", size: 6n, options: { offset: 7, bytesToRead: 2 }, expected: 0 },
+  { name: "zero byte count", size: oversized, options: { bytesToRead: 0 }, expected: 0 }
+])("fileFromInfo handles $name", async ({ expected, options, size }) => {
+  const body = await Effect.runPromise(fromInfo(size, options))
+  assert.strictEqual(body.contentLength, expected)
+})
+
+it.each([
+  { name: "first unsafe final length", size: maxSafe + 1n, options: {} },
+  {
+    name: "unsafe length after applying both bounds",
+    size: oversized + 3n,
+    options: { offset: 1, bytesToRead: oversized }
+  },
+  // Bypass the input type to exercise runtime validation.
+  { name: "malformed byte count", size: 6n, options: { bytesToRead: "garbage" as ByteSize.Input } },
+  { name: "negative offset with zero bytes requested", size: 6n, options: { offset: -1n, bytesToRead: 0 } },
+  { name: "negative byte count at EOF", size: 6n, options: { offset: 6, bytesToRead: -1 } },
+  { name: "fractional offset", size: 6n, options: { offset: 1.5 } },
+  { name: "non-finite byte count", size: 6n, options: { bytesToRead: Infinity } },
+  { name: "unsafe numeric offset", size: 6n, options: { offset: Number.MAX_SAFE_INTEGER + 1 } },
+  { name: "unsafe numeric byte count", size: 6n, options: { bytesToRead: Number.MAX_SAFE_INTEGER + 1 } }
+])("fileFromInfo rejects $name with typed BadArgument", async ({ options, size }) => {
+  const error = await Effect.runPromise(fromInfo(size, options).pipe(Effect.flip))
+  assert.strictEqual(error._tag, "PlatformError")
+  assert.strictEqual(error.reason._tag, "BadArgument")
+  assert.strictEqual(error.reason.method, "fileFromInfo")
+})
+
+for (const constructor of ["file", "fileFromInfo"] as const) {
+  it(`${constructor} defers range validation and filesystem access until evaluation`, async () => {
+    let reads = 0
+    let statCalls = 0
+    const options = {
+      get offset() {
+        reads++
+        // Bypass the input type to exercise deferred runtime validation.
+        return "garbage" as ByteSize.Input
+      }
+    }
+    // Construct outside Effect.gen so eager validation fails the test.
+    const info = fileInfo(6n)
+    const body = (constructor === "file" ? HttpBody.file("x", options) : HttpBody.fileFromInfo("x", info, options))
+      .pipe(
+        Effect.provideService(
+          FileSystem.FileSystem,
+          FileSystem.makeNoop({
+            stat: () => {
+              statCalls++
+              return Effect.succeed(info)
+            },
+            stream: () => assert.fail("invalid ranges must fail before creating a stream")
+          })
+        )
+      )
+    assert.strictEqual(reads, 0)
+    assert.strictEqual(statCalls, 0)
+    const error = await Effect.runPromise(body.pipe(Effect.flip))
+    assert.strictEqual(error._tag, "PlatformError")
+    assert.strictEqual(error.reason._tag, "BadArgument")
+    assert.strictEqual(error.reason.method, constructor)
+    assert.isAbove(reads, 0)
+    assert.strictEqual(statCalls, constructor === "file" ? 1 : 0)
+  })
+}
+
+it("fileFromInfo preserves a small selected range and stream options", async () => {
+  const options = { offset: "2 B", bytesToRead: ByteSize.bytes(2), contentType: "text/plain", chunkSize: 2 } as const
+  const body = await Effect.runPromise(
+    HttpBody.fileFromInfo("x", fileInfo(6n), options).pipe(
+      Effect.provideService(
+        FileSystem.FileSystem,
+        FileSystem.makeNoop({
+          stream: (path, range) => {
+            assert.strictEqual(path, "x")
+            assert.deepStrictEqual(range, options)
+            return Stream.succeed(new Uint8Array([3, 4]))
+          }
+        })
+      )
     )
-    const bytes = yield* Stream.mkUint8Array(body.stream)
-    assert.strictEqual(body.contentLength, bytes.length)
-  }))
+  )
+  const bytes = await Effect.runPromise(Stream.mkUint8Array(body.stream))
+  assert.deepStrictEqual(Array.from(bytes), [3, 4])
+  assert.strictEqual(body.contentLength, bytes.length)
+  assert.strictEqual(body.contentType, "text/plain")
+})
diff --git a/repos/effect/packages/effect/test/unstable/http/HttpClient.test.ts b/repos/effect/packages/effect/test/unstable/http/HttpClient.test.ts
index 4f44a3de5..299c39a77 100644
--- a/repos/effect/packages/effect/test/unstable/http/HttpClient.test.ts
+++ b/repos/effect/packages/effect/test/unstable/http/HttpClient.test.ts
@@ -62,6 +62,56 @@ describe("HttpClient", () => {
       )
     }))
 
+  it.effect("forwards parse options to response schema decoders", () =>
+    Effect.gen(function*() {
+      const response = HttpClientResponse.fromWeb(
+        HttpClientRequest.get("https://example.com"),
+        new Response("{}")
+      )
+      const error = yield* HttpClientResponse.schemaJson(
+        Schema.Struct({
+          body: Schema.Struct({
+            a: Schema.String,
+            b: Schema.String
+          })
+        }),
+        { errors: "all" }
+      )(response).pipe(Effect.flip)
+
+      assert.strictEqual(
+        error.message,
+        `Missing key
+  at ["body"]["a"]
+Missing key
+  at ["body"]["b"]`
+      )
+    }))
+
+  it.effect("forwards parse options to response schema decoders without a body", () =>
+    Effect.gen(function*() {
+      const response = HttpClientResponse.fromWeb(
+        HttpClientRequest.get("https://example.com"),
+        new Response(null)
+      )
+      const error = yield* HttpClientResponse.schemaNoBody(
+        Schema.Struct({
+          headers: Schema.Struct({
+            a: Schema.String,
+            b: Schema.String
+          })
+        }),
+        { errors: "all" }
+      )(response).pipe(Effect.flip)
+
+      assert.strictEqual(
+        error.message,
+        `Missing key
+  at ["headers"]["a"]
+Missing key
+  at ["headers"]["b"]`
+      )
+    }))
+
   it.effect("preserves a raw large integer through schemaBodyJson reviver context", () =>
     Effect.gen(function*() {
       const response = HttpClientResponse.fromWeb(
@@ -194,6 +244,23 @@ describe("HttpClient", () => {
   })
 
   describe("followRedirects", () => {
+    it.effect("preserves preprocessing error recovery", () =>
+      Effect.gen(function*() {
+        const request = HttpClientRequest.get("https://origin.test/")
+        const recovered = HttpClientResponse.fromWeb(request, new Response(null, { status: 418 }))
+        const client = HttpClient.make((request) =>
+          Effect.succeed(HttpClientResponse.fromWeb(request, new Response(null, { status: 200 })))
+        ).pipe(
+          HttpClient.mapRequestEffect(() => Effect.fail("preprocessing failed")),
+          HttpClient.catch(() => Effect.succeed(recovered)),
+          HttpClient.followRedirects()
+        )
+
+        const response = yield* client.execute(request)
+
+        assert.strictEqual(response, recovered)
+      }))
+
     it.effect("preserves credential headers on same-origin redirects", () =>
       Effect.gen(function*() {
         const { client, requests } = yield* makeRedirectClient(302, "https://origin.test/destination")
diff --git a/repos/effect/packages/effect/test/unstable/http/HttpClientRequest.test.ts b/repos/effect/packages/effect/test/unstable/http/HttpClientRequest.test.ts
index 919c07ea2..14473c169 100644
--- a/repos/effect/packages/effect/test/unstable/http/HttpClientRequest.test.ts
+++ b/repos/effect/packages/effect/test/unstable/http/HttpClientRequest.test.ts
@@ -1,10 +1,53 @@
 import { describe, it } from "@effect/vitest"
 import { assertNone, assertSome, assertTrue, deepStrictEqual, strictEqual } from "@effect/vitest/utils"
-import { Effect, Stream } from "effect"
+import { ByteSize, Effect, FileSystem, Stream } from "effect"
 import * as Option from "effect/Option"
 import { Headers, HttpBody, HttpClientRequest } from "effect/unstable/http"
 
 describe("HttpClientRequest", () => {
+  describe("bodyFile", () => {
+    const oversized = 9007199254740993n
+    const fileSystem = (size: bigint) =>
+      FileSystem.makeNoop({
+        stat: () => Effect.succeed({ size: ByteSize.bytes(size) } as FileSystem.File.Info),
+        stream: () => Stream.empty
+      })
+
+    it.each([
+      { name: "unsafe bigint offset", size: oversized + 3n, options: { offset: oversized }, expected: 3 },
+      { name: "range past EOF", size: 6n, options: { offset: 7 }, expected: 0 }
+    ])("sets the exact outgoing Content-Length for $name", async ({ expected, options, size }) => {
+      const request = await Effect.runPromise(
+        HttpClientRequest.post("https://example.com").pipe(
+          HttpClientRequest.bodyText("stale"),
+          HttpClientRequest.bodyFile("x", { ...options, contentType: "application/octet-stream" }),
+          Effect.provideService(FileSystem.FileSystem, fileSystem(size))
+        )
+      )
+      strictEqual(request.body._tag, "Stream")
+      if (request.body._tag === "Stream") {
+        strictEqual(request.body.contentLength, expected)
+      }
+      strictEqual(request.headers["content-length"], String(expected))
+      strictEqual(request.headers["content-type"], "application/octet-stream")
+      const web = await Effect.runPromise(HttpClientRequest.toWeb(request))
+      strictEqual(web.headers.get("content-length"), String(expected))
+    })
+
+    it("propagates typed BadArgument from file range validation", async () => {
+      const request = HttpClientRequest.bodyFile(HttpClientRequest.post("https://example.com"), "x", {
+        // @ts-expect-error Exercise runtime validation of malformed input.
+        bytesToRead: "garbage"
+      })
+      const error = await Effect.runPromise(request.pipe(
+        Effect.flip,
+        Effect.provideService(FileSystem.FileSystem, fileSystem(6n))
+      ))
+      strictEqual(error._tag, "PlatformError")
+      strictEqual(error.reason._tag, "BadArgument")
+    })
+  })
+
   describe("appendUrl", () => {
     it("joins segments without slashes", () => {
       const request = HttpClientRequest.get("base").pipe(
diff --git a/repos/effect/packages/effect/test/unstable/http/HttpCompression.test.ts b/repos/effect/packages/effect/test/unstable/http/HttpCompression.test.ts
index cfd242178..a79c6b63a 100644
--- a/repos/effect/packages/effect/test/unstable/http/HttpCompression.test.ts
+++ b/repos/effect/packages/effect/test/unstable/http/HttpCompression.test.ts
@@ -90,6 +90,41 @@ const randomBytes = (length: number): Uint8Array => {
 }
 
 describe("HttpCompression", () => {
+  for (
+    const [name, makeResponse] of [
+      ["Stream", () => HttpServerResponse.stream(Stream.succeed(new TextEncoder().encode(bigJson)))],
+      ["Uint8Array", () => HttpServerResponse.uint8Array(new TextEncoder().encode(bigJson))],
+      ["Raw", () => HttpServerResponse.raw(new Response(bigJson).body, { contentType: "text/plain" })]
+    ] as const
+  ) {
+    it(`preserves a Content-Type header override when compressing web ${name} responses`, async () => {
+      const original = HttpServerResponse.setHeader(makeResponse(), "content-type", "application/json")
+      assert.strictEqual(original.headers["content-type"], "application/json")
+      const handler = makeHandler(Effect.succeed(original))
+
+      const compressed = await get(handler, { "accept-encoding": "gzip" })
+      assert.strictEqual(compressed.headers.get("content-encoding"), "gzip")
+      assert.strictEqual(await decompress(await compressed.arrayBuffer(), "gzip"), bigJson)
+      assert.strictEqual(compressed.headers.get("content-type"), original.headers["content-type"])
+    })
+  }
+
+  it("preserves a header-only Content-Type when compressing web Raw responses", async () => {
+    const handler = makeHandler(
+      Effect.sync(() =>
+        HttpServerResponse.raw(new Response(bigJson).body, { headers: { "content-type": "application/json" } })
+      )
+    )
+    const uncompressed = await get(handler, { "accept-encoding": "identity" })
+    assert.strictEqual(uncompressed.headers.get("content-type"), "application/json")
+    assert.strictEqual(await uncompressed.text(), bigJson)
+
+    const compressed = await get(handler, { "accept-encoding": "gzip" })
+    assert.strictEqual(compressed.headers.get("content-encoding"), "gzip")
+    assert.strictEqual(await decompress(await compressed.arrayBuffer(), "gzip"), bigJson)
+    assert.strictEqual(compressed.headers.get("content-type"), uncompressed.headers.get("content-type"))
+  })
+
   it("compresses a compressible response with gzip", async () => {
     const response = await get(makeHandler(bigJsonApp), { "accept-encoding": "gzip" })
     assert.strictEqual(response.status, 200)
diff --git a/repos/effect/packages/effect/test/unstable/http/HttpEffect.test.ts b/repos/effect/packages/effect/test/unstable/http/HttpEffect.test.ts
index 544826a95..76618d4e8 100644
--- a/repos/effect/packages/effect/test/unstable/http/HttpEffect.test.ts
+++ b/repos/effect/packages/effect/test/unstable/http/HttpEffect.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, test } from "@effect/vitest"
 import { deepStrictEqual, strictEqual } from "@effect/vitest/utils"
-import { Context, Effect, References, Scope, Stream } from "effect"
+import { Context, Effect, Option, References, Scope, Stream, Tracer } from "effect"
 import * as Layer from "effect/Layer"
 import { HttpEffect, HttpServerRequest, HttpServerResponse } from "effect/unstable/http"
 import {
@@ -36,6 +36,33 @@ describe("HttpEffect", () => {
   })
 
   describe("toWebHandler", () => {
+    test("skips the server span with the default tracer", async () => {
+      let hasParentSpan = false
+      const handler = HttpEffect.toWebHandler(Effect.gen(function*() {
+        hasParentSpan = Option.isSome(yield* Effect.serviceOption(Tracer.ParentSpan))
+        return HttpServerResponse.empty()
+      }))
+
+      await handler(new Request("http://localhost:3000/"))
+
+      strictEqual(hasParentSpan, false)
+    })
+
+    test("provides a parent span with a configured tracer", async () => {
+      let hasParentSpan = false
+      const tracer = Tracer.make({
+        span: (options) => new Tracer.NativeSpan(options)
+      })
+      const handler = HttpEffect.toWebHandler(Effect.gen(function*() {
+        hasParentSpan = Option.isSome(yield* Effect.serviceOption(Tracer.ParentSpan))
+        return HttpServerResponse.empty()
+      }))
+
+      await handler(new Request("http://localhost:3000/"), Context.make(Tracer.Tracer, tracer))
+
+      strictEqual(hasParentSpan, true)
+    })
+
     test("json", async () => {
       const handler = HttpEffect.toWebHandler(HttpServerResponse.json({ foo: "bar" }))
       const response = await handler(new Request("http://localhost:3000/"))
@@ -83,6 +110,22 @@ describe("HttpEffect", () => {
       strictEqual(await response.text(), "foobar")
     })
 
+    test("preserves explicit stream headers", async () => {
+      const handler = HttpEffect.toWebHandler(Effect.succeed(
+        HttpServerResponse.stream(Stream.empty).pipe(
+          HttpServerResponse.setHeaders({
+            "Content-Type": "text/javascript",
+            "Content-Length": "9007199254740993"
+          })
+        )
+      ))
+      const response = await handler(new Request("http://localhost/script.js"))
+      await response.arrayBuffer()
+
+      strictEqual(response.headers.get("content-type"), "text/javascript")
+      strictEqual(response.headers.get("content-length"), "9007199254740993")
+    })
+
     test("stream scope", async () => {
       let order = 0
       let streamFinalized = 0
@@ -108,6 +151,48 @@ describe("HttpEffect", () => {
       strictEqual(streamFinalized < handlerFinalized, true)
     })
 
+    test("streaming HEAD closes the request scope", async () => {
+      let finalized = false
+      const handler = HttpEffect.toWebHandler(Effect.gen(function*() {
+        yield* Effect.addFinalizer(() =>
+          Effect.sync(() => {
+            finalized = true
+          })
+        )
+        return HttpServerResponse.stream(Stream.make("body").pipe(Stream.encodeText))
+      }))
+
+      await handler(new Request("http://localhost:3000/", { method: "HEAD" }))
+
+      strictEqual(finalized, true)
+    })
+
+    test.each([204, 205, 304])("status %i closes the request scope without starting the stream", async (status) => {
+      let finalized = false
+      let streamStarted = false
+      const handler = HttpEffect.toWebHandler(Effect.gen(function*() {
+        yield* Effect.addFinalizer(() =>
+          Effect.sync(() => {
+            finalized = true
+          })
+        )
+        return HttpServerResponse.stream(
+          Stream.fromEffect(Effect.sync(() => {
+            streamStarted = true
+            return new Uint8Array([1])
+          })),
+          { status }
+        )
+      }))
+
+      const response = await handler(new Request("http://localhost:3000/"))
+
+      strictEqual(response.status, status)
+      strictEqual(response.body, null)
+      strictEqual(streamStarted, false)
+      strictEqual(finalized, true)
+    })
+
     test("stream runtime", async () => {
       const handler = Effect.succeed(HttpServerResponse.stream(
         Stream.fromEffect(TestValue).pipe(Stream.map(String), Stream.encodeText)
@@ -161,6 +246,54 @@ describe("HttpEffect", () => {
     })
   })
 
+  describe("toWebHandlerLayer", () => {
+    test("builds the layer when the handler is created", async () => {
+      let builds = 0
+      const { dispose, handler } = HttpEffect.toWebHandlerLayer(
+        Effect.map(TestValue, (value) => HttpServerResponse.text(String(value))),
+        Layer.effect(
+          TestValue,
+          Effect.sync(() => {
+            builds++
+            return 420
+          })
+        )
+      )
+      strictEqual(builds, 1)
+      const response = await handler(new Request("http://localhost:3000/"))
+      strictEqual(await response.text(), "420")
+      strictEqual(builds, 1)
+      await dispose()
+    })
+
+    test("a failing layer rejects every request without an unhandled rejection", async () => {
+      const unhandled: Array<unknown> = []
+      const onUnhandled = (reason: unknown) => {
+        unhandled.push(reason)
+      }
+      process.on("unhandledRejection", onUnhandled)
+      try {
+        const error = new Error("boom")
+        const { handler } = HttpEffect.toWebHandlerLayer(
+          Effect.succeed(HttpServerResponse.empty()),
+          Layer.effectDiscard(Effect.fail(error))
+        )
+        await new Promise((resolve) => setTimeout(resolve, 0))
+        for (let i = 0; i < 2; i++) {
+          const rejected = await handler(new Request("http://localhost:3000/")).then(
+            () => undefined,
+            (cause) => cause
+          )
+          strictEqual(rejected, error)
+        }
+        await new Promise((resolve) => setTimeout(resolve, 0))
+        deepStrictEqual(unhandled, [])
+      } finally {
+        process.off("unhandledRejection", onUnhandled)
+      }
+    })
+  })
+
   describe("fromWebHandler", () => {
     test("basic GET request", async () => {
       const webHandler = async (request: Request) => {
diff --git a/repos/effect/packages/effect/test/unstable/http/HttpMiddleware.test.ts b/repos/effect/packages/effect/test/unstable/http/HttpMiddleware.test.ts
index 25abe87bf..6cd6f4a16 100644
--- a/repos/effect/packages/effect/test/unstable/http/HttpMiddleware.test.ts
+++ b/repos/effect/packages/effect/test/unstable/http/HttpMiddleware.test.ts
@@ -6,11 +6,113 @@ import * as Exit from "effect/Exit"
 import * as Logger from "effect/Logger"
 import * as References from "effect/References"
 import * as Tracer from "effect/Tracer"
+import * as Headers from "effect/unstable/http/Headers"
+import * as HttpEffect from "effect/unstable/http/HttpEffect"
 import * as HttpMiddleware from "effect/unstable/http/HttpMiddleware"
 import * as HttpServerRequest from "effect/unstable/http/HttpServerRequest"
 import * as HttpServerResponse from "effect/unstable/http/HttpServerResponse"
 
 describe("HttpMiddleware", () => {
+  describe("cors", () => {
+    it.effect.each([
+      {
+        name: "adds Origin when Vary is absent",
+        vary: undefined,
+        expected: "Origin"
+      },
+      {
+        name: "preserves existing Vary dimensions when adding Origin",
+        vary: "Accept-Language",
+        expected: "Accept-Language, Origin"
+      },
+      {
+        name: "preserves other dimensions without duplicating a mixed-case Origin",
+        vary: "Accept-Language, oRiGiN",
+        expected: "Accept-Language, oRiGiN"
+      },
+      {
+        name: "preserves wildcard Vary",
+        vary: "*",
+        expected: "*"
+      }
+    ])("$name", ({ expected, vary }) =>
+      Effect.gen(function*() {
+        const handler = HttpEffect.toWebHandler(
+          Effect.succeed(HttpServerResponse.text("hello", {
+            headers: vary === undefined ? {} : { Vary: vary }
+          })).pipe(HttpMiddleware.cors({
+            allowedOrigins: ["https://client.example", "https://other.example"]
+          }))
+        )
+        const response = yield* Effect.promise(() =>
+          handler(
+            new Request("http://localhost/", {
+              headers: { Origin: "https://client.example" }
+            })
+          )
+        )
+        assert.strictEqual(response.headers.get("access-control-allow-origin"), "https://client.example")
+        assert.strictEqual(response.headers.get("vary"), expected)
+      }))
+
+    it.effect("preserves both Vary dimensions for preflight requests", () =>
+      Effect.gen(function*() {
+        const handler = HttpEffect.toWebHandler(
+          Effect.succeed(HttpServerResponse.empty()).pipe(HttpMiddleware.cors({
+            allowedOrigins: ["https://client.example", "https://other.example"]
+          }))
+        )
+        const response = yield* Effect.promise(() =>
+          handler(
+            new Request("http://localhost/", {
+              method: "OPTIONS",
+              headers: {
+                Origin: "https://client.example",
+                "Access-Control-Request-Headers": "X-Test"
+              }
+            })
+          )
+        )
+        const vary = response.headers.get("vary")?.split(",").map((member) => member.trim().toLowerCase()).sort()
+        assert.deepStrictEqual(vary, ["access-control-request-headers", "origin"])
+      }))
+
+    it.effect("varies by Origin when the request origin is rejected", () =>
+      Effect.gen(function*() {
+        const handler = HttpEffect.toWebHandler(
+          Effect.succeed(HttpServerResponse.empty()).pipe(HttpMiddleware.cors({
+            allowedOrigins: ["https://client.example", "https://other.example"]
+          }))
+        )
+        const response = yield* Effect.promise(() =>
+          handler(
+            new Request("http://localhost/", {
+              headers: { Origin: "https://rejected.example" }
+            })
+          )
+        )
+        assert.strictEqual(response.headers.get("vary"), "Origin")
+      }))
+
+    it.effect("preserves Vary when allowing all origins", () =>
+      Effect.gen(function*() {
+        const handler = HttpEffect.toWebHandler(
+          Effect.succeed(HttpServerResponse.text("hello", {
+            headers: { Vary: "Accept-Language" }
+          })).pipe(HttpMiddleware.cors())
+        )
+        const response = yield* Effect.promise(() =>
+          handler(
+            new Request("http://localhost/", {
+              headers: { Origin: "https://client.example" }
+            })
+          )
+        )
+        assert.strictEqual(response.headers.get("access-control-allow-origin"), "*")
+        assert.strictEqual(response.headers.get("vary"), "Accept-Language")
+      }))
+  })
+
   describe("logger", () => {
     it.effect("annotates method, path, and status without query or hash", () =>
       Effect.gen(function*() {
@@ -94,17 +196,22 @@ describe("HttpMiddleware", () => {
             method: "POST",
             headers: {
               "user-agent": "test-agent",
-              "x-request": "request"
+              "x-request": "request",
+              "x-request-secret": "request-secret"
             }
           })
         )
         const response = HttpServerResponse.empty({
           status: 201,
-          headers: { "x-response": "response" }
+          headers: {
+            "x-response": "response",
+            "x-response-secret": "response-secret"
+          }
         })
 
         yield* HttpMiddleware.tracer(Effect.succeed(response)).pipe(
           Effect.provideService(HttpServerRequest.HttpServerRequest, request),
+          Effect.provideService(Headers.CurrentRedactedNames, ["x-request-secret", "x-response-secret"]),
           Effect.provideService(Tracer.Tracer, tracer)
         )
         yield* Effect.yieldNow
@@ -116,8 +223,10 @@ describe("HttpMiddleware", () => {
         assert.strictEqual(serverSpan.attributes.get("url.query"), "foo=bar")
         assert.strictEqual(serverSpan.attributes.get("user_agent.original"), "test-agent")
         assert.strictEqual(serverSpan.attributes.get("http.request.header.x-request"), "request")
+        assert.strictEqual(serverSpan.attributes.get("http.request.header.x-request-secret"), "<redacted>")
         assert.strictEqual(serverSpan.attributes.get("http.response.status_code"), 201)
         assert.strictEqual(serverSpan.attributes.get("http.response.header.x-response"), "response")
+        assert.strictEqual(serverSpan.attributes.get("http.response.header.x-response-secret"), "<redacted>")
       }))
 
     it.effect("skips attributes for unsampled spans", () =>
diff --git a/repos/effect/packages/effect/test/unstable/http/HttpPlatform.test.ts b/repos/effect/packages/effect/test/unstable/http/HttpPlatform.test.ts
index f5ae0cab4..e2b5fcabe 100644
--- a/repos/effect/packages/effect/test/unstable/http/HttpPlatform.test.ts
+++ b/repos/effect/packages/effect/test/unstable/http/HttpPlatform.test.ts
@@ -1,8 +1,68 @@
 import { assert, describe, it } from "@effect/vitest"
-import { Effect, FileSystem, Stream } from "effect"
+import { ByteSize, Effect, FileSystem, Layer, Option, Stream } from "effect"
 import { HttpPlatform } from "effect/unstable/http"
 
 describe("HttpPlatform", () => {
+  const oversized = 9007199254740993n
+  const layer = HttpPlatform.layer.pipe(Layer.provide(FileSystem.layerNoop({
+    stat: () =>
+      Effect.succeed({
+        type: "File",
+        size: ByteSize.bytes(oversized),
+        mtime: Option.none()
+      } as FileSystem.File.Info),
+    stream: () => Stream.empty
+  })))
+
+  it.effect("fileResponse infers the content type from the extension", () =>
+    Effect.gen(function*() {
+      const platform = yield* HttpPlatform.HttpPlatform
+      const response = yield* platform.fileResponse("script.js")
+      assert.strictEqual(response.headers["content-type"], "text/javascript")
+    }).pipe(Effect.provide(layer)))
+
+  it.effect("fileResponse honors contentType over a conflicting header", () =>
+    Effect.gen(function*() {
+      const platform = yield* HttpPlatform.HttpPlatform
+      const response = yield* platform.fileResponse("script.js", {
+        contentType: "application/custom",
+        headers: { "content-type": "application/header" }
+      })
+      assert.strictEqual(response.headers["content-type"], "application/custom")
+    }).pipe(Effect.provide(layer)))
+
+  it.effect("fileWebResponse honors contentType over the file type", () =>
+    Effect.gen(function*() {
+      const platform = yield* HttpPlatform.HttpPlatform
+      const response = yield* platform.fileWebResponse(new File([], "script.js", { type: "text/plain" }), {
+        contentType: "text/javascript"
+      })
+      assert.strictEqual(response.headers["content-type"], "text/javascript")
+    }).pipe(Effect.provide(layer)))
+
+  it.effect("serves a whole oversized file with an exact content-length header", () =>
+    Effect.gen(function*() {
+      const platform = yield* HttpPlatform.HttpPlatform
+      const response = yield* platform.fileResponse("file.bin")
+      assert.strictEqual(response.headers["content-length"], oversized.toString())
+    }).pipe(Effect.provide(layer)))
+
+  for (
+    const [name, options] of [
+      ["unsafe bigint offset", { offset: oversized }],
+      ["unsafe end from safe bounds", { offset: Number.MAX_SAFE_INTEGER, bytesToRead: 2 }],
+      ["unsafe number offset", { offset: Number.MAX_SAFE_INTEGER + 1 }],
+      ["unsafe number byte count", { bytesToRead: Number.MAX_SAFE_INTEGER + 1 }]
+    ] as const
+  ) {
+    it.effect(`rejects ${name} with BadArgument`, () =>
+      Effect.gen(function*() {
+        const platform = yield* HttpPlatform.HttpPlatform
+        const error = yield* Effect.flip(platform.fileResponse("file.bin", options))
+        assert.strictEqual(error.reason._tag, "BadArgument")
+      }).pipe(Effect.provide(layer)))
+  }
+
   const file = {
     name: "file.bin",
     lastModified: 0,
@@ -26,6 +86,37 @@ describe("HttpPlatform", () => {
       Effect.provideService(FileSystem.FileSystem, {} as any)
     ))
 
+  for (
+    const { name, offset, bytesToRead, expected } of [
+      { name: "clamps bytesToRead beyond EOF", offset: 1, bytesToRead: 10, expected: [2, 3, 4] },
+      { name: "returns an empty body at EOF", offset: 4, bytesToRead: undefined, expected: [] },
+      { name: "returns an empty body past EOF", offset: 9, bytesToRead: undefined, expected: [] },
+      { name: "clamps bytesToRead at EOF", offset: 4, bytesToRead: 10, expected: [] },
+      { name: "clamps bytesToRead past EOF", offset: 9, bytesToRead: 10, expected: [] }
+    ]
+  ) {
+    it.effect(`fileWebResponse ${name}`, () =>
+      Effect.gen(function*() {
+        const platform = yield* HttpPlatform.HttpPlatform
+        const response = yield* platform.fileWebResponse(file, { offset, bytesToRead })
+        assert.strictEqual(response.body._tag, "Stream")
+        if (response.body._tag === "Stream") {
+          const bytes = yield* Stream.mkUint8Array(response.body.stream)
+          assert.deepStrictEqual(
+            {
+              contentLength: response.body.contentLength,
+              header: response.headers["content-length"],
+              body: Array.from(bytes)
+            },
+            { contentLength: expected.length, header: String(expected.length), body: expected }
+          )
+        }
+      }).pipe(
+        Effect.provide(HttpPlatform.layer),
+        Effect.provideService(FileSystem.FileSystem, {} as any)
+      ))
+  }
+
   it.effect("honors Web file chunk size", () =>
     Effect.gen(function*() {
       const platform = yield* HttpPlatform.HttpPlatform
@@ -40,4 +131,18 @@ describe("HttpPlatform", () => {
       Effect.provide(HttpPlatform.layer),
       Effect.provideService(FileSystem.FileSystem, {} as any)
     ))
+
+  it.effect("keeps the source chunking by default", () =>
+    Effect.gen(function*() {
+      const platform = yield* HttpPlatform.HttpPlatform
+      const response = yield* platform.fileWebResponse(file)
+      assert.strictEqual(response.body._tag, "Stream")
+      if (response.body._tag === "Stream") {
+        const chunks = yield* Stream.runCollect(response.body.stream)
+        assert.deepStrictEqual(chunks.map((chunk) => Array.from(chunk)), [[1, 2, 3, 4]])
+      }
+    }).pipe(
+      Effect.provide(HttpPlatform.layer),
+      Effect.provideService(FileSystem.FileSystem, {} as any)
+    ))
 })
diff --git a/repos/effect/packages/effect/test/unstable/http/HttpRouter.test.ts b/repos/effect/packages/effect/test/unstable/http/HttpRouter.test.ts
new file mode 100644
index 000000000..1077dc33f
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/http/HttpRouter.test.ts
@@ -0,0 +1,89 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Effect, Layer, Option } from "effect"
+import { HttpRouter, type HttpServerRequest, HttpServerResponse } from "effect/unstable/http"
+
+const echoUrl = (request: HttpServerRequest.HttpServerRequest) => Effect.succeed(HttpServerResponse.text(request.url))
+
+const layerPrefixed = (prefix: string) =>
+  Layer.effect(
+    HttpRouter.HttpRouter,
+    Effect.map(HttpRouter.HttpRouter, (router) => router.prefixed(prefix))
+  )
+
+const fetchText = (app: Layer.Layer<never, never, HttpRouter.HttpRouter>, path: string) =>
+  Effect.acquireUseRelease(
+    Effect.sync(() => HttpRouter.toWebHandler(app, { disableLogger: true })),
+    ({ handler }) =>
+      Effect.promise(async () => {
+        const response = await handler(new Request(`http://localhost${path}`))
+        return await response.text()
+      }),
+    ({ dispose }) => Effect.promise(dispose)
+  )
+
+describe("HttpRouter", () => {
+  it("normalizes the prefix stored by prefixRoute", () => {
+    const route = HttpRouter.prefixRoute(
+      HttpRouter.route("GET", "/users", HttpServerResponse.text("ok")),
+      "/api/"
+    )
+
+    assert.deepStrictEqual(route.prefix, Option.some("/api"))
+  })
+
+  it("handles prefixed routes with toWebHandler", async () => {
+    const { dispose, handler } = HttpRouter.toWebHandler(
+      Effect.gen(function*() {
+        const router = yield* HttpRouter.HttpRouter
+        yield* router.prefixed("/api").add("GET", "/hello", HttpServerResponse.text("hi"))
+      }).pipe(Layer.effectDiscard)
+    )
+
+    try {
+      const response = await handler(new Request("http://localhost/api/hello"))
+      assert.strictEqual(response.status, 200)
+      assert.strictEqual(await response.text(), "hi")
+    } finally {
+      await dispose()
+    }
+  })
+
+  for (
+    const { prefix, requestUrl } of [
+      { prefix: "/", requestUrl: "/users" },
+      { prefix: "/api/", requestUrl: "/api/users" }
+    ]
+  ) {
+    it.effect(`preserves the local URL for the ${prefix} prefix`, () =>
+      Effect.gen(function*() {
+        const routes = HttpRouter.use((router) => router.prefixed(prefix).add("GET", "/users", echoUrl))
+
+        const body = yield* fetchText(routes, requestUrl)
+
+        assert.strictEqual(body, "/users")
+      }))
+  }
+
+  it.effect("nests a prefixed sub-router beneath a prefixed parent router", () =>
+    Effect.gen(function*() {
+      const routes = HttpRouter.use((router) => router.prefixed("/app").add("GET", "/users", echoUrl)).pipe(
+        Layer.provide(layerPrefixed("/api"))
+      )
+
+      const body = yield* fetchText(routes, "/api/app/users")
+
+      assert.strictEqual(body, "/users")
+    }))
+
+  it.effect("nests a prefixRoute prefix beneath a prefixed parent router", () =>
+    Effect.gen(function*() {
+      const users = HttpRouter.prefixRoute(HttpRouter.route("GET", "/users", echoUrl), "/app")
+      const routes = HttpRouter.use((router) => router.addAll([users])).pipe(
+        Layer.provide(layerPrefixed("/api"))
+      )
+
+      const body = yield* fetchText(routes, "/api/app/users")
+
+      assert.strictEqual(body, "/users")
+    }))
+})
diff --git a/repos/effect/packages/effect/test/unstable/http/HttpServer.test.ts b/repos/effect/packages/effect/test/unstable/http/HttpServer.test.ts
new file mode 100644
index 000000000..e8a115139
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/http/HttpServer.test.ts
@@ -0,0 +1,99 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Cause, Effect, Exit } from "effect"
+import * as HttpClient from "effect/unstable/http/HttpClient"
+import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse"
+import * as HttpServer from "effect/unstable/http/HttpServer"
+import * as NetAddress from "effect/unstable/net/NetAddress"
+
+describe("HttpServer", () => {
+  it("accepts a canonical socket address", () => {
+    const address = NetAddress.inetAddressUnsafe(NetAddress.ipv4Loopback, 8080)
+    const server = HttpServer.make({
+      address,
+      serve: () => Effect.void
+    })
+
+    assert.strictEqual(server.address, address)
+  })
+
+  it.effect("passes formatted server addresses to the callback", () =>
+    Effect.gen(function*() {
+      for (
+        const [input, expected] of [
+          ["127.0.0.1:3000", "http://127.0.0.1:3000"],
+          ["127.0.0.1:80", "http://127.0.0.1"],
+          ["[::]:3000", "http://[::]:3000"],
+          ["[::1]:3000", "http://[::1]:3000"],
+          ["[fe80::1%0]:3000", "http://[fe80::1]:3000"]
+        ]
+      ) {
+        const server = HttpServer.make({
+          address: NetAddress.inetAddressFromStringUnsafe(input),
+          serve: () => Effect.void
+        })
+        const formatted = yield* HttpServer.addressFormattedWith(Effect.succeed).pipe(
+          Effect.provideService(HttpServer.HttpServer, server)
+        )
+        assert.strictEqual(formatted, expected)
+        assert.doesNotThrow(() => new URL(formatted))
+      }
+      for (
+        const [path, expected] of [
+          ["server.sock", "unix://server.sock"],
+          ["/tmp/server.sock", "unix:///tmp/server.sock"],
+          ["./run/../socket?#", "unix://./run/../socket?#"]
+        ]
+      ) {
+        const server = HttpServer.make({ address: NetAddress.unixPathAddress(path), serve: () => Effect.void })
+        const formatted = yield* HttpServer.addressFormattedWith(Effect.succeed).pipe(
+          Effect.provideService(HttpServer.HttpServer, server)
+        )
+        assert.strictEqual(formatted, expected)
+      }
+    }))
+
+  it.effect("rejects scoped IPv6 test server addresses before dropping their scope", () =>
+    Effect.gen(function*() {
+      for (const input of ["[fe80::1%2]:3000", "[::%2]:3000"]) {
+        const address = NetAddress.inetAddressFromStringUnsafe(input)
+        const server = HttpServer.make({ address, serve: () => Effect.void })
+        const client = HttpClient.make(() => Effect.die("unexpected request"))
+        const exit = yield* HttpServer.makeTestClient.pipe(
+          Effect.provideService(HttpServer.HttpServer, server),
+          Effect.provideService(HttpClient.HttpClient, client),
+          Effect.exit
+        )
+        if (Exit.isSuccess(exit)) assert.fail("expected Failure")
+        const error = Cause.squash(exit.cause)
+        assert.instanceOf(error, NetAddress.NetAddressError)
+        assert.strictEqual((error as NetAddress.NetAddressError).input, address)
+      }
+    }))
+
+  it.effect("uses IPv4 loopback for unspecified listeners and preserves explicit hosts", () =>
+    Effect.gen(function*() {
+      for (
+        const [input, origin] of [
+          ["0.0.0.0:3000", "http://127.0.0.1:3000"],
+          ["[::]:3000", "http://127.0.0.1:3000"],
+          ["127.0.0.1:3000", "http://127.0.0.1:3000"],
+          ["[::1]:3000", "http://[::1]:3000"],
+          ["[2001:db8::1]:3000", "http://[2001:db8::1]:3000"]
+        ]
+      ) {
+        const server = HttpServer.make({
+          address: NetAddress.inetAddressFromStringUnsafe(input),
+          serve: () => Effect.void
+        })
+        const client = HttpClient.make((request, url) => {
+          assert.strictEqual(url.origin, origin)
+          return Effect.succeed(HttpClientResponse.fromWeb(request, new Response()))
+        })
+        const testClient = yield* HttpServer.makeTestClient.pipe(
+          Effect.provideService(HttpServer.HttpServer, server),
+          Effect.provideService(HttpClient.HttpClient, client)
+        )
+        yield* testClient.get("/")
+      }
+    }))
+})
diff --git a/repos/effect/packages/effect/test/unstable/http/HttpServerRequest.test.ts b/repos/effect/packages/effect/test/unstable/http/HttpServerRequest.test.ts
index 2f0191b86..4c2dc8144 100644
--- a/repos/effect/packages/effect/test/unstable/http/HttpServerRequest.test.ts
+++ b/repos/effect/packages/effect/test/unstable/http/HttpServerRequest.test.ts
@@ -199,17 +199,15 @@ describe("HttpServerRequest", () => {
       })
 
       const decoded = yield* HttpServerRequest.schemaBodyJson(schema, {
-        onExcessProperty: "preserve",
+        onExcessProperty: "ignore",
         reviver: (key, value) => key === "status" ? "revived" : value
       }).pipe(
         Effect.provideService(HttpServerRequest.HttpServerRequest, request)
       )
-      const decodedRecord = decoded as Record<string, unknown>
-
       assert.strictEqual(decoded.status, "revived")
       assert.strictEqual(decoded.name, "svc")
-      assert.strictEqual(decodedRecord.sha, "abc")
-      assert.strictEqual(decodedRecord.version, "1.0.0")
+      assert.isFalse("sha" in decoded)
+      assert.isFalse("version" in decoded)
     }))
 
   it("remoteAddress defaults to none for web requests", () => {
diff --git a/repos/effect/packages/effect/test/unstable/http/HttpServerRespondable.test.ts b/repos/effect/packages/effect/test/unstable/http/HttpServerRespondable.test.ts
new file mode 100644
index 000000000..1ff740f0b
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/http/HttpServerRespondable.test.ts
@@ -0,0 +1,22 @@
+import { describe, it } from "@effect/vitest"
+import { strictEqual } from "@effect/vitest/utils"
+import { Effect, Schema } from "effect"
+import { HttpServerRespondable, HttpServerResponse } from "effect/unstable/http"
+
+describe("HttpServerRespondable", () => {
+  it.effect("maps SchemaError to a 400 response", () =>
+    Effect.gen(function*() {
+      const error = yield* Effect.flip(Schema.decodeUnknownEffect(Schema.String)(123))
+      strictEqual(Schema.isSchemaError(error), true)
+      const fallback = HttpServerResponse.empty({ status: 500 })
+      const response = yield* HttpServerRespondable.toResponseOrElse(error, fallback)
+      strictEqual(response.status, 400)
+    }))
+
+  it.effect("falls back for other errors", () =>
+    Effect.gen(function*() {
+      const fallback = HttpServerResponse.empty({ status: 500 })
+      const response = yield* HttpServerRespondable.toResponseOrElse(new Error("boom"), fallback)
+      strictEqual(response, fallback)
+    }))
+})
diff --git a/repos/effect/packages/effect/test/unstable/http/HttpServerResponse.test.ts b/repos/effect/packages/effect/test/unstable/http/HttpServerResponse.test.ts
index 76105cef8..69559f53e 100644
--- a/repos/effect/packages/effect/test/unstable/http/HttpServerResponse.test.ts
+++ b/repos/effect/packages/effect/test/unstable/http/HttpServerResponse.test.ts
@@ -1,10 +1,143 @@
 import { assert, describe, it } from "@effect/vitest"
 import { Context, Effect, Stream } from "effect"
-import { HttpBody, HttpClientRequest, HttpClientResponse, HttpServerResponse } from "effect/unstable/http"
+import { Cookies, HttpBody, HttpClientRequest, HttpClientResponse, HttpServerResponse } from "effect/unstable/http"
 
 const TestValue = Context.Reference<number>("test/TestValue", { defaultValue: () => 0 })
 
 describe("HttpServerResponse", () => {
+  describe("toWeb", () => {
+    it.each([
+      { status: 204, withoutBody: false },
+      { status: 205, withoutBody: false },
+      { status: 304, withoutBody: true }
+    ])(
+      "prefers outer status $status and merges raw Response headers with withoutBody=$withoutBody",
+      ({ status, withoutBody }) => {
+        const nativeCookies = ["sid=abc; Path=/; HttpOnly", "theme=dark; Path=/"]
+        const native = new Response("cached body", {
+          status: 200,
+          statusText: "Native status",
+          headers: [
+            ["etag", "\"version-1\""],
+            ["x-shared", "native"],
+            ...nativeCookies.map((cookie): [string, string] => ["set-cookie", cookie])
+          ]
+        })
+        const web = HttpServerResponse.toWeb(
+          HttpServerResponse.raw(native, {
+            status,
+            statusText: "Outer status",
+            headers: { "x-outer": "outer", "x-shared": "outer" },
+            cookies: Cookies.setAllUnsafe(Cookies.empty, [["a", "1", {}], ["b", "2", {}]])
+          }),
+          { withoutBody }
+        )
+
+        assert.strictEqual(web.status, status)
+        assert.strictEqual(web.statusText, "Outer status")
+        assert.strictEqual(web.body, null)
+        assert.strictEqual(web.headers.get("etag"), "\"version-1\"")
+        assert.strictEqual(web.headers.get("x-outer"), "outer")
+        assert.strictEqual(web.headers.get("x-shared"), "outer")
+        assert.deepStrictEqual(web.headers.getSetCookie(), [...nativeCookies, "a=1", "b=2"])
+      }
+    )
+
+    it("preserves raw Response metadata for HEAD", () => {
+      const native = new Response("body", {
+        status: 202,
+        statusText: "Accepted by upstream",
+        headers: { "x-probe": "native", "set-cookie": "sid=abc" }
+      })
+      const web = HttpServerResponse.toWeb(
+        HttpServerResponse.raw(native, { status: 200, statusText: "Outer status" }),
+        { withoutBody: true }
+      )
+
+      assert.strictEqual(web.body, null)
+      assert.strictEqual(web.status, 202)
+      assert.strictEqual(web.statusText, "Accepted by upstream")
+      assert.strictEqual(web.headers.get("x-probe"), "native")
+      assert.deepStrictEqual(web.headers.getSetCookie(), ["sid=abc"])
+    })
+
+    it("returns the raw Response with merged headers for GET", async () => {
+      const native = new Response("body", {
+        status: 202,
+        statusText: "Accepted by upstream",
+        headers: { "x-probe": "native", "x-shared": "native", "set-cookie": "sid=abc; Path=/; HttpOnly" }
+      })
+      const web = HttpServerResponse.toWeb(
+        HttpServerResponse.raw(native, {
+          headers: { "x-outer": "outer", "x-shared": "outer" },
+          cookies: Cookies.setAllUnsafe(Cookies.empty, [["a", "1", {}], ["b", "2", {}]])
+        })
+      )
+
+      assert.strictEqual(web, native)
+      assert.strictEqual(web.status, 202)
+      assert.strictEqual(web.statusText, "Accepted by upstream")
+      assert.strictEqual(web.headers.get("x-probe"), "native")
+      assert.strictEqual(web.headers.get("x-outer"), "outer")
+      assert.strictEqual(web.headers.get("x-shared"), "outer")
+      assert.deepStrictEqual(web.headers.getSetCookie(), ["sid=abc; Path=/; HttpOnly", "a=1", "b=2"])
+      assert.strictEqual(await web.text(), "body")
+    })
+
+    it.each([
+      { status: 200, withoutBody: true },
+      { status: 304, withoutBody: false }
+    ])(
+      "preserves representation headers for status $status with withoutBody=$withoutBody",
+      ({ status, withoutBody }) => {
+        const web = HttpServerResponse.toWeb(HttpServerResponse.text("body", { status }), { withoutBody })
+
+        assert.strictEqual(web.body, null)
+        assert.strictEqual(web.headers.get("content-length"), "4")
+        assert.strictEqual(web.headers.get("content-type"), "text/plain")
+      }
+    )
+
+    it.each([
+      { status: 200, withoutBody: true },
+      { status: 204, withoutBody: false },
+      { status: 205, withoutBody: false },
+      { status: 304, withoutBody: false }
+    ])("cancels raw streams for status $status with withoutBody=$withoutBody", async ({ status, withoutBody }) => {
+      let cancelled = false
+      const body = new ReadableStream({
+        cancel() {
+          cancelled = true
+        }
+      })
+      try {
+        const web = HttpServerResponse.toWeb(HttpServerResponse.raw(body, { status }), { withoutBody })
+
+        assert.strictEqual(web.status, status)
+        assert.strictEqual(web.body, null)
+        assert.strictEqual(await web.text(), "")
+        assert.strictEqual(cancelled, true)
+      } finally {
+        await body.cancel()
+      }
+    })
+
+    for (const status of [204, 205, 304]) {
+      it.each([
+        { name: "text", response: HttpServerResponse.text("body", { status }) },
+        { name: "uint8Array", response: HttpServerResponse.uint8Array(new Uint8Array([1]), { status }) },
+        { name: "raw", response: HttpServerResponse.raw("body", { status }) },
+        { name: "formData", response: HttpServerResponse.formData(new FormData(), { status }) },
+        { name: "stream", response: HttpServerResponse.stream(Stream.succeed(new Uint8Array([1])), { status }) }
+      ])(`omits $name bodies for status ${status}`, ({ response }) => {
+        const web = HttpServerResponse.toWeb(response)
+
+        assert.strictEqual(web.status, status)
+        assert.strictEqual(web.body, null)
+      })
+    }
+  })
+
   it("setHeader overrides body-derived content headers", () => {
     const response = HttpServerResponse.text("body").pipe(
       HttpServerResponse.setHeader("content-type", "text/custom"),
@@ -15,9 +148,44 @@ describe("HttpServerResponse", () => {
     assert.strictEqual(response.headers["content-length"], "1")
   })
 
+  it.effect("fromWeb preserves content-length through a Web round trip", () =>
+    Effect.gen(function*() {
+      const response = HttpServerResponse.fromWeb(
+        new Response("hello", { headers: { "content-length": "5" } })
+      )
+      const roundTrip = HttpServerResponse.toWeb(response)
+
+      assert.strictEqual(yield* Effect.promise(() => roundTrip.text()), "hello")
+      assert.strictEqual(roundTrip.headers.get("content-length"), "5")
+    }))
+
+  describe("toClientResponse", () => {
+    it.effect("supports repeated reads of raw Web Response bodies", () =>
+      Effect.gen(function*() {
+        const clientResponse = HttpServerResponse.toClientResponse(
+          HttpServerResponse.raw(new Response("hello"))
+        )
+
+        assert.strictEqual(yield* clientResponse.text, "hello")
+        assert.strictEqual(yield* clientResponse.text, "hello")
+        assert.deepStrictEqual(new Uint8Array(yield* clientResponse.arrayBuffer), new TextEncoder().encode("hello"))
+      }))
+
+    it.effect("leaves the raw Web Response servable after a client-body read", () =>
+      Effect.gen(function*() {
+        const response = HttpServerResponse.raw(new Response("hello"))
+
+        assert.strictEqual(yield* HttpServerResponse.toClientResponse(response).text, "hello")
+        assert.strictEqual(yield* Effect.promise(() => HttpServerResponse.toWeb(response).text()), "hello")
+      }))
+  })
+
   it.effect("fromClientResponse preserves status, headers, cookies, and json", () =>
     Effect.gen(function*() {
-      const request = HttpClientRequest.get("http://localhost:3000/todos/1")
+      const request = HttpClientRequest.get("http://localhost:3000/todos/1?existing=1", {
+        urlParams: { value: "a#b" },
+        hash: "fragment"
+      })
       const clientResponse = HttpServerResponse.toClientResponse(
         HttpServerResponse.jsonUnsafe({ foo: "bar" }, { status: 201 }).pipe(
           HttpServerResponse.setHeader("x-test", "ok"),
@@ -29,6 +197,8 @@ describe("HttpServerResponse", () => {
       const response = HttpServerResponse.fromClientResponse(clientResponse)
       const roundTrip = HttpServerResponse.toClientResponse(response, { request })
 
+      assert.strictEqual(clientResponse.url, "http://localhost:3000/todos/1?existing=1&value=a%23b")
+      assert.strictEqual(roundTrip.url, clientResponse.url)
       assert.strictEqual(response.status, 201)
       assert.strictEqual(response.headers["content-type"], "application/json")
       assert.strictEqual(response.headers["x-test"], "ok")
@@ -50,6 +220,7 @@ describe("HttpServerResponse", () => {
 
       const response = HttpServerResponse.fromClientResponse(clientResponse)
       const roundTrip = HttpServerResponse.toClientResponse(response)
+      assert.strictEqual(roundTrip.url, "")
       const text = yield* roundTrip.text.pipe(
         Effect.provideService(TestValue, 420)
       )
diff --git a/repos/effect/packages/effect/test/unstable/http/HttpStaticServer.test.ts b/repos/effect/packages/effect/test/unstable/http/HttpStaticServer.test.ts
new file mode 100644
index 000000000..554bab2c8
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/http/HttpStaticServer.test.ts
@@ -0,0 +1,138 @@
+import { assert, describe, it } from "@effect/vitest"
+import * as ByteSize from "effect/ByteSize"
+import * as Effect from "effect/Effect"
+import * as FileSystem from "effect/FileSystem"
+import * as Layer from "effect/Layer"
+import * as Option from "effect/Option"
+import * as Path from "effect/Path"
+import * as Stream from "effect/Stream"
+import { HttpEffect, HttpPlatform, HttpServerRequest, HttpServerResponse, HttpStaticServer } from "effect/unstable/http"
+
+const services = Layer.mergeAll(
+  Path.layer,
+  FileSystem.layerNoop({
+    stat: () => Effect.succeed({ type: "File", size: ByteSize.bytes(10) } as FileSystem.File.Info)
+  }),
+  Layer.succeed(
+    HttpPlatform.HttpPlatform,
+    HttpPlatform.HttpPlatform.of({
+      platform: "web",
+      compression: { algorithms: new Set(), compressResponse: Effect.succeed },
+      fileResponse: () => Effect.succeed(HttpServerResponse.text("0123456789")),
+      fileWebResponse: () => Effect.die("unused")
+    })
+  )
+)
+
+describe("HttpStaticServer", () => {
+  it.effect("preserves the JavaScript MIME type through toWebHandler", () => {
+    const fileSystem = FileSystem.layerNoop({
+      stat: () =>
+        Effect.succeed({
+          type: "File",
+          size: ByteSize.zero,
+          mtime: Option.none()
+        } as FileSystem.File.Info),
+      stream: () => Stream.empty
+    })
+    const layer = Layer.mergeAll(
+      Path.layer,
+      fileSystem,
+      HttpPlatform.layer.pipe(Layer.provide(fileSystem))
+    )
+    return Effect.gen(function*() {
+      const app = yield* HttpStaticServer.make({ root: "/root" })
+      const response = yield* Effect.promise(() =>
+        HttpEffect.toWebHandler(app)(new Request("http://localhost/script.js"))
+      )
+      yield* Effect.promise(() => response.arrayBuffer())
+
+      assert.strictEqual(response.headers.get("content-type"), "text/javascript; charset=utf-8")
+    }).pipe(Effect.provide(layer))
+  })
+
+  it.effect("ignores Range on HEAD requests", () =>
+    Effect.gen(function*() {
+      const app = yield* HttpStaticServer.make({ root: "/root" })
+      const response = yield* Effect.promise(() =>
+        HttpEffect.toWebHandler(app)(
+          new Request("http://localhost/file.txt", {
+            method: "HEAD",
+            headers: { Range: "bytes=20-24" }
+          })
+        )
+      )
+
+      assert.strictEqual(response.status, 200)
+      assert.strictEqual(response.headers.get("content-length"), "10")
+      assert.strictEqual(response.headers.get("content-range"), null)
+    }).pipe(Effect.provide(services)))
+})
+
+type FileOptions = Parameters<HttpPlatform.HttpPlatform["Service"]["fileResponse"]>[1]
+
+const precisionServices = (size: bigint, calls: Array<{ path: string; options: FileOptions }>) =>
+  Layer.mergeAll(
+    Path.layer,
+    FileSystem.layerNoop({
+      stat: (path) =>
+        Effect.succeed({
+          type: path === "/root/directory" ? "Directory" : "File",
+          size: ByteSize.bytes(size)
+        } as FileSystem.File.Info)
+    }),
+    Layer.succeed(
+      HttpPlatform.HttpPlatform,
+      HttpPlatform.HttpPlatform.of({
+        platform: "web",
+        compression: { algorithms: new Set(), compressResponse: Effect.succeed },
+        fileResponse: (path, options) => {
+          calls.push({ path, options })
+          return Effect.succeed(HttpServerResponse.empty({ status: options?.status ?? 200 }))
+        },
+        fileWebResponse: () => Effect.die("unused")
+      })
+    )
+  )
+
+describe("HttpStaticServer precision", () => {
+  const size = 9007199254740993n
+  for (
+    const [url, range, start, end] of [
+      ["/file.bin", "bytes=0-0", 0n, 0n],
+      ["/file.bin", "bytes=-2", size - 2n, size - 1n],
+      ["/directory", "bytes=1-", 1n, size - 1n]
+    ] as const
+  ) {
+    it.effect(`preserves ${range} and the exact total for ${url}`, () => {
+      const calls: Array<{ path: string; options: FileOptions }> = []
+      return Effect.gen(function*() {
+        const app = yield* HttpStaticServer.make({ root: "/root" })
+        const response = yield* app.pipe(Effect.provideService(
+          HttpServerRequest.HttpServerRequest,
+          HttpServerRequest.fromWeb(new Request(`http://localhost${url}`, { headers: { Range: range } }))
+        ))
+        assert.strictEqual(response.status, 206)
+        assert.strictEqual(response.headers["content-range"], `bytes ${start}-${end}/${size}`)
+        assert.deepStrictEqual(calls, [{
+          path: url === "/directory" ? "/root/directory/index.html" : "/root/file.bin",
+          options: { status: 206, offset: start, bytesToRead: end - start + 1n }
+        }])
+      }).pipe(Effect.provide(precisionServices(size, calls)))
+    })
+  }
+
+  it.effect("preserves the exact total in a 416 response", () => {
+    const calls: Array<{ path: string; options: FileOptions }> = []
+    return Effect.gen(function*() {
+      const app = yield* HttpStaticServer.make({ root: "/root" })
+      const response = yield* app.pipe(Effect.provideService(
+        HttpServerRequest.HttpServerRequest,
+        HttpServerRequest.fromWeb(new Request("http://localhost/file.bin", { headers: { Range: "bytes=-0" } }))
+      ))
+      assert.strictEqual(response.status, 416)
+      assert.strictEqual(response.headers["content-range"], `bytes */${size}`)
+      assert.deepStrictEqual(calls, [])
+    }).pipe(Effect.provide(precisionServices(size, calls)))
+  })
+})
diff --git a/repos/effect/packages/effect/test/unstable/http/Mime.test.ts b/repos/effect/packages/effect/test/unstable/http/Mime.test.ts
index 5f1c5fef4..ee4ab253c 100644
--- a/repos/effect/packages/effect/test/unstable/http/Mime.test.ts
+++ b/repos/effect/packages/effect/test/unstable/http/Mime.test.ts
@@ -32,5 +32,9 @@ describe("Mime", () => {
   it("exposes reverse lookups at the module level", () => {
     assert.deepStrictEqual(Mime.getExtension("text/html; charset=utf-8"), Option.some("html"))
     assert.deepStrictEqual(Mime.getAllExtensions("text/html"), Option.some(new Set(["html", "htm", "shtml"])))
+    assert.deepStrictEqual(
+      Mime.getAllExtensions("text/html; charset=utf-8"),
+      Option.some(new Set(["html", "htm", "shtml"]))
+    )
   })
 })
diff --git a/repos/effect/packages/effect/test/unstable/http/Multipart.test.ts b/repos/effect/packages/effect/test/unstable/http/Multipart.test.ts
index 50c0f979d..b8965d120 100644
--- a/repos/effect/packages/effect/test/unstable/http/Multipart.test.ts
+++ b/repos/effect/packages/effect/test/unstable/http/Multipart.test.ts
@@ -1,5 +1,5 @@
 import { describe, it } from "@effect/vitest"
-import { Effect, ErrorReporter, FileSystem, identity, Path, Schema, Stream, Unify } from "effect"
+import { ByteSize, Effect, ErrorReporter, FileSystem, identity, Path, Schema, Sink, Stream, Unify } from "effect"
 import {
   HttpClientRequest,
   HttpIncomingMessage,
@@ -20,13 +20,14 @@ describe("Multipart", () => {
       deepStrictEqual(decoded, { value: "revived" })
     }))
 
-  it.effect("parses fields and streams file content", () =>
+  it.effect("parses fields and streams file content as stream parts", () =>
     Effect.gen(function*() {
       const data = new globalThis.FormData()
       data.append("foo", "bar")
       data.append("test", "ing")
       data.append("file", new globalThis.File(["A".repeat(1024 * 1024)], "foo.txt", { type: "text/plain" }))
       const response = new Response(data)
+      const streamed: Array<Multipart.Part> = []
 
       const parts = yield* Stream.fromReadableStream({
         evaluate: () => response.body!,
@@ -34,6 +35,7 @@ describe("Multipart", () => {
       }).pipe(
         Stream.pipeThroughChannel(Multipart.makeChannel(Object.fromEntries(response.headers))),
         Stream.mapEffect((part) => {
+          streamed.push(part)
           return Unify.unify(
             part._tag === "File" ?
               Effect.zip(
@@ -51,6 +53,10 @@ describe("Multipart", () => {
         ["test", "ing"],
         ["foo.txt", "A".repeat(1024 * 1024)]
       ])
+      deepStrictEqual(
+        streamed.map((part) => [Multipart.isPart(part), Multipart.isStreamPart(part)]),
+        [[true, true], [true, true], [true, true]]
+      )
     }))
 
   it.effect("collects file content across pulls and a split trailing boundary", () =>
@@ -189,7 +195,7 @@ describe("Multipart", () => {
           return Stream.runDrain(part.content)
         }),
         Stream.runDrain,
-        Effect.provideService(Multipart.MaxFileSize, 256),
+        Effect.provideService(Multipart.MaxFileSize, ByteSize.bytes(256)),
         Effect.flip
       )
 
@@ -225,7 +231,7 @@ describe("Multipart", () => {
           return Stream.runDrain(part.content)
         }),
         Stream.runDrain,
-        Effect.provideService(HttpIncomingMessage.MaxBodySize, FileSystem.Size(256)),
+        Effect.provideService(HttpIncomingMessage.MaxBodySize, ByteSize.bytes(256)),
         Effect.flip
       )
 
@@ -234,6 +240,84 @@ describe("Multipart", () => {
       strictEqual(error.reason._tag, "BodyTooLarge")
     }))
 
+  const activeFileParts = (error: Multipart.MultipartError) =>
+    Stream.make(
+      new TextEncoder().encode(
+        "--b\r\nContent-Disposition: form-data; name=\"file\"; filename=\"a.txt\"\r\n\r\nhello"
+      )
+    ).pipe(
+      Stream.concat(Stream.fail(error)),
+      Stream.pipeThroughChannel(Multipart.makeChannel({ "content-type": "multipart/form-data; boundary=b" }))
+    )
+
+  it.live("propagates upstream failure while consuming an active file", () =>
+    Effect.gen(function*() {
+      const upstreamError = Multipart.MultipartError.fromReason("InternalError", new Error("body-read-failed"))
+      let bytesRead = 0
+
+      const error = yield* activeFileParts(upstreamError).pipe(
+        Stream.runForEach((part) =>
+          part._tag === "File"
+            ? Stream.runForEach(part.content, (chunk) =>
+              Effect.sync(() => {
+                bytesRead += chunk.length
+              })).pipe(Effect.flatMap(() => Effect.die("content should have failed")))
+            : Effect.die("expected file")
+        ),
+        Effect.timeout("1 second"),
+        Effect.flip
+      )
+
+      strictEqual(bytesRead, 5)
+      strictEqual(error, upstreamError)
+    }))
+
+  it.live("preserves upstream failure when collecting an active file with contentEffect", () =>
+    Effect.gen(function*() {
+      const upstreamError = Multipart.MultipartError.fromReason("InternalError", new Error("body-read-failed"))
+
+      const error = yield* activeFileParts(upstreamError).pipe(
+        Stream.runForEach((part) =>
+          part._tag === "File"
+            ? Effect.flatMap(part.contentEffect, () => Effect.die("contentEffect should have failed"))
+            : Effect.die("expected file")
+        ),
+        Effect.timeout("1 second"),
+        Effect.flip
+      )
+
+      strictEqual(error, upstreamError)
+    }))
+
+  it.live("preserves the upstream error cause when persisting an active file", () =>
+    Effect.gen(function*() {
+      const upstreamError = Multipart.MultipartError.fromReason("InternalError", new Error("body-read-failed"))
+      let bytesWritten = 0
+
+      const error = yield* activeFileParts(upstreamError).pipe(
+        Multipart.toPersisted,
+        Effect.provideService(
+          FileSystem.FileSystem,
+          FileSystem.makeNoop({
+            makeTempDirectoryScoped: () => Effect.succeed("/tmp/multipart-test"),
+            sink: () =>
+              Sink.forEach((chunk: Uint8Array) =>
+                Effect.sync(() => {
+                  bytesWritten += chunk.length
+                })
+              )
+          })
+        ),
+        Effect.provide(Path.layer),
+        Effect.scoped,
+        Effect.timeout("1 second"),
+        Effect.flip
+      )
+
+      strictEqual(bytesWritten, 5)
+      strictEqual(error, upstreamError)
+    }))
+
   it.effect("propagates Parse when the body ends mid-file", () =>
     Effect.gen(function*() {
       const boundary = "----testboundary"
@@ -271,8 +355,8 @@ describe("Multipart", () => {
     description: string
     options: {
       readonly maxParts?: number
-      readonly maxFieldSize?: number
-      readonly maxPartSize?: number
+      readonly maxFieldSize?: ByteSize.Input
+      readonly maxPartSize?: ByteSize.Input
     }
     limit: "MaxParts" | "MaxFieldSize" | "MaxPartSize"
     expectedFields: Array<string>
@@ -285,13 +369,13 @@ describe("Multipart", () => {
     },
     {
       description: "maxFieldSize",
-      options: { maxFieldSize: 1 },
+      options: { maxFieldSize: "1 B" },
       limit: "MaxFieldSize",
       expectedFields: []
     },
     {
       description: "maxPartSize",
-      options: { maxPartSize: 1 },
+      options: { maxPartSize: ByteSize.bytes(1) },
       limit: "MaxPartSize",
       expectedFields: []
     }
@@ -330,6 +414,9 @@ describe("Multipart", () => {
     let done = false
     const parser = MultipartParser.make({
       headers: { "content-type": `multipart/form-data; boundary=${boundary}` },
+      maxTotalSize: Infinity,
+      maxPartSize: Infinity,
+      maxFieldSize: Infinity,
       onField(info, value) {
         fields.push([info.name, decoder.decode(value)])
       },
@@ -352,7 +439,7 @@ describe("Multipart", () => {
     deepStrictEqual(errors, [])
   })
 
-  it.effect("returns distinct persisted file paths for files with the same client filename", () =>
+  it.effect("returns distinct persisted file paths as non-stream parts", () =>
     Effect.gen(function*() {
       const formData = new FormData()
       formData.append("first", new File(["one"], "same.txt"))
@@ -375,6 +462,9 @@ describe("Multipart", () => {
       )
       const first = (persisted.first as Array<Multipart.PersistedFile>)[0]
       const second = (persisted.second as Array<Multipart.PersistedFile>)[0]
+      strictEqual(Multipart.isPersistedFile(first), true)
+      strictEqual(Multipart.isPart(first), true)
+      strictEqual(Multipart.isStreamPart(first), false)
       strictEqual(first.path, "/tmp/audit/same.txt")
       notStrictEqual(first.path, second.path)
       deepStrictEqual(writes, [first.path, second.path])
@@ -423,7 +513,7 @@ describe("Multipart", () => {
             }
           },
           "required": ["key", "name", "contentType", "path"],
-          "additionalProperties": false
+          "additionalProperties": true
         },
         definitions: {}
       })
diff --git a/repos/effect/packages/effect/test/unstable/http/SchemaRepresentation.test.ts b/repos/effect/packages/effect/test/unstable/http/SchemaRepresentation.test.ts
index 089fcf8e8..f2bca1229 100644
--- a/repos/effect/packages/effect/test/unstable/http/SchemaRepresentation.test.ts
+++ b/repos/effect/packages/effect/test/unstable/http/SchemaRepresentation.test.ts
@@ -1,14 +1,13 @@
 import { assert, describe, it } from "@effect/vitest"
-import { SchemaRepresentation } from "effect"
-import { Cookies, Headers, UrlParams } from "effect/unstable/http"
+import { Schema, SchemaRepresentation } from "effect"
 
 describe("HTTP schema representations", () => {
   it("generates code for declaration schemas", () => {
     const document = SchemaRepresentation.toRepresentations([
-      Headers.HeadersSchema.ast,
-      Cookies.CookiesSchema.ast,
-      Cookies.CookieSchema.ast,
-      UrlParams.UrlParamsSchema.ast
+      Schema.Headers.ast,
+      Schema.Cookies.ast,
+      Schema.Cookie.ast,
+      Schema.UrlParams.ast
     ])
 
     assert.deepStrictEqual(
@@ -26,10 +25,10 @@ describe("HTTP schema representations", () => {
     const output = SchemaRepresentation.toCodeDocument(document)
 
     assert.deepStrictEqual(output.codes, [
-      { runtime: `Headers.HeadersSchema.annotate({ "expected": "Headers" })`, Type: "Headers.Headers" },
-      { runtime: `Cookies.CookiesSchema.annotate({ "expected": "Cookies" })`, Type: "Cookies.Cookies" },
-      { runtime: `Cookies.CookieSchema.annotate({ "expected": "Cookie" })`, Type: "Cookies.Cookie" },
-      { runtime: `UrlParams.UrlParamsSchema.annotate({ "expected": "UrlParams" })`, Type: "UrlParams.UrlParams" }
+      { runtime: `Schema.Headers.annotate({ "expected": "Headers" })`, Type: "Headers.Headers" },
+      { runtime: `Schema.Cookies.annotate({ "expected": "Cookies" })`, Type: "Cookies.Cookies" },
+      { runtime: `Schema.Cookie.annotate({ "expected": "Cookie" })`, Type: "Cookies.Cookie" },
+      { runtime: `Schema.UrlParams.annotate({ "expected": "UrlParams" })`, Type: "UrlParams.UrlParams" }
     ])
     assert.deepStrictEqual(output.artifacts, [
       {
diff --git a/repos/effect/packages/effect/test/unstable/http/UrlParams.test.ts b/repos/effect/packages/effect/test/unstable/http/UrlParams.test.ts
index ef321780a..f016c0af2 100644
--- a/repos/effect/packages/effect/test/unstable/http/UrlParams.test.ts
+++ b/repos/effect/packages/effect/test/unstable/http/UrlParams.test.ts
@@ -1,13 +1,31 @@
-import { describe, it } from "@effect/vitest"
+import { assert, describe, it } from "@effect/vitest"
 import { assertNone, assertSome, deepStrictEqual } from "@effect/vitest/utils"
 import { Schema } from "effect"
 import { UrlParams } from "effect/unstable/http"
 import { assertSuccess } from "../../utils/assert.ts"
 
 describe("UrlParams", () => {
-  describe("UrlParamsSchema", () => {
+  describe("fromInput", () => {
+    it("coerces null to a string", () => {
+      deepStrictEqual(UrlParams.fromInput({ filter: null }).params, [["filter", "null"]])
+    })
+  })
+
+  describe("setAll", () => {
+    it("does not retain parameters when reusing UrlParams overrides", () => {
+      const overrides = UrlParams.fromInput({ sort: "name" })
+
+      UrlParams.setAll(UrlParams.fromInput({ page: 1 }), overrides)
+      assert.strictEqual(
+        UrlParams.toString(UrlParams.setAll(UrlParams.fromInput({ page: 2 }), overrides)),
+        "sort=name&page=2"
+      )
+    })
+  })
+
+  describe("Schema.UrlParams", () => {
     it("round-trips ordered pairs with the serializer annotation", () => {
-      const iso = Schema.toIso(UrlParams.UrlParamsSchema)
+      const iso = Schema.toIso(Schema.UrlParams)
       const params = UrlParams.make([["a", "1"], ["b", "2"]])
       assertSuccess(iso.getResult(params), [["a", "1"], ["b", "2"]])
       assertSuccess(iso.replaceResult([["a", "1"], ["b", "3"]], params), UrlParams.make([["a", "1"], ["b", "3"]]))
@@ -28,8 +46,8 @@ describe("UrlParams", () => {
     assertNone(UrlParams.getLast(params, "bar"))
   })
 
-  it("schemaJsonField applies a JSON reviver", () => {
-    const schema = UrlParams.schemaJsonField("json", {
+  it("JsonFromUrlParamsField applies a JSON reviver", () => {
+    const schema = Schema.JsonFromUrlParamsField("json", {
       reviver: (key, value) => key === "value" ? "revived" : value
     }).pipe(Schema.decodeTo(Schema.Struct({ value: Schema.String })))
 
@@ -38,4 +56,17 @@ describe("UrlParams", () => {
       { value: "revived" }
     )
   })
+
+  it("RecordFromUrlParams preserves single and repeated values", () => {
+    const params = UrlParams.make([["a", "1"], ["a", "2"], ["b", "3"]])
+
+    deepStrictEqual(Schema.decodeSync(Schema.RecordFromUrlParams)(params), {
+      a: ["1", "2"],
+      b: "3"
+    })
+    deepStrictEqual(
+      Schema.encodeSync(Schema.RecordFromUrlParams)({ a: ["1", "2"], b: "3" }),
+      params
+    )
+  })
 })
diff --git a/repos/effect/packages/effect/test/unstable/httpapi/HttpApiBuilder.test.ts b/repos/effect/packages/effect/test/unstable/httpapi/HttpApiBuilder.test.ts
index e07d64445..1ed68c322 100644
--- a/repos/effect/packages/effect/test/unstable/httpapi/HttpApiBuilder.test.ts
+++ b/repos/effect/packages/effect/test/unstable/httpapi/HttpApiBuilder.test.ts
@@ -11,11 +11,12 @@ import {
   SchemaTransformation,
   Stream
 } from "effect"
-import { Etag, HttpPlatform } from "effect/unstable/http"
+import { Etag, HttpEffect, HttpPlatform, HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/unstable/http"
 import {
   HttpApi,
   HttpApiBuilder,
   HttpApiEndpoint,
+  HttpApiError,
   HttpApiGroup,
   HttpApiMiddleware,
   HttpApiSchema,
@@ -33,6 +34,222 @@ const TestServices = Layer.mergeAll(
   HttpPlatform.layer
 ).pipe(Layer.provideMerge(FileSystem.layerNoop({})))
 
+it.layer(TestServices)("HttpApiBuilder ParseOptions", (it) => {
+  const Fields = { firstName: Schema.String, lastName: Schema.String }
+  const Person = Schema.Struct(Fields)
+
+  it.effect("strict SSE encoding rejects excess properties in user event data", () =>
+    Effect.gen(function*() {
+      const api = HttpApi.make("Api").add(
+        HttpApiGroup.make("test").add(HttpApiEndpoint.get("events", "/events", {
+          success: HttpApiSchema.StreamSse({ data: Person, error: StreamError })
+        }))
+      ).annotate(HttpApi.ParseOptions, { onExcessProperty: "error" })
+      const GroupLayer = HttpApiBuilder.group(api, "test", (handlers) =>
+        handlers.handle("events", () =>
+          Effect.succeed(Stream.make({ firstName: "Ada", lastName: "Lovelace", extra: true }))))
+      const client = yield* HttpApiTest.groups(api, ["test"]).pipe(Effect.provide(GroupLayer))
+      const response = yield* client.test.events({ responseMode: "response-only" })
+      const text = yield* response.text
+      assert.isTrue(text.startsWith("event: effect/httpapi/stream/failure\ndata: "))
+      const data = text.split("\n")[1]!.slice("data: ".length)
+      const FailureSchema = Schema.fromJsonString(Schema.toCodecJson(Schema.Cause(StreamError, Schema.Defect())))
+      const cause = yield* Schema.decodeUnknownEffect(FailureSchema)(data)
+      const error = Cause.squash(cause)
+      assert.instanceOf(error, Error)
+      assert.include(error.message, "Expected no excess property")
+      assert.include(error.message, "[\"data\"][\"extra\"]")
+    }))
+
+  it.effect("SSE encoding aggregates all user data issues in the reserved failure event", () =>
+    Effect.gen(function*() {
+      const api = HttpApi.make("Api").add(
+        HttpApiGroup.make("test").add(HttpApiEndpoint.get("events", "/events", {
+          success: HttpApiSchema.StreamSse({ data: Person, error: StreamError })
+        }))
+      ).annotate(HttpApi.ParseOptions, { errors: "all" })
+      const GroupLayer = HttpApiBuilder.group(api, "test", (handlers) =>
+        handlers.handle("events", () =>
+          Effect.succeed(Stream.make({} as typeof Person.Type))))
+      const client = yield* HttpApiTest.groups(api, ["test"]).pipe(Effect.provide(GroupLayer))
+      const response = yield* client.test.events({ responseMode: "response-only" })
+      const text = yield* response.text
+      assert.isTrue(text.startsWith("event: effect/httpapi/stream/failure\ndata: "))
+      const data = text.split("\n")[1]!.slice("data: ".length)
+      const FailureSchema = Schema.fromJsonString(Schema.toCodecJson(Schema.Cause(StreamError, Schema.Defect())))
+      const cause = yield* Schema.decodeUnknownEffect(FailureSchema)(data)
+      const error = Cause.squash(cause)
+      assert.instanceOf(error, Error)
+      assert.include(error.message, "firstName")
+      assert.include(error.message, "lastName")
+    }))
+
+  const Create = HttpApiEndpoint.post("create", "/users", { payload: Person })
+  const Api = HttpApi.make("Api").add(HttpApiGroup.make("users").add(Create))
+  const payloadError = Effect.fnUntraced(function*(api: typeof Api, payload: unknown = {}) {
+    const handler = yield* HttpRouter.toHttpEffect(
+      HttpApiBuilder.layer(api).pipe(
+        Layer.provide(HttpApiBuilder.group(api, "users", (handlers) => handlers.handle("create", () => Effect.void)))
+      )
+    )
+    const exit = yield* handler.pipe(
+      Effect.provideService(
+        HttpServerRequest.HttpServerRequest,
+        HttpServerRequest.fromWeb(
+          new Request("http://localhost/users", {
+            method: "POST",
+            headers: { "content-type": "application/json" },
+            body: JSON.stringify(payload)
+          })
+        )
+      ),
+      Effect.exit
+    )
+    assert.strictEqual(exit._tag, "Failure")
+    if (exit._tag === "Success") throw new Error("Expected payload decoding to fail")
+    const error = Cause.squash(exit.cause)
+    assert.ok(HttpApiError.HttpApiSchemaError.is(error))
+    assert.strictEqual(error.kind, "Payload")
+    return error.cause.message
+  })
+
+  it.effect("POST payload decoding collects all issues from API options", () =>
+    Effect.gen(function*() {
+      const message = yield* payloadError(Api.annotate(HttpApi.ParseOptions, { errors: "all" }))
+      assert.include(message, "firstName")
+      assert.include(message, "lastName")
+    }))
+
+  it.effect("POST payload decoding defaults to the first issue", () =>
+    Effect.gen(function*() {
+      const message = yield* payloadError(Api)
+      assert.include(message, "firstName")
+      assert.notInclude(message, "lastName")
+    }))
+
+  it.effect("endpoint options replace the whole API value", () =>
+    Effect.gen(function*() {
+      const api = HttpApi.make("Api").add(
+        HttpApiGroup.make("users").add(
+          Create.annotate(HttpApi.ParseOptions, { onExcessProperty: "error" })
+        )
+      ).annotate(HttpApi.ParseOptions, { errors: "all" })
+      const message = yield* payloadError(api)
+      assert.include(message, "firstName")
+      assert.notInclude(message, "lastName")
+      assert.include(yield* payloadError(api, { firstName: "Ada", lastName: "Lovelace", extra: true }), "extra")
+    }))
+})
+
+it.layer(TestServices)("HttpApiBuilder.handler", (it) => {
+  it.effect("round trips a path parameter followed by a literal action suffix", () =>
+    Effect.gen(function*() {
+      const Api = HttpApi.make("Api").add(
+        HttpApiGroup.make("operations").add(
+          HttpApiEndpoint.post("wait", "/operations/:id:wait", {
+            params: { id: Schema.String },
+            success: Schema.String
+          })
+        )
+      )
+      const GroupLayer = HttpApiBuilder.group(Api, "operations", (handlers) =>
+        handlers.handle("wait", ({ params }) =>
+          Effect.succeed(params.id)))
+      const client = yield* HttpApiTest.groups(Api, ["operations"]).pipe(Effect.provide(GroupLayer))
+
+      assert.strictEqual(yield* client.operations.wait({ params: { id: "op_1" } }), "op_1")
+    }))
+
+  it.effect("does not bind a non-word schema key in a literal client path", () =>
+    Effect.gen(function*() {
+      const Params = Schema.Struct({ "a$b": Schema.optional(Schema.String) })
+      const Api = HttpApi.make("Api").add(
+        HttpApiGroup.make("test").add(
+          HttpApiEndpoint.get("get", "/x/:a$b", { params: Params, success: Params })
+        )
+      )
+      const GroupLayer = HttpApiBuilder.group(Api, "test", (handlers) =>
+        handlers.handle("get", ({ params }) =>
+          Effect.succeed(params)))
+      const client = yield* HttpApiTest.groups(Api, ["test"]).pipe(Effect.provide(GroupLayer))
+
+      assert.deepStrictEqual(yield* client.test.get({ params: { "a$b": "value" } }), {})
+    }))
+
+  it.effect("returns the callback unchanged and supports registration in a group", () =>
+    Effect.gen(function*() {
+      const Api = HttpApi.make("Api").add(
+        HttpApiGroup.make("users").add(
+          HttpApiEndpoint.post("create", "/users/:id", {
+            params: { id: Schema.FiniteFromString },
+            payload: Schema.Struct({ name: Schema.String }),
+            success: Schema.Struct({ id: Schema.Number, name: Schema.String })
+          })
+        )
+      )
+      const callback = vi.fn(({ params, payload }: {
+        readonly params: { readonly id: number }
+        readonly payload: { readonly name: string }
+      }) => Effect.succeed({ id: params.id, name: payload.name }))
+      const handler = HttpApiBuilder.handler(Api, "users", "create", callback)
+
+      assert.strictEqual(handler, callback)
+      assert.strictEqual(callback.mock.calls.length, 0)
+
+      const GroupLayer = HttpApiBuilder.group(Api, "users", (handlers) => handlers.handle("create", handler))
+      const client = yield* HttpApiTest.groups(Api, ["users"]).pipe(Effect.provide(GroupLayer))
+      const result = yield* client.users.create({ params: { id: 42 }, payload: { name: "Ada" } })
+
+      assert.deepStrictEqual(result, { id: 42, name: "Ada" })
+      assert.strictEqual(callback.mock.calls.length, 1)
+    }))
+
+  it.effect("round trips a QUERY request body", () =>
+    Effect.gen(function*() {
+      const Payload = Schema.Struct({ query: Schema.String })
+      const Api = HttpApi.make("Api").add(
+        HttpApiGroup.make("search").add(
+          HttpApiEndpoint.query("run", "/search", {
+            payload: Payload,
+            success: Payload
+          })
+        )
+      )
+      const GroupLayer = HttpApiBuilder.group(Api, "search", (handlers) =>
+        handlers.handle("run", ({ payload }) =>
+          Effect.succeed(payload)))
+      const client = yield* HttpApiTest.groups(Api, ["search"]).pipe(Effect.provide(GroupLayer))
+
+      assert.deepStrictEqual(yield* client.search.run({ payload: { query: "effect" } }), { query: "effect" })
+    }))
+})
+
+it.layer(TestServices)("HttpApiTest pre-response handlers", (it) => {
+  it.effect("runs registered pre-response handlers", () =>
+    Effect.gen(function*() {
+      const Api = HttpApi.make("Api").add(
+        HttpApiGroup.make("test").add(
+          HttpApiEndpoint.get("get", "/fixture", { success: Schema.String.pipe(HttpApiSchema.asText()) })
+        )
+      )
+      const GroupLayer = HttpApiBuilder.group(Api, "test", (handlers) =>
+        handlers.handle("get", () =>
+          Effect.as(
+            HttpEffect.appendPreResponseHandler((_request, response) =>
+              Effect.succeed(HttpServerResponse.setHeader(response, "x-fixture", "present"))
+            ),
+            "ok"
+          )))
+      const client = yield* HttpApiTest.groups(Api, ["test"]).pipe(Effect.provide(GroupLayer))
+      const response = yield* client.test.get({ responseMode: "response-only" })
+
+      assert.strictEqual(response.url, "http://localhost:3000/fixture")
+      assert.strictEqual(response.status, 200)
+      assert.strictEqual(response.headers["x-fixture"], "present")
+      assert.strictEqual(yield* response.text, "ok")
+    }))
+})
+
 it.layer(TestServices)("HttpApiBuilder query parameters", (it) => {
   it.effect("round trips array query parameters with one or more values", () =>
     Effect.gen(function*() {
@@ -790,6 +1007,51 @@ it.layer(TestServices)("HttpApiBuilder WithHeaders responses", (it) => {
 })
 
 it.layer(TestServices)("HttpApiBuilder streaming success responses", (it) => {
+  for (
+    const [name, innerStatus, wrapperStatus, expectedStatus] of [
+      ["wrapper status", undefined, 206, 206],
+      ["wrapper overrides inner status", 201, 206, 206],
+      ["default status control", undefined, undefined, 200]
+    ] as const
+  ) {
+    it.effect(`preserves WithHeaders stream status: ${name}`, () =>
+      Effect.gen(function*() {
+        const stream = HttpApiSchema.StreamUint8Array()
+        const wrapped = HttpApiSchema.WithHeaders(
+          innerStatus === undefined ? stream : stream.pipe(HttpApiSchema.status(innerStatus)),
+          { "x-note": Schema.String }
+        )
+        const success = wrapperStatus === undefined ? wrapped : wrapped.pipe(HttpApiSchema.status(wrapperStatus))
+        const Api = HttpApi.make("Api").add(
+          HttpApiGroup.make("test").add(HttpApiEndpoint.get("download", "/test", { success }))
+        )
+        const GroupLayer = HttpApiBuilder.group(
+          Api,
+          "test",
+          (handlers) =>
+            handlers.handle("download", () =>
+              Effect.succeed(HttpApiSchema.withHeaders({
+                body: Stream.make(new Uint8Array([1, 2])),
+                headers: { "x-note": "test" }
+              })))
+        )
+
+        const client = yield* HttpApiTest.groups(Api, ["test"]).pipe(Effect.provide(GroupLayer))
+        const response = yield* client.test.download({ responseMode: "response-only" })
+        const chunks = yield* Stream.runCollect(response.stream)
+
+        assert.strictEqual(response.status, expectedStatus)
+        assert.strictEqual(response.headers["content-type"], "application/octet-stream")
+        assert.strictEqual(response.headers["x-note"], "test")
+        assert.deepStrictEqual(Array.from(chunks, (chunk) => Array.from(chunk)), [[1, 2]])
+
+        const decoded = yield* client.test.download({})
+        const decodedChunks = yield* Stream.runCollect(decoded.body)
+        assert.deepStrictEqual(decoded.headers, { "x-note": "test" })
+        assert.deepStrictEqual(Array.from(decodedChunks, (chunk) => Array.from(chunk)), [[1, 2]])
+      }))
+  }
+
   it.effect("emits StreamUint8Array handler responses as streamed bytes with the declared content type", () =>
     Effect.gen(function*() {
       const Api = HttpApi.make("Api").add(
@@ -1371,3 +1633,34 @@ it.layer(TestServices)("HttpApiBuilder streaming success responses", (it) => {
       assert.deepStrictEqual(error, new HandlerFailure({ message: "handler failed" }))
     }))
 })
+
+it.layer(TestServices)("HttpApiBuilder middleware error responses", (it) => {
+  it.effect("encodes a middleware error through the response codec", () =>
+    Effect.gen(function*() {
+      const RateLimited = Schema.Struct({ retryAfter: Schema.BigInt }).pipe(HttpApiSchema.status(429))
+
+      class RateLimit extends HttpApiMiddleware.Service<RateLimit>()("RateLimit", {
+        error: RateLimited
+      }) {}
+
+      const Api = HttpApi.make("Api").add(
+        HttpApiGroup.make("test").add(
+          HttpApiEndpoint.get("limited", "/limited", { success: Schema.String }).middleware(RateLimit)
+        )
+      )
+      const GroupLayer = HttpApiBuilder.group(
+        Api,
+        "test",
+        (handlers) => handlers.handle("limited", () => Effect.succeed("ok"))
+      )
+      const RateLimitLayer = Layer.succeed(RateLimit)(() => Effect.fail({ retryAfter: 30n }))
+
+      const client = yield* HttpApiTest.groups(Api, ["test"]).pipe(
+        Effect.provide(GroupLayer),
+        Effect.provide(RateLimitLayer)
+      )
+      const error = yield* Effect.flip(client.test.limited())
+
+      assert.deepStrictEqual(error, { retryAfter: 30n })
+    }))
+})
diff --git a/repos/effect/packages/effect/test/unstable/httpapi/HttpApiClient.test.ts b/repos/effect/packages/effect/test/unstable/httpapi/HttpApiClient.test.ts
index dbbf7085a..3c848380f 100644
--- a/repos/effect/packages/effect/test/unstable/httpapi/HttpApiClient.test.ts
+++ b/repos/effect/packages/effect/test/unstable/httpapi/HttpApiClient.test.ts
@@ -6,6 +6,193 @@ import { HttpClient, HttpClientError, HttpClientRequest, HttpClientResponse } fr
 import { HttpApi, HttpApiClient, HttpApiEndpoint, HttpApiGroup, HttpApiSchema } from "effect/unstable/httpapi"
 
 describe("HttpApiClient", () => {
+  describe("ParseOptions", () => {
+    const Fields = { firstName: Schema.String, lastName: Schema.String }
+    const Person = Schema.Struct(Fields)
+
+    const SseApi = HttpApi.make("SseApi").add(
+      HttpApiGroup.make("test").add(HttpApiEndpoint.get("events", "/events", {
+        success: HttpApiSchema.StreamSse({ data: Person, error: Schema.Struct({ reason: Schema.String }) })
+      }))
+    )
+
+    it.effect("strict events-mode decoding omits an absent event ID", () =>
+      Effect.gen(function*() {
+        const decode = (wire: string) =>
+          HttpApiClient.makeWith(
+            StreamingApi.annotate(HttpApi.ParseOptions, { onExcessProperty: "error" }),
+            { baseUrl: "http://test", httpClient: clientFromResponse(() => new Response(textStream([wire]))) }
+          ).pipe(Effect.flatMap((client) => client.test.events({})), Effect.flatMap(Stream.runCollect))
+
+        const error = yield* Effect.flip(decode("id: 1\nevent: person\ndata: hello\n\n"))
+        assert.ok(Schema.isSchemaError(error))
+        assert.include(error.message, "[\"id\"]")
+        assert.deepStrictEqual(yield* decode("event: person\ndata: hello\n\n"), [{ event: "person", data: "hello" }])
+      }))
+
+    it.effect("strict SSE decoding accepts valid user data and framework event metadata", () =>
+      Effect.gen(function*() {
+        const client = yield* HttpApiClient.makeWith(
+          SseApi.annotate(HttpApi.ParseOptions, { onExcessProperty: "error" }),
+          {
+            baseUrl: "http://test",
+            httpClient: clientFromResponse(() =>
+              new Response(
+                textStream([
+                  "id: 1\nevent: person\ndata: {\"firstName\":\"Ada\",\"lastName\":\"Lovelace\"}\n\n"
+                ]),
+                { headers: { "content-type": "text/event-stream" } }
+              )
+            )
+          }
+        )
+        const events = yield* client.test.events({}).pipe(Effect.flatMap(Stream.runCollect))
+        assert.deepStrictEqual(events, [{ firstName: "Ada", lastName: "Lovelace" }])
+      }))
+
+    it.effect("strict SSE decoding preserves reserved failure causes", () =>
+      Effect.gen(function*() {
+        const expected = Cause.fail({ reason: "boom" })
+        const FailureSchema = Schema.fromJsonString(Schema.toCodecJson(Schema.Cause(StreamError, Schema.Defect())))
+        const data = yield* Schema.encodeEffect(FailureSchema)(expected)
+        const client = yield* HttpApiClient.makeWith(
+          SseApi.annotate(HttpApi.ParseOptions, { onExcessProperty: "error" }),
+          {
+            baseUrl: "http://test",
+            httpClient: clientFromResponse(() =>
+              new Response(
+                textStream([
+                  Sse.encoder.write({ _tag: "Event", event: "effect/httpapi/stream/failure", id: undefined, data })
+                ]),
+                { headers: { "content-type": "text/event-stream" } }
+              )
+            )
+          }
+        )
+        const exit = yield* client.test.events({}).pipe(Effect.flatMap(Stream.runCollect), Effect.exit)
+        assert.strictEqual(exit._tag, "Failure")
+        if (exit._tag === "Failure") {
+          const error = Cause.squash(exit.cause)
+          assert.isFalse(Schema.isSchemaError(error), error instanceof Error ? error.message : undefined)
+          assert.deepStrictEqual(exit.cause, expected)
+        }
+      }))
+
+    it.effect("strict SSE decoding rejects excess properties in user event data", () =>
+      Effect.gen(function*() {
+        const client = yield* HttpApiClient.makeWith(
+          SseApi.annotate(HttpApi.ParseOptions, { onExcessProperty: "error" }),
+          {
+            baseUrl: "http://test",
+            httpClient: clientFromResponse(() =>
+              new Response(
+                textStream([
+                  "data: {\"firstName\":\"Ada\",\"lastName\":\"Lovelace\",\"extra\":true}\n\n"
+                ]),
+                { headers: { "content-type": "text/event-stream" } }
+              )
+            )
+          }
+        )
+        const exit = yield* client.test.events({}).pipe(Effect.flatMap(Stream.runCollect), Effect.exit)
+        assert.strictEqual(exit._tag, "Failure")
+        if (exit._tag === "Failure") {
+          const error = Cause.squash(exit.cause)
+          assert.ok(Schema.isSchemaError(error))
+          assert.include(error.message, "Expected no excess property")
+          assert.include(error.message, "[\"data\"][\"extra\"]")
+          assert.notInclude(error.message, "[\"_tag\"]")
+        }
+      }))
+
+    it.effect("client payload encoding collects all issues", () =>
+      Effect.gen(function*() {
+        const Api = HttpApi.make("Api").add(
+          HttpApiGroup.make("users").add(HttpApiEndpoint.post("create", "/users", { payload: Person }))
+        ).annotate(HttpApi.ParseOptions, { errors: "all" })
+        let requests = 0
+        const client = yield* HttpApiClient.makeWith(Api, {
+          baseUrl: "http://test",
+          httpClient: clientFromResponse(() => {
+            requests++
+            return new Response(null, { status: 204 })
+          })
+        })
+        const exit = yield* Effect.exit(client.users.create({ payload: {} as typeof Person.Type }))
+        assert.strictEqual(requests, 0)
+        assert.strictEqual(exit._tag, "Failure")
+        if (exit._tag === "Failure") {
+          const error = Cause.squash(exit.cause)
+          assert.ok(Schema.isSchemaError(error))
+          assert.include(error.message, "firstName")
+          assert.include(error.message, "lastName")
+        }
+      }))
+
+    it.effect("client response decoding collects all issues", () =>
+      Effect.gen(function*() {
+        const Api = HttpApi.make("Api").add(
+          HttpApiGroup.make("users").add(HttpApiEndpoint.get("get", "/users", { success: Person }))
+        ).annotate(HttpApi.ParseOptions, { errors: "all" })
+        const client = yield* HttpApiClient.makeWith(Api, {
+          baseUrl: "http://test",
+          httpClient: clientFromResponse(() => new Response("{}", { headers: { "content-type": "application/json" } }))
+        })
+        const exit = yield* Effect.exit(client.users.get({}))
+        assert.strictEqual(exit._tag, "Failure")
+        if (exit._tag === "Failure") {
+          const error = Cause.squash(exit.cause)
+          assert.ok(Schema.isSchemaError(error))
+          assert.include(error.message, "firstName")
+          assert.include(error.message, "lastName")
+        }
+      }))
+
+    it("urlBuilder uses group options over API options", () => {
+      const Api = HttpApi.make("Api").add(
+        HttpApiGroup.make("users").add(HttpApiEndpoint.get("get", "/users", { query: Person }))
+          .annotate(HttpApi.ParseOptions, { errors: "all" })
+      ).annotate(HttpApi.ParseOptions, { errors: "first" })
+      const urls = HttpApiClient.urlBuilder(Api)
+      assert.throws(() => urls.users.get({ query: {} as typeof Person.Type }), /firstName[\s\S]*lastName/)
+    })
+  })
+
+  describe("literal action suffixes", () => {
+    const Api = HttpApi.make("Api").add(
+      HttpApiGroup.make("operations").add(
+        HttpApiEndpoint.post("wait", "/operations/:id:wait", {
+          params: Schema.Struct({ id: Schema.String })
+        })
+      )
+    )
+    const expectedUrl = "https://api.example.com/operations/op_1:wait"
+
+    it("urlBuilder preserves the undeclared action suffix", () => {
+      const urls = HttpApiClient.urlBuilder(Api, { baseUrl: "https://api.example.com" })
+
+      strictEqual(urls.operations.wait({ params: { id: "op_1" } }), expectedUrl)
+    })
+
+    it.effect("make sends the request with the literal action suffix", () =>
+      Effect.gen(function*() {
+        let requestUrl: string | undefined
+        const httpClient = HttpClient.make((request, url) =>
+          Effect.sync(() => {
+            requestUrl = url.toString()
+            return HttpClientResponse.fromWeb(request, new Response(null, { status: 204 }))
+          })
+        )
+        const client = yield* HttpApiClient.make(Api, { baseUrl: "https://api.example.com" }).pipe(
+          Effect.provideService(HttpClient.HttpClient, httpClient)
+        )
+
+        yield* client.operations.wait({ params: { id: "op_1" } })
+
+        strictEqual(requestUrl, expectedUrl)
+      }))
+  })
+
   describe("streaming responses", () => {
     it.effect("decodes StreamSse events incrementally", () =>
       Effect.gen(function*() {
@@ -27,6 +214,26 @@ describe("HttpApiClient", () => {
         assert.deepStrictEqual(first, [{ event: "first", data: "one" }])
       }))
 
+    it.effect("keeps per-call SSE decode options isolated", () =>
+      Effect.gen(function*() {
+        const client = yield* HttpApiClient.makeWith(StreamingApi, {
+          baseUrl: "http://test",
+          httpClient: clientFromResponse(() => new Response(textStream(["data: ", "hello\n\n"]), { status: 200 }))
+        })
+
+        const limitedStream = yield* client.test.events({ sseOptions: { maxEventSize: 4 } })
+        const defaultStream = yield* client.test.events({})
+        const [error, events] = yield* Effect.all([
+          limitedStream.pipe(Stream.runCollect, Effect.flip),
+          Stream.runCollect(defaultStream)
+        ], { concurrency: "unbounded" })
+
+        assert.instanceOf(error, Sse.SseError)
+        assert.instanceOf(error.reason, Sse.EventTooLarge)
+        assert.strictEqual(error.reason.maxEventSize, 4)
+        assert.deepStrictEqual(events, [{ event: "message", data: "hello" }])
+      }))
+
     it.effect("keeps StreamSse parser state isolated between responses", () =>
       Effect.gen(function*() {
         const bodies = [
@@ -204,7 +411,7 @@ describe("HttpApiClient", () => {
         }
       }))
 
-    it.effect("selects a WithHeaders stream from a mixed buffered success by content type", () =>
+    it.effect("forwards SSE options through mixed WithHeaders content-type selection", () =>
       Effect.gen(function*() {
         const Api = HttpApi.make("Api").add(
           HttpApiGroup.make("test").add(
@@ -222,7 +429,7 @@ describe("HttpApiClient", () => {
         const client = yield* HttpApiClient.makeWith(Api, {
           baseUrl: "http://test",
           httpClient: clientFromResponse(() =>
-            new Response(textStream([`data: {"text":"hello"}\n\n`]), {
+            new Response(textStream(["data: ", `{"text":"hello"}\n\n`]), {
               status: 200,
               headers: {
                 "content-type": "text/event-stream; charset=utf-8",
@@ -232,13 +439,23 @@ describe("HttpApiClient", () => {
           )
         })
 
-        const value = yield* client.test.chat({})
+        const value = yield* client.test.chat({ sseOptions: { maxEventSize: 4 } })
         if (!(HttpApiSchema.WithHeadersValueTypeId in value)) {
           throw new Error("Expected WithHeaders response")
         }
-        const events = yield* Stream.runCollect(value.body)
+        const error = yield* value.body.pipe(Stream.runCollect, Effect.flip)
 
         assert.deepStrictEqual(value.headers, { "x-count": 1 })
+        assert.instanceOf(error, Sse.SseError)
+        assert.instanceOf(error.reason, Sse.EventTooLarge)
+        assert.strictEqual(error.reason.maxEventSize, 4)
+
+        const defaultValue = yield* client.test.chat({})
+        if (!(HttpApiSchema.WithHeadersValueTypeId in defaultValue)) {
+          throw new Error("Expected WithHeaders response")
+        }
+        const events = yield* Stream.runCollect(defaultValue.body)
+        assert.deepStrictEqual(defaultValue.headers, { "x-count": 1 })
         assert.deepStrictEqual(events, [{ text: "hello" }])
       }))
 
@@ -423,6 +640,30 @@ describe("HttpApiClient", () => {
       }))
   })
 
+  it.effect("decodes form-urlencoded responses", () =>
+    Effect.gen(function*() {
+      const Api = HttpApi.make("Api").add(
+        HttpApiGroup.make("test").add(
+          HttpApiEndpoint.get("form", "/form", {
+            success: Schema.Struct({ name: Schema.String }).pipe(HttpApiSchema.asFormUrlEncoded())
+          })
+        )
+      )
+      const client = yield* HttpApiClient.makeWith(Api, {
+        baseUrl: "https://example.test",
+        httpClient: clientFromResponse(() =>
+          new Response("name=Ada", {
+            status: 200,
+            headers: { "content-type": "application/x-www-form-urlencoded" }
+          })
+        )
+      })
+
+      const value = yield* client.test.form({})
+
+      assert.deepStrictEqual(value, { name: "Ada" })
+    }))
+
   describe("response headers", () => {
     it.effect("fails response decoding when a declared header is invalid", () =>
       Effect.gen(function*() {
@@ -502,6 +743,14 @@ describe("HttpApiClient", () => {
       )
     })
 
+    it("preserves a base URL pathname", () => {
+      const builder = HttpApiClient.urlBuilder(Api, {
+        baseUrl: "https://api.example.com/v1"
+      })
+
+      strictEqual(builder.users.health(), "https://api.example.com/v1/health")
+    })
+
     it("encodes path parameters", () => {
       const Api = HttpApi.make("Api")
         .add(
diff --git a/repos/effect/packages/effect/test/unstable/httpapi/HttpApiDocumentation.test.ts b/repos/effect/packages/effect/test/unstable/httpapi/HttpApiDocumentation.test.ts
index 04a4a9d2d..be58c5ac7 100644
--- a/repos/effect/packages/effect/test/unstable/httpapi/HttpApiDocumentation.test.ts
+++ b/repos/effect/packages/effect/test/unstable/httpapi/HttpApiDocumentation.test.ts
@@ -9,7 +9,8 @@ const TestServices = Layer.mergeAll(
   HttpPlatform.layer
 ).pipe(Layer.provideMerge(FileSystem.layerNoop({})))
 
-describe("HttpApiBuilder", () => {
+// Response spies are shared across suites.
+describe("HttpApiBuilder", { concurrent: false }, () => {
   it.effect("defers and memoizes successful openapiPath responses", () =>
     Effect.gen(function*() {
       let transforms = 0
@@ -87,7 +88,7 @@ describe("HttpApiBuilder", () => {
     }))
 })
 
-describe("HttpApiScalar", () => {
+describe("HttpApiScalar", { concurrent: false }, () => {
   it.effect("defers and memoizes successful OpenAPI responses", () =>
     Effect.gen(function*() {
       let transforms = 0
@@ -215,7 +216,7 @@ describe("HttpApiScalar", () => {
     }))
 })
 
-describe("HttpApiSwagger", () => {
+describe("HttpApiSwagger", { concurrent: false }, () => {
   it.effect("defers and memoizes successful OpenAPI responses", () =>
     Effect.gen(function*() {
       let transforms = 0
diff --git a/repos/effect/packages/effect/test/unstable/httpapi/HttpApiEndpoint.test.ts b/repos/effect/packages/effect/test/unstable/httpapi/HttpApiEndpoint.test.ts
index eeedb9d18..429b4d1cb 100644
--- a/repos/effect/packages/effect/test/unstable/httpapi/HttpApiEndpoint.test.ts
+++ b/repos/effect/packages/effect/test/unstable/httpapi/HttpApiEndpoint.test.ts
@@ -1,6 +1,6 @@
 import { assert, describe, it } from "@effect/vitest"
 import { Schema } from "effect"
-import { HttpApiEndpoint, HttpApiSchema } from "effect/unstable/httpapi"
+import { HttpApiEndpoint, HttpApiSchema, OpenApi } from "effect/unstable/httpapi"
 
 const Events = Schema.Struct({
   event: Schema.Literal("user.created"),
@@ -378,6 +378,18 @@ describe("HttpApiEndpoint WithHeaders schemas", () => {
     assert.isTrue(endpoint.success.has(wrapped))
   })
 
+  it("preserves disableCodecs through derived endpoints", () => {
+    const endpoint = HttpApiEndpoint.get("list", "/users", {
+      disableCodecs: true,
+      success: Schema.Struct({ a: Schema.String })
+    })
+
+    assert.isTrue(endpoint.disableCodecs)
+    assert.isTrue(endpoint.prefix("/api").disableCodecs)
+    assert.isTrue(endpoint.annotate(OpenApi.Title, "Users").disableCodecs)
+    assert.isFalse(HttpApiEndpoint.get("plain", "/plain").disableCodecs)
+  })
+
   it("keeps a wrapped stream schema as the inner schema", () => {
     const stream = sse()
     const endpoint = HttpApiEndpoint.get("events", "/events", {
diff --git a/repos/effect/packages/effect/test/unstable/httpapi/HttpApiSchema.test.ts b/repos/effect/packages/effect/test/unstable/httpapi/HttpApiSchema.test.ts
index a808f77b6..66878be7f 100644
--- a/repos/effect/packages/effect/test/unstable/httpapi/HttpApiSchema.test.ts
+++ b/repos/effect/packages/effect/test/unstable/httpapi/HttpApiSchema.test.ts
@@ -268,6 +268,28 @@ describe("HttpApiSchema", () => {
     it("defaults the response encoding to Json", () => {
       assert.strictEqual(HttpApiSchema.getResponseEncoding(WrappedUserNotFound.ast)._tag, "Json")
     })
+
+    it("uses the body defaults instead of source response metadata", () => {
+      const schema = Schema.String.pipe(
+        HttpApiSchema.status(429),
+        HttpApiSchema.asText(),
+        HttpApiSchema.encodeToWithHeaders({
+          body: Schema.String,
+          headers: { "x-note": Schema.String }
+        }, {
+          decode: ({ body }) => body,
+          encode: (body) => ({ body, headers: { "x-note": "test" } })
+        })
+      )
+
+      assert.deepStrictEqual({
+        status: HttpApiSchema.getStatusError(schema.ast),
+        encoding: HttpApiSchema.getResponseEncoding(schema.ast)
+      }, {
+        status: 500,
+        encoding: { _tag: "Json", contentType: "application/json" }
+      })
+    })
   })
 
   it("does not identify buffered schemas as stream schemas", () => {
diff --git a/repos/effect/packages/effect/test/unstable/httpapi/OpenApi.test.ts b/repos/effect/packages/effect/test/unstable/httpapi/OpenApi.test.ts
index fbb89b904..6a21825ab 100644
--- a/repos/effect/packages/effect/test/unstable/httpapi/OpenApi.test.ts
+++ b/repos/effect/packages/effect/test/unstable/httpapi/OpenApi.test.ts
@@ -70,6 +70,50 @@ const makeSecurityApi = (
   )
 
 describe("OpenApi", () => {
+  it("preserves literal action suffixes in path templates", () => {
+    const Api = HttpApi.make("Api").add(
+      HttpApiGroup.make("operations").add(
+        HttpApiEndpoint.post("wait", "/operations/:id:wait", {
+          params: { id: Schema.String }
+        })
+      )
+    )
+    const spec = OpenApi.fromApi(Api)
+
+    assert.deepStrictEqual(Object.keys(spec.paths), ["/operations/{id}:wait"])
+    assert.deepStrictEqual(spec.paths["/operations/{id}:wait"]?.post?.parameters, [
+      { name: "id", in: "path", required: true, schema: { type: "string" } }
+    ])
+  })
+
+  it("keeps action paths literal when no parameter schema is declared", () => {
+    const Api = HttpApi.make("Api").add(
+      HttpApiGroup.make("offers").add(HttpApiEndpoint.post("resolve", "/offers:resolve"))
+    )
+    const spec = OpenApi.fromApi(Api)
+
+    assert.deepStrictEqual(Object.keys(spec.paths), ["/offers:resolve"])
+    assert.deepStrictEqual(spec.paths["/offers:resolve"]?.post?.parameters, [])
+  })
+
+  it("preserves parameter schemas when an endpoint transform reorders parameters", () => {
+    const Api = HttpApi.make("Api").add(
+      HttpApiGroup.make("test").add(
+        HttpApiEndpoint.get("list", "/list", {
+          query: { first: Schema.Literal("first"), second: Schema.Literal("second") }
+        }).annotate(OpenApi.Transform, (operation: Record<string, any>) => ({
+          ...operation,
+          parameters: [...operation.parameters].reverse()
+        }))
+      )
+    )
+
+    assert.deepStrictEqual(OpenApi.fromApi(Api).paths["/list"]?.get?.parameters, [
+      { name: "second", in: "query", required: true, schema: { type: "string", enum: ["second"] } },
+      { name: "first", in: "query", required: true, schema: { type: "string", enum: ["first"] } }
+    ])
+  })
+
   it("returns fresh spec instances when using the cache", () => {
     const Api = HttpApi.make("Api").add(
       HttpApiGroup.make("test").add(
@@ -159,6 +203,31 @@ describe("OpenApi", () => {
     })
   })
 
+  it("preserves GET and QUERY schemas on the same path", () => {
+    const Api = HttpApi.make("Api").add(
+      HttpApiGroup.make("search").add(
+        HttpApiEndpoint.get("list", "/search", { success: Schema.Finite }),
+        HttpApiEndpoint.query("search", "/search", {
+          payload: Schema.String,
+          success: Schema.Boolean
+        }).annotate(OpenApi.Transform, (operation: Record<string, any>) => {
+          assert.deepStrictEqual(operation.requestBody.content["application/json"].schema, { type: "string" })
+          return { ...operation, summary: "Search" }
+        })
+      )
+    )
+
+    const spec = OpenApi.fromApi(Api)
+    const pathItem = spec.paths["/search"]
+    const query = pathItem["x-oai-additionalOperations"]?.QUERY
+
+    assert.strictEqual(spec.openapi, "3.1.0")
+    assert.deepStrictEqual(Object.keys(pathItem), ["get", "x-oai-additionalOperations"])
+    assert.strictEqual(query?.summary, "Search")
+    assert.deepStrictEqual(pathItem.get?.responses[200]?.content?.["application/json"]?.schema, { type: "number" })
+    assert.deepStrictEqual(query?.responses[200]?.content?.["application/json"]?.schema, { type: "boolean" })
+  })
+
   it("emits buffered and stream successes with the same status", () => {
     const Api = HttpApi.make("Api").add(
       HttpApiGroup.make("test").add(
@@ -316,6 +385,165 @@ describe("OpenApi", () => {
     })
   })
 
+  it("collapses a middleware error that repeats an endpoint error", () => {
+    const ApiError = Schema.Struct({ code: Schema.String }).annotate({ identifier: "ApiError" })
+
+    class SameError extends HttpApiMiddleware.Service<SameError>()("SameError", {
+      error: ApiError
+    }) {}
+
+    const Api = HttpApi.make("Api").add(
+      HttpApiGroup.make("test").add(
+        HttpApiEndpoint.get("error", "/error", { error: ApiError })
+      )
+    ).middleware(SameError)
+
+    const spec = OpenApi.fromApi(Api)
+
+    assert.deepStrictEqual(spec.paths["/error"]?.get?.responses[500]?.content, {
+      "application/json": {
+        schema: { $ref: "#/components/schemas/ApiError" }
+      }
+    })
+  })
+
+  it("collapses a repeated middleware error when the endpoint disables codecs", () => {
+    const ApiError = Schema.Struct({ code: Schema.String }).annotate({ identifier: "ApiError" })
+
+    class SameError extends HttpApiMiddleware.Service<SameError>()("SameErrorNoCodecs", {
+      error: ApiError
+    }) {}
+
+    const Api = HttpApi.make("Api").add(
+      HttpApiGroup.make("test").add(
+        HttpApiEndpoint.get("error", "/error", {
+          disableCodecs: true,
+          error: ApiError
+        })
+      )
+    ).middleware(SameError)
+
+    const spec = OpenApi.fromApi(Api)
+
+    assert.deepStrictEqual(spec.paths["/error"]?.get?.responses[500]?.content, {
+      "application/json": {
+        schema: { $ref: "#/components/schemas/ApiError" }
+      }
+    })
+  })
+
+  it("resolves one shared middleware error per endpoint codec mode", () => {
+    const ApiError = Schema.Struct({ code: Schema.String }).annotate({ identifier: "ApiError" })
+
+    class SharedError extends HttpApiMiddleware.Service<SharedError>()("SharedError", {
+      error: ApiError
+    }) {}
+
+    // The same middleware instance is attached to both endpoints, so its single
+    // error set has to be resolved against each endpoint's `disableCodecs`.
+    const Api = HttpApi.make("Api").add(
+      HttpApiGroup.make("test")
+        .add(HttpApiEndpoint.get("codecs", "/codecs", { error: ApiError }))
+        .add(HttpApiEndpoint.get("raw", "/raw", { disableCodecs: true, error: ApiError }))
+    ).middleware(SharedError)
+
+    const spec = OpenApi.fromApi(Api)
+
+    assert.deepStrictEqual(spec.paths["/codecs"]?.get?.responses[500]?.content, {
+      "application/json": {
+        schema: { $ref: "#/components/schemas/ApiError" }
+      }
+    })
+    assert.deepStrictEqual(spec.paths["/raw"]?.get?.responses[500]?.content, {
+      "application/json": {
+        schema: { $ref: "#/components/schemas/ApiError" }
+      }
+    })
+  })
+
+  it("emits an anyOf for a middleware error that differs from the endpoint error", () => {
+    const EndpointError = Schema.Struct({ code: Schema.String }).annotate({ identifier: "EndpointError" })
+    const MiddlewareError = Schema.Struct({ reason: Schema.String }).annotate({ identifier: "MiddlewareError" })
+
+    class OtherError extends HttpApiMiddleware.Service<OtherError>()("OtherError", {
+      error: MiddlewareError
+    }) {}
+
+    const Api = HttpApi.make("Api").add(
+      HttpApiGroup.make("test").add(
+        HttpApiEndpoint.get("error", "/error", { error: EndpointError })
+      )
+    ).middleware(OtherError)
+
+    const spec = OpenApi.fromApi(Api)
+
+    assert.deepStrictEqual(spec.paths["/error"]?.get?.responses[500]?.content, {
+      "application/json": {
+        schema: {
+          anyOf: [
+            { $ref: "#/components/schemas/EndpointError" },
+            { $ref: "#/components/schemas/MiddlewareError" }
+          ]
+        }
+      }
+    })
+  })
+
+  it("emits an anyOf for two different endpoint errors sharing a status", () => {
+    const FirstError = Schema.Struct({ code: Schema.String }).annotate({ identifier: "FirstError" })
+    const SecondError = Schema.Struct({ reason: Schema.String }).annotate({ identifier: "SecondError" })
+
+    const Api = HttpApi.make("Api").add(
+      HttpApiGroup.make("test").add(
+        HttpApiEndpoint.get("error", "/error", { error: [FirstError, SecondError] })
+      )
+    )
+
+    const spec = OpenApi.fromApi(Api)
+
+    assert.deepStrictEqual(spec.paths["/error"]?.get?.responses[500]?.content, {
+      "application/json": {
+        schema: {
+          anyOf: [
+            { $ref: "#/components/schemas/FirstError" },
+            { $ref: "#/components/schemas/SecondError" }
+          ]
+        }
+      }
+    })
+  })
+
+  it("documents a middleware error for a status the endpoint does not declare", () => {
+    const Unauthorized = Schema.Struct({ message: Schema.String }).pipe(HttpApiSchema.status(401)).annotate({
+      identifier: "Unauthorized"
+    })
+
+    class Auth extends HttpApiMiddleware.Service<Auth>()("Auth", {
+      error: Unauthorized
+    }) {}
+
+    const Api = HttpApi.make("Api").add(
+      HttpApiGroup.make("test").add(
+        HttpApiEndpoint.get("error", "/error", {
+          error: Schema.Struct({ code: Schema.String }).annotate({ identifier: "ServerError" })
+        })
+      )
+    ).middleware(Auth)
+
+    const spec = OpenApi.fromApi(Api)
+
+    assert.deepStrictEqual(spec.paths["/error"]?.get?.responses[401]?.content, {
+      "application/json": {
+        schema: { $ref: "#/components/schemas/Unauthorized" }
+      }
+    })
+    assert.deepStrictEqual(spec.paths["/error"]?.get?.responses[500]?.content, {
+      "application/json": {
+        schema: { $ref: "#/components/schemas/ServerError" }
+      }
+    })
+  })
+
   it("emits stream response headers", () => {
     const Api = HttpApi.make("Api").add(
       HttpApiGroup.make("test").add(
@@ -354,8 +582,8 @@ describe("OpenApi", () => {
   it("rejects equivalent templated method and path pairs", () => {
     const Api = HttpApi.make("Api").add(
       HttpApiGroup.make("test").add(
-        HttpApiEndpoint.get("first", "/users/:id"),
-        HttpApiEndpoint.get("second", "/users/:userId")
+        HttpApiEndpoint.get("first", "/users/:id", { params: { id: Schema.String } }),
+        HttpApiEndpoint.get("second", "/users/:userId", { params: { userId: Schema.String } })
       )
     )
 
diff --git a/repos/effect/packages/effect/test/unstable/httpapi/OpenApiRepresentation.test.ts b/repos/effect/packages/effect/test/unstable/httpapi/OpenApiRepresentation.test.ts
index 19e5a8f8e..88231bb62 100644
--- a/repos/effect/packages/effect/test/unstable/httpapi/OpenApiRepresentation.test.ts
+++ b/repos/effect/packages/effect/test/unstable/httpapi/OpenApiRepresentation.test.ts
@@ -77,7 +77,7 @@ describe("OpenApi representation v2 consumer", () => {
           event: { type: "string" },
           data: { $ref: "#/components/schemas/Tool.ContentEncoded" }
         },
-        required: ["id", "event", "data"],
+        required: ["event", "data"],
         additionalProperties: false
       }
     )
diff --git a/repos/effect/packages/effect/test/unstable/net/IpInterface.test.ts b/repos/effect/packages/effect/test/unstable/net/IpInterface.test.ts
new file mode 100644
index 000000000..99a736046
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/net/IpInterface.test.ts
@@ -0,0 +1,109 @@
+import { assert, describe, it } from "@effect/vitest"
+import { assertTrue } from "@effect/vitest/utils"
+import { Equal, Hash, Result, Schema } from "effect"
+import * as IpInterface from "effect/unstable/net/IpInterface"
+import * as IpNetwork from "effect/unstable/net/IpNetwork"
+import * as NetAddress from "effect/unstable/net/NetAddress"
+import { inspect } from "node:util"
+
+const success = <A>(result: Result.Result<A, unknown>): A => {
+  assertTrue(Result.isSuccess(result), "expected Success")
+  return result.success
+}
+
+const failure = <E>(result: Result.Result<unknown, E>): E => {
+  assertTrue(Result.isFailure(result), "expected Failure")
+  return result.failure
+}
+
+const ip = (input: string): NetAddress.IpAddress => success(NetAddress.ipFromString(input))
+const interfaceAddress = (input: string): IpInterface.IpInterface => success(IpInterface.fromString(input))
+
+describe("IpInterface", () => {
+  it("serializes and inspects canonical strings", () => {
+    for (const expected of ["192.0.2.1/24", "2001:db8::1/64"]) {
+      const address = IpInterface.fromStringUnsafe(expected)
+      assert.strictEqual(address.toJSON(), expected)
+      assert.strictEqual(JSON.stringify(address), JSON.stringify(expected))
+      assert.strictEqual(inspect(address), expected)
+    }
+  })
+
+  it("retains the address supplied to checked constructors", () => {
+    const address = NetAddress.ipv4Loopback
+    assert.strictEqual(failure(IpInterface.make(address, 33)).input, address)
+  })
+
+  it("forwards errors from address and prefix validation", () => {
+    for (const parse of [IpInterface.fromString, IpInterface.ipv4FromString]) {
+      assert.strictEqual(failure(parse("1.2.3.4/+24")).input, "1.2.3.4/+24")
+      assert.strictEqual(failure(parse("010.2.3.4/24")).input, "010.2.3.4")
+      assert.deepStrictEqual(failure(parse("1.2.3.4/33")).input, ip("1.2.3.4"))
+    }
+    for (const parse of [IpInterface.fromString, IpInterface.ipv6FromString]) {
+      assert.strictEqual(failure(parse("::ffff:192.000.2.1/128")).input, "192.000.2.1")
+    }
+  })
+
+  it("constructs one generic runtime representation", () => {
+    const ipv4 = IpInterface.makeUnsafe(NetAddress.ipv4Unspecified, 0)
+    const ipv6 = IpInterface.makeUnsafe(NetAddress.ipv6Unspecified, 0)
+    assert.isTrue(Object.isFrozen(ipv4))
+    assert.isTrue(Object.isFrozen(ipv6))
+    assert.strictEqual(ipv4._tag, "IpInterface")
+    assert.strictEqual(ipv6._tag, "IpInterface")
+    assert.isTrue(IpInterface.isIpv4Interface(ipv4))
+    assert.isTrue(IpInterface.isIpv6Interface(ipv6))
+    assert.isTrue(IpInterface.isIpInterface(ipv4))
+  })
+
+  it("defaults bare addresses to full-width prefixes", () => {
+    assert.strictEqual(IpInterface.format(interfaceAddress("192.0.2.1")), "192.0.2.1/32")
+    assert.strictEqual(IpInterface.format(interfaceAddress("2001:db8::1")), "2001:db8::1/128")
+  })
+
+  it("parses prefixes and preserves host bits", () => {
+    assert.strictEqual(IpInterface.format(interfaceAddress("192.0.2.1/24")), "192.0.2.1/24")
+    assert.strictEqual(
+      IpInterface.format(interfaceAddress("2001:0DB8:0000:0000:0000:0000:0000:0001/64")),
+      "2001:db8::1/64"
+    )
+  })
+
+  it("rejects invalid prefixes and malformed input", () => {
+    const address = ip("10.1.2.3")
+    for (const prefix of [-1, 1.5, Number.NaN, Number.POSITIVE_INFINITY, 33]) {
+      failure(IpInterface.make(address, prefix))
+    }
+    assert.strictEqual(failure(IpInterface.make(address, -1))._tag, "NetAddressError")
+    assert.strictEqual(
+      failure(IpInterface.fromString("1.2.3.4/+24")).message,
+      "prefix length must be an unpadded ASCII decimal integer"
+    )
+    failure(IpInterface.fromString("1.2.3.4", { prefix: "required" }))
+    failure(IpInterface.ipv4FromString("::1/128"))
+    failure(IpInterface.ipv6FromString("127.0.0.1/32"))
+  })
+
+  it("uses address and prefix equality with matching hashes", () => {
+    const first = interfaceAddress("2001:0DB8:0:0:0:0:0:1/64")
+    const second = interfaceAddress("2001:db8::1/64")
+    assert.isTrue(Equal.equals(first, second))
+    assert.strictEqual(Hash.hash(first), Hash.hash(second))
+    assert.isFalse(Equal.equals(first, interfaceAddress("2001:db8::1/65")))
+  })
+
+  it("converts to the canonical containing network", () => {
+    assert.strictEqual(IpNetwork.format(IpNetwork.fromInterface(interfaceAddress("10.1.2.3/8"))), "10.0.0.0/8")
+  })
+
+  it("provides throwing counterparts", () => {
+    assert.strictEqual(IpInterface.format(IpInterface.fromStringUnsafe("10.1.2.3/8")), "10.1.2.3/8")
+    assert.throws(() => IpInterface.makeUnsafe(ip("10.1.2.3"), 33))
+  })
+
+  it("decodes and canonically encodes schemas", () => {
+    const value = Schema.decodeUnknownSync(Schema.IpInterfaceFromString)("192.0.2.1/24")
+    assert.strictEqual(Schema.encodeSync(Schema.IpInterfaceFromString)(value), "192.0.2.1/24")
+  })
+})
diff --git a/repos/effect/packages/effect/test/unstable/net/IpNetwork.test.ts b/repos/effect/packages/effect/test/unstable/net/IpNetwork.test.ts
new file mode 100644
index 000000000..cadab66a7
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/net/IpNetwork.test.ts
@@ -0,0 +1,316 @@
+import { assert, describe, it } from "@effect/vitest"
+import { assertTrue } from "@effect/vitest/utils"
+import { Equal, Hash, Result, Schema } from "effect"
+import * as IpInterface from "effect/unstable/net/IpInterface"
+import * as IpNetwork from "effect/unstable/net/IpNetwork"
+import * as NetAddress from "effect/unstable/net/NetAddress"
+import * as fc from "fast-check"
+import { inspect } from "node:util"
+
+const success = <A>(result: Result.Result<A, unknown>): A => {
+  assertTrue(Result.isSuccess(result), "expected Success")
+  return result.success
+}
+
+const failure = <E>(result: Result.Result<unknown, E>): E => {
+  assertTrue(Result.isFailure(result), "expected Failure")
+  return result.failure
+}
+
+const ip = (input: string): NetAddress.IpAddress => success(NetAddress.ipFromString(input))
+const network = (input: string): IpNetwork.IpNetwork => success(IpNetwork.fromString(input))
+
+describe("IpNetwork", () => {
+  it("serializes and inspects canonical strings", () => {
+    for (const expected of ["192.0.2.0/24", "2001:db8::/32"]) {
+      const address = IpNetwork.fromStringUnsafe(expected)
+      assert.strictEqual(address.toJSON(), expected)
+      assert.strictEqual(JSON.stringify(address), JSON.stringify(expected))
+      assert.strictEqual(inspect(address), expected)
+    }
+  })
+
+  it("retains the address supplied to checked constructors", () => {
+    const address = NetAddress.ipv4Loopback
+    assert.strictEqual(failure(IpNetwork.make(address, 33)).input, address)
+    assert.strictEqual(failure(IpNetwork.make(address, 8)).input, address)
+    assert.strictEqual(failure(IpNetwork.fromAddress(address, 33)).input, address)
+  })
+
+  it("forwards errors from address and prefix validation", () => {
+    for (const parse of [IpNetwork.fromString, IpNetwork.ipv4FromString]) {
+      assert.strictEqual(failure(parse("1.2.3.4/+24")).input, "1.2.3.4/+24")
+      assert.strictEqual(failure(parse("010.2.3.4/24")).input, "010.2.3.4")
+      assert.deepStrictEqual(failure(parse("1.2.3.4/33")).input, ip("1.2.3.4"))
+    }
+    for (const parse of [IpNetwork.fromString, IpNetwork.ipv6FromString]) {
+      assert.strictEqual(failure(parse("::ffff:192.000.2.1/128")).input, "192.000.2.1")
+    }
+  })
+
+  it("constructs immutable canonical networks and preserves family identity", () => {
+    const ipv4 = IpNetwork.makeUnsafe(NetAddress.ipv4Unspecified, 0)
+    const ipv6 = IpNetwork.makeUnsafe(NetAddress.ipv6Unspecified, 0)
+    assert.isTrue(Object.isFrozen(ipv4))
+    assert.isTrue(Object.isFrozen(ipv6))
+    assert.isTrue(IpNetwork.isIpv4Network(ipv4))
+    assert.isTrue(IpNetwork.isIpv6Network(ipv6))
+    assert.strictEqual(ipv4._tag, "IpNetwork")
+    assert.strictEqual(ipv6._tag, "IpNetwork")
+    assert.isFalse(IpNetwork.isIpv4Network(ipv6))
+    assert.isFalse(IpNetwork.isIpv6Network(ipv4))
+    assert.isTrue(IpNetwork.isIpNetwork(ipv4))
+    assert.isFalse(Equal.equals(ipv4, ipv6))
+    assert.strictEqual(ipv4.toString(), "0.0.0.0/0")
+    assert.strictEqual(ipv6.toString(), "::/0")
+  })
+
+  it("rejects invalid prefix lengths and host bits", () => {
+    const ipv4 = ip("10.1.2.3")
+    const ipv6 = ip("2001:db8::1")
+    for (const prefix of [1.5, Number.NaN, Number.POSITIVE_INFINITY, 33]) {
+      failure(IpNetwork.make(ipv4, prefix))
+      failure(IpNetwork.fromAddress(ipv4, prefix))
+    }
+    failure(IpNetwork.make(ipv6, 129))
+    assert.deepStrictEqual(failure(IpNetwork.fromString("10.1.2.3/8")).input, ipv4)
+    failure(IpNetwork.make(ipv4, 8))
+    failure(IpNetwork.make(ipv6, 32))
+
+    const error = failure(IpNetwork.make(ipv4, -1))
+    assert.strictEqual(error._tag, "NetAddressError")
+    assert.strictEqual(error.message, "prefix length must be an integer from 0 through 32")
+  })
+
+  it("explicitly truncates byte-aligned and partial-byte host addresses", () => {
+    assert.strictEqual(IpNetwork.format(success(IpNetwork.fromAddress(ip("10.1.2.3"), 8))), "10.0.0.0/8")
+    assert.strictEqual(IpNetwork.format(success(IpNetwork.fromAddress(ip("192.0.2.255"), 25))), "192.0.2.128/25")
+    assert.strictEqual(
+      IpNetwork.format(success(IpNetwork.fromAddress(ip("2001:db8:0:1:ffff::1"), 63))),
+      "2001:db8::/63"
+    )
+    assert.strictEqual(
+      IpNetwork.format(success(IpNetwork.fromAddress(ip("2001:db8:0:1:ffff::1"), 65))),
+      "2001:db8:0:1:8000::/65"
+    )
+  })
+
+  it("requires derived addresses to revalidate refinements", () => {
+    const multicast = NetAddress.ipv4FromBytesUnsafe(new Uint8Array([224, 0, 0, 1]))
+    if (!NetAddress.isMulticast(multicast)) throw new Error("expected multicast test address")
+    const direct = IpNetwork.fromAddressUnsafe(multicast, 0)
+    const viaInterface = IpNetwork.fromInterface(IpInterface.makeUnsafe(multicast, 0))
+    for (const derived of [direct, viaInterface]) {
+      assert.strictEqual(NetAddress.formatIp(derived.address), "0.0.0.0")
+      assert.isFalse(NetAddress.isMulticast(derived.address))
+      const last = IpNetwork.lastAddress(derived)
+      assert.strictEqual(NetAddress.formatIp(last), "255.255.255.255")
+      assert.isFalse(NetAddress.isMulticast(last))
+    }
+
+    const unspecifiedNetwork = IpNetwork.makeUnsafe(NetAddress.ipv4Unspecified, 0)
+    const broadcast = IpNetwork.lastAddress(unspecifiedNetwork)
+    assert.isFalse(NetAddress.isUnspecified(broadcast))
+    assert.isTrue(NetAddress.isBroadcast(broadcast))
+
+    const loopback = ip("::1")
+    assert.isTrue(NetAddress.isLoopback(loopback))
+    if (NetAddress.isLoopback(loopback)) {
+      const directLoopback = IpNetwork.fromAddressUnsafe(loopback, 64)
+      const interfaceLoopback = IpNetwork.fromInterface(IpInterface.makeUnsafe(loopback, 64))
+      for (const derived of [directLoopback, interfaceLoopback]) {
+        assert.strictEqual(NetAddress.formatIp(derived.address), "::")
+        assert.isFalse(NetAddress.isLoopback(derived.address))
+        assert.isTrue(NetAddress.isUnspecified(derived.address))
+      }
+    }
+  })
+
+  it("parses strict CIDR and formats canonical address text", () => {
+    assert.strictEqual(IpNetwork.format(network("192.0.2.0/24")), "192.0.2.0/24")
+    assert.strictEqual(
+      IpNetwork.format(network("2001:0DB8:0000:0000:0000:0000:0000:0000/32")),
+      "2001:db8::/32"
+    )
+    assert.strictEqual(IpNetwork.format(network("::ffff:192.0.2.0/120")), "::ffff:192.0.2.0/120")
+  })
+
+  it("rejects malformed and non-network CIDR input", () => {
+    for (
+      const input of [
+        "1.2.3.4",
+        "1.2.3.4/",
+        "/24",
+        "1.2.3.4/24/1",
+        "1.2.3.4/+24",
+        "1.2.3.4/024",
+        "1.2.3.4/24 ",
+        "1.2.3.4/1e1",
+        "1.2.3.4/33",
+        "10.1.2.3/8",
+        "2001:db8::1/32"
+      ]
+    ) {
+      failure(IpNetwork.fromString(input))
+    }
+    const parseError = failure(IpNetwork.fromString("1.2.3.4/+24"))
+    assert.strictEqual(parseError.message, "prefix length must be an unpadded ASCII decimal integer")
+    failure(IpNetwork.ipv4FromString("::/0"))
+    failure(IpNetwork.ipv6FromString("0.0.0.0/0"))
+  })
+
+  it("uses numeric equality and matching hashes", () => {
+    const first = network("2001:0DB8:0:0:0:0:0:0/32")
+    const second = network("2001:db8::/32")
+    assert.isTrue(Equal.equals(first, second))
+    assert.strictEqual(Hash.hash(first), Hash.hash(second))
+    assert.isFalse(Equal.equals(first, network("2001:db8::/33")))
+  })
+
+  it("computes first, last, and exact address counts", () => {
+    const ipv4All = network("0.0.0.0/0")
+    const ipv6All = network("::/0")
+    assert.strictEqual(NetAddress.formatIp(IpNetwork.firstAddress(ipv4All)), "0.0.0.0")
+    assert.strictEqual(NetAddress.formatIp(IpNetwork.lastAddress(ipv4All)), "255.255.255.255")
+    assert.strictEqual(IpNetwork.addressCount(ipv4All), BigInt(1) << BigInt(32))
+    assert.strictEqual(NetAddress.formatIp(IpNetwork.lastAddress(ipv6All)), "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
+    assert.strictEqual(IpNetwork.addressCount(ipv6All), BigInt(1) << BigInt(128))
+
+    const ipv4Pair = network("192.0.2.0/31")
+    assert.strictEqual(NetAddress.formatIp(IpNetwork.lastAddress(ipv4Pair)), "192.0.2.1")
+    assert.strictEqual(IpNetwork.addressCount(ipv4Pair), BigInt(2))
+    assert.strictEqual(NetAddress.formatIp(IpNetwork.lastAddress(network("192.0.2.128/25"))), "192.0.2.255")
+    const ipv6Pair = network("2001:db8::/127")
+    assert.strictEqual(NetAddress.formatIp(IpNetwork.lastAddress(ipv6Pair)), "2001:db8::1")
+    assert.strictEqual(IpNetwork.addressCount(ipv6Pair), BigInt(2))
+    assert.strictEqual(
+      NetAddress.formatIp(IpNetwork.lastAddress(network("2001:db8:0:1:8000::/65"))),
+      "2001:db8:0:1:ffff:ffff:ffff:ffff"
+    )
+
+    const ipv4Host = network("255.255.255.255/32")
+    assert.strictEqual(NetAddress.formatIp(IpNetwork.lastAddress(ipv4Host)), "255.255.255.255")
+    assert.strictEqual(IpNetwork.addressCount(ipv4Host), BigInt(1))
+  })
+
+  it("checks address containment in data-first and data-last forms", () => {
+    const self = network("192.0.2.0/25")
+    assert.isTrue(IpNetwork.contains(self, ip("192.0.2.0")))
+    assert.isTrue(IpNetwork.contains(self, ip("192.0.2.64")))
+    assert.isTrue(IpNetwork.contains(ip("192.0.2.127"))(self))
+    assert.isFalse(IpNetwork.contains(self, ip("192.0.1.255")))
+    assert.isFalse(IpNetwork.contains(self, ip("192.0.2.128")))
+    assert.isFalse(IpNetwork.contains(self, ip("::ffff:192.0.2.1")))
+  })
+
+  it("checks network containment and overlap", () => {
+    const parent = network("2001:db8::/63")
+    const child = network("2001:db8:0:1:8000::/65")
+    const sibling = network("2001:db8:0:1::/65")
+    const disjoint = network("2001:db8:0:2::/63")
+    assert.isTrue(IpNetwork.containsNetwork(parent, parent))
+    assert.isTrue(IpNetwork.containsNetwork(child)(parent))
+    assert.isFalse(IpNetwork.containsNetwork(child, parent))
+    assert.isTrue(IpNetwork.overlaps(parent, child))
+    assert.isTrue(IpNetwork.overlaps(child, parent))
+    assert.isFalse(IpNetwork.overlaps(child, sibling))
+    assert.isFalse(IpNetwork.overlaps(parent, disjoint))
+    assert.isFalse(IpNetwork.overlaps(parent, network("0.0.0.0/0")))
+  })
+
+  it("provides checked unsafe wrappers", () => {
+    assert.strictEqual(IpNetwork.format(IpNetwork.fromAddressUnsafe(ip("10.1.2.3"), 8)), "10.0.0.0/8")
+    assert.strictEqual(IpNetwork.format(IpNetwork.fromStringUnsafe("10.0.0.0/8")), "10.0.0.0/8")
+    assert.throws(() => IpNetwork.makeUnsafe(ip("10.1.2.3"), 8))
+    assert.throws(() => IpNetwork.fromAddressUnsafe(ip("10.1.2.3"), 33))
+    assert.throws(() => IpNetwork.fromStringUnsafe("10.1.2.3/8"))
+  })
+
+  it("decodes declarations and canonically encodes Schema strings", () => {
+    const ipv6 = Schema.decodeUnknownSync(Schema.Ipv6NetworkFromString)(
+      "2001:0DB8:0000:0000:0000:0000:0000:0000/32"
+    )
+    assert.strictEqual(Schema.encodeSync(Schema.Ipv6NetworkFromString)(ipv6), "2001:db8::/32")
+    assert.strictEqual(
+      IpNetwork.format(Schema.decodeUnknownSync(Schema.IpNetworkFromString)("192.0.2.0/24")),
+      "192.0.2.0/24"
+    )
+    assert.throws(() => Schema.decodeUnknownSync(Schema.IpNetworkFromString)("192.0.2.1/24"))
+    assert.throws(() =>
+      Schema.decodeUnknownSync(Schema.IpNetwork)({ _tag: "IpNetwork", address: ip("192.0.2.0"), prefixLength: 24 })
+    )
+  })
+
+  it("matches independent range models for generated networks", () => {
+    fc.assert(fc.property(
+      fc.tuple(
+        fc.integer({ min: 0, max: 255 }),
+        fc.integer({ min: 0, max: 255 }),
+        fc.integer({ min: 0, max: 255 }),
+        fc.integer({ min: 0, max: 255 }),
+        fc.integer({ min: 0, max: 32 })
+      ),
+      ([a, b, c, d, prefix]) => {
+        const address = success(NetAddress.ipv4FromOctets([a, b, c, d]))
+        const value = success(IpNetwork.fromAddress(address, prefix))
+        const input = (((a * 256 + b) * 256 + c) * 256 + d) >>> 0
+        const hostBits = 32 - prefix
+        const hostMask = hostBits === 32 ? 0xffffffff : 2 ** hostBits - 1
+        const first = (input & ~hostMask) >>> 0
+        const last = (first | hostMask) >>> 0
+        const parsed = success(IpNetwork.fromString(IpNetwork.format(value)))
+        const firstAddress = IpNetwork.firstAddress(value)
+        const lastAddress = IpNetwork.lastAddress(value)
+        if (!NetAddress.isIpv4Address(firstAddress) || !NetAddress.isIpv4Address(lastAddress)) {
+          assert.fail("expected IPv4 bounds")
+        }
+        assert.isTrue(Equal.equals(parsed, value))
+        assert.deepStrictEqual(NetAddress.ipv4ToOctets(firstAddress), [
+          first >>> 24,
+          (first >>> 16) & 0xff,
+          (first >>> 8) & 0xff,
+          first & 0xff
+        ])
+        assert.deepStrictEqual(NetAddress.ipv4ToOctets(lastAddress), [
+          last >>> 24,
+          (last >>> 16) & 0xff,
+          (last >>> 8) & 0xff,
+          last & 0xff
+        ])
+        assert.strictEqual(IpNetwork.addressCount(value), BigInt(2) ** BigInt(hostBits))
+        assert.isTrue(IpNetwork.contains(value, address))
+      }
+    ))
+
+    fc.assert(fc.property(
+      fc.tuple(
+        fc.array(fc.integer({ min: 0, max: 0xffff }), { minLength: 8, maxLength: 8 }),
+        fc.integer({ min: 0, max: 128 })
+      ),
+      ([segments, prefix]) => {
+        const address = success(NetAddress.ipv6FromSegments(
+          segments as [number, number, number, number, number, number, number, number]
+        ))
+        const value = success(IpNetwork.fromAddress(address, prefix))
+        const input = segments.reduce((value, segment) => (value << BigInt(16)) | BigInt(segment), BigInt(0))
+        const hostBits = BigInt(128 - prefix)
+        const hostMask = (BigInt(1) << hostBits) - BigInt(1)
+        const toBigInt = (address: NetAddress.Ipv6Address) =>
+          NetAddress.ipv6ToSegments(address).reduce(
+            (value, segment) => (value << BigInt(16)) | BigInt(segment),
+            BigInt(0)
+          )
+        const firstAddress = IpNetwork.firstAddress(value)
+        const lastAddress = IpNetwork.lastAddress(value)
+        if (!NetAddress.isIpv6Address(firstAddress) || !NetAddress.isIpv6Address(lastAddress)) {
+          assert.fail("expected IPv6 bounds")
+        }
+        assert.isTrue(Equal.equals(success(IpNetwork.fromString(IpNetwork.format(value))), value))
+        assert.strictEqual(toBigInt(firstAddress), input & ~hostMask)
+        assert.strictEqual(toBigInt(lastAddress), input | hostMask)
+        assert.strictEqual(IpNetwork.addressCount(value), BigInt(1) << hostBits)
+        assert.isTrue(IpNetwork.contains(value, address))
+      }
+    ))
+  })
+})
diff --git a/repos/effect/packages/effect/test/unstable/net/NetAddress.test.ts b/repos/effect/packages/effect/test/unstable/net/NetAddress.test.ts
new file mode 100644
index 000000000..a55af3ea5
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/net/NetAddress.test.ts
@@ -0,0 +1,834 @@
+import { assert, describe, it } from "@effect/vitest"
+import { assertTrue } from "@effect/vitest/utils"
+import { Equal, Hash, Option, Result, Schema } from "effect"
+import * as NetAddress from "effect/unstable/net/NetAddress"
+import { Buffer } from "node:buffer"
+import { inspect } from "node:util"
+
+const success = <A>(result: Result.Result<A, unknown>): A => {
+  assertTrue(Result.isSuccess(result), "expected Success")
+  return result.success
+}
+
+const failure = <E>(result: Result.Result<unknown, E>): E => {
+  assertTrue(Result.isFailure(result), "expected Failure")
+  return result.failure
+}
+
+describe("NetAddress", () => {
+  it("returns IP address widths", () => {
+    assert.strictEqual(NetAddress.width(success(NetAddress.ipv4FromString("1.2.3.4"))), 32)
+    assert.strictEqual(NetAddress.width(success(NetAddress.ipv6FromString("2001:db8::1"))), 128)
+  })
+
+  describe("IPv4", () => {
+    it("parses strict dotted decimal", () => {
+      assert.strictEqual(NetAddress.formatIp(success(NetAddress.ipv4FromString("1.2.3.4"))), "1.2.3.4")
+      assert.deepStrictEqual(NetAddress.ipv4ToOctets(success(NetAddress.ipv4FromOctets([127, 0, 0, 1]))), [
+        127,
+        0,
+        0,
+        1
+      ])
+    })
+
+    it("rejects malformed inputs", () => {
+      for (
+        const input of [
+          "",
+          "127.1",
+          "127.0.0.1.2",
+          ".1.2.3",
+          "1..2.3",
+          "-1.2.3.4",
+          "+1.2.3.4",
+          " 1.2.3.4",
+          "01.2.3.4",
+          "001.002.003.004",
+          "0x7f.0.0.1",
+          "256.0.0.1"
+        ]
+      ) {
+        failure(NetAddress.ipv4FromString(input))
+      }
+      failure(NetAddress.ipv4FromOctets([0, 0, 0, 256]))
+      failure(NetAddress.ipv4FromOctets([0, 0, 0, 1.5]))
+    })
+  })
+
+  describe("IPv6", () => {
+    const cases = [
+      ["0:0:0:0:0:0:0:0", "::"],
+      ["0:0:0:0:0:0:0:1", "::1"],
+      ["2001:0DB8:0000:0000:0001:0000:0000:0001", "2001:db8::1:0:0:1"],
+      ["2001:db8:0:1:0:0:0:1", "2001:db8:0:1::1"],
+      ["2001:0:0:1:0:0:1:1", "2001::1:0:0:1:1"],
+      ["::ffff:192.0.2.128", "::ffff:192.0.2.128"],
+      ["::192.0.2.128", "::c000:280"],
+      ["2001:db8::192.0.2.1", "2001:db8::c000:201"]
+    ] as const
+
+    it("uses canonical compression and embedded IPv4 policy", () => {
+      for (const [input, expected] of cases) {
+        const parsed = success(NetAddress.ipv6FromString(input))
+        assert.strictEqual(NetAddress.formatIp(parsed), expected)
+        assert.isTrue(Equal.equals(parsed, success(NetAddress.ipv6FromString(expected))))
+      }
+    })
+
+    it("rejects malformed inputs", () => {
+      for (
+        const input of [
+          "",
+          ":",
+          ":::1",
+          "1::2::3",
+          "1:2:3:4:5:6:7",
+          "1:2:3:4:5:6:7:8:9",
+          "1:2:3:4:5:6:7:8::",
+          "1:2:3:4:5:6:7::8",
+          "gggg::1",
+          "[::1]",
+          "fe80::1%1",
+          "::ffff:999.1.1.1",
+          "::ffff:192.000.2.1",
+          "::ffff:1.2.3",
+          "192.0.2.1::"
+        ]
+      ) {
+        failure(NetAddress.ipv6FromString(input))
+      }
+      failure(NetAddress.ipv6FromSegments([0, 0, 0, 0, 0, 0, 0, 65536]))
+    })
+
+    it("round trips constructed numeric values", () => {
+      const values = [
+        success(NetAddress.ipv6FromSegments([0, 0, 0, 0, 0, 0, 0, 0])),
+        success(NetAddress.ipv6FromSegments([0x2001, 0xdb8, 0, 1, 2, 3, 4, 5])),
+        success(NetAddress.ipv6FromSegments([0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff]))
+      ]
+      for (const value of values) {
+        const encoded = NetAddress.formatIp(value)
+        assert.isTrue(Equal.equals(success(NetAddress.ipv6FromString(encoded)), value))
+      }
+    })
+
+    it("uses numeric equality and hash laws", () => {
+      const expanded = success(NetAddress.ipv6FromString("2001:db8:0:0:0:0:0:1"))
+      const compressed = success(NetAddress.ipv6FromString("2001:db8::1"))
+      assert.isTrue(Equal.equals(expanded, compressed))
+      assert.strictEqual(Hash.hash(expanded), Hash.hash(compressed))
+    })
+
+    it("converts mapped IPv4 addresses", () => {
+      const ipv4 = success(NetAddress.ipv4FromString("192.0.2.128"))
+      const mapped = NetAddress.toIpv4Mapped(ipv4)
+      assert.isTrue(NetAddress.isIpv4Mapped(mapped))
+      assert.strictEqual(NetAddress.formatIp(mapped), "::ffff:192.0.2.128")
+      assert.isTrue(Equal.equals(Option.getOrThrow(NetAddress.fromIpv4Mapped(mapped)), ipv4))
+      assert.isTrue(Option.isNone(NetAddress.fromIpv4Mapped(success(NetAddress.ipv6FromString("::1")))))
+      assert.isTrue(Equal.equals(NetAddress.toCanonical(mapped), ipv4))
+      assert.isTrue(Equal.equals(NetAddress.toCanonical(ipv4), ipv4))
+    })
+
+    it("returns IPv6 octets", () => {
+      assert.deepStrictEqual(NetAddress.ipv6ToOctets(success(NetAddress.ipv6FromString("2001:db8::1"))), [
+        0x20,
+        0x01,
+        0x0d,
+        0xb8,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1
+      ])
+      assert.strictEqual(
+        NetAddress.formatIp(NetAddress.ipv6FromBytesUnsafe(new Uint8Array(16))),
+        "::"
+      )
+      assert.strictEqual(
+        NetAddress.formatIp(NetAddress.ipv4FromBytesUnsafe(new Uint8Array([127, 0, 0, 1]))),
+        "127.0.0.1"
+      )
+    })
+  })
+
+  describe("MAC", () => {
+    it("parses and canonically formats six octets", () => {
+      const address = success(NetAddress.macAddressFromString("02:0A:0b:0C:0d:0E"))
+      assert.strictEqual(NetAddress.formatMacAddress(address), "02:0a:0b:0c:0d:0e")
+      const octets = NetAddress.macAddressToOctets(address)
+      assert.deepStrictEqual(octets, [2, 10, 11, 12, 13, 14])
+      Reflect.set(octets, 0, 0xff)
+      assert.strictEqual(NetAddress.formatMacAddress(address), "02:0a:0b:0c:0d:0e")
+      assert.isTrue(NetAddress.isMacAddress(address))
+      assert.isTrue(Equal.equals(address, success(NetAddress.macAddressFromOctets([2, 10, 11, 12, 13, 14]))))
+      assert.strictEqual(Hash.hash(address), Hash.hash(success(NetAddress.macAddressFromString("02:0a:0b:0c:0d:0e"))))
+    })
+
+    it("rejects malformed inputs and invalid octets", () => {
+      for (
+        const input of [
+          "",
+          "00:11:22:33:44",
+          "00:11:22:33:44:55:66",
+          "0:11:22:33:44:55",
+          "00-11-22-33-44-55",
+          "0011.2233.4455",
+          "gg:11:22:33:44:55"
+        ]
+      ) {
+        failure(NetAddress.macAddressFromString(input))
+      }
+      failure(NetAddress.macAddressFromOctets([0, 0, 0, 0, 0, 256]))
+      failure(NetAddress.macAddressFromOctets([0, 0, 0, 0, 0, 1.5]))
+      assert.throws(() => NetAddress.macAddressFromStringUnsafe("invalid"))
+    })
+
+    it("classifies address bits", () => {
+      const mac = (text: string) => success(NetAddress.macAddressFromString(text))
+      assert.isTrue(NetAddress.isMacBroadcast(mac("ff:ff:ff:ff:ff:ff")))
+      assert.isTrue(NetAddress.isMacMulticast(mac("01:00:5e:00:00:01")))
+      assert.isFalse(NetAddress.isMacUnicast(mac("01:00:5e:00:00:01")))
+      assert.isTrue(NetAddress.isMacUnicast(mac("00:00:5e:00:53:01")))
+      assert.isTrue(NetAddress.isMacLocallyAdministered(mac("02:00:00:00:00:01")))
+      assert.isFalse(NetAddress.isMacUniversallyAdministered(mac("02:00:00:00:00:01")))
+      assert.isTrue(NetAddress.isMacUniversallyAdministered(mac("00:00:5e:00:53:01")))
+    })
+  })
+
+  it("classifies documented address ranges at their boundaries", () => {
+    const ip = (text: string) => success(NetAddress.ipFromString(text))
+    assert.isTrue(NetAddress.isUnspecified(ip("0.0.0.0")))
+    assert.isTrue(NetAddress.isUnspecified(ip("::")))
+    assert.isTrue(NetAddress.isLoopback(ip("127.255.255.255")))
+    assert.isFalse(NetAddress.isLoopback(ip("128.0.0.0")))
+    assert.isTrue(NetAddress.isMulticast(ip("224.0.0.0")))
+    assert.isFalse(NetAddress.isMulticast(ip("223.255.255.255")))
+    assert.isTrue(NetAddress.isMulticast(ip("ff00::")))
+    assert.isTrue(NetAddress.isBroadcast(NetAddress.ipv4Broadcast))
+    assert.isFalse(NetAddress.isBroadcast(success(NetAddress.ipv4FromString("255.255.255.254"))))
+    assert.isTrue(NetAddress.isLinkLocal(ip("169.254.255.255")))
+    assert.isFalse(NetAddress.isLinkLocal(ip("169.255.0.0")))
+    assert.isTrue(NetAddress.isLinkLocal(ip("febf::")))
+    assert.isFalse(NetAddress.isLinkLocal(ip("fec0::")))
+    assert.isTrue(NetAddress.isPrivate(success(NetAddress.ipv4FromString("10.255.255.255"))))
+    assert.isTrue(NetAddress.isPrivate(success(NetAddress.ipv4FromString("172.31.255.255"))))
+    assert.isTrue(NetAddress.isPrivate(success(NetAddress.ipv4FromString("192.168.0.0"))))
+    assert.isFalse(NetAddress.isPrivate(success(NetAddress.ipv4FromString("172.32.0.0"))))
+    assert.isTrue(NetAddress.isUniqueLocal(success(NetAddress.ipv6FromString("fc00::"))))
+    assert.isTrue(
+      NetAddress.isUniqueLocal(success(NetAddress.ipv6FromString("fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")))
+    )
+    assert.isFalse(NetAddress.isUniqueLocal(success(NetAddress.ipv6FromString("fe00::"))))
+    assert.isTrue(Equal.equals(NetAddress.ipv4Unspecified, ip("0.0.0.0")))
+    assert.isTrue(Equal.equals(NetAddress.ipv6Unspecified, ip("::")))
+  })
+
+  describe("branded classifications", () => {
+    const ip = NetAddress.ipFromStringUnsafe
+    const ipv4 = (text: string) => success(NetAddress.ipv4FromString(text))
+    const ipv6 = (text: string) => success(NetAddress.ipv6FromString(text))
+    const mac = NetAddress.macAddressFromStringUnsafe
+
+    it("classifies IP boundaries without claiming reachability", () => {
+      for (const text of ["1.2.3.4", "127.0.0.1", "169.254.1.1", "240.0.0.1", "::1", "fe80::1"]) {
+        assert.isTrue(NetAddress.isUnicast(ip(text)), text)
+      }
+      for (const text of ["0.0.0.0", "224.0.0.0", "255.255.255.255", "::", "ff00::"]) {
+        assert.isFalse(NetAddress.isUnicast(ip(text)), text)
+      }
+      assert.isTrue(NetAddress.isLoopback(ip("127.0.0.0")))
+      assert.isTrue(NetAddress.isLoopback(ip("127.255.255.255")))
+      assert.isFalse(NetAddress.isLoopback(ip("128.0.0.0")))
+      assert.isTrue(NetAddress.isLoopback(ip("::1")))
+      assert.isFalse(NetAddress.isLoopback(ip("::2")))
+      assert.isFalse(NetAddress.isLoopback(ip("::ffff:127.0.0.1")))
+      assert.isFalse(NetAddress.isMulticast(ip("::ffff:224.0.0.1")))
+      assert.isTrue(NetAddress.isLinkLocal(ip("169.254.0.0")))
+      assert.isTrue(NetAddress.isLinkLocal(ip("169.254.255.255")))
+      assert.isFalse(NetAddress.isLinkLocal(ip("169.255.0.0")))
+      assert.isTrue(NetAddress.isLinkLocal(ip("fe80::")))
+      assert.isTrue(NetAddress.isLinkLocal(ip("febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff")))
+      assert.isFalse(NetAddress.isLinkLocal(ip("fec0::")))
+      for (const text of ["10.0.0.0", "10.255.255.255", "172.16.0.0", "172.31.255.255", "192.168.0.0"]) {
+        assert.isTrue(NetAddress.isPrivate(ipv4(text)), text)
+      }
+      for (const text of ["9.255.255.255", "172.15.255.255", "172.32.0.0", "192.169.0.0", "100.64.0.1"]) {
+        assert.isFalse(NetAddress.isPrivate(ipv4(text)), text)
+      }
+      assert.isTrue(NetAddress.isUniqueLocal(ipv6("fc00::")))
+      assert.isTrue(NetAddress.isUniqueLocal(ipv6("fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")))
+      assert.isFalse(NetAddress.isUniqueLocal(ipv6("fe00::")))
+    })
+
+    it("classifies the independent MAC group and administration bits", () => {
+      const cases = [
+        ["00:00:5e:00:53:01", false, false],
+        ["01:00:5e:00:00:01", true, false],
+        ["02:00:00:00:00:01", false, true],
+        ["03:00:00:00:00:01", true, true],
+        ["ff:ff:ff:ff:ff:ff", true, true]
+      ] as const
+      for (const [text, multicast, local] of cases) {
+        const address = mac(text)
+        assert.strictEqual(NetAddress.isMulticast(address), multicast)
+        assert.strictEqual(NetAddress.isMacMulticast(address), multicast)
+        assert.strictEqual(NetAddress.isUnicast(address), !multicast)
+        assert.strictEqual(NetAddress.isMacUnicast(address), !multicast)
+        assert.strictEqual(NetAddress.isMacLocallyAdministered(address), local)
+        assert.strictEqual(NetAddress.isMacUniversallyAdministered(address), !local)
+      }
+      const broadcast = mac("ff:ff:ff:ff:ff:ff")
+      assert.isTrue(NetAddress.isBroadcast(broadcast))
+      assert.isTrue(NetAddress.isMacBroadcast(broadcast))
+      assert.isTrue(NetAddress.isMulticast(broadcast))
+      assert.isFalse(NetAddress.isBroadcast(mac("01:00:5e:00:00:01")))
+      assert.isTrue(NetAddress.isBroadcast(NetAddress.ipv4Broadcast))
+      assert.isFalse(NetAddress.isMulticast(NetAddress.ipv4Broadcast))
+    })
+  })
+
+  it("serializes and inspects canonical strings without private bytes", () => {
+    const cases = [
+      [NetAddress.ipv4Loopback, "127.0.0.1"],
+      [NetAddress.ipv6Loopback, "::1"],
+      [NetAddress.macAddressFromStringUnsafe("02:0A:0B:0C:0D:0E"), "02:0a:0b:0c:0d:0e"],
+      [NetAddress.inetAddressFromStringUnsafe("127.0.0.1:80"), "127.0.0.1:80"],
+      [NetAddress.inetAddressFromStringUnsafe("[fe80::1%2]:80"), "[fe80::1%2]:80"],
+      [NetAddress.unixPathAddress("./run/../server.sock"), "./run/../server.sock"]
+    ] as const
+    for (const [address, expected] of cases) {
+      assert.strictEqual(address.toJSON(), expected)
+      assert.strictEqual(JSON.stringify(address), JSON.stringify(expected))
+      assert.strictEqual(JSON.stringify({ address }), JSON.stringify({ address: expected }))
+      assert.strictEqual(inspect(address), expected)
+    }
+  })
+
+  it("preserves the input rejected by the failing operation", () => {
+    const cases = [
+      [NetAddress.ipv4FromString, "01.2.3.4", "01.2.3.4"],
+      [NetAddress.ipv6FromString, "::ffff:192.000.2.1", "192.000.2.1"],
+      [NetAddress.macAddressFromString, "00-11-22-33-44-55", "00-11-22-33-44-55"],
+      [NetAddress.inetAddressFromString, "localhost:80", "localhost"],
+      [NetAddress.inetAddressFromString, "[::ffff:999.0.0.1]:80", "999.0.0.1"],
+      [NetAddress.inetAddressFromString, "[fe80::1%bad]:80", "[fe80::1%bad]:80"]
+    ] as const
+    for (const [parse, input, rejected] of cases) {
+      assert.strictEqual(failure(parse(input)).input, rejected)
+    }
+    assert.deepStrictEqual(failure(NetAddress.inetAddressFromString("127.0.0.1:65536")).input, NetAddress.ipv4Loopback)
+    assert.strictEqual(
+      failure(NetAddress.socketAddressFromInput({ address: "localhost", port: 80 })).input,
+      "localhost"
+    )
+    assert.strictEqual(failure(NetAddress.inetAddressFromIpString("localhost", 80)).input, "localhost")
+    const octets = [256, 0, 0, 1] as const
+    assert.strictEqual(failure(NetAddress.ipv4FromOctets(octets)).input, octets)
+  })
+
+  it("retains the address supplied to checked socket constructors", () => {
+    const ipv4 = NetAddress.ipv4Loopback
+    const ipv6 = NetAddress.ipv6Loopback
+    assert.strictEqual(failure(NetAddress.inetAddressV4(ipv4, -1)).input, ipv4)
+    assert.strictEqual(failure(NetAddress.inetAddressV6(ipv6, -1)).input, ipv6)
+    assert.strictEqual(failure(NetAddress.inetAddressV6(ipv6, 80, { scopeId: -1 })).input, ipv6)
+  })
+
+  it("converts internet addresses to normalized URL values", () => {
+    for (
+      const [input, scheme, expected] of [
+        ["[::]:3000", "https", "https://[::]:3000/"],
+        ["0.0.0.0:3000", "http", "http://0.0.0.0:3000/"],
+        ["[::1]:3000", "ws", "ws://[::1]:3000/"],
+        ["192.0.2.1:80", "http", "http://192.0.2.1/"],
+        ["[::1]:443", "HTTPS", "https://[::1]/"],
+        ["[::1]:0", "http", "http://[::1]:0/"],
+        ["192.0.2.1:65535", "http", "http://192.0.2.1:65535/"]
+      ]
+    ) {
+      const address = NetAddress.inetAddressFromStringUnsafe(input)
+      const url = success(NetAddress.toUrl(address, scheme))
+      assert.instanceOf(url, URL)
+      assert.strictEqual(url.href, expected)
+    }
+    const address = NetAddress.inetAddressFromStringUnsafe("[::]:3000")
+    const url = success(NetAddress.toUrl(address))
+    assert.strictEqual(url.href, "http://[::]:3000/")
+    url.hostname = "127.0.0.1"
+    assert.strictEqual(url.origin, "http://127.0.0.1:3000")
+    assert.strictEqual(success(NetAddress.toUrl(address, undefined)).hostname, "[::]")
+  })
+
+  it("converts bare IP addresses without adding an explicit port", () => {
+    for (
+      const [input, expected] of [
+        ["127.0.0.1", "http://127.0.0.1/"],
+        ["::1", "http://[::1]/"],
+        ["0.0.0.0", "http://0.0.0.0/"],
+        ["::", "http://[::]/"]
+      ]
+    ) {
+      const url = success(NetAddress.toUrl(NetAddress.ipFromStringUnsafe(input)))
+      assert.strictEqual(url.href, expected)
+      assert.strictEqual(url.port, "")
+    }
+    assert.strictEqual(success(NetAddress.toUrl(NetAddress.ipv6Loopback, "https")).href, "https://[::1]/")
+  })
+
+  it("formats URL strings without trailing slashes or default ports", () => {
+    assert.strictEqual(success(NetAddress.formatUrl(NetAddress.ipv4Loopback)), "http://127.0.0.1")
+    assert.strictEqual(success(NetAddress.formatUrl(NetAddress.ipv6Loopback, "https")), "https://[::1]")
+    assert.strictEqual(NetAddress.formatUrlUnsafe(NetAddress.ipv4Loopback), "http://127.0.0.1")
+    assert.strictEqual(NetAddress.formatUrlUnsafe(NetAddress.ipv6Loopback, "https"), "https://[::1]")
+    for (
+      const [input, scheme, expected] of [
+        ["192.0.2.1:80", "http", "http://192.0.2.1"],
+        ["[::1]:443", "HTTPS", "https://[::1]"],
+        ["[::]:3000", "http", "http://[::]:3000"],
+        ["[::1]:0", "http", "http://[::1]:0"],
+        ["127.0.0.1:80", "tcp", "tcp://127.0.0.1:80"]
+      ]
+    ) {
+      assert.strictEqual(success(NetAddress.formatUrl(NetAddress.inetAddressFromStringUnsafe(input), scheme)), expected)
+    }
+    const scoped = NetAddress.inetAddressFromStringUnsafe("[fe80::1%2]:3000")
+    const scopedError = failure(NetAddress.formatUrl(scoped))
+    assert.strictEqual(scopedError.input, scoped)
+    assert.include(scopedError.message, "scoped IPv6")
+    const schemeError = failure(NetAddress.formatUrl(NetAddress.ipv4Loopback, "1http"))
+    assert.strictEqual(schemeError.input, NetAddress.ipv4Loopback)
+    assert.instanceOf(schemeError.cause, TypeError)
+    assert.throws(() => NetAddress.formatUrlUnsafe(scoped), NetAddress.NetAddressError, "scoped IPv6")
+    assert.throws(() => NetAddress.formatUrlUnsafe(NetAddress.ipv4Loopback, "1http"), NetAddress.NetAddressError)
+  })
+
+  it("formats Unix socket paths without encoding or normalizing them", () => {
+    for (
+      const [path, expected] of [
+        ["/tmp/server.sock", "unix:///tmp/server.sock"],
+        ["./run/../server.sock", "unix://./run/../server.sock"],
+        ["/tmp/socket?#%20", "unix:///tmp/socket?#%20"],
+        ["/tmp/socket with spaces.sock", "unix:///tmp/socket with spaces.sock"],
+        ["", "unix://"]
+      ]
+    ) {
+      const address = NetAddress.unixPathAddress(path)
+      assert.strictEqual(NetAddress.formatUnixPath(address), expected)
+      assert.strictEqual(success(NetAddress.formatUrl(address)), expected)
+      assert.strictEqual(NetAddress.formatUrlUnsafe(address, "https"), expected)
+    }
+  })
+
+  it("returns URL conversion errors for scopes and rejected URLs", () => {
+    for (const input of ["[fe80::1%2]:3000", "[::%2]:3000"]) {
+      const scoped = NetAddress.inetAddressFromStringUnsafe(input)
+      const error = failure(NetAddress.toUrl(scoped, "http"))
+      assert.instanceOf(error, NetAddress.NetAddressError)
+      assert.strictEqual(error.input, scoped)
+      assert.include(error.message, "scoped IPv6")
+      assert.isUndefined(error.cause)
+    }
+    const address = NetAddress.inetAddressFromStringUnsafe("127.0.0.1:80")
+    for (const scheme of ["", "1http", "file"]) {
+      const error = failure(NetAddress.toUrl(address, scheme))
+      assert.instanceOf(error, NetAddress.NetAddressError)
+      assert.strictEqual(error.input, address)
+      assert.strictEqual(error.message, "failed to construct URL")
+      assert.instanceOf(error.cause, TypeError)
+    }
+  })
+
+  it("canonicalizes mapped internet addresses while retaining their port", () => {
+    const ipv4 = success(NetAddress.ipv4FromString("192.0.2.128"))
+    const expected = success(NetAddress.inetAddressV4(ipv4, 4567))
+    for (const scopeId of [0, 7]) {
+      const mapped = success(NetAddress.inetAddressV6(NetAddress.toIpv4Mapped(ipv4), 4567, { scopeId }))
+      const canonical: NetAddress.InetAddress = NetAddress.toCanonical(mapped)
+      assert.isTrue(NetAddress.isInetAddressV4(canonical))
+      assert.isTrue(Equal.equals(canonical, expected))
+      assert.strictEqual(Hash.hash(canonical), Hash.hash(expected))
+      assert.strictEqual(NetAddress.toCanonical(canonical), canonical)
+    }
+  })
+
+  it("retains identity and scope for internet addresses that need no canonicalization", () => {
+    const scoped = success(
+      NetAddress.inetAddressV6(success(NetAddress.ipv6FromString("fe80::1")), 1234, { scopeId: 3 })
+    )
+    for (const address of [success(NetAddress.inetAddressV4(NetAddress.ipv4Loopback, 1234)), scoped]) {
+      assert.strictEqual(NetAddress.toCanonical(address), address)
+    }
+    assert.strictEqual(NetAddress.toCanonical(scoped.address), scoped.address)
+  })
+
+  it("constructs immutable address values", () => {
+    const ipv4 = success(NetAddress.ipv4FromString("127.0.0.1"))
+    const ipv6 = success(NetAddress.ipv6FromString("::1"))
+    const inet4 = success(NetAddress.inetAddressV4(ipv4, 80))
+    const inet6 = success(NetAddress.inetAddressV6(ipv6, 80, { scopeId: 2 }))
+    const mac = success(NetAddress.macAddressFromString("00:00:5e:00:53:01"))
+    const unix = NetAddress.unixPathAddress("server.sock")
+
+    for (const address of [ipv4, ipv6, inet4, inet6, mac, unix]) {
+      assert.isTrue(Object.isFrozen(address))
+    }
+  })
+
+  it("copies byte constructor inputs", () => {
+    const ipv4Bytes = new Uint8Array([127, 0, 0, 1])
+    const ipv6Bytes = new Uint8Array(16)
+    ipv6Bytes[15] = 1
+    const ipv4 = NetAddress.ipv4FromBytesUnsafe(ipv4Bytes)
+    const ipv6 = NetAddress.ipv6FromBytesUnsafe(ipv6Bytes)
+    const ipv4Hash = Hash.hash(ipv4)
+    const ipv6Hash = Hash.hash(ipv6)
+
+    ipv4Bytes[0] = 1
+    ipv6Bytes[15] = 2
+
+    assert.strictEqual(NetAddress.formatIp(ipv4), "127.0.0.1")
+    assert.strictEqual(NetAddress.formatIp(ipv6), "::1")
+    assert.strictEqual(Hash.hash(ipv4), ipv4Hash)
+    assert.strictEqual(Hash.hash(ipv6), ipv6Hash)
+  })
+
+  it("copies Buffer constructor inputs", () => {
+    const ipv4Bytes = Buffer.from([127, 0, 0, 1])
+    const ipv6Bytes = Buffer.alloc(16)
+    ipv6Bytes[15] = 1
+    const ipv4 = NetAddress.ipv4FromBytesUnsafe(ipv4Bytes)
+    const ipv6 = NetAddress.ipv6FromBytesUnsafe(ipv6Bytes)
+    const ipv4Hash = Hash.hash(ipv4)
+    const ipv6Hash = Hash.hash(ipv6)
+
+    ipv4Bytes[0] = 1
+    ipv6Bytes[15] = 2
+
+    assert.strictEqual(NetAddress.formatIp(ipv4), "127.0.0.1")
+    assert.strictEqual(NetAddress.formatIp(ipv6), "::1")
+    assert.strictEqual(Hash.hash(ipv4), ipv4Hash)
+    assert.strictEqual(Hash.hash(ipv6), ipv6Hash)
+    assert.isTrue(Equal.equals(ipv4, NetAddress.ipv4Loopback))
+    assert.isTrue(Equal.equals(ipv6, NetAddress.ipv6Loopback))
+  })
+
+  it("discriminates addresses sharing the common type id", () => {
+    assert.isTrue(NetAddress.isIpv4Address(NetAddress.ipv4Loopback))
+    assert.isFalse(NetAddress.isIpv6Address(NetAddress.ipv4Loopback))
+    assert.isFalse(NetAddress.isMacAddress(NetAddress.ipv4Loopback))
+  })
+
+  it("returns NetAddressError from checked operations", () => {
+    const result = NetAddress.ipFromString("localhost")
+    assertTrue(Result.isFailure(result), "expected Failure")
+    assert.instanceOf(result.failure, NetAddress.NetAddressError)
+    assert.strictEqual(result.failure.message, "expected exactly four decimal octets")
+    assert.strictEqual(result.failure.input, "localhost")
+  })
+
+  describe("socket addresses", () => {
+    it("constructs socket addresses from input", () => {
+      const inet = NetAddress.inetAddressFromStringUnsafe("127.0.0.1:8080")
+      assert.strictEqual(success(NetAddress.socketAddressFromInput(inet)), inet)
+      assert.strictEqual(
+        NetAddress.formatSocketAddress(success(NetAddress.socketAddressFromInput("127.0.0.1:3000"))),
+        "127.0.0.1:3000"
+      )
+      assert.strictEqual(
+        NetAddress.formatSocketAddress(success(NetAddress.socketAddressFromInput("[::1]:3000"))),
+        "[::1]:3000"
+      )
+      assert.strictEqual(
+        NetAddress.formatSocketAddress(success(NetAddress.socketAddressFromInput({
+          address: "::1",
+          port: 8080
+        }))),
+        "[::1]:8080"
+      )
+      assert.strictEqual(
+        NetAddress.formatSocketAddress(success(NetAddress.socketAddressFromInput({
+          address: NetAddress.ipv4Loopback,
+          port: 8080
+        }))),
+        "127.0.0.1:8080"
+      )
+      assert.strictEqual(
+        NetAddress.formatSocketAddress(success(NetAddress.socketAddressFromInput({ path: "server.sock" }))),
+        "server.sock"
+      )
+      failure(NetAddress.socketAddressFromInput({ address: "localhost", port: 8080 }))
+      failure(NetAddress.socketAddressFromInput({ address: "127.0.0.1", port: 65536 }))
+      failure(NetAddress.socketAddressFromInput("localhost:8080"))
+      assert.throws(() => NetAddress.socketAddressFromInputUnsafe({ address: "localhost", port: 8080 }))
+    })
+
+    it("parses and formats bracketed numeric addresses", () => {
+      assert.strictEqual(
+        NetAddress.formatInet(success(NetAddress.inetAddressFromString("127.0.0.1:8080"))),
+        "127.0.0.1:8080"
+      )
+      assert.strictEqual(
+        NetAddress.formatInet(success(NetAddress.inetAddressFromString("[0:0:0:0:0:0:0:1]:8080"))),
+        "[::1]:8080"
+      )
+      assert.strictEqual(NetAddress.formatInet(success(NetAddress.inetAddressFromIpString("::1", 8080))), "[::1]:8080")
+      assert.strictEqual(NetAddress.formatUrlHost(success(NetAddress.ipv6FromString("::1"))), "[::1]")
+    })
+
+    it("formats separate socket hosts while preserving IPv6 scope", () => {
+      for (
+        const [input, expected] of [
+          ["127.0.0.1:8080", "127.0.0.1"],
+          ["[0:0:0:0:0:0:0:1]:8080", "::1"],
+          ["[fe80::1%7]:4567", "fe80::1%7"],
+          ["[fe80::1%0]:4567", "fe80::1"]
+        ]
+      ) {
+        const address = NetAddress.inetAddressFromStringUnsafe(input)
+        const host = NetAddress.formatHost(address)
+        assert.strictEqual(host, expected)
+        assert.deepStrictEqual(success(NetAddress.inetAddressFromHostString(host, address.port)), address)
+      }
+    })
+
+    it("formats native hosts using the supplied platform and interface names", () => {
+      const scopeIds = NetAddress.scopeIdsFromInterfaces([
+        ["en0", [{ family: "IPv6", scopeid: 7 }]],
+        ["en1", [{ family: "IPv6", scopeid: 7 }]]
+      ])
+      for (const platform of ["win32", "linux", "darwin", undefined]) {
+        for (
+          const [input, expected] of [
+            ["127.0.0.1:8080", "127.0.0.1"],
+            ["[0:0:0:0:0:0:0:1]:8080", "::1"],
+            ["[fe80::1%0]:4567", "fe80::1"],
+            ["[fe80::1%7]:4567", platform === "win32" ? "fe80::1%7" : "fe80::1%en0"],
+            ["[fe80::1%9]:4567", "fe80::1%9"]
+          ]
+        ) {
+          const address = NetAddress.inetAddressFromStringUnsafe(input)
+          const host = NetAddress.formatNativeHost(address, scopeIds, platform)
+          assert.strictEqual(host, expected)
+          assert.deepStrictEqual(success(NetAddress.inetAddressFromHostString(host, address.port, scopeIds)), address)
+        }
+      }
+      const address = NetAddress.inetAddressFromStringUnsafe("[fe80::1%7]:4567")
+      assert.strictEqual(NetAddress.formatNativeHost(address, scopeIds), "fe80::1%en0")
+      assert.strictEqual(NetAddress.formatNativeHost(address, new Map(), "linux"), "fe80::1%7")
+      assert.strictEqual(NetAddress.formatNativeHost(address, new Map([["eth0", 7]]), "linux"), "fe80::1%eth0")
+    })
+
+    it("formats multicast interfaces using the supplied platform and scope map", () => {
+      const scopeIds = NetAddress.scopeIdsFromInterfaces([
+        ["en0", [{ family: "IPv6", scopeid: 7 }]],
+        ["en1", [{ family: "IPv6", scopeid: 7 }]]
+      ])
+      for (const platform of ["win32", "linux", "darwin", undefined]) {
+        assert.strictEqual(
+          NetAddress.formatMulticastInterface(NetAddress.ipv4Loopback, scopeIds, platform),
+          "127.0.0.1"
+        )
+        assert.strictEqual(NetAddress.formatMulticastInterface(0, scopeIds, platform), "::")
+        assert.strictEqual(
+          NetAddress.formatMulticastInterface(7, scopeIds, platform),
+          platform === "win32" ? "::%7" : "::%en0"
+        )
+        assert.strictEqual(NetAddress.formatMulticastInterface(9, scopeIds, platform), "::%9")
+      }
+      assert.strictEqual(NetAddress.formatMulticastInterface(7, scopeIds), "::%en0")
+      assert.strictEqual(NetAddress.formatMulticastInterface(7, new Map(), "linux"), "::%7")
+      assert.strictEqual(NetAddress.formatMulticastInterface(7, new Map([["eth0", 7]]), "linux"), "::%eth0")
+    })
+
+    it("resolves named IPv6 zones only through the supplied scope map", () => {
+      for (const scopeId of [7, 9]) {
+        const scopeIds = new Map([["en0", scopeId]])
+        const address = success(NetAddress.inetAddressFromHostString("fe80::1%en0", 4567, scopeIds))
+        assert.deepStrictEqual(address, NetAddress.inetAddressFromStringUnsafe(`[fe80::1%${scopeId}]:4567`))
+      }
+      const unknown = failure(NetAddress.inetAddressFromHostString("fe80::1%en0", 4567, new Map([["en1", 7]])))
+      assert.strictEqual(unknown.input, "fe80::1%en0")
+      failure(NetAddress.inetAddressFromHostString("fe80::1%en0", 4567))
+    })
+
+    it("snapshots the first positive IPv6 scope ID from each interface", () => {
+      const linkLocal = { family: "IPv6", scopeid: 7 }
+      const interfaces = {
+        en0: [
+          { family: "IPv4", scopeid: 99 },
+          { family: "IPv6" },
+          { family: "IPv6", scopeid: 0 },
+          { family: "IPv6", scopeid: -1 },
+          linkLocal,
+          { family: "IPv6", scopeid: 9 }
+        ],
+        en1: undefined,
+        en2: [{ family: "IPv4" }, { family: "IPv6", scopeid: 0 }],
+        en3: [{ family: "IPv6", scopeid: 11 }]
+      }
+      const scopeIds = NetAddress.scopeIdsFromInterfaces(Object.entries(interfaces))
+      linkLocal.scopeid = 12
+      assert.deepStrictEqual(scopeIds, new Map([["en0", 7], ["en3", 11]]))
+      assert.deepStrictEqual(NetAddress.scopeIdsFromInterfaces([]), new Map())
+    })
+
+    it("provides throwing counterparts for trusted construction", () => {
+      const ip = NetAddress.ipFromStringUnsafe("::1")
+      assert.strictEqual(NetAddress.formatIp(ip), "::1")
+      assert.strictEqual(NetAddress.formatInet(NetAddress.inetAddressUnsafe(ip, 8080)), "[::1]:8080")
+      assert.strictEqual(
+        NetAddress.formatInet(NetAddress.inetAddressFromStringUnsafe("127.0.0.1:8080")),
+        "127.0.0.1:8080"
+      )
+      assert.throws(() => NetAddress.ipFromStringUnsafe("localhost"))
+      assert.throws(() => NetAddress.inetAddressUnsafe(ip, -1))
+      assert.throws(() => NetAddress.inetAddressFromStringUnsafe("localhost:8080"))
+    })
+
+    it("checks port boundaries and rejects ambiguous input", () => {
+      for (const port of [0, 1, 65535]) {
+        assert.strictEqual(success(NetAddress.inetAddressFromString(`127.0.0.1:${port}`)).port, port)
+      }
+      for (
+        const input of [
+          "127.0.0.1:-1",
+          "127.0.0.1:65536",
+          "127.0.0.1:1.5",
+          "127.0.0.1:00",
+          "127.0.0.1:080",
+          "localhost:80",
+          "::1:80",
+          "[::1]80",
+          "[127.0.0.1]:80",
+          "[fe80::1%]:80",
+          "[fe80::1%-1]:80",
+          "[fe80::1%1.5]:80",
+          "[fe80::1%en0]:80",
+          "[fe80::1%1%2]:80",
+          "[fe80::1%4294967296]:80"
+        ]
+      ) {
+        failure(NetAddress.inetAddressFromString(input))
+      }
+      const invalidPort = NetAddress.inetAddressFromString("127.0.0.1:65536")
+      assertTrue(Result.isFailure(invalidPort), "expected Failure")
+      assert.strictEqual(invalidPort.failure.message, "port must be an integer from 0 through 65535")
+
+      const missingPort = NetAddress.inetAddressFromString("127.0.0.1")
+      assertTrue(Result.isFailure(missingPort), "expected Failure")
+      assert.strictEqual(missingPort.failure.message, "expected host:port or [IPv6]:port")
+    })
+
+    it("preserves IPv6 scope metadata in equality and hashing", () => {
+      const address = success(NetAddress.ipv6FromString("fe80::1"))
+      const first = success(NetAddress.inetAddressV6(address, 80, { scopeId: 3 }))
+      const second = success(NetAddress.inetAddressV6(address, 80, { scopeId: 3 }))
+      const otherScope = success(NetAddress.inetAddressV6(address, 80, { scopeId: 4 }))
+      assert.isTrue(Equal.equals(first, second))
+      assert.strictEqual(Hash.hash(first), Hash.hash(second))
+      assert.isFalse(Equal.equals(first, otherScope))
+    })
+
+    it("round trips numeric IPv6 scope identifiers", () => {
+      const scoped = success(NetAddress.inetAddressFromString("[fe80::1%4294967295]:65535"))
+      if (!NetAddress.isInetAddressV6(scoped)) assert.fail("expected InetAddressV6")
+      assert.strictEqual(scoped.scopeId, 0xffffffff)
+      assert.strictEqual(NetAddress.formatInet(scoped), "[fe80::1%4294967295]:65535")
+      assert.strictEqual(
+        NetAddress.formatInet(success(NetAddress.inetAddressFromString("[fe80::1%0]:80"))),
+        "[fe80::1]:80"
+      )
+    })
+
+    it("keeps Unix paths opaque", () => {
+      const address = NetAddress.unixPathAddress("./run/../server.sock")
+      assert.strictEqual(address.path, "./run/../server.sock")
+      assert.strictEqual(NetAddress.formatSocketAddress(address), "./run/../server.sock")
+      assert.isTrue(Equal.equals(address, NetAddress.unixPathAddress("./run/../server.sock")))
+    })
+  })
+
+  it("decodes and canonically encodes schemas", () => {
+    assert.strictEqual(Schema.resolveAnnotations(Schema.IpAddress)?.identifier, "IpAddress")
+    assert.strictEqual(Schema.resolveAnnotations(Schema.IpAddressFromString)?.identifier, "IpAddressFromString")
+    const mac = Schema.decodeUnknownSync(Schema.MacAddressFromString)("02:0A:0b:0C:0d:0E")
+    assert.strictEqual(Schema.encodeSync(Schema.MacAddressFromString)(mac), "02:0a:0b:0c:0d:0e")
+    const ipv6 = Schema.decodeUnknownSync(Schema.Ipv6AddressFromString)("2001:0DB8:0:0:0:0:0:1")
+    assert.strictEqual(Schema.encodeSync(Schema.Ipv6AddressFromString)(ipv6), "2001:db8::1")
+    const inet = Schema.decodeUnknownSync(Schema.InetAddressFromString)("[0:0:0:0:0:0:0:1]:0")
+    assert.strictEqual(Schema.encodeSync(Schema.InetAddressFromString)(inet), "[::1]:0")
+    const scoped = Schema.decodeUnknownSync(Schema.InetAddressFromString)("[fe80::1%3]:80")
+    assert.strictEqual(Schema.encodeSync(Schema.InetAddressFromString)(scoped), "[fe80::1%3]:80")
+    const unix = Schema.decodeUnknownSync(Schema.UnixPathAddressFromString)("../opaque.sock")
+    assert.strictEqual(Schema.encodeSync(Schema.UnixPathAddressFromString)(unix), "../opaque.sock")
+    assert.throws(() => Schema.decodeUnknownSync(Schema.MacAddressFromString)("00-11-22-33-44-55"))
+    assert.throws(() => Schema.decodeUnknownSync(Schema.Ipv4AddressFromString)("999.0.0.1"))
+  })
+
+  it("validates branded address schemas on decode and encode", () => {
+    const multicastIp = Schema.decodeUnknownSync(Schema.IpMulticastAddressFromString)("239.255.0.1")
+    const multicastMac = Schema.decodeUnknownSync(Schema.MacMulticastAddressFromString)("01:00:5E:00:00:01")
+    const broadcastMac = Schema.decodeUnknownSync(Schema.MacBroadcastAddressFromString)("FF:FF:FF:FF:FF:FF")
+    assert.strictEqual(Schema.encodeSync(Schema.IpMulticastAddressFromString)(multicastIp), "239.255.0.1")
+    assert.strictEqual(
+      Schema.encodeSync(Schema.MacMulticastAddressFromString)(multicastMac),
+      "01:00:5e:00:00:01"
+    )
+    assert.isTrue(NetAddress.isMulticast(multicastIp))
+    assert.isTrue(NetAddress.isMulticast(multicastMac))
+    assert.isTrue(NetAddress.isMulticast(broadcastMac))
+
+    assert.isTrue(NetAddress.isUnicast(Schema.decodeUnknownSync(Schema.IpUnicastAddressFromString)("192.0.2.1")))
+    assert.isTrue(
+      NetAddress.isMacUnicast(Schema.decodeUnknownSync(Schema.MacUnicastAddressFromString)("00:00:5e:00:53:01"))
+    )
+    assert.isTrue(
+      NetAddress.isBroadcast(Schema.decodeUnknownSync(Schema.Ipv4BroadcastAddressFromString)("255.255.255.255"))
+    )
+    assert.isTrue(NetAddress.isLoopback(Schema.decodeUnknownSync(Schema.IpLoopbackAddressFromString)("::1")))
+    assert.isTrue(NetAddress.isLinkLocal(Schema.decodeUnknownSync(Schema.IpLinkLocalAddressFromString)("fe80::1")))
+    assert.isTrue(NetAddress.isUnspecified(Schema.decodeUnknownSync(Schema.IpUnspecifiedAddressFromString)("::")))
+    assert.isTrue(NetAddress.isPrivate(Schema.decodeUnknownSync(Schema.Ipv4PrivateAddressFromString)("10.0.0.1")))
+    assert.isTrue(
+      NetAddress.isUniqueLocal(Schema.decodeUnknownSync(Schema.Ipv6UniqueLocalAddressFromString)("fd00::1"))
+    )
+    assert.isTrue(
+      NetAddress.isMacLocallyAdministered(
+        Schema.decodeUnknownSync(Schema.MacLocallyAdministeredAddressFromString)("02:00:00:00:00:01")
+      )
+    )
+    assert.isTrue(
+      NetAddress.isMacUniversallyAdministered(
+        Schema.decodeUnknownSync(Schema.MacUniversallyAdministeredAddressFromString)("00:00:5e:00:53:01")
+      )
+    )
+
+    const loopback = NetAddress.ipv4Loopback
+    const decodedLoopback: NetAddress.IpAddress = Schema.decodeUnknownSync(Schema.IpLoopbackAddress)(loopback)
+    assert.strictEqual(decodedLoopback, loopback)
+    assert.isTrue(Schema.is(Schema.IpLoopbackAddress)(loopback))
+    assert.isFalse(Schema.is(Schema.IpMulticastAddress)(loopback))
+    assert.throws(
+      () => Schema.decodeUnknownSync(Schema.IpMulticastAddressFromString)("127.0.0.1"),
+      /Expected a multicast address/
+    )
+    assert.throws(
+      () => Schema.decodeUnknownSync(Schema.IpMulticastAddressFromString)("localhost"),
+      /expected exactly four decimal octets/
+    )
+    assert.throws(
+      () => Schema.encodeUnknownSync(Schema.IpMulticastAddressFromString)(loopback),
+      /Expected a multicast address/
+    )
+  })
+})
diff --git a/repos/effect/packages/effect/test/unstable/observability/OtlpExporter.test.ts b/repos/effect/packages/effect/test/unstable/observability/OtlpExporter.test.ts
index 072472de9..9f042f988 100644
--- a/repos/effect/packages/effect/test/unstable/observability/OtlpExporter.test.ts
+++ b/repos/effect/packages/effect/test/unstable/observability/OtlpExporter.test.ts
@@ -50,14 +50,17 @@ const makeExporter = (
     Effect.provide(OtlpExporter.layerFlusher)
   )
 
-const makeExporterRaw = (maxBatchSize: number | "disabled" = 1) =>
+const makeExporterRaw = (
+  maxBatchSize: number | "disabled" = 1,
+  body: (data: Array<any>) => HttpBody.HttpBody = () => HttpBody.empty
+) =>
   OtlpExporter.make({
     label: "OtlpExporterTest",
     url: "http://localhost:4318/v1/logs",
     headers: undefined,
     exportInterval: "1 hour",
     maxBatchSize,
-    body: () => [HttpBody.empty, Effect.void],
+    body: (data) => [body(data), Effect.void],
     shutdownTimeout: "1 second"
   })
 
@@ -142,12 +145,14 @@ describe("OtlpExporter", () => {
       assert.isFalse(yield* Deferred.isDone(started[1]))
 
       yield* Deferred.succeed(releases[0], undefined)
+      exporter.push({ value: 2 })
       yield* TestClock.adjust("1 second")
       yield* Deferred.await(started[1])
 
+      exporter.push({ value: 3 })
       const closeFiber = yield* Effect.forkChild(Scope.close(scope, Exit.void))
-      yield* Deferred.await(started[2])
       yield* Deferred.succeed(releases[1], undefined)
+      yield* Deferred.await(started[2])
       yield* Deferred.succeed(releases[2], undefined)
       yield* Fiber.join(closeFiber)
     }))
@@ -347,6 +352,53 @@ describe("OtlpExporter", () => {
         )
       }))
 
+    it.effect("does not export empty payloads when batching is disabled", () =>
+      Effect.gen(function*() {
+        const { httpClient } = yield* makeStatusHttpClient(200)
+        const payloads: Array<ReadonlyArray<unknown>> = []
+
+        yield* Effect.scoped(
+          Effect.gen(function*() {
+            yield* makeExporterRaw("disabled", (items) => {
+              payloads.push(items)
+              return HttpBody.empty
+            })
+            const flusher = yield* OtlpExporter.Flusher
+            yield* flusher.flush
+          }).pipe(
+            Effect.provideService(HttpClient.HttpClient, httpClient),
+            Effect.provide(OtlpExporter.layerFlusher)
+          )
+        )
+
+        assert.deepStrictEqual(payloads, [])
+      }))
+
+    it.effect("exports buffered items once when batching is disabled", () =>
+      Effect.gen(function*() {
+        const { httpClient } = yield* makeStatusHttpClient(200)
+        const payloads: Array<ReadonlyArray<unknown>> = []
+
+        yield* Effect.scoped(
+          Effect.gen(function*() {
+            const exporter = yield* makeExporterRaw("disabled", (items) => {
+              payloads.push(items)
+              return HttpBody.empty
+            })
+            const flusher = yield* OtlpExporter.Flusher
+
+            exporter.push({ value: 1 })
+            yield* flusher.flush
+            yield* flusher.flush
+          }).pipe(
+            Effect.provideService(HttpClient.HttpClient, httpClient),
+            Effect.provide(OtlpExporter.layerFlusher)
+          )
+        )
+
+        assert.deepStrictEqual(payloads, [[{ value: 1 }]])
+      }))
+
     it.effect("shares one registry across traces, logs and metrics", () =>
       Effect.gen(function*() {
         const { httpClient, urls } = yield* makeStatusHttpClient(200)
@@ -421,10 +473,11 @@ describe("OtlpExporter", () => {
         const flusher = yield* OtlpExporter.Flusher
         const scope = yield* Scope.make()
 
-        yield* makeExporterRaw("disabled").pipe(
+        const exporter = yield* makeExporterRaw("disabled").pipe(
           Effect.provideService(HttpClient.HttpClient, httpClient),
           Effect.provideService(Scope.Scope, scope)
         )
+        exporter.push({ value: 1 })
 
         yield* Scope.close(scope, Exit.void)
         assert.strictEqual(yield* Ref.get(attempts), 1)
diff --git a/repos/effect/packages/effect/test/unstable/observability/OtlpMetrics.test.ts b/repos/effect/packages/effect/test/unstable/observability/OtlpMetrics.test.ts
index 510a0a0fc..201365122 100644
--- a/repos/effect/packages/effect/test/unstable/observability/OtlpMetrics.test.ts
+++ b/repos/effect/packages/effect/test/unstable/observability/OtlpMetrics.test.ts
@@ -521,7 +521,10 @@ describe("OtlpMetrics", () => {
         // Second export should report current value 50 (not delta -50)
         const secondMetric = findMetric(requests[1], metricName)
         assert.strictEqual(secondMetric?.gauge?.dataPoints[0].asDouble, 50)
-      }).pipe(Effect.provide(layer)))
+      }).pipe(
+        Effect.provide(layer),
+        Effect.provideService(Metric.MetricRegistry, new Map())
+      ))
   })
 })
 
diff --git a/repos/effect/packages/effect/test/unstable/persistence/KeyValueStore.test.ts b/repos/effect/packages/effect/test/unstable/persistence/KeyValueStore.test.ts
index d0def431f..1e43b12e2 100644
--- a/repos/effect/packages/effect/test/unstable/persistence/KeyValueStore.test.ts
+++ b/repos/effect/packages/effect/test/unstable/persistence/KeyValueStore.test.ts
@@ -5,100 +5,102 @@ import * as KeyValueStore from "effect/unstable/persistence/KeyValueStore"
 import * as Persistence from "effect/unstable/persistence/Persistence"
 
 export const testLayer = <E>(layer: Layer.Layer<KeyValueStore.KeyValueStore, E>) => {
-  const run = <E, A>(effect: Effect.Effect<A, E, KeyValueStore.KeyValueStore>) =>
-    Effect.runPromise(Effect.provide(effect, layer))
-
-  afterEach(() =>
-    run(Effect.gen(function*() {
-      const kv = yield* (KeyValueStore.KeyValueStore)
-      yield* kv.clear
-    }))
-  )
-
-  it("set", () =>
-    run(Effect.gen(function*() {
-      const kv = yield* (KeyValueStore.KeyValueStore)
-      yield* (kv.set("/foo/bar", "bar"))
-
-      const value = yield* (kv.get("/foo/bar"))
-      const length = yield* (kv.size)
-
-      strictEqual(value, "bar")
-      strictEqual(length, 1)
-    })))
-
-  it("get/ missing", () =>
-    run(Effect.gen(function*() {
-      const kv = yield* (KeyValueStore.KeyValueStore)
-      yield* (kv.clear)
-      const value = yield* (kv.get("foo"))
-
-      strictEqual(value, undefined)
-    })))
-
-  it("remove", () =>
-    run(Effect.gen(function*() {
-      const kv = yield* (KeyValueStore.KeyValueStore)
-      yield* (kv.set("foo", "bar"))
-      yield* (kv.remove("foo"))
-
-      const value = yield* (kv.get("foo"))
-      const length = yield* (kv.size)
-
-      strictEqual(value, undefined)
-      strictEqual(length, 0)
-    })))
-
-  it("clear", () =>
-    run(Effect.gen(function*() {
-      const kv = yield* (KeyValueStore.KeyValueStore)
-      yield* (kv.set("foo", "bar"))
-      yield* (kv.clear)
-
-      const value = yield* (kv.get("foo"))
-      const length = yield* (kv.size)
-
-      strictEqual(value, undefined)
-      strictEqual(length, 0)
-    })))
-
-  it("modify", () =>
-    run(Effect.gen(function*() {
-      const kv = yield* (KeyValueStore.KeyValueStore)
-      yield* (kv.set("foo", "bar"))
-
-      const value = yield* (kv.modify("foo", (v) => v + "bar"))
-      const length = yield* (kv.size)
-
-      strictEqual(value, "barbar")
-      strictEqual(length, 1)
-    })))
-
-  it("modify - none", () =>
-    run(Effect.gen(function*() {
-      const kv = yield* (KeyValueStore.KeyValueStore)
-
-      const value = yield* (kv.modify("foo", (v) => v + "bar"))
-      const length = yield* (kv.size)
-
-      strictEqual(value, undefined)
-      strictEqual(length, 0)
-    })))
-
-  it("setMany stores entries without a TTL", () =>
-    run(
-      Effect.gen(function*() {
-        const backing = yield* Persistence.BackingPersistence
-        const store = yield* backing.make("store")
-
-        yield* store.setMany([["key", { value: 1 }, undefined]])
-
-        deepStrictEqual(yield* store.get("key"), { value: 1 })
-      }).pipe(
-        Effect.scoped,
-        Effect.provide(Persistence.layerBackingKvs)
-      )
-    ))
+  describe("store operations", { concurrent: false }, () => {
+    const run = <E, A>(effect: Effect.Effect<A, E, KeyValueStore.KeyValueStore>) =>
+      Effect.runPromise(Effect.provide(effect, layer))
+
+    afterEach(() =>
+      run(Effect.gen(function*() {
+        const kv = yield* (KeyValueStore.KeyValueStore)
+        yield* kv.clear
+      }))
+    )
+
+    it("set", () =>
+      run(Effect.gen(function*() {
+        const kv = yield* (KeyValueStore.KeyValueStore)
+        yield* (kv.set("/foo/bar", "bar"))
+
+        const value = yield* (kv.get("/foo/bar"))
+        const length = yield* (kv.size)
+
+        strictEqual(value, "bar")
+        strictEqual(length, 1)
+      })))
+
+    it("get/ missing", () =>
+      run(Effect.gen(function*() {
+        const kv = yield* (KeyValueStore.KeyValueStore)
+        yield* (kv.clear)
+        const value = yield* (kv.get("foo"))
+
+        strictEqual(value, undefined)
+      })))
+
+    it("remove", () =>
+      run(Effect.gen(function*() {
+        const kv = yield* (KeyValueStore.KeyValueStore)
+        yield* (kv.set("foo", "bar"))
+        yield* (kv.remove("foo"))
+
+        const value = yield* (kv.get("foo"))
+        const length = yield* (kv.size)
+
+        strictEqual(value, undefined)
+        strictEqual(length, 0)
+      })))
+
+    it("clear", () =>
+      run(Effect.gen(function*() {
+        const kv = yield* (KeyValueStore.KeyValueStore)
+        yield* (kv.set("foo", "bar"))
+        yield* (kv.clear)
+
+        const value = yield* (kv.get("foo"))
+        const length = yield* (kv.size)
+
+        strictEqual(value, undefined)
+        strictEqual(length, 0)
+      })))
+
+    it("modify", () =>
+      run(Effect.gen(function*() {
+        const kv = yield* (KeyValueStore.KeyValueStore)
+        yield* (kv.set("foo", "bar"))
+
+        const value = yield* (kv.modify("foo", (v) => v + "bar"))
+        const length = yield* (kv.size)
+
+        strictEqual(value, "barbar")
+        strictEqual(length, 1)
+      })))
+
+    it("modify - none", () =>
+      run(Effect.gen(function*() {
+        const kv = yield* (KeyValueStore.KeyValueStore)
+
+        const value = yield* (kv.modify("foo", (v) => v + "bar"))
+        const length = yield* (kv.size)
+
+        strictEqual(value, undefined)
+        strictEqual(length, 0)
+      })))
+
+    it("setMany stores entries without a TTL", () =>
+      run(
+        Effect.gen(function*() {
+          const backing = yield* Persistence.BackingPersistence
+          const store = yield* backing.make("store")
+
+          yield* store.setMany([["key", { value: 1 }, undefined]])
+
+          deepStrictEqual(yield* store.get("key"), { value: 1 })
+        }).pipe(
+          Effect.scoped,
+          Effect.provide(Persistence.layerBackingKvs)
+        )
+      ))
+  })
 }
 
 describe("KeyValueStore / layerMemory", () => testLayer(KeyValueStore.layerMemory))
diff --git a/repos/effect/packages/effect/test/unstable/persistence/KeyValueStoreTest.ts b/repos/effect/packages/effect/test/unstable/persistence/KeyValueStoreTest.ts
index ded171349..2e42a8254 100644
--- a/repos/effect/packages/effect/test/unstable/persistence/KeyValueStoreTest.ts
+++ b/repos/effect/packages/effect/test/unstable/persistence/KeyValueStoreTest.ts
@@ -3,8 +3,9 @@ import type { Layer } from "effect"
 import { Effect, Encoding } from "effect"
 import * as KeyValueStore from "effect/unstable/persistence/KeyValueStore"
 
+// Tests clear the shared store.
 export const suite = (name: string, layer: Layer.Layer<KeyValueStore.KeyValueStore, unknown>) =>
-  it.layer(layer, { timeout: { seconds: 30 } })(`KeyValueStore (${name})`, (it) => {
+  it.layer(layer, { timeout: { seconds: 30 }, concurrent: false })(`KeyValueStore (${name})`, (it) => {
     it.effect("set + get + size", () =>
       Effect.gen(function*() {
         const kv = yield* KeyValueStore.KeyValueStore
diff --git a/repos/effect/packages/effect/test/unstable/persistence/PersistedQueueTest.ts b/repos/effect/packages/effect/test/unstable/persistence/PersistedQueueTest.ts
index 9aa368745..cd8ae1183 100644
--- a/repos/effect/packages/effect/test/unstable/persistence/PersistedQueueTest.ts
+++ b/repos/effect/packages/effect/test/unstable/persistence/PersistedQueueTest.ts
@@ -31,12 +31,13 @@ export const suiteWith = <R>(
   testApi: Vitest.MethodsNonLive<R>,
   timeout: Duration.Input = "30 seconds"
 ) => {
+  // Tests share and advance the same TestClock.
   const testOptions = { timeout: Duration.toMillis(timeout) }
   return testApi.layer(
     PersistedQueue.layer.pipe(
       Layer.provideMerge(layer)
     ),
-    { timeout }
+    { timeout, concurrent: false }
   )(`PersistedQueue (${name})`, (it) => {
     it.effect("offer + take", () =>
       Effect.gen(function*() {
diff --git a/repos/effect/packages/effect/test/unstable/persistence/RateLimiter.test.ts b/repos/effect/packages/effect/test/unstable/persistence/RateLimiter.test.ts
index 7117d58ff..d6d9c9010 100644
--- a/repos/effect/packages/effect/test/unstable/persistence/RateLimiter.test.ts
+++ b/repos/effect/packages/effect/test/unstable/persistence/RateLimiter.test.ts
@@ -2,6 +2,9 @@ import { assert, describe, it } from "@effect/vitest"
 import { Duration, Effect } from "effect"
 import { TestClock } from "effect/testing"
 import { RateLimiter } from "effect/unstable/persistence"
+import * as RateLimiterTest from "./RateLimiterTest.ts"
+
+RateLimiterTest.suite("memory", RateLimiter.layerStoreMemory)
 
 describe(`RateLimiter`, () => {
   it.effect("supports partially applied sleep", () =>
@@ -36,6 +39,89 @@ describe(`RateLimiter`, () => {
     ))
 
   describe("fixed-window", () => {
+    it.effect("reports a full-window reset for an exact reservation", () =>
+      Effect.gen(function*() {
+        const limiter = yield* RateLimiter.make
+        const result = yield* limiter.consume({
+          algorithm: "fixed-window",
+          onExceeded: "delay",
+          key: "exact",
+          limit: 5,
+          window: "1 minute",
+          tokens: 5
+        })
+
+        assert.strictEqual(result.limit, 5)
+        assert.strictEqual(result.remaining, 0)
+        assert.deepStrictEqual(result.delay, Duration.zero)
+        assert.strictEqual(Duration.toMillis(result.resetAfter), 60_000)
+      }).pipe(Effect.provide(RateLimiter.layerStoreMemory)))
+
+    it.effect("reports a fresh partial reset lifetime without rounding", () =>
+      Effect.gen(function*() {
+        const limiter = yield* RateLimiter.make
+        const result = yield* limiter.consume({
+          algorithm: "fixed-window",
+          onExceeded: "delay",
+          key: "partial",
+          limit: 5,
+          window: "1 minute",
+          tokens: 1
+        })
+
+        assert.strictEqual(result.limit, 5)
+        assert.strictEqual(result.remaining, 4)
+        assert.deepStrictEqual(result.delay, Duration.zero)
+        assert.strictEqual(Duration.toMillis(result.resetAfter), 12_000)
+      }).pipe(Effect.provide(RateLimiter.layerStoreMemory)))
+
+    it.effect("subtracts elapsed time from reset metadata", () =>
+      Effect.gen(function*() {
+        const limiter = yield* RateLimiter.make
+        yield* limiter.consume({
+          algorithm: "fixed-window",
+          onExceeded: "delay",
+          key: "elapsed",
+          limit: 5,
+          window: "1 minute",
+          tokens: 4
+        })
+        yield* TestClock.adjust("10 seconds")
+        const result = yield* limiter.consume({
+          algorithm: "fixed-window",
+          onExceeded: "delay",
+          key: "elapsed",
+          limit: 5,
+          window: "1 minute",
+          tokens: 1
+        })
+
+        assert.strictEqual(result.limit, 5)
+        assert.strictEqual(result.remaining, 0)
+        assert.deepStrictEqual(result.delay, Duration.zero)
+        assert.strictEqual(Duration.toMillis(result.resetAfter), 50_000)
+      }).pipe(Effect.provide(RateLimiter.layerStoreMemory)))
+
+    it.effect("reports the exact reserved lifetime without changing overflow delay", () =>
+      Effect.gen(function*() {
+        const limiter = yield* RateLimiter.make
+        const consume = limiter.consume({
+          algorithm: "fixed-window",
+          onExceeded: "delay",
+          key: "overflow",
+          limit: 5,
+          window: "1 minute",
+          tokens: 1
+        })
+        for (let i = 0; i < 5; i++) yield* consume
+        const result = yield* consume
+
+        assert.strictEqual(result.limit, 5)
+        assert.strictEqual(result.remaining, -1)
+        assert.deepStrictEqual(result.delay, Duration.minutes(1))
+        assert.strictEqual(Duration.toMillis(result.resetAfter), 72_000)
+      }).pipe(Effect.provide(RateLimiter.layerStoreMemory)))
+
     it.effect("returns accumulated delays after the fixed window is exceeded", () =>
       Effect.gen(function*() {
         const limiter = yield* RateLimiter.make
diff --git a/repos/effect/packages/effect/test/unstable/persistence/RateLimiterTest.ts b/repos/effect/packages/effect/test/unstable/persistence/RateLimiterTest.ts
new file mode 100644
index 000000000..8eedcefce
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/persistence/RateLimiterTest.ts
@@ -0,0 +1,311 @@
+import { assert, it } from "@effect/vitest"
+import { Duration, Effect, type Layer } from "effect"
+import { TestClock } from "effect/testing"
+import { RateLimiter } from "effect/unstable/persistence"
+
+type OnExceeded = "fail" | "delay"
+
+const options = (key: string, onExceeded?: OnExceeded) =>
+  ({ algorithm: "token-bucket", window: "5 minutes", limit: 5, key, onExceeded }) as const
+
+const exceeded = (error: RateLimiter.RateLimiterError) =>
+  error.reason._tag === "RateLimitExceeded" ? error.reason : assert.fail("Expected RateLimitExceeded")
+
+/**
+ * Consumes `tokens`, runs `idle`, and asserts the bucket is back at capacity
+ * with a fresh refill interval.
+ */
+export const restartsInterval = Effect.fnUntraced(function*<E, R>(
+  key: string,
+  onExceeded: OnExceeded,
+  tokens: number,
+  idle: Effect.Effect<void, E, R>
+) {
+  const limiter = yield* RateLimiter.make
+  const opts = options(key, onExceeded)
+  yield* limiter.consume({ ...opts, tokens })
+  yield* idle
+  const result = yield* limiter.consume({ ...opts, tokens })
+
+  assert.strictEqual(result.remaining, 5 - tokens)
+  assert.deepStrictEqual(result.delay, Duration.zero)
+  assert.strictEqual(Duration.toMillis(result.resetAfter), tokens * 60_000)
+
+  const excess = limiter.consume({ ...opts, tokens: 6 - tokens })
+  if (onExceeded === "fail") {
+    const error = exceeded(yield* Effect.flip(excess))
+    assert.strictEqual(Duration.toMillis(error.retryAfter), 60_000)
+  } else {
+    const delayed = yield* excess
+    assert.strictEqual(delayed.remaining, -1)
+    assert.strictEqual(Duration.toMillis(delayed.delay), 60_000)
+    assert.strictEqual(Duration.toMillis(delayed.resetAfter), 360_000)
+  }
+})
+
+export const consumeFractionalCosts = Effect.fnUntraced(function*(key: string) {
+  const limiter = yield* RateLimiter.make
+  return yield* Effect.forEach(
+    [0.1, 0.1, 0.4, 0.15, 0.15, 0.1],
+    (tokens) => limiter.consume({ ...options(key), tokens })
+  )
+})
+
+export const suite = (
+  name: string,
+  layer: Layer.Layer<RateLimiter.RateLimiterStore, unknown>
+) => {
+  it.layer(layer, { timeout: "30 seconds", concurrent: false })(`RateLimiter token-bucket timing (${name})`, (it) => {
+    for (const onExceeded of ["fail", "delay"] as const) {
+      for (
+        const [elapsed, tokens, expected, resetAfter] of [
+          [59_000, 1, 1_000, 301_000],
+          [59_500, 1, 500, 300_500],
+          [59_000, 2, 61_000, 361_000],
+          [119_000, 2, 1_000, 301_000]
+        ] as const
+      ) {
+        it.effect(`${onExceeded}: ${tokens} tokens after ${elapsed}ms waits ${expected}ms`, () =>
+          Effect.gen(function*() {
+            const limiter = yield* RateLimiter.make
+            const opts = options(`timing-${onExceeded}-${elapsed}-${tokens}`, onExceeded)
+            yield* limiter.consume({ ...opts, tokens: 5 })
+            yield* TestClock.adjust(elapsed)
+
+            if (onExceeded === "fail") {
+              const error = exceeded(yield* Effect.flip(limiter.consume({ ...opts, tokens })))
+              assert.strictEqual(Duration.toMillis(error.retryAfter), expected)
+              assert.strictEqual(error.remaining, 0)
+            } else {
+              const result = yield* limiter.consume({ ...opts, tokens })
+              assert.strictEqual(Duration.toMillis(result.delay), expected)
+              assert.strictEqual(result.remaining, Math.floor(elapsed / 60_000) - tokens)
+              assert.strictEqual(Duration.toMillis(result.resetAfter), resetAfter)
+            }
+          }))
+      }
+
+      it.effect(`${onExceeded}: resetAfter accounts for elapsed time on an allowed request`, () =>
+        Effect.gen(function*() {
+          const limiter = yield* RateLimiter.make
+          const opts = options(`timing-allowed-${onExceeded}`, onExceeded)
+          const initial = yield* limiter.consume({ ...opts, tokens: 4 })
+          assert.strictEqual(Duration.toMillis(initial.resetAfter), 240_000)
+          yield* TestClock.adjust("59 seconds")
+          const result = yield* limiter.consume(opts)
+
+          assert.deepStrictEqual(result.delay, Duration.zero)
+          assert.strictEqual(result.remaining, 0)
+          assert.strictEqual(Duration.toMillis(result.resetAfter), 241_000)
+
+          yield* TestClock.adjust("241 seconds")
+          const full = yield* limiter.consume({ ...opts, tokens: 0 })
+          assert.strictEqual(full.remaining, 5)
+          assert.deepStrictEqual(full.resetAfter, Duration.zero)
+        }))
+
+      for (const [tokens, idle] of [[1, "61 seconds"], [5, "359 seconds"]] as const) {
+        it.effect(`${onExceeded}: restarts the refill interval after ${idle} idle`, () =>
+          restartsInterval(`timing-idle-${onExceeded}-${tokens}`, onExceeded, tokens, TestClock.adjust(idle)))
+      }
+    }
+
+    it.effect("restarts the interval after a zero-token call without a whole-token refill", () =>
+      Effect.gen(function*() {
+        const limiter = yield* RateLimiter.make
+        const opts = options("timing-zero-tokens")
+        const initial = yield* limiter.consume({ ...opts, tokens: 0 })
+        assert.strictEqual(initial.remaining, 5)
+        assert.deepStrictEqual(initial.resetAfter, Duration.zero)
+
+        yield* TestClock.adjust("30 seconds")
+        const result = yield* limiter.consume(opts)
+
+        assert.strictEqual(result.remaining, 4)
+        assert.deepStrictEqual(result.delay, Duration.zero)
+        assert.strictEqual(Duration.toMillis(result.resetAfter), 60_000)
+      }))
+
+    for (const allowOverflow of [false, true]) {
+      it.effect(`preserves signed fractional token counts with allowOverflow=${allowOverflow}`, () =>
+        Effect.gen(function*() {
+          const store = yield* RateLimiter.RateLimiterStore
+          const opts = {
+            key: `fractional-count-${allowOverflow}`,
+            limit: 5,
+            refillRate: Duration.minutes(1),
+            allowOverflow
+          }
+          const initial = yield* store.tokenBucket({ ...opts, tokens: 4.5 })
+          const excess = yield* store.tokenBucket({ ...opts, tokens: 1 })
+          const stored = yield* store.tokenBucket({ ...opts, tokens: 0 })
+
+          assert.deepStrictEqual([initial, excess, stored], [
+            [0.5, 0],
+            [-0.5, 0],
+            [allowOverflow ? -0.5 : 0.5, 0]
+          ])
+        }))
+    }
+
+    it.effect("preserves accumulated fractional balances and their reset timing", () =>
+      Effect.gen(function*() {
+        const results = yield* consumeFractionalCosts("fractional-accumulation")
+
+        assert.deepStrictEqual(
+          results.map((result) => ({
+            remaining: result.remaining,
+            delay: Duration.toMillis(result.delay),
+            resetAfter: Duration.toMillis(result.resetAfter)
+          })),
+          [
+            { remaining: 4.9, delay: 0, resetAfter: 60_000 },
+            { remaining: 4.800000000000001, delay: 0, resetAfter: 60_000 },
+            { remaining: 4.4, delay: 0, resetAfter: 60_000 },
+            { remaining: 4.25, delay: 0, resetAfter: 60_000 },
+            { remaining: 4.1, delay: 0, resetAfter: 60_000 },
+            { remaining: 3.9999999999999996, delay: 0, resetAfter: 120_000 }
+          ]
+        )
+      }))
+
+    it.effect("rejects a request with a fractional token deficit", () =>
+      Effect.gen(function*() {
+        const limiter = yield* RateLimiter.make
+        const opts = options("fractional-deficit", "fail")
+        yield* limiter.consume({ ...opts, tokens: 4.5 })
+
+        const error = exceeded(yield* Effect.flip(limiter.consume(opts)))
+        assert.strictEqual(error.remaining, 0)
+        assert.strictEqual(error.limit, 5)
+      }))
+
+    for (const onExceeded of ["fail", "delay"] as const) {
+      it.effect(`${onExceeded}: fractional costs reset at the next whole-token refill`, () =>
+        Effect.gen(function*() {
+          const limiter = yield* RateLimiter.make
+          const opts = options(`fractional-reset-${onExceeded}`, onExceeded)
+          const initial = yield* limiter.consume({ ...opts, tokens: 0.5 })
+          yield* TestClock.adjust("45 seconds")
+          const partial = yield* limiter.consume({ ...opts, tokens: 0 })
+          yield* TestClock.adjust("15 seconds")
+          const full = yield* limiter.consume({ ...opts, tokens: 0 })
+
+          assert.strictEqual(full.remaining, 5)
+          assert.deepStrictEqual(
+            [initial, partial, full].map((result) => Duration.toMillis(result.resetAfter)),
+            [60_000, 15_000, 0]
+          )
+        }))
+    }
+
+    it.effect("fractional deficits remain rejected until the whole-token refill", () =>
+      Effect.gen(function*() {
+        const limiter = yield* RateLimiter.make
+        const opts = options("fractional-retry-boundary", "fail")
+        yield* limiter.consume({ ...opts, tokens: 4.5 })
+        yield* TestClock.adjust("45 seconds")
+        const first = exceeded(yield* Effect.flip(limiter.consume(opts)))
+        yield* TestClock.adjust(14_999)
+        const beforeRefill = exceeded(yield* Effect.flip(limiter.consume(opts)))
+        yield* TestClock.adjust(1)
+        const allowed = yield* limiter.consume(opts)
+
+        assert.deepStrictEqual(
+          [first, beforeRefill].map((error) => Duration.toMillis(error.retryAfter)),
+          [15_000, 1]
+        )
+        assert.strictEqual(allowed.remaining, 0.5)
+        assert.deepStrictEqual(allowed.delay, Duration.zero)
+      }))
+
+    it.effect("fractional delay reservations wait for enough whole-token refills", () =>
+      Effect.gen(function*() {
+        const limiter = yield* RateLimiter.make
+        const opts = options("fractional-reservation-boundary", "delay")
+        yield* limiter.consume({ ...opts, tokens: 4.5 })
+        yield* TestClock.adjust("45 seconds")
+        const first = yield* limiter.consume(opts)
+        const second = yield* limiter.consume({ ...opts, tokens: 1.25 })
+        yield* TestClock.adjust(74_999)
+        const beforeRefill = yield* limiter.consume({ ...opts, tokens: 0 })
+        yield* TestClock.adjust(1)
+        const available = yield* limiter.consume({ ...opts, tokens: 0 })
+
+        assert.deepStrictEqual(
+          [first, second, beforeRefill, available].map((result) => ({
+            remaining: result.remaining,
+            delay: Duration.toMillis(result.delay),
+            resetAfter: Duration.toMillis(result.resetAfter)
+          })),
+          [
+            { remaining: -0.5, delay: 15_000, resetAfter: 315_000 },
+            { remaining: -1.75, delay: 75_000, resetAfter: 375_000 },
+            { remaining: -0.75, delay: 1, resetAfter: 300_001 },
+            { remaining: 0.25, delay: 0, resetAfter: 300_000 }
+          ]
+        )
+      }))
+
+    it.effect("preserves fractional elapsed milliseconds in the store tuple and timing metadata", () =>
+      Effect.gen(function*() {
+        const store = yield* RateLimiter.RateLimiterStore
+        const opts = {
+          key: "timing-fractional",
+          limit: 3,
+          refillRate: Duration.millis(1_000 / 3),
+          allowOverflow: true
+        }
+        const initial = yield* store.tokenBucket({ ...opts, tokens: 3 })
+        assert.deepStrictEqual(initial, [0, 0])
+        yield* TestClock.adjust(500)
+        const [remaining, elapsedMillis] = yield* store.tokenBucket({ ...opts, tokens: 1 })
+
+        assert.strictEqual(remaining, 0)
+        assert.closeTo(elapsedMillis, 1_000 / 6, 0.000_001)
+
+        const limiter = yield* RateLimiter.make
+        const result = yield* limiter.consume({
+          algorithm: "token-bucket",
+          onExceeded: "delay",
+          window: "1 second",
+          limit: 3,
+          key: opts.key
+        })
+        assert.strictEqual(result.remaining, -1)
+        assert.closeTo(Duration.toMillis(result.delay), 1_000 / 6, 0.000_01)
+        assert.closeTo(Duration.toMillis(result.resetAfter), 7_000 / 6, 0.000_01)
+      }))
+
+    it.effect("failed retries do not reserve tokens or move the refill boundary", () =>
+      Effect.gen(function*() {
+        const limiter = yield* RateLimiter.make
+        const opts = options("timing-fail-boundary", "fail")
+        yield* limiter.consume({ ...opts, tokens: 5 })
+        yield* Effect.flip(limiter.consume(opts))
+        yield* TestClock.adjust("59 seconds")
+        yield* Effect.flip(limiter.consume(opts))
+        yield* Effect.flip(limiter.consume(opts))
+        yield* TestClock.adjust("1 second")
+
+        const result = yield* limiter.consume(opts)
+        assert.deepStrictEqual(result.delay, Duration.zero)
+        assert.strictEqual(result.remaining, 0)
+        assert.strictEqual(Duration.toMillis(result.resetAfter), 300_000)
+      }))
+
+    it.effect("accumulated delay reservations retain the partial refill interval", () =>
+      Effect.gen(function*() {
+        const limiter = yield* RateLimiter.make
+        const opts = options("timing-delay-reservations", "delay")
+        yield* limiter.consume({ ...opts, tokens: 5 })
+        yield* TestClock.adjust("59 seconds")
+        yield* limiter.consume(opts)
+        const result = yield* limiter.consume(opts)
+
+        assert.strictEqual(Duration.toMillis(result.delay), 61_000)
+        assert.strictEqual(result.remaining, -2)
+        assert.strictEqual(Duration.toMillis(result.resetAfter), 361_000)
+      }))
+  })
+}
diff --git a/repos/effect/packages/effect/test/unstable/process/ChildProcess.test.ts b/repos/effect/packages/effect/test/unstable/process/ChildProcess.test.ts
index 31ed43eb8..9ebe2dde2 100644
--- a/repos/effect/packages/effect/test/unstable/process/ChildProcess.test.ts
+++ b/repos/effect/packages/effect/test/unstable/process/ChildProcess.test.ts
@@ -54,6 +54,12 @@ describe("ChildProcess", () => {
       assert.deepStrictEqual(cmd.args, ["hello"])
     })
 
+    it("preserves astral Unicode escapes in template arguments", () => {
+      const cmd = ChildProcess.make`echo \u{1F600} tail`
+      assert(ChildProcess.isStandardCommand(cmd))
+      assert.deepStrictEqual(cmd.args, ["😀", "tail"])
+    })
+
     it("array form should create a standard command", () => {
       const cmd = ChildProcess.make("node", ["--version"])
       assert.strictEqual(cmd._tag, "StandardCommand")
diff --git a/repos/effect/packages/effect/test/unstable/process/ChildProcessSpawnerTest.ts b/repos/effect/packages/effect/test/unstable/process/ChildProcessSpawnerTest.ts
index 9c24aa48e..56fd77d81 100644
--- a/repos/effect/packages/effect/test/unstable/process/ChildProcessSpawnerTest.ts
+++ b/repos/effect/packages/effect/test/unstable/process/ChildProcessSpawnerTest.ts
@@ -473,11 +473,12 @@ export const suite = (
               const ready = path.join(directory, "ready")
               const handle = yield* ChildProcess.make("sh", [
                 "-c",
-                "trap '' TERM; : > \"$1\"; while :; do sleep 1; done",
+                "trap '' TERM; : > \"$1\"; exec cat",
                 "force-kill",
                 ready
               ], {
                 killSignal: "SIGKILL",
+                stdin: "pipe",
                 stdout: "ignore",
                 stderr: "ignore"
               })
@@ -491,19 +492,13 @@ export const suite = (
                 TestClock.withLive
               )
 
-              const completed = yield* handle.kill({
+              yield* handle.kill({
                 killSignal: "SIGTERM",
                 forceKillAfter: "50 millis"
-              }).pipe(
-                Effect.as(true),
-                Effect.timeoutOrElse({
-                  duration: "1 second",
-                  orElse: () => Effect.succeed(false)
-                }),
-                TestClock.withLive
-              )
+              }).pipe(TestClock.withLive)
 
-              assert.isTrue(completed)
+              assert.isFalse(yield* handle.isRunning)
+              assert.isTrue(Exit.isFailure(yield* Effect.exit(handle.exitCode)))
             }))
 
           it.effect("should force kill a process when its scope closes", () =>
@@ -892,7 +887,7 @@ export const suite = (
           }))
       })
 
-      describe.sequential("process supervision", () => {
+      describe("process supervision", { concurrent: false }, () => {
         const countMatchingProcesses = (pattern: string) =>
           Effect.gen(function*() {
             const handle = yield* ChildProcess.make("bash", [
@@ -929,8 +924,18 @@ export const suite = (
             // Start the process that spawns children and grandchildren
             const handle = yield* ChildProcess.make("./spawn-children.sh", { cwd })
 
-            // Give it time to spawn all processes
-            yield* TestClock.withLive(Effect.sleep("100 millis"))
+            const readyCount = yield* handle.stdout.pipe(
+              Stream.decodeText,
+              Stream.splitLines,
+              Stream.filter((line) =>
+                line.includes(" started with PID ")
+              ),
+              Stream.take(7),
+              Stream.runCount,
+              Effect.timeout("2 seconds"),
+              TestClock.withLive
+            )
+            assert.strictEqual(readyCount, 7, "all seven processes must report readiness before stdout closes")
 
             // Verify the main process is running
             const isRunningBeforeKill = yield* handle.isRunning
@@ -942,9 +947,7 @@ export const suite = (
               "ps aux | grep spawn-children.sh | grep -v grep | wc -l"
             ])
             const beforeKill = yield* decodeByteStream(beforeKillHandle.stdout).pipe(
-              Effect.map((s) =>
-                Number.parseInt(s.trim())
-              ),
+              Effect.map((s) => Number.parseInt(s.trim())),
               Effect.orElseSucceed(() => 0)
             )
             assert.isAtLeast(beforeKill, 7)
diff --git a/repos/effect/packages/effect/test/unstable/schema/VariantSchema.test.ts b/repos/effect/packages/effect/test/unstable/schema/VariantSchema.test.ts
index 9d6bc6e3f..32c760309 100644
--- a/repos/effect/packages/effect/test/unstable/schema/VariantSchema.test.ts
+++ b/repos/effect/packages/effect/test/unstable/schema/VariantSchema.test.ts
@@ -84,6 +84,21 @@ describe("VariantSchema", () => {
 })
 
 describe("Model", () => {
+  it("preserves classes when extracting the default variant", () => {
+    class Person extends Model.Class<Person>("Person")({
+      name: Schema.String
+    }) {}
+
+    const person = Schema.decodeSync(Model.extract(Person, "select"))({ name: "Alex" })
+
+    assert.isTrue(person instanceof Person)
+  })
+
+  it("FieldOption preserves omitted variants", () => {
+    const field = Model.FieldOption(Model.Field({ select: Schema.String, json: undefined }))
+    assert.strictEqual(field.schemas.json, undefined)
+  })
+
   it("FieldOnly includes fields only in listed variants", () => {
     const InsertOnly = Model.Struct({
       value: Model.FieldOnly(["insert"])(Schema.String)
diff --git a/repos/effect/packages/effect/test/unstable/socket/Socket.test.ts b/repos/effect/packages/effect/test/unstable/socket/Socket.test.ts
index 36f70ecc9..201136f55 100644
--- a/repos/effect/packages/effect/test/unstable/socket/Socket.test.ts
+++ b/repos/effect/packages/effect/test/unstable/socket/Socket.test.ts
@@ -3,7 +3,6 @@ import * as Effect from "effect/Effect"
 import * as Exit from "effect/Exit"
 import * as Fiber from "effect/Fiber"
 import * as Latch from "effect/Latch"
-import * as Scheduler from "effect/Scheduler"
 import * as Stream from "effect/Stream"
 import * as Socket from "effect/unstable/socket/Socket"
 
@@ -133,66 +132,15 @@ describe("Socket", () => {
         assert.strictEqual(ws.listenerCount("open"), 0)
       }))
 
-    it.effect("coalesces same-tick messages through the Scheduler and does not pause after deliver", () =>
-      Effect.gen(function*() {
-        const tasks: Array<() => void> = []
-        const scheduler: Scheduler.Scheduler = {
-          executionMode: "sync",
-          shouldYield: () => false,
-          makeDispatcher: () => ({
-            scheduleTask(task) {
-              tasks.push(task)
-            },
-            flush() {
-              while (tasks.length > 0) tasks.shift()!()
-            }
-          })
-        }
-        const ws = new TestWebSocket(Latch.makeUnsafe(false))
-        ws.readyState = 1
-        const socket = yield* Socket.fromWebSocket(Effect.succeed(ws))
-        const { pull } = yield* socket.reader.pipe(
-          Effect.provideService(Scheduler.Scheduler, scheduler)
-        )
-        assert.strictEqual(ws.pauseCount, 0)
-        const reader = yield* pull.pipe(Effect.forkChild({ startImmediately: true }))
-        assert.strictEqual(ws.resumeCount, 0)
-
-        ws.dispatch("message", { data: "hello" })
-        ws.dispatch("message", { data: "world" })
-
-        assert.isUndefined(reader.pollUnsafe())
-        assert.lengthOf(tasks, 1)
-        scheduler.makeDispatcher().flush()
-        assert.deepStrictEqual(yield* Fiber.join(reader), ["hello", "world"])
-        assert.strictEqual(ws.pauseCount, 0)
-      }))
-
     it.effect("pauses at the highWaterMark and resumes after draining", () =>
       Effect.gen(function*() {
-        const tasks: Array<() => void> = []
-        const scheduler: Scheduler.Scheduler = {
-          executionMode: "sync",
-          shouldYield: () => false,
-          makeDispatcher: () => ({
-            scheduleTask(task) {
-              tasks.push(task)
-            },
-            flush() {
-              while (tasks.length > 0) tasks.shift()!()
-            }
-          })
-        }
         const ws = new TestWebSocket(Latch.makeUnsafe(false))
         ws.readyState = 1
         const socket = yield* Socket.fromWebSocket(Effect.succeed(ws), { highWaterMark: 10 })
-        const { pull } = yield* socket.reader.pipe(
-          Effect.provideService(Scheduler.Scheduler, scheduler)
-        )
+        const { pull } = yield* socket.reader
         const firstPull = yield* pull.pipe(Effect.forkChild({ startImmediately: true }))
 
         ws.dispatch("message", { data: "first" })
-        scheduler.makeDispatcher().flush()
         assert.deepStrictEqual(yield* Fiber.join(firstPull), ["first"])
 
         ws.dispatch("message", { data: "hello" })
@@ -204,6 +152,19 @@ describe("Socket", () => {
         assert.strictEqual(ws.resumeCount, 1)
       }))
 
+    it.effect("counts text frames toward the highWaterMark by UTF-8 byte length", () =>
+      Effect.gen(function*() {
+        const ws = new TestWebSocket(Latch.makeUnsafe(false))
+        ws.readyState = 1
+        const socket = yield* Socket.fromWebSocket(Effect.succeed(ws), { highWaterMark: 3 })
+        const { pull } = yield* socket.reader
+
+        ws.dispatch("message", { data: "€" })
+
+        assert.strictEqual(ws.pauseCount, 1)
+        assert.deepStrictEqual(yield* pull, ["€"])
+      }))
+
     it.effect("uses the default highWaterMark for pausable sockets", () =>
       Effect.gen(function*() {
         const ws = new TestWebSocket(Latch.makeUnsafe(false))
diff --git a/repos/effect/packages/effect/test/unstable/sql/SqlClient.test.ts b/repos/effect/packages/effect/test/unstable/sql/SqlClient.test.ts
index 9bcb9ad57..f08338f67 100644
--- a/repos/effect/packages/effect/test/unstable/sql/SqlClient.test.ts
+++ b/repos/effect/packages/effect/test/unstable/sql/SqlClient.test.ts
@@ -24,11 +24,17 @@ let harnessIdCounter = 0
  * The stubs mirror the driver contract: `rollback` and `rollbackSavepoint` fail
  * when no transaction or savepoint is active, which is what a real database
  * reports when a rollback is issued after a failed `BEGIN`.
+ *
+ * Savepoint release is opt-in, as it is for drivers: pass `true` to enable it,
+ * or a `SqlError` to enable it and have it fail.
  */
-const makeHarness = (failures: {
+const makeHarness = (options: {
   readonly begin?: SqlError.SqlError | undefined
   readonly savepoint?: SqlError.SqlError | undefined
+  readonly rollbackSavepoint?: SqlError.SqlError | undefined
+  readonly releaseSavepoint?: true | SqlError.SqlError | undefined
 } = {}) => {
+  const release = options.releaseSavepoint
   const calls: Array<string> = []
   const conn: StubConnection = { id: "stub" }
   const transactionService = Context.Service<
@@ -54,16 +60,16 @@ const makeHarness = (failures: {
       )),
     begin: () =>
       Effect.flatMap(record("begin"), () => {
-        if (failures.begin !== undefined) {
-          return Effect.fail(failures.begin)
+        if (options.begin !== undefined) {
+          return Effect.fail(options.begin)
         }
         transactionActive = true
         return Effect.void
       }),
     savepoint: (_conn, id) =>
       Effect.flatMap(record(`savepoint(${id})`), () => {
-        if (failures.savepoint !== undefined) {
-          return Effect.fail(failures.savepoint)
+        if (options.savepoint !== undefined) {
+          return Effect.fail(options.savepoint)
         }
         savepoints.push(id)
         return Effect.void
@@ -83,12 +89,18 @@ const makeHarness = (failures: {
           })
           : Effect.fail(sqlError("cannot rollback - no transaction is active"))),
     rollbackSavepoint: (_conn, id) =>
-      Effect.flatMap(record(`rollbackSavepoint(${id})`), () =>
-        savepoints.includes(id)
-          ? Effect.sync(() => {
-            savepoints.splice(savepoints.indexOf(id), 1)
-          })
-          : Effect.fail(sqlError(`cannot rollback to savepoint ${id} - it does not exist`)))
+      Effect.flatMap(record(`rollbackSavepoint(${id})`), () => {
+        if (options.rollbackSavepoint !== undefined) {
+          return Effect.fail(options.rollbackSavepoint)
+        }
+        return savepoints.includes(id)
+          ? Effect.void
+          : Effect.fail(sqlError(`cannot rollback to savepoint ${id} - it does not exist`))
+      }),
+    releaseSavepoint: release === undefined ?
+      undefined :
+      (_conn, id) =>
+        Effect.flatMap(record(`releaseSavepoint(${id})`), () => release === true ? Effect.void : Effect.fail(release))
   })
 
   return { calls, withTransaction } as const
@@ -156,6 +168,81 @@ describe("SqlClient", () => {
         ])
       }))
 
+    it.effect("releases savepoints after nested transactions succeed or roll back", () =>
+      Effect.gen(function*() {
+        const harness = makeHarness({ releaseSavepoint: true })
+
+        const exit = yield* harness.withTransaction(Effect.gen(function*() {
+          yield* harness.withTransaction(Effect.void)
+          return yield* Effect.exit(harness.withTransaction(Effect.fail("boom" as const)))
+        }))
+
+        assertTypedFailure(exit, "boom" as const)
+        assert.deepStrictEqual(harness.calls, [
+          "acquireConnection",
+          "begin",
+          "savepoint(1)",
+          "releaseSavepoint(1)",
+          "savepoint(1)",
+          "rollbackSavepoint(1)",
+          "releaseSavepoint(1)",
+          "commit",
+          "closeConnection"
+        ])
+      }))
+
+    it.effect("does not release savepoints when the driver does not opt in", () =>
+      Effect.gen(function*() {
+        const harness = makeHarness()
+
+        const result = yield* harness.withTransaction(harness.withTransaction(Effect.succeed(1)))
+
+        assert.strictEqual(result, 1)
+        assert.deepStrictEqual(harness.calls, [
+          "acquireConnection",
+          "begin",
+          "savepoint(1)",
+          "commit",
+          "closeConnection"
+        ])
+      }))
+
+    it.effect("skips savepoint release when rollback fails", () =>
+      Effect.gen(function*() {
+        const rollbackError = sqlError("cannot roll back savepoint")
+        const harness = makeHarness({ releaseSavepoint: true, rollbackSavepoint: rollbackError })
+
+        const exit = yield* Effect.exit(harness.withTransaction(harness.withTransaction(Effect.fail("boom"))))
+
+        assert.deepStrictEqual(exit, Exit.failCause(Cause.combine(Cause.fail("boom"), Cause.die(rollbackError))))
+        assert.deepStrictEqual(harness.calls, [
+          "acquireConnection",
+          "begin",
+          "savepoint(1)",
+          "rollbackSavepoint(1)",
+          "rollback",
+          "closeConnection"
+        ])
+      }))
+
+    it.effect("rolls back the outer transaction when a savepoint release fails", () =>
+      Effect.gen(function*() {
+        const releaseError = sqlError("cannot release savepoint")
+        const harness = makeHarness({ releaseSavepoint: releaseError })
+
+        const exit = yield* Effect.exit(harness.withTransaction(harness.withTransaction(Effect.void)))
+
+        assert.deepStrictEqual(exit, Exit.die(releaseError))
+        assert.deepStrictEqual(harness.calls, [
+          "acquireConnection",
+          "begin",
+          "savepoint(1)",
+          "releaseSavepoint(1)",
+          "rollback",
+          "closeConnection"
+        ])
+      }))
+
     it.effect("closes the connection scope when begin fails", () =>
       Effect.gen(function*() {
         const harness = makeHarness({ begin: sqlError("database is locked") })
diff --git a/repos/effect/packages/effect/test/unstable/sql/Statement.test.ts b/repos/effect/packages/effect/test/unstable/sql/Statement.test.ts
index 0f15afc2e..b4b505528 100644
--- a/repos/effect/packages/effect/test/unstable/sql/Statement.test.ts
+++ b/repos/effect/packages/effect/test/unstable/sql/Statement.test.ts
@@ -1,4 +1,8 @@
 import { assert, describe, it } from "@effect/vitest"
+import { Effect, Option, References, Stream } from "effect"
+import * as Reactivity from "effect/unstable/reactivity/Reactivity"
+import * as SqlClient from "effect/unstable/sql/SqlClient"
+import type { Connection } from "effect/unstable/sql/SqlConnection"
 import * as Statement from "effect/unstable/sql/Statement"
 
 describe("Statement", () => {
@@ -32,4 +36,91 @@ describe("Statement", () => {
     assert.deepStrictEqual(postgres.compile(fragment, false), ["\"value\"$1", [1]])
     assert.deepStrictEqual(sqlite.compile(fragment, false), ["\"value\"?", [1]])
   })
+
+  it("renumbers a cached returning fragment", () => {
+    const sql = Statement.make(
+      Effect.void as any,
+      Statement.makeCompiler({
+        dialect: "pg",
+        placeholder: (index) => `$${index}`,
+        onIdentifier: Statement.defaultEscape("\""),
+        onRecordUpdate: () => ["", []],
+        onCustom: () => ["", []]
+      }),
+      [],
+      undefined
+    )
+    const returning = sql`${"label"} AS label`
+
+    assert.deepStrictEqual(returning.compile(), ["$1 AS label", ["label"]])
+    assert.deepStrictEqual(
+      sql`INSERT INTO people ${sql.insert({ name: "Ada" }).returning(returning)}, ${"extra"} AS extra`.compile(),
+      ["INSERT INTO people (\"name\") VALUES ($1) RETURNING $2 AS label, $3 AS extra", ["Ada", "label", "extra"]]
+    )
+  })
+
+  it.effect("reads propagation overrides when executing existing statements and streams", () =>
+    Effect.gen(function*() {
+      let expected = "none"
+      const sql = yield* makeClient(Effect.map(Effect.option(Effect.currentSpan), (span) => {
+        assert.strictEqual(Option.isSome(span) ? span.value.name : "none", expected)
+      }))
+      const query = sql`select 1`
+      const run = Effect.andThen(query, Stream.runDrain(query.stream))
+
+      yield* run
+      expected = "sql.execute"
+      yield* Effect.provideService(run, Statement.SpanPropagationEnabled, true)
+      expected = "none"
+      yield* run.pipe(
+        Effect.provideService(Statement.SpanPropagationEnabled, false),
+        Effect.provideService(Statement.SpanPropagationEnabled, true)
+      )
+    }).pipe(Effect.provide(Reactivity.layer)))
+
+  it.effect("parents acquisition, execution, and pulls without adding stack frames", () =>
+    Effect.gen(function*() {
+      const frame = yield* Effect.service(References.CurrentStackFrame)
+      const observe = Effect.gen(function*() {
+        assert.strictEqual((yield* Effect.orDie(Effect.currentSpan)).name, "sql.execute")
+        assert.strictEqual(yield* Effect.service(References.CurrentStackFrame), frame)
+      })
+      const acquired = yield* makeClient(observe)
+      const borrowed = yield* makeClient(observe, true)
+
+      yield* Effect.gen(function*() {
+        yield* acquired`select 1`
+        yield* borrowed`select 1`
+        yield* Stream.runDrain(borrowed`select 1`.stream)
+      }).pipe(Effect.provideService(Statement.SpanPropagationEnabled, true))
+    }).pipe(Effect.provide(Reactivity.layer)))
+
+  it.effect("skips propagation when tracing is disabled", () =>
+    Effect.gen(function*() {
+      const sql = yield* makeClient(Effect.map(Effect.option(Effect.currentSpan), (span) => {
+        assert.isTrue(Option.isNone(span))
+      }))
+      yield* Effect.andThen(sql`select 1`, Stream.runDrain(sql`select 1`.stream)).pipe(
+        Effect.provideService(Statement.SpanPropagationEnabled, true),
+        Effect.provideService(References.TracerEnabled, false)
+      )
+    }).pipe(Effect.provide(Reactivity.layer)))
 })
+
+const makeClient = (observe: Effect.Effect<void>, borrow = false) => {
+  const execute = Effect.as(observe, [])
+  const connection: Connection = {
+    execute: () => execute,
+    executeRaw: () => execute,
+    executeValues: () => execute,
+    executeUnprepared: () => execute,
+    executeValuesUnprepared: () => execute,
+    executeStream: () => Stream.fromEffect(execute)
+  }
+  return SqlClient.make({
+    acquirer: Effect.as(observe, connection),
+    borrower: borrow ? (f) => Effect.andThen(observe, f(connection)) : undefined,
+    compiler: Statement.makeCompilerSqlite(),
+    spanAttributes: []
+  })
+}
diff --git a/repos/effect/packages/effect/test/unstable/workers/Worker.test.ts b/repos/effect/packages/effect/test/unstable/workers/Worker.test.ts
new file mode 100644
index 000000000..a533bf819
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/workers/Worker.test.ts
@@ -0,0 +1,91 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Deferred, Effect, Exit, Fiber } from "effect"
+import * as Worker from "effect/unstable/workers/Worker"
+import { isWorkerError, WorkerError, WorkerReceiveError } from "effect/unstable/workers/WorkerError"
+
+interface TestPort {
+  readonly postMessage: (message: any, transfers?: any) => void
+}
+
+const testPort: TestPort = { postMessage: () => {} }
+
+const makePlatform = (
+  onListen: (options: {
+    readonly emit: (data: any) => void
+    readonly deferred: Deferred.Deferred<never, WorkerError>
+  }) => void
+) =>
+  Worker.makePlatform<TestPort>()({
+    setup: ({ worker }) => Effect.succeed(worker),
+    listen: ({ deferred, emit }) => Effect.sync(() => onListen({ deferred, emit }))
+  })
+
+const spawnerLayer = Worker.layerSpawner(() => testPort)
+
+const exitError = new WorkerError({
+  reason: new WorkerReceiveError({ message: "The worker has exited with code: 1" })
+})
+
+describe("Worker", () => {
+  it.effect("run fails when the worker exits before the ready message", () =>
+    Effect.gen(function*() {
+      const platform = makePlatform(({ deferred }) => {
+        Deferred.doneUnsafe(deferred, exitError)
+      })
+      const worker = yield* platform.spawn(0)
+      const error = yield* Effect.flip(worker.run(() => Effect.void))
+      assert.isTrue(isWorkerError(error))
+    }).pipe(Effect.provide(spawnerLayer)))
+
+  it.effect("run fails when the worker exits while waiting for ready", () =>
+    Effect.gen(function*() {
+      let deferred: Deferred.Deferred<never, WorkerError> | undefined
+      const platform = makePlatform((options) => {
+        deferred = options.deferred
+      })
+      const worker = yield* platform.spawn(0)
+      const fiber = yield* Effect.forkChild(
+        worker.run(() => Effect.void),
+        { startImmediately: true }
+      )
+      assert.isUndefined(fiber.pollUnsafe())
+
+      Deferred.doneUnsafe(deferred!, exitError)
+      const exit = yield* Fiber.await(fiber)
+      assert.isTrue(Exit.isFailure(exit))
+    }).pipe(Effect.provide(spawnerLayer)))
+
+  it.effect("run is interruptible while waiting for ready", () =>
+    Effect.gen(function*() {
+      const platform = makePlatform(() => {})
+      const worker = yield* platform.spawn(0)
+      const fiber = yield* Effect.forkChild(
+        worker.run(() => Effect.void),
+        { startImmediately: true }
+      )
+      assert.isUndefined(fiber.pollUnsafe())
+
+      yield* Fiber.interrupt(fiber)
+      const exit = yield* Fiber.await(fiber)
+      assert.isTrue(Exit.hasInterrupts(exit))
+    }).pipe(Effect.provide(spawnerLayer)))
+
+  it.effect("run still fails on worker exit after ready", () =>
+    Effect.gen(function*() {
+      let deferred: Deferred.Deferred<never, WorkerError> | undefined
+      const platform = makePlatform((options) => {
+        deferred = options.deferred
+        options.emit([0])
+      })
+      const worker = yield* platform.spawn(0)
+      const fiber = yield* Effect.forkChild(
+        worker.run(() => Effect.void),
+        { startImmediately: true }
+      )
+      assert.isUndefined(fiber.pollUnsafe())
+
+      Deferred.doneUnsafe(deferred!, exitError)
+      const exit = yield* Fiber.await(fiber)
+      assert.isTrue(Exit.isFailure(exit))
+    }).pipe(Effect.provide(spawnerLayer)))
+})
diff --git a/repos/effect/packages/effect/test/unstable/workflow/Workflow.test.ts b/repos/effect/packages/effect/test/unstable/workflow/Workflow.test.ts
new file mode 100644
index 000000000..47674f3bf
--- /dev/null
+++ b/repos/effect/packages/effect/test/unstable/workflow/Workflow.test.ts
@@ -0,0 +1,40 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Effect, Exit, Fiber, Scheduler } from "effect"
+import { Workflow } from "effect/unstable/workflow"
+import { WorkflowInstance } from "effect/unstable/workflow/WorkflowEngine"
+
+describe("Workflow.wrapActivityResult", () => {
+  it.effect("releases acquisition interrupted before the body starts", () =>
+    Effect.gen(function*() {
+      const workflow = Workflow.make("ActivityInterruption", {
+        payload: {},
+        idempotencyKey: () => "activity-interruption"
+      })
+      const instance = WorkflowInstance.initial(workflow, "acquisition")
+      const scheduler = new class extends Scheduler.MixedScheduler {
+        yielded = false
+        override shouldYield(fiber: Fiber.Fiber<unknown, unknown>): boolean {
+          if (this.yielded || instance.activityState.count !== 1) return super.shouldYield(fiber)
+          this.yielded = true
+          return true
+        }
+      }()
+      let entered = false
+      const fiber = yield* Workflow.wrapActivityResult(
+        Effect.sync(() => {
+          entered = true
+        }),
+        () => false
+      ).pipe(
+        Effect.provideService(WorkflowInstance, instance),
+        Effect.provideService(Scheduler.Scheduler, scheduler),
+        Effect.forkChild({ startImmediately: true })
+      )
+      assert.isTrue(scheduler.yielded)
+      yield* Fiber.interrupt(fiber)
+      assert.isTrue(Exit.hasInterrupts(yield* Fiber.await(fiber)))
+      assert.isFalse(entered)
+      assert.strictEqual(instance.activityState.count, 0)
+      yield* instance.activityState.latch.await
+    }))
+})
diff --git a/repos/effect/packages/effect/test/unstable/workflow/WorkflowEngine.test.ts b/repos/effect/packages/effect/test/unstable/workflow/WorkflowEngine.test.ts
index 3b26601e4..1da1e95bd 100644
--- a/repos/effect/packages/effect/test/unstable/workflow/WorkflowEngine.test.ts
+++ b/repos/effect/packages/effect/test/unstable/workflow/WorkflowEngine.test.ts
@@ -1,7 +1,89 @@
 import { assert, describe, it } from "@effect/vitest"
-import { Effect, Exit, Fiber, Latch, Layer, Option, Ref, Schema, Scope } from "effect"
+import { Cause, Duration, Effect, Exit, Fiber, Latch, Layer, Option, Ref, Schema, Scope } from "effect"
 import { TestClock } from "effect/testing"
-import { DurableDeferred, Workflow, WorkflowEngine } from "effect/unstable/workflow"
+import { Activity, DurableClock, DurableDeferred, Workflow, WorkflowEngine } from "effect/unstable/workflow"
+
+describe("deferred self-completion", () => {
+  for (const failure of [false, true]) {
+    it.live(failure ? "failure" : "success", () =>
+      Effect.gen(function*() {
+        const signal = DurableDeferred.make("signal", { success: Schema.String, error: Schema.String })
+        const read = yield* Latch.make()
+        const cleanup = yield* Latch.make()
+        const release = yield* Latch.make()
+        const events: Array<string> = []
+        let runs = 0
+        const workflow = Workflow.make("SelfCompletion", {
+          payload: {},
+          success: Schema.String,
+          error: Schema.String,
+          idempotencyKey: () => "one"
+        })
+        const layer = workflow.toLayer(() =>
+          Effect.gen(function*() {
+            const run = ++runs
+            events.push(`start-${run}`)
+            const engine = yield* WorkflowEngine.WorkflowEngine
+            return yield* DurableDeferred.raceAll({
+              name: "race",
+              success: Schema.String,
+              error: Schema.String,
+              effects: [
+                DurableDeferred.await(signal),
+                read.await.pipe(
+                  Effect.andThen(Effect.yieldNow),
+                  Effect.andThen(failure ? Effect.fail("boom") : Effect.succeed("ok")),
+                  DurableDeferred.into(signal),
+                  // Successful completion must preempt this producer and replay the run.
+                  Effect.andThen(Effect.never),
+                  Effect.onInterrupt(() =>
+                    run === 1
+                      ? Effect.gen(function*() {
+                        events.push("cleanup-start")
+                        yield* cleanup.open
+                        yield* release.await
+                        events.push("cleanup-end")
+                      })
+                      : Effect.void
+                  )
+                )
+              ]
+            }).pipe(
+              Effect.provideService(WorkflowEngine.WorkflowEngine, {
+                ...engine,
+                deferredResult: (deferred) =>
+                  engine.deferredResult(deferred).pipe(
+                    Effect.tap(() => deferred.name === signal.name ? read.open : Effect.void)
+                  )
+              }),
+              Effect.ensuring(Effect.sync(() => events.push(`end-${run}`)))
+            )
+          })
+        ).pipe(Layer.provideMerge(WorkflowEngine.layerMemory))
+
+        yield* Effect.gen(function*() {
+          const execution = yield* workflow.execute({}).pipe(Effect.exit, Effect.forkChild({ startImmediately: true }))
+          if (!failure) {
+            yield* cleanup.await
+            for (let i = 0; i < 20; i++) yield* Effect.yieldNow
+            assert.deepStrictEqual(events, ["start-1", "cleanup-start"], "replay must wait for cleanup")
+            yield* release.open
+          }
+          const result = yield* Fiber.join(execution)
+          if (failure) {
+            assert.ok(Exit.isFailure(result))
+            assert.strictEqual(result.cause.reasons.length, 1)
+            const reason = result.cause.reasons[0]
+            assert.ok(Cause.isFailReason(reason))
+            assert.strictEqual(reason.error, "boom")
+          } else {
+            assert.deepStrictEqual(result, Exit.succeed("ok"))
+            assert.deepStrictEqual(events, ["start-1", "cleanup-start", "cleanup-end", "end-1", "start-2", "end-2"])
+          }
+        }).pipe(Effect.provide(layer))
+      }), 5_000)
+  }
+})
 
 describe("WorkflowEngine", () => {
   const IncrementWorkflow = Workflow.make("WorkflowEngine/IncrementWorkflow", {
@@ -61,6 +143,194 @@ describe("WorkflowEngine", () => {
       ))
     ))
 
+  for (
+    const { childCount, concurrency, waves } of [
+      { childCount: 3, concurrency: "unbounded" as const, waves: [3] },
+      { childCount: 5, concurrency: 2, waves: [2, 4, 5] }
+    ]
+  ) {
+    it.effect(`layerMemory replays suspended activity fan-out with concurrency ${concurrency}`, () =>
+      Effect.gen(function*() {
+        const Parent = Workflow.make("WorkflowEngine/FanOutParent", {
+          payload: {},
+          success: Schema.Array(Schema.Number),
+          idempotencyKey: () => "parent"
+        })
+        const Child = Workflow.make("WorkflowEngine/FanOutChild", {
+          payload: { index: Schema.Number },
+          success: Schema.Number,
+          idempotencyKey: ({ index }) => String(index)
+        })
+        const started = new Set<number>()
+        let parentRuns = 0
+        let activityRuns = 0
+        let released = 0
+        const ParentLayer = Parent.toLayer(() =>
+          Effect.suspend(() => {
+            parentRuns++
+            return Activity.make({
+              name: "fan-out",
+              success: Schema.Array(Schema.Number),
+              execute: Effect.suspend(() => {
+                activityRuns++
+                return Effect.forEach(
+                  Array.from({ length: childCount }, (_, index) => index),
+                  (index) => Child.execute({ index }),
+                  { concurrency }
+                )
+              }).pipe(Effect.ensuring(Effect.sync(() => {
+                released++
+              })))
+            })
+          })
+        )
+        const ChildLayer = Child.toLayer(Effect.fnUntraced(function*({ index }) {
+          started.add(index)
+          yield* DurableClock.sleep({ name: "child", duration: "2 seconds", inMemoryThreshold: Duration.zero })
+          return index
+        }))
+        yield* Effect.gen(function*() {
+          const executionId = yield* Parent.execute({}, { discard: true })
+          // Execution-ID digests use real promises, so wait for state rather than clock ticks.
+          for (const expected of waves) {
+            let result = yield* Parent.poll(executionId)
+            while (Option.isNone(result) || result.value._tag !== "Suspended" || started.size !== expected) {
+              yield* Effect.yieldNow
+              result = yield* Parent.poll(executionId)
+            }
+            assert.deepStrictEqual([...started].sort(), Array.from({ length: expected }, (_, index) => index))
+            assert.strictEqual(released, activityRuns)
+            assert.isAtMost(activityRuns, parentRuns)
+            if (expected === waves[0]) assert.strictEqual(parentRuns, 1)
+            yield* TestClock.adjust("2 seconds")
+          }
+          let result = yield* Parent.poll(executionId)
+          while (Option.isNone(result) || result.value._tag !== "Complete") {
+            yield* Effect.yieldNow
+            result = yield* Parent.poll(executionId)
+          }
+          assert.deepStrictEqual(
+            result.value,
+            new Workflow.Complete({ exit: Exit.succeed(Array.from({ length: childCount }, (_, index) => index)) })
+          )
+          assert.isAtLeast(parentRuns, waves.length + 1)
+          assert.isAtMost(activityRuns, parentRuns)
+        }).pipe(
+          Effect.provide(Layer.mergeAll(ParentLayer, ChildLayer).pipe(Layer.provideMerge(WorkflowEngine.layerMemory)))
+        )
+      }))
+  }
+
+  it.effect("layerMemory resumes when children complete during activity cleanup", () =>
+    Effect.gen(function*() {
+      const cleaningUp = yield* Latch.make()
+      const release = yield* Latch.make()
+      const Parent = Workflow.make("WorkflowEngine/CleanupParent", {
+        payload: {},
+        success: Schema.Array(Schema.Number),
+        idempotencyKey: () => "parent"
+      })
+      const Child = Workflow.make("WorkflowEngine/CleanupChild", {
+        payload: { index: Schema.Number },
+        success: Schema.Number,
+        idempotencyKey: ({ index }) => String(index)
+      })
+      const ParentLayer = Parent.toLayer(() =>
+        Activity.make({
+          name: "children",
+          success: Schema.Array(Schema.Number),
+          execute: Effect.forEach([0, 1], (index) => Child.execute({ index }), { concurrency: "unbounded" }).pipe(
+            Effect.ensuring(Effect.andThen(cleaningUp.open, release.await))
+          )
+        })
+      )
+      const ChildLayer = Child.toLayer(({ index }) =>
+        DurableClock.sleep({ name: "wait", duration: "2 seconds", inMemoryThreshold: Duration.zero }).pipe(
+          Effect.as(index)
+        )
+      )
+      yield* Effect.gen(function*() {
+        const executionId = yield* Parent.execute({}, { discard: true })
+        yield* cleaningUp.await
+        yield* TestClock.adjust("2 seconds")
+        yield* release.open
+        let result = yield* Parent.poll(executionId)
+        while (Option.isNone(result) || result.value._tag !== "Complete") {
+          yield* Effect.yieldNow
+          result = yield* Parent.poll(executionId)
+        }
+        assert.deepStrictEqual(
+          result.value,
+          new Workflow.Complete({ exit: Exit.succeed([0, 1]) })
+        )
+      }).pipe(
+        Effect.provide(Layer.mergeAll(ParentLayer, ChildLayer).pipe(Layer.provideMerge(WorkflowEngine.layerMemory)))
+      )
+    }))
+
+  for (const mode of ["failure", "interruption"] as const) {
+    it.effect(`layerMemory releases a pending child registration on ${mode}`, () =>
+      Effect.gen(function*() {
+        const computingId = yield* Latch.make()
+        const started = new Set<number>()
+        const Parent = Workflow.make(`WorkflowEngine/PendingParent/${mode}`, {
+          payload: {},
+          success: Schema.Array(Schema.Number),
+          idempotencyKey: () => "parent"
+        })
+        const Child = Workflow.make(`WorkflowEngine/PendingChild/${mode}`, {
+          payload: { index: Schema.Number },
+          success: Schema.Number,
+          idempotencyKey: ({ index }) => {
+            if (index === 1) {
+              if (mode === "failure") throw new Error("cannot compute the execution id")
+              computingId.openUnsafe()
+            }
+            return String(index)
+          }
+        })
+        const ParentLayer = Parent.toLayer(() =>
+          Activity.make({
+            name: "children",
+            success: Schema.Array(Schema.Number),
+            execute: Effect.forEach([0, 1], (index) => {
+              const execute = Child.execute({ index })
+              if (index === 0) return execute
+              return mode === "failure"
+                ? Effect.catchDefect(execute, () => Effect.succeed(-1))
+                : Effect.raceFirst(execute, Effect.as(computingId.await, -1))
+            }, { concurrency: "unbounded" })
+          })
+        )
+        const ChildLayer = Child.toLayer(Effect.fnUntraced(function*({ index }) {
+          started.add(index)
+          yield* DurableClock.sleep({ name: "wait", duration: "2 seconds", inMemoryThreshold: Duration.zero })
+          return index
+        }))
+        yield* Effect.gen(function*() {
+          const executionId = yield* Parent.execute({}, { discard: true })
+          let result = yield* Parent.poll(executionId)
+          while (Option.isNone(result) || result.value._tag !== "Suspended") {
+            yield* Effect.yieldNow
+            result = yield* Parent.poll(executionId)
+          }
+          assert.deepStrictEqual([...started], [0])
+          yield* TestClock.adjust("2 seconds")
+          result = yield* Parent.poll(executionId)
+          while (Option.isNone(result) || result.value._tag !== "Complete") {
+            yield* Effect.yieldNow
+            result = yield* Parent.poll(executionId)
+          }
+          assert.deepStrictEqual(
+            result.value,
+            new Workflow.Complete({ exit: Exit.succeed([0, -1]) })
+          )
+        }).pipe(
+          Effect.provide(Layer.mergeAll(ParentLayer, ChildLayer).pipe(Layer.provideMerge(WorkflowEngine.layerMemory)))
+        )
+      }))
+  }
+
   it.effect("discard returns the deterministic execution ID", () =>
     Effect.gen(function*() {
       const executionId = yield* IncrementWorkflow.executionId({ value: 1 })
diff --git a/repos/effect/packages/effect/test/utils/gc.ts b/repos/effect/packages/effect/test/utils/gc.ts
new file mode 100644
index 000000000..f12ba1c14
--- /dev/null
+++ b/repos/effect/packages/effect/test/utils/gc.ts
@@ -0,0 +1,14 @@
+import { Effect } from "effect"
+
+export const collectGarbage = Effect.promise(async () => {
+  const { setFlagsFromString } = await import("node:v8")
+  const { runInNewContext } = await import("node:vm")
+  setFlagsFromString("--expose_gc")
+  const collect = runInNewContext("gc") as () => void
+  setFlagsFromString("--no-expose_gc")
+  // WeakRef targets remain alive until the current job ends, so collect across jobs.
+  for (let i = 0; i < 8; i++) {
+    await new Promise((resolve) => setTimeout(resolve, 0))
+    collect()
+  }
+})
diff --git a/repos/effect/packages/effect/typetest/ByteSize.tst.ts b/repos/effect/packages/effect/typetest/ByteSize.tst.ts
index 071a3d41c..ccb809571 100644
--- a/repos/effect/packages/effect/typetest/ByteSize.tst.ts
+++ b/repos/effect/packages/effect/typetest/ByteSize.tst.ts
@@ -4,6 +4,50 @@ import { describe, expect, it } from "tstyche"
 declare const value: ByteSizeType.ByteSize
 
 describe("ByteSize", () => {
+  it("accepts only canonical integral string inputs", () => {
+    expect("0B").type.toBeAssignableTo<ByteSizeType.Input>()
+    expect("4MB").type.toBeAssignableTo<ByteSizeType.Input>()
+    expect("100 kB").type.toBeAssignableTo<ByteSizeType.Input>()
+    expect("12KiB").type.toBeAssignableTo<ByteSizeType.Input>()
+    expect("9007199254740993 B").type.toBeAssignableTo<ByteSizeType.Input>()
+    expect("1 byte").type.toBeAssignableTo<ByteSizeType.Input>()
+    expect("2 megabytes").type.toBeAssignableTo<ByteSizeType.Input>()
+    expect("3 mebibytes").type.toBeAssignableTo<ByteSizeType.Input>()
+    expect("1QB").type.toBeAssignableTo<ByteSizeType.Input>()
+    expect("1YiB").type.toBeAssignableTo<ByteSizeType.Input>()
+    expect("").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("hello").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("4Mb").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("100Kb").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("1 KB").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("1mb").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("1b").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("1").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("-1B").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("+1B").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("01B").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("00B").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("1.5MB").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("0.1KiB").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("1e3B").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("0x10B").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("0X10 B").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("0b10B").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("0o10B").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("1_000B").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("NaNB").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("InfinityB").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect(" 1B").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("1B ").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("1  B").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("1\tB").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("1\nB").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect("1 B trailing").type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect<string>().type.not.toBeAssignableTo<ByteSizeType.Input>()
+    expect(ByteSize.fromInputUnsafe("4MB")).type.toBe<ByteSizeType.ByteSize>()
+    expect(ByteSize.fromString("1.5 MB")).type.toBe<Option.Option<ByteSizeType.ByteSize>>()
+  })
+
   it("distinguishes decimal and binary units", () => {
     expect("B").type.toBeAssignableTo<ByteSizeType.DecimalUnit>()
     expect("B").type.toBeAssignableTo<ByteSizeType.BinaryUnit>()
@@ -23,6 +67,8 @@ describe("ByteSize", () => {
   })
 
   it("infers data-last arithmetic", () => {
+    expect(value).type.toBeAssignableTo<bigint>()
+    expect<bigint>().type.not.toBeAssignableTo<ByteSizeType.ByteSize>()
     expect(ByteSize.sum(value)(value)).type.toBe<ByteSizeType.ByteSize>()
     expect(ByteSize.times(2)(value)).type.toBe<Option.Option<ByteSizeType.ByteSize>>()
   })
diff --git a/repos/effect/packages/effect/typetest/Channel.tst.ts b/repos/effect/packages/effect/typetest/Channel.tst.ts
index 7124e9972..6031c4f99 100644
--- a/repos/effect/packages/effect/typetest/Channel.tst.ts
+++ b/repos/effect/packages/effect/typetest/Channel.tst.ts
@@ -12,6 +12,18 @@ class AiError extends Data.TaggedError("AiError")<{ readonly reason: RateLimit |
 
 declare const aiChannel: Channel.Channel<number, AiError | ErrorB>
 
+describe("Channel.catchDefect", () => {
+  it("supports data-last usage", () => {
+    const result = pipe(channel, Channel.catchDefect(() => Channel.fail("recovery" as const)))
+    expect(result).type.toBe<Channel.Channel<number, ErrorA | ErrorB | "recovery">>()
+  })
+
+  it("supports data-first usage", () => {
+    const result = Channel.catchDefect(channel, () => Channel.succeed("recovered"))
+    expect(result).type.toBe<Channel.Channel<number | string, ErrorA | ErrorB>>()
+  })
+})
+
 describe("Channel.catchTag", () => {
   it("removes the handled error when orElse is omitted", () => {
     const result = pipe(channel, Channel.catchTag("ErrorA", () => Channel.succeed(1)))
diff --git a/repos/effect/packages/effect/typetest/Context.tst.ts b/repos/effect/packages/effect/typetest/Context.tst.ts
index 0c1c89cc3..4a01cf441 100644
--- a/repos/effect/packages/effect/typetest/Context.tst.ts
+++ b/repos/effect/packages/effect/typetest/Context.tst.ts
@@ -9,3 +9,10 @@ it("does not type a service removed with addOrOmit as present", () => {
   expect(Context.get).type.not.toBeCallableWith(context, Service)
   expect(Context.get).type.not.toBeCallableWith(dataFirst, Service)
 })
+
+it("infers services for a saved curried getter", () => {
+  const Service = Context.Service<{ readonly value: number }>("TestService")
+  const getService = Context.get(Service)
+
+  expect(getService(Context.make(Service, { value: 1 }))).type.toBe<{ readonly value: number }>()
+})
diff --git a/repos/effect/packages/effect/typetest/Effect.tst.ts b/repos/effect/packages/effect/typetest/Effect.tst.ts
index 6a655cbb1..51008bd38 100644
--- a/repos/effect/packages/effect/typetest/Effect.tst.ts
+++ b/repos/effect/packages/effect/typetest/Effect.tst.ts
@@ -4,11 +4,14 @@ import {
   type Channel,
   Context,
   Data,
+  Duration,
   Effect,
   type ExecutionPlan,
+  Exit,
   Fiber,
   HashMap,
   type Layer,
+  Metric,
   type Option,
   pipe,
   Result,
@@ -71,8 +74,28 @@ declare const resultStringOrNumber: Result.Result<string, "err-1"> | Result.Resu
 declare const fiberStringOrNumber: Fiber.Fiber<string, "err-1"> | Fiber.Fiber<number, "err-2">
 declare const stringArray: Array<Effect.Effect<string, "err-3", "dep-3">>
 declare const numberRecord: Record<string, Effect.Effect<number, "err-4", "dep-4">>
+declare const unionRecord: { a: typeof string } | { b: typeof number }
 declare const optionalEffect: Option.Option<Effect.Effect<string, "err-1", "dep-1">>
 declare const iterableString: Effect.Effect<Iterable<string>, "err-1", "dep-1">
+declare const unknownValue: unknown
+
+describe("Effect.isEffect", () => {
+  it("narrows unknown values to unknown success, error, and service types", () => {
+    if (Effect.isEffect(unknownValue)) {
+      expect(unknownValue).type.toBe<Effect.Effect<unknown, unknown, unknown>>()
+    }
+  })
+})
+
+describe("Effect.orElseSucceed", () => {
+  it("passes the previous error in data-first usage", () => {
+    const result = Effect.orElseSucceed(string, (error) => {
+      expect(error).type.toBe<"err-1">()
+      return error.length
+    })
+    expect(result).type.toBe<Effect.Effect<string | number, never, "dep-1">>()
+  })
+})
 
 class AcquireReleaseDependency extends Context.Service<AcquireReleaseDependency, string>()(
   "AcquireReleaseDependency"
@@ -125,22 +148,38 @@ describe("Types", () => {
 })
 
 describe("Effect.try", () => {
-  it("supports direct-thunk form", () => {
+  it("infers UnknownError for the direct-thunk form", () => {
     const result = Effect.try(() => 1)
     expect(result).type.toBe<Effect.Effect<number, Cause.UnknownError>>()
   })
 
-  it("supports options form with typed error mapping", () => {
+  it("rejects a narrower return annotation for the direct-thunk form", () => {
+    function load(): Effect.Effect<number, SimpleError> {
+      // @ts-expect-error is not assignable to type
+      return Effect.try(() => 1)
+    }
+    expect(load).type.toBe<() => Effect.Effect<number, SimpleError>>()
+  })
+
+  it("infers the mapped error from the options form", () => {
     const result = Effect.try({
       try: () => 1,
       catch: () => new SimpleError({ code: 1 })
     })
     expect(result).type.toBe<Effect.Effect<number, SimpleError>>()
   })
+
+  it("rejects a generic alias that erases UnknownError", () => {
+    expect(Effect.try).type.not.toBeAssignableTo<
+      <A, E>(
+        options: (() => A) | { readonly try: () => A; readonly catch: (error: unknown) => E }
+      ) => Effect.Effect<A, E>
+    >()
+  })
 })
 
 describe("Effect.tryPromise", () => {
-  it("supports direct-thunk form", () => {
+  it("infers UnknownError for the direct-thunk form", () => {
     const result = Effect.tryPromise((signal) => {
       expect(signal).type.toBe<AbortSignal>()
       return Promise.resolve(1)
@@ -148,7 +187,15 @@ describe("Effect.tryPromise", () => {
     expect(result).type.toBe<Effect.Effect<number, Cause.UnknownError>>()
   })
 
-  it("supports options form with typed error mapping", () => {
+  it("rejects a narrower return annotation for the direct-thunk form", () => {
+    function load(): Effect.Effect<number, SimpleError> {
+      // @ts-expect-error is not assignable to type
+      return Effect.tryPromise(() => Promise.resolve(1))
+    }
+    expect(load).type.toBe<() => Effect.Effect<number, SimpleError>>()
+  })
+
+  it("infers the mapped error from the options form", () => {
     const result = Effect.tryPromise({
       try: (signal) => {
         expect(signal).type.toBe<AbortSignal>()
@@ -158,6 +205,16 @@ describe("Effect.tryPromise", () => {
     })
     expect(result).type.toBe<Effect.Effect<number, SimpleError>>()
   })
+
+  it("rejects a generic alias that erases UnknownError", () => {
+    expect(Effect.tryPromise).type.not.toBeAssignableTo<
+      <A, E>(
+        options:
+          | ((signal: AbortSignal) => PromiseLike<A>)
+          | { readonly try: (signal: AbortSignal) => PromiseLike<A>; readonly catch: (error: unknown) => E }
+      ) => Effect.Effect<A, E>
+    >()
+  })
 })
 
 describe("Effect.catchReason", () => {
@@ -706,6 +763,13 @@ describe("Effect.acquireRelease", () => {
   })
 })
 
+describe("Effect.tapDefect", () => {
+  it("saved operator preserves the source error type", () => {
+    const observe = Effect.tapDefect(() => Effect.void)
+    expect(observe(Effect.fail("boom"))).type.toBe<Effect.Effect<never, string>>()
+  })
+})
+
 describe("Effect.tapErrorTag", () => {
   it("narrows tagged errors", () => {
     const result = pipe(
@@ -1120,6 +1184,41 @@ describe("all", () => {
       Effect.Effect<void, never, "dep-4">
     >()
   })
+
+  it("union of records", () => {
+    expect(Effect.all(unionRecord)).type.toBe<
+      Effect.Effect<{ a: string } | { b: number }, "err-1" | "err-2", "dep-1" | "dep-2">
+    >()
+    expect(Effect.all(unionRecord, { discard: true })).type.toBe<
+      Effect.Effect<void, "err-1" | "err-2", "dep-1" | "dep-2">
+    >()
+    expect(Effect.all(unionRecord, { mode: "result" })).type.toBe<
+      Effect.Effect<
+        { a: Result.Result<string, "err-1"> } | { b: Result.Result<number, "err-2"> },
+        never,
+        "dep-1" | "dep-2"
+      >
+    >()
+  })
+})
+
+describe("Effect.repeatOrElse", () => {
+  const source = Effect.succeed("input")
+  const schedule = null as unknown as Schedule.Schedule<number, string>
+
+  it("passes the previous schedule metadata to the direct fallback", () => {
+    Effect.repeatOrElse(source, schedule, (_error, previous) => {
+      expect(previous).type.toBe<Option.Option<Schedule.Metadata<number, string>>>()
+      return Effect.succeed(0)
+    })
+  })
+
+  it("passes the previous schedule metadata to the curried fallback", () => {
+    source.pipe(Effect.repeatOrElse(schedule, (_error, previous) => {
+      expect(previous).type.toBe<Option.Option<Schedule.Metadata<number, string>>>()
+      return Effect.succeed(0)
+    }))
+  })
 })
 
 describe("Effect.retry", () => {
@@ -1250,6 +1349,24 @@ describe("Effect.updateServiceScoped", () => {
   })
 })
 
+describe("Effect.effectify", () => {
+  it("error mappers receive caller inputs without the callback", () => {
+    const fn = (input: string, callback: (error: Error | null, value?: string) => void) => callback(null, input)
+
+    Effect.effectify(fn, (_error, args) => {
+      expect(args).type.toBe<[input: string]>()
+      return args
+    })
+    Effect.effectify(fn, (_error, args) => {
+      expect(args).type.toBe<[input: string]>()
+      return args
+    }, (_error, args) => {
+      expect(args).type.toBe<[input: string]>()
+      return args
+    })
+  })
+})
+
 describe("Effect.withExecutionPlan", () => {
   const plan = null as unknown as ExecutionPlan.ExecutionPlan<{
     provides: "provided"
@@ -1287,3 +1404,44 @@ describe("Effect.withExecutionPlan", () => {
     expect(result).type.toBe<Effect.Effect<number, string, "other-dep" | "plan-dep">>()
   })
 })
+
+describe("Effect.cachedWithTTL", () => {
+  it("data-first", () => {
+    const cached = Effect.cachedWithTTL(number, (exit) => {
+      expect(exit).type.toBe<Exit.Exit<number, "err-2">>()
+      return Exit.isSuccess(exit) ? Duration.seconds(exit.value) : 0
+    })
+
+    expect(cached).type.toBe<Effect.Effect<Effect.Effect<number, "err-2", "dep-2">>>()
+  })
+
+  it("data-last", () => {
+    const cached = number.pipe(Effect.cachedWithTTL((exit) => {
+      expect(exit).type.toBe<Exit.Exit<number, "err-2">>()
+      return Exit.isSuccess(exit) ? "1 second" : 0
+    }))
+
+    expect(cached).type.toBe<Effect.Effect<Effect.Effect<number, "err-2", "dep-2">>>()
+  })
+})
+
+describe("Effect.track", () => {
+  const observe = Effect.track(
+    Metric.gauge("track"),
+    (exit: Exit.Exit<number, string>) => Exit.isSuccess(exit) ? exit.value : 0
+  )
+
+  it("rejects incompatible source errors", () => {
+    expect(observe).type.not.toBeCallableWith(Effect.fail(1))
+  })
+
+  it("preserves compatible narrow errors", () => {
+    expect(observe(number)).type.toBe<Effect.Effect<number, "err-2", "dep-2">>()
+  })
+})
+
+describe("Effect.withErrorReporting", () => {
+  it("returns an Effect for an Exit input", () => {
+    expect(Effect.withErrorReporting(Exit.succeed(1))).type.toBe<Effect.Effect<number>>()
+  })
+})
diff --git a/repos/effect/packages/effect/typetest/Effectable.tst.ts b/repos/effect/packages/effect/typetest/Effectable.tst.ts
new file mode 100644
index 000000000..3179e3bec
--- /dev/null
+++ b/repos/effect/packages/effect/typetest/Effectable.tst.ts
@@ -0,0 +1,72 @@
+import { Effect, Effectable } from "effect"
+import { describe, expect, it } from "tstyche"
+
+describe("Effectable.Mixin", () => {
+  class Box {
+    constructor(readonly value: number) {}
+  }
+
+  class EffectBox extends Effectable.Mixin(Box) {
+    override asEffect() {
+      return Effect.succeed(this.value.toString())
+    }
+  }
+
+  class FullEffectBox extends Effectable.Mixin(Box) {
+    override asEffect() {
+      return undefined as unknown as Effect.Effect<"success", "error", "service">
+    }
+  }
+
+  it("preserves constructor parameters", () => {
+    expect<ConstructorParameters<typeof EffectBox>>().type.toBe<[value: number]>()
+  })
+
+  it("rejects unknown properties", () => {
+    expect(new EffectBox(1)).type.not.toHaveProperty("typo")
+  })
+
+  it("supports abstract base classes", () => {
+    abstract class AbstractBox {
+      constructor(readonly value: number) {}
+      abstract double(): number
+    }
+
+    class ConcreteBox extends Effectable.Mixin(AbstractBox) {
+      double() {
+        return this.value * 2
+      }
+      override asEffect() {
+        return Effect.succeed(this.double())
+      }
+    }
+
+    expect<ConstructorParameters<typeof ConcreteBox>>().type.toBe<[value: number]>()
+    expect(new ConcreteBox(1)).type.toBeAssignableTo<AbstractBox>()
+    expect(new ConcreteBox(1)).type.toBeAssignableTo<Effect.Effect<number>>()
+    // @ts-expect-error does not implement inherited abstract member double
+    class MissingDouble extends Effectable.Mixin(AbstractBox) {
+      override asEffect() {
+        return Effect.succeed(this.value)
+      }
+    }
+  })
+
+  it("instances are Effects of the asEffect success type and original class instances", () => {
+    expect<Effect.Success<EffectBox>>().type.toBe<string>()
+    expect(new EffectBox(1)).type.toBeAssignableTo<Effect.Effect<string>>()
+    expect(new EffectBox(1)).type.toBeAssignableTo<Box>()
+  })
+
+  it("propagates success, error, and services through yield*", () => {
+    const effect = Effect.gen(function*() {
+      return yield* new FullEffectBox(1)
+    })
+    expect(effect).type.toBe<Effect.Effect<"success", "error", "service">>()
+  })
+
+  it("requires asEffect", () => {
+    // @ts-expect-error does not implement inherited abstract member asEffect
+    class MissingAsEffect extends Effectable.Mixin(Box) {}
+  })
+})
diff --git a/repos/effect/packages/effect/typetest/FileSystem.tst.ts b/repos/effect/packages/effect/typetest/FileSystem.tst.ts
new file mode 100644
index 000000000..dd319cb04
--- /dev/null
+++ b/repos/effect/packages/effect/typetest/FileSystem.tst.ts
@@ -0,0 +1,17 @@
+import type { ByteSize, Effect, FileSystem, PlatformError } from "effect"
+import { describe, expect, it } from "tstyche"
+
+describe("FileSystem", () => {
+  it("uses numbers for buffer sizes and ByteSize for logical file sizes", () => {
+    expect<FileSystem.File.Info["size"]>().type.toBe<ByteSize.ByteSize>()
+    expect<Parameters<FileSystem.File["readAlloc"]>[0]>().type.toBe<number>()
+    expect<NonNullable<Parameters<FileSystem.FileSystem["stream"]>[1]>["chunkSize"]>().type.toBe<
+      number | undefined
+    >()
+    expect<Parameters<FileSystem.File["truncate"]>[0]>().type.toBe<number | undefined>()
+    expect<Parameters<FileSystem.File["seek"]>[0]>().type.toBe<bigint>()
+    expect<ReturnType<FileSystem.File["seek"]>>().type.toBe<Effect.Effect<bigint, PlatformError.PlatformError>>()
+    expect<Effect.Success<ReturnType<FileSystem.File["read"]>>>().type.toBe<number>()
+    expect<Effect.Success<ReturnType<FileSystem.File["write"]>>>().type.toBe<number>()
+  })
+})
diff --git a/repos/effect/packages/effect/typetest/Layer.tst.ts b/repos/effect/packages/effect/typetest/Layer.tst.ts
new file mode 100644
index 000000000..ddad96b1f
--- /dev/null
+++ b/repos/effect/packages/effect/typetest/Layer.tst.ts
@@ -0,0 +1,23 @@
+/** @effect-diagnostics missingEffectError:skip-file */
+import { type Cause, Effect, Layer } from "effect"
+import { it } from "tstyche"
+
+const source = Layer.effectDiscard(Effect.fail<string | number>(123))
+
+it("tapError rejects an observer that cannot handle every source error", () => {
+  const observer = (error: string) => Effect.succeed(error.toUpperCase())
+
+  // @ts-expect-error is not assignable
+  Layer.tapError(source, observer)
+  // @ts-expect-error is not assignable
+  source.pipe(Layer.tapError(observer))
+})
+
+it("tapCause rejects an observer that cannot handle every source error", () => {
+  const observer = (cause: Cause.Cause<string>) => Effect.succeed(cause.reasons)
+
+  // @ts-expect-error is not assignable
+  Layer.tapCause(source, observer)
+  // @ts-expect-error is not assignable
+  source.pipe(Layer.tapCause(observer))
+})
diff --git a/repos/effect/packages/effect/typetest/Match.tst.ts b/repos/effect/packages/effect/typetest/Match.tst.ts
index ec16d6ffd..0850bf4a9 100644
--- a/repos/effect/packages/effect/typetest/Match.tst.ts
+++ b/repos/effect/packages/effect/typetest/Match.tst.ts
@@ -1,4 +1,4 @@
-import { Effect, Match, Option, pipe, type Result } from "effect"
+import { Effect, Match, Option, pipe, type Result, Schema } from "effect"
 import { describe, expect, it } from "tstyche"
 
 type Closed = { readonly _tag: "Closed" }
@@ -247,6 +247,71 @@ describe("Match", () => {
     )
   })
 
+  it("valueTags rejects the unknown tag in the Schema union reproduction", () => {
+    // https://github.com/Effect-TS/effect/issues/8167
+    const Vehicles = Schema.Union([
+      Schema.TaggedStruct("Car", {}),
+      Schema.TaggedStruct("Bike", {})
+    ])
+    const myVehicle: typeof Vehicles.Type = { _tag: "Bike" }
+
+    // @ts-expect-error Type '() => string' is not assignable to type 'never'
+    Match.valueTags(myVehicle, { Plane: () => "plane" })
+  })
+
+  it("valueTags rejects missing and unknown tags", () => {
+    // @ts-expect-error Type '() => boolean' is not assignable to type 'never'
+    Match.valueTags(taggedInput, { A: () => "a", B: () => 1, C: () => true })
+
+    // @ts-expect-error Property 'B' is missing
+    Match.valueTags(taggedInput, { A: () => "a" })
+
+    // @ts-expect-error Type '{}' is missing the following properties
+    Match.valueTags(taggedInput, {})
+
+    pipe(
+      taggedInput,
+      // @ts-expect-error Type '() => boolean' is not assignable to type 'never'
+      Match.valueTags({ A: () => "a", B: () => 1, C: () => true })
+    )
+
+    pipe(
+      taggedInput,
+      // @ts-expect-error Property 'B' is missing
+      Match.valueTags({ A: () => "a" })
+    )
+  })
+
+  it("valueTags infers handler inputs and the union of return types", () => {
+    const result = Match.valueTags(taggedInput, {
+      A: (value) => {
+        expect(value).type.toBe<{ readonly _tag: "A"; readonly a: string }>()
+        return value.a
+      },
+      B: (value) => {
+        expect(value).type.toBe<{ readonly _tag: "B"; readonly b: number }>()
+        return value.b
+      }
+    })
+    expect(result).type.toBe<string | number>()
+
+    expect(
+      pipe(
+        taggedInput,
+        Match.valueTags({
+          A: (value) => {
+            expect(value).type.toBe<{ readonly _tag: "A"; readonly a: string }>()
+            return value.a
+          },
+          B: (value) => {
+            expect(value).type.toBe<{ readonly _tag: "B"; readonly b: number }>()
+            return value.b
+          }
+        })
+      )
+    ).type.toBe<string | number>()
+  })
+
   it("related handler maps contextually type nested Effect.fn calls", () => {
     Match.value(taggedInput).pipe(
       Match.tags({
diff --git a/repos/effect/packages/effect/typetest/Stream.tst.ts b/repos/effect/packages/effect/typetest/Stream.tst.ts
index ebabd421a..8af467059 100644
--- a/repos/effect/packages/effect/typetest/Stream.tst.ts
+++ b/repos/effect/packages/effect/typetest/Stream.tst.ts
@@ -1,4 +1,15 @@
-import { type Cause, Data, type Effect, type ExecutionPlan, pipe, type Queue, Result, type Scope, Stream } from "effect"
+import {
+  type Cause,
+  Data,
+  type Effect,
+  type ExecutionPlan,
+  pipe,
+  type PubSub,
+  type Queue,
+  Result,
+  type Scope,
+  Stream
+} from "effect"
 import { describe, expect, it } from "tstyche"
 
 class ErrorA extends Data.TaggedError("ErrorA")<{
@@ -18,6 +29,53 @@ class AiError extends Data.TaggedError("AiError")<{ readonly reason: RateLimit |
 
 declare const aiStream: Stream.Stream<string, AiError | ErrorB, "dep-1">
 
+declare const pubsub: PubSub.PubSub<string>
+declare const recordStream: Stream.Stream<{ readonly key: string; readonly keep: boolean }, ErrorA, "dep-1">
+declare const numberStream: Stream.Stream<number, ErrorB, "dep-2">
+
+describe("Stream utility types", () => {
+  it("distributes over unions and ignores non-stream members", () => {
+    type Input = Stream.Stream<string, ErrorA, "dep-1"> | Stream.Stream<number, ErrorB, "dep-2"> | number
+    expect<Stream.Success<Input>>().type.toBe<string | number>()
+    expect<Stream.Error<Input>>().type.toBe<ErrorA | ErrorB>()
+    expect<Stream.Services<Input>>().type.toBe<"dep-1" | "dep-2">()
+  })
+})
+
+describe("Stream.runIntoPubSub", () => {
+  it("preserves errors and services in data-first usage", () => {
+    expect(Stream.runIntoPubSub(stream, pubsub)).type.toBe<Effect.Effect<void, ErrorA | ErrorB, "dep-1">>()
+  })
+})
+
+describe("Stream.let", () => {
+  it("replaces an existing field type in data-first usage", () => {
+    const result = Stream.let(recordStream, "key", (record) => record.key.length)
+    expect(result).type.toBe<Stream.Stream<{ readonly keep: boolean; key: number }, ErrorA, "dep-1">>()
+  })
+})
+
+describe("Stream.bind", () => {
+  it("replaces an existing field and combines channels in data-first usage", () => {
+    const result = Stream.bind(recordStream, "key", () => numberStream)
+    expect(result).type.toBe<
+      Stream.Stream<{ readonly keep: boolean; key: number }, ErrorA | ErrorB, "dep-1" | "dep-2">
+    >()
+  })
+})
+
+describe("Stream.catchDefect", () => {
+  it("supports data-last usage", () => {
+    const result = pipe(stream, Stream.catchDefect(() => Stream.fail("recovery" as const)))
+    expect(result).type.toBe<Stream.Stream<string, ErrorA | ErrorB | "recovery", "dep-1">>()
+  })
+
+  it("supports data-first usage", () => {
+    const result = Stream.catchDefect(stream, () => Stream.succeed(1))
+    expect(result).type.toBe<Stream.Stream<string | number, ErrorA | ErrorB, "dep-1">>()
+  })
+})
+
 describe("Stream.catchIf", () => {
   it("supports refinement in data-last usage", () => {
     const result = pipe(
@@ -122,6 +180,16 @@ describe("Stream.catchTag", () => {
 })
 
 describe("Stream.catchTags", () => {
+  const handlers = {
+    ErrorA: (_error: ErrorA) => Stream.succeed("ok"),
+    UnknownTag: () => Stream.succeed("unexpected")
+  }
+
+  it("rejects extra handler keys in data-first usage", () => {
+    // @ts-expect-error UnknownTag
+    Stream.catchTags(stream, handlers)
+  })
+
   it("removes handled errors when orElse is omitted", () => {
     const result = pipe(stream, Stream.catchTags({ ErrorA: () => Stream.succeed("ok") }))
     expect(result).type.toBe<Stream.Stream<string, ErrorB, "dep-1">>()
diff --git a/repos/effect/packages/effect/typetest/SynchronizedRef.tst.ts b/repos/effect/packages/effect/typetest/SynchronizedRef.tst.ts
new file mode 100644
index 000000000..e25da187d
--- /dev/null
+++ b/repos/effect/packages/effect/typetest/SynchronizedRef.tst.ts
@@ -0,0 +1,30 @@
+import { Effect, Option, SynchronizedRef } from "effect"
+import { describe, expect, it } from "tstyche"
+
+declare const ref: SynchronizedRef.SynchronizedRef<number>
+declare const pf: (value: number) => Effect.Effect<readonly [string, Option.Option<number>], "failure", "dependency">
+
+describe("SynchronizedRef.modifySomeEffect", () => {
+  it("regression: callback-only currying preserves result, error, and environment", () => {
+    const operation = SynchronizedRef.modifySomeEffect(pf)
+    expect(operation).type.toBe<
+      (self: SynchronizedRef.SynchronizedRef<number>) => Effect.Effect<string, "failure", "dependency">
+    >()
+    expect(ref.pipe(operation)).type.toBe<Effect.Effect<string, "failure", "dependency">>()
+  })
+
+  it("regression: infers the callback tuple without a fallback", () => {
+    const result = ref.pipe(
+      SynchronizedRef.modifySomeEffect((value: number) => Effect.succeed(["result", Option.some(value + 1)] as const))
+    )
+    expect(result).type.toBe<Effect.Effect<"result">>()
+  })
+
+  it("regression: rejects the obsolete fallback call", () => {
+    expect(SynchronizedRef.modifySomeEffect).type.not.toBeCallableWith("fallback", pf)
+  })
+
+  it("control: data-first preserves result, error, and environment", () => {
+    expect(SynchronizedRef.modifySomeEffect(ref, pf)).type.toBe<Effect.Effect<string, "failure", "dependency">>()
+  })
+})
diff --git a/repos/effect/packages/effect/typetest/Tuple.tst.ts b/repos/effect/packages/effect/typetest/Tuple.tst.ts
index 4c3922760..10df4a3e5 100644
--- a/repos/effect/packages/effect/typetest/Tuple.tst.ts
+++ b/repos/effect/packages/effect/typetest/Tuple.tst.ts
@@ -113,6 +113,11 @@ describe("Tuple", () => {
         (b) => `b: ${b}`
       ] as const
     )).type.toBe<[number, number, string]>()
+
+    const optionalTransform = undefined as ((n: number) => string) | undefined
+    expect(Tuple.evolve(tuple, [undefined, optionalTransform] as const)).type.toBe<
+      [string, number | string, boolean]
+    >()
   })
 
   describe("renameIndices", () => {
diff --git a/repos/effect/packages/effect/typetest/Types.tst.ts b/repos/effect/packages/effect/typetest/Types.tst.ts
index da49eee6a..1b5306797 100644
--- a/repos/effect/packages/effect/typetest/Types.tst.ts
+++ b/repos/effect/packages/effect/typetest/Types.tst.ts
@@ -1,4 +1,4 @@
-import type { Brand, Types } from "effect"
+import type { Brand, DateTime, Effect, HashMap, Option, Types } from "effect"
 import { describe, expect, it } from "tstyche"
 
 describe("Types", () => {
@@ -108,6 +108,46 @@ describe("Types", () => {
     })
   })
 
+  describe("RequiredKeys", () => {
+    it("retains named required keys with string, number and symbol indexes", () => {
+      const key = Symbol()
+      expect<
+        Types.RequiredKeys<{ readonly a: number; optional?: number; [key: string]: number | undefined }>
+      >().type.toBe<"a">()
+      expect<Types.RequiredKeys<{ 0: number; [key: number]: number }>>().type.toBe<0>()
+      expect<Types.RequiredKeys<{ [key]: number; [key: symbol]: number }>>().type.toBe<typeof key>()
+    })
+
+    it("excludes index signatures and optional properties", () => {
+      expect<Types.RequiredKeys<Record<string, number>>>().type.toBe<never>()
+      expect<Types.RequiredKeys<{ optional?: number; [key: string]: number | undefined }>>().type.toBe<never>()
+    })
+
+    it("extracts required keys without an index signature", () => {
+      expect<Types.RequiredKeys<{ a: number; b?: string }>>().type.toBe<"a">()
+    })
+
+    it("retains named keys on intersections and indexed unions", () => {
+      expect<Types.RequiredKeys<{ a: number } & { [key: string]: number }>>().type.toBe<"a">()
+      expect<
+        Types.RequiredKeys<
+          | { a: number; [key: string]: number }
+          | { a: number; b: string; [key: string]: unknown }
+        >
+      >().type.toBe<"a">()
+    })
+
+    it("preserves the mixed indexed union result", () => {
+      expect<Types.RequiredKeys<{ a: number; [key: string]: number } | { b: string }>>().type.toBe<"b">()
+    })
+
+    it("preserves array and tuple behavior", () => {
+      type Legacy<T> = { [K in keyof T]-?: {} extends Pick<T, K> ? never : K }[keyof T]
+      expect<Types.RequiredKeys<ReadonlyArray<number>>>().type.toBe<Legacy<ReadonlyArray<number>>>()
+      expect<Types.RequiredKeys<[number, string?]>>().type.toBe<Legacy<[number, string?]>>()
+    })
+  })
+
   describe("Mutable", () => {
     it("should convert a readonly object to mutable", () => {
       expect<Types.Mutable<{ readonly a: string; readonly b: number }>>()
@@ -157,19 +197,63 @@ describe("Types", () => {
       expect<Types.DeepMutable<(arg: 1) => 2>>().type.toBe<(arg: 1) => 2>()
     })
 
-    it("built in objects", () => {
+    it("built-in objects", () => {
       expect<
         [
-          Types.DeepMutable<string>,
-          Types.DeepMutable<number>,
-          Types.DeepMutable<boolean>,
-          Types.DeepMutable<bigint>,
-          Types.DeepMutable<symbol>,
           Types.DeepMutable<Date>,
           Types.DeepMutable<RegExp>,
-          Types.DeepMutable<Generator>
+          Types.DeepMutable<Generator>,
+          Types.DeepMutable<ArrayBuffer>,
+          Types.DeepMutable<URL>
         ]
-      >().type.toBeAssignableTo<[string, number, boolean, bigint, symbol, Date, RegExp, Generator]>()
+      >().type.toBe<[Date, RegExp, Generator, ArrayBuffer, URL]>()
+    })
+
+    it("Effect data types", () => {
+      type Value = { readonly value: string }
+      expect<
+        [
+          Types.DeepMutable<DateTime.DateTime>,
+          Types.DeepMutable<Effect.Effect<Value, Error>>,
+          Types.DeepMutable<HashMap.HashMap<string, Value>>,
+          Types.DeepMutable<Option.Option<Value>>
+        ]
+      >().type.toBe<
+        [
+          DateTime.DateTime,
+          Effect.Effect<Value, Error>,
+          HashMap.HashMap<string, Value>,
+          Option.Option<Value>
+        ]
+      >()
+    })
+
+    it("preserves opaque values nested in structural data", () => {
+      type Value = { readonly value: string }
+      expect<
+        Types.DeepMutable<{
+          readonly dates: ReadonlyArray<DateTime.DateTime>
+          readonly option: Option.Option<Value>
+        }>
+      >().type.toBe<{
+        dates: Array<DateTime.DateTime>
+        option: Option.Option<Value>
+      }>()
+    })
+
+    it("preserves objects with methods or symbol-keyed properties", () => {
+      const TypeId = Symbol()
+      type WithMethod = {
+        readonly nested: { readonly value: string }
+        readonly run: () => void
+      }
+      type WithSymbol = {
+        readonly [TypeId]: "WithSymbol"
+        readonly nested: { readonly value: string }
+      }
+      expect<
+        [Types.DeepMutable<WithMethod>, Types.DeepMutable<WithSymbol>]
+      >().type.toBe<[WithMethod, WithSymbol]>()
     })
 
     describe("Branded", () => {
diff --git a/repos/effect/packages/effect/typetest/schema/Graph.tst.ts b/repos/effect/packages/effect/typetest/schema/Graph.tst.ts
index 236352d19..d94614d1e 100644
--- a/repos/effect/packages/effect/typetest/schema/Graph.tst.ts
+++ b/repos/effect/packages/effect/typetest/schema/Graph.tst.ts
@@ -1,4 +1,4 @@
-import { type Graph, hole, Schema, type SchemaRepresentation } from "effect"
+import { type Graph, hole, Schema, SchemaRepresentation } from "effect"
 import { describe, expect, it } from "tstyche"
 
 describe("Schema.Graph", () => {
@@ -58,6 +58,6 @@ describe("Schema.Graph", () => {
   })
 
   it("exposes a kind-aware declaration reviver", () => {
-    expect(Schema.GraphReviver).type.toBe<SchemaRepresentation.DeclarationReviver<Graph.Kind>>()
+    expect(SchemaRepresentation.GraphReviver).type.toBe<SchemaRepresentation.DeclarationReviver<Graph.Kind>>()
   })
 })
diff --git a/repos/effect/packages/effect/typetest/schema/Schema.tst.ts b/repos/effect/packages/effect/typetest/schema/Schema.tst.ts
index 729751b21..68f639327 100644
--- a/repos/effect/packages/effect/typetest/schema/Schema.tst.ts
+++ b/repos/effect/packages/effect/typetest/schema/Schema.tst.ts
@@ -530,6 +530,13 @@ describe("Schema", () => {
     })
   })
 
+  describe("toEncoderXml", () => {
+    it("returns SchemaIssue.Issue in the error channel", () => {
+      const encode = Schema.toEncoderXml(Schema.toCodecStringTree(Schema.FiniteFromString))
+      expect(encode).type.toBe<(value: number) => Effect.Effect<string, SchemaIssue.Issue>>()
+    })
+  })
+
   describe("toCodecArrayFromSingle", () => {
     it("revealCodec + annotate", () => {
       const stringTree = Schema.toCodecStringTree(Schema.Array(Schema.FiniteFromString))
@@ -861,6 +868,24 @@ describe("Schema", () => {
       .type.toBe<Schema.Codec<readonly ["a", string | number], `a${string}` | `a${number}`>>()
   })
 
+  it("TemplateLiteralParser propagates decoding and encoding services separately", () => {
+    const first = hole<Schema.Codec<number, string, "DecodeFirst", "EncodeFirst">>()
+    const second = hole<Schema.Codec<boolean, 0 | 1, "DecodeSecond", "EncodeSecond">>()
+    const schema = Schema.TemplateLiteralParser(["value:", first, ":", second])
+
+    expect(schema.DecodingServices).type.toBe<"DecodeFirst" | "DecodeSecond">()
+    expect(schema.EncodingServices).type.toBe<"EncodeFirst" | "EncodeSecond">()
+    expect(Schema.decodeEffect(schema)).type.toBe<
+      (
+        input: `value:${string}:0` | `value:${string}:1`,
+        options?: SchemaAST.ParseOptions
+      ) => Effect.Effect<readonly ["value:", number, ":", boolean], Schema.SchemaError, "DecodeFirst" | "DecodeSecond">
+    >()
+    expect(Schema.encodeEffect(schema)(["value:", 1, ":", true])).type.toBe<
+      Effect.Effect<`value:${string}:0` | `value:${string}:1`, Schema.SchemaError, "EncodeFirst" | "EncodeSecond">
+    >()
+  })
+
   describe("flip", () => {
     it("applying flip twice should return the original schema", () => {
       const schema = Schema.FiniteFromString
@@ -1779,10 +1804,10 @@ describe("Schema", () => {
   it("asStandardSchemaV1 should not be callable with a schema with DecodingServices", () => {
     class MagicNumber extends Context.Service<MagicNumber, number>()("MagicNumber") {}
     const DepString = Schema.Number.pipe(Schema.decode({
-      decode: SchemaGetter.onSome((n) =>
+      decode: SchemaGetter.transformEffect((n) =>
         Effect.gen(function*() {
           const magicNumber = yield* MagicNumber
-          return Option.some(n * magicNumber)
+          return n * magicNumber
         })
       ),
       encode: SchemaGetter.passthrough()
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaAOTCompiler.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaAOTCompiler.tst.ts
new file mode 100644
index 000000000..6fb337a86
--- /dev/null
+++ b/repos/effect/packages/effect/typetest/schema/SchemaAOTCompiler.tst.ts
@@ -0,0 +1,24 @@
+import { Schema, SchemaAST } from "effect"
+import * as SchemaAOTCompiler from "effect/unstable/schema/SchemaAOTCompiler"
+import { describe, expect, it } from "tstyche"
+
+describe("SchemaAOTCompiler", () => {
+  it("compiles ASTs to module source", () => {
+    expect(SchemaAOTCompiler.compile([{ ast: Schema.String.ast, operations: ["decode"] }])).type.toBe<string>()
+    expect(SchemaAOTCompiler.compile).type.toBeCallableWith(
+      [
+        { ast: SchemaAST.string, operations: ["decode"] },
+        { ast: SchemaAST.number, operations: ["is", "make"] }
+      ] as const
+    )
+    expect(SchemaAOTCompiler.compile).type.toBeCallableWith([])
+    expect(SchemaAOTCompiler.compile).type.not.toBeCallableWith(SchemaAST.string)
+    expect(SchemaAOTCompiler.compile).type.not.toBeCallableWith(Schema.String)
+    expect(SchemaAOTCompiler.compile).type.not.toBeCallableWith([SchemaAST.string])
+    expect(SchemaAOTCompiler.compile).type.not.toBeCallableWith(
+      [
+        { ast: SchemaAST.string, operations: ["encode"] }
+      ] as const
+    )
+  })
+})
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaAOTCompilerBuild.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaAOTCompilerBuild.tst.ts
new file mode 100644
index 000000000..55b2ea189
--- /dev/null
+++ b/repos/effect/packages/effect/typetest/schema/SchemaAOTCompilerBuild.tst.ts
@@ -0,0 +1,34 @@
+import type { Effect, FileSystem, Path, PlatformError } from "effect"
+import * as SchemaAOTCompilerBuild from "effect/unstable/schema/SchemaAOTCompiler/Build"
+import { describe, expect, it } from "tstyche"
+
+describe("SchemaAOTCompilerBuild", () => {
+  it("build", () => {
+    const modules: Record<string, () => Promise<unknown>> = {
+      "./schema.js": () => Promise.resolve({})
+    }
+    const result = SchemaAOTCompilerBuild.build({
+      modules,
+      baseUrl: import.meta.url,
+      outFile: "./schema-aot.js"
+    })
+
+    expect(result).type.toBe<
+      Effect.Effect<
+        SchemaAOTCompilerBuild.BuildResult,
+        SchemaAOTCompilerBuild.BuildError | PlatformError.PlatformError,
+        FileSystem.FileSystem | Path.Path
+      >
+    >()
+    expect(SchemaAOTCompilerBuild.build).type.not.toBeCallableWith({
+      modules: {},
+      outFile: "./schema-aot.js"
+    })
+    expect(SchemaAOTCompilerBuild.build).type.not.toBeCallableWith({
+      modules: {},
+      baseUrl: import.meta.url,
+      outFile: "./schema-aot.js",
+      operations: ["parse"]
+    })
+  })
+})
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInAtomicDeclarationRevivers.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaBuiltInAtomicDeclarationRevivers.tst.ts
deleted file mode 100644
index 6eb183e48..000000000
--- a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInAtomicDeclarationRevivers.tst.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Schema, type SchemaRepresentation } from "effect"
-import { describe, expect, it } from "tstyche"
-
-describe("Schema built-in atomic declaration revivers", () => {
-  it("composes every atomic declaration reviver without casts", () => {
-    const revivers: ReadonlyArray<SchemaRepresentation.AnyReviver> = [
-      Schema.DateReviver,
-      Schema.FileReviver,
-      Schema.FormDataReviver,
-      Schema.RegExpReviver,
-      Schema.Uint8ArrayReviver,
-      Schema.URLReviver,
-      Schema.URLSearchParamsReviver
-    ]
-
-    expect(revivers).type.toBe<ReadonlyArray<SchemaRepresentation.AnyReviver>>()
-    expect(Schema.DateReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-    expect(Schema.FileReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-    expect(Schema.FormDataReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-  })
-})
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInBigDecimalDurationChunkDeclarationRevivers.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaBuiltInBigDecimalDurationChunkDeclarationRevivers.tst.ts
deleted file mode 100644
index 3d3972be6..000000000
--- a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInBigDecimalDurationChunkDeclarationRevivers.tst.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Schema, type SchemaRepresentation } from "effect"
-import { describe, expect, it } from "tstyche"
-
-describe("Schema built-in BigDecimal, Duration and Chunk declaration revivers", () => {
-  it("composes every declaration reviver without casts", () => {
-    const revivers: ReadonlyArray<SchemaRepresentation.AnyReviver> = [
-      Schema.BigDecimalReviver,
-      Schema.DurationReviver,
-      Schema.ChunkReviver
-    ]
-
-    expect(revivers).type.toBe<ReadonlyArray<SchemaRepresentation.AnyReviver>>()
-    expect(Schema.BigDecimalReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-    expect(Schema.DurationReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-    expect(Schema.ChunkReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-  })
-})
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInBigIntRevivers.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaBuiltInBigIntRevivers.tst.ts
deleted file mode 100644
index dd3c0af3f..000000000
--- a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInBigIntRevivers.tst.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Schema, type SchemaRepresentation } from "effect"
-import { describe, expect, it } from "tstyche"
-
-describe("Schema built-in BigInt revivers", () => {
-  it("composes every BigInt check reviver without casts", () => {
-    const revivers: ReadonlyArray<SchemaRepresentation.AnyReviver> = [
-      Schema.isGreaterThanBigIntReviver,
-      Schema.isGreaterThanOrEqualToBigIntReviver,
-      Schema.isLessThanBigIntReviver,
-      Schema.isLessThanOrEqualToBigIntReviver,
-      Schema.isBetweenBigIntReviver
-    ]
-
-    expect(revivers).type.toBe<ReadonlyArray<SchemaRepresentation.AnyReviver>>()
-    expect(Schema.isGreaterThanBigIntReviver).type.toBe<
-      SchemaRepresentation.FilterReviver<{ readonly exclusiveMinimum: bigint }>
-    >()
-    expect(Schema.isBetweenBigIntReviver).type.toBe<
-      SchemaRepresentation.FilterReviver<{
-        readonly minimum: bigint
-        readonly maximum: bigint
-        readonly exclusiveMinimum?: true | undefined
-        readonly exclusiveMaximum?: true | undefined
-      }>
-    >()
-  })
-})
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInCauseAndExitDeclarationRevivers.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaBuiltInCauseAndExitDeclarationRevivers.tst.ts
deleted file mode 100644
index f9ee5e1c5..000000000
--- a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInCauseAndExitDeclarationRevivers.tst.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Schema, type SchemaRepresentation } from "effect"
-import { describe, expect, it } from "tstyche"
-
-describe("Schema built-in Cause and Exit declaration revivers", () => {
-  it("exposes exact null payload reviver types", () => {
-    const revivers: ReadonlyArray<SchemaRepresentation.AnyReviver> = [
-      Schema.CauseReasonReviver,
-      Schema.CauseReviver,
-      Schema.ExitReviver
-    ]
-
-    expect(revivers).type.toBe<ReadonlyArray<SchemaRepresentation.AnyReviver>>()
-    expect(Schema.CauseReasonReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-    expect(Schema.CauseReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-    expect(Schema.ExitReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-  })
-})
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInCollectionRevivers.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaBuiltInCollectionRevivers.tst.ts
deleted file mode 100644
index cd5bdfae3..000000000
--- a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInCollectionRevivers.tst.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Schema, type SchemaRepresentation } from "effect"
-import { describe, expect, it } from "tstyche"
-
-describe("Schema built-in collection revivers", () => {
-  it("restricts isUniqueKey to arrays of key-value tuples", () => {
-    const check = Schema.isUniqueKey<string, number>()
-
-    Schema.Array(Schema.Tuple([Schema.String, Schema.Number])).check(check)
-    Schema.Array(Schema.String).check(
-      // @ts-expect-error Argument of type
-      check
-    )
-  })
-
-  it("composes every collection check reviver without casts", () => {
-    const revivers: ReadonlyArray<SchemaRepresentation.AnyReviver> = [
-      Schema.isMinSizeReviver,
-      Schema.isMaxSizeReviver,
-      Schema.isSizeBetweenReviver,
-      Schema.isUniqueReviver,
-      Schema.isUniqueKeyReviver
-    ]
-
-    expect(revivers).type.toBe<ReadonlyArray<SchemaRepresentation.AnyReviver>>()
-    expect(Schema.isMinSizeReviver).type.toBe<
-      SchemaRepresentation.FilterReviver<{ readonly minSize: number }>
-    >()
-    expect(Schema.isSizeBetweenReviver).type.toBe<
-      SchemaRepresentation.FilterReviver<{
-        readonly minimum: number
-        readonly maximum: number
-      }>
-    >()
-    expect(Schema.isUniqueReviver).type.toBe<SchemaRepresentation.FilterReviver<null>>()
-    expect(Schema.isUniqueKeyReviver).type.toBe<SchemaRepresentation.FilterReviver<null>>()
-  })
-})
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInDateRevivers.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaBuiltInDateRevivers.tst.ts
deleted file mode 100644
index 7fc656de9..000000000
--- a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInDateRevivers.tst.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Schema, type SchemaRepresentation } from "effect"
-import { describe, expect, it } from "tstyche"
-
-describe("Schema built-in Date revivers", () => {
-  it("composes every Date check reviver without casts", () => {
-    const revivers: ReadonlyArray<SchemaRepresentation.AnyReviver> = [
-      Schema.isGreaterThanDateReviver,
-      Schema.isGreaterThanOrEqualToDateReviver,
-      Schema.isLessThanDateReviver,
-      Schema.isLessThanOrEqualToDateReviver,
-      Schema.isBetweenDateReviver
-    ]
-
-    expect(revivers).type.toBe<ReadonlyArray<SchemaRepresentation.AnyReviver>>()
-    expect(Schema.isGreaterThanDateReviver).type.toBe<
-      SchemaRepresentation.FilterReviver<{ readonly exclusiveMinimum: globalThis.Date }>
-    >()
-    expect(Schema.isBetweenDateReviver).type.toBe<
-      SchemaRepresentation.FilterReviver<{
-        readonly minimum: globalThis.Date
-        readonly maximum: globalThis.Date
-        readonly exclusiveMinimum?: true | undefined
-        readonly exclusiveMaximum?: true | undefined
-      }>
-    >()
-  })
-})
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInDateTimeDeclarationRevivers.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaBuiltInDateTimeDeclarationRevivers.tst.ts
deleted file mode 100644
index a9d877f9e..000000000
--- a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInDateTimeDeclarationRevivers.tst.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Schema, type SchemaRepresentation } from "effect"
-import { describe, expect, it } from "tstyche"
-
-describe("Schema built-in DateTime declaration revivers", () => {
-  it("composes every DateTime declaration reviver without casts", () => {
-    const revivers: ReadonlyArray<SchemaRepresentation.AnyReviver> = [
-      Schema.TimeZoneReviver,
-      Schema.TimeZoneNamedReviver,
-      Schema.TimeZoneOffsetReviver,
-      Schema.DateTimeUtcReviver,
-      Schema.DateTimeZonedReviver
-    ]
-
-    expect(revivers).type.toBe<ReadonlyArray<SchemaRepresentation.AnyReviver>>()
-    expect(Schema.TimeZoneReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-    expect(Schema.TimeZoneNamedReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-    expect(Schema.TimeZoneOffsetReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-    expect(Schema.DateTimeUtcReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-    expect(Schema.DateTimeZonedReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-  })
-})
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInErrorAndCollectionDeclarationRevivers.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaBuiltInErrorAndCollectionDeclarationRevivers.tst.ts
deleted file mode 100644
index aea602808..000000000
--- a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInErrorAndCollectionDeclarationRevivers.tst.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Schema, type SchemaRepresentation } from "effect"
-import { describe, expect, it } from "tstyche"
-
-describe("Schema built-in Error and collection declaration revivers", () => {
-  it("exposes exact payload and declaration reviver types", () => {
-    const revivers: ReadonlyArray<SchemaRepresentation.AnyReviver> = [
-      Schema.ErrorInstanceReviver,
-      Schema.ReadonlyMapReviver,
-      Schema.ReadonlySetReviver
-    ]
-
-    expect(revivers).type.toBe<ReadonlyArray<SchemaRepresentation.AnyReviver>>()
-    expect(Schema.ErrorInstanceReviver).type.toBe<
-      SchemaRepresentation.DeclarationReviver<
-        | null
-        | {
-          readonly includeStack?: true | undefined
-          readonly excludeCause?: true | undefined
-        }
-      >
-    >()
-    expect(Schema.ReadonlyMapReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-    expect(Schema.ReadonlySetReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-  })
-})
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInJsonAndHashDeclarationRevivers.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaBuiltInJsonAndHashDeclarationRevivers.tst.ts
deleted file mode 100644
index 4afae11c8..000000000
--- a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInJsonAndHashDeclarationRevivers.tst.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Schema, type SchemaRepresentation } from "effect"
-import { describe, expect, it } from "tstyche"
-
-describe("Schema built-in JSON and hash collection declaration revivers", () => {
-  it("exposes exact null payload reviver types", () => {
-    const revivers: ReadonlyArray<SchemaRepresentation.AnyReviver> = [
-      Schema.JsonReviver,
-      Schema.MutableJsonReviver,
-      Schema.HashMapReviver,
-      Schema.HashSetReviver
-    ]
-
-    expect(revivers).type.toBe<ReadonlyArray<SchemaRepresentation.AnyReviver>>()
-    expect(Schema.JsonReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-    expect(Schema.MutableJsonReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-    expect(Schema.HashMapReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-    expect(Schema.HashSetReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-  })
-})
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInNumberRevivers.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaBuiltInNumberRevivers.tst.ts
deleted file mode 100644
index 4b8c6ae2d..000000000
--- a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInNumberRevivers.tst.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Schema, type SchemaRepresentation } from "effect"
-import { describe, expect, it } from "tstyche"
-
-describe("Schema built-in number revivers", () => {
-  it("composes every number check reviver without casts", () => {
-    const revivers: ReadonlyArray<SchemaRepresentation.AnyReviver> = [
-      Schema.isFiniteReviver,
-      Schema.isIntReviver,
-      Schema.isMultipleOfReviver,
-      Schema.isGreaterThanReviver,
-      Schema.isGreaterThanOrEqualToReviver,
-      Schema.isLessThanReviver,
-      Schema.isLessThanOrEqualToReviver,
-      Schema.isBetweenReviver
-    ]
-
-    expect(revivers).type.toBe<ReadonlyArray<SchemaRepresentation.AnyReviver>>()
-    expect(Schema.isMultipleOfReviver).type.toBe<
-      SchemaRepresentation.FilterReviver<{ readonly divisor: number }>
-    >()
-    expect(Schema.isGreaterThanReviver).type.toBe<
-      SchemaRepresentation.FilterReviver<{ readonly exclusiveMinimum: number }>
-    >()
-    expect(Schema.isBetweenReviver).type.toBe<
-      SchemaRepresentation.FilterReviver<{
-        readonly minimum: number
-        readonly maximum: number
-        readonly exclusiveMinimum?: true | undefined
-        readonly exclusiveMaximum?: true | undefined
-      }>
-    >()
-  })
-})
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInObjectRevivers.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaBuiltInObjectRevivers.tst.ts
deleted file mode 100644
index 917ff9f33..000000000
--- a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInObjectRevivers.tst.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Schema, type SchemaRepresentation } from "effect"
-import { describe, expect, it } from "tstyche"
-
-describe("Schema built-in object revivers", () => {
-  it("composes every object check reviver without casts", () => {
-    const revivers: ReadonlyArray<SchemaRepresentation.AnyReviver> = [
-      Schema.isMinPropertiesReviver,
-      Schema.isMaxPropertiesReviver,
-      Schema.isPropertiesLengthBetweenReviver,
-      Schema.isPropertyNamesReviver
-    ]
-
-    expect(revivers).type.toBe<ReadonlyArray<SchemaRepresentation.AnyReviver>>()
-    expect(Schema.isMinPropertiesReviver).type.toBe<
-      SchemaRepresentation.FilterReviver<{ readonly minProperties: number }>
-    >()
-    expect(Schema.isPropertiesLengthBetweenReviver).type.toBe<
-      SchemaRepresentation.FilterReviver<{
-        readonly minimum: number
-        readonly maximum: number
-      }>
-    >()
-    expect(Schema.isPropertyNamesReviver).type.toBe<SchemaRepresentation.FilterReviver<null>>()
-  })
-})
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInResultAndRedactedDeclarationRevivers.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaBuiltInResultAndRedactedDeclarationRevivers.tst.ts
deleted file mode 100644
index 02662ca51..000000000
--- a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInResultAndRedactedDeclarationRevivers.tst.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Schema, type SchemaRepresentation } from "effect"
-import { describe, expect, it } from "tstyche"
-
-describe("Schema built-in Result and Redacted declaration revivers", () => {
-  it("exposes exact payload and declaration reviver types", () => {
-    const revivers: ReadonlyArray<SchemaRepresentation.AnyReviver> = [
-      Schema.ResultReviver,
-      Schema.RedactedReviver
-    ]
-
-    expect(revivers).type.toBe<ReadonlyArray<SchemaRepresentation.AnyReviver>>()
-    expect(Schema.ResultReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-    expect(Schema.RedactedReviver).type.toBe<
-      SchemaRepresentation.DeclarationReviver<
-        | null
-        | {
-          readonly label?: string | undefined
-          readonly disallowJsonEncode?: true | undefined
-        }
-      >
-    >()
-  })
-})
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInRevivers.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaBuiltInRevivers.tst.ts
index cd10d73a5..c048c673c 100644
--- a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInRevivers.tst.ts
+++ b/repos/effect/packages/effect/typetest/schema/SchemaBuiltInRevivers.tst.ts
@@ -1,17 +1,98 @@
-import { Schema, type SchemaRepresentation } from "effect"
+import { Schema, SchemaRepresentation } from "effect"
 import { describe, expect, it } from "tstyche"
 
 describe("Schema built-in revivers", () => {
-  it("exports the isPattern and Option revivers with concrete payload types", () => {
-    expect(Schema.isPatternReviver).type.toBe<
-      SchemaRepresentation.FilterReviver<{ readonly source: string; readonly flags: string }>
-    >()
-    expect(Schema.OptionReviver).type.toBe<SchemaRepresentation.DeclarationReviver<null>>()
-
+  it("composes every built-in reviver without casts", () => {
     const revivers: ReadonlyArray<SchemaRepresentation.AnyReviver> = [
-      Schema.isPatternReviver,
-      Schema.OptionReviver
+      SchemaRepresentation.isTrimmedReviver,
+      SchemaRepresentation.isPatternReviver,
+      SchemaRepresentation.isStringFiniteReviver,
+      SchemaRepresentation.isStringBigIntReviver,
+      SchemaRepresentation.isStringSymbolReviver,
+      SchemaRepresentation.isUUIDReviver,
+      SchemaRepresentation.isGUIDReviver,
+      SchemaRepresentation.isULIDReviver,
+      SchemaRepresentation.isBase64Reviver,
+      SchemaRepresentation.isBase64UrlReviver,
+      SchemaRepresentation.isStartsWithReviver,
+      SchemaRepresentation.isEndsWithReviver,
+      SchemaRepresentation.isIncludesReviver,
+      SchemaRepresentation.isUppercasedReviver,
+      SchemaRepresentation.isLowercasedReviver,
+      SchemaRepresentation.isCapitalizedReviver,
+      SchemaRepresentation.isUncapitalizedReviver,
+      SchemaRepresentation.isFiniteReviver,
+      SchemaRepresentation.isGreaterThanReviver,
+      SchemaRepresentation.isGreaterThanOrEqualToReviver,
+      SchemaRepresentation.isLessThanReviver,
+      SchemaRepresentation.isLessThanOrEqualToReviver,
+      SchemaRepresentation.isBetweenReviver,
+      SchemaRepresentation.isMultipleOfReviver,
+      SchemaRepresentation.isIntReviver,
+      SchemaRepresentation.isMinLengthReviver,
+      SchemaRepresentation.isMaxLengthReviver,
+      SchemaRepresentation.isLengthBetweenReviver,
+      SchemaRepresentation.isMinSizeReviver,
+      SchemaRepresentation.isMaxSizeReviver,
+      SchemaRepresentation.isSizeBetweenReviver,
+      SchemaRepresentation.isMinPropertiesReviver,
+      SchemaRepresentation.isMaxPropertiesReviver,
+      SchemaRepresentation.isPropertiesLengthBetweenReviver,
+      SchemaRepresentation.isPropertyNamesReviver,
+      SchemaRepresentation.isUniqueReviver,
+      SchemaRepresentation.isUniqueKeyReviver,
+      SchemaRepresentation.OptionReviver,
+      SchemaRepresentation.ResultReviver,
+      SchemaRepresentation.RedactedReviver,
+      SchemaRepresentation.CauseReasonReviver,
+      SchemaRepresentation.CauseReviver,
+      SchemaRepresentation.ErrorInstanceReviver,
+      SchemaRepresentation.ExitReviver,
+      SchemaRepresentation.ReadonlyMapReviver,
+      SchemaRepresentation.GraphReviver,
+      SchemaRepresentation.HashMapReviver,
+      SchemaRepresentation.ReadonlySetReviver,
+      SchemaRepresentation.HashSetReviver,
+      SchemaRepresentation.ChunkReviver,
+      SchemaRepresentation.RegExpReviver,
+      SchemaRepresentation.URLReviver,
+      SchemaRepresentation.DateReviver,
+      SchemaRepresentation.DurationReviver,
+      SchemaRepresentation.ByteSizeReviver,
+      SchemaRepresentation.BigDecimalReviver,
+      SchemaRepresentation.FileReviver,
+      SchemaRepresentation.FormDataReviver,
+      SchemaRepresentation.URLSearchParamsReviver,
+      SchemaRepresentation.Uint8ArrayReviver,
+      SchemaRepresentation.DateTimeUtcReviver,
+      SchemaRepresentation.TimeZoneOffsetReviver,
+      SchemaRepresentation.TimeZoneNamedReviver,
+      SchemaRepresentation.TimeZoneReviver,
+      SchemaRepresentation.DateTimeZonedReviver,
+      SchemaRepresentation.isGreaterThanDateReviver,
+      SchemaRepresentation.isGreaterThanOrEqualToDateReviver,
+      SchemaRepresentation.isLessThanDateReviver,
+      SchemaRepresentation.isLessThanOrEqualToDateReviver,
+      SchemaRepresentation.isBetweenDateReviver,
+      SchemaRepresentation.isGreaterThanBigIntReviver,
+      SchemaRepresentation.isGreaterThanOrEqualToBigIntReviver,
+      SchemaRepresentation.isLessThanBigIntReviver,
+      SchemaRepresentation.isLessThanOrEqualToBigIntReviver,
+      SchemaRepresentation.isBetweenBigIntReviver,
+      SchemaRepresentation.JsonReviver,
+      SchemaRepresentation.MutableJsonReviver
     ]
+
     expect(revivers).type.toBe<ReadonlyArray<SchemaRepresentation.AnyReviver>>()
   })
+
+  it("restricts isUniqueKey to arrays of key-value tuples", () => {
+    const check = Schema.isUniqueKey<string, number>()
+
+    Schema.Array(Schema.Tuple([Schema.String, Schema.Number])).check(check)
+    Schema.Array(Schema.String).check(
+      // @ts-expect-error Argument of type
+      check
+    )
+  })
 })
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInStringRevivers.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaBuiltInStringRevivers.tst.ts
deleted file mode 100644
index 768db4cd7..000000000
--- a/repos/effect/packages/effect/typetest/schema/SchemaBuiltInStringRevivers.tst.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Schema, type SchemaRepresentation } from "effect"
-import { describe, expect, it } from "tstyche"
-
-describe("Schema built-in string revivers", () => {
-  it("composes every string check reviver without casts", () => {
-    const revivers: ReadonlyArray<SchemaRepresentation.AnyReviver> = [
-      Schema.isStringFiniteReviver,
-      Schema.isStringBigIntReviver,
-      Schema.isStringSymbolReviver,
-      Schema.isMinLengthReviver,
-      Schema.isMaxLengthReviver,
-      Schema.isLengthBetweenReviver,
-      Schema.isPatternReviver,
-      Schema.isTrimmedReviver,
-      Schema.isUUIDReviver,
-      Schema.isGUIDReviver,
-      Schema.isULIDReviver,
-      Schema.isBase64Reviver,
-      Schema.isBase64UrlReviver,
-      Schema.isStartsWithReviver,
-      Schema.isEndsWithReviver,
-      Schema.isIncludesReviver,
-      Schema.isUppercasedReviver,
-      Schema.isLowercasedReviver,
-      Schema.isCapitalizedReviver,
-      Schema.isUncapitalizedReviver
-    ]
-
-    expect(revivers).type.toBe<ReadonlyArray<SchemaRepresentation.AnyReviver>>()
-    expect(Schema.isMinLengthReviver).type.toBe<
-      SchemaRepresentation.FilterReviver<{ readonly minLength: number }>
-    >()
-    expect(Schema.isLengthBetweenReviver).type.toBe<
-      SchemaRepresentation.FilterReviver<{ readonly minimum: number; readonly maximum: number }>
-    >()
-    expect(Schema.isUUIDReviver).type.toBe<
-      SchemaRepresentation.FilterReviver<{
-        readonly version: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | null
-      }>
-    >()
-  })
-})
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaCompiler.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaCompiler.tst.ts
new file mode 100644
index 000000000..55035ab43
--- /dev/null
+++ b/repos/effect/packages/effect/typetest/schema/SchemaCompiler.tst.ts
@@ -0,0 +1,24 @@
+import { Effect, Schema } from "effect"
+import { SchemaCompiler, SchemaJITCompiler } from "effect/unstable/schema"
+import { describe, expect, it } from "tstyche"
+
+describe("SchemaCompiler", () => {
+  it("set", () => {
+    const decoder = {
+      is: (input, _options) => typeof input === "string",
+      decode: (input, _options) => typeof input === "string" ? input : SchemaCompiler.invalid,
+      make: (input, _options) => typeof input === "string" ? input : SchemaCompiler.invalid,
+      decodeEffect: (input, _options) => Effect.succeed(input),
+      makeEffect: (input, _options) => Effect.succeed(input)
+    } satisfies SchemaCompiler.CompiledDecoder
+
+    expect(SchemaCompiler.set(Schema.String.ast, decoder)).type.toBe<void>()
+    expect(SchemaCompiler.set).type.toBeCallableWith(Schema.String.ast, { decodeEffect: Effect.succeed })
+    expect(SchemaCompiler.set).type.not.toBeCallableWith(Schema.String.ast, { makeEffect: Effect.succeed })
+  })
+
+  it("enable", () => {
+    expect(SchemaJITCompiler.enable(Schema.String.ast)).type.toBe<void>()
+    expect(SchemaJITCompiler.enable).type.not.toBeCallableWith(Schema.String)
+  })
+})
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaGetter.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaGetter.tst.ts
new file mode 100644
index 000000000..42c1ee244
--- /dev/null
+++ b/repos/effect/packages/effect/typetest/schema/SchemaGetter.tst.ts
@@ -0,0 +1,74 @@
+import type { Effect, Option, SchemaIssue } from "effect"
+import { SchemaGetter, SchemaTransformation } from "effect"
+import { describe, expect, it } from "tstyche"
+
+describe("SchemaGetter", () => {
+  it("map", () => {
+    const getter = null as unknown as SchemaGetter.Getter<number, string, "R">
+
+    expect(SchemaGetter.map(getter, String)).type.toBe<SchemaGetter.Getter<string, string, "R">>()
+    expect(SchemaGetter.map(String)(getter)).type.toBe<SchemaGetter.Getter<string, string, "R">>()
+  })
+
+  it("compose", () => {
+    const first = null as unknown as SchemaGetter.Getter<number, string, "R1">
+    const second = null as unknown as SchemaGetter.Getter<boolean, number, "R2">
+
+    expect(SchemaGetter.compose(first, second)).type.toBe<SchemaGetter.Getter<boolean, string, "R1" | "R2">>()
+    expect(SchemaGetter.compose(second)(first)).type.toBe<SchemaGetter.Getter<boolean, string, "R1" | "R2">>()
+  })
+
+  it("run", () => {
+    const getter = null as unknown as SchemaGetter.Getter<number, string, "R">
+    const input = null as unknown as Option.Option<string>
+
+    expect(SchemaGetter.run(getter, input, {})).type.toBe<
+      Effect.Effect<Option.Option<number>, SchemaIssue.Issue, "R">
+    >()
+    expect(SchemaGetter.run(input, {})(getter)).type.toBe<
+      Effect.Effect<Option.Option<number>, SchemaIssue.Issue, "R">
+    >()
+  })
+})
+
+describe("SchemaTransformation", () => {
+  it("makeTransformation", () => {
+    const decode = null as unknown as SchemaGetter.Getter<number, string, "RD">
+    const encode = null as unknown as SchemaGetter.Getter<string, number, "RE">
+
+    expect(SchemaTransformation.makeTransformation({ decode, encode })).type.toBe<
+      SchemaTransformation.Transformation<number, string, "RD", "RE">
+    >()
+  })
+
+  it("pipe", () => {
+    const transformation = null as unknown as SchemaTransformation.Transformation<number, string, "RD", "RE">
+    const middleware = null as unknown as SchemaTransformation.Middleware<
+      number,
+      string,
+      "RDE",
+      "RDT",
+      "RET",
+      "REE"
+    >
+
+    expect(transformation.pipe((self) => self)).type.toBe<
+      SchemaTransformation.Transformation<number, string, "RD", "RE">
+    >()
+    expect(middleware.pipe((self) => self)).type.toBe<
+      SchemaTransformation.Middleware<number, string, "RDE", "RDT", "RET", "REE">
+    >()
+  })
+
+  it("composeTransformation", () => {
+    const first = null as unknown as SchemaTransformation.Transformation<number, string, "RD1", "RE1">
+    const second = null as unknown as SchemaTransformation.Transformation<boolean, number, "RD2", "RE2">
+
+    expect(SchemaTransformation.composeTransformation(first, second)).type.toBe<
+      SchemaTransformation.Transformation<boolean, string, "RD1" | "RD2", "RE1" | "RE2">
+    >()
+    expect(SchemaTransformation.composeTransformation(second)(first)).type.toBe<
+      SchemaTransformation.Transformation<boolean, string, "RD1" | "RD2", "RE1" | "RE2">
+    >()
+  })
+})
diff --git a/repos/effect/packages/effect/typetest/schema/SchemaRepresentationReviver.tst.ts b/repos/effect/packages/effect/typetest/schema/SchemaRepresentationReviver.tst.ts
index 39273f44e..e16fcdf8f 100644
--- a/repos/effect/packages/effect/typetest/schema/SchemaRepresentationReviver.tst.ts
+++ b/repos/effect/packages/effect/typetest/schema/SchemaRepresentationReviver.tst.ts
@@ -3,7 +3,7 @@ import { describe, expect, it } from "tstyche"
 
 describe("SchemaRepresentation revivers", () => {
   it("infers payload types from reviver constructors", () => {
-    const declaration = SchemaRepresentation.makeDeclarationReviver(
+    const declaration = SchemaRepresentation.makeReviverDeclaration(
       "acme/schema/Box",
       Schema.Struct({ label: Schema.String }),
       ({ payload }) => {
@@ -13,7 +13,7 @@ describe("SchemaRepresentation revivers", () => {
     )
     expect(declaration).type.toBe<SchemaRepresentation.DeclarationReviver<{ readonly label: string }>>()
 
-    const filter = SchemaRepresentation.makeFilterReviver(
+    const filter = SchemaRepresentation.makeReviverFilter(
       "acme/schema/minLength",
       Schema.Struct({ minimum: Schema.Number }),
       ({ annotations, payload }) => {
@@ -23,7 +23,7 @@ describe("SchemaRepresentation revivers", () => {
     )
     expect(filter).type.toBe<SchemaRepresentation.FilterReviver<{ readonly minimum: number }>>()
 
-    const filterGroup = SchemaRepresentation.makeFilterGroupReviver(
+    const filterGroup = SchemaRepresentation.makeReviverFilterGroup(
       "acme/schema/nonEmpty",
       Schema.Null,
       ({ annotations, payload }) => {
@@ -45,6 +45,57 @@ describe("SchemaRepresentation revivers", () => {
     expect(revivers).type.toBe<ReadonlyArray<SchemaRepresentation.AnyReviver>>()
   })
 
+  it("exposes the concrete payload types of built-in revivers", () => {
+    expect(SchemaRepresentation.isPatternReviver).type.toBe<
+      SchemaRepresentation.FilterReviver<{ readonly source: string; readonly flags: string }>
+    >()
+    expect(SchemaRepresentation.isBetweenReviver).type.toBe<
+      SchemaRepresentation.FilterReviver<{
+        readonly minimum: number
+        readonly maximum: number
+        readonly exclusiveMinimum?: true | undefined
+        readonly exclusiveMaximum?: true | undefined
+      }>
+    >()
+    expect(SchemaRepresentation.isBetweenDateReviver).type.toBe<
+      SchemaRepresentation.FilterReviver<{
+        readonly minimum: globalThis.Date
+        readonly maximum: globalThis.Date
+        readonly exclusiveMinimum?: true | undefined
+        readonly exclusiveMaximum?: true | undefined
+      }>
+    >()
+    expect(SchemaRepresentation.isBetweenBigIntReviver).type.toBe<
+      SchemaRepresentation.FilterReviver<{
+        readonly minimum: bigint
+        readonly maximum: bigint
+        readonly exclusiveMinimum?: true | undefined
+        readonly exclusiveMaximum?: true | undefined
+      }>
+    >()
+    expect(SchemaRepresentation.GraphReviver).type.toBe<
+      SchemaRepresentation.DeclarationReviver<"directed" | "undirected">
+    >()
+    expect(SchemaRepresentation.ErrorInstanceReviver).type.toBe<
+      SchemaRepresentation.DeclarationReviver<
+        | null
+        | {
+          readonly includeStack?: true | undefined
+          readonly excludeCause?: true | undefined
+        }
+      >
+    >()
+    expect(SchemaRepresentation.RedactedReviver).type.toBe<
+      SchemaRepresentation.DeclarationReviver<
+        | null
+        | {
+          readonly label?: string | undefined
+          readonly disallowJsonEncode?: true | undefined
+        }
+      >
+    >()
+  })
+
   it("separates JSON decoding from schema revival", () => {
     expect(SchemaRepresentation.fromJson).type.toBe<
       (input: Schema.Json) => SchemaRepresentation.Document
diff --git a/repos/effect/packages/effect/typetest/schema/options.tst.ts b/repos/effect/packages/effect/typetest/schema/options.tst.ts
new file mode 100644
index 000000000..1b5a7412d
--- /dev/null
+++ b/repos/effect/packages/effect/typetest/schema/options.tst.ts
@@ -0,0 +1,36 @@
+import { Schema, SchemaParser } from "effect"
+import type { SchemaAST, SchemaRepresentation, Types } from "effect"
+import { describe, expect, it } from "tstyche"
+
+describe("runtime and structural options", () => {
+  it("supports product concurrency without order or unvalidated preservation", () => {
+    expect<SchemaAST.ParseOptions["onExcessProperty"]>().type.toBe<"ignore" | "error" | undefined>()
+    expect<Extract<SchemaAST.ParseOptions["onExcessProperty"], "preserve">>().type.toBe<never>()
+    expect<SchemaAST.ParseOptions["concurrency"]>().type.toBe<Types.Concurrency | undefined>()
+    expect<Extract<keyof SchemaAST.ParseOptions, "propertyOrder">>().type.toBe<never>()
+    expect<Schema.Annotations.Bottom<string, readonly []>["parseOptions"]>().type.toBe<unknown>()
+
+    const schema = Schema.Struct({ a: Schema.String })
+    expect(SchemaParser.decodeUnknownSync(schema, { onExcessProperty: "error" })({ a: "a" }))
+      .type.toBe<{ readonly a: string }>()
+    expect(SchemaParser.is).type.not.toBeCallableWith(schema, { onExcessProperty: "error" })
+  })
+
+  it("stores options only on Union", () => {
+    expect<Extract<keyof SchemaAST.Arrays, "options">>().type.toBe<never>()
+    expect<Extract<keyof SchemaAST.Objects, "options">>().type.toBe<never>()
+    expect<SchemaAST.Union["options"]>().type.toBe<SchemaAST.UnionOptions | undefined>()
+    expect<Extract<keyof SchemaAST.Union, "mode">>().type.toBe<never>()
+    expect<Extract<keyof SchemaRepresentation.Arrays, "options">>().type.toBe<never>()
+    expect<Extract<keyof SchemaRepresentation.Objects, "options">>().type.toBe<never>()
+    expect<SchemaRepresentation.Union["options"]>().type.toBe<SchemaAST.UnionOptions | undefined>()
+  })
+
+  it("keeps the public Union call and inference", () => {
+    const schema = Schema.Union([Schema.String, Schema.Number], { mode: "oneOf" })
+    expect(schema).type.toBe<Schema.Union<readonly [Schema.String, Schema.Number]>>()
+    expect(Schema.revealCodec(schema)).type.toBe<
+      Schema.Codec<string | number, string | number, never, never>
+    >()
+  })
+})
diff --git a/repos/effect/packages/effect/typetest/unstable/ai/DecisionModel.tst.ts b/repos/effect/packages/effect/typetest/unstable/ai/DecisionModel.tst.ts
new file mode 100644
index 000000000..afb5640b1
--- /dev/null
+++ b/repos/effect/packages/effect/typetest/unstable/ai/DecisionModel.tst.ts
@@ -0,0 +1,248 @@
+import { Context, Effect, Schema, SchemaGetter } from "effect"
+import { type AiError, Decision, DecisionModel } from "effect/unstable/ai"
+import { describe, expect, it } from "tstyche"
+
+const Ticket = Schema.Struct({
+  subject: Schema.String,
+  priority: Schema.FiniteFromString
+})
+
+const TicketTriage = Decision.make({
+  input: Ticket,
+  decisions: {
+    department: Decision.classify({
+      instructions: "Which team should handle this",
+      criteria: {
+        billing: "payments",
+        technical: "bugs",
+        sales: "pricing"
+      }
+    }),
+    frustration: Decision.rate({
+      instructions: "How frustrated",
+      criteria: ["calm", "frustrated", "angry"]
+    }),
+    urgent: Decision.probability({
+      instructions: "The message is time-sensitive",
+      criteria: {
+        false: "No time pressure",
+        true: "Needs action now"
+      }
+    })
+  }
+})
+
+class Redactor extends Context.Service<Redactor, {
+  readonly redact: (value: string) => string
+}>()("Redactor") {}
+
+const RedactedString = Schema.String.pipe(
+  Schema.decodeTo(Schema.String, {
+    decode: SchemaGetter.passthrough(),
+    encode: SchemaGetter.transformEffect<string, string, Redactor>((value) =>
+      Effect.map(Effect.service(Redactor), (redactor) => redactor.redact(value))
+    )
+  })
+)
+
+const RedactedTriage = Decision.make({
+  input: Schema.Struct({ body: RedactedString }),
+  decisions: {
+    urgent: Decision.probability({
+      instructions: "Needs action now",
+      criteria: { false: "No", true: "Yes" }
+    })
+  }
+})
+
+const program = DecisionModel.decide(TicketTriage, {
+  input: { subject: "Card was charged twice", priority: 3 }
+})
+
+type Success = typeof program extends Effect.Effect<infer A, any, any> ? A : never
+type Answers = Success["answers"]
+
+describe("Decision", () => {
+  it("classify infers labels from the criteria keys", () => {
+    expect<Answers["department"]["label"]>().type.toBe<"billing" | "technical" | "sales">()
+    expect<Answers["department"]["probabilities"]>().type.toBe<{
+      readonly billing: number
+      readonly technical: number
+      readonly sales: number
+    }>()
+    expect<Answers["department"]["confidence"]>().type.toBe<number | undefined>()
+  })
+
+  it("rate infers labels from the ordered criteria", () => {
+    expect<Answers["frustration"]["rating"]>().type.toBe<number>()
+    expect<Answers["frustration"]["label"]>().type.toBe<"calm" | "frustrated" | "angry">()
+    expect<Answers["frustration"]["probabilities"]>().type.toBe<{
+      readonly calm: number
+      readonly frustrated: number
+      readonly angry: number
+    }>()
+    expect<Answers["frustration"]["confidence"]>().type.toBe<number | undefined>()
+  })
+
+  it("rate widens to string for non-literal criteria", () => {
+    const levels: ReadonlyArray<string> = ["low", "high"]
+    const Wide = Decision.make({
+      input: Schema.String,
+      decisions: {
+        level: Decision.rate({ instructions: "How much", criteria: levels })
+      }
+    })
+    const wide = DecisionModel.decide(Wide, { input: "text" })
+
+    type WideSuccess = typeof wide extends Effect.Effect<infer A, any, any> ? A : never
+    type WideAnswers = WideSuccess["answers"]
+
+    expect<WideAnswers["level"]["label"]>().type.toBe<string>()
+  })
+
+  it("probability answers carry only the probability", () => {
+    expect<Answers["urgent"]>().type.toBe<{ readonly probability: number }>()
+    expect<Answers["urgent"]>().type.not.toHaveProperty("confidence")
+    expect<Answers["urgent"]>().type.not.toHaveProperty("probabilities")
+  })
+
+  it("probability accepts omitted criteria and preserves answer inference", () => {
+    const urgent = Decision.probability({ instructions: "Needs action now" })
+    const definition = Decision.make({
+      input: Schema.String,
+      decisions: { urgent }
+    })
+    const result = DecisionModel.decide(definition, { input: "Help now" })
+
+    type Result = typeof result extends Effect.Effect<infer A, any, any> ? A : never
+
+    expect(urgent).type.toBe<Decision.Probability>()
+    expect<Result["answers"]>().type.toBe<{ readonly urgent: Decision.ProbabilityAnswer }>()
+  })
+
+  it("probability accepts explicitly undefined criteria", () => {
+    expect(Decision.probability({ instructions: "Needs action now", criteria: undefined }))
+      .type.toBe<Decision.Probability>()
+  })
+
+  it("probability requires both false and true when criteria are supplied", () => {
+    Decision.probability({
+      instructions: "Needs action now",
+      // @ts-expect-error is missing in type
+      criteria: { false: "No" }
+    })
+    Decision.probability({
+      instructions: "Needs action now",
+      // @ts-expect-error is missing in type
+      criteria: { true: "Yes" }
+    })
+  })
+
+  it("instructions must be a string", () => {
+    Decision.classify({
+      // @ts-expect-error is not assignable to type
+      instructions: ["Which team"],
+      criteria: { billing: "payments" }
+    })
+  })
+
+  it("make rejects a non-schema input", () => {
+    Decision.make({
+      // @ts-expect-error is not assignable to type
+      input: "Ticket",
+      decisions: {
+        urgent: Decision.probability({
+          instructions: "Needs action now",
+          criteria: { false: "No", true: "Yes" }
+        })
+      }
+    })
+  })
+})
+
+describe("DecisionModel", () => {
+  it("provider rate answers do not require a label", () => {
+    expect<{
+      readonly _tag: "Rate"
+      readonly rating: number
+      readonly probabilities: Readonly<Record<string, number>>
+      readonly confidence: number
+    }>().type.toBeAssignableTo<DecisionModel.ProviderRateAnswer>()
+  })
+
+  it("provider classify answers require a label", () => {
+    expect<DecisionModel.ProviderClassifyAnswer["label"]>().type.toBe<string>()
+    expect<{
+      readonly _tag: "Classify"
+      readonly probabilities: Readonly<Record<string, number>>
+      readonly confidence: number
+    }>().type.not.toBeAssignableTo<DecisionModel.ProviderClassifyAnswer>()
+  })
+
+  it("decide keys answers by the decisions map", () => {
+    expect<keyof Answers>().type.toBe<"department" | "frustration" | "urgent">()
+    expect<Success["usage"]>().type.toBe<DecisionModel.DecisionUsage>()
+  })
+
+  it("decide fails only with AiError", () => {
+    type Error = typeof program extends Effect.Effect<any, infer E, any> ? E : never
+
+    expect<Error>().type.toBe<AiError.AiError>()
+  })
+
+  it("decide requires the DecisionModel service", () => {
+    type Requirements = typeof program extends Effect.Effect<any, any, infer R> ? R : never
+
+    expect<Requirements>().type.toBe<DecisionModel.DecisionModel>()
+  })
+
+  it("decide includes input encoding services in the requirements", () => {
+    const redacted = DecisionModel.decide(RedactedTriage, { input: { body: "call me" } })
+
+    type Requirements = typeof redacted extends Effect.Effect<any, any, infer R> ? R : never
+
+    expect<Requirements>().type.toBe<DecisionModel.DecisionModel | Redactor>()
+  })
+
+  it("decide takes the schema Type as input", () => {
+    DecisionModel.decide(TicketTriage, {
+      // @ts-expect-error is not assignable to type
+      input: { subject: "Card was charged twice", priority: "3" }
+    })
+    DecisionModel.decide(TicketTriage, {
+      // @ts-expect-error is missing in type
+      input: { subject: "Card was charged twice" }
+    })
+  })
+
+  it("the service decide matches the module decide without the service requirement", () => {
+    const model = null as unknown as DecisionModel.DecisionModel
+    const viaService = model.decide(TicketTriage, {
+      input: { subject: "Card was charged twice", priority: 3 }
+    })
+    const viaServiceRedacted = model.decide(RedactedTriage, { input: { body: "call me" } })
+
+    type ServiceSuccess = typeof viaService extends Effect.Effect<infer A, any, any> ? A : never
+    type ServiceError = typeof viaService extends Effect.Effect<any, infer E, any> ? E : never
+    type ServiceRequirements = typeof viaService extends Effect.Effect<any, any, infer R> ? R : never
+    type RedactedRequirements = typeof viaServiceRedacted extends Effect.Effect<any, any, infer R> ? R : never
+
+    expect<ServiceSuccess>().type.toBe<Success>()
+    expect<ServiceError>().type.toBe<AiError.AiError>()
+    expect<ServiceRequirements>().type.toBe<never>()
+    expect<RedactedRequirements>().type.toBe<Redactor>()
+  })
+
+  it("make takes a provider decide returning AiError", () => {
+    const provider = (options: DecisionModel.ProviderOptions) => {
+      expect(options.state).type.toBe<Schema.Json>()
+      expect(options.decisions).type.toBeAssignableTo<Record<string, Decision.Any>>()
+      return Effect.succeed<DecisionModel.ProviderResponse>({
+        answers: {},
+        usage: { inputTokens: undefined, outputTokens: undefined }
+      })
+    }
+
+    expect(DecisionModel.make({ decide: provider })).type.toBe<Effect.Effect<DecisionModel.DecisionModel>>()
+  })
+})
diff --git a/repos/effect/packages/effect/typetest/unstable/ai/LanguageModel.tst.ts b/repos/effect/packages/effect/typetest/unstable/ai/LanguageModel.tst.ts
index fad424926..894d60e93 100644
--- a/repos/effect/packages/effect/typetest/unstable/ai/LanguageModel.tst.ts
+++ b/repos/effect/packages/effect/typetest/unstable/ai/LanguageModel.tst.ts
@@ -1,4 +1,4 @@
-import { Context, Effect, Schema, type Stream } from "effect"
+import { Context, Effect, Schema, SchemaGetter, type Stream } from "effect"
 import { type AiError, type Chat, LanguageModel, Tool, Toolkit } from "effect/unstable/ai"
 import type * as Response from "effect/unstable/ai/Response"
 import { describe, expect, it } from "tstyche"
@@ -36,6 +36,24 @@ const TransformTool = Tool.make("TransformTool", {
   success: Schema.Finite
 })
 
+class ParamEncodeService extends Context.Service<ParamEncodeService, {
+  readonly use: Effect.Effect<void>
+}>()("ParamEncodeService") {}
+
+const AsymmetricParam = Schema.String.pipe(
+  Schema.decodeTo(Schema.String, {
+    decode: SchemaGetter.passthrough(),
+    encode: SchemaGetter.transformEffect<string, string, ParamEncodeService>((value) =>
+      Effect.as(Effect.service(ParamEncodeService), value)
+    )
+  })
+)
+
+const AsymmetricParamsTool = Tool.make("AsymmetricParamsTool", {
+  parameters: Schema.Struct({ input: AsymmetricParam }),
+  success: Schema.Struct({ output: Schema.String })
+})
+
 describe("LanguageModel", () => {
   describe("generateText", () => {
     it("uses encoded tool parameters when tool call resolution is disabled", () => {
@@ -52,7 +70,7 @@ describe("LanguageModel", () => {
       expect<ToolCallParams>().type.toBe<string>()
     })
 
-    it("uses decoded tool parameters when tool call resolution is enabled", () => {
+    it("uses opaque tool parameters when tool call resolution is enabled", () => {
       const toolkit = Toolkit.make(TransformTool)
       const program = LanguageModel.generateText({
         prompt: "hello",
@@ -62,10 +80,10 @@ describe("LanguageModel", () => {
       type ProgramSuccess = typeof program extends Effect.Effect<infer A, any, any> ? A : never
       type ToolCallParams = ProgramSuccess["toolCalls"][number]["params"]
 
-      expect<ToolCallParams>().type.toBe<number>()
+      expect<ToolCallParams>().type.toBe<unknown>()
     })
 
-    it("uses decoded tool parameters for a non-literal resolution flag", () => {
+    it("uses opaque tool parameters for a non-literal resolution flag", () => {
       const toolkit = Toolkit.make(TransformTool)
       const disableToolCallResolution = null as unknown as boolean
       const program = LanguageModel.generateText({
@@ -77,7 +95,7 @@ describe("LanguageModel", () => {
       type ProgramSuccess = typeof program extends Effect.Effect<infer A, any, any> ? A : never
       type ToolCallParams = ProgramSuccess["toolCalls"][number]["params"]
 
-      expect<ToolCallParams>().type.toBe<number>()
+      expect<ToolCallParams>().type.toBe<unknown>()
     })
 
     it("returns an empty tool record when no toolkit is provided", () => {
@@ -118,6 +136,46 @@ describe("LanguageModel", () => {
       >()
     })
 
+    it("includes parameter encoding services in the requirements", () => {
+      const toolkit = Toolkit.make(AsymmetricParamsTool)
+      const program = LanguageModel.generateText({
+        prompt: "hello",
+        toolkit
+      })
+
+      type ProgramRequirements = typeof program extends Effect.Effect<any, any, infer R> ? R : never
+
+      expect<ProgramRequirements>().type.toBe<
+        LanguageModel.LanguageModel | ParamEncodeService | Tool.HandlersFor<Toolkit.Tools<typeof toolkit>>
+      >()
+    })
+
+    it("includes parameter encoding services when tool call resolution is disabled", () => {
+      const toolkit = Toolkit.make(AsymmetricParamsTool)
+      const program = LanguageModel.generateText({
+        prompt: "hello",
+        toolkit,
+        disableToolCallResolution: true
+      })
+
+      type ProgramRequirements = typeof program extends Effect.Effect<any, any, infer R> ? R : never
+
+      expect<ProgramRequirements>().type.toBe<LanguageModel.LanguageModel | ParamEncodeService>()
+    })
+
+    it("omits handler and result requirements when tool call resolution is disabled", () => {
+      const toolkit = Toolkit.make(ToolWithRequestContext)
+      const program = LanguageModel.generateText({
+        prompt: "hello",
+        toolkit,
+        disableToolCallResolution: true
+      })
+
+      type ProgramRequirements = typeof program extends Effect.Effect<any, any, infer R> ? R : never
+
+      expect<ProgramRequirements>().type.toBe<LanguageModel.LanguageModel>()
+    })
+
     it("includes tool request dependencies for resolved toolkits with handlers", () => {
       const toolkit: Toolkit.WithHandler<{
         readonly ToolWithRequestContext: typeof ToolWithRequestContext
@@ -197,7 +255,7 @@ describe("LanguageModel", () => {
       expect<ProgramSuccess>().type.toBe<
         LanguageModel.GenerateTextResponse<{
           readonly ToolWithRequestContext: typeof ToolWithRequestContext
-        }>
+        }, "opaque">
       >()
     })
   })
@@ -245,9 +303,22 @@ describe("LanguageModel", () => {
       expect<StreamPart>().type.toBe<
         Response.StreamPart<{
           readonly ToolWithRequestContext: typeof ToolWithRequestContext
-        }>
+        }, "opaque">
       >()
     })
+
+    it("uses opaque tool parameters when tool call resolution is enabled", () => {
+      const toolkit = Toolkit.make(TransformTool)
+      const stream = LanguageModel.streamText({
+        prompt: "hello",
+        toolkit
+      })
+
+      type StreamPart = typeof stream extends Stream.Stream<infer A, any, any> ? A : never
+      type ToolCallParams = Extract<StreamPart, { readonly type: "tool-call" }>["params"]
+
+      expect<ToolCallParams>().type.toBe<unknown>()
+    })
   })
 
   describe("generateObject", () => {
@@ -269,7 +340,7 @@ describe("LanguageModel", () => {
 
   describe("Chat", () => {
     it("uses encoded tool parameters when tool call resolution is disabled", () => {
-      const chat = null as unknown as Chat.Service
+      const chat = null as unknown as Chat.Chat
       const toolkit = Toolkit.make(TransformTool)
       const program = chat.generateText({
         prompt: "hello",
diff --git a/repos/effect/packages/effect/typetest/unstable/ai/McpServer.tst.ts b/repos/effect/packages/effect/typetest/unstable/ai/McpServer.tst.ts
index 14c0c6c12..dfc0cb72b 100644
--- a/repos/effect/packages/effect/typetest/unstable/ai/McpServer.tst.ts
+++ b/repos/effect/packages/effect/typetest/unstable/ai/McpServer.tst.ts
@@ -16,6 +16,35 @@ const serverOptions = {
 } as const
 
 describe("McpServer", () => {
+  it("should expose protocol-neutral request facts without a session service", () => {
+    expect(McpSchema.McpRequestContext.useSync((context) => context.protocolVersion)).type.toBe<
+      Effect.Effect<string, never, McpSchema.McpRequestContext>
+    >()
+    expect(McpSchema.McpRequestContext.useSync((context) => context.clientInfo)).type.toBe<
+      Effect.Effect<McpSchema.Implementation | undefined, never, McpSchema.McpRequestContext>
+    >()
+    expect(McpServer.clientCapabilities).type.toBe<
+      Effect.Effect<McpSchema.ClientCapabilities, never, McpSchema.McpRequestContext>
+    >()
+  })
+
+  it("should accept scalar tool output schemas while keeping inputs object-rooted", () => {
+    expect(McpSchema.Tool.make).type.toBeCallableWith({
+      name: "scalar-output",
+      inputSchema: { type: "object" },
+      outputSchema: { type: "string" }
+    })
+    expect({ type: "string" } as const).type.not.toBeAssignableTo<McpSchema.ToolJson>()
+  })
+
+  it("should accept JSON-valued structured sampling results", () => {
+    expect(McpSchema.ToolResultContent.make).type.toBeCallableWith({
+      toolUseId: "call-1",
+      content: [],
+      structuredContent: ["sunny", null, 24]
+    })
+  })
+
   describe("protocol configuration", () => {
     it("should accept a non-empty protocol declaration when constructing any server", () => {
       expect(McpServer.run).type.toBeCallableWith(serverOptions)
@@ -71,11 +100,8 @@ describe("McpServer", () => {
     })
 
     it("should expose every historical protocol adapter", () => {
-      expect<keyof typeof McpProtocol>().type.toBe<
-        "v2024_11_05" | "v2025_03_26" | "v2025_06_18" | "v2025_11_25"
-      >()
       expect<McpProtocol.ProtocolVersion>().type.toBe<
-        "2024-11-05" | "2025-03-26" | "2025-06-18" | "2025-11-25"
+        "2024-11-05" | "2025-03-26" | "2025-06-18" | "2025-11-25" | "2026-07-28"
       >()
     })
 
@@ -84,20 +110,26 @@ describe("McpServer", () => {
       expect(McpProtocol.v2025_03_26).type.toBeAssignableTo<McpProtocol.ProtocolAdapter<"2025-03-26">>()
       expect(McpProtocol.v2025_06_18).type.toBeAssignableTo<McpProtocol.ProtocolAdapter<"2025-06-18">>()
       expect(McpProtocol.v2025_11_25).type.toBeAssignableTo<McpProtocol.ProtocolAdapter<"2025-11-25">>()
+      expect(McpProtocol.v2026_07_28).type.toBeAssignableTo<McpProtocol.ProtocolAdapter<"2026-07-28">>()
+      expect(McpProtocol.v2025_06_18.runtime).type.toBe<McpProtocol.StatefulRuntimeDescriptor>()
+      expect(McpProtocol.v2026_07_28.runtime).type.toBe<McpProtocol.StatelessRuntimeDescriptor>()
 
       const protocols: readonly [McpProtocol.ProtocolAdapter, ...Array<McpProtocol.ProtocolAdapter>] = [
         McpProtocol.v2024_11_05,
         McpProtocol.v2025_03_26,
         McpProtocol.v2025_06_18,
-        McpProtocol.v2025_11_25
+        McpProtocol.v2025_11_25,
+        McpProtocol.v2026_07_28
       ]
 
       expect(protocols[0].protocolVersion).type.toBe<McpProtocol.ProtocolVersion>()
+      expect(protocols[0].runtime).type.toBe<McpProtocol.RuntimeDescriptor>()
+      expect(protocols[0].runtime.transport).type.toBe<McpProtocol.TransportPolicy>()
       expect(protocols[0].clientRpcs.requests).type.toBeAssignableTo<ReadonlyMap<string, Rpc.Any>>()
     })
 
     it("should preserve the decoded tool JSON Schema shape", () => {
-      expect<Schema.Schema.Type<typeof McpSchema.ToolJsonSchema>>().type.toBe<McpSchema.ToolJsonSchema>()
+      expect<Schema.Schema.Type<typeof McpSchema.ToolJson>>().type.toBe<McpSchema.ToolJson>()
     })
 
     it("should expose invalid protocol declarations as typed constructor failures", () => {
@@ -110,9 +142,44 @@ describe("McpServer", () => {
   })
 
   describe("request context", () => {
+    it("should not claim that stateless handlers receive the legacy client service", () => {
+      const layer = McpServer.resource({
+        uri: "file:///legacy-client.txt",
+        name: "legacy-client",
+        content: McpSchema.McpServerClient.useSync((client) => client.clientInfo.name)
+      })
+      expect<Layer.Services<typeof layer>>().type.toBe<McpSchema.McpServerClient>()
+    })
+
+    it("should expose multi-round-trip input through the request context", () => {
+      expect(McpSchema.McpRequestContext.useSync((context) => context.inputResponses)).type.toBe<
+        Effect.Effect<
+          Readonly<Record<string, McpSchema.McpInputResponse>> | undefined,
+          never,
+          McpSchema.McpRequestContext
+        >
+      >()
+      expect(McpSchema.McpRequestContext.useSync((context) => context.requestState)).type.toBe<
+        Effect.Effect<string | undefined, never, McpSchema.McpRequestContext>
+      >()
+      expect(
+        new McpSchema.InputRequired({
+          inputRequests: {
+            approval: { method: "elicitation/create", params: { message: "Approve" } }
+          }
+        })
+      ).type.toBe<McpSchema.InputRequired>()
+      expect(
+        new McpSchema.InputRequired({
+          requestState: "retry-after-1s"
+        })
+      ).type.toBe<McpSchema.InputRequired>()
+      expect(McpSchema.InputRequired).type.not.toBeConstructableWith({})
+    })
+
     it("should expose the selected protocol version when a handler reads its client", () => {
       expect(McpSchema.McpServerClient.useSync((client) => client.protocolVersion)).type.toBe<
-        Effect.Effect<McpProtocol.ProtocolVersion, never, McpSchema.McpServerClient>
+        Effect.Effect<McpProtocol.StatefulProtocolVersion, never, McpSchema.McpServerClient>
       >()
     })
 
diff --git a/repos/effect/packages/effect/typetest/unstable/ai/Response.tst.ts b/repos/effect/packages/effect/typetest/unstable/ai/Response.tst.ts
index 4c260f33b..f7130d2d4 100644
--- a/repos/effect/packages/effect/typetest/unstable/ai/Response.tst.ts
+++ b/repos/effect/packages/effect/typetest/unstable/ai/Response.tst.ts
@@ -24,11 +24,11 @@ describe("Response", () => {
     const narrow = <
       StaticTools extends Record<string, Tool.Any>,
       DynamicTools extends Record<string, Tool.Any>,
-      EncodedParameters extends boolean
-    >(part: Response.StreamPart<StaticTools & DynamicTools, EncodedParameters>) => {
+      ParametersMode extends Response.ToolParametersMode
+    >(part: Response.StreamPart<StaticTools & DynamicTools, ParametersMode>) => {
       if (part.type === "error") return
 
-      const narrowed: Response.StreamPart<StaticTools & DynamicTools, EncodedParameters> = part
+      const narrowed: Response.StreamPart<StaticTools & DynamicTools, ParametersMode> = part
       return narrowed
     }
 
@@ -36,31 +36,34 @@ describe("Response", () => {
   })
 
   it("preserves tool names with decoded and encoded parameters", () => {
-    const decoded = null as unknown as Response.ToolCallParts<Tools>
+    const decoded = null as unknown as Response.ToolCallParts<Tools, "decoded">
     if (decoded.name === "BooleanTool") {
       expect(decoded.params).type.toBe<boolean>()
     } else {
       expect(decoded.params).type.toBe<number>()
     }
 
-    const encoded = null as unknown as Response.ToolCallParts<Tools, true>
+    const encoded = null as unknown as Response.ToolCallParts<Tools, "encoded">
     if (encoded.name === "BooleanTool") {
       expect(encoded.params).type.toBe<boolean>()
     } else {
       expect(encoded.params).type.toBe<string>()
     }
+
+    const opaque = null as unknown as Response.ToolCallParts<Tools, "opaque">
+    expect(opaque.params).type.toBe<unknown>()
   })
 
   it("preserves tool names with success and failure results", () => {
     const result = null as unknown as Response.ToolResultParts<Tools>
     if (result.name === "BooleanTool") {
       if (result.isFailure) {
-        expect(result.result).type.toBe<boolean>()
+        expect(result.result).type.toBe<typeof BooleanTool.failureSchema.Type | typeof Tool.ExecutionFailure.Type>()
       } else {
         expect(result.result).type.toBe<string>()
       }
     } else if (result.isFailure) {
-      expect(result.result).type.toBe<{ readonly message: string }>()
+      expect(result.result).type.toBe<typeof TransformTool.failureSchema.Type | typeof Tool.ExecutionFailure.Type>()
     } else {
       expect(result.result).type.toBe<number>()
     }
diff --git a/repos/effect/packages/effect/typetest/unstable/ai/Tool.tst.ts b/repos/effect/packages/effect/typetest/unstable/ai/Tool.tst.ts
index 830941ed8..5cb8a6d9d 100644
--- a/repos/effect/packages/effect/typetest/unstable/ai/Tool.tst.ts
+++ b/repos/effect/packages/effect/typetest/unstable/ai/Tool.tst.ts
@@ -1,8 +1,32 @@
-import type { Schema } from "effect"
-import { Tool } from "effect/unstable/ai"
+import { Schema } from "effect"
+import { type AiError, Tool } from "effect/unstable/ai"
 import { describe, expect, it } from "tstyche"
 
 describe("Tool", () => {
+  describe("failure results", () => {
+    const failure = Schema.NumberFromString
+    const errorTool = Tool.make("ErrorMode", { failure })
+    const returnTool = Tool.make("ReturnMode", { failure, failureMode: "return" })
+
+    it("includes execution failures in the default error mode", () => {
+      expect<Tool.FailureResult<typeof errorTool>>().type.toBe<
+        typeof failure.Type | typeof Tool.ExecutionFailure.Type
+      >()
+      expect<Tool.FailureResultEncoded<typeof errorTool>>().type.toBe<
+        typeof failure.Encoded | typeof Tool.ExecutionFailure.Encoded
+      >()
+    })
+
+    it("includes execution failures alongside AiError in return mode", () => {
+      expect<Tool.FailureResult<typeof returnTool>>().type.toBe<
+        typeof failure.Type | typeof Tool.ExecutionFailure.Type | AiError.AiError
+      >()
+      expect<Tool.FailureResultEncoded<typeof returnTool>>().type.toBe<
+        typeof failure.Encoded | typeof Tool.ExecutionFailure.Encoded | AiError.AiErrorEncoded
+      >()
+    })
+  })
+
   describe("make", () => {
     it("omitting parameters defaults to EmptyParams", () => {
       const tool = Tool.make("A")
diff --git a/repos/effect/packages/effect/typetest/unstable/arbitrary/Arbitrary.tst.ts b/repos/effect/packages/effect/typetest/unstable/arbitrary/Arbitrary.tst.ts
index 936608f43..77bb29106 100644
--- a/repos/effect/packages/effect/typetest/unstable/arbitrary/Arbitrary.tst.ts
+++ b/repos/effect/packages/effect/typetest/unstable/arbitrary/Arbitrary.tst.ts
@@ -36,6 +36,20 @@ describe("Arbitrary", () => {
     const strings = Arbitrary.schema(Schema.String)
     const stringOrNumber = Arbitrary.schema(Schema.Union([Schema.String, Schema.Number]))
 
+    expect(Arbitrary.array(strings)).type.toBe<Arbitrary.Arbitrary<Array<string>>>()
+    expect(Arbitrary.array(stringOrNumber, { minLength: 1, maxLength: 50 })).type.toBe<
+      Arbitrary.Arbitrary<Array<string | number>>
+    >()
+    const commands = Arbitrary.array(Arbitrary.Constant({ _tag: "Stop" }))
+    expect(commands).type.toBe<Arbitrary.Arbitrary<Array<{ readonly _tag: "Stop" }>>>()
+    expect(Arbitrary.all([commands, strings])).type.toBe<
+      Arbitrary.Arbitrary<[Array<{ readonly _tag: "Stop" }>, string]>
+    >()
+    expect(Arbitrary.checkEffect(commands, (values) => {
+      expect(values).type.toBe<Array<{ readonly _tag: "Stop" }>>()
+      return true
+    })).type.toBe<Effect.Effect<Arbitrary.CheckResult<Array<{ readonly _tag: "Stop" }>, never>>>()
+
     expect(Arbitrary.Constant({ _tag: "Constant" })).type.toBe<
       Arbitrary.Arbitrary<{ readonly _tag: "Constant" }>
     >()
diff --git a/repos/effect/packages/effect/typetest/unstable/cli/Command.tst.ts b/repos/effect/packages/effect/typetest/unstable/cli/Command.tst.ts
index a2f85052f..0f8535404 100644
--- a/repos/effect/packages/effect/typetest/unstable/cli/Command.tst.ts
+++ b/repos/effect/packages/effect/typetest/unstable/cli/Command.tst.ts
@@ -26,10 +26,10 @@ describe("Command", () => {
   describe("withSharedFlags", () => {
     it("adds shared flags to command input and parent context", () => {
       const root = Command.make("root", {
-        workspace: Flag.string("workspace")
+        workspace: Flag.String("workspace")
       }).pipe(
         Command.withSharedFlags({
-          verbose: Flag.boolean("verbose")
+          verbose: Flag.Boolean("verbose")
         }),
         Command.withHandler((config) => {
           expect(config).type.toBe<{ readonly workspace: string; readonly verbose: boolean }>()
@@ -50,10 +50,10 @@ describe("Command", () => {
 
     it("does not expose local config through yield* parent", () => {
       const root = Command.make("root", {
-        workspace: Flag.string("workspace")
+        workspace: Flag.String("workspace")
       }).pipe(
         Command.withSharedFlags({
-          verbose: Flag.boolean("verbose")
+          verbose: Flag.Boolean("verbose")
         })
       )
 
@@ -70,10 +70,10 @@ describe("Command", () => {
 
     it("widens input after withSubcommands for input-based combinators", () => {
       const root = Command.make("root", {
-        local: Flag.string("local")
+        local: Flag.String("local")
       }).pipe(
         Command.withSharedFlags({
-          verbose: Flag.boolean("verbose")
+          verbose: Flag.Boolean("verbose")
         })
       )
 
@@ -96,19 +96,19 @@ describe("Command", () => {
     it("accepts only flags", () => {
       Command.make("root").pipe(
         // @ts-expect-error Type 'Argument<string>' is not assignable
-        Command.withSharedFlags({ file: Argument.string("file") })
+        Command.withSharedFlags({ file: Argument.String("file") })
       )
     })
   })
 
   describe("withGlobalFlags", () => {
     it("strips setting context from mixed global flags", () => {
-      const VerboseAction = GlobalFlag.action({
-        flag: Flag.boolean("verbose").pipe(Flag.withDefault(false)),
+      const VerboseAction = GlobalFlag.Action({
+        flag: Flag.Boolean("verbose").pipe(Flag.withDefault(false)),
         run: () => Effect.void
       })
-      const Format = GlobalFlag.setting("format")({
-        flag: Flag.string("format").pipe(Flag.withDefault("text"))
+      const Format = GlobalFlag.Setting("format")({
+        flag: Flag.String("format").pipe(Flag.withDefault("text"))
       })
 
       const command = Command.make("example", {}, () =>
@@ -122,12 +122,12 @@ describe("Command", () => {
     })
 
     it("strips setting context in data-first form", () => {
-      const VerboseAction = GlobalFlag.action({
-        flag: Flag.boolean("verbose").pipe(Flag.withDefault(false)),
+      const VerboseAction = GlobalFlag.Action({
+        flag: Flag.Boolean("verbose").pipe(Flag.withDefault(false)),
         run: () => Effect.void
       })
-      const Format = GlobalFlag.setting("format")({
-        flag: Flag.string("format").pipe(Flag.withDefault("text"))
+      const Format = GlobalFlag.Setting("format")({
+        flag: Flag.String("format").pipe(Flag.withDefault("text"))
       })
 
       const command = Command.withGlobalFlags(
diff --git a/repos/effect/packages/effect/typetest/unstable/cli/Param.tst.ts b/repos/effect/packages/effect/typetest/unstable/cli/Param.tst.ts
index 51d34a6be..2a6627dee 100644
--- a/repos/effect/packages/effect/typetest/unstable/cli/Param.tst.ts
+++ b/repos/effect/packages/effect/typetest/unstable/cli/Param.tst.ts
@@ -4,13 +4,13 @@ import { describe, expect, it } from "tstyche"
 
 describe("Param", () => {
   it("accepts effectful fallback prompts for flags and arguments", () => {
-    const prompt = Effect.succeed(Prompt.text({ message: "Name" }))
-    const integerPrompt = Effect.succeed(Prompt.integer({ message: "Count" }))
+    const prompt = Effect.succeed(Prompt.String({ message: "Name" }))
+    const integerPrompt = Effect.succeed(Prompt.Int({ message: "Count" }))
 
-    const flag = Flag.string("name").pipe(Flag.withFallbackPrompt(prompt))
-    const argument = Argument.string("name").pipe(Argument.withFallbackPrompt(prompt))
-    const integerFlag = Flag.string("count").pipe(Flag.withFallbackPrompt(integerPrompt))
-    const integerArgument = Argument.string("count").pipe(Argument.withFallbackPrompt(integerPrompt))
+    const flag = Flag.String("name").pipe(Flag.withFallbackPrompt(prompt))
+    const argument = Argument.String("name").pipe(Argument.withFallbackPrompt(prompt))
+    const integerFlag = Flag.String("count").pipe(Flag.withFallbackPrompt(integerPrompt))
+    const integerArgument = Argument.String("count").pipe(Argument.withFallbackPrompt(integerPrompt))
 
     expect(flag).type.toBe<Flag.Flag<string>>()
     expect(argument).type.toBe<Argument.Argument<string>>()
diff --git a/repos/effect/packages/effect/typetest/unstable/cli/Prompt.tst.ts b/repos/effect/packages/effect/typetest/unstable/cli/Prompt.tst.ts
index 597f542a7..bbd620741 100644
--- a/repos/effect/packages/effect/typetest/unstable/cli/Prompt.tst.ts
+++ b/repos/effect/packages/effect/typetest/unstable/cli/Prompt.tst.ts
@@ -6,23 +6,48 @@ declare const stringEvents: Queue.Dequeue<string, never>
 declare const objectEvents: Queue.Dequeue<{ readonly tick: number }, never>
 
 describe("Prompt", () => {
+  it("allows select messages to be omitted but requires an autocomplete message", () => {
+    const options = { choices: [{ title: "First", value: "first" }] }
+    expect(Prompt.Select).type.toBeCallableWith(options)
+    expect(Prompt.MultiSelect).type.toBeCallableWith(options)
+    expect(Prompt.AutoComplete).type.not.toBeCallableWith(options)
+  })
+
+  it("numeric option types match their constructors", () => {
+    const intOptions: Prompt.IntOptions = { message: "Count", min: 0, incrementBy: 2 }
+    const numberOptions: Prompt.NumberOptions = { ...intOptions, precision: 3 }
+    expect(Prompt.Int).type.toBeCallableWith(intOptions)
+    expect(Prompt.Number).type.toBeCallableWith(numberOptions)
+    expect<Parameters<typeof Prompt.Int>[0]>().type.toBe<Prompt.IntOptions>()
+    expect<Parameters<typeof Prompt.Number>[0]>().type.toBe<Prompt.NumberOptions>()
+    expect<Prompt.NumberOptions>().type.toBeAssignableTo<Prompt.IntOptions>()
+  })
+
+  it("TextOptions remains shared by text controls", () => {
+    const options: Prompt.TextOptions = { message: "Value" }
+    expect(Prompt.String).type.toBeCallableWith(options)
+    expect(Prompt.Hidden).type.toBeCallableWith(options)
+    expect(Prompt.Password).type.toBeCallableWith(options)
+    expect<Prompt.ListOptions>().type.toBeAssignableTo<Prompt.TextOptions>()
+  })
+
   describe("Theme", () => {
     it("supports context and per-prompt customization", () => {
       expect(Prompt.makeTheme({ prefix: "!", primaryColor: "primary" })).type.toBe<Prompt.Theme>()
-      expect(Prompt.text).type.toBeCallableWith({
+      expect(Prompt.String).type.toBeCallableWith({
         message: "Name",
         theme: { prefix: "!", errorColor: "error" }
       })
     })
 
     it("does not expose the replaced prefix option", () => {
-      expect(Prompt.text).type.not.toBeCallableWith({ message: "Name", prefix: "!" })
+      expect(Prompt.String).type.not.toBeCallableWith({ message: "Name", prefix: "!" })
     })
   })
 
   describe("custom", () => {
     it("without events, process receives Terminal.UserInput", () => {
-      Prompt.custom(
+      Prompt.Custom(
         { count: 0 },
         {
           render: () => Effect.succeed(""),
@@ -36,7 +61,7 @@ describe("Prompt", () => {
     })
 
     it("with events, process receives ProcessInput<A>", () => {
-      Prompt.custom(
+      Prompt.Custom(
         { count: 0 },
         stringEvents,
         {
@@ -51,7 +76,7 @@ describe("Prompt", () => {
     })
 
     it("ProcessInput is a discriminated union narrowed by _tag", () => {
-      Prompt.custom(
+      Prompt.Custom(
         { count: 0 },
         objectEvents,
         {
@@ -70,7 +95,7 @@ describe("Prompt", () => {
     })
 
     it("returns Prompt<Output>", () => {
-      const prompt = Prompt.custom(
+      const prompt = Prompt.Custom(
         0,
         {
           render: () => Effect.succeed(""),
@@ -86,7 +111,7 @@ describe("Prompt", () => {
     })
 
     it("returns Prompt<Output> with events", () => {
-      const prompt = Prompt.custom(
+      const prompt = Prompt.Custom(
         0,
         stringEvents,
         {
diff --git a/repos/effect/packages/effect/typetest/unstable/cluster/EntityProxyServer.tst.ts b/repos/effect/packages/effect/typetest/unstable/cluster/EntityProxyServer.tst.ts
new file mode 100644
index 000000000..0855e685d
--- /dev/null
+++ b/repos/effect/packages/effect/typetest/unstable/cluster/EntityProxyServer.tst.ts
@@ -0,0 +1,41 @@
+import { Context, Effect, type Layer, Schema, SchemaGetter } from "effect"
+import { Entity, EntityProxy, EntityProxyServer, type Sharding } from "effect/unstable/cluster"
+import { HttpApi } from "effect/unstable/httpapi"
+import { Rpc } from "effect/unstable/rpc"
+import { describe, expect, it } from "tstyche"
+
+class PayloadEncoder extends Context.Service<PayloadEncoder, {}>()("PayloadEncoder") {}
+class SuccessDecoder extends Context.Service<SuccessDecoder, {}>()("SuccessDecoder") {}
+class ErrorDecoder extends Context.Service<ErrorDecoder, {}>()("ErrorDecoder") {}
+class PayloadDecoder extends Context.Service<PayloadDecoder, {}>()("PayloadDecoder") {}
+
+const payload = Schema.String.pipe(Schema.decodeTo(Schema.String, {
+  decode: SchemaGetter.transformEffect((value: string) => Effect.as(PayloadDecoder, value)),
+  encode: SchemaGetter.transformEffect((value: string) => Effect.as(PayloadEncoder, value))
+}))
+const success = Schema.String.pipe(Schema.decodeTo(Schema.String, {
+  decode: SchemaGetter.transformEffect((value: string) => Effect.as(SuccessDecoder, value)),
+  encode: SchemaGetter.passthrough()
+}))
+const error = Schema.String.pipe(Schema.decodeTo(Schema.String, {
+  decode: SchemaGetter.transformEffect((value: string) => Effect.as(ErrorDecoder, value)),
+  encode: SchemaGetter.passthrough()
+}))
+
+const entity = Entity.make("Asymmetric", [Rpc.make("Echo", { payload, success, error })])
+const api = HttpApi.make("api").add(EntityProxy.toHttpApiGroup("entity", entity))
+type ClientCodecs = PayloadEncoder | SuccessDecoder | ErrorDecoder
+
+describe("EntityProxyServer", () => {
+  it("retains client codec services in RPC handler layer requirements", () => {
+    const layer = EntityProxyServer.layerRpcHandlers(entity)
+
+    expect<Layer.Services<typeof layer>>().type.toBe<Sharding.Sharding | PayloadDecoder | ClientCodecs>()
+  })
+
+  it("retains client codec services in HTTP handler layer requirements", () => {
+    const layer = EntityProxyServer.layerHttpApi(api, "entity", entity)
+
+    expect<Layer.Services<typeof layer>>().type.toBe<Sharding.Sharding | PayloadDecoder | ClientCodecs>()
+  })
+})
diff --git a/repos/effect/packages/effect/typetest/unstable/cluster/Reply.tst.ts b/repos/effect/packages/effect/typetest/unstable/cluster/Reply.tst.ts
new file mode 100644
index 000000000..5189436e7
--- /dev/null
+++ b/repos/effect/packages/effect/typetest/unstable/cluster/Reply.tst.ts
@@ -0,0 +1,21 @@
+import { Context, Effect, Schema, SchemaGetter } from "effect"
+import { Reply } from "effect/unstable/cluster"
+import { Rpc, RpcSerialization } from "effect/unstable/rpc"
+import { describe, expect, it } from "tstyche"
+
+class Decoder extends Context.Service<Decoder, number>()("ReplyTest/Decoder") {}
+
+const success = Schema.Number.pipe(Schema.decodeTo(Schema.Number, {
+  decode: SchemaGetter.transformEffect((value) => Effect.map(Decoder, (scale) => value * scale)),
+  encode: SchemaGetter.passthrough()
+}))
+const rpc = Rpc.make("Decode", { payload: {}, success })
+
+describe("Reply", () => {
+  it("preserves reply decoding services in the transport codec", () => {
+    const codec = Reply.Reply(rpc, RpcSerialization.json.codecFor)
+
+    expect<typeof codec.DecodingServices>().type.toBe<Decoder>()
+    expect<typeof codec.EncodingServices>().type.toBe<never>()
+  })
+})
diff --git a/repos/effect/packages/effect/typetest/unstable/http/HttpClient.tst.ts b/repos/effect/packages/effect/typetest/unstable/http/HttpClient.tst.ts
index f35b66270..f853335b7 100644
--- a/repos/effect/packages/effect/typetest/unstable/http/HttpClient.tst.ts
+++ b/repos/effect/packages/effect/typetest/unstable/http/HttpClient.tst.ts
@@ -5,6 +5,9 @@ import { describe, expect, it } from "tstyche"
 
 declare const client: HttpClient.HttpClient
 declare const limiter: RateLimiter.RateLimiter
+declare const failingClient: HttpClient.HttpClient.With<"error">
+declare const recoverNumber: (error: "error") => Effect.Effect<number>
+declare const recoverResponse: (error: "error") => Effect.Effect<HttpClientResponse.HttpClientResponse>
 
 describe("HttpClient", () => {
   describe("urlParams", () => {
@@ -145,4 +148,14 @@ describe("HttpClient", () => {
       >()
     })
   })
+
+  describe("catch", () => {
+    it("should reject non-response data-first recoveries", () => {
+      expect(HttpClient.catch).type.not.toBeCallableWith(failingClient, recoverNumber)
+    })
+
+    it("should accept response data-first recoveries", () => {
+      expect(HttpClient.catch).type.toBeCallableWith(failingClient, recoverResponse)
+    })
+  })
 })
diff --git a/repos/effect/packages/effect/typetest/unstable/http/HttpPlatform.tst.ts b/repos/effect/packages/effect/typetest/unstable/http/HttpPlatform.tst.ts
new file mode 100644
index 000000000..1f71faf0b
--- /dev/null
+++ b/repos/effect/packages/effect/typetest/unstable/http/HttpPlatform.tst.ts
@@ -0,0 +1,10 @@
+import type { HttpPlatform, HttpServerResponse } from "effect/unstable/http"
+import { describe, expect, it } from "tstyche"
+
+describe("HttpPlatform", () => {
+  it("accepts a synchronous fileResponse implementation", () => {
+    expect<ReturnType<Parameters<typeof HttpPlatform.make>[0]["fileResponse"]>>().type.toBe<
+      HttpServerResponse.HttpServerResponse
+    >()
+  })
+})
diff --git a/repos/effect/packages/effect/typetest/unstable/httpapi/HttpApiBuilder.tst.ts b/repos/effect/packages/effect/typetest/unstable/httpapi/HttpApiBuilder.tst.ts
index 424ac7c5b..a3652a743 100644
--- a/repos/effect/packages/effect/typetest/unstable/httpapi/HttpApiBuilder.tst.ts
+++ b/repos/effect/packages/effect/typetest/unstable/httpapi/HttpApiBuilder.tst.ts
@@ -19,6 +19,98 @@ import {
 import { describe, expect, it } from "tstyche"
 
 describe("HttpApiBuilder", () => {
+  describe("handler", () => {
+    it("infers the selected endpoint's decoded request and preserves service requirements", () => {
+      class Repository extends Context.Service<Repository, {}>()("Repository") {}
+      class Lookup extends HttpApiEndpoint.post("lookup", "/users/:id", {
+        params: { id: Schema.FiniteFromString },
+        query: { page: Schema.FiniteFromString },
+        payload: Schema.Struct({ name: Schema.String }),
+        headers: { "x-token": Schema.String },
+        success: Schema.String
+      }) {}
+      const api = HttpApi.make("api").add(
+        HttpApiGroup.make("users").add(Lookup),
+        HttpApiGroup.make("admins").add(
+          HttpApiEndpoint.get("lookup", "/admins", { success: Schema.Number })
+        )
+      )
+      const handler = HttpApiBuilder.handler(api, "users", "lookup", ({ params, query, payload, headers }) => {
+        expect(params).type.toBe<{ readonly id: number }>()
+        expect(query).type.toBe<{ readonly page: number }>()
+        expect(payload).type.toBe<{ readonly name: string }>()
+        expect(headers).type.toBe<{ readonly "x-token": string }>()
+        return Effect.as(Repository, payload.name)
+      })
+
+      expect(handler).type.toBe<HttpApiEndpoint.Handler<typeof Lookup, never, Repository>>()
+      const group = HttpApiBuilder.group(api, "users", (handlers) => handlers.handle("lookup", handler))
+      expect(group).type.toBe<
+        Layer.Layer<HttpApiGroup.Service<"api", "users">, never, HttpRouterRequest<"Requires", Repository>>
+      >()
+
+      const adminHandler = HttpApiBuilder.handler(api, "admins", "lookup", () => Effect.succeed(42))
+      expect<Effect.Success<ReturnType<typeof adminHandler>>>().type.toBe<number | HttpServerResponse>()
+      expect<Effect.Services<ReturnType<typeof adminHandler>>>().type.toBe<never>()
+    })
+
+    it("accepts endpoint and middleware errors while preserving middleware-provided services", () => {
+      class NotFound extends Schema.TaggedError<NotFound>()("NotFound", {}) {}
+      class Unauthorized extends Schema.TaggedError<Unauthorized>()("Unauthorized", {}) {}
+      class Auth extends HttpApiMiddleware.Service<Auth, { provides: CurrentUser }>()("Auth", {
+        error: Unauthorized
+      }) {}
+      const endpoint = HttpApiEndpoint.get("get", "/users", {
+        success: Schema.String,
+        error: NotFound
+      }).middleware(Auth)
+      const api = HttpApi.make("api").add(HttpApiGroup.make("users").add(endpoint))
+      const handler = HttpApiBuilder.handler(
+        api,
+        "users",
+        "get",
+        Effect.fnUntraced(function*() {
+          const { userId } = yield* CurrentUser
+          if (userId === "missing") return yield* Effect.fail(new NotFound())
+          if (userId === "unauthorized") return yield* Effect.fail(new Unauthorized())
+          return userId
+        })
+      )
+
+      expect(handler).type.toBe<HttpApiEndpoint.Handler<typeof endpoint, Unauthorized, CurrentUser>>()
+      const group = HttpApiBuilder.group(api, "users", (handlers) => handlers.handle("get", handler))
+      expect(group).type.toBe<Layer.Layer<HttpApiGroup.Service<"api", "users">, never, Auth>>()
+    })
+
+    it("rejects unknown groups and endpoints outside the selected group", () => {
+      const api = HttpApi.make("api").add(
+        HttpApiGroup.make("users").add(HttpApiEndpoint.get("getUser", "/users")),
+        HttpApiGroup.make("admins").add(HttpApiEndpoint.get("getAdmin", "/admins"))
+      )
+
+      expect(HttpApiBuilder.handler).type.not.toBeCallableWith(api, "missing", "getUser", () => Effect.void)
+      expect(HttpApiBuilder.handler).type.not.toBeCallableWith(api, "users", "missing", () => Effect.void)
+      expect(HttpApiBuilder.handler).type.not.toBeCallableWith(api, "users", "getAdmin", () => Effect.void)
+    })
+
+    it("rejects invalid successes and errors from other endpoints", () => {
+      class OtherError extends Schema.TaggedError<OtherError>()("OtherError", {}) {}
+      class OtherMiddleware extends HttpApiMiddleware.Service<OtherMiddleware>()("OtherMiddleware", {
+        error: OtherError
+      }) {}
+      const api = HttpApi.make("api").add(
+        HttpApiGroup.make("users").add(
+          HttpApiEndpoint.get("get", "/users", { success: Schema.String }),
+          HttpApiEndpoint.get("other", "/other", { success: Schema.Number }).middleware(OtherMiddleware)
+        )
+      )
+
+      expect(HttpApiBuilder.handler).type.not.toBeCallableWith(api, "users", "get", () => Effect.succeed(42))
+      expect(HttpApiBuilder.handler).type.not.toBeCallableWith(api, "users", "get", () => Effect.fail(new OtherError()))
+      expect(HttpApiBuilder.handler).type.not.toBeCallableWith(api, "users", "get", () => Effect.fail("undeclared"))
+    })
+  })
+
   describe("group", () => {
     it("does not require unknown services for status annotations piped onto errors", () => {
       class NotFound extends Schema.TaggedError<NotFound>()("NotFound", {}) {}
diff --git a/repos/effect/packages/effect/typetest/unstable/httpapi/HttpApiClient.tst.ts b/repos/effect/packages/effect/typetest/unstable/httpapi/HttpApiClient.tst.ts
index 63a3d2b50..4163f11a4 100644
--- a/repos/effect/packages/effect/typetest/unstable/httpapi/HttpApiClient.tst.ts
+++ b/repos/effect/packages/effect/typetest/unstable/httpapi/HttpApiClient.tst.ts
@@ -33,7 +33,11 @@ describe("HttpApiClient", () => {
       )
       const f = client.group.a
       expect<Parameters<typeof f>[0]>().type.toBe<
-        { readonly params: { readonly id: number }; readonly responseMode?: ResponseMode }
+        {
+          readonly params: { readonly id: number }
+          readonly sseOptions?: Sse.DecodeOptions | undefined
+          readonly responseMode?: ResponseMode
+        }
       >()
     })
   })
@@ -56,7 +60,11 @@ describe("HttpApiClient", () => {
       )
       const f = client.group.a
       expect<Parameters<typeof f>[0]>().type.toBe<
-        { readonly query: { readonly id: number }; readonly responseMode?: ResponseMode }
+        {
+          readonly query: { readonly id: number }
+          readonly sseOptions?: Sse.DecodeOptions | undefined
+          readonly responseMode?: ResponseMode
+        }
       >()
     })
   })
@@ -177,7 +185,7 @@ describe("HttpApiClient", () => {
         Effect.Effect<HttpClientResponse.HttpClientResponse, HttpClientError.HttpClientError>
       >()
       expect<Parameters<typeof client.topHealth>[0]>().type.toBe<
-        void | { readonly responseMode?: ResponseMode } | undefined
+        void | { readonly sseOptions?: Sse.DecodeOptions | undefined; readonly responseMode?: ResponseMode } | undefined
       >()
       expect(client).type.not.toHaveProperty("top")
     })
@@ -201,10 +209,18 @@ describe("HttpApiClient", () => {
 
       expect<keyof GeneratedClient>().type.toBe<"users" | "lookup">()
       expect<Parameters<typeof client.users.lookup>[0]>().type.toBe<
-        { readonly payload: { readonly name: string }; readonly responseMode?: ResponseMode }
+        {
+          readonly payload: { readonly name: string }
+          readonly sseOptions?: Sse.DecodeOptions | undefined
+          readonly responseMode?: ResponseMode
+        }
       >()
       expect<Parameters<typeof client.lookup>[0]>().type.toBe<
-        { readonly query: { readonly token: string }; readonly responseMode?: ResponseMode }
+        {
+          readonly query: { readonly token: string }
+          readonly sseOptions?: Sse.DecodeOptions | undefined
+          readonly responseMode?: ResponseMode
+        }
       >()
       expect(client.users.lookup({ payload: { name: "Ada" } })).type.toBe<
         Effect.Effect<{ readonly userId: string }, HttpClientError.HttpClientError | Schema.SchemaError>
@@ -230,7 +246,11 @@ describe("HttpApiClient", () => {
 
       expect<keyof GeneratedClient>().type.toBe<"getUser">()
       expect<Parameters<typeof client.getUser>[0]>().type.toBe<
-        { readonly params: { readonly id: number }; readonly responseMode?: ResponseMode }
+        {
+          readonly params: { readonly id: number }
+          readonly sseOptions?: Sse.DecodeOptions | undefined
+          readonly responseMode?: ResponseMode
+        }
       >()
       expect(client.getUser({ params: { id: 1 } })).type.toBe<
         Effect.Effect<{ readonly id: string }, HttpClientError.HttpClientError | Schema.SchemaError>
@@ -258,10 +278,14 @@ describe("HttpApiClient", () => {
 
       expect<keyof GeneratedClient>().type.toBe<"getUser" | "health">()
       expect<Parameters<typeof client.getUser>[0]>().type.toBe<
-        { readonly params: { readonly id: number }; readonly responseMode?: ResponseMode }
+        {
+          readonly params: { readonly id: number }
+          readonly sseOptions?: Sse.DecodeOptions | undefined
+          readonly responseMode?: ResponseMode
+        }
       >()
       expect<Parameters<typeof client.health>[0]>().type.toBe<
-        void | { readonly responseMode?: ResponseMode } | undefined
+        void | { readonly sseOptions?: Sse.DecodeOptions | undefined; readonly responseMode?: ResponseMode } | undefined
       >()
       expect(client.getUser({ params: { id: 1 } })).type.toBe<
         Effect.Effect<{ readonly id: string }, HttpClientError.HttpClientError | Schema.SchemaError>
@@ -291,7 +315,11 @@ describe("HttpApiClient", () => {
 
       expect<keyof UsersClient>().type.toBe<"getUser">()
       expect<Parameters<typeof client.getUser>[0]>().type.toBe<
-        { readonly params: { readonly id: number }; readonly responseMode?: ResponseMode }
+        {
+          readonly params: { readonly id: number }
+          readonly sseOptions?: Sse.DecodeOptions | undefined
+          readonly responseMode?: ResponseMode
+        }
       >()
       expect(client.getUser({ params: { id: 1 } })).type.toBe<
         Effect.Effect<{ readonly id: string }, HttpClientError.HttpClientError | Schema.SchemaError>
@@ -312,7 +340,11 @@ describe("HttpApiClient", () => {
 
       expect<keyof UsersClient>().type.toBe<"getUser">()
       expect<Parameters<typeof client.getUser>[0]>().type.toBe<
-        { readonly params: { readonly id: number }; readonly responseMode?: ResponseMode }
+        {
+          readonly params: { readonly id: number }
+          readonly sseOptions?: Sse.DecodeOptions | undefined
+          readonly responseMode?: ResponseMode
+        }
       >()
       expect(client.getUser({ params: { id: 1 } })).type.toBe<
         Effect.Effect<{ readonly id: string }, HttpClientError.HttpClientError | Schema.SchemaError>
@@ -347,10 +379,18 @@ describe("HttpApiClient", () => {
       expect<keyof Effect.Success<typeof usersClient>>().type.toBe<"lookup">()
       expect<keyof Effect.Success<typeof adminsClient>>().type.toBe<"lookup">()
       expect<Parameters<typeof selectedUsers.lookup>[0]>().type.toBe<
-        { readonly params: { readonly userId: string }; readonly responseMode?: ResponseMode }
+        {
+          readonly params: { readonly userId: string }
+          readonly sseOptions?: Sse.DecodeOptions | undefined
+          readonly responseMode?: ResponseMode
+        }
       >()
       expect<Parameters<typeof selectedAdmins.lookup>[0]>().type.toBe<
-        { readonly query: { readonly email: string }; readonly responseMode?: ResponseMode }
+        {
+          readonly query: { readonly email: string }
+          readonly sseOptions?: Sse.DecodeOptions | undefined
+          readonly responseMode?: ResponseMode
+        }
       >()
       expect(selectedUsers.lookup).type.not.toBeCallableWith({ query: { email: "admin@example.com" } })
       expect(selectedAdmins.lookup).type.not.toBeCallableWith({ params: { userId: "1" } })
@@ -375,7 +415,11 @@ describe("HttpApiClient", () => {
       )
       const f = client.group.a
       expect<Parameters<typeof f>[0]>().type.toBe<
-        { readonly headers: { readonly id: number }; readonly responseMode?: ResponseMode }
+        {
+          readonly headers: { readonly id: number }
+          readonly sseOptions?: Sse.DecodeOptions | undefined
+          readonly responseMode?: ResponseMode
+        }
       >()
     })
   })
@@ -393,7 +437,9 @@ describe("HttpApiClient", () => {
         HttpApiClient.make(Api).pipe(Effect.provide(FetchHttpClient.layer))
       )
       const f = client.group.a
-      expect<Parameters<typeof f>[0]>().type.toBe<void | { readonly responseMode?: ResponseMode } | undefined>()
+      expect<Parameters<typeof f>[0]>().type.toBe<
+        void | { readonly sseOptions?: Sse.DecodeOptions | undefined; readonly responseMode?: ResponseMode } | undefined
+      >()
     })
 
     it("derives the request payload from a field record", () => {
@@ -413,7 +459,11 @@ describe("HttpApiClient", () => {
       )
       const f = client.group.a
       expect<Parameters<typeof f>[0]>().type.toBe<
-        { readonly payload: { readonly id: number }; readonly responseMode?: ResponseMode }
+        {
+          readonly payload: { readonly id: number }
+          readonly sseOptions?: Sse.DecodeOptions | undefined
+          readonly responseMode?: ResponseMode
+        }
       >()
     })
 
@@ -432,7 +482,11 @@ describe("HttpApiClient", () => {
       )
       const f = client.group.a
       expect<Parameters<typeof f>[0]>().type.toBe<
-        { readonly payload: FormData; readonly responseMode?: ResponseMode }
+        {
+          readonly payload: FormData
+          readonly sseOptions?: Sse.DecodeOptions | undefined
+          readonly responseMode?: ResponseMode
+        }
       >()
     })
 
@@ -451,7 +505,11 @@ describe("HttpApiClient", () => {
       )
       const f = client.group.a
       expect<Parameters<typeof f>[0]>().type.toBe<
-        { readonly payload: FormData; readonly responseMode?: ResponseMode }
+        {
+          readonly payload: FormData
+          readonly sseOptions?: Sse.DecodeOptions | undefined
+          readonly responseMode?: ResponseMode
+        }
       >()
     })
   })
@@ -559,7 +617,11 @@ describe("HttpApiClient", () => {
 
       type Request = Parameters<typeof f>[0]
       expect<Request>().type.toBe<
-        { readonly params: { readonly id: number }; readonly responseMode?: ResponseMode }
+        {
+          readonly params: { readonly id: number }
+          readonly sseOptions?: Sse.DecodeOptions | undefined
+          readonly responseMode?: ResponseMode
+        }
       >()
       expect(f).type.toBeCallableWith({ params: { id: 1 } })
       expect(f).type.toBeCallableWith({ params: { id: 1 }, responseMode: "decoded-only" })
@@ -616,6 +678,7 @@ describe("HttpApiClient", () => {
         HttpApiClient.make(Api).pipe(Effect.provide(FetchHttpClient.layer))
       )
       const f = client.group.a
+      const sseOptions = hole<Sse.DecodeOptions>()
 
       type Event = { readonly event: "user.created"; readonly data: string }
       type StreamError = { readonly reason: string }
@@ -624,9 +687,16 @@ describe("HttpApiClient", () => {
         StreamError | HttpClientError.HttpClientError | Schema.SchemaError | Sse.Retry | Sse.SseError
       >
 
+      expect<Parameters<typeof f>[0]>().type.toBe<
+        void | { readonly sseOptions?: Sse.DecodeOptions | undefined; readonly responseMode?: ResponseMode } | undefined
+      >()
+      expect(f).type.not.toBeCallableWith({}, { sseOptions: {} })
       expect(f()).type.toBe<
         Effect.Effect<ClientStream, HttpClientError.HttpClientError | Schema.SchemaError>
       >()
+      expect(f({ sseOptions })).type.toBe<
+        Effect.Effect<ClientStream, HttpClientError.HttpClientError | Schema.SchemaError>
+      >()
       expect(f({ responseMode: "decoded-only" })).type.toBe<
         Effect.Effect<ClientStream, HttpClientError.HttpClientError | Schema.SchemaError>
       >()
@@ -636,9 +706,16 @@ describe("HttpApiClient", () => {
           HttpClientError.HttpClientError | Schema.SchemaError
         >
       >()
+      expect(f({ responseMode: "decoded-and-response", sseOptions })).type.toBe<
+        Effect.Effect<
+          [ClientStream, HttpClientResponse.HttpClientResponse],
+          HttpClientError.HttpClientError | Schema.SchemaError
+        >
+      >()
       expect(f({ responseMode: "response-only" })).type.toBe<
         Effect.Effect<HttpClientResponse.HttpClientResponse, HttpClientError.HttpClientError>
       >()
+      expect(f).type.not.toBeCallableWith({ sseOptions: { maxEventSize: "4" } })
     })
 
     it("widens only the body stream errors for WithHeaders StreamSse successes", () => {
@@ -971,15 +1048,24 @@ describe("HttpApiClient", () => {
         {
           readonly params: { readonly id: string }
           readonly query: { readonly page: number }
+          readonly sseOptions?: Sse.DecodeOptions | undefined
           readonly responseMode?: ResponseMode
         }
       >()
+      const sseOptions = hole<Sse.DecodeOptions>()
+
       expect(getUser({ params: { id: "1" }, query: { page: 1 } })).type.toBe<
         Effect.Effect<
           { readonly id: string; readonly age: number },
           HttpClientError.HttpClientError | Schema.SchemaError
         >
       >()
+      expect(getUser({ params: { id: "1" }, query: { page: 1 }, sseOptions })).type.toBe<
+        Effect.Effect<
+          { readonly id: string; readonly age: number },
+          HttpClientError.HttpClientError | Schema.SchemaError
+        >
+      >()
       expect(getUser({ params: { id: "1" }, query: { page: 1 }, responseMode: "decoded-and-response" })).type.toBe<
         Effect.Effect<
           [{ readonly id: string; readonly age: number }, HttpClientResponse.HttpClientResponse],
@@ -996,7 +1082,11 @@ describe("HttpApiClient", () => {
       )
 
       expect<Parameters<typeof searchUsers>[0]>().type.toBe<
-        { readonly query: { readonly q: string }; readonly responseMode?: ResponseMode }
+        {
+          readonly query: { readonly q: string }
+          readonly sseOptions?: Sse.DecodeOptions | undefined
+          readonly responseMode?: ResponseMode
+        }
       >()
       expect(searchUsers).type.not.toBeCallableWith({ params: { id: "1" }, query: { page: 1 } })
     })
@@ -1019,7 +1109,11 @@ describe("HttpApiClient", () => {
       const getUser = hole<Effect.Success<typeof endpointClient>>()
 
       expect<Parameters<typeof getUser>[0]>().type.toBe<
-        { readonly params: { readonly id: number }; readonly responseMode?: ResponseMode }
+        {
+          readonly params: { readonly id: number }
+          readonly sseOptions?: Sse.DecodeOptions | undefined
+          readonly responseMode?: ResponseMode
+        }
       >()
       expect(getUser({ params: { id: 1 } })).type.toBe<
         Effect.Effect<{ readonly id: string }, HttpClientError.HttpClientError | Schema.SchemaError>
@@ -1100,6 +1194,7 @@ describe("HttpApiClient", () => {
           readonly query: { readonly page: number }
           readonly payload: { readonly name: string }
           readonly headers: { readonly "x-user": string }
+          readonly sseOptions?: Sse.DecodeOptions | undefined
           readonly responseMode?: ResponseMode
         }
       >()
@@ -1109,6 +1204,7 @@ describe("HttpApiClient", () => {
           readonly query: { readonly scope: string }
           readonly payload: { readonly role: "admin" }
           readonly headers: { readonly "x-admin": string }
+          readonly sseOptions?: Sse.DecodeOptions | undefined
           readonly responseMode?: ResponseMode
         }
       >()
diff --git a/repos/effect/packages/effect/typetest/unstable/httpapi/HttpApiEndpoint.tst.ts b/repos/effect/packages/effect/typetest/unstable/httpapi/HttpApiEndpoint.tst.ts
index 3dff19a20..e1c5098ca 100644
--- a/repos/effect/packages/effect/typetest/unstable/httpapi/HttpApiEndpoint.tst.ts
+++ b/repos/effect/packages/effect/typetest/unstable/httpapi/HttpApiEndpoint.tst.ts
@@ -185,6 +185,18 @@ describe("HttpApiEndpoint", () => {
       })
     })
 
+    describe("QUERY", () => {
+      it("accepts a body schema", () => {
+        const endpoint = HttpApiEndpoint.query("a", "/a", {
+          payload: Schema.Struct({ a: Schema.String })
+        })
+        expect(endpoint.method).type.toBe<"QUERY">()
+        expect(endpoint["~Payload"]).type.toBe<
+          Schema.toCodecJson<Schema.Struct<{ readonly a: Schema.String }>>
+        >()
+      })
+    })
+
     describe("HEAD", () => {
       it("accepts a field record", () => {
         const endpoint = HttpApiEndpoint.head("a", "/a", {
diff --git a/repos/effect/packages/effect/typetest/unstable/httpapi/HttpApiSchema.tst.ts b/repos/effect/packages/effect/typetest/unstable/httpapi/HttpApiSchema.tst.ts
index c60f81eb3..86aa02bc3 100644
--- a/repos/effect/packages/effect/typetest/unstable/httpapi/HttpApiSchema.tst.ts
+++ b/repos/effect/packages/effect/typetest/unstable/httpapi/HttpApiSchema.tst.ts
@@ -73,7 +73,7 @@ describe("HttpApiSchema", () => {
         HttpApiSchema.StreamSse<HttpApiSchema.SseEventFromData<typeof Data>, typeof Error, { readonly id: string }>
       >()
       expect(stream.events["Type"]).type.toBe<{
-        readonly id: string | undefined
+        readonly id?: string | undefined
         readonly event: string
         readonly data: { readonly id: string }
       }>()
diff --git a/repos/effect/packages/effect/typetest/unstable/net/IpInterface.tst.ts b/repos/effect/packages/effect/typetest/unstable/net/IpInterface.tst.ts
new file mode 100644
index 000000000..57699c392
--- /dev/null
+++ b/repos/effect/packages/effect/typetest/unstable/net/IpInterface.tst.ts
@@ -0,0 +1,55 @@
+import type { Result, Schema } from "effect"
+import * as IpInterface from "effect/unstable/net/IpInterface"
+import * as IpNetwork from "effect/unstable/net/IpNetwork"
+import * as NetAddress from "effect/unstable/net/NetAddress"
+import { describe, expect, it } from "tstyche"
+
+describe("IpInterface", () => {
+  it("preserves address families", () => {
+    expect(IpInterface.make(NetAddress.ipv4Unspecified, 0)).type.toBe<
+      Result.Result<IpInterface.IpInterface<NetAddress.Ipv4Address>, NetAddress.NetAddressError>
+    >()
+    expect(IpInterface.make(NetAddress.ipv6Unspecified, 0)).type.toBe<
+      Result.Result<IpInterface.IpInterface<NetAddress.Ipv6Address>, NetAddress.NetAddressError>
+    >()
+    expect(IpInterface.ipv4FromString("127.0.0.1/8")).type.toBe<
+      Result.Result<IpInterface.Ipv4Interface, NetAddress.NetAddressError>
+    >()
+    const ipv4 = IpInterface.makeUnsafe(NetAddress.ipv4Unspecified, 0)
+    expect(IpNetwork.fromInterface(ipv4)).type.toBe<IpNetwork.Ipv4Network>()
+  })
+
+  it("preserves refinements obtained on demand when the address is unchanged", () => {
+    const unspecified = NetAddress.ipv4Unspecified
+    if (NetAddress.isUnspecified(unspecified)) {
+      const precise = IpInterface.make(unspecified, 0)
+      expect(precise).type.toBe<
+        Result.Result<
+          IpInterface.IpInterface<NetAddress.UnspecifiedAddress<NetAddress.Ipv4Address>>,
+          NetAddress.NetAddressError
+        >
+      >()
+      expect(precise).type.toBeAssignableTo<
+        Result.Result<IpInterface.Ipv4Interface, NetAddress.NetAddressError>
+      >()
+      expect<Result.Result<IpInterface.Ipv4Interface, NetAddress.NetAddressError>>().type.not.toBeAssignableTo<
+        typeof precise
+      >()
+    }
+  })
+
+  it("narrows generic interface addresses", () => {
+    const value = null as unknown as IpInterface.IpInterface
+    if (IpInterface.isIpv4Interface(value)) {
+      expect(value.address).type.toBe<NetAddress.Ipv4Address>()
+    } else if (IpInterface.isIpv6Interface(value)) {
+      expect(value.address).type.toBe<NetAddress.Ipv6Address>()
+    }
+  })
+
+  it("preserves exact Schema types", () => {
+    expect<Schema.Schema.Type<typeof Schema.Ipv4InterfaceFromString>>().type.toBe<IpInterface.Ipv4Interface>()
+    expect<Schema.Schema.Type<typeof Schema.Ipv6InterfaceFromString>>().type.toBe<IpInterface.Ipv6Interface>()
+    expect<Schema.Schema.Type<typeof Schema.IpInterfaceFromString>>().type.toBe<IpInterface.IpInterface>()
+  })
+})
diff --git a/repos/effect/packages/effect/typetest/unstable/net/IpNetwork.tst.ts b/repos/effect/packages/effect/typetest/unstable/net/IpNetwork.tst.ts
new file mode 100644
index 000000000..6c069cdc2
--- /dev/null
+++ b/repos/effect/packages/effect/typetest/unstable/net/IpNetwork.tst.ts
@@ -0,0 +1,106 @@
+import type { Result, Schema } from "effect"
+import * as IpInterface from "effect/unstable/net/IpInterface"
+import * as IpNetwork from "effect/unstable/net/IpNetwork"
+import * as NetAddress from "effect/unstable/net/NetAddress"
+import { describe, expect, it } from "tstyche"
+
+describe("IpNetwork", () => {
+  it("preserves address families in checked constructors", () => {
+    expect(IpNetwork.make(NetAddress.ipv4Unspecified, 0)).type.toBe<
+      Result.Result<IpNetwork.Ipv4Network, NetAddress.NetAddressError>
+    >()
+    expect(IpNetwork.make(NetAddress.ipv6Unspecified, 0)).type.toBe<
+      Result.Result<IpNetwork.Ipv6Network, NetAddress.NetAddressError>
+    >()
+    expect(IpNetwork.fromAddress(NetAddress.ipv4Unspecified, 0)).type.toBe<
+      Result.Result<IpNetwork.Ipv4Network, NetAddress.NetAddressError>
+    >()
+    expect(IpNetwork.fromInterface(IpInterface.makeUnsafe(NetAddress.ipv4Unspecified, 0))).type.toBe<
+      IpNetwork.Ipv4Network
+    >()
+    expect(IpNetwork.fromInterface(IpInterface.makeUnsafe(NetAddress.ipv6Unspecified, 0))).type.toBe<
+      IpNetwork.Ipv6Network
+    >()
+    const ipv4Network = IpNetwork.makeUnsafe(NetAddress.ipv4Unspecified, 0)
+    expect(IpNetwork.firstAddress(ipv4Network)).type.toBe<NetAddress.Ipv4Address>()
+    expect(IpNetwork.lastAddress(ipv4Network)).type.toBe<NetAddress.Ipv4Address>()
+    const address = null as unknown as NetAddress.IpAddress
+    expect(IpNetwork.make(address, 0)).type.toBe<Result.Result<IpNetwork.IpNetwork, NetAddress.NetAddressError>>()
+    expect(IpNetwork.fromAddress(address, 0)).type.toBe<
+      Result.Result<IpNetwork.IpNetwork, NetAddress.NetAddressError>
+    >()
+  })
+
+  it("preserves families in parsers and unsafe constructors", () => {
+    expect(IpNetwork.ipv4FromString("0.0.0.0/0")).type.toBe<
+      Result.Result<IpNetwork.Ipv4Network, NetAddress.NetAddressError>
+    >()
+    expect(IpNetwork.ipv6FromString("::/0")).type.toBe<
+      Result.Result<IpNetwork.Ipv6Network, NetAddress.NetAddressError>
+    >()
+    expect(IpNetwork.fromString("::/0")).type.toBe<Result.Result<IpNetwork.IpNetwork, NetAddress.NetAddressError>>()
+    expect(IpNetwork.makeUnsafe(NetAddress.ipv4Unspecified, 0)).type.toBe<IpNetwork.Ipv4Network>()
+    expect(IpNetwork.fromAddressUnsafe(NetAddress.ipv6Unspecified, 0)).type.toBe<IpNetwork.Ipv6Network>()
+    expect(IpNetwork.fromStringUnsafe("::/0")).type.toBe<IpNetwork.IpNetwork>()
+  })
+
+  it("preserves on-demand refinements only when address bits are unchanged", () => {
+    const unspecified = NetAddress.ipv4Unspecified
+    if (NetAddress.isUnspecified(unspecified)) {
+      const network = IpNetwork.makeUnsafe(unspecified, 0)
+      expect(network).type.toBe<
+        IpNetwork.IpNetwork<NetAddress.UnspecifiedAddress<NetAddress.Ipv4Address>>
+      >()
+      expect(IpNetwork.firstAddress(network)).type.toBe<
+        NetAddress.UnspecifiedAddress<NetAddress.Ipv4Address>
+      >()
+      expect(IpNetwork.lastAddress(network)).type.toBe<NetAddress.Ipv4Address>()
+      expect(IpNetwork.lastAddress(network)).type.not.toBeAssignableTo<NetAddress.UnspecifiedAddress>()
+    }
+  })
+
+  it("drops refinements from derived addresses", () => {
+    const multicast = NetAddress.ipv4FromBytesUnsafe(new Uint8Array([224, 0, 0, 1]))
+    if (NetAddress.isMulticast(multicast)) {
+      expect(IpNetwork.fromAddress(multicast, 0)).type.toBe<
+        Result.Result<IpNetwork.Ipv4Network, NetAddress.NetAddressError>
+      >()
+      expect(IpNetwork.fromInterface(IpInterface.makeUnsafe(multicast, 0))).type.toBe<IpNetwork.Ipv4Network>()
+    }
+
+    const input = null as unknown as NetAddress.IpAddress
+    if (NetAddress.isMulticast(input)) {
+      expect(IpNetwork.fromAddress(input, 0)).type.toBe<
+        Result.Result<IpNetwork.IpNetwork, NetAddress.NetAddressError>
+      >()
+      expect(IpNetwork.fromInterface(IpInterface.makeUnsafe(input, 0))).type.toBe<IpNetwork.IpNetwork>()
+    }
+  })
+
+  it("narrows generic networks", () => {
+    const value = null as unknown as IpNetwork.IpNetwork
+    if (IpNetwork.isIpv4Network(value)) {
+      expect(value.address).type.toBe<NetAddress.Ipv4Address>()
+    } else if (IpNetwork.isIpv6Network(value)) {
+      expect(value.address).type.toBe<NetAddress.Ipv6Address>()
+    }
+  })
+
+  it("supports both predicate call forms", () => {
+    const value = null as unknown as IpNetwork.IpNetwork
+    const address = null as unknown as NetAddress.IpAddress
+    expect(IpNetwork.contains(value, address)).type.toBe<boolean>()
+    expect(IpNetwork.contains(address)(value)).type.toBe<boolean>()
+    expect(IpNetwork.containsNetwork(value, value)).type.toBe<boolean>()
+    expect(IpNetwork.containsNetwork(value)(value)).type.toBe<boolean>()
+    expect(IpNetwork.overlaps(value, value)).type.toBe<boolean>()
+    expect(IpNetwork.overlaps(value)(value)).type.toBe<boolean>()
+  })
+
+  it("preserves exact Schema types", () => {
+    expect<Schema.Schema.Type<typeof Schema.Ipv4NetworkFromString>>().type.toBe<IpNetwork.Ipv4Network>()
+    expect<Schema.Schema.Type<typeof Schema.Ipv6NetworkFromString>>().type.toBe<IpNetwork.Ipv6Network>()
+    expect<Schema.Schema.Type<typeof Schema.IpNetworkFromString>>().type.toBe<IpNetwork.IpNetwork>()
+    expect<Schema.Codec.Encoded<typeof Schema.IpNetworkFromString>>().type.toBe<string>()
+  })
+})
diff --git a/repos/effect/packages/effect/typetest/unstable/net/NetAddress.tst.ts b/repos/effect/packages/effect/typetest/unstable/net/NetAddress.tst.ts
new file mode 100644
index 000000000..d677e750e
--- /dev/null
+++ b/repos/effect/packages/effect/typetest/unstable/net/NetAddress.tst.ts
@@ -0,0 +1,258 @@
+import { Effect, type Result, Schema } from "effect"
+import type * as Brand from "effect/Brand"
+import * as HttpServer from "effect/unstable/http/HttpServer"
+import * as NetAddress from "effect/unstable/net/NetAddress"
+import { describe, expect, it } from "tstyche"
+
+describe("NetAddress", () => {
+  it("exposes checked and throwing constructors", () => {
+    expect(NetAddress.macAddressFromString("00:00:5e:00:53:01")).type.toBe<
+      Result.Result<NetAddress.MacAddress, NetAddress.NetAddressError>
+    >()
+    expect(NetAddress.macAddressFromStringUnsafe("00:00:5e:00:53:01")).type.toBe<NetAddress.MacAddress>()
+    expect(NetAddress.ipFromString("::1")).type.toBe<Result.Result<NetAddress.IpAddress, NetAddress.NetAddressError>>()
+    expect(NetAddress.ipFromStringUnsafe("::1")).type.toBe<NetAddress.IpAddress>()
+    expect(NetAddress.inetAddressUnsafe(NetAddress.ipv6Loopback, 80)).type.toBe<NetAddress.InetAddress>()
+    expect(NetAddress.inetAddressFromStringUnsafe("[::1]:80")).type.toBe<NetAddress.InetAddress>()
+    expect(NetAddress.socketAddressFromInput({ address: "::1", port: 80 })).type.toBe<
+      Result.Result<NetAddress.SocketAddress, NetAddress.NetAddressError>
+    >()
+    expect(NetAddress.socketAddressFromInput("127.0.0.1:3000")).type.toBe<
+      Result.Result<NetAddress.SocketAddress, NetAddress.NetAddressError>
+    >()
+    expect(NetAddress.socketAddressFromInputUnsafe({ path: "server.sock" })).type.toBe<NetAddress.SocketAddress>()
+    expect(NetAddress.ipv4FromBytesUnsafe(new Uint8Array(4))).type.toBe<NetAddress.Ipv4Address>()
+    expect(NetAddress.ipv6FromBytesUnsafe(new Uint8Array(16))).type.toBe<NetAddress.Ipv6Address>()
+    expect(NetAddress.ipv4FromOctets([127, 0, 0, 1])).type.toBe<
+      Result.Result<NetAddress.Ipv4Address, NetAddress.NetAddressError>
+    >()
+    expect(NetAddress.ipv6FromSegments([0, 0, 0, 0, 0, 0, 0, 1])).type.toBe<
+      Result.Result<NetAddress.Ipv6Address, NetAddress.NetAddressError>
+    >()
+    expect(NetAddress.macAddressFromOctets([0, 0, 0, 0, 0, 0])).type.toBe<
+      Result.Result<NetAddress.MacAddress, NetAddress.NetAddressError>
+    >()
+    // @ts-expect-error Source has 3 element(s) but target requires 4.
+    NetAddress.ipv4FromOctets([127, 0, 1])
+    expect(NetAddress.ipv6ToOctets(NetAddress.ipv6Loopback)).type.toBe<ReadonlyArray<number>>()
+    // @ts-expect-error Property 'bytes' does not exist
+    void NetAddress.ipv4Loopback.bytes
+  })
+
+  it("requires canonical socket addresses at consumer constructors", () => {
+    const server = HttpServer.make({
+      address: NetAddress.inetAddressUnsafe(NetAddress.ipv4Loopback, 8080),
+      serve: () => Effect.void
+    })
+    expect(server.address).type.toBe<NetAddress.SocketAddress>()
+
+    HttpServer.make({
+      // @ts-expect-error Type 'string' is not assignable to type 'Ipv6Address'
+      address: { address: "localhost", port: 8080 },
+      serve: () => Effect.void
+    })
+  })
+
+  it("converts internet addresses to URLs and exposes rejected inputs", () => {
+    const address = NetAddress.inetAddressUnsafe(NetAddress.ipv6Unspecified, 80)
+    expect(NetAddress.toUrl(address)).type.toBe<Result.Result<URL, NetAddress.NetAddressError>>()
+    expect(NetAddress.toUrl(address, undefined)).type.toBe<Result.Result<URL, NetAddress.NetAddressError>>()
+    expect(NetAddress.toUrl(address, "https")).type.toBe<Result.Result<URL, NetAddress.NetAddressError>>()
+    const unix = NetAddress.unixPathAddress("server.sock")
+    expect(NetAddress.toUrl(NetAddress.ipv4Loopback)).type.toBe<Result.Result<URL, NetAddress.NetAddressError>>()
+    expect(NetAddress.toUrl(NetAddress.ipv6Loopback, "https")).type.toBe<
+      Result.Result<URL, NetAddress.NetAddressError>
+    >()
+    expect(NetAddress.toUrl).type.not.toBeCallableWith(unix)
+    expect(NetAddress.toUrl).type.not.toBeCallableWith(unix, "http")
+    expect(NetAddress.formatUrl(address)).type.toBe<Result.Result<string, NetAddress.NetAddressError>>()
+    expect(NetAddress.formatUrl(NetAddress.ipv4Loopback, "https")).type.toBe<
+      Result.Result<string, NetAddress.NetAddressError>
+    >()
+    expect(NetAddress.formatUrl(unix)).type.toBe<Result.Result<string, NetAddress.NetAddressError>>()
+    expect(NetAddress.formatUrlUnsafe(address)).type.toBe<string>()
+    expect(NetAddress.formatUrlUnsafe(NetAddress.ipv4Loopback, "https")).type.toBe<string>()
+    expect(NetAddress.formatUrlUnsafe(unix)).type.toBe<string>()
+    expect(NetAddress.formatUnixPath(unix)).type.toBe<string>()
+    expect(new NetAddress.NetAddressError({ input: address, message: "invalid" }).input).type.toBe<unknown>()
+  })
+
+  it("narrows address unions", () => {
+    const address = null as unknown as NetAddress.SocketAddress
+    if (NetAddress.isUnixPathAddress(address)) {
+      expect(address).type.toBe<NetAddress.UnixPathAddress>()
+    } else if (NetAddress.isInetAddressV4(address)) {
+      expect(address.address).type.toBe<NetAddress.Ipv4Address>()
+    } else {
+      expect(address.address).type.toBe<NetAddress.Ipv6Address>()
+    }
+  })
+
+  it("preserves multicast families and the IP-only default", () => {
+    const ip = null as unknown as NetAddress.IpAddress
+    const mac = null as unknown as NetAddress.MacAddress
+    const inet = null as unknown as NetAddress.InetAddress
+    const group = null as unknown as NetAddress.MulticastAddress
+    const macGroup = null as unknown as NetAddress.MulticastAddress<NetAddress.MacAddress>
+    const wideGroup = null as unknown as NetAddress.MulticastAddress<NetAddress.IpAddress | NetAddress.MacAddress>
+    const addMembership = null as unknown as <A extends NetAddress.IpAddress>(
+      group: NetAddress.MulticastAddress<A>
+    ) => void
+
+    if (NetAddress.isMulticast(ip)) {
+      expect(ip).type.toBe<NetAddress.MulticastAddress<NetAddress.IpAddress>>()
+      if (NetAddress.isIpv4Address(ip)) {
+        expect(ip).type.toBe<NetAddress.MulticastAddress<NetAddress.Ipv4Address>>()
+      }
+    } else {
+      expect(ip).type.toBe<NetAddress.IpAddress>()
+    }
+    if (NetAddress.isMulticast(mac)) {
+      expect(mac).type.toBe<NetAddress.MulticastAddress<NetAddress.MacAddress>>()
+    }
+    expect(NetAddress.isMulticast).type.not.toBeCallableWith(inet)
+    addMembership(group)
+    expect(addMembership).type.not.toBeCallableWith(macGroup)
+    expect(addMembership).type.not.toBeCallableWith(wideGroup)
+  })
+
+  it("narrows classifications while preserving address families", () => {
+    const ip = null as unknown as NetAddress.IpAddress
+    const ipv4 = null as unknown as NetAddress.Ipv4Address
+    const ipv6 = null as unknown as NetAddress.Ipv6Address
+    const mac = null as unknown as NetAddress.MacAddress
+
+    if (NetAddress.isUnicast(ip)) expect(ip).type.toBe<NetAddress.UnicastAddress<NetAddress.IpAddress>>()
+    if (NetAddress.isBroadcast(ipv4)) {
+      expect(ipv4).type.toBe<NetAddress.BroadcastAddress<NetAddress.Ipv4Address>>()
+    }
+    if (NetAddress.isLoopback(ip)) expect(ip).type.toBe<NetAddress.LoopbackAddress<NetAddress.IpAddress>>()
+    if (NetAddress.isLinkLocal(ip)) expect(ip).type.toBe<NetAddress.LinkLocalAddress<NetAddress.IpAddress>>()
+    if (NetAddress.isUnspecified(ip)) {
+      expect(ip).type.toBe<NetAddress.UnspecifiedAddress<NetAddress.IpAddress>>()
+    }
+    if (NetAddress.isPrivate(ipv4)) expect(ipv4).type.toBe<NetAddress.PrivateAddress>()
+    if (NetAddress.isUniqueLocal(ipv6)) expect(ipv6).type.toBe<NetAddress.UniqueLocalAddress>()
+    if (NetAddress.isMacLocallyAdministered(mac)) {
+      expect(mac).type.toBe<NetAddress.LocallyAdministeredAddress>()
+    }
+    if (NetAddress.isMacUniversallyAdministered(mac)) {
+      expect(mac).type.toBe<NetAddress.UniversallyAdministeredAddress>()
+    }
+    expect(NetAddress.isLoopback).type.toBeAssignableTo<(self: NetAddress.IpAddress) => boolean>()
+  })
+
+  it("stacks brands and models MAC broadcast as multicast", () => {
+    const ipv4 = null as unknown as NetAddress.Ipv4Address
+    const mac = null as unknown as NetAddress.MacAddress
+
+    if (NetAddress.isMacLocallyAdministered(mac) && NetAddress.isMulticast(mac)) {
+      expect(mac).type.toBe<
+        NetAddress.MulticastAddress<NetAddress.LocallyAdministeredAddress<NetAddress.MacAddress>>
+      >()
+    }
+    if (NetAddress.isUnicast(ipv4) && NetAddress.isPrivate(ipv4)) {
+      expect(ipv4).type.toBe<
+        NetAddress.PrivateAddress<NetAddress.UnicastAddress<NetAddress.Ipv4Address>>
+      >()
+    }
+    if (NetAddress.isMacBroadcast(mac)) {
+      expect(mac).type.toBeAssignableTo<NetAddress.MulticastAddress<NetAddress.MacAddress>>()
+    }
+    expect(NetAddress.ipv4Broadcast).type.not.toBeAssignableTo<NetAddress.MulticastAddress>()
+    expect(
+      [
+        NetAddress.ipv4Loopback,
+        NetAddress.ipv4Unspecified,
+        NetAddress.ipv4Broadcast
+      ] as const
+    ).type.toBe<readonly [NetAddress.Ipv4Address, NetAddress.Ipv4Address, NetAddress.Ipv4Address]>()
+    expect(
+      [
+        NetAddress.ipv6Loopback,
+        NetAddress.ipv6Unspecified
+      ] as const
+    ).type.toBe<readonly [NetAddress.Ipv6Address, NetAddress.Ipv6Address]>()
+  })
+
+  it("narrows singleton constants to generic classifications on demand", () => {
+    const ipv4Loopback = NetAddress.ipv4Loopback
+    const ipv6Unspecified = NetAddress.ipv6Unspecified
+    const ipv4Broadcast = NetAddress.ipv4Broadcast
+
+    if (NetAddress.isLoopback(ipv4Loopback)) {
+      expect(ipv4Loopback).type.toBe<NetAddress.LoopbackAddress<NetAddress.Ipv4Address>>()
+    }
+    if (NetAddress.isUnspecified(ipv6Unspecified)) {
+      expect(ipv6Unspecified).type.toBe<NetAddress.UnspecifiedAddress<NetAddress.Ipv6Address>>()
+    }
+    if (NetAddress.isBroadcast(ipv4Broadcast)) {
+      expect(ipv4Broadcast).type.toBe<NetAddress.BroadcastAddress<NetAddress.Ipv4Address>>()
+    }
+  })
+
+  it("preserves families and prior brands in higher-order inference", () => {
+    type CustomIpv4Address = NetAddress.Ipv4Address & Brand.Brand<"CustomIpv4Address">
+    const ips = null as unknown as Array<NetAddress.IpAddress>
+    const custom = null as unknown as CustomIpv4Address
+    const multicastSchema = Schema.IpAddress.pipe(Schema.refine(NetAddress.isMulticast))
+
+    expect(ips.filter(NetAddress.isMulticast)).type.toBe<
+      Array<NetAddress.MulticastAddress<NetAddress.IpAddress>>
+    >()
+    expect(Schema.revealCodec(multicastSchema)).type.toBe<
+      Schema.Codec<NetAddress.MulticastAddress<NetAddress.IpAddress>, NetAddress.IpAddress, never, never>
+    >()
+    if (NetAddress.isMulticast(custom)) {
+      expect(custom).type.toBe<NetAddress.MulticastAddress<CustomIpv4Address>>()
+    }
+  })
+
+  it("preserves named schema types when annotating codecs", () => {
+    expect(Schema.MacAddressFromString.annotate({ identifier: "custom" })).type.toBe<Schema.MacAddressFromString>()
+    expect(Schema.Ipv4AddressFromString.annotate({ identifier: "custom" })).type.toBe<Schema.Ipv4AddressFromString>()
+    expect(Schema.Ipv6AddressFromString.annotate({ identifier: "custom" })).type.toBe<Schema.Ipv6AddressFromString>()
+    expect(Schema.IpAddressFromString.annotate({ identifier: "custom" })).type.toBe<Schema.IpAddressFromString>()
+    expect(Schema.Ipv4InterfaceFromString.annotate({ identifier: "custom" })).type.toBe<
+      Schema.Ipv4InterfaceFromString
+    >()
+    expect(Schema.Ipv6InterfaceFromString.annotate({ identifier: "custom" })).type.toBe<
+      Schema.Ipv6InterfaceFromString
+    >()
+    expect(Schema.IpInterfaceFromString.annotate({ identifier: "custom" })).type.toBe<Schema.IpInterfaceFromString>()
+    expect(Schema.Ipv4NetworkFromString.annotate({ identifier: "custom" })).type.toBe<Schema.Ipv4NetworkFromString>()
+    expect(Schema.Ipv6NetworkFromString.annotate({ identifier: "custom" })).type.toBe<Schema.Ipv6NetworkFromString>()
+    expect(Schema.IpNetworkFromString.annotate({ identifier: "custom" })).type.toBe<Schema.IpNetworkFromString>()
+    expect(Schema.InetAddressFromString.annotate({ identifier: "custom" })).type.toBe<Schema.InetAddressFromString>()
+    expect(Schema.UnixPathAddressFromString.annotate({ identifier: "custom" })).type.toBe<
+      Schema.UnixPathAddressFromString
+    >()
+  })
+
+  it("exposes string transformation schemas", () => {
+    expect(Schema.MacAddressFromString).type.toBeAssignableTo<Schema.Codec<NetAddress.MacAddress, string>>()
+    expect(Schema.IpAddressFromString).type.toBeAssignableTo<Schema.Codec<NetAddress.IpAddress, string>>()
+    expect(Schema.InetAddressFromString).type.toBeAssignableTo<Schema.Codec<NetAddress.InetAddress, string>>()
+    expect(Schema.UnixPathAddressFromString).type.toBeAssignableTo<
+      Schema.Codec<NetAddress.UnixPathAddress, string>
+    >()
+    expect(Schema.IpMulticastAddressFromString).type.toBeAssignableTo<
+      Schema.Codec<NetAddress.MulticastAddress<NetAddress.IpAddress>, string>
+    >()
+    expect(Schema.MacBroadcastAddressFromString).type.toBeAssignableTo<
+      Schema.Codec<NetAddress.BroadcastAddress<NetAddress.MacAddress>, string>
+    >()
+  })
+
+  it("exposes representative named classification schema outputs", () => {
+    expect<Schema.Schema.Type<typeof Schema.IpMulticastAddressFromString>>().type.toBe<
+      NetAddress.MulticastAddress<NetAddress.IpAddress>
+    >()
+    expect<Schema.Schema.Type<typeof Schema.MacBroadcastAddressFromString>>().type.toBe<
+      NetAddress.BroadcastAddress<NetAddress.MacAddress>
+    >()
+    expect<Schema.Schema.Type<typeof Schema.Ipv4PrivateAddress>>().type.toBe<
+      NetAddress.PrivateAddress<NetAddress.Ipv4Address>
+    >()
+  })
+})
diff --git a/repos/effect/packages/effect/typetest/unstable/reactivity/AtomHttpApi.tst.ts b/repos/effect/packages/effect/typetest/unstable/reactivity/AtomHttpApi.tst.ts
index 510b0086d..3c3f89c2f 100644
--- a/repos/effect/packages/effect/typetest/unstable/reactivity/AtomHttpApi.tst.ts
+++ b/repos/effect/packages/effect/typetest/unstable/reactivity/AtomHttpApi.tst.ts
@@ -1,7 +1,8 @@
-import { Effect, Layer, Schema } from "effect"
-import { HttpClient } from "effect/unstable/http"
-import { HttpApi, HttpApiEndpoint, HttpApiGroup, HttpApiMiddleware } from "effect/unstable/httpapi"
-import { type Atom, AtomHttpApi } from "effect/unstable/reactivity"
+import { Effect, Layer, Schema, type Stream } from "effect"
+import type { Sse } from "effect/unstable/encoding"
+import { HttpClient, type HttpClientError, type HttpClientResponse } from "effect/unstable/http"
+import { HttpApi, HttpApiEndpoint, HttpApiGroup, HttpApiMiddleware, HttpApiSchema } from "effect/unstable/httpapi"
+import { type Atom, AtomHttpApi, AtomRegistry } from "effect/unstable/reactivity"
 import { describe, expect, it } from "tstyche"
 
 class EndpointError extends Schema.Error<EndpointError>("EndpointError")({
@@ -28,7 +29,18 @@ const Api = HttpApi.make("Api").add(
     HttpApiEndpoint.get("get", "/get", {
       success: Schema.String,
       error: EndpointError
-    }).middleware(TestMiddleware)
+    }).middleware(TestMiddleware),
+    HttpApiEndpoint.get("sse", "/sse", {
+      success: HttpApiSchema.StreamSse({ data: Schema.String })
+    }),
+    HttpApiEndpoint.get("bytes", "/bytes", {
+      success: HttpApiSchema.StreamUint8Array()
+    }),
+    HttpApiEndpoint.get("headers", "/headers", {
+      success: HttpApiSchema.WithHeaders(HttpApiSchema.StreamSse({ data: Schema.String }), {
+        "x-count": Schema.Int
+      })
+    })
   )
 )
 
@@ -37,7 +49,48 @@ const Client = AtomHttpApi.Service()("Client", {
   httpClient: Layer.succeed(HttpClient.HttpClient, HttpClient.make(() => Effect.die("not used")))
 })
 
+type InnerError = HttpClientError.HttpClientError | Schema.SchemaError | Sse.Retry | Sse.SseError
+type SseStream = Stream.Stream<string, InnerError>
+
 describe("AtomHttpApi", () => {
+  it("accepts SSE decode options in query and mutation requests", () => {
+    const StreamingClient = AtomHttpApi.Service()("StreamingClient", {
+      api: HttpApi.make("StreamingApi").add(
+        HttpApiGroup.make("group").add(
+          HttpApiEndpoint.get("events", "/events", {
+            params: { id: Schema.String },
+            success: HttpApiSchema.StreamSse({ data: Schema.String })
+          })
+        )
+      ),
+      httpClient: Layer.succeed(HttpClient.HttpClient, HttpClient.make(() => Effect.die("not used")))
+    })
+    const defaults = StreamingClient.query("group", "events", { params: { id: "1" } })
+    const query = StreamingClient.query("group", "events", {
+      params: { id: "1" },
+      sseOptions: { maxEventSize: 4 }
+    })
+    expect(query).type.toBe<typeof defaults>()
+    expect(StreamingClient.query).type.not.toBeCallableWith("group", "events", {
+      params: { id: "1" },
+      sseOptions: { maxEventSize: "4" }
+    })
+    expect(StreamingClient.query).type.not.toBeCallableWith("group", "events", { sseOptions: {} })
+
+    const mutation = StreamingClient.mutation("group", "events", { responseMode: "decoded-only" })
+    const request: Extract<Parameters<typeof mutation.write>[1], { readonly params: unknown }> = {
+      params: { id: "1" },
+      sseOptions: { maxEventSize: Infinity }
+    }
+    const registry = AtomRegistry.make()
+    expect(registry.set(mutation, request)).type.toBe<void>()
+    expect(registry.set).type.not.toBeCallableWith(mutation, {
+      params: { id: "1" },
+      sseOptions: { maxEventSize: "4" }
+    })
+    expect(registry.set).type.not.toBeCallableWith(mutation, { sseOptions: {} })
+  })
+
   it("should include middleware errors in query and mutation atoms", () => {
     const mutation = Client.mutation("group", "get")
     const query = Client.query("group", "get", {})
@@ -60,4 +113,34 @@ describe("AtomHttpApi", () => {
       MiddlewareError | MiddlewareClientError
     >()
   })
+
+  it("should expose generated SSE stream errors from queries", () => {
+    const query = Client.query("group", "sse", {})
+
+    expect<Atom.Success<typeof query>>().type.toBe<SseStream>()
+  })
+
+  it("should pair the stream with the response in decoded-and-response mode", () => {
+    const mutation = Client.mutation("group", "sse", { responseMode: "decoded-and-response" })
+
+    expect<Atom.Success<typeof mutation>>().type.toBe<
+      [SseStream, HttpClientResponse.HttpClientResponse]
+    >()
+  })
+
+  it("should expose generated binary stream errors from mutations", () => {
+    const mutation = Client.mutation("group", "bytes")
+
+    expect<Atom.Success<typeof mutation>>().type.toBe<
+      Stream.Stream<Uint8Array, HttpClientError.HttpClientError>
+    >()
+  })
+
+  it("should expose generated stream errors through response headers", () => {
+    const query = Client.query("group", "headers", {})
+
+    expect<Atom.Success<typeof query>>().type.toBe<
+      HttpApiSchema.withHeaders<SseStream, { readonly "x-count": number }>
+    >()
+  })
 })
diff --git a/repos/effect/packages/effect/typetest/unstable/reactivity/AtomRpc.tst.ts b/repos/effect/packages/effect/typetest/unstable/reactivity/AtomRpc.tst.ts
new file mode 100644
index 000000000..f91e9b6f2
--- /dev/null
+++ b/repos/effect/packages/effect/typetest/unstable/reactivity/AtomRpc.tst.ts
@@ -0,0 +1,39 @@
+import { Context, Effect, Layer, Schema } from "effect"
+import { type Atom, AtomRpc } from "effect/unstable/reactivity"
+import { Rpc, RpcGroup, RpcMiddleware } from "effect/unstable/rpc"
+import { describe, expect, it } from "tstyche"
+
+describe("AtomRpc", () => {
+  class ServerDependency extends Context.Service<
+    ServerDependency,
+    {}
+  >()("ServerDependency") {}
+
+  class RequiringMiddleware extends RpcMiddleware.Service<RequiringMiddleware, {
+    requires: ServerDependency
+  }>()("RequiringMiddleware", {}) {}
+
+  const RequiringGroup = RpcGroup.make(
+    Rpc.make("getUser", {
+      success: Schema.Struct({
+        id: Schema.Number,
+        name: Schema.String
+      })
+    }).middleware(RequiringMiddleware)
+  )
+
+  it("query supports RPCs whose middleware declares service requirements", () => {
+    const Client = AtomRpc.Service()("RequiringClient", {
+      group: RequiringGroup,
+      protocol: Layer.empty,
+      makeEffect: Effect.die("unused")
+    })
+
+    const query = Client.query("getUser", undefined)
+
+    expect<Atom.Success<typeof query>>().type.toBe<{
+      readonly id: number
+      readonly name: string
+    }>()
+  })
+})
diff --git a/repos/effect/packages/opentelemetry/CHANGELOG.md b/repos/effect/packages/opentelemetry/CHANGELOG.md
index 68925bf8f..e97487fe3 100644
--- a/repos/effect/packages/opentelemetry/CHANGELOG.md
+++ b/repos/effect/packages/opentelemetry/CHANGELOG.md
@@ -1,5 +1,53 @@
 # @effect/opentelemetry
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7483](https://github.com/Effect-TS/effect/pull/7483) [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92) Thanks @tim-smart! - Align runtime type IDs with their module paths. Effect markers now omit legacy grouping prefixes and the `unstable` path segment, while OpenTelemetry spans use the `OtelTracer` module path. Custom implementations that copy these marker strings must adopt the corrected IDs.
+
+- [#7643](https://github.com/Effect-TS/effect/pull/7643) [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af) Thanks @tim-smart! - Reduce memory usage in Effect primitives and fibers.
+  
+  Breaking: context-derived `Fiber` fields now live under `fiber.cache`. The
+  `currentScheduler`, `currentSpan`, `currentLogLevel`, `currentStackFrame`, and
+  `currentPreventYield` fields are now `scheduler`, `span`, `logLevel`,
+  `stackFrame`, and `preventYield`. Access `minimumLogLevel` and
+  `maxOpsBeforeYield` through `cache` as well.
+
+- [#7762](https://github.com/Effect-TS/effect/pull/7762) [`ab07e66`](https://github.com/Effect-TS/effect/commit/ab07e661440ec4002fa873dd3f4097600c12aff8) Thanks @kitlangton! - Use collection interval starts for OpenTelemetry delta metrics.
+
+- [#7760](https://github.com/Effect-TS/effect/pull/7760) [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f) Thanks @kitlangton! - Preserve negative counter deltas in OTLP and OpenTelemetry metric exports.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/opentelemetry/package.json b/repos/effect/packages/opentelemetry/package.json
index 3a860ed17..00ed79f95 100644
--- a/repos/effect/packages/opentelemetry/package.json
+++ b/repos/effect/packages/opentelemetry/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@effect/opentelemetry",
   "type": "module",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "license": "MIT",
   "description": "OpenTelemetry integration for Effect",
   "homepage": "https://effect.website",
@@ -111,18 +111,18 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.1",
-    "@opentelemetry/api-logs": "^0.221.0",
-    "@opentelemetry/context-async-hooks": "^2.10.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.221.0",
-    "@opentelemetry/exporter-prometheus": "^0.221.0",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.221.0",
-    "@opentelemetry/otlp-exporter-base": "^0.221.0",
-    "@opentelemetry/resources": "^2.10.0",
-    "@opentelemetry/sdk-logs": "^0.221.0",
-    "@opentelemetry/sdk-metrics": "^2.10.0",
-    "@opentelemetry/sdk-trace-base": "^2.10.0",
-    "@opentelemetry/sdk-trace-node": "^2.10.0",
-    "@opentelemetry/sdk-trace-web": "^2.10.0",
+    "@opentelemetry/api-logs": "^0.222.0",
+    "@opentelemetry/context-async-hooks": "^2.11.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.222.0",
+    "@opentelemetry/exporter-prometheus": "^0.222.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.222.0",
+    "@opentelemetry/otlp-exporter-base": "^0.222.0",
+    "@opentelemetry/resources": "^2.11.0",
+    "@opentelemetry/sdk-logs": "^0.222.0",
+    "@opentelemetry/sdk-metrics": "^2.11.0",
+    "@opentelemetry/sdk-trace-base": "^2.11.0",
+    "@opentelemetry/sdk-trace-node": "^2.11.0",
+    "@opentelemetry/sdk-trace-web": "^2.11.0",
     "@opentelemetry/semantic-conventions": "^1.43.0"
   }
 }
diff --git a/repos/effect/packages/opentelemetry/src/OtelTracer.ts b/repos/effect/packages/opentelemetry/src/OtelTracer.ts
index 216c8112d..daeff53ac 100644
--- a/repos/effect/packages/opentelemetry/src/OtelTracer.ts
+++ b/repos/effect/packages/opentelemetry/src/OtelTracer.ts
@@ -104,7 +104,7 @@ export const make: Effect.Effect<Tracer.Tracer, never, OtelTracer> = Effect.map(
         )
       },
       context(primitive, fiber) {
-        const currentSpan = fiber.currentSpan
+        const currentSpan = fiber.cache.span
 
         if (currentSpan === undefined) {
           return primitive["~effect/Effect/evaluate"](fiber)
diff --git a/repos/effect/packages/opentelemetry/src/internal/metrics.ts b/repos/effect/packages/opentelemetry/src/internal/metrics.ts
index 3fd560a7a..eae58e7f7 100644
--- a/repos/effect/packages/opentelemetry/src/internal/metrics.ts
+++ b/repos/effect/packages/opentelemetry/src/internal/metrics.ts
@@ -116,7 +116,7 @@ export class MetricProducerImpl implements MetricProducer {
               if (typeof currentCount === "bigint" && typeof previousCount === "bigint") {
                 reportValue = currentCount - previousCount
                 // Handle reset: if current < previous, report current value
-                if (reportValue < BigInt(0)) {
+                if (state.state.incremental && reportValue < BigInt(0)) {
                   reportValue = currentCount
                 }
               } else {
@@ -124,7 +124,7 @@ export class MetricProducerImpl implements MetricProducer {
                 const prev = Number(previousCount)
                 reportValue = curr - prev
                 // Handle reset
-                if (reportValue < 0) {
+                if (state.state.incremental && reportValue < 0) {
                   reportValue = curr
                 }
               }
@@ -133,7 +133,7 @@ export class MetricProducerImpl implements MetricProducer {
           }
 
           const descriptor = descriptorFromState(state, attributes)
-          const startTime = this.startTimeFor(descriptor.name, intervalStartTime)
+          const startTime = isDelta ? intervalStartTime : this.startTimeFor(descriptor.name, intervalStartTime)
           const dataPoint: DataPoint<number> = {
             startTime,
             endTime: hrTimeNow,
@@ -217,7 +217,7 @@ export class MetricProducerImpl implements MetricProducer {
           }
 
           const descriptor = descriptorFromState(state, attributes)
-          const startTime = this.startTimeFor(descriptor.name, intervalStartTime)
+          const startTime = isDelta ? intervalStartTime : this.startTimeFor(descriptor.name, intervalStartTime)
           const dataPoint: DataPoint<Histogram> = {
             startTime,
             endTime: hrTimeNow,
@@ -263,7 +263,7 @@ export class MetricProducerImpl implements MetricProducer {
             }
 
             const descriptor = descriptorFromState(state, attributes)
-            const startTime = this.startTimeFor(descriptor.name, intervalStartTime)
+            const startTime = isDelta ? intervalStartTime : this.startTimeFor(descriptor.name, intervalStartTime)
             dataPoints.push({
               startTime,
               endTime: hrTimeNow,
diff --git a/repos/effect/packages/platform/browser/CHANGELOG.md b/repos/effect/packages/platform/browser/CHANGELOG.md
index 1e7386c3a..7b2e55872 100644
--- a/repos/effect/packages/platform/browser/CHANGELOG.md
+++ b/repos/effect/packages/platform/browser/CHANGELOG.md
@@ -1,5 +1,67 @@
 # @effect/platform-browser
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7808](https://github.com/Effect-TS/effect/pull/7808) [`d84f865`](https://github.com/Effect-TS/effect/commit/d84f865a48c9302b17254a500ae88bcc316b802c) Thanks @kitlangton! - Return a typed `PlatformError` from `BrowserCrypto` digest operations when `crypto.subtle` is unavailable, instead of failing with a defect.
+
+- [#7868](https://github.com/Effect-TS/effect/pull/7868) [`6b8128e`](https://github.com/Effect-TS/effect/commit/6b8128e0bdc9d6778ca4dcea7effcfd50a500662) Thanks @kitlangton! - Fix `BrowserKeyValueStore.layerIndexedDb` to report keys containing `Uint8Array` values from `has`.
+
+- [#7866](https://github.com/Effect-TS/effect/pull/7866) [`53eb888`](https://github.com/Effect-TS/effect/commit/53eb88875dace386188435884037e4bc25109c37) Thanks @kitlangton! - Invoke custom `BrowserRuntime.runMain` teardown callbacks when the main effect completes, and remove the `pagehide` listener once the main fiber finishes.
+
+- [#7818](https://github.com/Effect-TS/effect/pull/7818) [`072005e`](https://github.com/Effect-TS/effect/commit/072005e64b75452a2f5413b4a1b56a3690007e5b) Thanks @kitlangton! - Preserve out-of-line primary keys in IndexedDB query results, including secondary-index reads.
+
+- [#7820](https://github.com/Effect-TS/effect/pull/7820) [`99f57af`](https://github.com/Effect-TS/effect/commit/99f57af40100fe41fbc244cc4dd76247bc618464) Thanks @kitlangton! - Keep streamed IndexedDB selects within their query limits.
+
+- [#7487](https://github.com/Effect-TS/effect/pull/7487) [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80) Thanks @tim-smart! - Redesign `Socket` around a scoped, pull-based reader with transport backpressure.
+  
+  `Socket` now exposes `reader` and `writer`. Client reader acquisition dials and yields a pull of non-empty batches: one buffer for TCP and one entry per WebSocket frame. TCP applies backpressure while paused; pausable WebSockets pause at `highWaterMark` (64 KiB by default) and resume after draining. Browser WebSockets cannot pause, so they can fail with `SocketReadError` at a configured `highWaterMark`. Writes await native drain signals and batch with `cork` / `uncork` where available.
+  
+  ### Breaking changes
+  
+  - `Socket.run`, `Socket.runString`, and `Socket.runRaw` are removed. Acquire `socket.reader` (or `Socket.readerBytes` / `Socket.readerString`) in a scope and pull in a loop. Code before the first pull replaces `onOpen`.
+  - `Socket.make` now takes `{ reader, writer }`. The writer acquisition is infallible and yields a `Writer` with `write` and `writeAll`; both operations can still fail with `SocketError`.
+  - Every close fails the pull with `SocketError` wrapping `SocketCloseError`. The close-code predicates are removed; use `Effect.retry` around the scoped read loop to reconnect.
+  - `Socket.toChannel` and `Socket.toChannelString` now read from the pull and fail on close. `Socket.toStream` is added for read-only consumption.
+  - `fromWebSocket` drops the `onInitialRun` option; `SendQueueCapacity` is removed.
+  - Accepted server sockets pause immediately. Their reader attaches to the existing connection and cannot reconnect after close.
+
+- [#7496](https://github.com/Effect-TS/effect/pull/7496) [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed) Thanks @nikhilsnayak! - Add `HttpClientResponse.url`, including query parameters and excluding the hash. When redirects are followed, it reports
+  the final URL.
+
+- [#7736](https://github.com/Effect-TS/effect/pull/7736) [`736c882`](https://github.com/Effect-TS/effect/commit/736c882a45b6278a1a0fc773987aaf69a752ca12) Thanks @kitlangton! - Support text, JSON, and stream readers when the XHR response type is `"arraybuffer"`.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/platform/browser/package.json b/repos/effect/packages/platform/browser/package.json
index 82f8c23ac..63f83e962 100644
--- a/repos/effect/packages/platform/browser/package.json
+++ b/repos/effect/packages/platform/browser/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@effect/platform-browser",
   "type": "module",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "license": "MIT",
   "description": "Platform specific implementations for the browser",
   "homepage": "https://effect.website",
diff --git a/repos/effect/packages/platform/browser/src/BrowserCrypto.ts b/repos/effect/packages/platform/browser/src/BrowserCrypto.ts
index bf00b051a..3a8913540 100644
--- a/repos/effect/packages/platform/browser/src/BrowserCrypto.ts
+++ b/repos/effect/packages/platform/browser/src/BrowserCrypto.ts
@@ -67,7 +67,7 @@ export const layer: Layer.Layer<EffectCrypto.Crypto> = Layer.effect(
     }
 
     const digest: EffectCrypto.Crypto["digest"] = (algorithm, data) => {
-      if (typeof crypto.subtle.digest !== "function") {
+      if (typeof crypto.subtle?.digest !== "function") {
         return Effect.fail(PlatformError.systemError({
           module: "Crypto",
           method: "digest",
diff --git a/repos/effect/packages/platform/browser/src/BrowserHttpClient.ts b/repos/effect/packages/platform/browser/src/BrowserHttpClient.ts
index 2d506a078..aef52185d 100644
--- a/repos/effect/packages/platform/browser/src/BrowserHttpClient.ts
+++ b/repos/effect/packages/platform/browser/src/BrowserHttpClient.ts
@@ -147,7 +147,7 @@ const makeXmlHttpRequest = HttpClient.make(
           const onChange = () => {
             if (!sent && xhr.readyState >= 2) {
               sent = true
-              resume(Effect.succeed(new ClientResponseImpl(request, xhr)))
+              resume(Effect.succeed(new ClientResponseImpl(request, xhr, url.href)))
             }
           }
           xhr.onreadystatechange = onChange
@@ -260,6 +260,13 @@ abstract class IncomingMessageImpl<E> extends Inspectable.Class implements HttpI
     if (this._textEffect) {
       return this._textEffect
     }
+    if (this.source.responseType === "arraybuffer") {
+      return this._textEffect = this.arrayBuffer.pipe(
+        Effect.map((buffer) => new TextDecoder().decode(buffer)),
+        Effect.cached,
+        Effect.runSync
+      )
+    }
     return this._textEffect = Effect.callback<string, E>((resume) => {
       if (this.source.readyState === 4) {
         resume(Effect.succeed(this.source.responseText))
@@ -303,6 +310,9 @@ abstract class IncomingMessageImpl<E> extends Inspectable.Class implements HttpI
   }
 
   get stream(): Stream.Stream<Uint8Array, E> {
+    if (this.source.responseType === "arraybuffer") {
+      return Stream.fromEffect(Effect.map(this.arrayBuffer, (buffer) => new Uint8Array(buffer)))
+    }
     return Stream.callback<Uint8Array, E>((queue) => {
       let offset = 0
       const onReadyStateChange = () => {
@@ -377,10 +387,12 @@ class ClientResponseImpl extends IncomingMessageImpl<HttpClientError.HttpClientE
 {
   readonly [HttpClientResponse.TypeId]: typeof HttpClientResponse.TypeId
   readonly request: HttpClientRequest.HttpClientRequest
+  private readonly requestUrl: string
 
   constructor(
     request: HttpClientRequest.HttpClientRequest,
-    source: globalThis.XMLHttpRequest
+    source: globalThis.XMLHttpRequest,
+    requestUrl: string
   ) {
     super(source, (cause) =>
       new HttpClientError.HttpClientError({
@@ -391,6 +403,7 @@ class ClientResponseImpl extends IncomingMessageImpl<HttpClientError.HttpClientE
         })
       }))
     this.request = request
+    this.requestUrl = requestUrl
     this[HttpClientResponse.TypeId] = HttpClientResponse.TypeId
   }
 
@@ -398,6 +411,10 @@ class ClientResponseImpl extends IncomingMessageImpl<HttpClientError.HttpClientE
     return this.source.status
   }
 
+  get url() {
+    return (this.source.responseURL || this.requestUrl).split("#")[0]
+  }
+
   get formData(): Effect.Effect<FormData, HttpClientError.HttpClientError> {
     return Effect.flatMap(this.arrayBuffer, (body) =>
       Effect.tryPromise({
diff --git a/repos/effect/packages/platform/browser/src/BrowserKeyValueStore.ts b/repos/effect/packages/platform/browser/src/BrowserKeyValueStore.ts
index dd63cbffe..71c120348 100644
--- a/repos/effect/packages/platform/browser/src/BrowserKeyValueStore.ts
+++ b/repos/effect/packages/platform/browser/src/BrowserKeyValueStore.ts
@@ -104,6 +104,18 @@ export const layerIndexedDb = (options?: {
             }),
             (found) => found?.value && found.value instanceof Uint8Array ? found.value : undefined
           ),
+        has: (key: string) =>
+          Effect.map(
+            Effect.suspend(() => {
+              const store = getKvsEntriesStore(db, "readonly")
+              return idbRequest<number>({
+                method: "has",
+                message: "Failed to check key in backing store",
+                key
+              }, () => store.count(key))
+            }),
+            (count) => count > 0
+          ),
         set: (key: string, value: string | Uint8Array) =>
           Effect.asVoid(Effect.suspend(() => {
             return idbWriteRequest(
diff --git a/repos/effect/packages/platform/browser/src/BrowserRuntime.ts b/repos/effect/packages/platform/browser/src/BrowserRuntime.ts
index 73c7e9532..c02dad8c0 100644
--- a/repos/effect/packages/platform/browser/src/BrowserRuntime.ts
+++ b/repos/effect/packages/platform/browser/src/BrowserRuntime.ts
@@ -47,10 +47,16 @@ export const runMain: {
       readonly teardown?: Teardown | undefined
     }
   ): void
-} = makeRunMain(({ fiber }) => {
-  globalThis.addEventListener("pagehide", (event) => {
+} = makeRunMain(({ fiber, teardown }) => {
+  function onPageHide(event: PageTransitionEvent) {
     if (!event.persisted) {
       fiber.interruptUnsafe(fiber.id)
     }
+  }
+
+  globalThis.addEventListener("pagehide", onPageHide)
+  fiber.addObserver((exit) => {
+    globalThis.removeEventListener("pagehide", onPageHide)
+    teardown(exit, () => {})
   })
 })
diff --git a/repos/effect/packages/platform/browser/src/IndexedDbDatabase.ts b/repos/effect/packages/platform/browser/src/IndexedDbDatabase.ts
index 77f07cc76..5ccb2aa60 100644
--- a/repos/effect/packages/platform/browser/src/IndexedDbDatabase.ts
+++ b/repos/effect/packages/platform/browser/src/IndexedDbDatabase.ts
@@ -134,7 +134,7 @@ export class IndexedDbDatabase extends Context.Service<
   {
     readonly database: MutableRef.MutableRef<globalThis.IDBDatabase>
     readonly IDBKeyRange: typeof globalThis.IDBKeyRange
-    readonly reactivity: Reactivity.Reactivity["Service"]
+    readonly reactivity: Reactivity.Reactivity
     readonly rebuild: Effect.Effect<void, IndexedDbDatabaseError>
   }
 >()(TypeId) {}
@@ -553,7 +553,7 @@ const makeTransactionProto = <Source extends IndexedDbVersion.AnyWithProps>({
   readonly IDBKeyRange: typeof globalThis.IDBKeyRange
   readonly tables: ReadonlyMap<string, IndexedDbVersion.Tables<Source>>
   readonly transaction: globalThis.IDBTransaction
-  readonly reactivity: Reactivity.Reactivity["Service"]
+  readonly reactivity: Reactivity.Reactivity
 }): Transaction<Source> => {
   const migration = IndexedDbQueryBuilder.make({
     database,
diff --git a/repos/effect/packages/platform/browser/src/IndexedDbQueryBuilder.ts b/repos/effect/packages/platform/browser/src/IndexedDbQueryBuilder.ts
index 934db2fe9..1897010aa 100644
--- a/repos/effect/packages/platform/browser/src/IndexedDbQueryBuilder.ts
+++ b/repos/effect/packages/platform/browser/src/IndexedDbQueryBuilder.ts
@@ -106,7 +106,7 @@ export interface IndexedDbQueryBuilder<
 > extends Pipeable.Pipeable, Inspectable {
   readonly tables: ReadonlyMap<string, IndexedDbVersion.Tables<Source>>
   readonly database: MutableRef.MutableRef<globalThis.IDBDatabase>
-  readonly reactivity: Reactivity.Reactivity["Service"]
+  readonly reactivity: Reactivity.Reactivity
   readonly IDBKeyRange: typeof globalThis.IDBKeyRange
   readonly IDBTransaction: globalThis.IDBTransaction | undefined
 
@@ -268,7 +268,7 @@ export declare namespace IndexedDbQuery {
     readonly table: Table
     readonly database: MutableRef.MutableRef<globalThis.IDBDatabase>
     readonly IDBKeyRange: typeof globalThis.IDBKeyRange
-    readonly reactivity: Reactivity.Reactivity["Service"]
+    readonly reactivity: Reactivity.Reactivity
 
     readonly clear: Effect.Effect<void, IndexedDbQueryError>
 
@@ -937,7 +937,7 @@ const applySelect = Effect.fnUntraced(function*(
         if (predicate === undefined || predicate(cursor.value)) {
           results.push(
             keyPath === undefined
-              ? { ...cursor.value, key: cursor.key }
+              ? { ...cursor.value, key: cursor.primaryKey }
               : cursor.value
           )
           count += 1
@@ -992,7 +992,7 @@ const applyFirst = Effect.fnUntraced(function*(
   const data = yield* Effect.callback<any, IndexedDbQueryError | Cause.NoSuchElementError>((resume) => {
     const { keyRange, store } = getReadonlyObjectStore(query.select)
 
-    if (keyRange !== undefined) {
+    if (keyRange !== undefined && keyPath !== undefined) {
       const request = store.get(keyRange)
 
       request.onerror = (event) => {
@@ -1016,7 +1016,7 @@ const applyFirst = Effect.fnUntraced(function*(
         }
       }
     } else {
-      const request = store.openCursor()
+      const request = store.openCursor(keyRange)
 
       request.onerror = (event) => {
         resume(
@@ -1031,7 +1031,7 @@ const applyFirst = Effect.fnUntraced(function*(
 
       request.onsuccess = () => {
         const value = request.result?.value
-        const key = request.result?.key
+        const key = request.result?.primaryKey
 
         if (value === undefined) {
           resume(
@@ -1413,7 +1413,7 @@ const makeFrom = <
   readonly table: Table
   readonly database: MutableRef.MutableRef<globalThis.IDBDatabase>
   readonly IDBKeyRange: typeof globalThis.IDBKeyRange
-  readonly reactivity: Reactivity.Reactivity["Service"]
+  readonly reactivity: Reactivity.Reactivity
 }): IndexedDbQuery.From<Table> => {
   const self = Object.create(FromProto)
   self.table = options.table
@@ -1785,6 +1785,7 @@ const SelectProto: Omit<
             const isPartial = data.length < chunkSize
             const next = makeSelect({
               ...select,
+              limitValue: limit === undefined ? chunkSize : Math.min(chunkSize, limit - total),
               offsetValue: initialOffset + total
             })
             return [data, isPartial || reachedLimit ? Option.none() : Option.some(next)] as const
@@ -2054,7 +2055,7 @@ export const make = <Source extends IndexedDbVersion.AnyWithProps>({
   readonly database: MutableRef.MutableRef<globalThis.IDBDatabase>
   readonly IDBKeyRange: typeof globalThis.IDBKeyRange
   readonly tables: ReadonlyMap<string, IndexedDbVersion.Tables<Source>>
-  readonly reactivity: Reactivity.Reactivity["Service"]
+  readonly reactivity: Reactivity.Reactivity
 }): IndexedDbQueryBuilder<Source> => {
   const self = Object.create(QueryBuilderProto)
   self.tables = tables
diff --git a/repos/effect/packages/platform/browser/test/BrowserCrypto.test.ts b/repos/effect/packages/platform/browser/test/BrowserCrypto.test.ts
index 3c9b78d52..8ddecf34f 100644
--- a/repos/effect/packages/platform/browser/test/BrowserCrypto.test.ts
+++ b/repos/effect/packages/platform/browser/test/BrowserCrypto.test.ts
@@ -1,9 +1,11 @@
 import * as BrowserCrypto from "@effect/platform-browser/BrowserCrypto"
 import { assert, describe, it } from "@effect/vitest"
-import { Layer } from "effect"
+import { Cause, Exit, Layer } from "effect"
 import * as Crypto from "effect/Crypto"
 import * as Effect from "effect/Effect"
+import * as PlatformError from "effect/PlatformError"
 import * as TestClock from "effect/testing/TestClock"
+import { webcrypto } from "node:crypto"
 
 const uuidV4Regex = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/
 const uuidV7Regex = /^[0-9a-f]{8}-[0-9a-f]{4}-7[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/
@@ -17,6 +19,36 @@ const getRandomValues = <T extends ArrayBufferView | null>(array: T): T => {
   return array
 }
 
+const withSubtle = (subtle: unknown): globalThis.Crypto =>
+  Object.create(globalThis.crypto, { subtle: { value: subtle } })
+
+const layerWith = (crypto: globalThis.Crypto) =>
+  BrowserCrypto.layer.pipe(Layer.provide(Layer.succeed(BrowserCrypto.WebCrypto, crypto)))
+
+const assertPlatformError = (
+  exit: Exit.Exit<Uint8Array, PlatformError.PlatformError>,
+  description: string
+) => {
+  assert.ok(Exit.isFailure(exit))
+  assert.strictEqual(exit.cause.reasons.length, 1)
+  const reason = exit.cause.reasons[0]
+  assert.ok(Cause.isFailReason(reason))
+  assert.strictEqual(reason.error._tag, "PlatformError")
+  assert.instanceOf(reason.error.reason, PlatformError.SystemError)
+  assert.strictEqual(reason.error.reason._tag, "Unknown")
+  assert.strictEqual(reason.error.reason.module, "Crypto")
+  assert.strictEqual(reason.error.reason.method, "digest")
+  assert.strictEqual(reason.error.reason.description, description)
+  return reason.error
+}
+
+const checkUnavailable = (crypto: globalThis.Crypto) =>
+  Effect.gen(function*() {
+    const service = yield* Crypto.Crypto
+    const exit = yield* Effect.exit(Effect.suspend(() => service.digest("SHA-256", new Uint8Array())))
+    assertPlatformError(exit, "crypto.subtle.digest is not available")
+  }).pipe(Effect.provide(layerWith(crypto)))
+
 describe("BrowserCrypto", () => {
   it.effect("generates random bytes at and above the getRandomValues limit", () => {
     const chunks: Array<number> = []
@@ -93,4 +125,46 @@ describe("BrowserCrypto", () => {
       ))
     )
   })
+
+  it.effect("fails with PlatformError when subtle is absent", () => checkUnavailable(withSubtle(undefined)))
+
+  it.effect("fails with PlatformError when subtle exists but digest is absent", () =>
+    checkUnavailable(withSubtle(Object.create(globalThis.crypto.subtle, { digest: { value: undefined } }))))
+
+  it.effect("computes a real SHA-256 digest when subtle is present", () =>
+    Effect.gen(function*() {
+      const service = yield* Crypto.Crypto
+      const bytes = yield* service.digest("SHA-256", new TextEncoder().encode("abc"))
+      const hex = Array.from(bytes, (byte) => byte.toString(16).padStart(2, "0")).join("")
+      assert.strictEqual(hex, "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad")
+    }).pipe(Effect.provide(layerWith(withSubtle(webcrypto.subtle)))))
+
+  it.effect("preserves a rejected digest promise as a typed PlatformError", () => {
+    const rejection = new Error("Digest rejected by fixture")
+    const subtle = Object.create(globalThis.crypto.subtle, {
+      digest: { value: () => Promise.reject(rejection) }
+    })
+    return Effect.gen(function*() {
+      const service = yield* Crypto.Crypto
+      const exit = yield* Effect.exit(service.digest("SHA-256", new Uint8Array()))
+      const error = assertPlatformError(exit, "Could not compute digest")
+      assert.strictEqual(error.reason.cause, rejection)
+    }).pipe(Effect.provide(layerWith(withSubtle(subtle))))
+  })
+
+  it.effect("synthetic control: fails with PlatformError when subtle is null", () => checkUnavailable(withSubtle(null)))
+
+  it.effect("still dies when the entire Web Crypto object is absent", () => {
+    const fixture = { crypto: globalThis.crypto }
+    Object.defineProperty(fixture, "crypto", { value: undefined })
+    return Effect.gen(function*() {
+      const exit = yield* Effect.exit(Crypto.Crypto.pipe(Effect.provide(layerWith(fixture.crypto))))
+      assert.ok(Exit.isFailure(exit))
+      assert.strictEqual(exit.cause.reasons.length, 1)
+      const reason = exit.cause.reasons[0]
+      assert.ok(Cause.isDieReason(reason))
+      assert.ok(reason.defect instanceof Error)
+      assert.strictEqual(reason.defect.message, "Web Crypto API is not available")
+    })
+  })
 })
diff --git a/repos/effect/packages/platform/browser/test/BrowserHttpClient.test.ts b/repos/effect/packages/platform/browser/test/BrowserHttpClient.test.ts
index 4ae16f07b..d91fae775 100644
--- a/repos/effect/packages/platform/browser/test/BrowserHttpClient.test.ts
+++ b/repos/effect/packages/platform/browser/test/BrowserHttpClient.test.ts
@@ -7,41 +7,42 @@ import * as Cookies from "effect/unstable/http/Cookies"
 import * as HttpClient from "effect/unstable/http/HttpClient"
 import * as MXHR from "mock-xmlhttprequest"
 
-const layer = (...args: Parameters<typeof MXHR.newServer>) =>
+const layer = (routes: Parameters<typeof MXHR.newServer>[0], responseURL = "") =>
   Layer.unwrap(Effect.sync(() => {
-    const server = MXHR.newServer(...args)
+    const server = MXHR.newServer(routes)
     return BrowserHttpClient.layerXMLHttpRequest.pipe(
-      Layer.provide(Layer.succeed(BrowserHttpClient.XMLHttpRequest, server.xhrFactory))
+      Layer.provide(Layer.succeed(BrowserHttpClient.XMLHttpRequest, () => {
+        const xhr = server.xhrFactory()
+        xhr.responseURL = responseURL
+        return xhr
+      }))
     )
   }))
 
 describe("BrowserHttpClient", () => {
   it.effect("json", () =>
     Effect.gen(function*() {
-      const body = yield* HttpClient.get("http://localhost:8080/my/url").pipe(
-        Effect.flatMap((_) => _.json)
-      )
-      assert.deepStrictEqual(body, { message: "Success!" })
+      const response = yield* HttpClient.get("http://localhost:8080/my/url")
+      assert.strictEqual(response.url, "http://localhost:8080/final?value=1")
+      assert.deepStrictEqual(yield* response.json, { message: "Success!" })
     }).pipe(Effect.provide(layer({
       get: ["http://localhost:8080/my/url", {
         headers: { "Content-Type": "application/json" },
         body: "{ \"message\": \"Success!\" }"
       }]
-    }))))
+    }, "http://localhost:8080/final?value=1#fragment"))))
 
   it.effect("stream", () =>
     Effect.gen(function*() {
-      const body = yield* HttpClient.get("http://localhost:8080/my/url").pipe(
-        Effect.flatMap((response) =>
-          response.stream.pipe(
-            Stream.decodeText(),
-            Stream.mkString
-          )
-        )
-      )
+      const response = yield* HttpClient.get("http://localhost:8080/my/url?existing=1", {
+        urlParams: { value: "a#b" },
+        hash: "fragment"
+      })
+      assert.strictEqual(response.url, "http://localhost:8080/my/url?existing=1&value=a%23b")
+      const body = yield* response.stream.pipe(Stream.decodeText(), Stream.mkString)
       assert.deepStrictEqual(body, "{ \"message\": \"Success!\" }")
     }).pipe(Effect.provide(layer({
-      get: ["http://localhost:8080/my/url", {
+      get: ["http://localhost:8080/my/url?existing=1&value=a%23b#fragment", {
         headers: { "Content-Type": "application/json" },
         body: "{ \"message\": \"Success!\" }"
       }]
@@ -89,6 +90,24 @@ describe("BrowserHttpClient", () => {
       }]
     }))))
 
+  it.effect("readers in ArrayBuffer mode", () =>
+    Effect.gen(function*() {
+      const response = yield* HttpClient.get("http://localhost:8080/my/url").pipe(
+        BrowserHttpClient.withXHRArrayBuffer
+      )
+      assert.strictEqual(yield* response.text, "{ \"message\": \"café\" }")
+      assert.deepStrictEqual(yield* response.json, { message: "café" })
+      assert.strictEqual(
+        yield* response.stream.pipe(Stream.decodeText(), Stream.mkString),
+        "{ \"message\": \"café\" }"
+      )
+    }).pipe(Effect.provide(layer({
+      get: ["http://localhost:8080/my/url", {
+        headers: { "Content-Type": "application/json" },
+        body: "{ \"message\": \"café\" }"
+      }]
+    }))))
+
   it.effect("decodes an XHR response as FormData", () =>
     Effect.gen(function*() {
       const formData = yield* HttpClient.get("http://localhost/form").pipe(
diff --git a/repos/effect/packages/platform/browser/test/BrowserKeyValueStore.test.ts b/repos/effect/packages/platform/browser/test/BrowserKeyValueStore.test.ts
index f4ca6281f..593aa2055 100644
--- a/repos/effect/packages/platform/browser/test/BrowserKeyValueStore.test.ts
+++ b/repos/effect/packages/platform/browser/test/BrowserKeyValueStore.test.ts
@@ -24,6 +24,18 @@ describe("KeyValueStore / layerIndexedDb", () => {
     )
   )
 
+  it.effect("reports a key containing bytes as present", () => {
+    const layer = BrowserKeyValueStore.layerIndexedDb({
+      database: `kvs_binary_has_${crypto.randomUUID()}`
+    }).pipe(Layer.provide(layerFakeIndexedDb))
+
+    return Effect.gen(function*() {
+      const store = yield* KeyValueStore.KeyValueStore
+      yield* store.set("binary", new Uint8Array([0, 127, 255]))
+      assert.isTrue(yield* store.has("binary"))
+    }).pipe(Effect.provide(layer))
+  })
+
   it.effect("does not report a write before its transaction commits", () => {
     const db = {
       objectStoreNames: { contains: () => true },
diff --git a/repos/effect/packages/platform/browser/test/BrowserPersistence.test.ts b/repos/effect/packages/platform/browser/test/BrowserPersistence.test.ts
index c834a7d33..757295770 100644
--- a/repos/effect/packages/platform/browser/test/BrowserPersistence.test.ts
+++ b/repos/effect/packages/platform/browser/test/BrowserPersistence.test.ts
@@ -33,7 +33,7 @@ afterEach(() => {
   Reflect.set(globalThis, "indexedDB", previousIndexedDb)
 })
 
-describe.sequential("BrowserPersistence", () => {
+describe("BrowserPersistence", { concurrent: false }, () => {
   it.effect("set + get", () =>
     Effect.gen(function*() {
       const backing = yield* Persistence.BackingPersistence
diff --git a/repos/effect/packages/platform/browser/test/BrowserPersistencePersistedCache.test.ts b/repos/effect/packages/platform/browser/test/BrowserPersistencePersistedCache.test.ts
index 01324b67f..b64509798 100644
--- a/repos/effect/packages/platform/browser/test/BrowserPersistencePersistedCache.test.ts
+++ b/repos/effect/packages/platform/browser/test/BrowserPersistencePersistedCache.test.ts
@@ -21,7 +21,7 @@ afterAll(() => {
   Reflect.set(globalThis, "indexedDB", previousIndexedDb)
 })
 
-describe.sequential("BrowserPersistence / PersistedCache", () => {
+describe("BrowserPersistence / PersistedCache", { concurrent: false }, () => {
   PersistedCacheTest.suite(
     "browser-indexeddb",
     BrowserPersistence.layerIndexedDb({ database })
diff --git a/repos/effect/packages/platform/browser/test/IndexedDbDatabase.test.ts b/repos/effect/packages/platform/browser/test/IndexedDbDatabase.test.ts
index 2b6464d69..cee9832b3 100644
--- a/repos/effect/packages/platform/browser/test/IndexedDbDatabase.test.ts
+++ b/repos/effect/packages/platform/browser/test/IndexedDbDatabase.test.ts
@@ -19,7 +19,7 @@ afterEach(() => {
   indexedDB.deleteDatabase(databaseName)
 })
 
-describe.sequential("IndexedDbDatabase", () => {
+describe("IndexedDbDatabase", { concurrent: false }, () => {
   it.effect("insert and read todos", () => {
     const Table = IndexedDbTable.make({
       name: "todo",
diff --git a/repos/effect/packages/platform/browser/test/IndexedDbQueryBuilder.test.ts b/repos/effect/packages/platform/browser/test/IndexedDbQueryBuilder.test.ts
index 8cd582c21..af1dc9b78 100644
--- a/repos/effect/packages/platform/browser/test/IndexedDbQueryBuilder.test.ts
+++ b/repos/effect/packages/platform/browser/test/IndexedDbQueryBuilder.test.ts
@@ -63,7 +63,7 @@ class VerifyContext extends Context.Service<
 
 const VerifyId = Schema.String.pipe(
   Schema.decodeTo(Schema.String, {
-    encode: SchemaGetter.transformOrFail((s) =>
+    encode: SchemaGetter.transformEffect((s) =>
       Effect.gen(function*() {
         const { maxLength } = yield* VerifyContext
         if (s.length > maxLength) {
@@ -120,7 +120,8 @@ const Table6 = IndexedDbTable.make({
 
 const Table7 = IndexedDbTable.make({
   name: "no-keypath",
-  schema: Schema.Struct({ username: Schema.String, index: Schema.Number })
+  schema: Schema.Struct({ username: Schema.String, index: Schema.Number }),
+  indexes: { usernameIndex: "username" }
 })
 
 class V1 extends IndexedDbVersion.make(
@@ -133,7 +134,7 @@ class V1 extends IndexedDbVersion.make(
   Table7
 ) {}
 
-describe.sequential("IndexedDbQueryBuilder", () => {
+describe("IndexedDbQueryBuilder", { concurrent: false }, () => {
   describe("select", () => {
     it.effect("select", () => {
       class Db extends IndexedDbDatabase.make(
@@ -252,6 +253,51 @@ describe.sequential("IndexedDbQueryBuilder", () => {
       }).pipe(provideDb(Db))
     })
 
+    it.effect("select first preserves the primary key in no keypath table", () => {
+      class Db extends IndexedDbDatabase.make(
+        V1,
+        Effect.fn(function*(api) {
+          yield* api.createObjectStore("no-keypath")
+          yield* api.createIndex("no-keypath", "usernameIndex")
+          yield* api.from("no-keypath").insertAll([
+            { key: 7, username: "user", index: 1 },
+            { key: 9, username: "user", index: 2 }
+          ])
+        })
+      ) {}
+
+      return Effect.gen(function*() {
+        const api = yield* Db
+        const data = yield* api.from("no-keypath").select("usernameIndex").equals("user").first()
+
+        assert.deepStrictEqual(data, { key: 7, username: "user", index: 1 })
+      }).pipe(provideDb(Db))
+    })
+
+    it.effect("select preserves primary keys in no keypath table", () => {
+      class Db extends IndexedDbDatabase.make(
+        V1,
+        Effect.fn(function*(api) {
+          yield* api.createObjectStore("no-keypath")
+          yield* api.createIndex("no-keypath", "usernameIndex")
+          yield* api.from("no-keypath").insertAll([
+            { key: 7, username: "user", index: 1 },
+            { key: 9, username: "user", index: 2 }
+          ])
+        })
+      ) {}
+
+      return Effect.gen(function*() {
+        const api = yield* Db
+        const data = yield* api.from("no-keypath").select("usernameIndex").equals("user")
+
+        assert.deepStrictEqual(data, [
+          { key: 7, username: "user", index: 1 },
+          { key: 9, username: "user", index: 2 }
+        ])
+      }).pipe(provideDb(Db))
+    })
+
     it.effect("select equals with index", () => {
       class Db extends IndexedDbDatabase.make(
         V1,
@@ -1418,6 +1464,11 @@ describe.sequential("IndexedDbQueryBuilder", () => {
       )
       assert.equal(data3.length, 10)
       assert.equal(data3[0].id, 51)
+
+      const data4 = yield* api.from("todo").select().limit(3).stream({ chunkSize: 2 }).pipe(
+        Stream.runCollect
+      )
+      assert.deepStrictEqual(data4.map((row) => row.id), [1, 2, 3])
     }).pipe(provideDb(Db))
   })
 
diff --git a/repos/effect/packages/platform/browser/test/fixtures/rpc-e2e.ts b/repos/effect/packages/platform/browser/test/fixtures/rpc-e2e.ts
index c04bb1aa4..a37711fc2 100644
--- a/repos/effect/packages/platform/browser/test/fixtures/rpc-e2e.ts
+++ b/repos/effect/packages/platform/browser/test/fixtures/rpc-e2e.ts
@@ -65,7 +65,7 @@ export const e2eSuite = <E>(
       Effect.gen(function*() {
         const client = yield* UsersClient
         const users: Array<User> = []
-        yield* client.StreamUsers({ id: "1" }).pipe(
+        const fiber = yield* client.StreamUsers({ id: "1" }).pipe(
           Stream.take(5),
           Stream.runForEach((user) =>
             Effect.sync(() => {
@@ -75,7 +75,7 @@ export const e2eSuite = <E>(
           Effect.forkChild
         )
 
-        yield* Effect.sleep(2000)
+        yield* Fiber.join(fiber)
         assert.lengthOf(users, 5)
 
         // test interrupts
diff --git a/repos/effect/packages/platform/bun/CHANGELOG.md b/repos/effect/packages/platform/bun/CHANGELOG.md
index 0321e591d..e8c70277e 100644
--- a/repos/effect/packages/platform/bun/CHANGELOG.md
+++ b/repos/effect/packages/platform/bun/CHANGELOG.md
@@ -1,5 +1,107 @@
 # @effect/platform-bun
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+  - @effect/platform-node-shared@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`05a6405`](https://github.com/Effect-TS/effect/commit/05a6405d3d729f9487121249435eae810233b949), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+  - @effect/platform-node-shared@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- [#8190](https://github.com/Effect-TS/effect/pull/8190) [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff) Thanks @javascript-unsafe! - Omit response bodies for statuses 204, 205, and 304 in `HttpServerResponse.toWeb` and the Bun/Deno HTTP adapters, preventing invalid Web responses and hung requests. Cancel omitted raw `ReadableStream` bodies, and finalize request resources without starting omitted Effect streams.
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+  - @effect/platform-node-shared@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- [#8185](https://github.com/Effect-TS/effect/pull/8185) [`9266051`](https://github.com/Effect-TS/effect/commit/92660514f78fff4f2fc1f2b6fdfc9366cad1de6e) Thanks @tim-smart! - Fix `BunHttpServer` startup when `hostname` is omitted by explicitly listening on `::`, preserving IPv4 and IPv6 connectivity and avoiding a `ServeError` when parsing Bun's default hostname.
+  
+  Preserve the configured listen address in `BunClusterHttp`, including loopback addresses, when applying the HTTP server hostname default.
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+  - @effect/platform-node-shared@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7477](https://github.com/Effect-TS/effect/pull/7477) [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803) Thanks @candrewlee14! - Allow sockets to use browser, Bun, and Node WebSocket implementations without consumer casts. Platform constructors
+  now support typed opening-handshake headers where available.
+
+- [#7800](https://github.com/Effect-TS/effect/pull/7800) [`d877605`](https://github.com/Effect-TS/effect/commit/d8776058bac7d9497b8654af1aec14ca80de4411) Thanks @kitlangton! - Report Unix socket addresses from Bun HTTP servers.
+
+- [#8036](https://github.com/Effect-TS/effect/pull/8036) [`66e2bec`](https://github.com/Effect-TS/effect/commit/66e2becda49c22c0bb7e102410e1fdba8c144c17) Thanks @nikhilsnayak! - Preserve mapped errors from Bun readable streams.
+
+- [#7772](https://github.com/Effect-TS/effect/pull/7772) [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de) Thanks @tim-smart! - Improve HTTP server throughput by reducing routing, request handling, response
+  construction, and body encoding overhead. Add `Effect.withFiberSucceed` for
+  synchronously computing successful values from the current fiber. Copy pooled
+  byte views by their exact range when exposing `ArrayBuffer` values.
+
+- [#7511](https://github.com/Effect-TS/effect/pull/7511) [`a4bb2aa`](https://github.com/Effect-TS/effect/commit/a4bb2aa22698ea8a98d5172d81305f4f74bd7caa) Thanks @tim-smart! - Add `NodeSocket.makeTls`, `NodeSocket.makeTlsChannel`, and `NodeSocket.layerTls` for TLS client connections.
+  
+  These mirror the existing `makeNet` family but dial `tls.connect`, so they take the full `tls.ConnectionOptions` set:
+  trust anchors (`ca`), client certificates (`cert` / `key`), ALPN protocols, and `servername`. The socket opens once the
+  handshake completes; a failed handshake fails with a `SocketOpenError`.
+
+- [#7512](https://github.com/Effect-TS/effect/pull/7512) [`5664c94`](https://github.com/Effect-TS/effect/commit/5664c941b522a5f318e609b9c45f2eb4c2b92ea1) Thanks @tim-smart! - Add `NodeSocketServer.makeTls` and `NodeSocketServer.layerTls` for TLS socket servers.
+
+- [#7514](https://github.com/Effect-TS/effect/pull/7514) [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb) Thanks @tim-smart! - Add Socket.upgrade, for upgrading tcp sockets using STARTTLS
+
+- [#7525](https://github.com/Effect-TS/effect/pull/7525) [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132) Thanks @fubhy! - Add `ByteSize` module and use it across the ecosystem
+
+- [#8110](https://github.com/Effect-TS/effect/pull/8110) [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0) Thanks @tim-smart! - Prevent precision loss in Node/Bun filesystem operations and `HttpPlatform` file responses.
+
+- [#8148](https://github.com/Effect-TS/effect/pull/8148) [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528) Thanks @tim-smart! - Preserve the response Content-Type when compressing file, raw, stream, and byte-array responses on Node, Bun, Deno, and the web platform, including headers overridden after body construction.
+
+- [#7564](https://github.com/Effect-TS/effect/pull/7564) [`464d0b3`](https://github.com/Effect-TS/effect/commit/464d0b3e5233d08167da370b9ad0f6c92746497b) Thanks @typedrat! - Load Bun's `RedisClient` lazily in `BunRedis`.
+
+- [#7524](https://github.com/Effect-TS/effect/pull/7524) [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6) Thanks @fubhy! - Add `NetAddress` under `effect/unstable/net` for MAC, IP, internet socket, and Unix socket addresses, with checked parsing, schemas, equality, canonical string serialization, and URL formatting. Companion modules `IpInterface` and `IpNetwork` represent IP interfaces and CIDR networks.
+  
+  HTTP and socket servers now expose `NetAddress.SocketAddress`. Replace TCP `hostname` access with `NetAddress.formatIp(address.address)` and use `UnixPathAddress.path` for Unix sockets. URL helpers bracket IPv6 addresses and reject scoped IPv6. Bun and Deno HTTP server layers can now fail with `ServeError` when listener address conversion fails.
+  
+  PostgreSQL `inet` values now use `IpInterface`; `cidr` values use `IpNetwork` and reject addresses with host bits set.
+
+- [#7487](https://github.com/Effect-TS/effect/pull/7487) [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80) Thanks @tim-smart! - Redesign `Socket` around a scoped, pull-based reader with transport backpressure.
+  
+  `Socket` now exposes `reader` and `writer`. Client reader acquisition dials and yields a pull of non-empty batches: one buffer for TCP and one entry per WebSocket frame. TCP applies backpressure while paused; pausable WebSockets pause at `highWaterMark` (64 KiB by default) and resume after draining. Browser WebSockets cannot pause, so they can fail with `SocketReadError` at a configured `highWaterMark`. Writes await native drain signals and batch with `cork` / `uncork` where available.
+  
+  ### Breaking changes
+  
+  - `Socket.run`, `Socket.runString`, and `Socket.runRaw` are removed. Acquire `socket.reader` (or `Socket.readerBytes` / `Socket.readerString`) in a scope and pull in a loop. Code before the first pull replaces `onOpen`.
+  - `Socket.make` now takes `{ reader, writer }`. The writer acquisition is infallible and yields a `Writer` with `write` and `writeAll`; both operations can still fail with `SocketError`.
+  - Every close fails the pull with `SocketError` wrapping `SocketCloseError`. The close-code predicates are removed; use `Effect.retry` around the scoped read loop to reconnect.
+  - `Socket.toChannel` and `Socket.toChannelString` now read from the pull and fail on close. `Socket.toStream` is added for read-only consumption.
+  - `fromWebSocket` drops the `onInitialRun` option; `SendQueueCapacity` is removed.
+  - Accepted server sockets pause immediately. Their reader attaches to the existing connection and cannot reconnect after close.
+
+- [#8035](https://github.com/Effect-TS/effect/pull/8035) [`6f6bd84`](https://github.com/Effect-TS/effect/commit/6f6bd84fe03fbc0d777e8b518635e039b8a1e445) Thanks @nikhilsnayak! - Preserve configured Bun routes when Effect HTTP handlers are installed or restored.
+
+- [#7461](https://github.com/Effect-TS/effect/pull/7461) [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d) Thanks @tim-smart! - Remove the MessagePack encoding and RPC serialization APIs together with the `msgpackr` dependency. Event-log persistence and remote messages now use SchemaBinary, and cluster transports use SchemaBinary unless NDJSON is selected explicitly.
+
+- [#7427](https://github.com/Effect-TS/effect/pull/7427) [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e) Thanks @tim-smart! - Use SchemaBinary as the default RPC serialization for TCP cluster connections, including configurable frame limits.
+  
+  Cluster payloads are encoded with the binary codec on the wire. When a persisted reply cannot be encoded for JSON storage, the defect fallback that storage records is now also the reply delivered to waiting callers, so live replies always match what was persisted.
+  
+  SchemaBinary codecs are memoized by schema identity and wire mode, so per-message codec requests reuse the derived codec instead of rebuilding it.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`2f106a5`](https://github.com/Effect-TS/effect/commit/2f106a524557d5b57a50e29d437cde31f5d73838), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`a4bb2aa`](https://github.com/Effect-TS/effect/commit/a4bb2aa22698ea8a98d5172d81305f4f74bd7caa), [`5664c94`](https://github.com/Effect-TS/effect/commit/5664c941b522a5f318e609b9c45f2eb4c2b92ea1), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`a6ceb98`](https://github.com/Effect-TS/effect/commit/a6ceb98e89cffdb59297764299bdb35728af63f1), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`615c41e`](https://github.com/Effect-TS/effect/commit/615c41e193494b3305dad8a98000ed04e2718469), [`d0a6c5e`](https://github.com/Effect-TS/effect/commit/d0a6c5eee03c1f55748739252cdb04c1df37b844), [`500c60b`](https://github.com/Effect-TS/effect/commit/500c60b3ab502aed3f2764b6791ff71770e7bada), [`163cebd`](https://github.com/Effect-TS/effect/commit/163cebdc19e339e0bbf23035f3fa3e3322043627), [`37cdd69`](https://github.com/Effect-TS/effect/commit/37cdd692adb989da3dff6d65221e5c27fa025ad8), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`0beaf69`](https://github.com/Effect-TS/effect/commit/0beaf69e3c368b8aaa1fa6aa1066272f5c554128), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+  - @effect/platform-node-shared@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/platform/bun/package.json b/repos/effect/packages/platform/bun/package.json
index 6ff932d1d..7aa536f35 100644
--- a/repos/effect/packages/platform/bun/package.json
+++ b/repos/effect/packages/platform/bun/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@effect/platform-bun",
   "type": "module",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "license": "MIT",
   "description": "Platform specific implementations for the Bun runtime",
   "homepage": "https://effect.website",
@@ -69,7 +69,7 @@
     "@effect/platform-node-shared": "workspace:^"
   },
   "devDependencies": {
-    "@types/bun": "^1.4.0",
+    "@types/bun": "^1.4.2",
     "effect": "workspace:^"
   }
 }
diff --git a/repos/effect/packages/platform/bun/src/BunClusterHttp.ts b/repos/effect/packages/platform/bun/src/BunClusterHttp.ts
index 417261dc6..8fbec0b45 100644
--- a/repos/effect/packages/platform/bun/src/BunClusterHttp.ts
+++ b/repos/effect/packages/platform/bun/src/BunClusterHttp.ts
@@ -64,7 +64,7 @@ export const layerHttpServer: Layer.Layer<
   if (Option.isNone(listenAddress)) {
     return yield* Effect.die("BunClusterHttp.layerHttpServer: ShardingConfig.runnerAddress is None")
   }
-  return BunHttpServer.layer(listenAddress.value)
+  return BunHttpServer.layer({ hostname: listenAddress.value.host, port: listenAddress.value.port })
 }).pipe(Layer.unwrap)
 
 /**
diff --git a/repos/effect/packages/platform/bun/src/BunHttpPlatform.ts b/repos/effect/packages/platform/bun/src/BunHttpPlatform.ts
index 905d2c407..418085587 100644
--- a/repos/effect/packages/platform/bun/src/BunHttpPlatform.ts
+++ b/repos/effect/packages/platform/bun/src/BunHttpPlatform.ts
@@ -36,16 +36,20 @@ const make: Effect.Effect<
 > = Platform.make({
   platform: "bun",
   compression,
-  fileResponse(path, status, statusText, headers, start, end, _contentLength) {
+  fileResponse(path, status, statusText, headers, start, end, contentLength) {
     let file = Bun.file(path)
     if (start > 0 || end !== undefined) {
       file = file.slice(start, end)
     }
-    return Response.raw(file, { headers, status, statusText })
+    return Response.raw(file, {
+      headers: { ...headers, "content-length": contentLength.toString() },
+      status,
+      statusText
+    })
   },
   fileWebResponse(file, status, statusText, headers, options) {
-    const start = Number(options?.offset ?? 0)
-    const end = options?.bytesToRead !== undefined ? start + Number(options.bytesToRead) : undefined
+    const start = options?.offset ?? 0
+    const end = options?.bytesToRead !== undefined ? start + options.bytesToRead : undefined
     const body = start > 0 || end !== undefined
       ? (file as File).slice(start, end, file.type)
       : file
diff --git a/repos/effect/packages/platform/bun/src/BunHttpServer.ts b/repos/effect/packages/platform/bun/src/BunHttpServer.ts
index 4b564eb30..e0cfbb47a 100644
--- a/repos/effect/packages/platform/bun/src/BunHttpServer.ts
+++ b/repos/effect/packages/platform/bun/src/BunHttpServer.ts
@@ -28,6 +28,7 @@ import * as Layer from "effect/Layer"
 import * as Option from "effect/Option"
 import type * as Path from "effect/Path"
 import type * as Record from "effect/Record"
+import * as Result from "effect/Result"
 import * as Scheduler from "effect/Scheduler"
 import type * as Schema from "effect/Schema"
 import * as Scope from "effect/Scope"
@@ -45,9 +46,10 @@ import type { HttpPlatform } from "effect/unstable/http/HttpPlatform"
 import * as Server from "effect/unstable/http/HttpServer"
 import * as Error from "effect/unstable/http/HttpServerError"
 import * as ServerRequest from "effect/unstable/http/HttpServerRequest"
-import type * as ServerResponse from "effect/unstable/http/HttpServerResponse"
+import * as ServerResponse from "effect/unstable/http/HttpServerResponse"
 import type * as Multipart from "effect/unstable/http/Multipart"
 import * as UrlParams from "effect/unstable/http/UrlParams"
+import * as NetAddress from "effect/unstable/net/NetAddress"
 import * as Socket from "effect/unstable/socket/Socket"
 import * as Platform from "./BunHttpPlatform.ts"
 import * as BunMultipart from "./BunMultipart.ts"
@@ -115,6 +117,22 @@ export const make = Effect.fnUntraced(
     }
   ) {
     const scope = yield* Effect.scope
+    let listenOptions = options
+    if (!("unix" in options) || options.unix === undefined) {
+      const internetOptions = options as Bun.Serve.HostnamePortServeOptions<WebSocketContext>
+      let hostname = internetOptions.hostname ?? "::"
+      if (Result.isFailure(NetAddress.ipFromString(hostname))) {
+        hostname = yield* Effect.tryPromise({
+          try: async () => {
+            const result = await Bun.dns.lookup(hostname, { socketType: "tcp" })
+            if (result.length === 0) throw new globalThis.Error(`Could not resolve hostname: ${hostname}`)
+            return result[0].address
+          },
+          catch: (cause) => new Error.ServeError({ cause })
+        })
+      }
+      listenOptions = { ...options, hostname }
+    }
     const { compressionThreshold = MIN_COMPRESSIBLE_SIZE, ...websocket } = options.websocket ?? {}
     const handlerStack: Array<(request: Request, server: BunServer<WebSocketContext>) => Response | Promise<Response>> =
       [
@@ -123,7 +141,7 @@ export const make = Effect.fnUntraced(
         }
       ]
     const server = Bun.serve<WebSocketContext, R>({
-      ...options as ServeOptions<R>,
+      ...listenOptions as ServeOptions<R>,
       fetch: handlerStack[0],
       websocket: {
         ...websocket,
@@ -154,8 +172,14 @@ export const make = Effect.fnUntraced(
 
     yield* Scope.addFinalizer(scope, shutdown)
 
+    const address = "unix" in options && options.unix !== undefined
+      ? NetAddress.unixPathAddress(options.unix)
+      : yield* Effect.fromResult(NetAddress.inetAddressFromIpString(server.hostname!, server.port!)).pipe(
+        Effect.mapError((cause) => new Error.ServeError({ cause }))
+      )
+
     return Server.make({
-      address: { _tag: "TcpAddress", port: server.port!, hostname: server.hostname! },
+      address,
       serve: Effect.fnUntraced(function*(httpApp, middleware) {
         const parent = yield* Effect.fiber
         const services = parent.context
@@ -184,11 +208,17 @@ export const make = Effect.fnUntraced(
         yield* Scope.addFinalizerExit(serveScope, () => {
           const index = handlerStack.indexOf(handler)
           if (index !== -1) handlerStack.splice(index, 1)
-          server.reload({ fetch: handlerStack[handlerStack.length - 1] })
+          server.reload({
+            fetch: handlerStack[handlerStack.length - 1],
+            ...(options.routes === undefined ? undefined : { routes: options.routes })
+          })
           return handlerStack.length === 1 ? preemptiveShutdown : Effect.void
         })
         handlerStack.push(handler)
-        server.reload({ fetch: handler })
+        server.reload({
+          fetch: handler,
+          ...(options.routes === undefined ? undefined : { routes: options.routes })
+        })
       })
     })
   }
@@ -202,6 +232,9 @@ const makeResponse = (
   context: Context.Context<never>,
   scope: Scope.Scope
 ): Response => {
+  if (ServerResponse.omitsBody(response, request.method === "HEAD")) {
+    return ServerResponse.toWeb(response, { withoutBody: true })
+  }
   const fields: {
     headers: globalThis.Headers
     status?: number
@@ -221,16 +254,15 @@ const makeResponse = (
     fields.statusText = response.statusText
   }
 
-  if (request.method === "HEAD") {
-    return new Response(undefined, fields)
-  }
   response = HttpEffect.scopeTransferToStream(response)
   const body = response.body
   switch (body._tag) {
     case "Empty": {
       return new Response(undefined, fields)
     }
-    case "Uint8Array":
+    case "Uint8Array": {
+      return new Response(body.text ?? body.body as any, fields)
+    }
     case "Raw": {
       if (body.body instanceof Response) {
         for (const [key, value] of fields.headers.entries()) {
@@ -270,7 +302,7 @@ export const layerServer: <R extends string>(
     readonly gracefulShutdownTimeout?: Duration.Input | undefined
     readonly websocket?: WebSocketOptions | undefined
   }
-) => Layer.Layer<Server.HttpServer> = flow(make, Layer.effect(Server.HttpServer)) as any
+) => Layer.Layer<Server.HttpServer, Error.ServeError> = flow(make, Layer.effect(Server.HttpServer)) as any
 
 /**
  * Layer that provides Bun HTTP support services: `HttpPlatform`, weak ETag generation, and `BunServices`.
@@ -304,7 +336,8 @@ export const layer = <R extends string>(
   | Server.HttpServer
   | HttpPlatform
   | Etag.Generator
-  | BunServices.BunServices
+  | BunServices.BunServices,
+  Error.ServeError
 > => Layer.mergeAll(layerServer(options), layerHttpServices)
 
 /**
@@ -319,7 +352,7 @@ export const layerTest: Layer.Layer<
   Layer.provide(FetchHttpClient.layer.pipe(
     Layer.provide(Layer.succeed(FetchHttpClient.RequestInit)({ keepalive: false }))
   )),
-  Layer.provideMerge(layer({ port: 0 }))
+  Layer.provideMerge(Layer.orDie(layer({ hostname: "127.0.0.1", port: 0 })))
 )
 
 /**
@@ -338,7 +371,7 @@ export const layerConfig = <R extends string>(
   >
 ): Layer.Layer<
   Server.HttpServer | HttpPlatform | FileSystem.FileSystem | Etag.Generator | Path.Path,
-  ConfigError
+  ConfigError | Error.ServeError
 > =>
   Layer.mergeAll(
     Layer.effect(Server.HttpServer)(Effect.flatMap(Config.unwrap(options), make)),
diff --git a/repos/effect/packages/platform/bun/src/BunRedis.ts b/repos/effect/packages/platform/bun/src/BunRedis.ts
index 2666642cd..1dab99f83 100644
--- a/repos/effect/packages/platform/bun/src/BunRedis.ts
+++ b/repos/effect/packages/platform/bun/src/BunRedis.ts
@@ -9,7 +9,7 @@
  *
  * @since 4.0.0
  */
-import { RedisClient, type RedisOptions } from "bun"
+import type { RedisClient, RedisOptions } from "bun"
 import * as Config from "effect/Config"
 import * as Context from "effect/Context"
 import * as Deferred from "effect/Deferred"
@@ -35,6 +35,7 @@ const make = Effect.fnUntraced(function*(
     readonly url?: string
   } & RedisOptions
 ) {
+  const { RedisClient } = yield* Effect.promise(() => import("bun"))
   const scope = yield* Effect.scope
   yield* Scope.addFinalizer(scope, Effect.sync(() => client.close()))
   const client = new RedisClient(options?.url, options)
diff --git a/repos/effect/packages/platform/bun/src/BunStream.ts b/repos/effect/packages/platform/bun/src/BunStream.ts
index ee43ffceb..1629a5bc5 100644
--- a/repos/effect/packages/platform/bun/src/BunStream.ts
+++ b/repos/effect/packages/platform/bun/src/BunStream.ts
@@ -13,7 +13,7 @@ import * as Arr from "effect/Array"
 import * as Cause from "effect/Cause"
 import * as Channel from "effect/Channel"
 import * as Effect from "effect/Effect"
-import type { LazyArg } from "effect/Function"
+import { constVoid, type LazyArg } from "effect/Function"
 import type * as Pull from "effect/Pull"
 import * as Scope from "effect/Scope"
 import * as Stream from "effect/Stream"
@@ -41,10 +41,19 @@ export const fromReadableStream = <A, E>(
     const reader = options.evaluate().getReader()
     yield* Scope.addFinalizer(
       scope,
-      options.releaseLockOnEnd ? Effect.sync(() => reader.releaseLock()) : Effect.promise(() => reader.cancel())
+      options.releaseLockOnEnd
+        ? Effect.sync(() => reader.releaseLock())
+        : Effect.promise(() => reader.cancel().catch(constVoid))
     )
     function readMany(): Pull.Pull<Arr.NonEmptyReadonlyArray<A>, E> {
-      const result = reader.readMany()
+      let result:
+        | Bun.ReadableStreamDefaultReadManyResult<A>
+        | Promise<Bun.ReadableStreamDefaultReadManyResult<A>>
+      try {
+        result = reader.readMany()
+      } catch (error) {
+        return Effect.fail(options.onError(error))
+      }
       if ("then" in result) {
         return Effect.callback<Arr.NonEmptyReadonlyArray<A>, E | Cause.Done>((resume) => {
           result.then((_) => resume(handleResult(_)), (e) => resume(Effect.fail(options.onError(e))))
diff --git a/repos/effect/packages/platform/bun/test/BunClusterHttp.test.ts b/repos/effect/packages/platform/bun/test/BunClusterHttp.test.ts
new file mode 100644
index 000000000..f6a04358c
--- /dev/null
+++ b/repos/effect/packages/platform/bun/test/BunClusterHttp.test.ts
@@ -0,0 +1,45 @@
+import * as BunClusterHttp from "@effect/platform-bun/BunClusterHttp"
+import { assert, describe, it } from "@effect/vitest"
+import * as ConfigProvider from "effect/ConfigProvider"
+import * as Effect from "effect/Effect"
+import * as ShardingConfig from "effect/unstable/cluster/ShardingConfig"
+import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient"
+import * as HttpServer from "effect/unstable/http/HttpServer"
+import * as HttpServerResponse from "effect/unstable/http/HttpServerResponse"
+import * as NetAddress from "effect/unstable/net/NetAddress"
+
+describe("BunClusterHttp", () => {
+  for (
+    const [name, values] of [
+      ["listen address overrides the runner address", {
+        host: "::1",
+        port: "0",
+        listenHost: "127.0.0.1",
+        listenPort: "0"
+      }],
+      ["runner address is used when the listen address is omitted", { host: "127.0.0.1", port: "0" }]
+    ] as const
+  ) {
+    it.effect(name, () =>
+      Effect.gen(function*() {
+        const config = yield* ShardingConfig.config.parse(ConfigProvider.fromUnknown(values))
+        yield* Effect.gen(function*() {
+          const server = yield* HttpServer.HttpServer
+          if (server.address._tag !== "InetAddressV4") {
+            return assert.fail(`expected InetAddressV4 at 127.0.0.1, got ${server.address}`)
+          }
+          assert.strictEqual(NetAddress.formatIp(server.address.address), "127.0.0.1")
+          assert.isAbove(server.address.port, 0)
+
+          yield* server.serve(Effect.succeed(HttpServerResponse.text("cluster loopback")))
+          const client = yield* HttpServer.makeTestClient.pipe(Effect.provide(FetchHttpClient.layer))
+          const response = yield* client.get("/")
+          assert.strictEqual(response.status, 200)
+          assert.strictEqual(yield* response.text, "cluster loopback")
+        }).pipe(
+          Effect.provide(BunClusterHttp.layerHttpServer),
+          Effect.provide(ShardingConfig.layer(config))
+        )
+      }))
+  }
+})
diff --git a/repos/effect/packages/platform/bun/test/BunHttpPlatform.test.ts b/repos/effect/packages/platform/bun/test/BunHttpPlatform.test.ts
index 9f9656fa8..2828cf8bb 100644
--- a/repos/effect/packages/platform/bun/test/BunHttpPlatform.test.ts
+++ b/repos/effect/packages/platform/bun/test/BunHttpPlatform.test.ts
@@ -1,15 +1,87 @@
+import type * as BunFileSystem from "@effect/platform-bun/BunFileSystem"
 import * as BunHttpPlatform from "@effect/platform-bun/BunHttpPlatform"
 import { assert, describe, it } from "@effect/vitest"
+import * as ByteSize from "effect/ByteSize"
 import * as Effect from "effect/Effect"
 import type * as HttpBody from "effect/unstable/http/HttpBody"
 import * as HttpPlatform from "effect/unstable/http/HttpPlatform"
+import * as HttpServerResponse from "effect/unstable/http/HttpServerResponse"
+import { afterEach, beforeEach, vi } from "vitest"
 
 const readBody = (body: HttpBody.HttpBody) => {
   assert.strictEqual(body._tag, "Raw")
   return Effect.promise(() => new Response((body as HttpBody.Raw).body as BodyInit).text())
 }
 
-describe("BunHttpPlatform", () => {
+// Bun sets Content-Length when sending the raw file, so inspect the HTTP response.
+const readResponse = (response: HttpServerResponse.HttpServerResponse) =>
+  Effect.acquireUseRelease(
+    Effect.sync(() =>
+      Bun.serve({
+        hostname: "127.0.0.1",
+        port: 0,
+        fetch: () => HttpServerResponse.toWeb(response)
+      })
+    ),
+    (server) =>
+      Effect.promise(async (signal) => {
+        const response = await fetch(server.url, { signal })
+        return { contentLength: response.headers.get("content-length"), body: await response.text() }
+      }),
+    (server) =>
+      Effect.promise(async () => {
+        await server.stop(true)
+      })
+  )
+
+describe("BunHttpPlatform", { concurrent: false }, () => {
+  for (
+    const { name, offset, bytesToRead, expected } of [
+      { name: "clamps bytesToRead beyond EOF", offset: 1, bytesToRead: 10, expected: "bcd" },
+      { name: "returns an empty body at EOF", offset: 4, bytesToRead: undefined, expected: "" },
+      { name: "returns an empty body past EOF", offset: 9, bytesToRead: undefined, expected: "" },
+      { name: "clamps bytesToRead at EOF", offset: 4, bytesToRead: 10, expected: "" },
+      { name: "clamps bytesToRead past EOF", offset: 9, bytesToRead: 10, expected: "" }
+    ]
+  ) {
+    it.effect(`fileWebResponse ${name}`, () =>
+      Effect.gen(function*() {
+        const platform = yield* HttpPlatform.HttpPlatform
+        const file = new File(["abcd"], "file.txt", { type: "text/plain", lastModified: 0 })
+        const response = yield* platform.fileWebResponse(file, { offset, bytesToRead })
+        assert.deepStrictEqual(
+          yield* readResponse(response),
+          { contentLength: String(expected.length), body: expected }
+        )
+      }).pipe(Effect.provide(BunHttpPlatform.layer)))
+  }
+
+  for (
+    const { name, offsetFromEnd, bytesToRead } of [
+      { name: "clamps bytesToRead beyond EOF", offsetFromEnd: -5, bytesToRead: 100 },
+      { name: "returns an empty body at EOF", offsetFromEnd: 0, bytesToRead: undefined },
+      { name: "returns an empty body past EOF", offsetFromEnd: 5, bytesToRead: undefined },
+      { name: "clamps bytesToRead at EOF", offsetFromEnd: 0, bytesToRead: 100 },
+      { name: "clamps bytesToRead past EOF", offsetFromEnd: 5, bytesToRead: 100 }
+    ]
+  ) {
+    it.effect(`fileResponse ${name}`, () =>
+      Effect.gen(function*() {
+        const platform = yield* HttpPlatform.HttpPlatform
+        const file = Bun.file(import.meta.filename)
+        const contents = yield* Effect.promise(() => file.text())
+        const expected = offsetFromEnd < 0 ? contents.slice(offsetFromEnd) : ""
+        const response = yield* platform.fileResponse(import.meta.filename, {
+          offset: ByteSize.bytes(file.size + offsetFromEnd),
+          bytesToRead: bytesToRead === undefined ? undefined : ByteSize.bytes(bytesToRead)
+        })
+        assert.deepStrictEqual(
+          yield* readResponse(response),
+          { contentLength: String(expected.length), body: expected }
+        )
+      }).pipe(Effect.provide(BunHttpPlatform.layer)))
+  }
+
   it.effect("fileWebResponse honors offset and bytesToRead including zero", () =>
     Effect.gen(function*() {
       const platform = yield* HttpPlatform.HttpPlatform
@@ -22,4 +94,66 @@ describe("BunHttpPlatform", () => {
         { sliced: "bc", empty: "" }
       )
     }).pipe(Effect.provide(BunHttpPlatform.layer)))
+
+  it.effect("fileResponse supports exact and empty ranges", () =>
+    Effect.gen(function*() {
+      const platform = yield* HttpPlatform.HttpPlatform
+      const exact = yield* platform.fileResponse(import.meta.filename, {
+        bytesToRead: ByteSize.bytes(6)
+      })
+      const empty = yield* platform.fileResponse(import.meta.filename, {
+        offset: ByteSize.bytes(1),
+        bytesToRead: ByteSize.zero
+      })
+
+      assert.deepStrictEqual(
+        { exact: yield* readBody(exact.body), empty: yield* readBody(empty.body) },
+        { exact: "import", empty: "" }
+      )
+    }).pipe(Effect.provide(BunHttpPlatform.layer)))
+})
+
+const precision = vi.hoisted(() => ({ enabled: false }))
+
+vi.mock("@effect/platform-bun/BunFileSystem", async (importOriginal) => {
+  const original = await importOriginal<typeof BunFileSystem>()
+  const { Layer, Effect } = await import("effect")
+  const { fileSystemLayer } = await import("../../node-shared/test/HttpPlatform.test-utils.ts")
+  return { layer: Layer.unwrap(Effect.sync(() => precision.enabled ? fileSystemLayer : original.layer)) }
+})
+
+describe("BunHttpPlatform precision", { concurrent: false }, () => {
+  const slice = vi.fn((_start?: number, _end?: number) => new Blob([]))
+
+  beforeEach(() => {
+    precision.enabled = true
+    slice.mockClear()
+    vi.spyOn(Bun, "file").mockReturnValue({ slice } as unknown as ReturnType<typeof Bun.file>)
+  })
+  afterEach(() => {
+    precision.enabled = false
+    vi.restoreAllMocks()
+  })
+
+  it.effect("passes a safe range to the runtime with the correct end bound", () =>
+    Effect.gen(function*() {
+      const maxSafe = Number.MAX_SAFE_INTEGER
+      const platform = yield* HttpPlatform.HttpPlatform
+      yield* platform.fileResponse("precision.bin", { offset: maxSafe - 1, bytesToRead: 1 })
+      assert.deepStrictEqual(slice.mock.calls, [[maxSafe - 1, maxSafe]])
+    }).pipe(Effect.provide(BunHttpPlatform.layer)))
+
+  it.effect("serves a whole oversized file without slicing it", () =>
+    Effect.gen(function*() {
+      const platform = yield* HttpPlatform.HttpPlatform
+      const response = yield* platform.fileResponse("precision.bin")
+      assert.strictEqual(response.status, 200)
+      assert.strictEqual(response.headers["content-length"], "9007199254740993")
+      assert.strictEqual(response.body._tag, "Raw")
+      if (response.body._tag === "Raw") {
+        assert.strictEqual(response.body.body, vi.mocked(Bun.file).mock.results[0].value)
+      }
+      assert.strictEqual(vi.mocked(Bun.file).mock.calls.length, 1)
+      assert.deepStrictEqual(slice.mock.calls, [])
+    }).pipe(Effect.provide(BunHttpPlatform.layer)))
 })
diff --git a/repos/effect/packages/platform/bun/test/BunHttpServer.test.ts b/repos/effect/packages/platform/bun/test/BunHttpServer.test.ts
index 3ba81e530..eb7072f3c 100644
--- a/repos/effect/packages/platform/bun/test/BunHttpServer.test.ts
+++ b/repos/effect/packages/platform/bun/test/BunHttpServer.test.ts
@@ -5,10 +5,17 @@ import * as Effect from "effect/Effect"
 import * as Exit from "effect/Exit"
 import * as Fiber from "effect/Fiber"
 import * as Scope from "effect/Scope"
+import * as Stream from "effect/Stream"
+import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient"
+import * as HttpClient from "effect/unstable/http/HttpClient"
 import * as HttpServer from "effect/unstable/http/HttpServer"
 import * as HttpServerRequest from "effect/unstable/http/HttpServerRequest"
 import * as HttpServerResponse from "effect/unstable/http/HttpServerResponse"
+import * as NetAddress from "effect/unstable/net/NetAddress"
+import { mkdtemp, rm } from "node:fs/promises"
 import * as Net from "node:net"
+import { tmpdir } from "node:os"
+import { join } from "node:path"
 
 const fetchText = (url: string) =>
   Effect.promise(() => fetch(url, { headers: { connection: "close" } }).then((response) => response.text()))
@@ -108,6 +115,137 @@ const makeWebSocketServer = Effect.fnUntraced(function*(payload: string, compres
 })
 
 describe("BunHttpServer", () => {
+  describe("body omission", () => {
+    for (const status of [204, 205, 304]) {
+      for (const bodyKind of ["text", "stream"]) {
+        it.live(`omits ${bodyKind} bodies for status ${status}`, () =>
+          Effect.gen(function*() {
+            let finalized = false
+            let streamStarted = false
+            yield* HttpServer.serveEffect(Effect.gen(function*() {
+              yield* Effect.addFinalizer(() =>
+                Effect.sync(() => {
+                  finalized = true
+                })
+              )
+              const options = { status, contentType: "text/plain", contentLength: 4 }
+              return bodyKind === "text"
+                ? HttpServerResponse.text("body", options)
+                : HttpServerResponse.stream(
+                  Stream.fromEffect(Effect.sync(() => {
+                    streamStarted = true
+                    return new TextEncoder().encode("body")
+                  })),
+                  options
+                )
+            }))
+            const response = yield* HttpClient.get("/")
+            assert.strictEqual(response.status, status)
+            assert.strictEqual(yield* response.text, "")
+            assert.strictEqual(streamStarted, false)
+            assert.strictEqual(finalized, true)
+            if (status === 304) {
+              assert.strictEqual(response.headers["content-type"], "text/plain")
+            }
+          }).pipe(
+            Effect.timeout("2 seconds"),
+            Effect.provide(BunHttpServer.layerTest)
+          ), 5000)
+      }
+    }
+
+    for (const [method, status] of [["HEAD", 200], ["GET", 204], ["GET", 205], ["GET", 304]] as const) {
+      it.live(`cancels raw streams for ${method} status ${status}`, () =>
+        Effect.gen(function*() {
+          let cancelled = false
+          const body = new ReadableStream<Uint8Array>({
+            pull(controller) {
+              controller.enqueue(new TextEncoder().encode("body"))
+              controller.close()
+            },
+            cancel() {
+              cancelled = true
+            }
+          }, { highWaterMark: 0 })
+          yield* Effect.addFinalizer(() => Effect.ignoreCause(Effect.promise(() => body.cancel())))
+          yield* HttpServer.serveEffect(Effect.succeed(HttpServerResponse.raw(body, {
+            status,
+            contentType: "text/plain",
+            contentLength: 4
+          })))
+          const response = yield* (method === "HEAD" ? HttpClient.head("/") : HttpClient.get("/"))
+          assert.strictEqual(response.status, status)
+          assert.strictEqual(yield* response.text, "")
+          assert.strictEqual(cancelled, true)
+          if (method === "HEAD") {
+            assert.strictEqual(response.headers["content-length"], "4")
+          }
+          if (method === "HEAD" || status === 304) {
+            assert.strictEqual(response.headers["content-type"], "text/plain")
+          }
+        }).pipe(
+          Effect.timeout("2 seconds"),
+          Effect.provide(BunHttpServer.layerTest)
+        ), 5000)
+    }
+  })
+
+  for (
+    const [name, options, expectedTag, expectedIp] of [
+      ["omitted hostname", { port: 0 }, "InetAddressV6", "::"],
+      ["undefined Unix path and omitted hostname", { port: 0, unix: undefined }, "InetAddressV6", "::"],
+      ["explicit wildcard hostname", { port: 0, hostname: "0.0.0.0" }, "InetAddressV4", "0.0.0.0"]
+    ] as const
+  ) {
+    it.effect(`starts a layer with ${name}`, () =>
+      Effect.gen(function*() {
+        const server = yield* HttpServer.HttpServer
+        if (server.address._tag !== expectedTag) {
+          return assert.fail(`expected ${expectedTag}, got ${server.address._tag}`)
+        }
+        assert.strictEqual(NetAddress.formatIp(server.address.address), expectedIp)
+        assert.isAbove(server.address.port, 0)
+
+        yield* server.serve(Effect.succeed(HttpServerResponse.text("default hostname")))
+        const client = yield* HttpServer.makeTestClient.pipe(Effect.provide(FetchHttpClient.layer))
+        const response = yield* client.get("/")
+        assert.strictEqual(response.status, 200)
+        assert.strictEqual(yield* response.text, "default hostname")
+      }).pipe(Effect.provide(BunHttpServer.layer(options))))
+  }
+
+  it.effect("treats an undefined Unix path as a TCP listener", () =>
+    Effect.gen(function*() {
+      for (const hostname of ["localhost", "127.0.0.1"]) {
+        const server = yield* BunHttpServer.make({ unix: undefined, hostname, port: 0 })
+        assert.isTrue(server.address._tag === "InetAddressV4" || server.address._tag === "InetAddressV6")
+        yield* server.serve(Effect.succeed(HttpServerResponse.text("tcp")))
+        const client = yield* HttpServer.makeTestClient.pipe(
+          Effect.provideService(HttpServer.HttpServer, server),
+          Effect.provide(FetchHttpClient.layer)
+        )
+        const response = yield* client.get("/")
+        assert.strictEqual(yield* response.text, "tcp")
+      }
+    }))
+
+  it.effect("resolves hostnames and formats Unix socket addresses", () =>
+    Effect.gen(function*() {
+      const server = yield* BunHttpServer.make({ hostname: "localhost", port: 0 })
+      assert.isTrue(server.address._tag === "InetAddressV4" || server.address._tag === "InetAddressV6")
+
+      const directory = yield* Effect.acquireRelease(
+        Effect.promise(() => mkdtemp(join(tmpdir(), "bun-http-"))),
+        (directory) => Effect.promise(() => rm(directory, { recursive: true, force: true }))
+      )
+      const path = join(directory, "server.sock")
+      const unixServer = yield* BunHttpServer.make({ unix: path })
+
+      assert.strictEqual(unixServer.address._tag, "UnixPathAddress")
+      assert.strictEqual(unixServer.address._tag === "UnixPathAddress" ? unixServer.address.path : undefined, path)
+      assert.strictEqual(NetAddress.formatUrlUnsafe(unixServer.address), `unix://${path}`)
+    }))
+
   it.effect("closing an older serve scope keeps the newer handler active", () =>
     Effect.gen(function*() {
       const ownerScope = yield* Effect.scope
@@ -120,7 +258,7 @@ describe("BunHttpServer", () => {
 
       yield* server.serve(Effect.succeed(HttpServerResponse.text("first"))).pipe(Scope.provide(firstScope))
       yield* server.serve(Effect.succeed(HttpServerResponse.text("second"))).pipe(Scope.provide(secondScope))
-      const url = HttpServer.formatAddress(server.address)
+      const url = NetAddress.formatUrlUnsafe(server.address)
 
       assert.strictEqual(yield* fetchText(url), "second")
       yield* Scope.close(firstScope, Exit.void)
@@ -139,18 +277,43 @@ describe("BunHttpServer", () => {
 
       yield* server.serve(Effect.succeed(HttpServerResponse.text("first"))).pipe(Scope.provide(firstScope))
       yield* server.serve(Effect.succeed(HttpServerResponse.text("second"))).pipe(Scope.provide(secondScope))
-      const url = HttpServer.formatAddress(server.address)
+      const url = NetAddress.formatUrlUnsafe(server.address)
 
       assert.strictEqual(yield* fetchText(url), "second")
       yield* Scope.close(secondScope, Exit.void)
       assert.strictEqual(yield* fetchText(url), "first")
     }))
 
+  it.effect("preserves configured routes while changing handlers", () =>
+    Effect.gen(function*() {
+      const ownerScope = yield* Effect.scope
+      const server = yield* BunHttpServer.make({
+        hostname: "127.0.0.1",
+        port: 0,
+        routes: { "/static": new Response("static") }
+      })
+      const firstScope = yield* Scope.fork(ownerScope)
+      const secondScope = yield* Scope.fork(ownerScope)
+      const url = NetAddress.formatUrlUnsafe(server.address)
+
+      yield* server.serve(Effect.succeed(HttpServerResponse.text("first"))).pipe(Scope.provide(firstScope))
+      assert.strictEqual(yield* fetchText(`${url}/static`), "static")
+      assert.strictEqual(yield* fetchText(`${url}/fallback`), "first")
+
+      yield* server.serve(Effect.succeed(HttpServerResponse.text("second"))).pipe(Scope.provide(secondScope))
+      assert.strictEqual(yield* fetchText(`${url}/static`), "static")
+      assert.strictEqual(yield* fetchText(`${url}/fallback`), "second")
+
+      yield* Scope.close(secondScope, Exit.void)
+      assert.strictEqual(yield* fetchText(`${url}/static`), "static")
+      assert.strictEqual(yield* fetchText(`${url}/fallback`), "first")
+    }))
+
   it.effect("compresses outgoing WebSocket messages when per-message deflate is negotiated", () =>
     Effect.gen(function*() {
       const payload = "a".repeat(4_096)
       const server = yield* makeWebSocketServer(payload)
-      const port = (server.address as HttpServer.TcpAddress).port
+      const port = (server.address as NetAddress.InetAddress).port
       const { frames, headers } = yield* readWebSocketFrames(port, true)
 
       assert.match(headers, /^sec-websocket-extensions:.*permessage-deflate/im)
@@ -163,7 +326,7 @@ describe("BunHttpServer", () => {
     Effect.gen(function*() {
       const payload = "a".repeat(64)
       const server = yield* makeWebSocketServer(payload)
-      const port = (server.address as HttpServer.TcpAddress).port
+      const port = (server.address as NetAddress.InetAddress).port
       const { frames, headers } = yield* readWebSocketFrames(port, true)
 
       assert.match(headers, /^sec-websocket-extensions:.*permessage-deflate/im)
@@ -176,7 +339,7 @@ describe("BunHttpServer", () => {
     Effect.gen(function*() {
       const payload = "a".repeat(64)
       const server = yield* makeWebSocketServer(payload, 32)
-      const port = (server.address as HttpServer.TcpAddress).port
+      const port = (server.address as NetAddress.InetAddress).port
       const { frames } = yield* readWebSocketFrames(port, true)
 
       assert.deepStrictEqual(frames.map((frame) => frame.opcode), [1, 2])
@@ -188,7 +351,7 @@ describe("BunHttpServer", () => {
     Effect.gen(function*() {
       const payload = "a".repeat(4_096)
       const server = yield* makeWebSocketServer(payload)
-      const port = (server.address as HttpServer.TcpAddress).port
+      const port = (server.address as NetAddress.InetAddress).port
       const { frames, headers } = yield* readWebSocketFrames(port, false)
 
       assert.notMatch(headers, /^sec-websocket-extensions:.*permessage-deflate/im)
@@ -229,7 +392,7 @@ describe("BunHttpServer", () => {
         return HttpServerResponse.empty()
       }))
 
-      const port = (server.address as HttpServer.TcpAddress).port
+      const port = (server.address as NetAddress.InetAddress).port
       yield* readWebSocketFrames(port, false)
       const failed = yield* Deferred.await(secondReaderFailed)
       assert.isTrue(failed)
diff --git a/repos/effect/packages/platform/bun/test/BunMultipart.test.ts b/repos/effect/packages/platform/bun/test/BunMultipart.test.ts
new file mode 100644
index 000000000..6519381d9
--- /dev/null
+++ b/repos/effect/packages/platform/bun/test/BunMultipart.test.ts
@@ -0,0 +1,48 @@
+import * as BunMultipart from "@effect/platform-bun/BunMultipart"
+import { describe, it } from "@effect/vitest"
+import { assertTrue, strictEqual } from "@effect/vitest/utils"
+import { Effect, Stream } from "effect"
+
+describe("BunMultipart", () => {
+  it.live("propagates a request body read error while consuming an active file", () =>
+    Effect.gen(function*() {
+      const cause = new Error("body-read-failed")
+      const body = new ReadableStream<Uint8Array>({
+        start(controller) {
+          controller.enqueue(new TextEncoder().encode(
+            "--b\r\nContent-Disposition: form-data; name=\"file\"; filename=\"a.txt\"\r\n\r\nhello"
+          ))
+        },
+        pull(controller) {
+          controller.error(cause)
+        }
+      }, {
+        // Delay the error until the file bytes are consumed.
+        highWaterMark: 0
+      })
+      const request = new Request("http://localhost/upload", {
+        method: "POST",
+        headers: { "content-type": "multipart/form-data; boundary=b" },
+        body
+      })
+      let bytesRead = 0
+
+      const error = yield* BunMultipart.stream(request).pipe(
+        Stream.runForEach((part) =>
+          part._tag === "File"
+            ? Stream.runForEach(part.content, (chunk) =>
+              Effect.sync(() => {
+                bytesRead += chunk.length
+              }))
+            : Effect.die("expected file")
+        ),
+        Effect.timeout("1 second"),
+        Effect.flip
+      )
+
+      strictEqual(bytesRead, 5)
+      assertTrue(error._tag === "MultipartError")
+      strictEqual(error.reason._tag, "InternalError")
+      strictEqual(error.reason.cause, cause)
+    }))
+})
diff --git a/repos/effect/packages/platform/bun/test/BunStream.test.ts b/repos/effect/packages/platform/bun/test/BunStream.test.ts
new file mode 100644
index 000000000..573bf4a16
--- /dev/null
+++ b/repos/effect/packages/platform/bun/test/BunStream.test.ts
@@ -0,0 +1,27 @@
+import * as BunStream from "@effect/platform-bun/BunStream"
+import { assert, describe, it } from "@effect/vitest"
+import * as Cause from "effect/Cause"
+import * as Effect from "effect/Effect"
+import * as Exit from "effect/Exit"
+import * as Stream from "effect/Stream"
+
+describe("BunStream", () => {
+  it.effect("preserves mapped failures from errored readable streams", () =>
+    Effect.gen(function*() {
+      const exit = yield* BunStream.fromReadableStream({
+        evaluate: () =>
+          new ReadableStream<number>({
+            start(controller) {
+              controller.error(new Error("boom"))
+            }
+          }),
+        onError: (error) => new Error(`mapped: ${(error as Error).message}`)
+      }).pipe(Stream.runDrain, Effect.exit)
+
+      assert.isTrue(Exit.isFailure(exit))
+      if (Exit.isFailure(exit)) {
+        assert.isTrue(exit.cause.reasons.every(Cause.isFailReason))
+        assert.deepStrictEqual(Cause.squash(exit.cause), new Error("mapped: boom"))
+      }
+    }))
+})
diff --git a/repos/effect/packages/platform/deno/CHANGELOG.md b/repos/effect/packages/platform/deno/CHANGELOG.md
index c33920dfc..2caeb5208 100644
--- a/repos/effect/packages/platform/deno/CHANGELOG.md
+++ b/repos/effect/packages/platform/deno/CHANGELOG.md
@@ -1,5 +1,102 @@
 # @effect/platform-deno
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+  - @effect/platform-node-shared@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- [#8254](https://github.com/Effect-TS/effect/pull/8254) [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a) Thanks @tim-smart! - Fix file response content types: honor the `contentType` option and preserve explicit headers, including MIME types set by `HttpStaticServer`. The default `HttpPlatform.layer` now infers missing content types from file extensions.
+  
+  Web file responses on the default, Node, and Deno platforms prefer explicit content types, then nonempty `File.type`, then the file extension.
+  
+  Removed the unused `contentLength` option from `HttpServerResponse.file`; lengths are calculated from the file and requested range.
+
+- [#8225](https://github.com/Effect-TS/effect/pull/8225) [`8abae87`](https://github.com/Effect-TS/effect/commit/8abae870f901540fe7e1ec461aef755558a3fe69) Thanks @tim-smart! - Update Rolldown, the Deno Redis driver, Cloudflare Workers types, and MySQL dependencies to their latest releases.
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`05a6405`](https://github.com/Effect-TS/effect/commit/05a6405d3d729f9487121249435eae810233b949), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+  - @effect/platform-node-shared@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- [#8190](https://github.com/Effect-TS/effect/pull/8190) [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff) Thanks @javascript-unsafe! - Omit response bodies for statuses 204, 205, and 304 in `HttpServerResponse.toWeb` and the Bun/Deno HTTP adapters, preventing invalid Web responses and hung requests. Cancel omitted raw `ReadableStream` bodies, and finalize request resources without starting omitted Effect streams.
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+  - @effect/platform-node-shared@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+  - @effect/platform-node-shared@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7833](https://github.com/Effect-TS/effect/pull/7833) [`832c1d8`](https://github.com/Effect-TS/effect/commit/832c1d8e2118a811e57bd60a5e0c7ee4d29bad1c) Thanks @kitlangton! - Decode percent-encoded Redis URL authority credentials before authentication.
+
+- [#7943](https://github.com/Effect-TS/effect/pull/7943) [`862ba71`](https://github.com/Effect-TS/effect/commit/862ba71de074b0fae5c0b35916643f57b0216e9b) Thanks @kitlangton! - Fix `FileSystem.writeFile` on Deno to preserve permissions when writing an existing file with an explicit mode.
+
+- [#7514](https://github.com/Effect-TS/effect/pull/7514) [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb) Thanks @tim-smart! - Add Socket.upgrade, for upgrading tcp sockets using STARTTLS
+
+- [#7514](https://github.com/Effect-TS/effect/pull/7514) [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb) Thanks @tim-smart! - Use the node-shared socket server on Deno so accepted TCP connections support reader-scoped server TLS upgrades.
+  
+  ### Breaking changes
+  
+  `DenoSocketServer.make` and `layer` now accept Node listen options. Use `host` instead of `hostname` for TCP and
+  `{ path }` instead of `{ transport: "unix", path }` for Unix sockets. Deno 2.8.3 or newer is now required.
+
+- [#7525](https://github.com/Effect-TS/effect/pull/7525) [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132) Thanks @fubhy! - Add `ByteSize` module and use it across the ecosystem
+
+- [#8110](https://github.com/Effect-TS/effect/pull/8110) [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0) Thanks @tim-smart! - Prevent precision loss in Node/Bun filesystem operations and `HttpPlatform` file responses.
+
+- [#8108](https://github.com/Effect-TS/effect/pull/8108) [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c) Thanks @tim-smart! - On Node and Deno, `FileSystem.File.seek` now rejects negative resulting positions with a `BadArgument` platform error, leaving the cursor unchanged. Its return type is now `Effect<bigint, PlatformError>`.
+
+- [#8148](https://github.com/Effect-TS/effect/pull/8148) [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528) Thanks @tim-smart! - Preserve the response Content-Type when compressing file, raw, stream, and byte-array responses on Node, Bun, Deno, and the web platform, including headers overridden after body construction.
+
+- [#8112](https://github.com/Effect-TS/effect/pull/8112) [`a6ceb98`](https://github.com/Effect-TS/effect/commit/a6ceb98e89cffdb59297764299bdb35728af63f1) Thanks @tim-smart! - Fix `File.readAlloc` on Node and Deno to fail with `PlatformError` (`BadArgument`) for negative, fractional, non-finite, or unallocatable sizes without moving the cursor. Zero-size reads continue to return `Option.none()` without moving the cursor.
+
+- [#7524](https://github.com/Effect-TS/effect/pull/7524) [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6) Thanks @fubhy! - Add `NetAddress` under `effect/unstable/net` for MAC, IP, internet socket, and Unix socket addresses, with checked parsing, schemas, equality, canonical string serialization, and URL formatting. Companion modules `IpInterface` and `IpNetwork` represent IP interfaces and CIDR networks.
+  
+  HTTP and socket servers now expose `NetAddress.SocketAddress`. Replace TCP `hostname` access with `NetAddress.formatIp(address.address)` and use `UnixPathAddress.path` for Unix sockets. URL helpers bracket IPv6 addresses and reject scoped IPv6. Bun and Deno HTTP server layers can now fail with `ServeError` when listener address conversion fails.
+  
+  PostgreSQL `inet` values now use `IpInterface`; `cidr` values use `IpNetwork` and reject addresses with host bits set.
+
+- [#7487](https://github.com/Effect-TS/effect/pull/7487) [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80) Thanks @tim-smart! - Redesign `Socket` around a scoped, pull-based reader with transport backpressure.
+  
+  `Socket` now exposes `reader` and `writer`. Client reader acquisition dials and yields a pull of non-empty batches: one buffer for TCP and one entry per WebSocket frame. TCP applies backpressure while paused; pausable WebSockets pause at `highWaterMark` (64 KiB by default) and resume after draining. Browser WebSockets cannot pause, so they can fail with `SocketReadError` at a configured `highWaterMark`. Writes await native drain signals and batch with `cork` / `uncork` where available.
+  
+  ### Breaking changes
+  
+  - `Socket.run`, `Socket.runString`, and `Socket.runRaw` are removed. Acquire `socket.reader` (or `Socket.readerBytes` / `Socket.readerString`) in a scope and pull in a loop. Code before the first pull replaces `onOpen`.
+  - `Socket.make` now takes `{ reader, writer }`. The writer acquisition is infallible and yields a `Writer` with `write` and `writeAll`; both operations can still fail with `SocketError`.
+  - Every close fails the pull with `SocketError` wrapping `SocketCloseError`. The close-code predicates are removed; use `Effect.retry` around the scoped read loop to reconnect.
+  - `Socket.toChannel` and `Socket.toChannelString` now read from the pull and fail on close. `Socket.toStream` is added for read-only consumption.
+  - `fromWebSocket` drops the `onInitialRun` option; `SendQueueCapacity` is removed.
+  - Accepted server sockets pause immediately. Their reader attaches to the existing connection and cannot reconnect after close.
+
+- [#7461](https://github.com/Effect-TS/effect/pull/7461) [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d) Thanks @tim-smart! - Remove the MessagePack encoding and RPC serialization APIs together with the `msgpackr` dependency. Event-log persistence and remote messages now use SchemaBinary, and cluster transports use SchemaBinary unless NDJSON is selected explicitly.
+
+- [#7427](https://github.com/Effect-TS/effect/pull/7427) [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e) Thanks @tim-smart! - Use SchemaBinary as the default RPC serialization for TCP cluster connections, including configurable frame limits.
+  
+  Cluster payloads are encoded with the binary codec on the wire. When a persisted reply cannot be encoded for JSON storage, the defect fallback that storage records is now also the reply delivered to waiting callers, so live replies always match what was persisted.
+  
+  SchemaBinary codecs are memoized by schema identity and wire mode, so per-message codec requests reuse the derived codec instead of rebuilding it.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`2f106a5`](https://github.com/Effect-TS/effect/commit/2f106a524557d5b57a50e29d437cde31f5d73838), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`a4bb2aa`](https://github.com/Effect-TS/effect/commit/a4bb2aa22698ea8a98d5172d81305f4f74bd7caa), [`5664c94`](https://github.com/Effect-TS/effect/commit/5664c941b522a5f318e609b9c45f2eb4c2b92ea1), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`a6ceb98`](https://github.com/Effect-TS/effect/commit/a6ceb98e89cffdb59297764299bdb35728af63f1), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`615c41e`](https://github.com/Effect-TS/effect/commit/615c41e193494b3305dad8a98000ed04e2718469), [`d0a6c5e`](https://github.com/Effect-TS/effect/commit/d0a6c5eee03c1f55748739252cdb04c1df37b844), [`500c60b`](https://github.com/Effect-TS/effect/commit/500c60b3ab502aed3f2764b6791ff71770e7bada), [`163cebd`](https://github.com/Effect-TS/effect/commit/163cebdc19e339e0bbf23035f3fa3e3322043627), [`37cdd69`](https://github.com/Effect-TS/effect/commit/37cdd692adb989da3dff6d65221e5c27fa025ad8), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`0beaf69`](https://github.com/Effect-TS/effect/commit/0beaf69e3c368b8aaa1fa6aa1066272f5c554128), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+  - @effect/platform-node-shared@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/platform/deno/package.json b/repos/effect/packages/platform/deno/package.json
index 1631f8c5d..51675bfd3 100644
--- a/repos/effect/packages/platform/deno/package.json
+++ b/repos/effect/packages/platform/deno/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@effect/platform-deno",
   "type": "module",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "license": "MIT",
   "description": "Platform specific implementations for the Deno runtime",
   "homepage": "https://effect.website",
@@ -64,7 +64,7 @@
     "check": "deno check"
   },
   "dependencies": {
-    "@db/redis": "jsr:^0.41.2",
+    "@db/redis": "jsr:^0.42.0",
     "@effect/platform-node-shared": "workspace:^",
     "@std/fs": "jsr:^1.0.24",
     "@std/media-types": "jsr:^1.1.0",
diff --git a/repos/effect/packages/platform/deno/src/DenoFileSystem.ts b/repos/effect/packages/platform/deno/src/DenoFileSystem.ts
index 9e263a7c3..6029b642a 100644
--- a/repos/effect/packages/platform/deno/src/DenoFileSystem.ts
+++ b/repos/effect/packages/platform/deno/src/DenoFileSystem.ts
@@ -5,6 +5,7 @@
  */
 import { copy as denoCopy, expandGlob, walk } from "@std/fs"
 import { relative } from "@std/path"
+import * as ByteSize from "effect/ByteSize"
 import * as Effect from "effect/Effect"
 import * as FileSystem from "effect/FileSystem"
 import * as Layer from "effect/Layer"
@@ -175,8 +176,8 @@ const makeFileInfo = (info: Deno.FileInfo): FileSystem.File.Info => ({
   nlink: Option.fromNullishOr(info.nlink),
   uid: Option.fromNullishOr(info.uid),
   gid: Option.fromNullishOr(info.gid),
-  size: FileSystem.Size(info.size),
-  blksize: Option.map(Option.fromNullishOr(info.blksize), FileSystem.Size),
+  size: ByteSize.bytes(BigInt(info.size)),
+  blksize: Option.map(Option.fromNullishOr(info.blksize), (size) => ByteSize.bytes(BigInt(size))),
   blocks: Option.fromNullishOr(info.blocks)
 })
 
@@ -207,15 +208,18 @@ class FileImpl implements FileSystem.File {
     return tryPromise("sync", undefined, () => this.file.sync())
   }
 
-  seek(offset: FileSystem.SizeInput, from: FileSystem.SeekMode) {
-    const size = FileSystem.Size(offset)
-    return Effect.sync(() => {
-      if (from === "start") {
-        this.position = size
-      } else {
-        this.position += size
+  seek(offset: bigint, from: FileSystem.SeekMode) {
+    return Effect.suspend(() => {
+      const position = from === "start" ? offset : this.position + offset
+      if (position < BigInt(0)) {
+        return Effect.fail(PlatformError.badArgument({
+          module: "FileSystem",
+          method: "seek",
+          description: "Cannot seek before the start of the file"
+        }))
       }
-      return FileSystem.Size(this.position)
+      this.position = position
+      return Effect.succeed(position)
     })
   }
 
@@ -235,9 +239,8 @@ class FileImpl implements FileSystem.File {
           }
         ),
         (bytesRead) => {
-          const sizeRead = FileSystem.Size(bytesRead ?? 0)
-          this.position = this.nativePosition = position + sizeRead
-          return sizeRead
+          this.position = this.nativePosition = position + BigInt(bytesRead ?? 0)
+          return bytesRead ?? 0
         }
       )
     })
@@ -247,21 +250,32 @@ class FileImpl implements FileSystem.File {
     return this.readChunk("read", buffer)
   }
 
-  readAlloc(size: FileSystem.SizeInput) {
-    const sizeNumber = Number(size)
+  readAlloc(size: number) {
     return Effect.suspend(() => {
-      const buffer = new Uint8Array(sizeNumber)
-      return Effect.map(this.readChunk("readAlloc", buffer), (bytesRead) => {
-        if (bytesRead === BigInt(0)) {
-          return Option.none()
+      try {
+        if (!Number.isInteger(size) || size < 0) {
+          throw new RangeError("size must be a non-negative integer")
         }
-        return Option.some(bytesRead === BigInt(sizeNumber) ? buffer : buffer.subarray(0, Number(bytesRead)))
-      })
+        const buffer = new Uint8Array(size)
+        return Effect.map(this.readChunk("readAlloc", buffer), (bytesRead) => {
+          if (bytesRead === 0) {
+            return Option.none()
+          }
+          return Option.some(bytesRead === size ? buffer : buffer.subarray(0, bytesRead))
+        })
+      } catch (cause) {
+        return Effect.fail(PlatformError.badArgument({
+          module: "FileSystem",
+          method: "readAlloc",
+          description: `Could not allocate a buffer of size ${size}`,
+          cause
+        }))
+      }
     })
   }
 
-  truncate(length?: FileSystem.SizeInput) {
-    const size = FileSystem.Size(length ?? 0)
+  truncate(length?: number) {
+    const size = BigInt(length ?? 0)
     return Effect.map(
       tryPromise("truncate", undefined, () => this.file.truncate(Number(size))),
       () => {
@@ -288,13 +302,12 @@ class FileImpl implements FileSystem.File {
           }
         ),
         (bytesWritten) => {
-          const sizeWritten = FileSystem.Size(bytesWritten)
           if (this.append) {
             this.nativePosition = undefined
           } else {
-            this.position = this.nativePosition = position + sizeWritten
+            this.position = this.nativePosition = position + BigInt(bytesWritten)
           }
-          return sizeWritten
+          return bytesWritten
         }
       )
     })
@@ -306,7 +319,7 @@ class FileImpl implements FileSystem.File {
 
   private writeAllChunk(buffer: Uint8Array): Effect.Effect<void, PlatformError.PlatformError> {
     return Effect.flatMap(this.writeChunk("writeAll", buffer), (bytesWritten) => {
-      if (bytesWritten === BigInt(0)) {
+      if (bytesWritten === 0) {
         return Effect.fail(PlatformError.systemError({
           module: "FileSystem",
           method: "writeAll",
@@ -315,7 +328,7 @@ class FileImpl implements FileSystem.File {
         }))
       }
       return bytesWritten < buffer.length
-        ? this.writeAllChunk(buffer.subarray(Number(bytesWritten)))
+        ? this.writeAllChunk(buffer.subarray(bytesWritten))
         : Effect.void
     })
   }
@@ -385,7 +398,7 @@ const symlink: FileSystem.FileSystem["symlink"] = (target, path) =>
   tryPromise("symlink", target, () => Deno.symlink(target, path))
 
 const truncate: FileSystem.FileSystem["truncate"] = (path, length) =>
-  tryPromise("truncate", path, () => Deno.truncate(path, length === undefined ? undefined : Number(length)))
+  tryPromise("truncate", path, () => Deno.truncate(path, length))
 
 const utimes: FileSystem.FileSystem["utimes"] = (path, atime, mtime) =>
   tryPromise("utimes", path, () => Deno.utime(path, atime, mtime))
@@ -441,12 +454,11 @@ const watch = (
 
 const writeFile: FileSystem.FileSystem["writeFile"] = (path, data, options) => {
   const flag = options?.flag ?? "w"
-  if (flag === "w" || flag === "wx" || flag === "a" || flag === "ax") {
+  if (options?.mode === undefined && (flag === "w" || flag === "wx" || flag === "a" || flag === "ax")) {
     return tryPromise("writeFile", path, (signal) =>
       Deno.writeFile(path, data, {
         append: flag.startsWith("a"),
         createNew: flag.includes("x"),
-        ...(options?.mode === undefined ? {} : { mode: options.mode }),
         signal
       }))
   }
diff --git a/repos/effect/packages/platform/deno/src/DenoHttpPlatform.ts b/repos/effect/packages/platform/deno/src/DenoHttpPlatform.ts
index f0dd88f78..c4c53dc18 100644
--- a/repos/effect/packages/platform/deno/src/DenoHttpPlatform.ts
+++ b/repos/effect/packages/platform/deno/src/DenoHttpPlatform.ts
@@ -44,7 +44,7 @@ export const make = Platform.make({
   compression,
   fileResponse(path, status, statusText, headers, start, end, contentLength) {
     let body: ReadableStream<Uint8Array>
-    if (contentLength === 0) {
+    if (contentLength === BigInt(0)) {
       body = new ReadableStream<Uint8Array>({
         start(controller) {
           controller.close()
@@ -55,7 +55,7 @@ export const make = Platform.make({
       file.seekSync(start, Deno.SeekMode.Start)
       body = end === undefined
         ? file.readable
-        : file.readable.pipeThrough(new ByteSliceStream(0, contentLength - 1))
+        : file.readable.pipeThrough(new ByteSliceStream(0, end - start - 1))
     }
     return Response.raw(body, {
       headers: {
@@ -68,11 +68,11 @@ export const make = Platform.make({
     })
   },
   fileWebResponse(file, status, statusText, headers, options) {
-    const offset = Number(options?.offset ?? 0)
+    const offset = options?.offset ?? 0
     const available = Math.max(0, file.size - offset)
     const contentLength = options?.bytesToRead === undefined
       ? available
-      : Math.min(available, Math.max(0, Number(options.bytesToRead)))
+      : Math.min(available, Math.max(0, options.bytesToRead))
     let body: typeof file | ReadableStream<Uint8Array> = file
     if (contentLength === 0) {
       body = new ReadableStream<Uint8Array>({
@@ -88,7 +88,8 @@ export const make = Platform.make({
     return Response.raw(body, {
       headers: {
         ...headers,
-        "content-type": file.type,
+        "content-type": headers["content-type"] ??
+          (file.type === "" ? contentType(extname(file.name)) ?? "application/octet-stream" : file.type),
         "content-length": contentLength.toString()
       },
       status,
diff --git a/repos/effect/packages/platform/deno/src/DenoHttpServer.ts b/repos/effect/packages/platform/deno/src/DenoHttpServer.ts
index d873b7a1a..87336cfec 100644
--- a/repos/effect/packages/platform/deno/src/DenoHttpServer.ts
+++ b/repos/effect/packages/platform/deno/src/DenoHttpServer.ts
@@ -32,9 +32,10 @@ import type { HttpPlatform } from "effect/unstable/http/HttpPlatform"
 import * as Server from "effect/unstable/http/HttpServer"
 import * as Error from "effect/unstable/http/HttpServerError"
 import * as ServerRequest from "effect/unstable/http/HttpServerRequest"
-import type * as ServerResponse from "effect/unstable/http/HttpServerResponse"
+import * as ServerResponse from "effect/unstable/http/HttpServerResponse"
 import type * as Multipart from "effect/unstable/http/Multipart"
 import * as UrlParams from "effect/unstable/http/UrlParams"
+import * as NetAddress from "effect/unstable/net/NetAddress"
 import * as Socket from "effect/unstable/socket/Socket"
 import * as Platform from "./DenoHttpPlatform.ts"
 import * as DenoMultipart from "./DenoMultipart.ts"
@@ -95,13 +96,12 @@ export const make = Effect.fnUntraced(function*(
   yield* Scope.addFinalizer(scope, shutdown)
 
   const serverAddress = server.addr
-  const address: Server.Address = serverAddress.transport === "unix"
-    ? { _tag: "UnixAddress", path: serverAddress.path }
-    : {
-      _tag: "TcpAddress",
-      port: (serverAddress as Deno.NetAddr).port,
-      hostname: (serverAddress as Deno.NetAddr).hostname
-    }
+  const address = yield* (serverAddress.transport === "unix"
+    ? Effect.succeed(NetAddress.unixPathAddress(serverAddress.path))
+    : Effect.fromResult(NetAddress.inetAddressFromIpString(
+      (serverAddress as Deno.NetAddr).hostname,
+      (serverAddress as Deno.NetAddr).port
+    )).pipe(Effect.mapError((cause) => new Error.ServeError({ cause }))))
 
   return Server.make({
     address,
@@ -171,7 +171,7 @@ const makeResponse = Effect.fnUntraced(function*(
   }
   if (response.statusText !== undefined) fields.statusText = response.statusText
 
-  if (request.method === "HEAD") {
+  if (ServerResponse.omitsBody(response, request.method === "HEAD")) {
     yield* cancelResponseBody(response.body)
     return new Response(undefined, fields)
   }
@@ -216,7 +216,7 @@ export const layerServer: (
     readonly gracefulShutdownTimeout?: Duration.Input | undefined
     readonly websocket?: Deno.UpgradeWebSocketOptions | undefined
   }
-) => Layer.Layer<Server.HttpServer> = flow(
+) => Layer.Layer<Server.HttpServer, Error.ServeError> = flow(
   make,
   Layer.effect(Server.HttpServer)
 )
@@ -245,7 +245,7 @@ export const layer = (
     readonly gracefulShutdownTimeout?: Duration.Input | undefined
     readonly websocket?: Deno.UpgradeWebSocketOptions | undefined
   }
-): Layer.Layer<Server.HttpServer | HttpPlatform | Etag.Generator | DenoServices.DenoServices> =>
+): Layer.Layer<Server.HttpServer | HttpPlatform | Etag.Generator | DenoServices.DenoServices, Error.ServeError> =>
   Layer.mergeAll(layerServer(options), layerHttpServices)
 
 /**
@@ -260,7 +260,7 @@ export const layerTest: Layer.Layer<
   Layer.provide(FetchHttpClient.layer.pipe(
     Layer.provide(Layer.succeed(FetchHttpClient.RequestInit)({ keepalive: false }))
   )),
-  Layer.provideMerge(layer({ hostname: "127.0.0.1", port: 0, onListen: () => {} }))
+  Layer.provideMerge(Layer.orDie(layer({ hostname: "127.0.0.1", port: 0, onListen: () => {} })))
 )
 
 /**
@@ -279,7 +279,7 @@ export const layerConfig = (
   >
 ): Layer.Layer<
   Server.HttpServer | HttpPlatform | FileSystem.FileSystem | Etag.Generator | Path.Path,
-  ConfigError
+  ConfigError | Error.ServeError
 > =>
   Layer.mergeAll(
     Layer.effect(Server.HttpServer)(Effect.flatMap(Config.unwrap(options), make)),
@@ -552,8 +552,8 @@ const bufferedWebSocket = (ws: WebSocket): Socket.WebSocketLike => {
 }
 
 const cancelResponseBody = (body: HttpBody.HttpBody): Effect.Effect<void> => {
-  const stream = (body as any).body
-  if ((body._tag === "Raw" || body._tag === "Uint8Array") && stream instanceof ReadableStream) {
+  if (body._tag === "Raw" && typeof ReadableStream !== "undefined" && body.body instanceof ReadableStream) {
+    const stream = body.body
     return Effect.ignoreCause(Effect.promise(() => stream.cancel()))
   }
   return Effect.void
diff --git a/repos/effect/packages/platform/deno/src/DenoRedis.ts b/repos/effect/packages/platform/deno/src/DenoRedis.ts
index 82a1eaf5d..dbdaec1f0 100644
--- a/repos/effect/packages/platform/deno/src/DenoRedis.ts
+++ b/repos/effect/packages/platform/deno/src/DenoRedis.ts
@@ -46,10 +46,13 @@ export class DenoRedis extends Context.Service<DenoRedis, {
 const make = Effect.fnUntraced(function*(options: RedisOptions = {}) {
   const connectClient = () => {
     const { url, ...connectOptions } = options
+    const parsedUrl = url === undefined ? undefined : new URL(url)
     const { name, ...parsed } = url === undefined ? { hostname: "localhost" } : parseURL(url)
     return connect({
       ...parsed,
       ...(name === undefined ? {} : { username: name }),
+      ...(parsedUrl?.username ? { username: decodeURIComponent(parsedUrl.username) } : {}),
+      ...(parsedUrl?.password ? { password: decodeURIComponent(parsedUrl.password) } : {}),
       ...Record.filter(connectOptions, Predicate.isNotUndefined)
     })
   }
diff --git a/repos/effect/packages/platform/deno/test/DenoFileSystem.test.ts b/repos/effect/packages/platform/deno/test/DenoFileSystem.test.ts
index b842099e4..ec2e862ea 100644
--- a/repos/effect/packages/platform/deno/test/DenoFileSystem.test.ts
+++ b/repos/effect/packages/platform/deno/test/DenoFileSystem.test.ts
@@ -1,5 +1,7 @@
 import * as DenoFileSystem from "@effect/platform-deno/DenoFileSystem"
-import { describe } from "@effect/vitest"
+import { assert, describe, it } from "@effect/vitest"
+import * as Effect from "effect/Effect"
+import * as FileSystem from "effect/FileSystem"
 import { testLayer } from "../../../effect/test/FileSystem.test-utils.ts"
 
 describe("FileSystem", () =>
@@ -7,3 +9,61 @@ describe("FileSystem", () =>
     accessOnDirectory: false,
     tempFileScopedRemovesDirectory: false
   }))
+
+describe("truncate", () => {
+  it.effect.each([1.5, NaN])(
+    "rejects length %s at the call site without changing the file",
+    (length) =>
+      Effect.gen(function*() {
+        const fs = yield* FileSystem.FileSystem
+        const path = yield* fs.makeTempFileScoped()
+        yield* fs.writeFileString(path, "contents")
+        const file = yield* fs.open(path, { flag: "r+" })
+        yield* file.seek(BigInt(4), "start")
+        let threwAtCall = false
+
+        yield* Effect.exit(Effect.suspend(() => {
+          try {
+            return file.truncate(length)
+          } catch (error) {
+            threwAtCall = error instanceof RangeError
+            return Effect.die(error)
+          }
+        }))
+
+        assert.deepStrictEqual({
+          threwAtCall,
+          content: yield* fs.readFileString(path),
+          position: yield* file.seek(BigInt(0), "current")
+        }, {
+          threwAtCall: true,
+          content: "contents",
+          position: BigInt(4)
+        })
+      }).pipe(Effect.provide(DenoFileSystem.layer))
+  )
+})
+
+describe.skipIf(Deno.build.os === "windows")("writeFile", () => {
+  it.effect("applies the mode when creating a file", () =>
+    Effect.gen(function*() {
+      const fs = yield* FileSystem.FileSystem
+      const directory = yield* fs.makeTempDirectoryScoped()
+      const path = `${directory}/created`
+
+      yield* fs.writeFileString(path, "content", { mode: 0o600 })
+
+      assert.strictEqual((yield* fs.stat(path)).mode & 0o777, 0o600)
+    }).pipe(Effect.provide(DenoFileSystem.layer)))
+
+  it.effect("preserves the mode of an existing file", () =>
+    Effect.gen(function*() {
+      const fs = yield* FileSystem.FileSystem
+      const path = yield* fs.makeTempFileScoped()
+      yield* fs.chmod(path, 0o640)
+
+      yield* fs.writeFileString(path, "content", { mode: 0o600 })
+
+      assert.strictEqual((yield* fs.stat(path)).mode & 0o777, 0o640)
+    }).pipe(Effect.provide(DenoFileSystem.layer)))
+})
diff --git a/repos/effect/packages/platform/deno/test/DenoHttpPlatform.test.ts b/repos/effect/packages/platform/deno/test/DenoHttpPlatform.test.ts
index 76a421f1f..801b20006 100644
--- a/repos/effect/packages/platform/deno/test/DenoHttpPlatform.test.ts
+++ b/repos/effect/packages/platform/deno/test/DenoHttpPlatform.test.ts
@@ -1,6 +1,11 @@
+import * as DenoFileSystem from "@effect/platform-deno/DenoFileSystem"
 import * as DenoHttpPlatform from "@effect/platform-deno/DenoHttpPlatform"
 import { assert, describe, it } from "@effect/vitest"
+import * as ByteSize from "effect/ByteSize"
+import * as Cause from "effect/Cause"
 import * as Effect from "effect/Effect"
+import * as FileSystem from "effect/FileSystem"
+import * as Etag from "effect/unstable/http/Etag"
 import type * as HttpBody from "effect/unstable/http/HttpBody"
 import * as HttpPlatform from "effect/unstable/http/HttpPlatform"
 
@@ -14,6 +19,70 @@ const readBody = (body: HttpBody.HttpBody) => {
 }
 
 describe("DenoHttpPlatform", () => {
+  it.effect("fileWebResponse preserves the requested content type", () =>
+    Effect.gen(function*() {
+      const platform = yield* HttpPlatform.HttpPlatform
+      const response = yield* platform.fileWebResponse(new File([], "script.js", { type: "text/plain" }), {
+        contentType: "text/javascript"
+      })
+      assert.strictEqual(response.headers["content-type"], "text/javascript")
+    }).pipe(Effect.provide(DenoHttpPlatform.layer)))
+
+  for (const [name, expected] of [["image.png", "image/png"], ["file", "application/octet-stream"]]) {
+    it.effect(`fileWebResponse resolves an empty File.type for ${name}`, () =>
+      Effect.gen(function*() {
+        const platform = yield* HttpPlatform.HttpPlatform
+        const response = yield* platform.fileWebResponse(new File([], name))
+        assert.strictEqual(response.headers["content-type"], expected)
+      }).pipe(Effect.provide(DenoHttpPlatform.layer)))
+  }
+
+  for (
+    const { name, offset, bytesToRead, expected } of [
+      { name: "clamps bytesToRead beyond EOF", offset: 1, bytesToRead: 10, expected: "bcd" },
+      { name: "returns an empty body at EOF", offset: 4, bytesToRead: undefined, expected: "" },
+      { name: "returns an empty body past EOF", offset: 9, bytesToRead: undefined, expected: "" },
+      { name: "clamps bytesToRead at EOF", offset: 4, bytesToRead: 10, expected: "" },
+      { name: "clamps bytesToRead past EOF", offset: 9, bytesToRead: 10, expected: "" }
+    ]
+  ) {
+    it.effect(`fileWebResponse ${name}`, () =>
+      Effect.gen(function*() {
+        const platform = yield* HttpPlatform.HttpPlatform
+        const file = new File(["abcd"], "file.txt", { type: "text/plain", lastModified: 0 })
+        const response = yield* platform.fileWebResponse(file, { offset, bytesToRead })
+        const text = yield* readBody(response.body)
+
+        assert.deepStrictEqual(
+          { contentLength: response.headers["content-length"], body: text },
+          { contentLength: String(expected.length), body: expected }
+        )
+      }).pipe(Effect.provide(DenoHttpPlatform.layer)))
+  }
+
+  it.effect("fileResponse preserves open failures as defects after stat succeeds", () =>
+    Effect.gen(function*() {
+      const fs = yield* FileSystem.FileSystem
+      const directory = yield* fs.makeTempDirectoryScoped()
+      const info = yield* fs.stat(fixture)
+      const platform = yield* DenoHttpPlatform.make.pipe(
+        Effect.provideService(
+          FileSystem.FileSystem,
+          FileSystem.makeNoop({
+            stat: () => Effect.succeed(info)
+          })
+        ),
+        Effect.provide(Etag.layer)
+      )
+
+      const exit = yield* Effect.exit(platform.fileResponse(`${directory}/missing.txt`))
+      assert.strictEqual(exit._tag, "Failure")
+      if (exit._tag === "Failure") {
+        assert.isTrue(Cause.hasDies(exit.cause))
+        assert.isFalse(Cause.hasFails(exit.cause))
+      }
+    }).pipe(Effect.scoped, Effect.provide(DenoFileSystem.layer)))
+
   it.effect("fileWebResponse honors offset and bytesToRead including zero", () =>
     Effect.gen(function*() {
       const platform = yield* HttpPlatform.HttpPlatform
@@ -36,8 +105,8 @@ describe("DenoHttpPlatform", () => {
     Effect.gen(function*() {
       const platform = yield* HttpPlatform.HttpPlatform
       const response = yield* platform.fileResponse(fixture, {
-        offset: 6,
-        bytesToRead: 5
+        offset: ByteSize.bytes(6),
+        bytesToRead: ByteSize.bytes(5)
       })
 
       assert.strictEqual(response.headers["content-length"], "5")
@@ -49,12 +118,38 @@ describe("DenoHttpPlatform", () => {
       assert.strictEqual(text, "ipsum")
     }).pipe(Effect.provide(DenoHttpPlatform.layer)))
 
+  for (
+    const { name, offset, bytesToRead, expected } of [
+      { name: "clamps bytesToRead beyond EOF", offset: 22, bytesToRead: 100, expected: "amet\n" },
+      { name: "returns an empty body at EOF", offset: 27, bytesToRead: undefined, expected: "" },
+      { name: "returns an empty body past EOF", offset: 50, bytesToRead: undefined, expected: "" },
+      { name: "clamps bytesToRead at EOF", offset: 27, bytesToRead: 100, expected: "" },
+      { name: "clamps bytesToRead past EOF", offset: 50, bytesToRead: 100, expected: "" }
+    ]
+  ) {
+    it.effect(`fileResponse ${name}`, () =>
+      Effect.gen(function*() {
+        const platform = yield* HttpPlatform.HttpPlatform
+        const response = yield* platform.fileResponse(fixture, {
+          offset: ByteSize.bytes(offset),
+          bytesToRead: bytesToRead === undefined ? undefined : ByteSize.bytes(bytesToRead)
+        })
+
+        assert.strictEqual(response.body._tag, "Raw")
+        const text = yield* readStream((response.body as HttpBody.Raw).body as ReadableStream<Uint8Array>)
+        assert.deepStrictEqual(
+          { contentLength: response.headers["content-length"], body: text },
+          { contentLength: String(expected.length), body: expected }
+        )
+      }).pipe(Effect.provide(DenoHttpPlatform.layer)))
+  }
+
   it.effect("fileResponse supports zero bytesToRead", () =>
     Effect.gen(function*() {
       const platform = yield* HttpPlatform.HttpPlatform
       const response = yield* platform.fileResponse(fixture, {
-        offset: 6,
-        bytesToRead: 0
+        offset: ByteSize.bytes(6),
+        bytesToRead: ByteSize.zero
       })
 
       assert.strictEqual(response.headers["content-length"], "0")
diff --git a/repos/effect/packages/platform/deno/test/DenoHttpServer.test.ts b/repos/effect/packages/platform/deno/test/DenoHttpServer.test.ts
index 02e7333d4..9a17b8121 100644
--- a/repos/effect/packages/platform/deno/test/DenoHttpServer.test.ts
+++ b/repos/effect/packages/platform/deno/test/DenoHttpServer.test.ts
@@ -1,5 +1,6 @@
 import * as DenoHttpServer from "@effect/platform-deno/DenoHttpServer"
 import { assert, describe, it } from "@effect/vitest"
+import * as ByteSize from "effect/ByteSize"
 import * as Duration from "effect/Duration"
 import * as Effect from "effect/Effect"
 import * as Fiber from "effect/Fiber"
@@ -27,6 +28,7 @@ import * as HttpServerResponse from "effect/unstable/http/HttpServerResponse"
 import * as Multipart from "effect/unstable/http/Multipart"
 import * as UrlParams from "effect/unstable/http/UrlParams"
 import * as HttpApiError from "effect/unstable/httpapi/HttpApiError"
+import type * as NetAddress from "effect/unstable/net/NetAddress"
 import type * as Socket from "effect/unstable/socket/Socket"
 
 const Todo = Schema.Struct({
@@ -40,6 +42,81 @@ const todoResponse = HttpServerResponse.schemaJson(Todo)
 const fixture = `${import.meta.dirname}/fixtures/text.txt`
 
 describe("DenoHttpServer", () => {
+  describe("body omission", () => {
+    for (const status of [204, 205, 304]) {
+      for (const bodyKind of ["text", "stream"]) {
+        it.live(`omits ${bodyKind} bodies for status ${status}`, () =>
+          Effect.gen(function*() {
+            let finalized = false
+            let streamStarted = false
+            yield* HttpServer.serveEffect(Effect.gen(function*() {
+              yield* Effect.addFinalizer(() =>
+                Effect.sync(() => {
+                  finalized = true
+                })
+              )
+              const options = { status, contentType: "text/plain", contentLength: 4 }
+              return bodyKind === "text"
+                ? HttpServerResponse.text("body", options)
+                : HttpServerResponse.stream(
+                  Stream.fromEffect(Effect.sync(() => {
+                    streamStarted = true
+                    return new TextEncoder().encode("body")
+                  })),
+                  options
+                )
+            }))
+            const response = yield* HttpClient.get("/")
+            assert.strictEqual(response.status, status)
+            assert.strictEqual(yield* response.text, "")
+            assert.strictEqual(streamStarted, false)
+            assert.strictEqual(finalized, true)
+            if (status === 304) {
+              assert.strictEqual(response.headers["content-type"], "text/plain")
+            }
+          }).pipe(
+            Effect.timeout("2 seconds"),
+            Effect.provide(DenoHttpServer.layerTest)
+          ), 5000)
+      }
+    }
+
+    for (const [method, status] of [["HEAD", 200], ["GET", 204], ["GET", 205], ["GET", 304]] as const) {
+      it.live(`cancels raw streams for ${method} status ${status}`, () =>
+        Effect.gen(function*() {
+          let cancelled = false
+          const body = new ReadableStream<Uint8Array>({
+            pull(controller) {
+              controller.enqueue(new TextEncoder().encode("body"))
+              controller.close()
+            },
+            cancel() {
+              cancelled = true
+            }
+          }, { highWaterMark: 0 })
+          yield* Effect.addFinalizer(() => Effect.ignoreCause(Effect.promise(() => body.cancel())))
+          yield* HttpServer.serveEffect(Effect.succeed(HttpServerResponse.raw(body, {
+            status,
+            contentType: "text/plain",
+            contentLength: 4
+          })))
+          const response = yield* (method === "HEAD" ? HttpClient.head("/") : HttpClient.get("/"))
+          assert.strictEqual(response.status, status)
+          assert.strictEqual(yield* response.text, "")
+          assert.strictEqual(cancelled, true)
+          if (method === "HEAD") {
+            assert.strictEqual(response.headers["content-length"], "4")
+          }
+          if (method === "HEAD" || status === 304) {
+            assert.strictEqual(response.headers["content-type"], "text/plain")
+          }
+        }).pipe(
+          Effect.timeout("2 seconds"),
+          Effect.provide(DenoHttpServer.layerTest)
+        ), 5000)
+    }
+  })
+
   it.effect("schema", () =>
     Effect.gen(function*() {
       yield* HttpRouter.add(
@@ -151,7 +228,7 @@ describe("DenoHttpServer", () => {
       ).pipe(
         HttpRouter.serve,
         Layer.build,
-        Effect.provideService(Multipart.MaxFileSize, 100)
+        Effect.provideService(Multipart.MaxFileSize, ByteSize.bytes(100))
       )
       const formData = new FormData()
       formData.append("file", new Blob([new Uint8Array(1000)], { type: "text/plain" }), "test.txt")
@@ -175,7 +252,7 @@ describe("DenoHttpServer", () => {
       ).pipe(
         HttpRouter.serve,
         Layer.build,
-        Effect.provideService(Multipart.MaxFieldSize, 100)
+        Effect.provideService(Multipart.MaxFieldSize, ByteSize.bytes(100))
       )
       const formData = new FormData()
       formData.append("file", "x".repeat(1000))
@@ -495,7 +572,7 @@ describe("DenoHttpServer", () => {
       )
       yield* Effect.promise(() => runtime.context())
       const downstreamServer = yield* Effect.promise(() => runtime.runPromise(HttpServer.HttpServer))
-      const downstreamPort = (downstreamServer.address as HttpServer.TcpAddress).port
+      const downstreamPort = (downstreamServer.address as NetAddress.InetAddress).port
 
       const controller = new AbortController()
       const downstream = fetch(`http://127.0.0.1:${downstreamPort}`, {
@@ -640,7 +717,7 @@ describe("DenoHttpServer", () => {
     Effect.gen(function*() {
       yield* serveWebSocket(echoWebSocket)
       const server = yield* HttpServer.HttpServer
-      const port = (server.address as HttpServer.TcpAddress).port
+      const port = (server.address as NetAddress.InetAddress).port
       const messages = yield* connectWebSocket(`ws://127.0.0.1:${port}/`, (socket) => socket.send("hello"), 1)
       assert.deepStrictEqual(messages, ["hello"])
     }).pipe(Effect.provide(DenoHttpServer.layerTest)))
@@ -654,7 +731,7 @@ describe("DenoHttpServer", () => {
       )
 
       const server = yield* HttpServer.HttpServer
-      const port = (server.address as HttpServer.TcpAddress).port
+      const port = (server.address as NetAddress.InetAddress).port
       const messages = yield* connectWebSocket(`ws://127.0.0.1:${port}/`, (socket) => {
         socket.send("first")
         socket.send("second")
@@ -683,7 +760,7 @@ describe("DenoHttpServer", () => {
       )
 
       const server = yield* HttpServer.HttpServer
-      const port = (server.address as HttpServer.TcpAddress).port
+      const port = (server.address as NetAddress.InetAddress).port
       const socket = yield* openWebSocket(`ws://127.0.0.1:${port}/`)
       socket.send(new Uint8Array([1, 2, 3]))
 
diff --git a/repos/effect/packages/platform/deno/test/DenoRedis.integration.test.ts b/repos/effect/packages/platform/deno/test/DenoRedis.integration.test.ts
index 9315ba5af..4f31e68fd 100644
--- a/repos/effect/packages/platform/deno/test/DenoRedis.integration.test.ts
+++ b/repos/effect/packages/platform/deno/test/DenoRedis.integration.test.ts
@@ -139,6 +139,48 @@ it.effect("uses the URL username for two-argument AUTH", () =>
     )
   }))
 
+it.effect("decodes URL authority credentials once", () =>
+  Effect.gen(function*() {
+    const listener = yield* makeListener
+    const server = yield* Effect.gen(function*() {
+      const connection = yield* accept(listener)
+      const request = yield* read(connection)
+      yield* write(connection, "+OK\r\n")
+      return request
+    }).pipe(Effect.forkChild)
+
+    const port = (listener.addr as Deno.NetAddr).port
+    yield* Layer.build(DenoRedis.layer({
+      url: `redis://app%3A%2540:p%40ss%2525@127.0.0.1:${port}`
+    }))
+
+    assert.strictEqual(
+      yield* Fiber.join(server),
+      "*3\r\n$4\r\nAUTH\r\n$7\r\napp:%40\r\n$7\r\np@ss%25\r\n"
+    )
+  }))
+
+it.effect("does not decode a query-string password twice", () =>
+  Effect.gen(function*() {
+    const listener = yield* makeListener
+    const server = yield* Effect.gen(function*() {
+      const connection = yield* accept(listener)
+      const request = yield* read(connection)
+      yield* write(connection, "+OK\r\n")
+      return request
+    }).pipe(Effect.forkChild)
+
+    const port = (listener.addr as Deno.NetAddr).port
+    yield* Layer.build(DenoRedis.layer({
+      url: `redis://alice@127.0.0.1:${port}/?password=p%2540ss`
+    }))
+
+    assert.strictEqual(
+      yield* Fiber.join(server),
+      "*3\r\n$4\r\nAUTH\r\n$5\r\nalice\r\n$6\r\np%40ss\r\n"
+    )
+  }))
+
 it.effect("prefers explicit credentials over URL credentials", () =>
   Effect.gen(function*() {
     const listener = yield* makeListener
diff --git a/repos/effect/packages/platform/deno/test/DenoSocketServer.test.ts b/repos/effect/packages/platform/deno/test/DenoSocketServer.test.ts
index a77f02483..8d7c55311 100644
--- a/repos/effect/packages/platform/deno/test/DenoSocketServer.test.ts
+++ b/repos/effect/packages/platform/deno/test/DenoSocketServer.test.ts
@@ -2,6 +2,7 @@ import * as DenoSocket from "@effect/platform-deno/DenoSocket"
 import * as DenoSocketServer from "@effect/platform-deno/DenoSocketServer"
 import { assert, describe, it } from "@effect/vitest"
 import { Effect, Exit, Redacted, Scope } from "effect"
+import * as NetAddress from "effect/unstable/net/NetAddress"
 import type * as Socket from "effect/unstable/socket/Socket"
 
 const ca = Deno.readTextFileSync(new URL("./fixtures/tls/ca.pem", import.meta.url))
@@ -51,13 +52,16 @@ describe("DenoSocketServer", () => {
     Effect.gen(function*() {
       const server = yield* DenoSocketServer.make({ host: "127.0.0.1", port: 0 })
       const address = server.address
-      assert.strictEqual(address._tag, "TcpAddress")
-      if (address._tag !== "TcpAddress") return
-      assert.strictEqual(address.hostname, "127.0.0.1")
+      assert.strictEqual(address._tag, "InetAddressV4")
+      if (address._tag !== "InetAddressV4") return
+      assert.strictEqual(NetAddress.formatIp(address.address), "127.0.0.1")
       assert.notStrictEqual(address.port, 0)
       yield* server.run(echo).pipe(Effect.forkScoped)
 
-      const socket = yield* DenoSocket.makeTcp({ hostname: address.hostname, port: address.port })
+      const socket = yield* DenoSocket.makeTcp({
+        hostname: NetAddress.formatIp(address.address),
+        port: address.port
+      })
       const output = yield* sendHelloDeno(socket)
 
       assert.strictEqual(output, "HelloDeno")
@@ -68,7 +72,8 @@ describe("DenoSocketServer", () => {
       const directory = yield* makeTempDir
       const path = `${directory}/echo.sock`
       const server = yield* DenoSocketServer.make({ path })
-      assert.deepStrictEqual(server.address, { _tag: "UnixAddress", path })
+      assert.strictEqual(server.address._tag, "UnixPathAddress")
+      assert.strictEqual(server.address._tag === "UnixPathAddress" ? server.address.path : undefined, path)
       yield* server.run(echo).pipe(Effect.forkScoped)
 
       const socket = yield* DenoSocket.makeTcp({ transport: "unix", path })
@@ -82,10 +87,10 @@ describe("DenoSocketServer", () => {
       const scope = yield* Scope.make()
       const server = yield* DenoSocketServer.make({ host: "127.0.0.1", port: 0 }).pipe(Scope.provide(scope))
       const address = server.address
-      assert.strictEqual(address._tag, "TcpAddress")
-      if (address._tag !== "TcpAddress") return
+      assert.strictEqual(address._tag, "InetAddressV4")
+      if (address._tag !== "InetAddressV4") return
       const conn = yield* Effect.acquireRelease(
-        Effect.promise(() => Deno.connect({ hostname: address.hostname, port: address.port })),
+        Effect.promise(() => Deno.connect({ hostname: NetAddress.formatIp(address.address), port: address.port })),
         (conn) => Effect.sync(() => conn.close())
       )
       void conn
@@ -97,11 +102,14 @@ describe("DenoSocketServer", () => {
     Effect.gen(function*() {
       const server = yield* DenoSocketServer.make({ host: "127.0.0.1", port: 0 })
       const address = server.address
-      assert.strictEqual(address._tag, "TcpAddress")
-      if (address._tag !== "TcpAddress") return
+      assert.strictEqual(address._tag, "InetAddressV4")
+      if (address._tag !== "InetAddressV4") return
       yield* server.run((socket) => echo(socket, { cert, key: Redacted.make(key) })).pipe(Effect.forkScoped)
 
-      const socket = yield* DenoSocket.makeTcp({ hostname: address.hostname, port: address.port })
+      const socket = yield* DenoSocket.makeTcp({
+        hostname: NetAddress.formatIp(address.address),
+        port: address.port
+      })
       const output = yield* sendHelloDeno(socket, {
         ca: [ca]
       })
diff --git a/repos/effect/packages/platform/deno/test/fixtures/deno-terminal.ts b/repos/effect/packages/platform/deno/test/fixtures/deno-terminal.ts
index 3264499d1..fe1298af6 100644
--- a/repos/effect/packages/platform/deno/test/fixtures/deno-terminal.ts
+++ b/repos/effect/packages/platform/deno/test/fixtures/deno-terminal.ts
@@ -20,8 +20,8 @@ const TerminalLayer = Layer.mergeAll(
 )
 
 const prompts = Effect.gen(function*() {
-  const first = yield* Prompt.run(Prompt.confirm({ message: "First" }))
-  const second = yield* Prompt.run(Prompt.confirm({ message: "Second" })).pipe(Effect.flip)
+  const first = yield* Prompt.run(Prompt.Confirm({ message: "First" }))
+  const second = yield* Prompt.run(Prompt.Confirm({ message: "Second" })).pipe(Effect.flip)
   return { first, second: second._tag }
 })
 
diff --git a/repos/effect/packages/platform/node-shared/CHANGELOG.md b/repos/effect/packages/platform/node-shared/CHANGELOG.md
index 5aafdcfd6..89f46aad2 100644
--- a/repos/effect/packages/platform/node-shared/CHANGELOG.md
+++ b/repos/effect/packages/platform/node-shared/CHANGELOG.md
@@ -1,5 +1,107 @@
 # @effect/platform-node-shared
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- [#8245](https://github.com/Effect-TS/effect/pull/8245) [`05a6405`](https://github.com/Effect-TS/effect/commit/05a6405d3d729f9487121249435eae810233b949) Thanks @danieljvdm! - Clean up referenced POSIX process groups on scope closure after their leader exits successfully or is terminated by a signal.
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- [#8164](https://github.com/Effect-TS/effect/pull/8164) [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe) Thanks @sam-goodwin! - Keep Node and Bun file stats usable when optional numeric metadata exceeds the safe integer range by returning `Option.none()` for those fields.
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#8071](https://github.com/Effect-TS/effect/pull/8071) [`2f106a5`](https://github.com/Effect-TS/effect/commit/2f106a524557d5b57a50e29d437cde31f5d73838) Thanks @javascript-unsafe! - Wake `NodeStream.pipeThroughDuplex` readers when the upstream fails so the original error is propagated instead of hanging.
+
+- [#8018](https://github.com/Effect-TS/effect/pull/8018) [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3) Thanks @tim-smart! - Wait for Node child process groups to exit during scoped release and `kill`.
+  
+  After signalling a process group, both operations now wait for its leader and descendants. Without `forceKillAfter`, the wait is limited to one second and never escalates. With `forceKillAfter`, the group receives `SIGKILL` at the deadline, followed by a final wait of up to one second. Native timers keep escalation working under a `TestClock`, and cleanup no longer depends on stdio closing.
+  
+  `exitCode` and `isRunning` remain tied to the leader's exit, and a leader that already exited successfully still leaves its group untouched. Process group checks count zombies, so cleanup may wait for the full bound under a non-reaping PID 1.
+
+- [#7511](https://github.com/Effect-TS/effect/pull/7511) [`a4bb2aa`](https://github.com/Effect-TS/effect/commit/a4bb2aa22698ea8a98d5172d81305f4f74bd7caa) Thanks @tim-smart! - Add `NodeSocket.makeTls`, `NodeSocket.makeTlsChannel`, and `NodeSocket.layerTls` for TLS client connections.
+  
+  These mirror the existing `makeNet` family but dial `tls.connect`, so they take the full `tls.ConnectionOptions` set:
+  trust anchors (`ca`), client certificates (`cert` / `key`), ALPN protocols, and `servername`. The socket opens once the
+  handshake completes; a failed handshake fails with a `SocketOpenError`.
+
+- [#7512](https://github.com/Effect-TS/effect/pull/7512) [`5664c94`](https://github.com/Effect-TS/effect/commit/5664c941b522a5f318e609b9c45f2eb4c2b92ea1) Thanks @tim-smart! - Add `NodeSocketServer.makeTls` and `NodeSocketServer.layerTls` for TLS socket servers.
+
+- [#7514](https://github.com/Effect-TS/effect/pull/7514) [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb) Thanks @tim-smart! - Add Socket.upgrade, for upgrading tcp sockets using STARTTLS
+
+- [#7514](https://github.com/Effect-TS/effect/pull/7514) [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb) Thanks @tim-smart! - Use the node-shared socket server on Deno so accepted TCP connections support reader-scoped server TLS upgrades.
+  
+  ### Breaking changes
+  
+  `DenoSocketServer.make` and `layer` now accept Node listen options. Use `host` instead of `hostname` for TCP and
+  `{ path }` instead of `{ transport: "unix", path }` for Unix sockets. Deno 2.8.3 or newer is now required.
+
+- [#7525](https://github.com/Effect-TS/effect/pull/7525) [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132) Thanks @fubhy! - Add `ByteSize` module and use it across the ecosystem
+
+- [#8110](https://github.com/Effect-TS/effect/pull/8110) [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0) Thanks @tim-smart! - Prevent precision loss in Node/Bun filesystem operations and `HttpPlatform` file responses.
+
+- [#8108](https://github.com/Effect-TS/effect/pull/8108) [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c) Thanks @tim-smart! - On Node and Deno, `FileSystem.File.seek` now rejects negative resulting positions with a `BadArgument` platform error, leaving the cursor unchanged. Its return type is now `Effect<bigint, PlatformError>`.
+
+- [#8148](https://github.com/Effect-TS/effect/pull/8148) [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528) Thanks @tim-smart! - Preserve the response Content-Type when compressing file, raw, stream, and byte-array responses on Node, Bun, Deno, and the web platform, including headers overridden after body construction.
+
+- [#8112](https://github.com/Effect-TS/effect/pull/8112) [`a6ceb98`](https://github.com/Effect-TS/effect/commit/a6ceb98e89cffdb59297764299bdb35728af63f1) Thanks @tim-smart! - Fix `File.readAlloc` on Node and Deno to fail with `PlatformError` (`BadArgument`) for negative, fractional, non-finite, or unallocatable sizes without moving the cursor. Zero-size reads continue to return `Option.none()` without moving the cursor.
+
+- [#7524](https://github.com/Effect-TS/effect/pull/7524) [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6) Thanks @fubhy! - Add `NetAddress` under `effect/unstable/net` for MAC, IP, internet socket, and Unix socket addresses, with checked parsing, schemas, equality, canonical string serialization, and URL formatting. Companion modules `IpInterface` and `IpNetwork` represent IP interfaces and CIDR networks.
+  
+  HTTP and socket servers now expose `NetAddress.SocketAddress`. Replace TCP `hostname` access with `NetAddress.formatIp(address.address)` and use `UnixPathAddress.path` for Unix sockets. URL helpers bracket IPv6 addresses and reject scoped IPv6. Bun and Deno HTTP server layers can now fail with `ServeError` when listener address conversion fails.
+  
+  PostgreSQL `inet` values now use `IpInterface`; `cidr` values use `IpNetwork` and reject addresses with host bits set.
+
+- [#7714](https://github.com/Effect-TS/effect/pull/7714) [`615c41e`](https://github.com/Effect-TS/effect/commit/615c41e193494b3305dad8a98000ed04e2718469) Thanks @kitlangton! - Prevent Node sinks from submitting buffered writes after interruption while waiting for writable backpressure.
+
+- [#7712](https://github.com/Effect-TS/effect/pull/7712) [`d0a6c5e`](https://github.com/Effect-TS/effect/commit/d0a6c5eee03c1f55748739252cdb04c1df37b844) Thanks @kitlangton! - Fix `NodeSink` hanging when a writable reports an error during finalization.
+
+- [#7838](https://github.com/Effect-TS/effect/pull/7838) [`500c60b`](https://github.com/Effect-TS/effect/commit/500c60b3ab502aed3f2764b6791ff71770e7bada) Thanks @tim-smart! - Remove the ignored `bufferSize` option from `NodeStream`.
+
+- [#7710](https://github.com/Effect-TS/effect/pull/7710) [`163cebd`](https://github.com/Effect-TS/effect/commit/163cebdc19e339e0bbf23035f3fa3e3322043627) Thanks @kitlangton! - Fix watch event classification for targets outside the current working directory.
+
+- [#7708](https://github.com/Effect-TS/effect/pull/7708) [`37cdd69`](https://github.com/Effect-TS/effect/commit/37cdd692adb989da3dff6d65221e5c27fa025ad8) Thanks @kitlangton! - Allow `File.writeAll` to accept empty buffers.
+
+- [#7728](https://github.com/Effect-TS/effect/pull/7728) [`0beaf69`](https://github.com/Effect-TS/effect/commit/0beaf69e3c368b8aaa1fa6aa1066272f5c554128) Thanks @kitlangton! - Route pipeline handle input through the first process.
+
+- [#7487](https://github.com/Effect-TS/effect/pull/7487) [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80) Thanks @tim-smart! - Redesign `Socket` around a scoped, pull-based reader with transport backpressure.
+  
+  `Socket` now exposes `reader` and `writer`. Client reader acquisition dials and yields a pull of non-empty batches: one buffer for TCP and one entry per WebSocket frame. TCP applies backpressure while paused; pausable WebSockets pause at `highWaterMark` (64 KiB by default) and resume after draining. Browser WebSockets cannot pause, so they can fail with `SocketReadError` at a configured `highWaterMark`. Writes await native drain signals and batch with `cork` / `uncork` where available.
+  
+  ### Breaking changes
+  
+  - `Socket.run`, `Socket.runString`, and `Socket.runRaw` are removed. Acquire `socket.reader` (or `Socket.readerBytes` / `Socket.readerString`) in a scope and pull in a loop. Code before the first pull replaces `onOpen`.
+  - `Socket.make` now takes `{ reader, writer }`. The writer acquisition is infallible and yields a `Writer` with `write` and `writeAll`; both operations can still fail with `SocketError`.
+  - Every close fails the pull with `SocketError` wrapping `SocketCloseError`. The close-code predicates are removed; use `Effect.retry` around the scoped read loop to reconnect.
+  - `Socket.toChannel` and `Socket.toChannelString` now read from the pull and fail on close. `Socket.toStream` is added for read-only consumption.
+  - `fromWebSocket` drops the `onInitialRun` option; `SendQueueCapacity` is removed.
+  - Accepted server sockets pause immediately. Their reader attaches to the existing connection and cannot reconnect after close.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/platform/node-shared/package.json b/repos/effect/packages/platform/node-shared/package.json
index 0e15dbefa..e4c1e3226 100644
--- a/repos/effect/packages/platform/node-shared/package.json
+++ b/repos/effect/packages/platform/node-shared/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@effect/platform-node-shared",
   "type": "module",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "license": "MIT",
   "description": "Unified interfaces for common platform-specific services",
   "homepage": "https://effect.website",
@@ -68,10 +68,10 @@
     "effect": "workspace:^"
   },
   "devDependencies": {
-    "@types/node": "^26.4.0",
+    "@types/node": "^26.6.2",
     "effect": "workspace:^",
     "tar": "^7.5.22",
-    "tinybench": "^6.1.4"
+    "tinybench": "^6.2.0"
   },
   "dependencies": {
     "@types/ws": "^8.18.1",
diff --git a/repos/effect/packages/platform/node-shared/src/NodeChildProcessSpawner.ts b/repos/effect/packages/platform/node-shared/src/NodeChildProcessSpawner.ts
index 38299e217..588f9891c 100644
--- a/repos/effect/packages/platform/node-shared/src/NodeChildProcessSpawner.ts
+++ b/repos/effect/packages/platform/node-shared/src/NodeChildProcessSpawner.ts
@@ -15,10 +15,20 @@
  * process at a time, wiring the selected source stream (`stdout`, `stderr`,
  * `all`, or `fdN`) to the destination `stdin` or `fdN`.
  *
+ * Scoped release and `kill` wait for the signalled process group. Without
+ * `forceKillAfter`, the wait is limited to one second and never escalates.
+ * With it, cleanup may take the configured duration plus a final one-second
+ * wait after `SIGKILL`. Zombie descendants can consume either full bound. On
+ * Windows, `taskkill` terminates the tree and only the leader's exit is awaited.
+ *
+ * POSIX cleanup targets a numeric process-group ID. If the group disappears
+ * and its ID is reused before cleanup, an unrelated group may be signalled.
+ *
  * @since 4.0.0
  */
 import type * as Arr from "effect/Array"
 import * as Deferred from "effect/Deferred"
+import * as Duration from "effect/Duration"
 import * as Effect from "effect/Effect"
 import * as Exit from "effect/Exit"
 import * as FileSystem from "effect/FileSystem"
@@ -66,6 +76,25 @@ const toPlatformError = (
 type ExitCodeWithSignal = readonly [code: number | null, signal: NodeJS.Signals | null]
 type ExitSignal = Deferred.Deferred<ExitCodeWithSignal>
 
+const processGroupGraceMillis = 1_000
+const processGroupPollIntervalMillis = 10
+
+/** The leader has not exited, or a member of its process group still exists. */
+const isProcessAlive = (childProcess: NodeChildProcess.ChildProcess, exitSignal: ExitSignal): boolean => {
+  if (!Deferred.isDoneUnsafe(exitSignal)) {
+    return true
+  }
+  if (globalThis.process.platform === "win32") {
+    return false
+  }
+  try {
+    globalThis.process.kill(-childProcess.pid!, 0)
+    return true
+  } catch {
+    return false
+  }
+}
+
 const taskkill = (
   childProcess: NodeChildProcess.ChildProcess,
   onExit: (error: NodeChildProcess.ExecException | null) => void = () => {}
@@ -413,26 +442,56 @@ const make = Effect.gen(function*() {
       return Effect.void
     })
 
-  const withTimeout = (
+  /** Waits for the leader and its process group, bounded by native time. */
+  const awaitProcessExit = (
     childProcess: NodeChildProcess.ChildProcess,
+    exitSignal: ExitSignal,
+    timeoutMillis: number
+  ): Effect.Effect<void> =>
+    Effect.callback<void>((resume) => {
+      const deadline = Date.now() + timeoutMillis
+      let timer: NodeJS.Timeout | undefined
+      const stop = () => {
+        clearTimeout(timer)
+        childProcess.removeListener("exit", poll)
+      }
+      const poll = () => {
+        clearTimeout(timer)
+        if (Date.now() >= deadline || !isProcessAlive(childProcess, exitSignal)) {
+          stop()
+          resume(Effect.void)
+          return
+        }
+        timer = setTimeout(poll, processGroupPollIntervalMillis)
+      }
+      // spawn's exit listener completes exitSignal before this listener runs
+      childProcess.on("exit", poll)
+      poll()
+      return Effect.sync(stop)
+    })
+
+  const terminateProcessGroup = Effect.fnUntraced(function*(
     command: ChildProcess.StandardCommand,
+    childProcess: NodeChildProcess.ChildProcess,
+    exitSignal: ExitSignal,
     options: ChildProcess.KillOptions | undefined
-  ) =>
-  <A, E, R>(
-    kill: (
-      command: ChildProcess.StandardCommand,
-      childProcess: NodeChildProcess.ChildProcess,
-      signal: NodeJS.Signals
-    ) => Effect.Effect<A, E, R>
-  ) => {
-    const killSignal = options?.killSignal ?? "SIGTERM"
-    return Predicate.isUndefined(options?.forceKillAfter)
-      ? kill(command, childProcess, killSignal)
-      : Effect.timeoutOrElse(kill(command, childProcess, killSignal), {
-        duration: options.forceKillAfter,
-        orElse: () => kill(command, childProcess, "SIGKILL")
-      })
-  }
+  ) {
+    const signalGroup = (signal: NodeJS.Signals) =>
+      killProcessGroup(command, childProcess, signal).pipe(
+        Effect.catch(() => killProcess(command, childProcess, signal))
+      )
+    yield* signalGroup(options?.killSignal ?? "SIGTERM")
+    if (Predicate.isUndefined(options?.forceKillAfter)) {
+      yield* awaitProcessExit(childProcess, exitSignal, processGroupGraceMillis)
+    } else {
+      yield* awaitProcessExit(childProcess, exitSignal, Duration.toMillis(options.forceKillAfter))
+      if (isProcessAlive(childProcess, exitSignal)) {
+        yield* signalGroup("SIGKILL")
+        yield* awaitProcessExit(childProcess, exitSignal, processGroupGraceMillis)
+      }
+    }
+    yield* Deferred.await(exitSignal)
+  })
 
   /**
    * Get the appropriate source stream from a process handle based on the
@@ -485,28 +544,19 @@ const make = Effect.gen(function*() {
           spawn(cmd, buildSpawnOptions(cmd.options, { cwd, env, stdio }, process.platform)),
           Effect.fnUntraced(function*([childProcess, exitSignal]) {
             const exited = yield* Deferred.isDone(exitSignal)
-            const killWithTimeout = withTimeout(childProcess, cmd, cmd.options)
             if (exited) {
-              // Process already exited, check if children need cleanup
               const [code] = yield* Deferred.await(exitSignal)
               if (code !== 0 && Predicate.isNotNull(code)) {
-                // Non-zero exit code ,attempt to clean up process group
-                return yield* Effect.ignore(killWithTimeout(killProcessGroup))
+                yield* Effect.ignore(killProcessGroup(cmd, childProcess, cmd.options.killSignal ?? "SIGTERM"))
+              } else if (isReferenced && process.platform !== "win32" && cmd.options.detached !== false) {
+                yield* Effect.ignore(terminateProcessGroup(cmd, childProcess, exitSignal, cmd.options))
               }
-              return yield* Effect.void
+              return
             }
             if (!isReferenced) {
-              return yield* Effect.void
+              return
             }
-            // Process is still running, kill it
-            return yield* killWithTimeout((command, childProcess, signal) =>
-              killProcessGroup(command, childProcess, signal).pipe(
-                Effect.catch(() => killProcess(command, childProcess, signal)),
-                Effect.andThen(Deferred.await(exitSignal))
-              )
-            ).pipe(
-              Effect.ignore
-            )
+            yield* Effect.ignore(terminateProcessGroup(cmd, childProcess, exitSignal, cmd.options))
           })
         )
 
@@ -543,17 +593,8 @@ const make = Effect.gen(function*() {
           const error = new globalThis.Error(`Process interrupted due to receipt of signal: '${signal}'`)
           return Effect.fail(toPlatformError("exitCode", error, cmd))
         })
-        const kill = (options?: ChildProcess.KillOptions | undefined) => {
-          const killWithTimeout = withTimeout(childProcess, cmd, options)
-          return killWithTimeout((command, childProcess, signal) =>
-            killProcessGroup(command, childProcess, signal).pipe(
-              Effect.catch(() => killProcess(command, childProcess, signal)),
-              Effect.andThen(Deferred.await(exitSignal))
-            )
-          ).pipe(
-            Effect.asVoid
-          )
-        }
+        const kill = (options?: ChildProcess.KillOptions | undefined) =>
+          terminateProcessGroup(cmd, childProcess, exitSignal, options)
 
         return makeHandle({
           pid,
@@ -639,7 +680,7 @@ const make = Effect.gen(function*() {
           exitCode: handle.exitCode,
           isRunning: handle.isRunning,
           kill,
-          stdin: handle.stdin,
+          stdin: handles[0].stdin,
           stdout: handle.stdout,
           stderr: handle.stderr,
           all: handle.all,
diff --git a/repos/effect/packages/platform/node-shared/src/NodeFileSystem.ts b/repos/effect/packages/platform/node-shared/src/NodeFileSystem.ts
index 8be146df3..19fabb023 100644
--- a/repos/effect/packages/platform/node-shared/src/NodeFileSystem.ts
+++ b/repos/effect/packages/platform/node-shared/src/NodeFileSystem.ts
@@ -9,6 +9,8 @@
  *
  * @since 4.0.0
  */
+import * as BI from "effect/BigInt"
+import * as ByteSize from "effect/ByteSize"
 import * as Cause from "effect/Cause"
 import * as Effect from "effect/Effect"
 import { effectify } from "effect/Effect"
@@ -32,6 +34,24 @@ const handleBadArgument = (method: string) => (err: unknown) =>
     description: (err as Error).message ?? String(err)
   })
 
+const bigintToNumber = (value: bigint, field: string): number => {
+  const number = Number(value)
+  if (!Number.isSafeInteger(number)) {
+    throw new RangeError(`${field} exceeds the safe integer range: ${value}`)
+  }
+  return number
+}
+
+const bigintToNumberOption = (value: bigint | undefined): Option.Option<number> =>
+  Option.flatMap(Option.fromNullishOr(value), BI.toNumber)
+
+// fs.write ignores bigint positions.
+const positionToNumber = (position: bigint, method: string) =>
+  Effect.try({
+    try: () => bigintToNumber(position, "position"),
+    catch: handleBadArgument(method)
+  })
+
 // == access
 
 const access = ((): FileSystem.FileSystem["access"] => {
@@ -267,23 +287,25 @@ const makeFile = (() => {
     }
 
     get stat() {
-      return Effect.map(nodeStat(this.fd), makeFileInfo)
+      return Effect.flatMap(nodeStat(this.fd, { bigint: true }), makeFileInfo)
     }
 
     get sync() {
       return nodeSync(this.fd)
     }
 
-    seek(offset: FileSystem.SizeInput, from: FileSystem.SeekMode) {
-      const offsetSize = FileSystem.Size(offset)
-      return Effect.sync(() => {
-        if (from === "start") {
-          this.position = offsetSize
-        } else if (from === "current") {
-          this.position = this.position + offsetSize
+    seek(offset: bigint, from: FileSystem.SeekMode) {
+      return Effect.suspend(() => {
+        const position = from === "start" ? offset : this.position + offset
+        if (position < BigInt(0)) {
+          return Effect.fail(Error.badArgument({
+            module: "FileSystem",
+            method: "seek",
+            description: "Cannot seek before the start of the file"
+          }))
         }
-
-        return FileSystem.Size(this.position)
+        this.position = position
+        return Effect.succeed(position)
       })
     }
 
@@ -293,41 +315,46 @@ const makeFile = (() => {
         return Effect.map(
           nodeRead(this.fd, { buffer, position }),
           (bytesRead) => {
-            const sizeRead = FileSystem.Size(bytesRead)
-            this.position = position + sizeRead
-            return sizeRead
+            this.position = position + BigInt(bytesRead)
+            return bytesRead
           }
         )
       })
     }
 
-    readAlloc(size: FileSystem.SizeInput) {
-      const sizeNumber = Number(size)
+    readAlloc(size: number) {
       return Effect.suspend(() => {
-        const buffer = Buffer.allocUnsafeSlow(sizeNumber)
-        const position = this.position
-        return Effect.map(
-          nodeReadAlloc(this.fd, { buffer, position }),
-          (bytesRead): Option.Option<Buffer> => {
-            if (bytesRead === 0) {
-              return Option.none()
-            }
-
-            this.position = position + BigInt(bytesRead)
-            if (bytesRead === sizeNumber) {
-              return Option.some(buffer)
-            }
-
-            const dst = Buffer.allocUnsafeSlow(bytesRead)
-            buffer.copy(dst, 0, 0, bytesRead)
-            return Option.some(dst)
+        try {
+          if (!Number.isInteger(size) || size < 0) {
+            throw new RangeError("size must be a non-negative integer")
           }
-        )
+          const buffer = Buffer.allocUnsafeSlow(size)
+          const position = this.position
+          return Effect.map(
+            nodeReadAlloc(this.fd, { buffer, position }),
+            (bytesRead): Option.Option<Buffer> => {
+              if (bytesRead === 0) {
+                return Option.none()
+              }
+
+              this.position = position + BigInt(bytesRead)
+              if (bytesRead === size) {
+                return Option.some(buffer)
+              }
+
+              const dst = Buffer.allocUnsafeSlow(bytesRead)
+              buffer.copy(dst, 0, 0, bytesRead)
+              return Option.some(dst)
+            }
+          )
+        } catch (cause) {
+          return Effect.fail(handleBadArgument("readAlloc")(cause))
+        }
       })
     }
 
-    truncate(length?: FileSystem.SizeInput) {
-      return Effect.map(nodeTruncate(this.fd, length ? Number(length) : undefined), () => {
+    truncate(length?: number) {
+      return Effect.map(nodeTruncate(this.fd, length || undefined), () => {
         if (!this.append) {
           const len = BigInt(length ?? 0)
           if (this.position > len) {
@@ -340,15 +367,18 @@ const makeFile = (() => {
     write(buffer: Uint8Array) {
       return Effect.suspend(() => {
         const position = this.position
-        return Effect.map(
-          nodeWrite(this.fd, buffer, undefined, undefined, this.append ? undefined : Number(position)),
-          (bytesWritten) => {
-            const sizeWritten = FileSystem.Size(bytesWritten)
-            if (!this.append) {
-              this.position = position + sizeWritten
-            }
-            return sizeWritten
-          }
+        return Effect.flatMap(
+          this.append ? Effect.succeed(undefined) : positionToNumber(position, "write"),
+          (nodePosition) =>
+            Effect.map(
+              nodeWrite(this.fd, buffer, undefined, undefined, nodePosition),
+              (bytesWritten) => {
+                if (!this.append) {
+                  this.position = position + BigInt(bytesWritten)
+                }
+                return bytesWritten
+              }
+            )
         )
       })
     }
@@ -357,32 +387,36 @@ const makeFile = (() => {
       return Effect.suspend(() => {
         const position = this.position
         return Effect.flatMap(
-          nodeWriteAll(this.fd, buffer, undefined, undefined, this.append ? undefined : Number(position)),
-          (bytesWritten) => {
-            if (bytesWritten === 0) {
-              return Effect.fail(
-                Error.systemError({
-                  module: "FileSystem",
-                  method: "writeAll",
-                  _tag: "WriteZero",
-                  pathOrDescriptor: this.fd,
-                  description: "write returned 0 bytes written"
-                })
-              )
-            }
-
-            if (!this.append) {
-              this.position = position + BigInt(bytesWritten)
-            }
-
-            return bytesWritten < buffer.length ? this.writeAllChunk(buffer.subarray(bytesWritten)) : Effect.void
-          }
+          this.append ? Effect.succeed(undefined) : positionToNumber(position, "writeAll"),
+          (nodePosition) =>
+            Effect.flatMap(
+              nodeWriteAll(this.fd, buffer, undefined, undefined, nodePosition),
+              (bytesWritten) => {
+                if (bytesWritten === 0) {
+                  return Effect.fail(
+                    Error.systemError({
+                      module: "FileSystem",
+                      method: "writeAll",
+                      _tag: "WriteZero",
+                      pathOrDescriptor: this.fd,
+                      description: "write returned 0 bytes written"
+                    })
+                  )
+                }
+
+                if (!this.append) {
+                  this.position = position + BigInt(bytesWritten)
+                }
+
+                return bytesWritten < buffer.length ? this.writeAllChunk(buffer.subarray(bytesWritten)) : Effect.void
+              }
+            )
         )
       })
     }
 
     writeAll(buffer: Uint8Array) {
-      return this.writeAllChunk(buffer)
+      return buffer.length === 0 ? Effect.void : this.writeAllChunk(buffer)
     }
   }
 
@@ -475,43 +509,47 @@ const rename = (() => {
 
 // == stat
 
-const makeFileInfo = (stat: NFS.Stats): FileSystem.File.Info => ({
-  type: stat.isFile() ?
-    "File" :
-    stat.isDirectory() ?
-    "Directory" :
-    stat.isSymbolicLink() ?
-    "SymbolicLink" :
-    stat.isBlockDevice() ?
-    "BlockDevice" :
-    stat.isCharacterDevice() ?
-    "CharacterDevice" :
-    stat.isFIFO() ?
-    "FIFO" :
-    stat.isSocket() ?
-    "Socket" :
-    "Unknown",
-  mtime: Option.fromNullishOr(stat.mtime),
-  atime: Option.fromNullishOr(stat.atime),
-  birthtime: Option.fromNullishOr(stat.birthtime),
-  dev: stat.dev,
-  rdev: Option.fromNullishOr(stat.rdev),
-  ino: Option.fromNullishOr(stat.ino),
-  mode: stat.mode,
-  nlink: Option.fromNullishOr(stat.nlink),
-  uid: Option.fromNullishOr(stat.uid),
-  gid: Option.fromNullishOr(stat.gid),
-  size: FileSystem.Size(stat.size),
-  blksize: stat.blksize !== undefined ? Option.some(FileSystem.Size(stat.blksize)) : Option.none(),
-  blocks: Option.fromNullishOr(stat.blocks)
-})
+const makeFileInfo = (stat: NFS.BigIntStats): Effect.Effect<FileSystem.File.Info, Error.PlatformError> =>
+  Effect.try({
+    try: (): FileSystem.File.Info => ({
+      type: stat.isFile() ?
+        "File" :
+        stat.isDirectory() ?
+        "Directory" :
+        stat.isSymbolicLink() ?
+        "SymbolicLink" :
+        stat.isBlockDevice() ?
+        "BlockDevice" :
+        stat.isCharacterDevice() ?
+        "CharacterDevice" :
+        stat.isFIFO() ?
+        "FIFO" :
+        stat.isSocket() ?
+        "Socket" :
+        "Unknown",
+      mtime: Option.fromNullishOr(stat.mtime),
+      atime: Option.fromNullishOr(stat.atime),
+      birthtime: Option.fromNullishOr(stat.birthtime),
+      dev: bigintToNumber(stat.dev, "dev"),
+      rdev: bigintToNumberOption(stat.rdev),
+      ino: bigintToNumberOption(stat.ino),
+      mode: bigintToNumber(stat.mode, "mode"),
+      nlink: bigintToNumberOption(stat.nlink),
+      uid: bigintToNumberOption(stat.uid),
+      gid: bigintToNumberOption(stat.gid),
+      size: ByteSize.bytes(stat.size),
+      blksize: stat.blksize !== undefined ? Option.some(ByteSize.bytes(stat.blksize)) : Option.none(),
+      blocks: bigintToNumberOption(stat.blocks)
+    }),
+    catch: handleBadArgument("stat")
+  })
 const stat = (() => {
   const nodeStat = effectify(
     NFS.stat,
     handleErrnoException("FileSystem", "stat"),
     handleBadArgument("stat")
   )
-  return (path: string) => Effect.map(nodeStat(path), makeFileInfo)
+  return (path: string) => Effect.flatMap(nodeStat(path, { bigint: true }), makeFileInfo)
 })()
 
 // == symlink
@@ -533,8 +571,7 @@ const truncate = (() => {
     handleErrnoException("FileSystem", "truncate"),
     handleBadArgument("truncate")
   )
-  return (path: string, length?: FileSystem.SizeInput) =>
-    nodeTruncate(path, length !== undefined ? Number(length) : undefined)
+  return (path: string, length?: number) => nodeTruncate(path, length)
 })()
 
 // == utimes
@@ -550,17 +587,18 @@ const utimes = (() => {
 
 // == watch
 
-const watchNode = (path: string, options?: FileSystem.WatchOptions) =>
+const watchNode = (path: string, info: FileSystem.File.Info, options?: FileSystem.WatchOptions) =>
   Stream.callback<FileSystem.WatchEvent, Error.PlatformError>((queue) =>
     Effect.acquireRelease(
       Effect.sync(() => {
+        const directory = info.type === "Directory" ? path : Path.dirname(path)
         const watcher = NFS.watch(path, {
           recursive: options?.recursive ?? false
         }, (event, path) => {
           if (!path) return
           switch (event) {
             case "rename": {
-              Effect.runFork(Effect.matchEffect(stat(path), {
+              Effect.runFork(Effect.matchEffect(stat(Path.resolve(directory, path)), {
                 onSuccess: (_) => Queue.offer(queue, { _tag: "Create", path }),
                 onFailure: (_) => Queue.offer(queue, { _tag: "Remove", path })
               }))
@@ -604,7 +642,7 @@ const watch = (
     Effect.map((stat) =>
       backend.pipe(
         Option.flatMap((_) => _.register(path, stat, options)),
-        Option.getOrElse(() => watchNode(path, options))
+        Option.getOrElse(() => watchNode(path, stat, options))
       )
     ),
     Stream.unwrap
diff --git a/repos/effect/packages/platform/node-shared/src/NodeHttpCompression.ts b/repos/effect/packages/platform/node-shared/src/NodeHttpCompression.ts
index 009fa8f61..f954d3868 100644
--- a/repos/effect/packages/platform/node-shared/src/NodeHttpCompression.ts
+++ b/repos/effect/packages/platform/node-shared/src/NodeHttpCompression.ts
@@ -93,7 +93,7 @@ export const make = (fallback: Platform.Compression): Platform.Compression => ({
     }
     return Effect.map(compress(body.body, algorithm, options), (result) =>
       Response.setHeader(
-        Response.setBody(response, HttpBody.uint8Array(result, body.contentType)),
+        Response.setBody(response, HttpBody.uint8Array(result, response.headers["content-type"] ?? body.contentType)),
         "content-length",
         result.byteLength.toString()
       ))
diff --git a/repos/effect/packages/platform/node-shared/src/NodeSink.ts b/repos/effect/packages/platform/node-shared/src/NodeSink.ts
index 8f02dbd4d..487bd1512 100644
--- a/repos/effect/packages/platform/node-shared/src/NodeSink.ts
+++ b/repos/effect/packages/platform/node-shared/src/NodeSink.ts
@@ -83,34 +83,53 @@ export const pullIntoWritable = <A, IE, E>(options: {
   options.pull.pipe(
     Effect.flatMap((chunk) => {
       let i = 0
-      return Effect.callback<void, E>(function loop(resume) {
-        for (; i < chunk.length;) {
-          const success = options.writable.write(chunk[i++], options.encoding as any)
-          if (!success) {
-            options.writable.once("drain", () => (loop as any)(resume))
-            return
+      return Effect.callback<void, E>((resume) => {
+        let cancelled = false
+        const loop = () => {
+          for (; i < chunk.length;) {
+            if (cancelled) {
+              return
+            }
+            const success = options.writable.write(chunk[i++], options.encoding as any)
+            if (!success) {
+              if (!cancelled) {
+                options.writable.once("drain", loop)
+              }
+              return
+            }
+          }
+          if (!cancelled) {
+            resume(Effect.void)
           }
         }
-        resume(Effect.void)
+        loop()
+        return Effect.sync(() => {
+          cancelled = true
+          options.writable.off("drain", loop)
+        })
       })
     }),
     Effect.forever({ disableYield: true }),
-    Effect.raceFirst(Effect.callback<never, E>((resume) => {
-      const onError = (error: unknown) => resume(Effect.fail(options.onError(error)))
-      options.writable.once("error", onError)
-      return Effect.sync(() => {
-        options.writable.off("error", onError)
-      })
-    })),
     options.endOnDone !== false ?
       Pull.catchDone((_) => {
         if ("closed" in options.writable && options.writable.closed) {
           return Cause.done(_)
         }
         return Effect.callback<never, E | Cause.Done<unknown>>((resume) => {
-          options.writable.once("finish", () => resume(Cause.done(_)))
+          const onFinish = () => resume(Cause.done(_))
+          options.writable.once("finish", onFinish)
           options.writable.end()
+          return Effect.sync(() => {
+            options.writable.off("finish", onFinish)
+          })
         })
       }) :
-      identity
+      identity,
+    Effect.raceFirst(Effect.callback<never, E>((resume) => {
+      const onError = (error: unknown) => resume(Effect.fail(options.onError(error)))
+      options.writable.once("error", onError)
+      return Effect.sync(() => {
+        options.writable.off("error", onError)
+      })
+    }))
   )
diff --git a/repos/effect/packages/platform/node-shared/src/NodeSocketServer.ts b/repos/effect/packages/platform/node-shared/src/NodeSocketServer.ts
index 9678bb405..eab3b11a2 100644
--- a/repos/effect/packages/platform/node-shared/src/NodeSocketServer.ts
+++ b/repos/effect/packages/platform/node-shared/src/NodeSocketServer.ts
@@ -22,6 +22,7 @@ import * as Function from "effect/Function"
 import * as Layer from "effect/Layer"
 import * as References from "effect/References"
 import * as Scope from "effect/Scope"
+import * as NetAddress from "effect/unstable/net/NetAddress"
 import * as Socket from "effect/unstable/socket/Socket"
 import * as SocketServer from "effect/unstable/socket/SocketServer"
 import type * as Http from "node:http"
@@ -32,6 +33,19 @@ import { NodeWS } from "./NodeSocket.ts"
 
 const isDeno = "Deno" in globalThis
 
+const socketAddressFromNode = (
+  address: string | Net.AddressInfo
+): Effect.Effect<NetAddress.SocketAddress, SocketServer.SocketServerError> =>
+  typeof address === "string"
+    ? Effect.succeed(NetAddress.unixPathAddress(address))
+    : Effect.fromResult(NetAddress.inetAddressFromIpString(address.address, address.port)).pipe(
+      Effect.mapError((cause) =>
+        new SocketServer.SocketServerError({
+          reason: new SocketServer.SocketServerOpenError({ cause })
+        })
+      )
+    )
+
 /**
  * Service tag for the Node `IncomingMessage` associated with the current
  * WebSocket server connection.
@@ -228,18 +242,9 @@ export const makeWebSocket: (
     )
   })
 
-  const address = server.address()!
+  const boundAddress = yield* socketAddressFromNode(server.address()!)
   return SocketServer.SocketServer.of({
-    address: typeof address === "string" ?
-      {
-        _tag: "UnixAddress",
-        path: address
-      } :
-      {
-        _tag: "TcpAddress",
-        hostname: address.address,
-        port: address.port
-      },
+    address: boundAddress,
     run
   })
 })
@@ -376,18 +381,9 @@ const makeNetServer = Effect.fnUntraced(function*(options: {
     })
   })
 
-  const address = server.address()!
+  const boundAddress = yield* socketAddressFromNode(server.address()!)
   return SocketServer.SocketServer.of({
-    address: typeof address === "string" ?
-      {
-        _tag: "UnixAddress",
-        path: address
-      } :
-      {
-        _tag: "TcpAddress",
-        hostname: address.address,
-        port: address.port
-      },
+    address: boundAddress,
     run
   })
 })
diff --git a/repos/effect/packages/platform/node-shared/src/NodeStream.ts b/repos/effect/packages/platform/node-shared/src/NodeStream.ts
index 17d677205..9bff3a84b 100644
--- a/repos/effect/packages/platform/node-shared/src/NodeStream.ts
+++ b/repos/effect/packages/platform/node-shared/src/NodeStream.ts
@@ -10,13 +10,13 @@
  * @since 4.0.0
  */
 import * as Arr from "effect/Array"
+import * as ByteSize from "effect/ByteSize"
 import * as Cause from "effect/Cause"
 import * as Channel from "effect/Channel"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as Exit from "effect/Exit"
 import * as Fiber from "effect/Fiber"
-import type { SizeInput } from "effect/FileSystem"
 import { dual, type LazyArg } from "effect/Function"
 import * as Latch from "effect/Latch"
 import * as MutableRef from "effect/MutableRef"
@@ -39,7 +39,6 @@ export const fromReadable = <A = Uint8Array, E = Cause.UnknownError>(options: {
   readonly evaluate: LazyArg<Readable | NodeJS.ReadableStream>
   readonly onError?: (error: unknown) => E
   readonly chunkSize?: number | undefined
-  readonly bufferSize?: number | undefined
   readonly closeOnDone?: boolean | undefined
 }): Stream.Stream<A, E> => Stream.fromChannel(fromReadableChannel<A, E>(options))
 
@@ -80,7 +79,6 @@ export const fromDuplex = <IE, I = Uint8Array, O = Uint8Array, E = Cause.Unknown
     readonly evaluate: LazyArg<Duplex>
     readonly onError?: (error: unknown) => E
     readonly chunkSize?: number | undefined
-    readonly bufferSize?: number | undefined
     readonly endOnDone?: boolean | undefined
     readonly encoding?: BufferEncoding | undefined
   }
@@ -88,6 +86,7 @@ export const fromDuplex = <IE, I = Uint8Array, O = Uint8Array, E = Cause.Unknown
   Channel.fromTransform((upstream, scope) => {
     const duplex = options.evaluate()
     const exit = MutableRef.make<Exit.Exit<never, IE | E | Cause.Done> | undefined>(undefined)
+    const latch = Latch.makeUnsafe(false)
 
     return pullIntoWritable({
       pull: upstream,
@@ -99,6 +98,7 @@ export const fromDuplex = <IE, I = Uint8Array, O = Uint8Array, E = Cause.Unknown
       Effect.catchCause((cause) => {
         if (Pull.isDoneCause(cause)) return Effect.void
         exit.current = Exit.failCause(cause as Cause.Cause<IE | E | Cause.Done>)
+        latch.openUnsafe()
         return Effect.void
       }),
       Effect.forkIn(scope),
@@ -106,6 +106,7 @@ export const fromDuplex = <IE, I = Uint8Array, O = Uint8Array, E = Cause.Unknown
         readableToPullUnsafe({
           scope,
           exit,
+          latch,
           readable: duplex,
           onError: options.onError ?? defaultOnError as any,
           chunkSize: options.chunkSize
@@ -127,7 +128,6 @@ export const pipeThroughDuplex: {
       readonly evaluate: LazyArg<Duplex>
       readonly onError?: (error: unknown) => E2
       readonly chunkSize?: number | undefined
-      readonly bufferSize?: number | undefined
       readonly endOnDone?: boolean | undefined
       readonly encoding?: BufferEncoding | undefined
     }
@@ -138,7 +138,6 @@ export const pipeThroughDuplex: {
       readonly evaluate: LazyArg<Duplex>
       readonly onError?: (error: unknown) => E2
       readonly chunkSize?: number | undefined
-      readonly bufferSize?: number | undefined
       readonly endOnDone?: boolean | undefined
       readonly encoding?: BufferEncoding | undefined
     }
@@ -149,7 +148,6 @@ export const pipeThroughDuplex: {
     readonly evaluate: LazyArg<Duplex>
     readonly onError?: (error: unknown) => E2
     readonly chunkSize?: number | undefined
-    readonly bufferSize?: number | undefined
     readonly endOnDone?: boolean | undefined
     readonly encoding?: BufferEncoding | undefined
   }
@@ -219,10 +217,10 @@ export const toString = <E = Cause.UnknownError>(
   options?: {
     readonly onError?: (error: unknown) => E
     readonly encoding?: BufferEncoding | undefined
-    readonly maxBytes?: SizeInput | undefined
+    readonly maxBytes?: ByteSize.Input | undefined
   }
 ): Effect.Effect<string, E> => {
-  const maxBytesNumber = options?.maxBytes !== undefined ? Number(options.maxBytes) : undefined
+  const maxBytesNumber = toMaxBytes(options?.maxBytes)
   const onError = options?.onError ?? defaultOnError
   const encoding = options?.encoding ?? "utf8"
   return Effect.callback((resume) => {
@@ -271,10 +269,10 @@ export const toArrayBuffer = <E = Cause.UnknownError>(
   readable: LazyArg<Readable | NodeJS.ReadableStream>,
   options?: {
     readonly onError?: (error: unknown) => E
-    readonly maxBytes?: SizeInput | undefined
+    readonly maxBytes?: ByteSize.Input | undefined
   }
 ): Effect.Effect<ArrayBuffer, E> => {
-  const maxBytesNumber = options?.maxBytes !== undefined ? Number(options.maxBytes) : undefined
+  const maxBytesNumber = toMaxBytes(options?.maxBytes)
   const onError = options?.onError ?? defaultOnError
   return Effect.callback((resume) => {
     const stream = readable() as Readable
@@ -324,7 +322,7 @@ export const toUint8Array = <E = Cause.UnknownError>(
   readable: LazyArg<Readable | NodeJS.ReadableStream>,
   options?: {
     readonly onError?: (error: unknown) => E
-    readonly maxBytes?: SizeInput | undefined
+    readonly maxBytes?: ByteSize.Input | undefined
   }
 ): Effect.Effect<Uint8Array, E> => Effect.map(toArrayBuffer(readable, options), (buffer) => new Uint8Array(buffer))
 
@@ -335,6 +333,7 @@ export const toUint8Array = <E = Cause.UnknownError>(
 const readableToPullUnsafe = <A, E>(options: {
   readonly scope: Scope.Scope
   readonly exit?: MutableRef.MutableRef<Exit.Exit<never, E | Cause.Done> | undefined> | undefined
+  readonly latch?: Latch.Latch | undefined
   readonly readable: Readable | NodeJS.ReadableStream
   readonly onError: (error: unknown) => E
   readonly chunkSize: number | undefined
@@ -344,7 +343,7 @@ const readableToPullUnsafe = <A, E>(options: {
 
   const closeOnDone = options.closeOnDone ?? true
   const exit = options.exit ?? MutableRef.make(undefined)
-  const latch = Latch.makeUnsafe(false)
+  const latch = options.latch ?? Latch.makeUnsafe(false)
   function onReadable() {
     latch.openUnsafe()
   }
@@ -448,3 +447,6 @@ class StreamAdapter<E, R> extends Readable {
 }
 
 const defaultOnError = (error: unknown): Cause.UnknownError => new Cause.UnknownError(error)
+
+const toMaxBytes = (maxBytes: ByteSize.Input | undefined): number | undefined =>
+  maxBytes === undefined || maxBytes === Infinity ? undefined : Number(ByteSize.fromInputUnsafe(maxBytes))
diff --git a/repos/effect/packages/platform/node-shared/test/HttpPlatform.test-utils.ts b/repos/effect/packages/platform/node-shared/test/HttpPlatform.test-utils.ts
new file mode 100644
index 000000000..f2fe62905
--- /dev/null
+++ b/repos/effect/packages/platform/node-shared/test/HttpPlatform.test-utils.ts
@@ -0,0 +1,27 @@
+import * as ByteSize from "effect/ByteSize"
+import * as Effect from "effect/Effect"
+import * as FileSystem from "effect/FileSystem"
+import * as Option from "effect/Option"
+
+const maxSafe = BigInt(Number.MAX_SAFE_INTEGER)
+const oversized = maxSafe + 2n
+
+export const fileSystemLayer = FileSystem.layerNoop({
+  stat: () =>
+    Effect.succeed({
+      type: "File",
+      size: ByteSize.bytes(oversized),
+      mtime: Option.none(),
+      atime: Option.none(),
+      birthtime: Option.none(),
+      dev: 0,
+      mode: 0,
+      ino: Option.none(),
+      nlink: Option.none(),
+      uid: Option.none(),
+      gid: Option.none(),
+      rdev: Option.none(),
+      blksize: Option.none(),
+      blocks: Option.none()
+    })
+})
diff --git a/repos/effect/packages/platform/node-shared/test/NodeChildProcessSpawner.test.ts b/repos/effect/packages/platform/node-shared/test/NodeChildProcessSpawner.test.ts
index 7c646284d..14afc6566 100644
--- a/repos/effect/packages/platform/node-shared/test/NodeChildProcessSpawner.test.ts
+++ b/repos/effect/packages/platform/node-shared/test/NodeChildProcessSpawner.test.ts
@@ -4,10 +4,16 @@ import * as NodeFileSystem from "@effect/platform-node-shared/NodeFileSystem"
 import * as NodePath from "@effect/platform-node-shared/NodePath"
 import { assert, describe, it } from "@effect/vitest"
 import * as ChildProcessSpawnerTest from "effect-test/unstable/process/ChildProcessSpawnerTest"
+import * as ByteSize from "effect/ByteSize"
+import * as Deferred from "effect/Deferred"
 import * as Effect from "effect/Effect"
+import * as Exit from "effect/Exit"
 import * as FileSystem from "effect/FileSystem"
 import * as Layer from "effect/Layer"
+import * as Scope from "effect/Scope"
+import * as Stream from "effect/Stream"
 import * as ChildProcess from "effect/unstable/process/ChildProcess"
+import { join } from "node:path"
 
 const NodeServices = NodeChildProcessSpawner.layer.pipe(
   Layer.provideMerge(Layer.mergeAll(
@@ -74,12 +80,28 @@ it.live("kills every process in a pipeline", () =>
     const childHeartbeat = `${directory}/child-heartbeat`
     const handle = yield* ChildProcess.make(
       "sh",
-      ["-c", "while :; do printf x >> \"$1\"; sleep 0.01; done", "pipeline-root", rootHeartbeat]
+      [
+        "-c",
+        "printf x >> \"$1\"; printf 'ROOT_READY\\n'; while :; do printf x >> \"$1\"; sleep 0.01; done",
+        "pipeline-root",
+        rootHeartbeat
+      ]
     ).pipe(ChildProcess.pipeTo(ChildProcess.make(
       "sh",
-      ["-c", "while :; do printf x >> \"$1\"; sleep 0.01; done", "pipeline-child", childHeartbeat]
+      [
+        "-c",
+        "printf x >> \"$1\"; printf 'CHILD_READY\\n'; read -r ready; printf '%s\\n' \"$ready\"; while :; do printf x >> \"$1\"; sleep 0.01; done",
+        "pipeline-child",
+        childHeartbeat
+      ]
     )))
-    yield* Effect.sleep("100 millis")
+    const readyLines = yield* handle.stdout.pipe(
+      Stream.decodeText,
+      Stream.splitLines,
+      Stream.take(2),
+      Stream.runCollect
+    )
+    assert.deepStrictEqual(readyLines, ["CHILD_READY", "ROOT_READY"])
     yield* handle.kill({ killSignal: "SIGKILL" })
     const rootSizeAfterKill = (yield* fs.stat(rootHeartbeat)).size
     const childSizeAfterKill = (yield* fs.stat(childHeartbeat)).size
@@ -87,6 +109,167 @@ it.live("kills every process in a pipeline", () =>
     const rootFinalSize = (yield* fs.stat(rootHeartbeat)).size
     const childFinalSize = (yield* fs.stat(childHeartbeat)).size
 
-    assert.strictEqual(rootFinalSize, rootSizeAfterKill)
-    assert.strictEqual(childFinalSize, childSizeAfterKill)
+    assert.strictEqual(ByteSize.toBigInt(rootFinalSize), ByteSize.toBigInt(rootSizeAfterKill))
+    assert.strictEqual(ByteSize.toBigInt(childFinalSize), ByteSize.toBigInt(childSizeAfterKill))
   }).pipe(Effect.scoped, Effect.provide(NodeServices)))
+
+const processGroupFixture = join(__dirname, "fixtures", "process-group.ts")
+
+// Use native timers under TestClock.
+const liveSleep = (millis: number) =>
+  Effect.callback<void>((resume) => {
+    const timer = setTimeout(() => resume(Effect.void), millis)
+    return Effect.sync(() => clearTimeout(timer))
+  })
+
+const liveTimeout = (millis: number) => <A, E, R>(effect: Effect.Effect<A, E, R>) =>
+  Effect.raceFirst(effect, liveSleep(millis).pipe(Effect.andThen(Effect.die(new Error("timed out")))))
+
+const startProcessGroup = (mode: "exit-on-signal" | "ignore-signal", options?: ChildProcess.CommandOptions) =>
+  Effect.gen(function*() {
+    const fs = yield* FileSystem.FileSystem
+    const directory = yield* fs.makeTempDirectoryScoped()
+    const marker = `${directory}/marker`
+    const scope = yield* Scope.fork(yield* Effect.scope)
+    const handle = yield* Scope.provide(scope)(ChildProcess.make(
+      process.execPath,
+      [processGroupFixture, "leader", mode, marker],
+      { stdin: "ignore", ...options }
+    ))
+    const ready = yield* Deferred.make<number>()
+    yield* handle.stdout.pipe(
+      Stream.decodeText,
+      Stream.splitLines,
+      Stream.runForEach((line) =>
+        line.startsWith("READY ") ? Deferred.succeed(ready, Number(line.slice("READY ".length))) : Effect.void
+      ),
+      Effect.forkScoped
+    )
+    const descendantPid = yield* Deferred.await(ready).pipe(liveTimeout(5_000))
+    return { handle, descendantPid, marker, scope }
+  })
+
+const killDescendant = (pid: number) =>
+  Effect.sync(() => {
+    try {
+      process.kill(pid, "SIGKILL")
+    } catch {}
+  })
+
+const assertHeartbeatStopped = (marker: string) =>
+  Effect.gen(function*() {
+    const fs = yield* FileSystem.FileSystem
+    const sizeAfterKill = (yield* fs.stat(marker)).size
+    yield* liveSleep(100)
+    const finalSize = (yield* fs.stat(marker)).size
+    assert.strictEqual(finalSize, sizeAfterKill)
+  })
+
+const timed = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
+  Effect.gen(function*() {
+    const start = Date.now()
+    yield* effect
+    return Date.now() - start
+  })
+
+describe.skipIf(process.platform === "win32")("process group cleanup", () => {
+  it.live("scope release cleans descendants after the leader exits successfully", () =>
+    Effect.gen(function*() {
+      const fs = yield* FileSystem.FileSystem
+      const { descendantPid, handle, marker, scope } = yield* startProcessGroup("exit-on-signal", { stdin: "pipe" })
+      yield* Effect.addFinalizer(() => killDescendant(descendantPid))
+
+      yield* Stream.run(Stream.make(new TextEncoder().encode("exit\n")), handle.stdin)
+      assert.strictEqual(yield* handle.exitCode, 0)
+      assert.doesNotThrow(() => process.kill(descendantPid, 0), "descendant must still be alive after the leader exits")
+      assert.isFalse(yield* fs.exists(marker))
+
+      yield* Scope.close(scope, Exit.void)
+
+      assert.strictEqual(yield* fs.readFileString(marker), "exited")
+    }).pipe(Effect.scoped, Effect.provide(NodeServices)))
+
+  it.live("scope release cleans descendants after the leader is killed externally", () =>
+    Effect.gen(function*() {
+      const fs = yield* FileSystem.FileSystem
+      const { descendantPid, handle, marker, scope } = yield* startProcessGroup("exit-on-signal")
+      yield* Effect.addFinalizer(() => killDescendant(descendantPid))
+
+      process.kill(handle.pid, "SIGKILL")
+      assert.isTrue(Exit.isFailure(yield* Effect.exit(handle.exitCode)))
+      assert.doesNotThrow(() => process.kill(descendantPid, 0), "descendant must survive the leader's SIGKILL")
+      assert.isFalse(yield* fs.exists(marker))
+
+      yield* Scope.close(scope, Exit.void)
+
+      assert.isTrue(yield* fs.exists(marker), "scope release must wait for the descendant's exit marker")
+      assert.strictEqual(yield* fs.readFileString(marker), "exited")
+    }).pipe(Effect.scoped, Effect.provide(NodeServices)))
+
+  it.live("scope release waits for descendants that outlive the leader", () =>
+    Effect.gen(function*() {
+      const fs = yield* FileSystem.FileSystem
+      const { handle, marker, scope } = yield* startProcessGroup("exit-on-signal")
+
+      yield* Scope.close(scope, Exit.void)
+
+      assert.isFalse(yield* handle.isRunning)
+      assert.isTrue(yield* fs.exists(marker))
+    }).pipe(Effect.scoped, Effect.provide(NodeServices)))
+
+  it.live("scope release force kills descendants that ignore the kill signal", () =>
+    Effect.gen(function*() {
+      const { marker, scope } = yield* startProcessGroup("ignore-signal", { forceKillAfter: "200 millis" })
+
+      yield* Scope.close(scope, Exit.void)
+
+      yield* assertHeartbeatStopped(marker)
+    }).pipe(Effect.scoped, Effect.provide(NodeServices)))
+
+  it.live("kill force kills descendants that ignore the kill signal", () =>
+    Effect.gen(function*() {
+      const { handle, marker, scope } = yield* startProcessGroup("ignore-signal")
+
+      yield* handle.kill({ forceKillAfter: "200 millis" })
+
+      assert.isFalse(yield* handle.isRunning)
+      yield* assertHeartbeatStopped(marker)
+      yield* Scope.close(scope, Exit.void)
+    }).pipe(Effect.scoped, Effect.provide(NodeServices)))
+
+  it.effect("forceKillAfter escalation does not depend on the Effect clock", () =>
+    Effect.gen(function*() {
+      const { marker, scope } = yield* startProcessGroup("ignore-signal", { forceKillAfter: "200 millis" })
+
+      const releaseMillis = yield* timed(Scope.close(scope, Exit.void))
+
+      assert.isBelow(releaseMillis, 2_000)
+      yield* assertHeartbeatStopped(marker)
+    }).pipe(Effect.scoped, Effect.provide(NodeServices)))
+
+  it.live("scope release returns when a descendant holds the inherited pipe without forceKillAfter", () =>
+    Effect.gen(function*() {
+      const { descendantPid, handle, scope } = yield* startProcessGroup("ignore-signal")
+
+      yield* Effect.gen(function*() {
+        const releaseMillis = yield* timed(Scope.close(scope, Exit.void))
+
+        assert.isFalse(yield* handle.isRunning)
+        assert.isAtLeast(releaseMillis, 1_000)
+        assert.isBelow(releaseMillis, 3_000)
+      }).pipe(Effect.ensuring(killDescendant(descendantPid)))
+    }).pipe(Effect.scoped, Effect.provide(NodeServices)))
+})
+
+it.live("scope release returns when stdout is unread and backpressured", () =>
+  Effect.gen(function*() {
+    const releaseMillis = yield* timed(Effect.scoped(Effect.gen(function*() {
+      yield* ChildProcess.make(process.execPath, [
+        "-e",
+        "process.stdout.write(\"x\".repeat(1024 * 1024)); setInterval(() => {}, 1000)"
+      ], { stdin: "ignore" })
+      yield* Effect.sleep("100 millis")
+    })))
+
+    assert.isBelow(releaseMillis, 2_000)
+  }).pipe(Effect.provide(NodeServices)))
diff --git a/repos/effect/packages/platform/node-shared/test/NodeFileSystem.test.ts b/repos/effect/packages/platform/node-shared/test/NodeFileSystem.test.ts
index c618ead16..6f0e5f82b 100644
--- a/repos/effect/packages/platform/node-shared/test/NodeFileSystem.test.ts
+++ b/repos/effect/packages/platform/node-shared/test/NodeFileSystem.test.ts
@@ -1,11 +1,15 @@
 import * as NodeFileSystem from "@effect/platform-node-shared/NodeFileSystem"
 import { assert, describe, it } from "@effect/vitest"
+import * as ByteSize from "effect/ByteSize"
 import * as Deferred from "effect/Deferred"
 import * as Effect from "effect/Effect"
 import * as Fiber from "effect/Fiber"
 import * as FileSystem from "effect/FileSystem"
+import * as Option from "effect/Option"
 import * as Stream from "effect/Stream"
 import * as TestClock from "effect/testing/TestClock"
+import type * as NFS from "node:fs"
+import { afterEach, beforeEach, vi } from "vitest"
 import { testLayer } from "../../../effect/test/FileSystem.test-utils.ts"
 
 const startWatch = <E, R>(
@@ -41,9 +45,38 @@ const startWatch = <E, R>(
     return fiber
   })
 
-describe("FileSystem", () => {
+describe("FileSystem", { concurrent: false }, () => {
   testLayer(NodeFileSystem.layer)
 
+  it.effect("writeAll accepts an empty buffer", () =>
+    Effect.gen(function*() {
+      const fs = yield* FileSystem.FileSystem
+      const path = yield* fs.makeTempFileScoped()
+      const file = yield* fs.open(path, { flag: "r+" })
+
+      yield* file.writeAll(new Uint8Array(0))
+    }).pipe(
+      Effect.provide(NodeFileSystem.layer)
+    ))
+
+  it.effect("watch reports Create for a new file outside the current directory", () =>
+    Effect.gen(function*() {
+      const fs = yield* FileSystem.FileSystem
+      const root = yield* fs.makeTempDirectoryScoped()
+      const name = "created.txt"
+      const path = `${root}/${name}`
+      assert.strictEqual(yield* fs.exists(name), false)
+
+      const fiber = yield* startWatch(fs, root, () => fs.watch(root))
+      yield* fs.writeFileString(path, "")
+
+      const event = yield* Fiber.join(fiber)
+      assert.strictEqual(yield* fs.exists(path), true)
+      assert.deepStrictEqual(event, { _tag: "Create", path: name })
+    }).pipe(
+      Effect.provide(NodeFileSystem.layer)
+    ))
+
   it.effect("watch does not report nested changes when recursive is false", () =>
     Effect.gen(function*() {
       const fs = yield* FileSystem.FileSystem
@@ -97,3 +130,176 @@ describe("FileSystem", () => {
       Effect.provide(NodeFileSystem.layer)
     ))
 })
+
+const state = vi.hoisted(() => ({
+  enabled: false,
+  values: {} as Record<string, bigint>,
+  positions: [] as Array<number | bigint | undefined>
+}))
+
+vi.mock("node:fs", async (importOriginal) => {
+  const original = await importOriginal<typeof NFS>()
+  // Match Node's number and bigint stat modes.
+  const stat = (
+    _pathOrFd: string | number,
+    optionsOrCallback: { bigint?: boolean } | ((error: null, stats: object) => void),
+    callback?: (error: null, stats: object) => void
+  ) => {
+    const bigint = typeof optionsOrCallback === "object" && optionsOrCallback.bigint
+    const done = typeof optionsOrCallback === "function" ? optionsOrCallback : callback!
+    done(null, {
+      ...Object.fromEntries(Object.entries(state.values).map(([key, value]) => [key, bigint ? value : Number(value)])),
+      mtime: new Date(0),
+      atime: new Date(0),
+      birthtime: new Date(0),
+      isFile: () => true
+    })
+  }
+  const doubles = {
+    open: (_path: string, _flags: string, _mode: unknown, callback: (error: null, fd: number) => void) =>
+      callback(null, 42),
+    close: (_fd: number, callback: (error: null) => void) => callback(null),
+    stat,
+    fstat: stat,
+    write: (
+      _fd: number,
+      _buffer: Uint8Array,
+      _offset: unknown,
+      _length: unknown,
+      position: number | bigint | undefined,
+      callback: (error: null, bytesWritten: number) => void
+    ) => {
+      state.positions.push(position)
+      callback(null, 1)
+    }
+  }
+  return {
+    ...original,
+    ...Object.fromEntries(
+      Object.entries(doubles).map(([name, implementation]) => [
+        name,
+        (...args: Array<unknown>) =>
+          Reflect.apply(state.enabled ? implementation : original[name as keyof typeof doubles], original, args)
+      ])
+    )
+  }
+})
+
+const maxSafe = BigInt(Number.MAX_SAFE_INTEGER)
+const oversized = maxSafe + 2n
+
+describe("NodeFileSystem precision", { concurrent: false }, () => {
+  afterEach(() => {
+    state.enabled = false
+  })
+  beforeEach(() => {
+    state.enabled = true
+    state.positions = []
+    state.values = {
+      size: 4n,
+      blksize: 4096n,
+      dev: 1n,
+      ino: 2n,
+      mode: 33188n,
+      nlink: 1n,
+      uid: 1000n,
+      gid: 1000n,
+      rdev: 0n,
+      blocks: 8n
+    }
+  })
+
+  for (const method of ["write", "writeAll"] as const) {
+    it.effect(`${method} rejects an unsafe position before writing`, () =>
+      Effect.gen(function*() {
+        const fs = yield* FileSystem.FileSystem
+        const file = yield* fs.open("precision.bin", { flag: "r+" })
+        yield* file.seek(oversized, "start")
+        const error = yield* Effect.flip(file[method](new Uint8Array([1])))
+        assert.strictEqual(error.reason._tag, "BadArgument")
+        assert.deepStrictEqual(state.positions, [])
+      }).pipe(Effect.provide(NodeFileSystem.layer)))
+  }
+
+  it.effect("writeAll stops when a partial write advances beyond the safe integer limit", () =>
+    Effect.gen(function*() {
+      const fs = yield* FileSystem.FileSystem
+      const file = yield* fs.open("precision.bin", { flag: "r+" })
+      yield* file.seek(maxSafe, "start")
+      const error = yield* Effect.flip(file.writeAll(new Uint8Array([1, 2])))
+      assert.strictEqual(error.reason._tag, "BadArgument")
+      assert.deepStrictEqual(state.positions, [Number.MAX_SAFE_INTEGER])
+      assert.strictEqual(yield* file.seek(0n, "current"), maxSafe + 1n)
+    }).pipe(Effect.provide(NodeFileSystem.layer)))
+
+  for (const method of ["stat", "fstat"] as const) {
+    const getInfo = Effect.gen(function*() {
+      const fs = yield* FileSystem.FileSystem
+      return yield* method === "stat" ? fs.stat("precision.bin") : (yield* fs.open("precision.bin")).stat
+    })
+
+    it.effect(`${method} preserves oversized byte counts`, () =>
+      Effect.gen(function*() {
+        state.values.size = oversized
+        state.values.blksize = oversized
+        const info = yield* getInfo
+        assert.strictEqual(info.size, ByteSize.bytes(oversized))
+        assert.strictEqual(Option.getOrThrow(info.blksize), ByteSize.bytes(oversized))
+      }).pipe(Effect.provide(NodeFileSystem.layer)))
+
+    for (const field of ["dev", "mode"] as const) {
+      it.effect(`${method} rejects unsafe ${field} metadata`, () =>
+        Effect.gen(function*() {
+          state.values[field] = maxSafe + 1n
+          const error = yield* Effect.flip(getInfo)
+          assert.strictEqual(error.reason._tag, "BadArgument")
+        }).pipe(Effect.provide(NodeFileSystem.layer)))
+    }
+
+    it.effect(`${method} omits only the overflowing optional field`, () =>
+      Effect.gen(function*() {
+        Object.assign(state.values, { ino: maxSafe + 1n, nlink: 3n, uid: 1000n, gid: 1001n, rdev: 0n, blocks: 8n })
+        const info = yield* getInfo
+        assert.deepStrictEqual(info.ino, Option.none())
+        assert.deepStrictEqual(info.nlink, Option.some(3))
+        assert.deepStrictEqual(info.uid, Option.some(1000))
+        assert.deepStrictEqual(info.gid, Option.some(1001))
+        assert.deepStrictEqual(info.rdev, Option.some(0))
+        assert.deepStrictEqual(info.blocks, Option.some(8))
+        assert.strictEqual(info.type, "File")
+        assert.strictEqual(info.size, ByteSize.bytes(4n))
+        assert.deepStrictEqual(info.mtime, Option.some(new Date(0)))
+      }).pipe(Effect.provide(NodeFileSystem.layer)))
+
+    for (
+      const { expected, name, value } of [
+        {
+          name: "preserves optional metadata at MAX_SAFE_INTEGER",
+          value: maxSafe,
+          expected: Option.some(Number.MAX_SAFE_INTEGER)
+        },
+        { name: "omits optional metadata above MAX_SAFE_INTEGER", value: maxSafe + 1n, expected: Option.none() },
+        { name: "omits missing optional metadata", value: undefined, expected: Option.none() }
+      ]
+    ) {
+      it.effect(`${method} ${name}`, () =>
+        Effect.gen(function*() {
+          const fields = ["ino", "nlink", "uid", "gid", "rdev", "blocks"] as const
+          for (const field of fields) {
+            if (value === undefined) {
+              delete state.values[field]
+            } else {
+              state.values[field] = value
+            }
+          }
+          const info = yield* getInfo
+          for (const field of fields) {
+            assert.deepStrictEqual(info[field], expected, field)
+          }
+          assert.strictEqual(info.type, "File")
+          assert.strictEqual(info.size, ByteSize.bytes(4n))
+          assert.deepStrictEqual(info.mtime, Option.some(new Date(0)))
+        }).pipe(Effect.provide(NodeFileSystem.layer)))
+    }
+  }
+})
diff --git a/repos/effect/packages/platform/node-shared/test/NodeSink.test.ts b/repos/effect/packages/platform/node-shared/test/NodeSink.test.ts
index 134018812..ded637969 100644
--- a/repos/effect/packages/platform/node-shared/test/NodeSink.test.ts
+++ b/repos/effect/packages/platform/node-shared/test/NodeSink.test.ts
@@ -1,11 +1,12 @@
 import * as NodeSink from "@effect/platform-node-shared/NodeSink"
 import * as NodeStream from "@effect/platform-node-shared/NodeStream"
 import { assert, describe, it } from "@effect/vitest"
-import { Effect } from "effect"
+import { Deferred, Effect, Exit, Fiber, Option } from "effect"
 import * as Data from "effect/Data"
 import * as Latch from "effect/Latch"
 import * as Queue from "effect/Queue"
 import * as Stream from "effect/Stream"
+import { TestClock } from "effect/testing"
 import { createReadStream } from "fs"
 import { join } from "path"
 import { Writable } from "stream"
@@ -14,6 +15,134 @@ import * as Tar from "tar"
 const TEST_TARBALL = join(__dirname, "fixtures", "helloworld.tar.gz")
 
 describe("Sink", () => {
+  it.effect("does not resume a selected drain callback after interruption", () =>
+    Effect.gen(function*() {
+      const items: Array<string> = []
+      const entered = yield* Deferred.make<() => void>()
+      const drained = yield* Deferred.make<void>()
+      const controller = new AbortController()
+      const writable = new Writable({
+        highWaterMark: 1,
+        write(chunk, _encoding, callback) {
+          items.push(chunk.toString())
+          if (chunk.toString() === "a") {
+            queueMicrotask(() => Deferred.doneUnsafe(entered, Effect.succeed(callback)))
+          } else {
+            callback()
+          }
+        }
+      })
+      yield* Effect.addFinalizer(() =>
+        Effect.sync(() => {
+          controller.abort()
+          writable.destroy()
+        })
+      )
+      writable.once("drain", () => controller.abort())
+      Effect.runCallback(
+        Stream.make("a", "b").pipe(
+          Stream.run(NodeSink.fromWritable({ evaluate: () => writable, onError: (error) => error }))
+        ),
+        { signal: controller.signal, onExit: () => {} }
+      )
+      const release = yield* Deferred.await(entered)
+      assert.deepEqual(items, ["a"])
+      writable.once("drain", () => {
+        queueMicrotask(() => Deferred.doneUnsafe(drained, Effect.void))
+      })
+      yield* Effect.sync(release)
+      yield* Deferred.await(drained)
+      assert.deepEqual(items, ["a"])
+    }))
+
+  it.effect.each(["normal_final", "write_error", "final_error"] as const)(
+    "writable lifecycle: %s",
+    (mode) =>
+      Effect.gen(function*() {
+        const error = new Error(mode)
+        const mapped = { _tag: "WritableError", cause: error }
+        const observed: Array<unknown> = []
+        const mappedErrors: Array<unknown> = []
+        const closed = yield* Deferred.make<void>()
+        const items: Array<string> = []
+        let finalized = false
+        const writable = new Writable({
+          write(chunk, _encoding, callback) {
+            items.push(chunk.toString())
+            callback(mode === "write_error" ? error : null)
+          },
+          final(callback) {
+            finalized = true
+            callback(mode === "final_error" ? error : null)
+          }
+        })
+        // Observe Node errors without handling them on behalf of the sink.
+        writable.on("error", (error) => observed.push(error))
+        writable.once("close", () => Deferred.doneUnsafe(closed, Effect.void))
+        yield* Effect.addFinalizer(() => Effect.sync(() => writable.destroy()))
+        const fiber = yield* Stream.make("a", "b").pipe(
+          Stream.run(NodeSink.fromWritable({
+            evaluate: () => writable,
+            onError: (error) => {
+              mappedErrors.push(error)
+              return mapped
+            }
+          })),
+          Effect.exit,
+          Effect.timeoutOption("1 second"),
+          Effect.forkScoped
+        )
+        yield* Deferred.await(closed)
+        // The writable has settled; advance only the virtual non-completion guard.
+        yield* TestClock.adjust("1 second")
+        assert.deepEqual(observed, mode === "normal_final" ? [] : [error])
+        assert.strictEqual(finalized, mode !== "write_error")
+        assert.deepEqual(items, mode === "write_error" ? ["a"] : ["a", "b"])
+        assert.deepEqual({ result: yield* Fiber.join(fiber), mappedErrors }, {
+          result: Option.some(mode === "normal_final" ? Exit.void : Exit.fail(mapped)),
+          mappedErrors: mode === "normal_final" ? [] : [error]
+        })
+      })
+  )
+
+  it.effect.each(["error", "interrupt"] as const)(
+    "cleans up finalization listeners on %s",
+    (mode) =>
+      Effect.gen(function*() {
+        const finalizing = yield* Deferred.make<(error?: Error | null) => void>()
+        const error = new Error("finalization failed")
+        const writable = new Writable({
+          write(_chunk, _encoding, callback) {
+            callback()
+          },
+          final(callback) {
+            queueMicrotask(() => Deferred.doneUnsafe(finalizing, Effect.succeed(callback)))
+          }
+        })
+        const observed: Array<unknown> = []
+        writable.on("error", (error) => observed.push(error))
+        yield* Effect.addFinalizer(() => Effect.sync(() => writable.destroy()))
+        const fiber = yield* Stream.make("a").pipe(
+          Stream.run(NodeSink.fromWritable({ evaluate: () => writable, onError: (error) => error })),
+          Effect.forkScoped
+        )
+        const release = yield* Deferred.await(finalizing)
+        assert.strictEqual(writable.listenerCount("finish"), 1)
+        if (mode === "error") {
+          yield* Effect.sync(() => release(error))
+          assert.deepEqual(yield* Fiber.await(fiber), Exit.fail(error))
+        } else {
+          yield* Fiber.interrupt(fiber)
+        }
+        assert.strictEqual(writable.listenerCount("finish"), 0)
+        assert.strictEqual(writable.listenerCount("error"), 1)
+        assert.deepEqual(observed, mode === "error" ? [error] : [])
+        if (mode === "interrupt") {
+          yield* Effect.sync(() => release())
+        }
+      })
+  )
+
   it.effect("should write to a stream", () =>
     Effect.gen(function*() {
       const items: Array<string> = []
diff --git a/repos/effect/packages/platform/node-shared/test/NodeStream.test.ts b/repos/effect/packages/platform/node-shared/test/NodeStream.test.ts
index 1e83b879f..7b0872d7a 100644
--- a/repos/effect/packages/platform/node-shared/test/NodeStream.test.ts
+++ b/repos/effect/packages/platform/node-shared/test/NodeStream.test.ts
@@ -2,6 +2,7 @@ import * as NodeStream from "@effect/platform-node-shared/NodeStream"
 import { assert, describe, it } from "@effect/vitest"
 import { Effect } from "effect"
 import * as Array from "effect/Array"
+import * as ByteSize from "effect/ByteSize"
 import * as Channel from "effect/Channel"
 import * as Console from "effect/Console"
 import * as Stream from "effect/Stream"
@@ -76,6 +77,25 @@ describe("Stream", () => {
       assert.strictEqual(result, "ABC")
     }))
 
+  it.effect("pipeThroughDuplex propagates upstream failure", () =>
+    Effect.gen(function*() {
+      const result = yield* Stream.fail("upstream error").pipe(
+        NodeStream.pipeThroughDuplex({
+          evaluate: () =>
+            new Duplex({
+              read() {},
+              write(_chunk, _encoding, callback) {
+                callback()
+              }
+            })
+        }),
+        Stream.runDrain,
+        Effect.flip
+      )
+
+      assert.strictEqual(result, "upstream error")
+    }))
+
   it.effect("pipeThroughDuplex write error", () =>
     Effect.gen(function*() {
       const result = yield* Stream.fromArray(["a", "b", "c"]).pipe(
@@ -181,6 +201,16 @@ describe("Stream", () => {
       assert.strictEqual(stream.listenerCount("error"), 1)
     }))
 
+  it.effect("collects strings and array buffers with an Infinity maxBytes limit", () =>
+    Effect.gen(function*() {
+      const chunks = [Buffer.from("hello "), Buffer.from("world")]
+      const text = yield* NodeStream.toString(() => Readable.from(chunks), { maxBytes: Infinity })
+      const buffer = yield* NodeStream.toArrayBuffer(() => Readable.from(chunks), { maxBytes: Infinity })
+
+      assert.strictEqual(text, "hello world")
+      assert.deepStrictEqual(new Uint8Array(buffer), new TextEncoder().encode("hello world"))
+    }))
+
   it.effect("toString enforces a zero maxBytes limit", () =>
     Effect.gen(function*() {
       let emitted = false
@@ -192,7 +222,7 @@ describe("Stream", () => {
         }
       })
       const error = yield* NodeStream.toString(() => stream, {
-        maxBytes: 0,
+        maxBytes: "0 B",
         onError: () => "maxBytes exceeded" as const
       }).pipe(Effect.flip)
 
@@ -211,7 +241,7 @@ describe("Stream", () => {
         }
       })
       const error = yield* NodeStream.toArrayBuffer(() => stream, {
-        maxBytes: 0,
+        maxBytes: ByteSize.zero,
         onError: () => "maxBytes exceeded" as const
       }).pipe(Effect.flip)
 
diff --git a/repos/effect/packages/platform/node-shared/test/fixtures/node-terminal.ts b/repos/effect/packages/platform/node-shared/test/fixtures/node-terminal.ts
index 63f6ea590..d714cf5e5 100644
--- a/repos/effect/packages/platform/node-shared/test/fixtures/node-terminal.ts
+++ b/repos/effect/packages/platform/node-shared/test/fixtures/node-terminal.ts
@@ -16,8 +16,8 @@ const TerminalLayer = Layer.mergeAll(
 )
 
 const prompts = Effect.gen(function*() {
-  const first = yield* Prompt.run(Prompt.confirm({ message: "First" }))
-  const second = yield* Prompt.run(Prompt.confirm({ message: "Second" })).pipe(Effect.flip)
+  const first = yield* Prompt.run(Prompt.Confirm({ message: "First" }))
+  const second = yield* Prompt.run(Prompt.Confirm({ message: "Second" })).pipe(Effect.flip)
   return { first, second: second._tag }
 })
 
diff --git a/repos/effect/packages/platform/node-shared/test/fixtures/process-group.ts b/repos/effect/packages/platform/node-shared/test/fixtures/process-group.ts
new file mode 100644
index 000000000..7c35be675
--- /dev/null
+++ b/repos/effect/packages/platform/node-shared/test/fixtures/process-group.ts
@@ -0,0 +1,30 @@
+import { spawn } from "node:child_process"
+import { appendFileSync, writeFileSync } from "node:fs"
+
+// The leader and descendant share a process group and inherited stdio. The
+// leader keeps the default SIGTERM behavior. The descendant either exits 200ms
+// after SIGTERM or ignores it while writing heartbeats to the marker file.
+const [role, mode, marker] = process.argv.slice(2)
+
+if (role === "leader") {
+  spawn(process.execPath, [process.argv[1], "descendant", mode, marker], {
+    stdio: ["ignore", "inherit", "inherit"]
+  })
+  process.stdin.once("data", () => process.exit(0))
+  setInterval(() => {}, 1_000)
+} else {
+  if (mode === "exit-on-signal") {
+    process.on("SIGTERM", () => {
+      setTimeout(() => {
+        writeFileSync(marker, "exited")
+        process.exit(0)
+      }, 200)
+    })
+  } else {
+    process.on("SIGTERM", () => {})
+    appendFileSync(marker, "x")
+    setInterval(() => appendFileSync(marker, "x"), 10)
+  }
+  setTimeout(() => process.exit(1), 5_000)
+  process.stdout.write(`READY ${process.pid}\n`)
+}
diff --git a/repos/effect/packages/platform/node/CHANGELOG.md b/repos/effect/packages/platform/node/CHANGELOG.md
index 087c67b29..55b7b3913 100644
--- a/repos/effect/packages/platform/node/CHANGELOG.md
+++ b/repos/effect/packages/platform/node/CHANGELOG.md
@@ -1,5 +1,122 @@
 # @effect/platform-node
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+  - @effect/platform-node-shared@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- [#8254](https://github.com/Effect-TS/effect/pull/8254) [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a) Thanks @tim-smart! - Fix file response content types: honor the `contentType` option and preserve explicit headers, including MIME types set by `HttpStaticServer`. The default `HttpPlatform.layer` now infers missing content types from file extensions.
+  
+  Web file responses on the default, Node, and Deno platforms prefer explicit content types, then nonempty `File.type`, then the file extension.
+  
+  Removed the unused `contentLength` option from `HttpServerResponse.file`; lengths are calculated from the file and requested range.
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`05a6405`](https://github.com/Effect-TS/effect/commit/05a6405d3d729f9487121249435eae810233b949), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+  - @effect/platform-node-shared@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+  - @effect/platform-node-shared@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+  - @effect/platform-node-shared@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7463](https://github.com/Effect-TS/effect/pull/7463) [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b) Thanks @tim-smart! - Remove the `mime` runtime dependency. The new `effect/unstable/http/Mime` module provides top-level lookup functions
+  backed by a vendored standard MIME registry.
+
+- [#7477](https://github.com/Effect-TS/effect/pull/7477) [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803) Thanks @candrewlee14! - Allow sockets to use browser, Bun, and Node WebSocket implementations without consumer casts. Platform constructors
+  now support typed opening-handshake headers where available.
+
+- [#8096](https://github.com/Effect-TS/effect/pull/8096) [`cce221e`](https://github.com/Effect-TS/effect/commit/cce221ebf450bbcf067f73bce98598303f6e4798) Thanks @tim-smart! - Update dependencies to their latest compatible versions.
+
+- [#7650](https://github.com/Effect-TS/effect/pull/7650) [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee) Thanks @tim-smart! - Reduce HTTP server allocation churn when tracing is not configured and for requests that complete synchronously.
+
+- [#7772](https://github.com/Effect-TS/effect/pull/7772) [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de) Thanks @tim-smart! - Improve HTTP server throughput by reducing routing, request handling, response
+  construction, and body encoding overhead. Add `Effect.withFiberSucceed` for
+  synchronously computing successful values from the current fiber. Copy pooled
+  byte views by their exact range when exposing `ArrayBuffer` values.
+
+- [#7511](https://github.com/Effect-TS/effect/pull/7511) [`a4bb2aa`](https://github.com/Effect-TS/effect/commit/a4bb2aa22698ea8a98d5172d81305f4f74bd7caa) Thanks @tim-smart! - Add `NodeSocket.makeTls`, `NodeSocket.makeTlsChannel`, and `NodeSocket.layerTls` for TLS client connections.
+  
+  These mirror the existing `makeNet` family but dial `tls.connect`, so they take the full `tls.ConnectionOptions` set:
+  trust anchors (`ca`), client certificates (`cert` / `key`), ALPN protocols, and `servername`. The socket opens once the
+  handshake completes; a failed handshake fails with a `SocketOpenError`.
+
+- [#7512](https://github.com/Effect-TS/effect/pull/7512) [`5664c94`](https://github.com/Effect-TS/effect/commit/5664c941b522a5f318e609b9c45f2eb4c2b92ea1) Thanks @tim-smart! - Add `NodeSocketServer.makeTls` and `NodeSocketServer.layerTls` for TLS socket servers.
+
+- [#7514](https://github.com/Effect-TS/effect/pull/7514) [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb) Thanks @tim-smart! - Add Socket.upgrade, for upgrading tcp sockets using STARTTLS
+
+- [#7525](https://github.com/Effect-TS/effect/pull/7525) [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132) Thanks @fubhy! - Add `ByteSize` module and use it across the ecosystem
+
+- [#8110](https://github.com/Effect-TS/effect/pull/8110) [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0) Thanks @tim-smart! - Prevent precision loss in Node/Bun filesystem operations and `HttpPlatform` file responses.
+
+- [#8148](https://github.com/Effect-TS/effect/pull/8148) [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528) Thanks @tim-smart! - Preserve the response Content-Type when compressing file, raw, stream, and byte-array responses on Node, Bun, Deno, and the web platform, including headers overridden after body construction.
+
+- [#7528](https://github.com/Effect-TS/effect/pull/7528) [`dd6ce2d`](https://github.com/Effect-TS/effect/commit/dd6ce2d6e32c86465a7e706ffd31c0925ec6a9b9) Thanks @Kashkovsky! - Defer loading Undici until an Undici-backed layer is acquired, preventing Node HTTP client imports from replacing Node's global fetch dispatcher. Import Undici APIs from `@effect/platform-node/Undici` instead of the package root.
+
+- [#7524](https://github.com/Effect-TS/effect/pull/7524) [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6) Thanks @fubhy! - Add `NetAddress` under `effect/unstable/net` for MAC, IP, internet socket, and Unix socket addresses, with checked parsing, schemas, equality, canonical string serialization, and URL formatting. Companion modules `IpInterface` and `IpNetwork` represent IP interfaces and CIDR networks.
+  
+  HTTP and socket servers now expose `NetAddress.SocketAddress`. Replace TCP `hostname` access with `NetAddress.formatIp(address.address)` and use `UnixPathAddress.path` for Unix sockets. URL helpers bracket IPv6 addresses and reject scoped IPv6. Bun and Deno HTTP server layers can now fail with `ServeError` when listener address conversion fails.
+  
+  PostgreSQL `inet` values now use `IpInterface`; `cidr` values use `IpNetwork` and reject addresses with host bits set.
+
+- [#7730](https://github.com/Effect-TS/effect/pull/7730) [`e406217`](https://github.com/Effect-TS/effect/commit/e406217f8c12f95626e72bb2b23054d8483b1009) Thanks @kitlangton! - Forward custom and empty status text from NodeHttpServer responses.
+
+- [#7716](https://github.com/Effect-TS/effect/pull/7716) [`f93d051`](https://github.com/Effect-TS/effect/commit/f93d051c3326c4d4e24aa8c2cde67c50850ec02a) Thanks @kitlangton! - Preserve response bytes when selecting the text reader in Node HTTP clients.
+
+- [#7810](https://github.com/Effect-TS/effect/pull/7810) [`9252a00`](https://github.com/Effect-TS/effect/commit/9252a00ba3cf8a9eacb72ed161d6bed306444f6c) Thanks @kitlangton! - Preserve reply payloads sent through `NodeWorkerRunner.sendUnsafe`.
+
+- [#7487](https://github.com/Effect-TS/effect/pull/7487) [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80) Thanks @tim-smart! - Redesign `Socket` around a scoped, pull-based reader with transport backpressure.
+  
+  `Socket` now exposes `reader` and `writer`. Client reader acquisition dials and yields a pull of non-empty batches: one buffer for TCP and one entry per WebSocket frame. TCP applies backpressure while paused; pausable WebSockets pause at `highWaterMark` (64 KiB by default) and resume after draining. Browser WebSockets cannot pause, so they can fail with `SocketReadError` at a configured `highWaterMark`. Writes await native drain signals and batch with `cork` / `uncork` where available.
+  
+  ### Breaking changes
+  
+  - `Socket.run`, `Socket.runString`, and `Socket.runRaw` are removed. Acquire `socket.reader` (or `Socket.readerBytes` / `Socket.readerString`) in a scope and pull in a loop. Code before the first pull replaces `onOpen`.
+  - `Socket.make` now takes `{ reader, writer }`. The writer acquisition is infallible and yields a `Writer` with `write` and `writeAll`; both operations can still fail with `SocketError`.
+  - Every close fails the pull with `SocketError` wrapping `SocketCloseError`. The close-code predicates are removed; use `Effect.retry` around the scoped read loop to reconnect.
+  - `Socket.toChannel` and `Socket.toChannelString` now read from the pull and fail on close. `Socket.toStream` is added for read-only consumption.
+  - `fromWebSocket` drops the `onInitialRun` option; `SendQueueCapacity` is removed.
+  - Accepted server sockets pause immediately. Their reader attaches to the existing connection and cannot reconnect after close.
+
+- [#7461](https://github.com/Effect-TS/effect/pull/7461) [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d) Thanks @tim-smart! - Remove the MessagePack encoding and RPC serialization APIs together with the `msgpackr` dependency. Event-log persistence and remote messages now use SchemaBinary, and cluster transports use SchemaBinary unless NDJSON is selected explicitly.
+
+- [#7496](https://github.com/Effect-TS/effect/pull/7496) [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed) Thanks @nikhilsnayak! - Add `HttpClientResponse.url`, including query parameters and excluding the hash. When redirects are followed, it reports
+  the final URL.
+
+- [#7427](https://github.com/Effect-TS/effect/pull/7427) [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e) Thanks @tim-smart! - Use SchemaBinary as the default RPC serialization for TCP cluster connections, including configurable frame limits.
+  
+  Cluster payloads are encoded with the binary codec on the wire. When a persisted reply cannot be encoded for JSON storage, the defect fallback that storage records is now also the reply delivered to waiting callers, so live replies always match what was persisted.
+  
+  SchemaBinary codecs are memoized by schema identity and wire mode, so per-message codec requests reuse the derived codec instead of rebuilding it.
+
+- [#7718](https://github.com/Effect-TS/effect/pull/7718) [`72b8582`](https://github.com/Effect-TS/effect/commit/72b85820f1baeb0abb21a47bd470720f58435a15) Thanks @kitlangton! - Parse URL-encoded and multipart response bodies in the Undici HTTP client.
+
+- [#7459](https://github.com/Effect-TS/effect/pull/7459) [`505dc05`](https://github.com/Effect-TS/effect/commit/505dc05dd68a80694f30bfaf772699494726f54d) Thanks @tim-smart! - Prevent NodeHttpServer from writing the route's HTTP response onto a connection that was upgraded to a WebSocket connection because stricter clients will interpret those bytes as WebSocket frames, logging "Invalid frame header" and failing the connection with an untyped 1006 error instead of the actual close code that the server sent.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`2f106a5`](https://github.com/Effect-TS/effect/commit/2f106a524557d5b57a50e29d437cde31f5d73838), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`a4bb2aa`](https://github.com/Effect-TS/effect/commit/a4bb2aa22698ea8a98d5172d81305f4f74bd7caa), [`5664c94`](https://github.com/Effect-TS/effect/commit/5664c941b522a5f318e609b9c45f2eb4c2b92ea1), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`a6ceb98`](https://github.com/Effect-TS/effect/commit/a6ceb98e89cffdb59297764299bdb35728af63f1), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`615c41e`](https://github.com/Effect-TS/effect/commit/615c41e193494b3305dad8a98000ed04e2718469), [`d0a6c5e`](https://github.com/Effect-TS/effect/commit/d0a6c5eee03c1f55748739252cdb04c1df37b844), [`500c60b`](https://github.com/Effect-TS/effect/commit/500c60b3ab502aed3f2764b6791ff71770e7bada), [`163cebd`](https://github.com/Effect-TS/effect/commit/163cebdc19e339e0bbf23035f3fa3e3322043627), [`37cdd69`](https://github.com/Effect-TS/effect/commit/37cdd692adb989da3dff6d65221e5c27fa025ad8), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`0beaf69`](https://github.com/Effect-TS/effect/commit/0beaf69e3c368b8aaa1fa6aa1066272f5c554128), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+  - @effect/platform-node-shared@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/platform/node/package.json b/repos/effect/packages/platform/node/package.json
index 1d2094974..affb4564b 100644
--- a/repos/effect/packages/platform/node/package.json
+++ b/repos/effect/packages/platform/node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@effect/platform-node",
   "type": "module",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "license": "MIT",
   "description": "Platform specific implementations for the Node.js runtime",
   "homepage": "https://effect.website",
@@ -67,7 +67,7 @@
   },
   "dependencies": {
     "@effect/platform-node-shared": "workspace:^",
-    "undici": "^8.10.0"
+    "undici": "^8.10.2"
   },
   "peerDependencies": {
     "effect": "workspace:^",
@@ -77,7 +77,7 @@
     "@testcontainers/mysql": "^12.1.0",
     "@testcontainers/postgresql": "^12.1.0",
     "@testcontainers/redis": "^12.1.0",
-    "@types/node": "^26.4.0",
+    "@types/node": "^26.6.2",
     "effect": "workspace:^",
     "redis": "^6.2.1"
   }
diff --git a/repos/effect/packages/platform/node/src/NodeClusterSocket.ts b/repos/effect/packages/platform/node/src/NodeClusterSocket.ts
index 5ba47f907..4f16656e8 100644
--- a/repos/effect/packages/platform/node/src/NodeClusterSocket.ts
+++ b/repos/effect/packages/platform/node/src/NodeClusterSocket.ts
@@ -31,7 +31,6 @@ import type { SqlClient } from "effect/unstable/sql/SqlClient"
 import * as NodeCrypto from "./NodeCrypto.ts"
 import * as NodeFileSystem from "./NodeFileSystem.ts"
 import * as NodeHttpClient from "./NodeHttpClient.ts"
-import * as Undici from "./Undici.ts"
 
 export {
   /**
@@ -150,10 +149,9 @@ export const layerDispatcherK8s: Layer.Layer<NodeHttpClient.Dispatcher> = Layer.
       Effect.option
     )
     if (caCertOption._tag === "Some") {
+      const Undici = yield* Effect.promise(() => import("./Undici.ts"))
       return yield* Effect.acquireRelease(
         Effect.sync(() =>
-          // oxlint cannot resolve values re-exported through the local Undici facade.
-          // oxlint-disable-next-line import/namespace
           new Undici.Agent({
             connect: {
               ca: caCertOption.value
diff --git a/repos/effect/packages/platform/node/src/NodeHttpClient.ts b/repos/effect/packages/platform/node/src/NodeHttpClient.ts
index 27fb8e097..00314661d 100644
--- a/repos/effect/packages/platform/node/src/NodeHttpClient.ts
+++ b/repos/effect/packages/platform/node/src/NodeHttpClient.ts
@@ -36,7 +36,7 @@ import { pipeline } from "node:stream/promises"
 import { NodeHttpIncomingMessage } from "./NodeHttpIncomingMessage.ts"
 import * as NodeSink from "./NodeSink.ts"
 import * as NodeStream from "./NodeStream.ts"
-import * as Undici from "./Undici.ts"
+import type * as Undici from "./Undici.ts"
 
 // -----------------------------------------------------------------------------
 // Fetch
@@ -90,6 +90,8 @@ export class Dispatcher extends Context.Service<Dispatcher, Undici.Dispatcher>()
   "@effect/platform-node/NodeHttpClient/Dispatcher"
 ) {}
 
+const loadUndici = Effect.promise(() => import("./Undici.ts"))
+
 /**
  * Acquires a new Undici `Agent` dispatcher and destroys it when the enclosing
  * scope is finalized.
@@ -98,9 +100,7 @@ export class Dispatcher extends Context.Service<Dispatcher, Undici.Dispatcher>()
  * @since 4.0.0
  */
 export const makeDispatcher: Effect.Effect<Undici.Dispatcher, never, Scope.Scope> = Effect.acquireRelease(
-  // oxlint cannot resolve values re-exported through the local Undici facade.
-  // oxlint-disable-next-line import/namespace
-  Effect.sync(() => new Undici.Agent()),
+  Effect.map(loadUndici, (_) => new _.Agent()),
   (dispatcher) => Effect.promise(() => dispatcher.destroy())
 )
 
@@ -119,9 +119,9 @@ export const layerDispatcher: Layer.Layer<Dispatcher> = Layer.effect(Dispatcher)
  * @category layers
  * @since 4.0.0
  */
-// oxlint cannot resolve values re-exported through the local Undici facade.
-// oxlint-disable-next-line import/namespace
-export const dispatcherLayerGlobal: Layer.Layer<Dispatcher> = Layer.sync(Dispatcher)(() => Undici.getGlobalDispatcher())
+export const dispatcherLayerGlobal: Layer.Layer<Dispatcher> = Layer.effect(Dispatcher)(
+  Effect.map(loadUndici, (_) => _.getGlobalDispatcher())
+)
 
 /**
  * Fiber reference containing default Undici request options applied to requests
@@ -156,7 +156,7 @@ export const makeUndici = Effect.gen(function*() {
               method: request.method,
               headers: request.headers,
               origin: url.origin,
-              path: url.pathname + url.search + url.hash,
+              path: url.pathname + url.search,
               body,
               // leave timeouts to Effect.timeout etc
               headersTimeout: 60 * 60 * 1000,
@@ -171,7 +171,7 @@ export const makeUndici = Effect.gen(function*() {
             })
         })
       ),
-      Effect.map((response) => new UndiciResponse(request, response))
+      Effect.map((response) => new UndiciResponse(request, response, url.href.split("#")[0]))
     )
   )
 })
@@ -203,16 +203,19 @@ class UndiciResponse extends Inspectable.Class implements HttpClientResponse, Pi
   readonly [Response.TypeId]: typeof Response.TypeId
   readonly request: HttpClientRequest
   readonly source: Undici.Dispatcher.ResponseData
+  readonly url: string
 
   constructor(
     request: HttpClientRequest,
-    source: Undici.Dispatcher.ResponseData
+    source: Undici.Dispatcher.ResponseData,
+    url: string
   ) {
     super()
     this[IncomingMessage.TypeId] = IncomingMessage.TypeId
     this[Response.TypeId] = Response.TypeId
     this.request = request
     this.source = source
+    this.url = url
     source.body.on("error", noopErrorHandler)
   }
 
@@ -275,18 +278,7 @@ class UndiciResponse extends Inspectable.Class implements HttpClientResponse, Pi
     if (this.textBody) {
       return this.textBody
     }
-    this.textBody = Effect.tryPromise({
-      try: () => this.source.body.text(),
-      catch: (cause) =>
-        new Error.HttpClientError({
-          reason: new Error.DecodeError({
-            request: this.request,
-            response: this,
-            cause
-          })
-        })
-    }).pipe(Effect.cached, Effect.runSync)
-    this.arrayBufferBody = Effect.map(this.textBody, (_) => new TextEncoder().encode(_).buffer)
+    this.textBody = Effect.map(this.arrayBuffer, (_) => new TextDecoder().decode(_))
     return this.textBody
   }
 
@@ -307,17 +299,18 @@ class UndiciResponse extends Inspectable.Class implements HttpClientResponse, Pi
 
   private formDataBody?: Effect.Effect<FormData, Error.HttpClientError>
   get formData(): Effect.Effect<FormData, Error.HttpClientError> {
-    return this.formDataBody ??= Effect.tryPromise({
-      try: () => this.source.body.formData() as Promise<FormData>,
-      catch: (cause) =>
-        new Error.HttpClientError({
-          reason: new Error.DecodeError({
-            request: this.request,
-            response: this,
-            cause
+    return this.formDataBody ??= Effect.flatMap(this.arrayBuffer, (body) =>
+      Effect.tryPromise({
+        try: () => new globalThis.Response(body, { headers: this.headers }).formData(),
+        catch: (cause) =>
+          new Error.HttpClientError({
+            reason: new Error.DecodeError({
+              request: this.request,
+              response: this,
+              cause
+            })
           })
-        })
-    }).pipe(Effect.cached, Effect.runSync)
+      })).pipe(Effect.cached, Effect.runSync)
   }
 
   private arrayBufferBody?: Effect.Effect<ArrayBuffer, Error.HttpClientError>
@@ -460,7 +453,7 @@ export const makeNodeHttp = Effect.gen(function*() {
       sendBody(nodeRequest, request, request.body).pipe(Effect.andThen(Effect.never))
     ).pipe(
       Effect.onError(() => Effect.sync(() => nodeRequest.destroy())),
-      Effect.map((_) => new NodeHttpResponse(request, _))
+      Effect.map((_) => new NodeHttpResponse(request, _, url.href.split("#")[0]))
     )
   })
 })
@@ -580,10 +573,12 @@ const waitForFinish = (nodeRequest: Http.ClientRequest, request: HttpClientReque
 class NodeHttpResponse extends NodeHttpIncomingMessage<Error.HttpClientError> implements HttpClientResponse, Pipeable {
   readonly [Response.TypeId]: typeof Response.TypeId
   readonly request: HttpClientRequest
+  readonly url: string
 
   constructor(
     request: HttpClientRequest,
-    source: Http.IncomingMessage
+    source: Http.IncomingMessage,
+    url: string
   ) {
     super(source, (cause) =>
       new Error.HttpClientError({
@@ -595,6 +590,7 @@ class NodeHttpResponse extends NodeHttpIncomingMessage<Error.HttpClientError> im
       }))
     this[Response.TypeId] = Response.TypeId
     this.request = request
+    this.url = url
   }
 
   get status() {
diff --git a/repos/effect/packages/platform/node/src/NodeHttpIncomingMessage.ts b/repos/effect/packages/platform/node/src/NodeHttpIncomingMessage.ts
index 3600259b1..67e0957db 100644
--- a/repos/effect/packages/platform/node/src/NodeHttpIncomingMessage.ts
+++ b/repos/effect/packages/platform/node/src/NodeHttpIncomingMessage.ts
@@ -76,17 +76,7 @@ export abstract class NodeHttpIncomingMessage<E> extends Inspectable.Class
     if (this.textEffect) {
       return this.textEffect
     }
-    this.textEffect = Effect.runSync(Effect.cached(
-      Effect.flatMap(
-        IncomingMessage.MaxBodySize,
-        (maxBodySize) =>
-          NodeStream.toString(() => this.source, {
-            onError: this.onError,
-            maxBytes: maxBodySize
-          })
-      )
-    ))
-    this.arrayBufferEffect = Effect.map(this.textEffect, (_) => new TextEncoder().encode(_).buffer)
+    this.textEffect = Effect.map(this.arrayBuffer, (_) => Buffer.from(_).toString("utf8"))
     return this.textEffect
   }
 
diff --git a/repos/effect/packages/platform/node/src/NodeHttpPlatform.ts b/repos/effect/packages/platform/node/src/NodeHttpPlatform.ts
index 368ddede3..7b1a0d56a 100644
--- a/repos/effect/packages/platform/node/src/NodeHttpPlatform.ts
+++ b/repos/effect/packages/platform/node/src/NodeHttpPlatform.ts
@@ -44,7 +44,7 @@ const compression = NodeHttpCompression.make({
             NodeStream.pipeThroughDuplex(body.stream, {
               evaluate: () => NodeHttpCompression.compressTransform(algorithm, options)
             }),
-            body.contentType
+            response.headers["content-type"] ?? body.contentType
           )
         ))
       }
@@ -57,7 +57,12 @@ const compression = NodeHttpCompression.make({
         transform.on("error", (cause) => readable.destroy(cause))
         transform.on("close", () => readable.destroy())
         return Effect.succeed(
-          compressedBody(response, HttpBody.raw(readable.pipe(transform), { contentType: body.contentType }))
+          compressedBody(
+            response,
+            HttpBody.raw(readable.pipe(transform), {
+              contentType: response.headers["content-type"] ?? body.contentType
+            })
+          )
         )
       }
       default: {
@@ -78,7 +83,7 @@ export const make = Platform.make({
   platform: "node",
   compression,
   fileResponse(path, status, statusText, headers, start, end, contentLength) {
-    const stream = contentLength === 0
+    const stream = contentLength === BigInt(0)
       ? Readable.from([])
       : Fs.createReadStream(path, { start, end: end === undefined ? undefined : end - 1 })
     return ServerResponse.raw(stream, {
@@ -98,7 +103,9 @@ export const make = Platform.make({
         headers,
         Headers.fromRecordUnsafe({
           "content-type": headers["content-type"] ??
-            Option.getOrElse(Mime.getType(file.name), () => "application/octet-stream"),
+            (file.type === ""
+              ? Option.getOrElse(Mime.getType(file.name), () => "application/octet-stream")
+              : file.type),
           "content-length": file.size.toString()
         })
       ),
diff --git a/repos/effect/packages/platform/node/src/NodeHttpServer.ts b/repos/effect/packages/platform/node/src/NodeHttpServer.ts
index dbaf21f2f..2e0f7e269 100644
--- a/repos/effect/packages/platform/node/src/NodeHttpServer.ts
+++ b/repos/effect/packages/platform/node/src/NodeHttpServer.ts
@@ -50,6 +50,7 @@ import * as Request from "effect/unstable/http/HttpServerRequest"
 import { HttpServerRequest } from "effect/unstable/http/HttpServerRequest"
 import type { HttpServerResponse } from "effect/unstable/http/HttpServerResponse"
 import type * as Multipart from "effect/unstable/http/Multipart"
+import * as NetAddress from "effect/unstable/net/NetAddress"
 import * as Socket from "effect/unstable/socket/Socket"
 import * as Http from "node:http"
 import type * as Net from "node:net"
@@ -131,6 +132,12 @@ export const make = Effect.fnUntraced(function*(
   })
 
   const address = server.address()!
+  const effectAddress = typeof address === "string"
+    ? Effect.succeed(NetAddress.unixPathAddress(address))
+    : Effect.fromResult(NetAddress.inetAddressFromIpString(address.address, address.port)).pipe(
+      Effect.mapError((cause) => new ServeError({ cause }))
+    )
+  const boundAddress = yield* effectAddress
 
   const wss = yield* Effect.acquireRelease(
     Effect.sync(() => new NodeWS.WebSocketServer({ ...options.websocket, noServer: true })),
@@ -144,16 +151,7 @@ export const make = Effect.fnUntraced(function*(
   )
 
   return HttpServer.make({
-    address: typeof address === "string" ?
-      {
-        _tag: "UnixAddress",
-        path: address
-      } :
-      {
-        _tag: "TcpAddress",
-        hostname: address.address === "::" ? "0.0.0.0" : address.address,
-        port: address.port
-      },
+    address: boundAddress,
     serve: Effect.fnUntraced(function*(httpApp, middleware) {
       const serveScope = yield* Effect.scope
       const scope = Scope.forkUnsafe(serveScope, "parallel")
@@ -208,11 +206,13 @@ export const makeHandler = <
     ) {
       const context = Context.add(services, HttpServerRequest, new ServerRequestImpl(nodeRequest, nodeResponse))
       const fiber = Fiber.runIn(Effect.runForkWith(context as Context.Context<any>)(handled), options.scope)
-      nodeResponse.on("close", () => {
-        if (!nodeResponse.writableEnded) {
-          fiber.interruptUnsafe(parent.id, ClientAbort.annotation)
-        }
-      })
+      if (fiber.pollUnsafe() === undefined) {
+        nodeResponse.on("close", () => {
+          if (!nodeResponse.writableEnded) {
+            fiber.interruptUnsafe(parent.id, ClientAbort.annotation)
+          }
+        })
+      }
     })
   })
 }
@@ -535,7 +535,7 @@ const handleResponse = (
   }
 
   if (request.method === "HEAD") {
-    nodeResponse.writeHead(response.status, headers)
+    nodeResponse.writeHead(response.status, response.statusText, headers)
     return Effect.andThen(
       cancelResponseBody(response.body),
       Effect.callback<void>((resume) => {
@@ -554,12 +554,12 @@ const handleResponse = (
   const body = response.body
   switch (body._tag) {
     case "Empty": {
-      nodeResponse.writeHead(response.status, headers)
+      nodeResponse.writeHead(response.status, response.statusText, headers)
       nodeResponse.end()
       return Effect.void
     }
     case "Raw": {
-      nodeResponse.writeHead(response.status, headers)
+      nodeResponse.writeHead(response.status, response.statusText, headers)
       if (
         typeof body.body === "object" && body.body !== null && "pipe" in body.body &&
         typeof body.body.pipe === "function"
@@ -585,20 +585,21 @@ const handleResponse = (
       })
     }
     case "Uint8Array": {
-      nodeResponse.writeHead(response.status, headers)
+      nodeResponse.writeHead(response.status, response.statusText, headers)
       // If the body is less than 1MB, we skip the callback
-      if (body.body.length < 1024 * 1024) {
-        nodeResponse.end(body.body)
+      if (body.contentLength < 1024 * 1024) {
+        // Writing text directly lets Node flush headers and body together.
+        nodeResponse.end(body.text ?? body.body)
         return Effect.void
       }
       return Effect.callback<void>((resume) => {
-        nodeResponse.end(body.body, () => resume(Effect.void))
+        nodeResponse.end(body.text ?? body.body, () => resume(Effect.void))
       })
     }
     case "FormData": {
       return Effect.suspend(() => {
         const r = new globalThis.Response(body.formData)
-        nodeResponse.writeHead(response.status, {
+        nodeResponse.writeHead(response.status, response.statusText, {
           ...headers,
           ...Object.fromEntries(r.headers)
         })
@@ -627,7 +628,7 @@ const handleResponse = (
       })
     }
     case "Stream": {
-      nodeResponse.writeHead(response.status, headers)
+      nodeResponse.writeHead(response.status, response.statusText, headers)
       const drainLatch = Latch.makeUnsafe()
       nodeResponse.on("drain", () => drainLatch.openUnsafe())
       return body.stream.pipe(
@@ -664,7 +665,7 @@ const handleCause = (
   Effect.flatMap(causeResponse(originalCause), ([response, cause]) => {
     const headersSent = nodeResponse.headersSent
     if (!headersSent) {
-      nodeResponse.writeHead(response.status)
+      nodeResponse.writeHead(response.status, response.statusText)
     }
     if (!nodeResponse.writableEnded) {
       nodeResponse.end()
diff --git a/repos/effect/packages/platform/node/src/NodeWorkerRunner.ts b/repos/effect/packages/platform/node/src/NodeWorkerRunner.ts
index f41ef5e5b..c67f8b1b7 100644
--- a/repos/effect/packages/platform/node/src/NodeWorkerRunner.ts
+++ b/repos/effect/packages/platform/node/src/NodeWorkerRunner.ts
@@ -38,11 +38,13 @@ export const layer: Layer.Layer<WorkerRunner.WorkerRunnerPlatform> = Layer.succe
         })
       }
 
-      const sendUnsafe = WorkerThreads.parentPort
+      const sendRaw = WorkerThreads.parentPort
         ? (_portId: number, message: any, transfers?: any) => WorkerThreads.parentPort!.postMessage(message, transfers)
         : (_portId: number, message: any, _transfers?: any) => process.send!(message)
+      const sendUnsafe = (_portId: number, message: O, transfers?: ReadonlyArray<unknown>) =>
+        sendRaw(_portId, [1, message], transfers)
       const send = (_portId: number, message: O, transfers?: ReadonlyArray<unknown>) =>
-        Effect.sync(() => sendUnsafe(_portId, [1, message], transfers as any))
+        Effect.sync(() => sendUnsafe(_portId, message, transfers))
 
       const run = <A, E, R>(
         handler: (portId: number, message: I) => Effect.Effect<A, E, R> | void
@@ -115,7 +117,7 @@ export const layer: Layer.Layer<WorkerRunner.WorkerRunnerPlatform> = Layer.succe
             })
           )
 
-          sendUnsafe(0, [0])
+          sendRaw(0, [0])
 
           return yield* Deferred.await(closeLatch)
         }))
diff --git a/repos/effect/packages/platform/node/src/index.ts b/repos/effect/packages/platform/node/src/index.ts
index 5d466bac0..5330e5c6d 100644
--- a/repos/effect/packages/platform/node/src/index.ts
+++ b/repos/effect/packages/platform/node/src/index.ts
@@ -2,7 +2,7 @@
  * @since 4.0.0
  */
 
-// @barrel: Auto-generated exports. Do not edit manually.
+// @barrel(Node*.ts): Auto-generated exports. Do not edit manually.
 
 /**
  * @since 4.0.0
@@ -123,8 +123,3 @@ export * as NodeWorker from "./NodeWorker.ts"
  * @since 4.0.0
  */
 export * as NodeWorkerRunner from "./NodeWorkerRunner.ts"
-
-/**
- * @since 4.0.0
- */
-export * as Undici from "./Undici.ts"
diff --git a/repos/effect/packages/platform/node/test/HttpApi.test.ts b/repos/effect/packages/platform/node/test/HttpApi.test.ts
index d435ce52e..1d89ad4e0 100644
--- a/repos/effect/packages/platform/node/test/HttpApi.test.ts
+++ b/repos/effect/packages/platform/node/test/HttpApi.test.ts
@@ -2,6 +2,7 @@ import { NodeHttpServer } from "@effect/platform-node"
 import { assert, describe, expect, it } from "@effect/vitest"
 import {
   Array,
+  ByteSize,
   Cause,
   Context,
   DateTime,
@@ -9,6 +10,7 @@ import {
   Equal,
   FileSystem,
   Layer,
+  Option,
   Redacted,
   Ref,
   Schema,
@@ -1744,7 +1746,7 @@ const HttpUsersLayer = HttpApiBuilder.group(
           const stat = yield* fs.stat(_.payload.file.path).pipe(Effect.orDie)
           return {
             contentType: _.payload.file.contentType,
-            length: Number(stat.size)
+            length: Option.getOrThrow(ByteSize.toNumber(stat.size))
           }
         }))
       .handle("uploadStream", (_) =>
diff --git a/repos/effect/packages/platform/node/test/HttpStaticServer.test.ts b/repos/effect/packages/platform/node/test/HttpStaticServer.test.ts
index 17d39e5ee..9e2f9cebd 100644
--- a/repos/effect/packages/platform/node/test/HttpStaticServer.test.ts
+++ b/repos/effect/packages/platform/node/test/HttpStaticServer.test.ts
@@ -179,6 +179,53 @@ describe("HttpStaticServer", () => {
     })
   })
 
+  const unsafeRangeInteger = (BigInt(Number.MAX_SAFE_INTEGER) + BigInt(1)).toString()
+
+  it.each([
+    `bytes=${unsafeRangeInteger}-`,
+    `bytes=${unsafeRangeInteger}-${unsafeRangeInteger}`
+  ])("returns 416 for a range start above Number.MAX_SAFE_INTEGER: %s", async (range) => {
+    await withStaticFiles(async ({ handler }) => {
+      const fullBody = await handler(new Request("http://localhost/range.txt")).then((response) => response.text())
+      const response = await handler(
+        new Request("http://localhost/range.txt", { headers: { Range: range } })
+      )
+
+      assert.strictEqual(response.status, 416)
+      assert.strictEqual(response.headers.get("content-range"), `bytes */${fullBody.length}`)
+      assert.strictEqual(await response.text(), "")
+    })
+  })
+
+  it.each([
+    `bytes=0-${unsafeRangeInteger}`,
+    `bytes=-${unsafeRangeInteger}`
+  ])("returns the whole file as 206 for range ends and suffixes above Number.MAX_SAFE_INTEGER: %s", async (range) => {
+    await withStaticFiles(async ({ handler }) => {
+      const fullBody = await handler(new Request("http://localhost/range.txt")).then((response) => response.text())
+      const response = await handler(new Request("http://localhost/range.txt", { headers: { Range: range } }))
+
+      assert.strictEqual(response.status, 206)
+      assert.strictEqual(response.headers.get("content-range"), `bytes 0-${fullBody.length - 1}/${fullBody.length}`)
+      assert.strictEqual(response.headers.get("content-length"), String(fullBody.length))
+      assert.strictEqual(await response.text(), fullBody)
+    })
+  })
+
+  it("clamps a range end above Number.MAX_SAFE_INTEGER while preserving a nonzero start", async () => {
+    await withStaticFiles(async ({ handler }) => {
+      const fullBody = await handler(new Request("http://localhost/range.txt")).then((response) => response.text())
+      const response = await handler(
+        new Request("http://localhost/range.txt", { headers: { Range: `bytes=5-${unsafeRangeInteger}` } })
+      )
+
+      assert.strictEqual(response.status, 206)
+      assert.strictEqual(response.headers.get("content-range"), `bytes 5-${fullBody.length - 1}/${fullBody.length}`)
+      assert.strictEqual(response.headers.get("content-length"), String(fullBody.length - 5))
+      assert.strictEqual(await response.text(), fullBody.slice(5))
+    })
+  })
+
   it("handles SPA fallback for html accept and missing routes", async () => {
     await withStaticFiles(async ({ handler }) => {
       const htmlFallback = await handler(new Request("http://localhost/missing", { headers: { accept: "text/html" } }))
diff --git a/repos/effect/packages/platform/node/test/HttpStaticServerConditional.test.ts b/repos/effect/packages/platform/node/test/HttpStaticServerConditional.test.ts
index 695ba7467..d225bcae4 100644
--- a/repos/effect/packages/platform/node/test/HttpStaticServerConditional.test.ts
+++ b/repos/effect/packages/platform/node/test/HttpStaticServerConditional.test.ts
@@ -1,4 +1,5 @@
 import { assert, describe, it } from "@effect/vitest"
+import * as ByteSize from "effect/ByteSize"
 import * as Effect from "effect/Effect"
 import * as FileSystem from "effect/FileSystem"
 import * as Layer from "effect/Layer"
@@ -50,7 +51,7 @@ const fileInfo: FileSystem.File.Info = {
   uid: Option.none(),
   gid: Option.none(),
   rdev: Option.none(),
-  size: FileSystem.Size(fileBody.length),
+  size: ByteSize.bytes(fileBody.length),
   blksize: Option.none(),
   blocks: Option.none()
 }
diff --git a/repos/effect/packages/platform/node/test/MultipartParser.test.ts b/repos/effect/packages/platform/node/test/MultipartParser.test.ts
index 3a5a38a1e..b0f4d7c3c 100644
--- a/repos/effect/packages/platform/node/test/MultipartParser.test.ts
+++ b/repos/effect/packages/platform/node/test/MultipartParser.test.ts
@@ -1,4 +1,5 @@
 import * as Node from "@effect/platform-node/NodeMultipartParser"
+import * as ByteSize from "effect/ByteSize"
 import * as Multipart from "effect/unstable/http/MultipartParser"
 import { assert, describe, expectTypeOf, test } from "vitest"
 
@@ -167,7 +168,7 @@ const cases: ReadonlyArray<MultipartCase> = [
     ],
     boundary: "----WebKitFormBoundaryTB2MiQ36fnSJlrhY",
     config: {
-      maxPartSize: 100
+      maxPartSize: ByteSize.bytes(100)
     },
     expected: [
       ["field", "first", "A".repeat(32), "text/plain"],
@@ -209,7 +210,7 @@ const cases: ReadonlyArray<MultipartCase> = [
     ],
     boundary: "---------------------------paZqsnEHRufoShdX6fh0lUhXBP4k",
     config: {
-      maxFieldSize: 5
+      maxFieldSize: ByteSize.bytes(5)
     },
     expected: [],
     errors: ["ReachedLimit"],
@@ -228,7 +229,7 @@ const cases: ReadonlyArray<MultipartCase> = [
     ],
     boundary: "---------------------------paZqsnEHRufoShdX6fh0lUhXBP4k",
     config: {
-      maxPartSize: 13
+      maxPartSize: ByteSize.bytes(13)
     },
     expected: [],
     errors: ["ReachedLimit"],
@@ -700,7 +701,7 @@ describe("node api", () => {
       headers: {
         "content-type": "multipart/form-data; boundary=boundary"
       },
-      maxPartSize: 100
+      maxPartSize: ByteSize.bytes(100)
     })
     let file: Node.FileStream | undefined
     parser.on("file", (part) => {
@@ -825,7 +826,8 @@ describe("node async-iterable api", () => {
   })
 })
 
-describe("random data", () => {
+// Synchronous parsing can starve the async suites.
+describe("random data", { concurrent: false }, () => {
   test("smoke test", () => {
     const boundary = "------WebKitFormBoundaryTB2MiQ36fnSJlrhY--"
     let seed = 0x9e3779b9
diff --git a/repos/effect/packages/platform/node/test/NodeHttpClient.test.ts b/repos/effect/packages/platform/node/test/NodeHttpClient.test.ts
index 4dc628d79..01a924a30 100644
--- a/repos/effect/packages/platform/node/test/NodeHttpClient.test.ts
+++ b/repos/effect/packages/platform/node/test/NodeHttpClient.test.ts
@@ -29,6 +29,32 @@ const TodoWithoutId = Schema.Struct({
   ...Struct.omit(Todo.fields, ["id"])
 })
 const largeResponseBody = "a".repeat(10 * 1024 * 1024)
+const responseBytes = new Uint8Array([0x89, 0x50, 0x4e, 0x47])
+const formDataResponses = [
+  {
+    name: "URL-encoded",
+    path: "/form/url-encoded",
+    contentType: "application/x-www-form-urlencoded",
+    body: "tag=one&tag=two"
+  },
+  {
+    name: "multipart",
+    path: "/form/multipart",
+    contentType: "multipart/form-data; boundary=effect-test",
+    body: [
+      "--effect-test",
+      "Content-Disposition: form-data; name=\"tag\"",
+      "",
+      "one",
+      "--effect-test",
+      "Content-Disposition: form-data; name=\"tag\"",
+      "",
+      "two",
+      "--effect-test--",
+      ""
+    ].join("\r\n")
+  }
+] as const
 
 const makeLocalServerClient = Effect.gen(function*() {
   const client = yield* HttpClient.HttpClient
@@ -66,6 +92,22 @@ const LocalServerRoutes = HttpRouter.serve(HttpRouter.addAll([
     })
   ),
   HttpRouter.route("GET", "/text", Effect.succeed(HttpServerResponse.text("test"))),
+  HttpRouter.route(
+    "QUERY",
+    "/search",
+    Effect.gen(function*() {
+      const request = yield* HttpServerRequest.HttpServerRequest
+      return HttpServerResponse.jsonUnsafe({
+        method: request.method,
+        contentType: request.headers["content-type"],
+        body: yield* request.text
+      })
+    })
+  ),
+  HttpRouter.route("GET", "/bytes", Effect.succeed(HttpServerResponse.uint8Array(responseBytes))),
+  ...formDataResponses.map(({ body, contentType, path }) =>
+    HttpRouter.route("GET", path, Effect.succeed(HttpServerResponse.text(body, { contentType })))
+  ),
   HttpRouter.route("GET", "/large", Effect.succeed(HttpServerResponse.text(largeResponseBody))),
   HttpRouter.route("GET", "/hang", Effect.never),
   HttpRouter.route("GET", "/redirect", Effect.succeed(HttpServerResponse.redirect("/redirected"))),
@@ -97,21 +139,41 @@ const LocalServerRoutes = HttpRouter.serve(HttpRouter.addAll([
   describe(`NodeHttpClient - ${name}`, () => {
     it.effect("text", () =>
       Effect.gen(function*() {
-        const response = yield* HttpClient.get("/text").pipe(
-          Effect.flatMap((_) => _.text)
-        )
-        expect(response).toBe("test")
+        const response = yield* HttpClient.get("/text?existing=1", {
+          urlParams: { value: "a#b" },
+          hash: "fragment"
+        })
+        const url = new URL(response.url)
+        assert.strictEqual(url.pathname, "/text")
+        assert.strictEqual(url.search, "?existing=1&value=a%23b")
+        assert.strictEqual(url.hash, "")
+        expect(yield* response.text).toBe("test")
+      }).pipe(Effect.provide(localServerTestLayer)))
+
+    it.effect("accessing text preserves response bytes", () =>
+      Effect.gen(function*() {
+        const response = yield* HttpClient.get("/bytes")
+        void response.text
+        assert.deepStrictEqual(new Uint8Array(yield* response.arrayBuffer), responseBytes)
       }).pipe(Effect.provide(localServerTestLayer)))
 
+    if (name === "undici") {
+      it.effect.each(formDataResponses)("parses $name response form data", ({ path }) =>
+        Effect.gen(function*() {
+          const response = yield* HttpClient.get(path)
+          const form = yield* response.formData
+          assert.deepStrictEqual(form.getAll("tag"), ["one", "two"])
+        }).pipe(Effect.provide(localServerTestLayer)))
+    }
+
     it.effect("local server followRedirects", () =>
       Effect.gen(function*() {
         const client = (yield* HttpClient.HttpClient).pipe(
           HttpClient.followRedirects()
         )
-        const response = yield* client.get("/redirect").pipe(
-          Effect.flatMap((_) => _.text)
-        )
-        expect(response).toBe("redirected")
+        const response = yield* client.get("/redirect")
+        expect(new URL(response.url).pathname).toBe("/redirected")
+        expect(yield* response.text).toBe("redirected")
       }).pipe(Effect.provide(localServerTestLayer)))
 
     it.effect("text stream", () =>
@@ -153,6 +215,21 @@ const LocalServerRoutes = HttpRouter.serve(HttpRouter.addAll([
         Effect.provide(localServerTestLayer)
       ))
 
+    it.effect("round trips QUERY method, body, and content type through the local server", () =>
+      Effect.gen(function*() {
+        const body = JSON.stringify({ query: "effect" })
+        const response = yield* HttpClient.query("/search", {
+          body: HttpBody.text(body, "application/json")
+        })
+
+        assert.strictEqual(response.status, 200)
+        assert.deepStrictEqual(yield* response.json, {
+          method: "QUERY",
+          contentType: "application/json",
+          body
+        })
+      }).pipe(Effect.provide(localServerTestLayer)))
+
     it.effect("head request with schemaJson", () =>
       Effect.gen(function*() {
         const client = yield* HttpClient.HttpClient
diff --git a/repos/effect/packages/platform/node/test/NodeHttpCompression.test.ts b/repos/effect/packages/platform/node/test/NodeHttpCompression.test.ts
index 6a70c0996..c597181dc 100644
--- a/repos/effect/packages/platform/node/test/NodeHttpCompression.test.ts
+++ b/repos/effect/packages/platform/node/test/NodeHttpCompression.test.ts
@@ -50,6 +50,28 @@ const get = (
 ) => handler(new Request("http://localhost/", headers === undefined ? {} : { headers }))
 
 describe("NodeHttpCompression", () => {
+  for (
+    const [name, makeResponse] of [
+      ["Stream", () => HttpServerResponse.stream(Stream.succeed(new TextEncoder().encode(bigJson)))],
+      ["Uint8Array", () => HttpServerResponse.uint8Array(new TextEncoder().encode(bigJson))]
+    ] as const
+  ) {
+    it(`preserves a Content-Type header override when compressing ${name} responses`, () => {
+      const original = HttpServerResponse.setHeader(makeResponse(), "content-type", "application/json")
+      assert.strictEqual(original.headers["content-type"], "application/json")
+      return withHandler(
+        Effect.succeed(original),
+        undefined,
+        async (handler) => {
+          const compressed = await get(handler, { "accept-encoding": "gzip" })
+          assert.strictEqual(compressed.headers.get("content-encoding"), "gzip")
+          assert.strictEqual(Zlib.gunzipSync(new Uint8Array(await compressed.arrayBuffer())).toString(), bigJson)
+          assert.strictEqual(compressed.headers.get("content-type"), original.headers["content-type"])
+        }
+      )
+    })
+  }
+
   it.effect("advertises supported algorithms", () =>
     Effect.gen(function*() {
       const platform = yield* HttpPlatform.HttpPlatform
@@ -136,6 +158,32 @@ describe("NodeHttpCompression", () => {
     )
   })
 
+  it.effect("preserves the Content-Type of file responses when compressed with Brotli", () =>
+    Effect.gen(function*() {
+      const directory = Fs.mkdtempSync(Path.join(Os.tmpdir(), "effect-http-compression-"))
+      yield* Effect.addFinalizer(() => Effect.sync(() => Fs.rmSync(directory, { recursive: true })))
+      const path = Path.join(directory, "index.html")
+      const contents = `<!doctype html><html><body>${"<p>Hello world</p>".repeat(100)}</body></html>`
+      Fs.writeFileSync(path, contents)
+
+      yield* HttpRouter.add("GET", "/file", HttpServerResponse.file(path)).pipe(
+        (self) => HttpRouter.serve(self, { middleware: HttpMiddleware.compression() }),
+        Layer.build
+      )
+
+      const uncompressed = yield* HttpClient.get("/file", { headers: { "accept-encoding": "identity" } })
+      assert.strictEqual(uncompressed.status, 200)
+      assert.strictEqual(uncompressed.headers["content-encoding"], undefined)
+      assert.strictEqual(uncompressed.headers["content-type"], "text/html")
+      assert.strictEqual(yield* uncompressed.text, contents)
+
+      const compressed = yield* HttpClient.get("/file", { headers: { "accept-encoding": "br" } })
+      assert.strictEqual(compressed.status, 200)
+      assert.strictEqual(compressed.headers["content-encoding"], "br")
+      assert.strictEqual(yield* compressed.text, contents)
+      assert.strictEqual(compressed.headers["content-type"], uncompressed.headers["content-type"])
+    }).pipe(Effect.provide(NodeHttpServer.layerTest)))
+
   it.effect("closes compressed file bodies for HEAD requests", () =>
     Effect.gen(function*() {
       const directory = Fs.mkdtempSync(Path.join(Os.tmpdir(), "effect-http-compression-"))
diff --git a/repos/effect/packages/platform/node/test/NodeHttpPlatform.test.ts b/repos/effect/packages/platform/node/test/NodeHttpPlatform.test.ts
index b98f28eea..146e30e7b 100644
--- a/repos/effect/packages/platform/node/test/NodeHttpPlatform.test.ts
+++ b/repos/effect/packages/platform/node/test/NodeHttpPlatform.test.ts
@@ -1,9 +1,15 @@
 import * as NodeHttpPlatform from "@effect/platform-node/NodeHttpPlatform"
 import { assert, describe, it } from "@effect/vitest"
+import * as ByteSize from "effect/ByteSize"
 import * as Effect from "effect/Effect"
+import * as Layer from "effect/Layer"
+import * as Etag from "effect/unstable/http/Etag"
 import type * as HttpBody from "effect/unstable/http/HttpBody"
 import * as HttpPlatform from "effect/unstable/http/HttpPlatform"
+import * as Fs from "node:fs"
 import { Readable } from "node:stream"
+import { afterEach, beforeEach, vi } from "vitest"
+import { fileSystemLayer } from "../../node-shared/test/HttpPlatform.test-utils.ts"
 
 const readStream = (stream: Readable) =>
   Effect.promise(async () => {
@@ -14,13 +20,20 @@ const readStream = (stream: Readable) =>
     return text
   })
 
-describe("NodeHttpPlatform", () => {
+describe("NodeHttpPlatform", { concurrent: false }, () => {
+  it.effect("fileWebResponse prefers File.type over the extension", () =>
+    Effect.gen(function*() {
+      const platform = yield* HttpPlatform.HttpPlatform
+      const response = yield* platform.fileWebResponse(new File([], "script.js", { type: "application/custom" }))
+      assert.strictEqual(response.headers["content-type"], "application/custom")
+    }).pipe(Effect.provide(NodeHttpPlatform.layer)))
+
   it.effect("fileResponse reads exact bytesToRead", () =>
     Effect.gen(function*() {
       const platform = yield* HttpPlatform.HttpPlatform
       const response = yield* platform.fileResponse(`${__dirname}/fixtures/text.txt`, {
-        offset: 6,
-        bytesToRead: 5
+        offset: ByteSize.bytes(6),
+        bytesToRead: ByteSize.bytes(5)
       })
 
       assert.strictEqual(response.headers["content-length"], "5")
@@ -33,12 +46,38 @@ describe("NodeHttpPlatform", () => {
       assert.strictEqual(text, "ipsum")
     }).pipe(Effect.provide(NodeHttpPlatform.layer)))
 
+  for (
+    const { name, offset, bytesToRead, expected } of [
+      { name: "clamps bytesToRead beyond EOF", offset: 22, bytesToRead: 100, expected: "amet\n" },
+      { name: "returns an empty body at EOF", offset: 27, bytesToRead: undefined, expected: "" },
+      { name: "returns an empty body past EOF", offset: 50, bytesToRead: undefined, expected: "" },
+      { name: "clamps bytesToRead at EOF", offset: 27, bytesToRead: 100, expected: "" },
+      { name: "clamps bytesToRead past EOF", offset: 50, bytesToRead: 100, expected: "" }
+    ]
+  ) {
+    it.effect(`fileResponse ${name}`, () =>
+      Effect.gen(function*() {
+        const platform = yield* HttpPlatform.HttpPlatform
+        const response = yield* platform.fileResponse(`${__dirname}/fixtures/text.txt`, {
+          offset: ByteSize.bytes(offset),
+          bytesToRead: bytesToRead === undefined ? undefined : ByteSize.bytes(bytesToRead)
+        })
+
+        assert.strictEqual(response.body._tag, "Raw")
+        const text = yield* readStream((response.body as HttpBody.Raw).body as Readable)
+        assert.deepStrictEqual(
+          { contentLength: response.headers["content-length"], body: text },
+          { contentLength: String(expected.length), body: expected }
+        )
+      }).pipe(Effect.provide(NodeHttpPlatform.layer)))
+  }
+
   it.effect("fileResponse supports zero bytesToRead", () =>
     Effect.gen(function*() {
       const platform = yield* HttpPlatform.HttpPlatform
       const response = yield* platform.fileResponse(`${__dirname}/fixtures/text.txt`, {
-        offset: 6,
-        bytesToRead: 0
+        offset: ByteSize.bytes(6),
+        bytesToRead: ByteSize.zero
       })
 
       assert.strictEqual(response.headers["content-length"], "0")
@@ -58,3 +97,45 @@ describe("NodeHttpPlatform", () => {
       assert.strictEqual(response.headers["content-type"], "text/html")
     }).pipe(Effect.provide(NodeHttpPlatform.layer)))
 })
+
+vi.mock("node:fs", async (importOriginal) => {
+  const original = await importOriginal<typeof Fs>()
+  return { ...original, createReadStream: vi.fn(original.createReadStream) }
+})
+
+describe("NodeHttpPlatform precision", { concurrent: false }, () => {
+  beforeEach(() => {
+    vi.mocked(Fs.createReadStream).mockImplementation(() => Readable.from([]) as Fs.ReadStream)
+  })
+  afterEach(() => {
+    vi.mocked(Fs.createReadStream).mockReset()
+  })
+
+  const layer = Layer.effect(HttpPlatform.HttpPlatform)(NodeHttpPlatform.make).pipe(
+    Layer.provide(fileSystemLayer),
+    Layer.provide(Etag.layer)
+  )
+
+  it.effect("passes a safe range to the runtime with the correct end bound", () =>
+    Effect.gen(function*() {
+      const maxSafe = Number.MAX_SAFE_INTEGER
+      const platform = yield* HttpPlatform.HttpPlatform
+      yield* platform.fileResponse("precision.bin", { offset: maxSafe - 1, bytesToRead: 1 })
+      assert.deepStrictEqual(vi.mocked(Fs.createReadStream).mock.calls, [["precision.bin", {
+        start: maxSafe - 1,
+        end: maxSafe - 1
+      }]])
+    }).pipe(Effect.provide(layer)))
+
+  it.effect("serves a whole oversized file with an exact content length and no end offset", () =>
+    Effect.gen(function*() {
+      const platform = yield* HttpPlatform.HttpPlatform
+      const response = yield* platform.fileResponse("precision.bin")
+      assert.strictEqual(response.status, 200)
+      assert.strictEqual(response.headers["content-length"], "9007199254740993")
+      assert.deepStrictEqual(vi.mocked(Fs.createReadStream).mock.calls, [["precision.bin", {
+        start: 0,
+        end: undefined
+      }]])
+    }).pipe(Effect.provide(layer)))
+})
diff --git a/repos/effect/packages/platform/node/test/NodeHttpServer.test.ts b/repos/effect/packages/platform/node/test/NodeHttpServer.test.ts
index 2839f1722..e299ed047 100644
--- a/repos/effect/packages/platform/node/test/NodeHttpServer.test.ts
+++ b/repos/effect/packages/platform/node/test/NodeHttpServer.test.ts
@@ -2,7 +2,7 @@
 import { NodeHttpServer } from "@effect/platform-node"
 import { NodeWS } from "@effect/platform-node/NodeSocket"
 import { assert, describe, expect, it } from "@effect/vitest"
-import { Effect, Option } from "effect"
+import { ByteSize, Effect, Option } from "effect"
 import * as Duration from "effect/Duration"
 import * as Fiber from "effect/Fiber"
 import { constVoid } from "effect/Function"
@@ -29,6 +29,7 @@ import {
   UrlParams
 } from "effect/unstable/http"
 import * as HttpApiError from "effect/unstable/httpapi/HttpApiError"
+import * as NetAddress from "effect/unstable/net/NetAddress"
 import { Socket } from "effect/unstable/socket"
 import * as Buffer from "node:buffer"
 import { randomBytes } from "node:crypto"
@@ -86,6 +87,24 @@ describe("HttpServer", () => {
       assert.strictEqual(response.status, 204)
     }).pipe(Effect.provide(NodeHttpServer.layerTest)))
 
+  it.effect.each(["Uploaded", ""] as const)("forwards status text %j", (statusText) =>
+    Effect.gen(function*() {
+      yield* HttpRouter.add(
+        "GET",
+        "/",
+        HttpServerResponse.empty({ status: 201, statusText })
+      ).pipe(
+        HttpRouter.serve,
+        Layer.build
+      )
+      const server = yield* HttpServer.HttpServer
+      assert.isTrue(NetAddress.isInetAddress(server.address))
+      if (!NetAddress.isInetAddress(server.address)) return
+      const port = server.address.port
+
+      assert.strictEqual(yield* getStatusText(port), statusText)
+    }).pipe(Effect.provide(NodeHttpServer.layerTest)))
+
   it.effect("formData", () =>
     Effect.gen(function*() {
       yield* HttpRouter.add(
@@ -159,7 +178,7 @@ describe("HttpServer", () => {
       ).pipe(
         HttpRouter.serve,
         Layer.build,
-        Effect.provideService(Multipart.MaxFileSize, 100)
+        Effect.provideService(Multipart.MaxFileSize, ByteSize.bytes(100))
       )
       const client = yield* HttpClient.HttpClient
       const formData = new FormData()
@@ -187,7 +206,7 @@ describe("HttpServer", () => {
       ).pipe(
         HttpRouter.serve,
         Layer.build,
-        Effect.provideService(Multipart.MaxFieldSize, 100)
+        Effect.provideService(Multipart.MaxFieldSize, ByteSize.bytes(100))
       )
       const client = yield* HttpClient.HttpClient
       const formData = new FormData()
@@ -880,7 +899,7 @@ describe("HttpServer", () => {
         Layer.build
       )
       const server = yield* HttpServer.HttpServer
-      const port = (server.address as HttpServer.TcpAddress).port
+      const port = (server.address as NetAddress.InetAddress).port
 
       const connect = (perMessageDeflate: boolean) =>
         Effect.acquireRelease(
@@ -909,7 +928,7 @@ describe("HttpServer", () => {
         Layer.build
       )
       const server = yield* HttpServer.HttpServer
-      const port = (server.address as HttpServer.TcpAddress).port
+      const port = (server.address as NetAddress.InetAddress).port
 
       const uncaught: Array<unknown> = []
       const onUncaught = (error: unknown) => uncaught.push(error)
@@ -958,7 +977,7 @@ describe("HttpServer", () => {
         Layer.build
       )
       const server = yield* HttpServer.HttpServer
-      const port = (server.address as HttpServer.TcpAddress).port
+      const port = (server.address as NetAddress.InetAddress).port
       const { frames, trailing } = yield* Effect.promise(() => rawWebSocket(port, "/ws"))
       assert.strictEqual(frames.length, 2)
       assert.strictEqual(frames[0].opcode, 1)
@@ -979,7 +998,7 @@ describe("HttpServer", () => {
         Layer.build
       )
       const server = yield* HttpServer.HttpServer
-      const port = (server.address as HttpServer.TcpAddress).port
+      const port = (server.address as NetAddress.InetAddress).port
       const response = yield* Effect.promise(() => rawUpgradeRequest(port, "/no-ws"))
       assert.match(response, /^HTTP\/1\.1 426/)
       assert.match(response, /upgrade refused/)
@@ -998,6 +1017,16 @@ const layerTestWebsocket = HttpServer.layerTestClient.pipe(
   }))
 )
 
+const getStatusText = (port: number) =>
+  Effect.callback<string | undefined, Error>((resume) => {
+    const request = Http.get({ hostname: "127.0.0.1", port, agent: false }, (response) => {
+      response.resume()
+      response.on("end", () => resume(Effect.succeed(response.statusMessage)))
+    })
+    request.on("error", (error) => resume(Effect.fail(error)))
+    return Effect.sync(() => request.destroy())
+  })
+
 const tcpPort = (server: Http.Server): number => {
   const address = server.address()
   assert(address !== null && typeof address !== "string")
diff --git a/repos/effect/packages/platform/node/test/NodeRedis.integration.test.ts b/repos/effect/packages/platform/node/test/NodeRedis.integration.test.ts
index d2fd302ab..1b4787413 100644
--- a/repos/effect/packages/platform/node/test/NodeRedis.integration.test.ts
+++ b/repos/effect/packages/platform/node/test/NodeRedis.integration.test.ts
@@ -1,11 +1,12 @@
 import { NodeRedis } from "@effect/platform-node"
 import { assert, it } from "@effect/vitest"
 import { RedisContainer } from "@testcontainers/redis"
-import { Effect, Layer, Queue, Schema } from "effect"
+import { Clock, Duration, Effect, Layer, Queue, Schema } from "effect"
 import * as PersistedCacheTest from "effect-test/unstable/persistence/PersistedCacheTest"
 import * as PersistedQueueTest from "effect-test/unstable/persistence/PersistedQueueTest"
+import * as RateLimiterTest from "effect-test/unstable/persistence/RateLimiterTest"
 import { TestClock } from "effect/testing"
-import { PersistedQueue, Persistence, Redis } from "effect/unstable/persistence"
+import { PersistedQueue, Persistence, RateLimiter, Redis } from "effect/unstable/persistence"
 import { createServer } from "node:net"
 
 const RedisLayer = Layer.unwrap(
@@ -40,6 +41,88 @@ PersistedQueueTest.suite(
   }).pipe(Layer.provide(RedisLayer))
 )
 
+RateLimiterTest.suite(
+  "NodeRedis",
+  RateLimiter.layerStoreRedis().pipe(Layer.provide(RedisLayer))
+)
+
+it.layer(RateLimiter.layerStoreRedis().pipe(Layer.provideMerge(RedisLayer)), {
+  timeout: "30 seconds",
+  concurrent: false
+})(
+  "RateLimiter token-bucket storage (NodeRedis)",
+  (it) => {
+    it.effect("returns the persisted balance after accumulating fractional costs", () =>
+      Effect.gen(function*() {
+        const redis = yield* Redis.Redis
+        const key = "fractional-persisted-balance"
+        const results = yield* RateLimiterTest.consumeFractionalCosts(key)
+        const stored = Number(yield* redis.send<string>("GET", `ratelimiter:${key}`))
+
+        assert.strictEqual(stored, 3.9999999999999996)
+        assert.strictEqual(results[results.length - 1].remaining, stored)
+      }))
+
+    it.effect(
+      "does not restore capacity early after a fractional token cost",
+      () =>
+        Effect.gen(function*() {
+          const redis = yield* Redis.Redis
+          const store = yield* RateLimiter.RateLimiterStore
+          const memory = yield* RateLimiter.RateLimiterStore.pipe(Effect.provide(RateLimiter.layerStoreMemory))
+          const opts = {
+            key: "fractional-cost-expiry",
+            limit: 5,
+            refillRate: Duration.seconds(4),
+            allowOverflow: false
+          }
+          const key = `ratelimiter:${opts.key}`
+          const refillKey = `${key}:refill`
+          yield* memory.tokenBucket({ ...opts, tokens: 0.5 })
+          yield* store.tokenBucket({ ...opts, tokens: 0.5 })
+          const refillAt = Number(yield* redis.send<string>("GET", refillKey))
+          assert.isAbove(yield* redis.send<number>("PTTL", key), 0)
+
+          // Use wall time: the reported bug expires these keys after 2s, before the 4s refill.
+          yield* Effect.sleep("2500 millis")
+          const beforeRefill = {
+            keys: yield* redis.send<number>("EXISTS", key, refillKey),
+            tokens: yield* redis.send<string | null>("GET", key),
+            memoryRemaining: (yield* memory.tokenBucket({ ...opts, tokens: 0 }))[0],
+            redisRemaining: (yield* store.tokenBucket({ ...opts, tokens: 0 }))[0]
+          }
+          const elapsed = (yield* Clock.currentTimeMillis) - refillAt
+          assert.isAtLeast(elapsed, 2_500)
+          assert.isBelow(elapsed, 4_000)
+
+          yield* Effect.sleep(4_100 - elapsed)
+          assert.strictEqual((yield* memory.tokenBucket({ ...opts, tokens: 0 }))[0], 5)
+          assert.strictEqual((yield* store.tokenBucket({ ...opts, tokens: 0 }))[0], 5)
+          assert.deepStrictEqual(beforeRefill, { keys: 2, tokens: "4.5", memoryRemaining: 4.5, redisRemaining: 4.5 })
+        }).pipe(TestClock.withLive),
+      10_000
+    )
+
+    for (const onExceeded of ["fail", "delay"] as const) {
+      it.effect(`${onExceeded}: restarts the refill interval after both Redis keys expire`, () => {
+        const key = `timing-expired-${onExceeded}`
+        const redisKey = `ratelimiter:${key}`
+        const refillKey = `${redisKey}:refill`
+        // TestClock does not advance Redis's expiry clock, so expire the keys by hand.
+        const idle = Effect.gen(function*() {
+          const redis = yield* Redis.Redis
+          yield* TestClock.adjust("359 seconds")
+          assert.strictEqual(yield* redis.send<number>("EXISTS", redisKey, refillKey), 2)
+          assert.strictEqual(yield* redis.send<number>("PEXPIRE", redisKey, "0"), 1)
+          assert.strictEqual(yield* redis.send<number>("PEXPIRE", refillKey, "0"), 1)
+          assert.strictEqual(yield* redis.send<number>("EXISTS", redisKey, refillKey), 0)
+        })
+        return RateLimiterTest.restartsInterval(key, onExceeded, 5, idle)
+      })
+    }
+  }
+)
+
 const PersistedQueueRedisLayer = Layer.mergeAll(
   RedisLayer,
   PersistedQueue.layer.pipe(
diff --git a/repos/effect/packages/platform/node/test/NodeSocket.test.ts b/repos/effect/packages/platform/node/test/NodeSocket.test.ts
index ab63bcf32..9fd922049 100644
--- a/repos/effect/packages/platform/node/test/NodeSocket.test.ts
+++ b/repos/effect/packages/platform/node/test/NodeSocket.test.ts
@@ -1,11 +1,12 @@
 import { NodeSocket, NodeSocketServer } from "@effect/platform-node"
 import { assert, describe, it } from "@effect/vitest"
-import { Deferred, Effect, Queue, Redacted } from "effect"
+import { Deferred, Effect, Option, Queue, Redacted } from "effect"
 import * as Exit from "effect/Exit"
 import * as Fiber from "effect/Fiber"
 import * as Scope from "effect/Scope"
 import * as Stream from "effect/Stream"
-import { Socket, type SocketServer } from "effect/unstable/socket"
+import type * as NetAddress from "effect/unstable/net/NetAddress"
+import { Socket } from "effect/unstable/socket"
 import * as Fs from "node:fs"
 import * as Net from "node:net"
 import { Duplex } from "node:stream"
@@ -70,12 +71,21 @@ const makeServer = Effect.gen(function*() {
 })
 
 describe("Socket", () => {
+  it.live("preserves a native IPv6 listener address", () =>
+    Effect.gen(function*() {
+      const server = yield* NodeSocketServer.make({ host: "::1", port: 0 })
+      assert.strictEqual(server.address._tag, "InetAddressV6")
+      if (server.address._tag !== "InetAddressV6") return
+      assert.strictEqual(server.address.address.toString(), "::1")
+      assert.notStrictEqual(server.address.port, 0)
+    }))
+
   it.live("closes with a pending pre-run socket", () =>
     Effect.gen(function*() {
       const scope = yield* Scope.make()
       const server = yield* NodeSocketServer.make({ host: "127.0.0.1", port: 0 }).pipe(Scope.provide(scope))
-      assert.strictEqual(server.address._tag, "TcpAddress")
-      if (server.address._tag !== "TcpAddress") return
+      assert.strictEqual(server.address._tag, "InetAddressV4")
+      if (server.address._tag !== "InetAddressV4") return
       const socket = Net.createConnection({ host: "127.0.0.1", port: server.address.port })
       yield* Effect.promise(() =>
         new Promise<void>((resolve, reject) => {
@@ -95,8 +105,8 @@ describe("Socket", () => {
     Effect.gen(function*() {
       const scope = yield* Scope.make()
       const server = yield* NodeSocketServer.makeWebSocket({ host: "127.0.0.1", port: 0 }).pipe(Scope.provide(scope))
-      assert.strictEqual(server.address._tag, "TcpAddress")
-      if (server.address._tag !== "TcpAddress") return
+      assert.strictEqual(server.address._tag, "InetAddressV4")
+      if (server.address._tag !== "InetAddressV4") return
       const socket = new NodeSocket.NodeWS.WebSocket(`ws://127.0.0.1:${server.address.port}`)
       yield* Effect.promise(() =>
         new Promise<void>((resolve, reject) => {
@@ -115,7 +125,7 @@ describe("Socket", () => {
   it.effect("open", () =>
     Effect.gen(function*() {
       const server = yield* makeServer
-      const channel = NodeSocket.makeNetChannel({ port: (server.address as SocketServer.TcpAddress).port })
+      const channel = NodeSocket.makeNetChannel({ port: (server.address as NetAddress.InetAddress).port })
 
       const outputEffect = Stream.make("Hello", "World").pipe(
         Stream.encodeText,
@@ -135,7 +145,7 @@ describe("Socket", () => {
   it.effect("pull batches", () =>
     Effect.gen(function*() {
       const server = yield* makeServer
-      const socket = yield* NodeSocket.makeNet({ port: (server.address as SocketServer.TcpAddress).port })
+      const socket = yield* NodeSocket.makeNet({ port: (server.address as NetAddress.InetAddress).port })
 
       const received = yield* Effect.gen(function*() {
         const writer = yield* socket.writer
@@ -346,7 +356,7 @@ describe("Socket", () => {
           Effect.callback<Tls.TLSSocket>((resume) => {
             const conn = Tls.connect({
               host: "127.0.0.1",
-              port: (server.address as SocketServer.TcpAddress).port,
+              port: (server.address as NetAddress.InetAddress).port,
               ca: [cert]
             })
             conn.once("secureConnect", () => resume(Effect.succeed(conn)))
@@ -368,7 +378,7 @@ describe("Socket", () => {
 
         const socket = yield* NodeSocket.makeTls({
           host: "127.0.0.1",
-          port: (server.address as SocketServer.TcpAddress).port,
+          port: (server.address as NetAddress.InetAddress).port,
           ca: [cert]
         })
 
@@ -384,7 +394,7 @@ describe("Socket", () => {
 
         const socket = yield* NodeSocket.makeNet({
           host: "127.0.0.1",
-          port: (server.address as SocketServer.TcpAddress).port
+          port: (server.address as NetAddress.InetAddress).port
         })
 
         const received = yield* sendHelloWorld(socket, {
@@ -478,7 +488,7 @@ describe("Socket", () => {
         ).pipe(Effect.forkScoped)
         const socket = yield* NodeSocket.makeNet({
           host: "127.0.0.1",
-          port: (server.address as SocketServer.TcpAddress).port
+          port: (server.address as NetAddress.InetAddress).port
         })
 
         const error = yield* Effect.gen(function*() {
@@ -505,7 +515,7 @@ describe("Socket", () => {
         yield* server.run(() => Effect.never).pipe(Effect.forkScoped)
         const socket = yield* NodeSocket.makeNet({
           host: "127.0.0.1",
-          port: (server.address as SocketServer.TcpAddress).port
+          port: (server.address as NetAddress.InetAddress).port
         })
 
         const error = yield* Effect.gen(function*() {
@@ -524,7 +534,7 @@ describe("Socket", () => {
       }))
   })
 
-  describe("WebSocket", () => {
+  describe("WebSocket", { concurrent: false }, () => {
     const url = `ws://localhost:1234`
 
     const makeServer = Effect.acquireRelease(
@@ -536,6 +546,54 @@ describe("Socket", () => {
         })
     )
 
+    it.live("receives messages after handing a paused WebSocket to the reader", () =>
+      Effect.gen(function*() {
+        const serverScope = yield* Scope.make()
+        const connections = new Set<NodeSocket.NodeWS.WebSocket>()
+        yield* Effect.addFinalizer(() =>
+          Effect.gen(function*() {
+            for (const connection of connections) connection.terminate()
+            yield* Scope.close(serverScope, Exit.void)
+          })
+        )
+        const received = yield* Deferred.make<ReadonlyArray<Uint8Array | string>>()
+        const server = yield* NodeSocketServer.makeWebSocket({ host: "127.0.0.1", port: 0 }).pipe(
+          Scope.provide(serverScope)
+        )
+        assert.strictEqual(server.address._tag, "InetAddressV4")
+        if (server.address._tag !== "InetAddressV4") return
+
+        yield* server.run((socket) =>
+          Effect.gen(function*() {
+            const native = Option.getOrThrow(yield* Effect.serviceOption(Socket.WebSocket))
+            if (native instanceof NodeSocket.NodeWS.WebSocket) connections.add(native)
+            const { pull } = yield* socket.reader
+            const writer = yield* socket.writer
+            yield* writer.write("reader-ready")
+            yield* Deferred.succeed(received, yield* pull)
+          }).pipe(Effect.scoped)
+        ).pipe(Effect.forkIn(serverScope))
+
+        const client = new NodeSocket.NodeWS.WebSocket(`ws://127.0.0.1:${server.address.port}`)
+        connections.add(client)
+        const open = new Promise<void>((resolve, reject) => {
+          client.once("open", resolve)
+          client.once("error", reject)
+        })
+        const ready = new Promise<string>((resolve) => {
+          client.once("message", (data) => resolve(data.toString()))
+        })
+
+        yield* Effect.promise(() => open).pipe(Effect.timeout("1 second"))
+        assert.strictEqual(yield* Effect.promise(() => ready).pipe(Effect.timeout("1 second")), "reader-ready")
+        client.send("after-ready")
+
+        assert.deepStrictEqual(
+          yield* Deferred.await(received).pipe(Effect.timeout("1 second")),
+          ["after-ready"]
+        )
+      }))
+
     it.effect("passes headers to the opening handshake", () =>
       Effect.gen(function*() {
         const authorization = yield* Deferred.make<string | undefined>()
@@ -547,8 +605,8 @@ describe("Socket", () => {
             return true
           }
         })
-        assert.strictEqual(server.address._tag, "TcpAddress")
-        if (server.address._tag !== "TcpAddress") return
+        assert.strictEqual(server.address._tag, "InetAddressV4")
+        if (server.address._tag !== "InetAddressV4") return
         const port = server.address.port
 
         const makeWebSocket = yield* Socket.WebSocketConstructor
diff --git a/repos/effect/packages/platform/node/test/NodeWorkerRunner.test.ts b/repos/effect/packages/platform/node/test/NodeWorkerRunner.test.ts
new file mode 100644
index 000000000..1ca168a24
--- /dev/null
+++ b/repos/effect/packages/platform/node/test/NodeWorkerRunner.test.ts
@@ -0,0 +1,31 @@
+import * as NodeWorker from "@effect/platform-node/NodeWorker"
+import { assert, describe, it } from "@effect/vitest"
+import * as Deferred from "effect/Deferred"
+import * as Effect from "effect/Effect"
+import * as Queue from "effect/Queue"
+import * as Worker from "effect/unstable/workers/Worker"
+import { Worker as NativeWorker } from "node:worker_threads"
+
+const fixture = new URL("./fixtures/worker-runner.ts", import.meta.url)
+
+describe("NodeWorkerRunner", () => {
+  it.live("sendUnsafe preserves reply payloads", () =>
+    Effect.scoped(
+      Effect.gen(function*() {
+        const replies = yield* Queue.unbounded<unknown>()
+        const ready = yield* Deferred.make<void>()
+        const native = new NativeWorker(fixture, { execArgv: [] })
+        const worker = yield* Worker.WorkerPlatform.use((platform) => platform.spawn<unknown, void>(0)).pipe(
+          Effect.provide(NodeWorker.layer(() => native))
+        )
+        yield* worker.run((reply) => Queue.offer(replies, reply), {
+          onSpawn: Deferred.succeed(ready, undefined)
+        }).pipe(Effect.forkScoped)
+        yield* Deferred.await(ready)
+
+        yield* worker.send(undefined)
+
+        assert.deepStrictEqual(yield* Queue.take(replies), { value: 42 })
+      })
+    ), { timeout: 20_000 })
+})
diff --git a/repos/effect/packages/platform/node/test/RpcServer.test.ts b/repos/effect/packages/platform/node/test/RpcServer.test.ts
index afa7d500f..b1f6c33fc 100644
--- a/repos/effect/packages/platform/node/test/RpcServer.test.ts
+++ b/repos/effect/packages/platform/node/test/RpcServer.test.ts
@@ -3,6 +3,7 @@ import { assert, describe, it } from "@effect/vitest"
 import { Cause, Deferred, Effect, Exit, Fiber, Layer, Ref, Schedule, Schema, Stream } from "effect"
 import { Entity, EntityProxy, EntityProxyServer, Sharding } from "effect/unstable/cluster"
 import { HttpClient, HttpClientRequest, HttpRouter, HttpServer } from "effect/unstable/http"
+import type * as NetAddress from "effect/unstable/net/NetAddress"
 import { Rpc, RpcClient, RpcGroup, RpcSerialization, RpcServer, RpcTest } from "effect/unstable/rpc"
 import { SocketServer } from "effect/unstable/socket"
 import { e2eSuite, UsersClient } from "./fixtures/rpc-e2e.ts"
@@ -64,7 +65,7 @@ describe("RpcServer", () => {
     Layer.provide(
       Effect.gen(function*() {
         const server = yield* HttpServer.HttpServer
-        const address = server.address as HttpServer.TcpAddress
+        const address = server.address as NetAddress.InetAddress
         return NodeSocket.layerWebSocket(`http://127.0.0.1:${address.port}/rpc`)
       }).pipe(Layer.unwrap)
     )
@@ -108,7 +109,7 @@ describe("RpcServer", () => {
     Layer.provide(
       Effect.gen(function*() {
         const server = yield* SocketServer.SocketServer
-        const address = server.address as SocketServer.TcpAddress
+        const address = server.address as NetAddress.InetAddress
         return NodeSocket.layerNet({ port: address.port })
       }).pipe(Layer.unwrap)
     )
@@ -221,7 +222,7 @@ describe("RpcServer", () => {
     Layer.provide(
       Effect.gen(function*() {
         const server = yield* SocketServer.SocketServer
-        const address = server.address as SocketServer.TcpAddress
+        const address = server.address as NetAddress.InetAddress
         return NodeSocket.layerNet({ port: address.port })
       }).pipe(Layer.unwrap)
     ),
diff --git a/repos/effect/packages/platform/node/test/__snapshots__/HttpApi.test.ts.snap b/repos/effect/packages/platform/node/test/__snapshots__/HttpApi.test.ts.snap
index 9a9c9072f..a495da0ff 100644
--- a/repos/effect/packages/platform/node/test/__snapshots__/HttpApi.test.ts.snap
+++ b/repos/effect/packages/platform/node/test/__snapshots__/HttpApi.test.ts.snap
@@ -479,14 +479,7 @@ exports[`HttpApi > original tests > OpenAPI spec > fixture 1`] = `
             "content": {
               "application/json": {
                 "schema": {
-                  "anyOf": [
-                    {
-                      "$ref": "#/components/schemas/UserErrorEncoded",
-                    },
-                    {
-                      "$ref": "#/components/schemas/UserErrorEncoded",
-                    },
-                  ],
+                  "$ref": "#/components/schemas/UserErrorEncoded",
                 },
               },
             },
diff --git a/repos/effect/packages/platform/node/test/cluster-integration/StreamDisconnect.test.ts b/repos/effect/packages/platform/node/test/cluster-integration/StreamDisconnect.test.ts
new file mode 100644
index 000000000..04453bd2d
--- /dev/null
+++ b/repos/effect/packages/platform/node/test/cluster-integration/StreamDisconnect.test.ts
@@ -0,0 +1,70 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Effect, Fiber, Queue, Schema, Stream } from "effect"
+import {
+  ClusterSchema,
+  Entity,
+  EntityAddress,
+  EntityId,
+  EntityType,
+  type Envelope,
+  Snowflake
+} from "effect/unstable/cluster"
+import { Headers } from "effect/unstable/http"
+import { Rpc } from "effect/unstable/rpc"
+import { make, makeRawRunnerClient } from "./harness.ts"
+
+const WatchRpc = Rpc.make("Watch", { payload: { id: Schema.String }, success: Schema.Int, stream: true })
+const WatchEntity = Entity.make("ClusterIntegrationStreamDisconnect", [WatchRpc])
+  .annotateRpcs(ClusterSchema.Persisted, false)
+
+const setup = Effect.fnUntraced(function*() {
+  const counts = { starts: 0, stops: 0 }
+  const layer = WatchEntity.toLayer({
+    Watch: () => {
+      counts.starts++
+      return Rpc.fork(Stream.never.pipe(Stream.ensuring(Effect.sync(() => {
+        counts.stops++
+      }))))
+    }
+  })
+  const cluster = yield* make({ backend: "pg", entities: layer })
+  const [owner] = yield* cluster.start(1)
+  yield* cluster.waitForStableAssignments()
+  const entityId = "watch-1"
+  return { cluster, counts, owner, entityId }
+})
+
+describe("cross-runner disconnect cleanup", () => {
+  it.live("dead caller: socket closed with no further messages", () =>
+    Effect.gen(function*() {
+      const { cluster, counts, owner, entityId } = yield* setup()
+      const raw = yield* makeRawRunnerClient(owner)
+      const id = EntityId.make(entityId)
+      const snowflake = yield* Snowflake.Generator.pipe(Effect.provide(Snowflake.layerGenerator))
+      const request: Envelope.PartialRequest = {
+        _tag: "Request",
+        requestId: snowflake.nextUnsafe(),
+        address: EntityAddress.make({
+          shardId: owner.sharding.getShardId(id, WatchEntity.getShardGroup(id)),
+          entityType: EntityType.make(WatchEntity.type),
+          entityId: id
+        }),
+        tag: "Watch",
+        payload: yield* Schema.encodeEffect(raw.codecFor(WatchRpc.payloadSchema))({ id: "x" }),
+        headers: Headers.empty
+      }
+      const caller = yield* raw.client.Stream({ request, persisted: false }, { asQueue: true }).pipe(
+        Effect.flatMap((queue) => Effect.forever(Queue.take(queue))),
+        Effect.scoped,
+        Effect.forkChild({ startImmediately: true })
+      )
+      yield* cluster.waitUntil("host handler did not start", Effect.sync(() => counts.starts === 1))
+      assert.deepStrictEqual(counts, { starts: 1, stops: 0 })
+
+      // The caller "dies": its socket closes and nothing else is ever sent.
+      yield* raw.disconnect
+      yield* cluster.waitUntil("host handler did not stop after the caller died", Effect.sync(() => counts.stops === 1))
+      assert.deepStrictEqual(counts, { starts: 1, stops: 1 })
+      yield* Fiber.interrupt(caller)
+    }))
+})
diff --git a/repos/effect/packages/platform/node/test/cluster-integration/harness.ts b/repos/effect/packages/platform/node/test/cluster-integration/harness.ts
index 071ebbe43..15da2282e 100644
--- a/repos/effect/packages/platform/node/test/cluster-integration/harness.ts
+++ b/repos/effect/packages/platform/node/test/cluster-integration/harness.ts
@@ -41,6 +41,25 @@ export interface ClusterRunner {
   readonly state: () => "frozen" | "killed" | "running" | "stopped"
 }
 
+/** A raw TCP caller whose transport can close without a Sharding retry. */
+export const makeRawRunnerClient = Effect.fnUntraced(function*(runner: ClusterRunner) {
+  const serialization = yield* RpcSerialization.RpcSerialization.pipe(
+    Effect.provide(RpcSerialization.layerSchemaBinary())
+  )
+  const transport = yield* Effect.acquireRelease(Scope.make(), (scope) => Scope.close(scope, Exit.void))
+  const socket = yield* NodeSocket.makeNet({ host: runner.address.host, port: runner.address.port })
+  const protocol = yield* RpcClient.makeProtocolSocket().pipe(
+    Effect.provideService(Socket.Socket, socket),
+    Effect.provideService(RpcSerialization.RpcSerialization, serialization),
+    Scope.provide(transport)
+  )
+  const client = yield* RpcClient.make(Runners.Rpcs).pipe(
+    Effect.provideService(RpcClient.Protocol, protocol),
+    Scope.provide(transport)
+  )
+  return { client, codecFor: serialization.codecFor, disconnect: Scope.close(transport, Exit.void) }
+})
+
 export interface MessageCounts {
   readonly failed: number
   readonly replied: number
@@ -465,7 +484,7 @@ export const make = Effect.fnUntraced(function*(options: MakeOptions) {
       Layer.buildWithScope(scope)
     )
     const socketServer = Context.get(serverContext, SocketServer.SocketServer)
-    if (socketServer.address._tag !== "TcpAddress") {
+    if (socketServer.address._tag === "UnixPathAddress") {
       return yield* Effect.die("Expected a TCP socket server")
     }
     const address = RunnerAddress.make("127.0.0.1", socketServer.address.port)
diff --git a/repos/effect/packages/platform/node/test/cluster/SocketRunner.test.ts b/repos/effect/packages/platform/node/test/cluster/SocketRunner.test.ts
index 5f3ff0790..6514e1d84 100644
--- a/repos/effect/packages/platform/node/test/cluster/SocketRunner.test.ts
+++ b/repos/effect/packages/platform/node/test/cluster/SocketRunner.test.ts
@@ -1,4 +1,4 @@
-import { NodeClusterSocket } from "@effect/platform-node"
+import { NodeClusterSocket, NodeSocketServer } from "@effect/platform-node"
 import { assert, describe, it } from "@effect/vitest"
 import { BigDecimal, Cause, Deferred, Effect, Exit, Fiber, Layer, Option, PrimaryKey, Schema } from "effect"
 import type { Sharding } from "effect/unstable/cluster"
@@ -13,6 +13,9 @@ import {
   SocketRunner
 } from "effect/unstable/cluster"
 import { Rpc, RpcSerialization } from "effect/unstable/rpc"
+import * as SocketServer from "effect/unstable/socket/SocketServer"
+
+const HOST = "127.0.0.1"
 
 class TestPayload extends Schema.Class<TestPayload>("TestPayload")({
   id: Schema.String,
@@ -36,7 +39,6 @@ const TestEntity = Entity
   ])
   .annotateRpcs(ClusterSchema.Uninterruptible, true)
 
-const RUNNER_PORT = 50_123
 // Build shared storage instances once, so runner and client see the same state.
 // MessageStorage.layerMemory requires ShardingConfig, so we provide a minimal one.
 const SharedStorage = Layer.mergeAll(
@@ -46,31 +48,38 @@ const SharedStorage = Layer.mergeAll(
   Layer.provide(ShardingConfig.layerDefaults)
 )
 
-const makeRunnerLayer = (
-  port: number,
+const startRunner = Effect.fnUntraced(function*(
   entities: Layer.Layer<never, never, Sharding.Sharding>,
   serialization: Layer.Layer<RpcSerialization.RpcSerialization> = RpcSerialization.layerSchemaBinary()
-) =>
-  entities.pipe(
+) {
+  const socketServer = yield* NodeSocketServer.make({ host: HOST, port: 0 })
+  if (socketServer.address._tag !== "InetAddressV4") {
+    return yield* Effect.die("Expected a TCP socket server")
+  }
+  const port = socketServer.address.port
+  yield* entities.pipe(
     Layer.provideMerge(SocketRunner.layer),
     Layer.provide(RunnerHealth.layerNoop),
-    Layer.provide(NodeClusterSocket.layerSocketServer),
+    Layer.provide(Layer.succeed(SocketServer.SocketServer, socketServer)),
     Layer.provide(NodeClusterSocket.layerClientProtocol),
     Layer.provide(ShardingConfig.layer({
-      runnerAddress: Option.some(RunnerAddress.make("localhost", port)),
+      runnerAddress: Option.some(RunnerAddress.make(HOST, port)),
       entityTerminationTimeout: 0,
       entityMessagePollInterval: 5000,
       sendRetryInterval: 100
     })),
-    Layer.provide(serialization)
+    Layer.provide(serialization),
+    Layer.build
   )
+  return port
+})
 
 const makeClientLayer = (port: number) =>
   SocketRunner.layerClientOnly.pipe(
     Layer.provide(NodeClusterSocket.layerClientProtocol),
     Layer.provide(ShardingConfig.layer({
-      runnerAddress: Option.some(RunnerAddress.make("localhost", port)),
-      runnerListenAddress: Option.some(RunnerAddress.make("localhost", port)),
+      runnerAddress: Option.some(RunnerAddress.make(HOST, port)),
+      runnerListenAddress: Option.some(RunnerAddress.make(HOST, port)),
       entityTerminationTimeout: 0,
       entityMessagePollInterval: 5000,
       sendRetryInterval: 100
@@ -89,8 +98,8 @@ const makeConfiguredClientLayer = (
     ...(serialization === undefined ? undefined : { serialization }),
     ...(serializationMaxBufferSize === undefined ? undefined : { serializationMaxBufferSize }),
     shardingConfig: {
-      runnerAddress: Option.some(RunnerAddress.make("localhost", port)),
-      runnerListenAddress: Option.some(RunnerAddress.make("localhost", port)),
+      runnerAddress: Option.some(RunnerAddress.make(HOST, port)),
+      runnerListenAddress: Option.some(RunnerAddress.make(HOST, port)),
       entityTerminationTimeout: 0,
       entityMessagePollInterval: 5000,
       sendRetryInterval: 100
@@ -110,17 +119,14 @@ const SerializationEntityLayer = SerializationEntity.toLayer(
 )
 
 const assertSerialization = (
-  port: number,
   serverSerialization: Layer.Layer<RpcSerialization.RpcSerialization>,
   clientSerialization?: "binary" | "ndjson"
 ) =>
   Effect.gen(function*() {
-    yield* Layer.launch(makeRunnerLayer(port, SerializationEntityLayer, serverSerialization)).pipe(Effect.forkScoped)
-    yield* Effect.sleep("2 seconds")
+    const port = yield* startRunner(SerializationEntityLayer, serverSerialization)
 
     const result = yield* Effect.gen(function*() {
       const makeClient = yield* SerializationEntity.client
-      yield* Effect.sleep("3 seconds")
       return yield* makeClient("serialization-entity").Ping()
     }).pipe(
       Effect.provide(makeConfiguredClientLayer(port, clientSerialization)),
@@ -145,15 +151,6 @@ const IsolationEntity = Entity
   ])
   .annotateRpcs(ClusterSchema.Persisted, false)
 
-const IsolationEntityLayer = IsolationEntity.toLayer(
-  Effect.succeed({
-    BadReply: () => Effect.succeed(1.5),
-    Slow: () => Effect.as(Effect.sleep("2 seconds"), "done")
-  })
-)
-
-const ISOLATION_PORT = 50_124
-
 // BigDecimal.normalize creates a circular `normalized` self-reference.
 // When a persisted message is sent with discard: true, the notify path in Runners.makeRpc
 // passes the raw envelope (with circular BigDecimal payload) to the runner,
@@ -164,13 +161,13 @@ const ISOLATION_PORT = 50_124
 describe("SocketRunner", () => {
   it.live(
     "uses SchemaBinary by default for TCP connections",
-    () => assertSerialization(50_120, RpcSerialization.layerSchemaBinary()),
+    () => assertSerialization(RpcSerialization.layerSchemaBinary()),
     15_000
   )
 
   it.live(
     "preserves an explicit binary selection",
-    () => assertSerialization(50_121, RpcSerialization.layerSchemaBinary(), "binary"),
+    () => assertSerialization(RpcSerialization.layerSchemaBinary(), "binary"),
     15_000
   )
 
@@ -178,21 +175,21 @@ describe("SocketRunner", () => {
     "applies serializationMaxBufferSize to the default SchemaBinary parser",
     () =>
       Effect.gen(function*() {
-        yield* Layer.launch(
-          makeRunnerLayer(
-            50_122,
-            SerializationEntityLayer,
-            RpcSerialization.layerSchemaBinary()
-          )
-        ).pipe(Effect.forkScoped)
-        yield* Effect.sleep("2 seconds")
+        const port = yield* startRunner(SerializationEntityLayer)
+
+        yield* Effect.gen(function*() {
+          const makeClient = yield* SerializationEntity.client
+          assert.strictEqual(yield* makeClient("serialization-limit-entity").Ping(), "pong")
+        }).pipe(
+          Effect.provide(makeConfiguredClientLayer(port)),
+          Effect.scoped
+        )
 
         const exit = yield* Effect.gen(function*() {
           const makeClient = yield* SerializationEntity.client
-          yield* Effect.sleep("3 seconds")
           return yield* makeClient("serialization-limit-entity").Ping().pipe(Effect.timeout("1 second"))
         }).pipe(
-          Effect.provide(makeConfiguredClientLayer(50_122, undefined, 1)),
+          Effect.provide(makeConfiguredClientLayer(port, undefined, 1)),
           Effect.scoped,
           Effect.exit
         )
@@ -219,20 +216,14 @@ describe("SocketRunner", () => {
         )
 
         // Start the runner (with socket server and entity handler)
-        yield* Layer.launch(makeRunnerLayer(RUNNER_PORT, TestEntityLayer)).pipe(Effect.forkScoped)
-
-        // Give the runner time to start and acquire shards
-        yield* Effect.sleep("2 seconds")
+        const port = yield* startRunner(TestEntityLayer)
         yield* Effect.log("Before starting the client")
 
         // Send a message from the client with discard: true.
         // The BigDecimal is normalized to trigger the circular `normalized` self-reference.
         yield* Effect.gen(function*() {
           yield* Effect.log("Starting the client")
-          yield* Effect.sleep("2 seconds")
           const makeClient = yield* TestEntity.client
-          // Give the client time to discover the runner
-          yield* Effect.sleep("3 seconds")
           const client = makeClient("entity-1")
 
           const amount = BigDecimal.fromStringUnsafe("123.45")
@@ -247,7 +238,12 @@ describe("SocketRunner", () => {
             { discard: true }
           ).pipe(Effect.forkChild)
 
-          yield* Deferred.await(volatileStarted)
+          yield* Deferred.await(volatileStarted).pipe(
+            Effect.timeoutOrElse({
+              duration: "5 seconds",
+              orElse: () => Effect.die("the volatile request never reached its handler")
+            })
+          )
           yield* Fiber.join(volatileFiber).pipe(
             Effect.timeoutOrElse({
               duration: "1 second",
@@ -256,7 +252,7 @@ describe("SocketRunner", () => {
           )
           yield* Deferred.succeed(releaseVolatile, void 0)
         }).pipe(
-          Effect.provide(makeClientLayer(RUNNER_PORT)),
+          Effect.provide(makeClientLayer(port)),
           Effect.scoped
         )
       }).pipe(Effect.provide(
@@ -269,20 +265,36 @@ describe("SocketRunner", () => {
     "a reply serialization failure fails only its own request",
     () =>
       Effect.gen(function*() {
-        // Start the runner hosting the entities
-        yield* Layer.launch(makeRunnerLayer(ISOLATION_PORT, IsolationEntityLayer)).pipe(Effect.forkScoped)
-        yield* Effect.sleep("2 seconds")
+        const slowStarted = yield* Deferred.make<void>()
+        const releaseSlow = yield* Deferred.make<void>()
+        const IsolationEntityLayer = IsolationEntity.toLayer(
+          Effect.succeed({
+            BadReply: () => Effect.succeed(1.5),
+            Slow: () =>
+              Deferred.succeed(slowStarted, void 0).pipe(
+                Effect.andThen(Deferred.await(releaseSlow)),
+                Effect.as("done")
+              )
+          })
+        )
+        const port = yield* startRunner(IsolationEntityLayer)
 
         yield* Effect.gen(function*() {
           const makeClient = yield* IsolationEntity.client
-          // Give the client time to discover the runner
-          yield* Effect.sleep("3 seconds")
 
           // a sibling request in flight on the same runner-to-runner connection
           const slowFiber = yield* makeClient("slow-entity").Slow().pipe(Effect.forkChild)
-          yield* Effect.sleep("300 millis")
+          yield* Deferred.await(slowStarted).pipe(
+            Effect.timeoutOrElse({
+              duration: "5 seconds",
+              orElse: () => Effect.die("the Slow request never reached its handler")
+            })
+          )
 
-          const badExit = yield* makeClient("bad-entity").BadReply({ id: 1 }).pipe(Effect.exit)
+          const badExit = yield* makeClient("bad-entity").BadReply({ id: 1 }).pipe(
+            Effect.exit,
+            Effect.ensuring(Deferred.succeed(releaseSlow, void 0))
+          )
           assert.isTrue(Exit.isFailure(badExit), "the unencodable reply must fail the request")
           const failure = Exit.isFailure(badExit) ? String(Cause.squash(badExit.cause)) : ""
           assert.include(failure, "MalformedMessage", "the caller must receive the real encode error")
@@ -301,7 +313,7 @@ describe("SocketRunner", () => {
             assert.strictEqual(slowExit.value, "done")
           }
         }).pipe(
-          Effect.provide(makeClientLayer(ISOLATION_PORT)),
+          Effect.provide(makeClientLayer(port)),
           Effect.scoped
         )
       }).pipe(Effect.provide(
diff --git a/repos/effect/packages/platform/node/test/cluster/SqlMessageStorage.integration.test.ts b/repos/effect/packages/platform/node/test/cluster/SqlMessageStorage.integration.test.ts
index 449f06823..a7fed18b7 100644
--- a/repos/effect/packages/platform/node/test/cluster/SqlMessageStorage.integration.test.ts
+++ b/repos/effect/packages/platform/node/test/cluster/SqlMessageStorage.integration.test.ts
@@ -56,7 +56,9 @@ describe("SqlMessageStorage", () => {
     ["mysql", Layer.orDie(MysqlContainer.layerClient)],
     ["sqlite", Layer.orDie(SqliteLayer)]
   ] as const).forEach(([label, layer]) => {
+    // Tests truncate this backend's shared tables.
     it.layer(StorageLayer.pipe(Layer.provideMerge(layer)), {
+      concurrent: false,
       timeout: 120000
     })(label, (it) => {
       if (label === "pg") {
@@ -73,6 +75,59 @@ describe("SqlMessageStorage", () => {
           }))
       }
 
+      it.effect("resetRequests with no IDs leaves existing claims untouched", () =>
+        Effect.gen(function*() {
+          yield* truncate
+          const storage = yield* MessageStorage.MessageStorage
+          const request = yield* makeRequest()
+          yield* storage.saveRequest(request)
+          expect(yield* storage.unprocessedMessages([request.envelope.address.shardId])).toHaveLength(1)
+          yield* storage.resetRequests([])
+          expect(yield* storage.unprocessedMessages([request.envelope.address.shardId])).toHaveLength(0)
+        }))
+
+      it.effect("resetRequests releases only the selected request at a shared address", () =>
+        Effect.gen(function*() {
+          yield* truncate
+          const storage = yield* MessageStorage.MessageStorage
+          const selected = yield* makeRequest()
+          const unrelated = yield* makeRequest()
+          yield* storage.saveRequest(selected)
+          yield* storage.saveRequest(unrelated)
+          const shards = [selected.envelope.address.shardId]
+          expect(yield* storage.unprocessedMessages(shards)).toHaveLength(2)
+          yield* storage.resetRequests([selected.envelope.requestId])
+          const messages = yield* storage.unprocessedMessages(shards)
+          expect(messages.map((message) => message.envelope.requestId)).toEqual([selected.envelope.requestId])
+          expect(yield* storage.unprocessedMessages(shards)).toHaveLength(0)
+        }))
+
+      it.effect("resetRequests preserves chunk replies, exit replies, and completed state", () =>
+        Effect.gen(function*() {
+          yield* truncate
+          const storage = yield* MessageStorage.MessageStorage
+          const streaming = yield* makeRequest({ rpc: StreamRpc, payload: StreamRpc.payloadSchema.make({ id: 123 }) })
+          const completed = yield* makeRequest()
+          yield* storage.saveRequest(streaming)
+          yield* storage.saveRequest(completed)
+          const shards = [streaming.envelope.address.shardId]
+          expect(yield* storage.unprocessedMessages(shards)).toHaveLength(2)
+          yield* storage.saveReply(yield* makeChunkReply(streaming))
+          yield* storage.saveReply(yield* makeReply(completed))
+          const replies = yield* storage.repliesFor([streaming, completed])
+          expect(replies).toHaveLength(2)
+          expect(yield* storage.unprocessedMessages(shards)).toHaveLength(0)
+          const sql = yield* SqlClient.SqlClient
+          const processed = yield* sql`SELECT processed FROM cluster_messages ORDER BY rowid`
+          yield* storage.resetRequests([streaming.envelope.requestId, completed.envelope.requestId])
+          const messages = yield* storage.unprocessedMessages(shards)
+          // Replies keep both requests out of the SQL read loop.
+          expect(messages).toHaveLength(0)
+          expect(yield* storage.repliesFor([streaming, completed])).toEqual(replies)
+          expect(yield* sql`SELECT processed FROM cluster_messages ORDER BY rowid`).toEqual(processed)
+          yield* truncate
+        }))
+
       it.effect("saveRequest", () =>
         Effect.gen(function*() {
           const storage = yield* MessageStorage.MessageStorage
@@ -472,10 +527,25 @@ describe("SqlMessageStorage", () => {
           yield* truncate
 
           const storage = yield* MessageStorage.MessageStorage
-          const request = yield* makeRequest()
+          const request = yield* makeRequest({
+            rpc: StreamRpc,
+            payload: StreamRpc.payloadSchema.make({ id: 123 })
+          })
           yield* storage.saveRequest(request)
           let messages = yield* storage.unprocessedMessagesById([request.envelope.requestId])
           expect(messages).toHaveLength(1)
+
+          const chunk = yield* makeChunkReply(request)
+          yield* storage.saveReply(chunk)
+          const ack = yield* makeAckChunk(request, chunk)
+          yield* storage.saveEnvelope(ack)
+
+          const encoded = yield* SqlMessageStorage.makeEncoded().pipe(Effect.provide(NodeCrypto.layer))
+          const acknowledgements = yield* encoded.unprocessedMessagesById([ack.envelope.id], 0)
+          expect(acknowledgements).toHaveLength(1)
+          assert(acknowledgements[0].envelope._tag === "AckChunk")
+          expect(acknowledgements[0].envelope.replyId).toEqual(String(chunk.reply.id))
+
           yield* storage.saveReply(yield* makeReply(request))
           messages = yield* storage.unprocessedMessagesById([request.envelope.requestId])
           expect(messages).toHaveLength(0)
diff --git a/repos/effect/packages/platform/node/test/cluster/SqlRunnerStorage.integration.test.ts b/repos/effect/packages/platform/node/test/cluster/SqlRunnerStorage.integration.test.ts
index 92235bcc2..b41b49e52 100644
--- a/repos/effect/packages/platform/node/test/cluster/SqlRunnerStorage.integration.test.ts
+++ b/repos/effect/packages/platform/node/test/cluster/SqlRunnerStorage.integration.test.ts
@@ -18,15 +18,20 @@ import { PgContainer } from "../fixtures/pg-utils.ts"
 
 const StorageLayer = SqlRunnerStorage.layer
 
+// Allow for CI latency in healthy PostgreSQL queries.
+const lockOperationInterval = 1000
+const partitionConfig = {
+  // Keep expiration / 3 above the operation deadline.
+  shardLockExpiration: lockOperationInterval * 10,
+  shardLockRefreshInterval: lockOperationInterval
+}
+
 describe("SqlRunnerStorage", () => {
   it.effect("bounds shard lock operations and rebuilds an unresponsive reserved connection", () => {
     const partitioned = makePartitionState()
     const layer = StorageLayer.pipe(
       Layer.provideMerge(blackholeReservedConnection(partitioned, true)),
-      Layer.provide(ShardingConfig.layer({
-        shardLockExpiration: 1000,
-        shardLockRefreshInterval: 100
-      }))
+      Layer.provide(ShardingConfig.layer(partitionConfig))
     )
 
     return Effect.gen(function*() {
@@ -50,7 +55,7 @@ describe("SqlRunnerStorage", () => {
         assert(Exit.isFailure(exit))
         const error = Cause.squash(exit.cause)
         assert(error instanceof ClusterError.PersistenceError)
-        assert.isBelow(Duration.toMillis(elapsed), 1000)
+        assert.isBelow(Duration.toMillis(elapsed), lockOperationInterval * 5)
         yield* Effect.sleep(20)
       })
 
@@ -84,7 +89,7 @@ describe("SqlRunnerStorage", () => {
       assert.strictEqual(partitioned.activeQueries, 0)
     }).pipe(
       Effect.timeoutOrElse({
-        duration: 15_000,
+        duration: 30_000,
         orElse: () =>
           Effect.die(
             `timed out exercising shard lock rebuilds (${partitionDiagnostics(partitioned)})`
@@ -103,10 +108,7 @@ describe("SqlRunnerStorage", () => {
     const partitioned = makePartitionState()
     const layer = StorageLayer.pipe(
       Layer.provideMerge(blackholeReservedConnection(partitioned, true)),
-      Layer.provide(ShardingConfig.layer({
-        shardLockExpiration: 1000,
-        shardLockRefreshInterval: 100
-      }))
+      Layer.provide(ShardingConfig.layer(partitionConfig))
     )
 
     return Effect.gen(function*() {
@@ -151,8 +153,7 @@ describe("SqlRunnerStorage", () => {
       Layer.provideMerge(blackholeReservedConnection(partitioned, false)),
       Layer.provide(ShardingConfig.layer({
         shardLockDisableAdvisory: true,
-        shardLockExpiration: 1000,
-        shardLockRefreshInterval: 100
+        ...partitionConfig
       }))
     )
 
@@ -174,8 +175,6 @@ describe("SqlRunnerStorage", () => {
       restoreConnection(partitioned)
       expect(
         yield* storage.refresh(runnerAddress1, shards).pipe(
-          // The integration shard can delay a healthy replacement beyond a
-          // handful of 100 ms lock-operation deadlines under load.
           Effect.retry({ times: 20, schedule: Schedule.spaced(20) })
         )
       ).toEqual(shards)
@@ -194,10 +193,7 @@ describe("SqlRunnerStorage", () => {
     const partitioned = makePartitionState()
     const layer = StorageLayer.pipe(
       Layer.provideMerge(blackholeReservedConnection(partitioned, false)),
-      Layer.provide(ShardingConfig.layer({
-        shardLockExpiration: 1000,
-        shardLockRefreshInterval: 100
-      }))
+      Layer.provide(ShardingConfig.layer(partitionConfig))
     )
 
     return Effect.gen(function*() {
@@ -246,8 +242,7 @@ describe("SqlRunnerStorage", () => {
       Layer.provideMerge(blackholeReservedConnection(partitioned, false)),
       Layer.provide(ShardingConfig.layer({
         shardLockDisableAdvisory: true,
-        shardLockExpiration: 1000,
-        shardLockRefreshInterval: 100
+        ...partitionConfig
       }))
     )
 
@@ -268,7 +263,7 @@ describe("SqlRunnerStorage", () => {
       partitionConnection(partitioned)
       partitioned.blockRelease = true
       yield* storage.refresh(runnerAddress1, shards).pipe(Effect.exit)
-      yield* Effect.sleep(150)
+      yield* Effect.sleep(lockOperationInterval * 1.5)
 
       // the stalled release must not disable further rebuilds
       restoreConnection(partitioned)
@@ -278,8 +273,6 @@ describe("SqlRunnerStorage", () => {
 
       expect(
         yield* storage.refresh(runnerAddress1, shards).pipe(
-          // The integration shard can delay a healthy replacement beyond a
-          // handful of 100 ms lock-operation deadlines under load.
           Effect.retry({ times: 20, schedule: Schedule.spaced(20) })
         )
       ).toEqual(shards)
@@ -342,7 +335,9 @@ describe("SqlRunnerStorage", () => {
       ]
     ] as const
   ).forEach(([label, layer]) => {
+    // Both tests update the same runner rows.
     it.layer(layer, {
+      concurrent: false,
       timeout: 60000
     })(label, (it) => {
       it.effect("getRunners", () =>
@@ -364,7 +359,7 @@ describe("SqlRunnerStorage", () => {
 
           yield* storage.unregister(runnerAddress1)
           expect(yield* storage.getRunners).toEqual([])
-        }), 30_000)
+        }), { timeout: 30_000 })
 
       it.effect("acquireShards", () =>
         Effect.gen(function*() {
@@ -382,6 +377,8 @@ describe("SqlRunnerStorage", () => {
             ShardId.make("default", 3)
           ])
           expect(acquired.map((_) => _.id)).toEqual([1, 2, 3])
+          acquired = yield* storage.acquire(runnerAddress1, [ShardId.make("default", 4)])
+          expect(acquired.map((_) => _.id)).toEqual([4])
 
           const refreshed = yield* storage.refresh(runnerAddress1, [
             ShardId.make("default", 1),
diff --git a/repos/effect/packages/platform/node/test/fixtures/worker-runner.ts b/repos/effect/packages/platform/node/test/fixtures/worker-runner.ts
new file mode 100644
index 000000000..e015495a1
--- /dev/null
+++ b/repos/effect/packages/platform/node/test/fixtures/worker-runner.ts
@@ -0,0 +1,15 @@
+import * as NodeWorkerRunner from "@effect/platform-node/NodeWorkerRunner"
+import * as Effect from "effect/Effect"
+import * as WorkerRunner from "effect/unstable/workers/WorkerRunner"
+
+await Effect.runPromise(
+  Effect.gen(function*() {
+    const platform = yield* WorkerRunner.WorkerRunnerPlatform
+    const runner = yield* platform.start<{ readonly value: number }>()
+    yield* runner.run((portId) =>
+      Effect.sync(() => {
+        runner.sendUnsafe(portId, { value: 42 })
+      })
+    )
+  }).pipe(Effect.provide(NodeWorkerRunner.layer))
+)
diff --git a/repos/effect/packages/sql/clickhouse/CHANGELOG.md b/repos/effect/packages/sql/clickhouse/CHANGELOG.md
index aa68f84c1..1df809aae 100644
--- a/repos/effect/packages/sql/clickhouse/CHANGELOG.md
+++ b/repos/effect/packages/sql/clickhouse/CHANGELOG.md
@@ -1,5 +1,48 @@
 # @effect/sql-clickhouse
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+  - @effect/platform-node@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- [#8211](https://github.com/Effect-TS/effect/pull/8211) [`f193ac5`](https://github.com/Effect-TS/effect/commit/f193ac50d11fe6838b5db0357bb7b232e8e696d1) Thanks @arrudaricardo! - Mark the ClickHouse statement compiler with the ClickHouse dialect so dialect-specific SQL fragments select the correct branch.
+
+- [#8210](https://github.com/Effect-TS/effect/pull/8210) [`73e6f4b`](https://github.com/Effect-TS/effect/commit/73e6f4bb94fe6a3d90504460de623b100e7df2f7) Thanks @arrudaricardo! - Use ClickHouse's `ping()` endpoint for connection validation and map failed health checks to `SqlError` values.
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+  - @effect/platform-node@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+  - @effect/platform-node@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+  - @effect/platform-node@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`cce221e`](https://github.com/Effect-TS/effect/commit/cce221ebf450bbcf067f73bce98598303f6e4798), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`a4bb2aa`](https://github.com/Effect-TS/effect/commit/a4bb2aa22698ea8a98d5172d81305f4f74bd7caa), [`5664c94`](https://github.com/Effect-TS/effect/commit/5664c941b522a5f318e609b9c45f2eb4c2b92ea1), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`dd6ce2d`](https://github.com/Effect-TS/effect/commit/dd6ce2d6e32c86465a7e706ffd31c0925ec6a9b9), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`e406217`](https://github.com/Effect-TS/effect/commit/e406217f8c12f95626e72bb2b23054d8483b1009), [`f93d051`](https://github.com/Effect-TS/effect/commit/f93d051c3326c4d4e24aa8c2cde67c50850ec02a), [`9252a00`](https://github.com/Effect-TS/effect/commit/9252a00ba3cf8a9eacb72ed161d6bed306444f6c), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`72b8582`](https://github.com/Effect-TS/effect/commit/72b85820f1baeb0abb21a47bd470720f58435a15), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`505dc05`](https://github.com/Effect-TS/effect/commit/505dc05dd68a80694f30bfaf772699494726f54d), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+  - @effect/platform-node@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/sql/clickhouse/package.json b/repos/effect/packages/sql/clickhouse/package.json
index 2b907ab3d..2de035d64 100644
--- a/repos/effect/packages/sql/clickhouse/package.json
+++ b/repos/effect/packages/sql/clickhouse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/sql-clickhouse",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "A Clickhouse toolkit for Effect",
diff --git a/repos/effect/packages/sql/clickhouse/src/ClickhouseClient.ts b/repos/effect/packages/sql/clickhouse/src/ClickhouseClient.ts
index a84ee2763..0fdd80173 100644
--- a/repos/effect/packages/sql/clickhouse/src/ClickhouseClient.ts
+++ b/repos/effect/packages/sql/clickhouse/src/ClickhouseClient.ts
@@ -3,7 +3,7 @@
  *
  * This module provides both the ClickHouse-specific {@link ClickhouseClient}
  * service and the generic {@link Client.SqlClient} service. `make` creates a
- * scoped client, checks the connection with `SELECT 1`, maps ClickHouse errors
+ * scoped client, checks the connection with `ping()`, maps ClickHouse errors
  * to `SqlError`, and aborts in-flight queries when interrupted. The
  * ClickHouse-specific service adds typed parameters, command execution, insert
  * queries, query id and settings helpers, a statement compiler, and direct or
@@ -159,7 +159,7 @@ export interface ClickhouseClientConfig extends Clickhouse.ClickHouseClientConfi
 }
 
 /**
- * Creates a scoped `ClickhouseClient`, verifies connectivity with `SELECT 1`,
+ * Creates a scoped `ClickhouseClient`, verifies connectivity with `ping()`,
  * closes the underlying client when the scope ends, maps ClickHouse failures
  * to `SqlError`, and aborts plus kills in-flight queries when interrupted.
  *
@@ -181,7 +181,13 @@ export const make = (
     )
 
     yield* Effect.tryPromise({
-      try: () => client.exec({ query: "SELECT 1" }),
+      try: async () => {
+        const result = await client.ping()
+        if (!result.success) {
+          throw result.error
+        }
+        return result
+      },
       catch: (cause) =>
         new SqlError({ reason: classifyError(cause, "ClickhouseClient: Failed to connect", "connect", "connection") })
     }).pipe(
@@ -518,7 +524,7 @@ const typeFromUnknown = (value: unknown): string => {
  */
 export const makeCompiler = (transform?: (_: string) => string) =>
   Statement.makeCompiler<ClickhouseCustom>({
-    dialect: "sqlite",
+    dialect: "clickhouse",
     placeholder(i, u) {
       return `{p${i}: ${typeFromUnknown(u)}}`
     },
diff --git a/repos/effect/packages/sql/clickhouse/test/Client.test.ts b/repos/effect/packages/sql/clickhouse/test/Client.test.ts
index c9c6f28c4..9973af434 100644
--- a/repos/effect/packages/sql/clickhouse/test/Client.test.ts
+++ b/repos/effect/packages/sql/clickhouse/test/Client.test.ts
@@ -12,7 +12,7 @@ const commandCalls: Array<Record<string, unknown>> = []
 
 vi.mock("@clickhouse/client", () => ({
   createClient: () => ({
-    exec: () => connectImmediately ? Promise.resolve({}) : new Promise(() => {}),
+    ping: () => connectImmediately ? Promise.resolve({ success: true }) : new Promise(() => {}),
     query: () => new Promise(() => {}),
     insert: () => new Promise(() => {}),
     command: (options: Record<string, unknown>) => {
@@ -26,7 +26,7 @@ vi.mock("@clickhouse/client", () => ({
   })
 }))
 
-describe("ClickhouseClient", () => {
+describe("ClickhouseClient", { concurrent: false }, () => {
   it("preserves fractional JavaScript numbers in inferred parameters", () => {
     const sql = Statement.make(Effect.void as any, ClickhouseClient.makeCompiler(), [], undefined)
     const [query] = sql`SELECT ${1.5}`.compile()
@@ -34,6 +34,21 @@ describe("ClickhouseClient", () => {
     assert.strictEqual(query, "SELECT {p1: Float64}")
   })
 
+  it("uses the ClickHouse dialect for dialect-specific fragments", () => {
+    const sql = Statement.make(Effect.void as any, ClickhouseClient.makeCompiler(), [], undefined)
+
+    assert.strictEqual(
+      sql.onDialect({
+        sqlite: () => "sqlite",
+        pg: () => "pg",
+        mysql: () => "mysql",
+        mssql: () => "mssql",
+        clickhouse: () => "clickhouse"
+      }),
+      "clickhouse"
+    )
+  })
+
   it.effect("closes the client when the connection check times out", () =>
     Effect.gen(function*() {
       connectImmediately = false
diff --git a/repos/effect/packages/sql/clickhouse/test/SqlErrorClassification.test.ts b/repos/effect/packages/sql/clickhouse/test/SqlErrorClassification.test.ts
index d0461345c..a2ed14a22 100644
--- a/repos/effect/packages/sql/clickhouse/test/SqlErrorClassification.test.ts
+++ b/repos/effect/packages/sql/clickhouse/test/SqlErrorClassification.test.ts
@@ -16,7 +16,10 @@ const state: {
 
 vi.mock("@clickhouse/client", () => ({
   createClient: () => ({
-    exec: () => state.connectCause ? Promise.reject(state.connectCause) : Promise.resolve({}),
+    ping: () =>
+      state.connectCause
+        ? Promise.resolve({ success: false, error: state.connectCause })
+        : Promise.resolve({ success: true }),
     close: () => Promise.resolve(),
     query: () =>
       state.queryCause
@@ -56,7 +59,7 @@ const queryFailureReasonTag = (code: number) =>
     Effect.provide(Reactivity.layer)
   )
 
-describe("ClickhouseClient SqlError classification", () => {
+describe("ClickhouseClient SqlError classification", { concurrent: false }, () => {
   it.effect("maps representative native codes to reasons", () =>
     Effect.gen(function*() {
       const cases = [
diff --git a/repos/effect/packages/sql/d1/CHANGELOG.md b/repos/effect/packages/sql/d1/CHANGELOG.md
index 64ed6ecff..24184a0f5 100644
--- a/repos/effect/packages/sql/d1/CHANGELOG.md
+++ b/repos/effect/packages/sql/d1/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @effect/sql-d1
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- [#8328](https://github.com/Effect-TS/effect/pull/8328) [`eea03fc`](https://github.com/Effect-TS/effect/commit/eea03fca8f2eb8868d144cc5201c5d892b85aee3) Thanks @tim-smart! - Update repository dependencies to their latest compatible releases.
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- [#8225](https://github.com/Effect-TS/effect/pull/8225) [`8abae87`](https://github.com/Effect-TS/effect/commit/8abae870f901540fe7e1ec461aef755558a3fe69) Thanks @tim-smart! - Update Rolldown, the Deno Redis driver, Cloudflare Workers types, and MySQL dependencies to their latest releases.
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7882](https://github.com/Effect-TS/effect/pull/7882) [`22cd7fa`](https://github.com/Effect-TS/effect/commit/22cd7fa32ac539c3298d1b4afdbd2ecf190de948) Thanks @kitlangton! - Return the complete native `D1Result` from D1 statement `.raw`, preserving `success`, `meta`, and `results` instead of returning only the row array.
+  
+  Callers that treated `.raw` as an array should read `.results` or use an ordinary or `.unprepared` statement when only rows are needed.
+
+- [#7534](https://github.com/Effect-TS/effect/pull/7534) [`c1693ff`](https://github.com/Effect-TS/effect/commit/c1693ffda83924ef2c71959cda643477ee42002d) Thanks @tim-smart! - Update production dependencies to their latest releases.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/sql/d1/package.json b/repos/effect/packages/sql/d1/package.json
index bc7eb5d65..572e436ae 100644
--- a/repos/effect/packages/sql/d1/package.json
+++ b/repos/effect/packages/sql/d1/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/sql-d1",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "A Cloudflare D1 integration for Effect",
@@ -66,12 +66,12 @@
   },
   "devDependencies": {
     "effect": "workspace:^",
-    "miniflare": "5.20260828.0-alpha"
+    "miniflare": "5.20260918.0-alpha"
   },
   "peerDependencies": {
     "effect": "workspace:^"
   },
   "dependencies": {
-    "@cloudflare/workers-types": "^5.20260829.1"
+    "@cloudflare/workers-types": "^5.20260919.1"
   }
 }
diff --git a/repos/effect/packages/sql/d1/src/D1Client.ts b/repos/effect/packages/sql/d1/src/D1Client.ts
index 9ffffa467..0609dccd5 100644
--- a/repos/effect/packages/sql/d1/src/D1Client.ts
+++ b/repos/effect/packages/sql/d1/src/D1Client.ts
@@ -10,7 +10,7 @@
  *
  * @since 4.0.0
  */
-import type { D1Database, D1PreparedStatement } from "@cloudflare/workers-types"
+import type { D1Database, D1PreparedStatement, D1Result } from "@cloudflare/workers-types"
 import * as Cache from "effect/Cache"
 import * as Config from "effect/Config"
 import * as Context from "effect/Context"
@@ -221,25 +221,31 @@ export const make = (
           })
       })
 
-      const runStatement = (
+      const runStatementRaw = (
         statement: D1PreparedStatement,
         params: ReadonlyArray<unknown> = []
-      ): Effect.Effect<ReadonlyArray<any>, SqlError, never> =>
+      ): Effect.Effect<D1Result, SqlError, never> =>
         Effect.tryPromise({
           try: async () => {
             const response = await statement.bind(...params).all()
             if (response.error) {
               throw response.error
             }
-            return response.results || []
+            return response
           },
           catch: (cause) => new SqlError({ reason: classifyError(cause, "Failed to execute statement", "execute") })
         })
 
+      const runStatement = (
+        statement: D1PreparedStatement,
+        params: ReadonlyArray<unknown> = []
+      ): Effect.Effect<ReadonlyArray<any>, SqlError, never> =>
+        Effect.map(runStatementRaw(statement, params), (response) => response.results || [])
+
       const runRaw = (
         sql: string,
         params: ReadonlyArray<unknown> = []
-      ) => runStatement(db.prepare(sql), params)
+      ) => runStatementRaw(db.prepare(sql), params)
 
       const runCached = (
         sql: string,
@@ -249,7 +255,7 @@ export const make = (
       const runUncached = (
         sql: string,
         params: ReadonlyArray<unknown> = []
-      ) => runRaw(sql, params)
+      ) => runStatement(db.prepare(sql), params)
 
       const runValues = (
         sql: string,
diff --git a/repos/effect/packages/sql/d1/test/Client.test.ts b/repos/effect/packages/sql/d1/test/Client.test.ts
index 7c658d227..ffab91e10 100644
--- a/repos/effect/packages/sql/d1/test/Client.test.ts
+++ b/repos/effect/packages/sql/d1/test/Client.test.ts
@@ -1,3 +1,4 @@
+import type { D1Result } from "@cloudflare/workers-types"
 import { D1Client } from "@effect/sql-d1"
 import { assert, describe, it } from "@effect/vitest"
 import { Cause, Effect } from "effect"
@@ -6,6 +7,17 @@ import { Statement } from "effect/unstable/sql"
 import { D1Miniflare } from "./utils.ts"
 
 describe("Client", () => {
+  it.effect("raw preserves the native result envelope", () =>
+    Effect.gen(function*() {
+      const sql = yield* D1Client.D1Client
+      yield* sql`CREATE TABLE raw_test (id INTEGER PRIMARY KEY, name TEXT)`
+      const raw = (yield* sql`INSERT INTO raw_test (name) VALUES (${"effect"})`.raw) as D1Result
+      assert.strictEqual(raw.success, true)
+      assert.deepStrictEqual(raw.results, [])
+      assert.strictEqual(raw.meta.changes, 1)
+      assert.strictEqual(raw.meta.last_row_id, 1)
+    }).pipe(Effect.provide(D1Miniflare.layerClient)))
+
   it.effect("classifies native errors without stable sqlite codes as UnknownError", () =>
     Effect.gen(function*() {
       const failingDb = {
diff --git a/repos/effect/packages/sql/libsql/CHANGELOG.md b/repos/effect/packages/sql/libsql/CHANGELOG.md
index 346bff282..f6147bf98 100644
--- a/repos/effect/packages/sql/libsql/CHANGELOG.md
+++ b/repos/effect/packages/sql/libsql/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @effect/sql-libsql
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- [#8308](https://github.com/Effect-TS/effect/pull/8308) [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca) Thanks @tristanz! - Release savepoints after nested transactions succeed or successfully roll back in PostgreSQL, PGlite, MySQL, libSQL, and the Node, Bun, React Native, and WASM SQLite clients. This frees PostgreSQL transaction locks before the outer transaction completes.
+  
+  Custom SQL clients can opt in through the new `releaseSavepoint` option. Clients that omit it are unchanged.
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#8096](https://github.com/Effect-TS/effect/pull/8096) [`cce221e`](https://github.com/Effect-TS/effect/commit/cce221ebf450bbcf067f73bce98598303f6e4798) Thanks @tim-smart! - Update dependencies to their latest compatible versions.
+
+- [#7829](https://github.com/Effect-TS/effect/pull/7829) [`b4d8183`](https://github.com/Effect-TS/effect/commit/b4d81832be7cefd1c5b3bfae8e3d12bda74a5184) Thanks @kitlangton! - Isolate transaction contexts between separately created libSQL clients.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/sql/libsql/package.json b/repos/effect/packages/sql/libsql/package.json
index 38e6beff2..49cdabaf2 100644
--- a/repos/effect/packages/sql/libsql/package.json
+++ b/repos/effect/packages/sql/libsql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/sql-libsql",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "A libSQL toolkit for Effect",
@@ -70,6 +70,6 @@
     "effect": "workspace:^"
   },
   "dependencies": {
-    "@libsql/client": "^0.17.4"
+    "@libsql/client": "^0.18.0"
   }
 }
diff --git a/repos/effect/packages/sql/libsql/src/LibsqlClient.ts b/repos/effect/packages/sql/libsql/src/LibsqlClient.ts
index 55c12997e..c59e927c6 100644
--- a/repos/effect/packages/sql/libsql/src/LibsqlClient.ts
+++ b/repos/effect/packages/sql/libsql/src/LibsqlClient.ts
@@ -70,9 +70,7 @@ export interface LibsqlClient extends Client.SqlClient {
  */
 export const LibsqlClient = Context.Service<LibsqlClient>("@effect/sql-libsql/LibsqlClient")
 
-const LibsqlTransaction = Context.Service<readonly [LibsqlConnection, counter: number]>(
-  "@effect/sql-libsql/LibsqlClient/LibsqlTransaction"
-)
+let clientIdCounter = 0
 
 /**
  * Configuration for a libSQL client, either by supplying connection options or an existing live libSQL client.
@@ -185,6 +183,9 @@ export const make = (
   options: LibsqlClientConfig
 ): Effect.Effect<LibsqlClient, never, Scope.Scope | Reactivity.Reactivity> =>
   Effect.gen(function*() {
+    const LibsqlTransaction = Context.Service<readonly [LibsqlConnection, counter: number]>(
+      `@effect/sql-libsql/LibsqlClient/LibsqlTransaction/${clientIdCounter++}`
+    )
     const compiler = Statement.makeCompilerSqlite(options.transformQueryNames)
     const transformRows = options.transformResultNames ?
       Statement.defaultTransforms(
@@ -319,6 +320,7 @@ export const make = (
       })),
       begin: () => Effect.void, // already begun in acquireConnection
       savepoint: (conn, id) => conn.executeRaw(`SAVEPOINT effect_sql_${id};`, []),
+      releaseSavepoint: (conn, id) => conn.executeRaw(`RELEASE SAVEPOINT effect_sql_${id};`, []),
       commit: (conn) => conn.commit,
       rollback: (conn) => conn.rollback,
       rollbackSavepoint: (conn, id) => conn.executeRaw(`ROLLBACK TO SAVEPOINT effect_sql_${id};`, [])
diff --git a/repos/effect/packages/sql/libsql/test/Client.integration.test.ts b/repos/effect/packages/sql/libsql/test/Client.integration.test.ts
index 352f647d5..0df9edcba 100644
--- a/repos/effect/packages/sql/libsql/test/Client.integration.test.ts
+++ b/repos/effect/packages/sql/libsql/test/Client.integration.test.ts
@@ -16,6 +16,48 @@ const Migrations = Layer.effectDiscard(
 )
 
 describe("Client", () => {
+  it.effect("releases completed nested savepoints", () =>
+    Effect.gen(function*() {
+      const sql = yield* LibsqlClient.make({ url: ":memory:" })
+      yield* sql`CREATE TABLE savepoint_release (value INTEGER)`
+      yield* sql.withTransaction(Effect.gen(function*() {
+        for (const rollback of [false, true]) {
+          yield* sql.withTransaction(
+            sql`INSERT INTO savepoint_release VALUES (1)`.pipe(
+              Effect.andThen(rollback ? Effect.fail("rollback") : Effect.void)
+            )
+          ).pipe(Effect.ignore)
+          const error = yield* sql`RELEASE SAVEPOINT effect_sql_1`.unprepared.pipe(Effect.flip)
+          assert.strictEqual(error._tag, "SqlError")
+        }
+      }))
+      assert.deepStrictEqual(yield* sql`SELECT value FROM savepoint_release`, [{ value: 1 }])
+      const error = yield* sql.withTransaction(
+        sql.withTransaction(sql`INSERT INTO savepoint_release VALUES (2)`).pipe(
+          Effect.andThen(Effect.fail("outer rollback"))
+        )
+      ).pipe(Effect.flip)
+      assert.strictEqual(error, "outer rollback")
+      assert.deepStrictEqual(yield* sql`SELECT value FROM savepoint_release`, [{ value: 1 }])
+    }).pipe(Effect.provide(Reactivity.layer)))
+
+  it.effect("keeps transactions isolated between clients", () =>
+    Effect.gen(function*() {
+      const a = yield* LibsqlClient.make({ url: ":memory:" })
+      const b = yield* LibsqlClient.make({ url: ":memory:" })
+
+      yield* a`CREATE TABLE marker (owner TEXT NOT NULL)`
+      yield* b`CREATE TABLE marker (owner TEXT NOT NULL)`
+      yield* a`INSERT INTO marker VALUES ('A')`
+      yield* b`INSERT INTO marker VALUES ('B')`
+
+      const rows = yield* a.withTransaction(b`SELECT owner FROM marker`)
+      assert.deepStrictEqual(rows, [{ owner: "B" }])
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(Reactivity.layer)
+    ))
+
   it.effect("releases transaction serialization after begin fails", () => {
     let transactionCalls = 0
     const transaction = {
@@ -48,7 +90,8 @@ describe("Client", () => {
     )
   })
 
-  layer(LibsqlContainer.layerClient, { timeout: "30 seconds" })((it) => {
+  // Each test recreates the same tables.
+  layer(LibsqlContainer.layerClient, { timeout: "30 seconds", concurrent: false })("shared tables", (it) => {
     it.effect("should work", () =>
       Effect.gen(function*() {
         const sql = yield* LibsqlClient.LibsqlClient
diff --git a/repos/effect/packages/sql/libsql/test/Resolver.integration.test.ts b/repos/effect/packages/sql/libsql/test/Resolver.integration.test.ts
index 6e98a9eac..b672fe802 100644
--- a/repos/effect/packages/sql/libsql/test/Resolver.integration.test.ts
+++ b/repos/effect/packages/sql/libsql/test/Resolver.integration.test.ts
@@ -21,7 +21,7 @@ const seededClient = Effect.gen(function*() {
 })
 
 layer(LibsqlContainer.layerClient, { timeout: "30 seconds" })("Resolver", (it) => {
-  describe.sequential("ordered", () => {
+  describe("ordered", { concurrent: false }, () => {
     it.effect("insert", () =>
       Effect.gen(function*() {
         const batches: Array<Array<string>> = []
@@ -76,7 +76,7 @@ layer(LibsqlContainer.layerClient, { timeout: "30 seconds" })("Resolver", (it) =
       }))
   })
 
-  describe.sequential("grouped", () => {
+  describe("grouped", { concurrent: false }, () => {
     it.effect("find by name", () =>
       Effect.gen(function*() {
         const sql = yield* seededClient
@@ -130,7 +130,7 @@ layer(LibsqlContainer.layerClient, { timeout: "30 seconds" })("Resolver", (it) =
       }))
   })
 
-  describe.sequential("findById", () => {
+  describe("findById", { concurrent: false }, () => {
     it.effect("find by id", () =>
       Effect.gen(function*() {
         const sql = yield* seededClient
diff --git a/repos/effect/packages/sql/mssql/CHANGELOG.md b/repos/effect/packages/sql/mssql/CHANGELOG.md
index dbcff1438..782814b31 100644
--- a/repos/effect/packages/sql/mssql/CHANGELOG.md
+++ b/repos/effect/packages/sql/mssql/CHANGELOG.md
@@ -1,5 +1,43 @@
 # @effect/sql-mssql
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7726](https://github.com/Effect-TS/effect/pull/7726) [`fe60666`](https://github.com/Effect-TS/effect/commit/fe606666a799e99ff63ddb2173cddef4fff6a885) Thanks @kitlangton! - Fix automatic binary parameter binding in `@effect/sql-mssql`.
+
+- [#7724](https://github.com/Effect-TS/effect/pull/7724) [`e42516a`](https://github.com/Effect-TS/effect/commit/e42516a9c57ef5626719a128b99deccc0f32c0c8) Thanks @kitlangton! - Forward the configured domain to the SQL Server driver so NTLM clients can be constructed with a supplied domain.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/sql/mssql/package.json b/repos/effect/packages/sql/mssql/package.json
index 4e6fd7be0..c36b115db 100644
--- a/repos/effect/packages/sql/mssql/package.json
+++ b/repos/effect/packages/sql/mssql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/sql-mssql",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "A Microsoft SQL Server toolkit for Effect",
diff --git a/repos/effect/packages/sql/mssql/src/MssqlClient.ts b/repos/effect/packages/sql/mssql/src/MssqlClient.ts
index 481e0e7b4..b7c3f64e8 100644
--- a/repos/effect/packages/sql/mssql/src/MssqlClient.ts
+++ b/repos/effect/packages/sql/mssql/src/MssqlClient.ts
@@ -40,6 +40,7 @@ import {
   UnknownError
 } from "effect/unstable/sql/SqlError"
 import * as Statement from "effect/unstable/sql/Statement"
+import { Buffer } from "node:buffer"
 import * as Tedious from "tedious"
 import type { ConnectionOptions } from "tedious/lib/connection.ts"
 import type { DataType } from "tedious/lib/data-type.ts"
@@ -311,6 +312,7 @@ export const make = (
         authentication: {
           type: (options.authType as any) ?? "default",
           options: {
+            domain: options.domain,
             userName: options.username,
             password: options.password
               ? Redacted.value(options.password)
@@ -706,6 +708,17 @@ function numberToParamName(n: number) {
   return `${Math.ceil(n + 1)}`
 }
 
+const byteArrayParameterType: DataType = {
+  ...Tedious.TYPES.VarBinary,
+  validate(value, collation, options) {
+    return Tedious.TYPES.VarBinary.validate(
+      Buffer.isBuffer(value) ? value : Buffer.from(value.buffer, value.byteOffset, value.byteLength),
+      collation,
+      options
+    )
+  }
+}
+
 /**
  * Default mapping from Effect SQL primitive value kinds to Tedious SQL Server parameter data types.
  *
@@ -718,8 +731,8 @@ export const defaultParameterTypes: Record<Statement.PrimitiveKind, DataType> =
   bigint: Tedious.TYPES.BigInt,
   boolean: Tedious.TYPES.Bit,
   Date: Tedious.TYPES.DateTime,
-  Uint8Array: Tedious.TYPES.VarBinary,
-  Int8Array: Tedious.TYPES.VarBinary,
+  Uint8Array: byteArrayParameterType,
+  Int8Array: byteArrayParameterType,
   null: Tedious.TYPES.Bit
 }
 
diff --git a/repos/effect/packages/sql/mssql/test/Binary.test.ts b/repos/effect/packages/sql/mssql/test/Binary.test.ts
new file mode 100644
index 000000000..4a3044ebc
--- /dev/null
+++ b/repos/effect/packages/sql/mssql/test/Binary.test.ts
@@ -0,0 +1,43 @@
+import { MssqlClient } from "@effect/sql-mssql"
+import { assert, it } from "@effect/vitest"
+import { Effect } from "effect"
+import * as Reactivity from "effect/unstable/reactivity/Reactivity"
+import type * as Tedious from "tedious"
+import { vi } from "vitest"
+
+vi.mock("tedious", async (importOriginal) => {
+  const original = await importOriginal<typeof Tedious>()
+
+  class MockConnection extends original.Connection {
+    override connect(callback?: (error?: Error) => void) {
+      callback?.()
+    }
+    override close() {}
+    override cancel() {
+      return false
+    }
+    override makeRequest(request: Tedious.Request | Tedious.BulkLoad) {
+      if (!(request instanceof original.Request)) {
+        throw new Error("Unexpected bulk load")
+      }
+      const rows = request.parameters.map((parameter) => [
+        { metadata: { colName: "value" }, value: parameter.value }
+      ])
+      request.callback(null, rows.length, rows)
+    }
+  }
+
+  return { ...original, Connection: MockConnection }
+})
+
+it.effect("binds an interpolated Uint8Array as VarBinary", () =>
+  Effect.gen(function*() {
+    const client = yield* MssqlClient.make({
+      server: "mock.invalid",
+      minConnections: 0,
+      maxConnections: 1
+    })
+    const rows = yield* client<{ value: Uint8Array }>`SELECT ${new Uint8Array([0, 128, 255])} AS value`
+
+    assert.deepStrictEqual(Array.from(rows[0].value), [0, 128, 255])
+  }).pipe(Effect.provide(Reactivity.layer)))
diff --git a/repos/effect/packages/sql/mssql/test/Client.test.ts b/repos/effect/packages/sql/mssql/test/Client.test.ts
index 6618bb135..be8b98aa9 100644
--- a/repos/effect/packages/sql/mssql/test/Client.test.ts
+++ b/repos/effect/packages/sql/mssql/test/Client.test.ts
@@ -132,6 +132,43 @@ describe("mssql", () => {
     expect(params).toEqual(["Tim"])
   })
 
+  for (
+    const [name, returning] of [
+      ["Identifier", sql("INSERTED.name")],
+      ["wrapped Identifier", sql`${sql("INSERTED.name")}`]
+    ] as const
+  ) {
+    it(`insert helper returning ${name}`, () => {
+      const result = sql`INSERT INTO ${sql("people")} ${sql.insert({ name: "Rowan", age: 10 }).returning(returning)}`
+        .compile()
+
+      assert.deepStrictEqual(result, [
+        `INSERT INTO [people] ([name],[age]) OUTPUT [INSERTED].[name] VALUES (@1,@2)`,
+        ["Rowan", 10]
+      ])
+    })
+
+    it(`update helper returning ${name}`, () => {
+      const result = sql`UPDATE people SET ${sql.update({ name: "Rowan" }).returning(returning)}`.compile()
+
+      assert.deepStrictEqual(result, [
+        `UPDATE people SET [name] = @1 OUTPUT [INSERTED].[name]`,
+        ["Rowan"]
+      ])
+    })
+
+    it(`updateValues helper returning ${name}`, () => {
+      const result = sql`UPDATE people SET name = data.name ${
+        sql.updateValues([{ name: "Rowan" }, { name: "Mira" }], "data").returning(returning)
+      }`.compile()
+
+      assert.deepStrictEqual(result, [
+        `UPDATE people SET name = data.name OUTPUT [INSERTED].[name] FROM (values (@1),(@2)) AS data([name])`,
+        ["Rowan", "Mira"]
+      ])
+    })
+  }
+
   it("array helper", () => {
     const [query, params] = sql`SELECT * FROM ${sql("people")} WHERE id IN ${sql.in([1, 2, "string"])}`.compile()
     expect(query).toEqual(`SELECT * FROM [people] WHERE id IN (@1,@2,@3)`)
diff --git a/repos/effect/packages/sql/mssql/test/SqlErrorClassification.test.ts b/repos/effect/packages/sql/mssql/test/SqlErrorClassification.test.ts
index 6a469024a..689e6df3b 100644
--- a/repos/effect/packages/sql/mssql/test/SqlErrorClassification.test.ts
+++ b/repos/effect/packages/sql/mssql/test/SqlErrorClassification.test.ts
@@ -113,7 +113,7 @@ const assertUniqueViolation = (reason: SqlError.SqlErrorReason, constraint: stri
   }
 }
 
-describe("MssqlClient SqlError classification", () => {
+describe("MssqlClient SqlError classification", { concurrent: false }, () => {
   it.effect("maps representative error numbers to reasons", () =>
     Effect.gen(function*() {
       const cases = [
diff --git a/repos/effect/packages/sql/mssql/tsconfig.json b/repos/effect/packages/sql/mssql/tsconfig.json
index e2a8ca19a..f98eabd65 100644
--- a/repos/effect/packages/sql/mssql/tsconfig.json
+++ b/repos/effect/packages/sql/mssql/tsconfig.json
@@ -1,6 +1,9 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "types": ["node"]
+  },
   "include": ["src"],
   "references": [
     { "path": "../../effect" }
diff --git a/repos/effect/packages/sql/mysql2/CHANGELOG.md b/repos/effect/packages/sql/mysql2/CHANGELOG.md
index b32d2a554..4c5f1f9e2 100644
--- a/repos/effect/packages/sql/mysql2/CHANGELOG.md
+++ b/repos/effect/packages/sql/mysql2/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @effect/sql-mysql2
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- [#8308](https://github.com/Effect-TS/effect/pull/8308) [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca) Thanks @tristanz! - Release savepoints after nested transactions succeed or successfully roll back in PostgreSQL, PGlite, MySQL, libSQL, and the Node, Bun, React Native, and WASM SQLite clients. This frees PostgreSQL transaction locks before the outer transaction completes.
+  
+  Custom SQL clients can opt in through the new `releaseSavepoint` option. Clients that omit it are unchanged.
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- [#8225](https://github.com/Effect-TS/effect/pull/8225) [`8abae87`](https://github.com/Effect-TS/effect/commit/8abae870f901540fe7e1ec461aef755558a3fe69) Thanks @tim-smart! - Update Rolldown, the Deno Redis driver, Cloudflare Workers types, and MySQL dependencies to their latest releases.
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#8096](https://github.com/Effect-TS/effect/pull/8096) [`cce221e`](https://github.com/Effect-TS/effect/commit/cce221ebf450bbcf067f73bce98598303f6e4798) Thanks @tim-smart! - Update dependencies to their latest compatible versions.
+
+- [#7534](https://github.com/Effect-TS/effect/pull/7534) [`c1693ff`](https://github.com/Effect-TS/effect/commit/c1693ffda83924ef2c71959cda643477ee42002d) Thanks @tim-smart! - Update production dependencies to their latest releases.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/sql/mysql2/package.json b/repos/effect/packages/sql/mysql2/package.json
index ca46918ba..e62e63b17 100644
--- a/repos/effect/packages/sql/mysql2/package.json
+++ b/repos/effect/packages/sql/mysql2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/sql-mysql2",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "A MySQL toolkit for Effect",
@@ -68,6 +68,6 @@
     "effect": "workspace:^"
   },
   "dependencies": {
-    "mysql2": "^3.24.2"
+    "mysql2": "^3.24.4"
   }
 }
diff --git a/repos/effect/packages/sql/mysql2/src/MysqlClient.ts b/repos/effect/packages/sql/mysql2/src/MysqlClient.ts
index afd682f66..c5f37f813 100644
--- a/repos/effect/packages/sql/mysql2/src/MysqlClient.ts
+++ b/repos/effect/packages/sql/mysql2/src/MysqlClient.ts
@@ -408,6 +408,7 @@ export const make = (
       yield* Client.make({
         acquirer: Effect.succeed(poolConnection),
         transactionAcquirer,
+        releaseSavepoint: (name) => `RELEASE SAVEPOINT ${name}`,
         compiler,
         spanAttributes,
         transformRows
diff --git a/repos/effect/packages/sql/mysql2/test/Client.integration.test.ts b/repos/effect/packages/sql/mysql2/test/Client.integration.test.ts
index d51b2f7c2..19aaa1459 100644
--- a/repos/effect/packages/sql/mysql2/test/Client.integration.test.ts
+++ b/repos/effect/packages/sql/mysql2/test/Client.integration.test.ts
@@ -12,6 +12,24 @@ const SqlLogger = Layer.succeed(Statement.CurrentTransformer)((statement) => {
 })
 
 describe("sql", () => {
+  it.effect("releases completed nested savepoints", () =>
+    Effect.gen(function*() {
+      const sql = yield* SqlClient.SqlClient
+      yield* sql`CREATE TABLE savepoint_release (value INTEGER)`
+      yield* sql.withTransaction(Effect.gen(function*() {
+        for (const rollback of [false, true]) {
+          yield* sql.withTransaction(
+            sql`INSERT INTO savepoint_release VALUES (1)`.pipe(
+              Effect.andThen(rollback ? Effect.fail("rollback") : Effect.void)
+            )
+          ).pipe(Effect.ignore)
+          const error = yield* sql`RELEASE SAVEPOINT effect_sql_1`.unprepared.pipe(Effect.flip)
+          assert.strictEqual(error._tag, "SqlError")
+        }
+      }))
+      assert.deepStrictEqual(yield* sql`SELECT value FROM savepoint_release`, [{ value: 1 }])
+    }).pipe(Effect.provide(MysqlContainer.layerClient)), { timeout: 60_000 })
+
   it.effect("tranformers", () =>
     Effect.gen(function*() {
       const logs: Array<unknown> = []
diff --git a/repos/effect/packages/sql/mysql2/test/Model.integration.test.ts b/repos/effect/packages/sql/mysql2/test/Model.integration.test.ts
index f5165a50b..84b814d2a 100644
--- a/repos/effect/packages/sql/mysql2/test/Model.integration.test.ts
+++ b/repos/effect/packages/sql/mysql2/test/Model.integration.test.ts
@@ -1,4 +1,4 @@
-import { assert, describe, it } from "@effect/vitest"
+import { assert, it } from "@effect/vitest"
 import { Cause, Effect, Schema } from "effect"
 import { Model } from "effect/unstable/schema"
 import { SqlClient, SqlModel, SqlResolver } from "effect/unstable/sql"
@@ -22,67 +22,64 @@ class SoftDeleteUser extends Model.Class<SoftDeleteUser>("SoftDeleteUser")({
   )
 }) {}
 
-describe("SqlModel", () => {
+it.layer(MysqlContainer.layer, { timeout: "90 seconds", excludeTestServices: true })("SqlModel", (it) => {
   it.effect("insert returns result", () =>
     Effect.gen(function*() {
       const repo = yield* SqlModel.makeRepository(User, {
-        tableName: "users",
+        tableName: "users_insert",
         idColumn: "id",
         spanPrefix: "UserRepository"
       })
       const sql = yield* SqlClient.SqlClient
-      yield* sql`CREATE TABLE users (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), age INT)`
+      yield* sql`CREATE TABLE users_insert (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), age INT)`
 
       const result = yield* repo.insert(User.insert.make({ name: "Alice", age: 30 }))
       assert.deepStrictEqual(result, new User({ id: 1, name: "Alice", age: 30 }))
     }).pipe(
-      Effect.provide(MysqlContainer.layerClient),
-      Effect.catchTag("ContainerError", () => Effect.void)
+      Effect.provide(MysqlContainer.client)
     ), { timeout: 60_000 })
 
   it.effect("insert returns result with transforms", () =>
     Effect.gen(function*() {
       const repo = yield* SqlModel.makeRepository(User, {
-        tableName: "users",
+        tableName: "users_insert_transforms",
         idColumn: "id",
         spanPrefix: "UserRepository"
       })
       const sql = yield* SqlClient.SqlClient
-      yield* sql`CREATE TABLE users (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), age INT)`
+      yield* sql`CREATE TABLE users_insert_transforms (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), age INT)`
 
       const result = yield* repo.insert(User.insert.make({ name: "Alice", age: 30 }))
       assert.deepStrictEqual(result, new User({ id: 1, name: "Alice", age: 30 }))
     }).pipe(
-      Effect.provide(MysqlContainer.layerClientWithTransforms),
-      Effect.catchTag("ContainerError", () => Effect.void)
+      Effect.provide(MysqlContainer.clientWithTransforms)
     ), { timeout: 60_000 })
 
   it.effect("insertVoid", () =>
     Effect.gen(function*() {
       const repo = yield* SqlModel.makeRepository(User, {
-        tableName: "users",
+        tableName: "users_insert_void",
         idColumn: "id",
         spanPrefix: "UserRepository"
       })
       const sql = yield* SqlClient.SqlClient
-      yield* sql`CREATE TABLE users (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), age INT)`
+      yield* sql`CREATE TABLE users_insert_void (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), age INT)`
 
       const result = yield* repo.insertVoid(User.insert.make({ name: "Alice", age: 30 }))
       assert.strictEqual(result, void 0)
     }).pipe(
-      Effect.provide(MysqlContainer.layerClient),
-      Effect.catchTag("ContainerError", () => Effect.void)
+      Effect.provide(MysqlContainer.client)
     ), { timeout: 60_000 })
 
-  it.live("insert data loader returns result", () =>
+  it.effect("insert data loader returns result", () =>
     Effect.gen(function*() {
       const repo = yield* SqlModel.makeResolvers(User, {
-        tableName: "users",
+        tableName: "users_insert_loader",
         idColumn: "id",
         spanPrefix: "UserRepository"
       })
       const sql = yield* SqlClient.SqlClient
-      yield* sql`CREATE TABLE users (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), age INT)`
+      yield* sql`CREATE TABLE users_insert_loader (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), age INT)`
 
       const [alice, john] = yield* Effect.all([
         SqlResolver.request(User.insert.make({ name: "Alice", age: 30 }), repo.insert),
@@ -91,19 +88,18 @@ describe("SqlModel", () => {
       assert.deepStrictEqual(alice.name, "Alice")
       assert.deepStrictEqual(john.name, "John")
     }).pipe(
-      Effect.provide(MysqlContainer.layerClient),
-      Effect.catchTag("ContainerError", () => Effect.void)
+      Effect.provide(MysqlContainer.client)
     ), { timeout: 60_000 })
 
-  it.live("findById data loader", () =>
+  it.effect("findById data loader", () =>
     Effect.gen(function*() {
       const repo = yield* SqlModel.makeResolvers(User, {
-        tableName: "users",
+        tableName: "users_find_loader",
         idColumn: "id",
         spanPrefix: "UserRepository"
       })
       const sql = yield* SqlClient.SqlClient
-      yield* sql`CREATE TABLE users (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), age INT)`
+      yield* sql`CREATE TABLE users_find_loader (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), age INT)`
       const alice = yield* SqlResolver.request(User.insert.make({ name: "Alice", age: 30 }), repo.insert)
       const john = yield* SqlResolver.request(User.insert.make({ name: "John", age: 30 }), repo.insert)
 
@@ -115,8 +111,7 @@ describe("SqlModel", () => {
       assert.deepStrictEqual(alice2.name, "Alice")
       assert.deepStrictEqual(john2.name, "John")
     }).pipe(
-      Effect.provide(MysqlContainer.layerClient),
-      Effect.catchTag("ContainerError", () => Effect.void)
+      Effect.provide(MysqlContainer.client)
     ), { timeout: 60_000 })
 
   it.effect("findById ignores soft deleted rows", () =>
@@ -150,11 +145,10 @@ describe("SqlModel", () => {
       const deletedError = yield* Effect.flip(repo.findById(alice.id))
       assert.isTrue(Cause.isNoSuchElementError(deletedError))
     }).pipe(
-      Effect.provide(MysqlContainer.layerClient),
-      Effect.catchTag("ContainerError", () => Effect.void)
+      Effect.provide(MysqlContainer.client)
     ), { timeout: 60_000 })
 
-  it.live("findById data loader ignores soft deleted rows", () =>
+  it.effect("findById data loader ignores soft deleted rows", () =>
     Effect.gen(function*() {
       const repo = yield* SqlModel.makeResolvers(SoftDeleteUser, {
         tableName: "soft_delete_user_resolvers",
@@ -185,43 +179,40 @@ describe("SqlModel", () => {
       const deletedError = yield* Effect.flip(SqlResolver.request(alice.id, repo.findById))
       assert.isTrue(Cause.isNoSuchElementError(deletedError))
     }).pipe(
-      Effect.provide(MysqlContainer.layerClient),
-      Effect.catchTag("ContainerError", () => Effect.void)
+      Effect.provide(MysqlContainer.client)
     ), { timeout: 60_000 })
 
   it.effect("update returns result", () =>
     Effect.gen(function*() {
       const repo = yield* SqlModel.makeRepository(User, {
-        tableName: "users",
+        tableName: "users_update",
         idColumn: "id",
         spanPrefix: "UserRepository"
       })
       const sql = yield* SqlClient.SqlClient
-      yield* sql`CREATE TABLE users (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), age INT)`
+      yield* sql`CREATE TABLE users_update (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), age INT)`
 
       let result = yield* repo.insert(User.insert.make({ name: "Alice", age: 30 }))
       result = yield* repo.update(User.update.make({ ...result, name: "Bob" }))
       assert.deepStrictEqual(result, new User({ id: 1, name: "Bob", age: 30 }))
     }).pipe(
-      Effect.provide(MysqlContainer.layerClient),
-      Effect.catchTag("ContainerError", () => Effect.void)
+      Effect.provide(MysqlContainer.client)
     ), { timeout: 60_000 })
 
   it.effect("update returns result with transforms", () =>
     Effect.gen(function*() {
       const repo = yield* SqlModel.makeRepository(User, {
-        tableName: "users",
+        tableName: "users_update_transforms",
         idColumn: "id",
         spanPrefix: "UserRepository"
       })
       const sql = yield* SqlClient.SqlClient
-      yield* sql`CREATE TABLE users (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), age INT)`
+      yield* sql`CREATE TABLE users_update_transforms (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), age INT)`
 
       let result = yield* repo.insert(User.insert.make({ name: "Alice", age: 30 }))
       result = yield* repo.update(User.update.make({ ...result, name: "Bob" }))
       assert.deepStrictEqual(result, new User({ id: 1, name: "Bob", age: 30 }))
     }).pipe(
-      Effect.provide(MysqlContainer.layerClientWithTransforms),
-      Effect.catchTag("ContainerError", () => Effect.void)
+      Effect.provide(MysqlContainer.clientWithTransforms)
     ), { timeout: 60_000 })
 })
diff --git a/repos/effect/packages/sql/mysql2/test/Persistence.integration.test.ts b/repos/effect/packages/sql/mysql2/test/Persistence.integration.test.ts
index ea8f80e4d..c5db8c4ec 100644
--- a/repos/effect/packages/sql/mysql2/test/Persistence.integration.test.ts
+++ b/repos/effect/packages/sql/mysql2/test/Persistence.integration.test.ts
@@ -1,4 +1,4 @@
-import { assert, it } from "@effect/vitest"
+import { assert, describe, it } from "@effect/vitest"
 import { Effect, Layer, Schema } from "effect"
 import * as PersistedCacheTest from "effect-test/unstable/persistence/PersistedCacheTest"
 import * as PersistedQueueTest from "effect-test/unstable/persistence/PersistedQueueTest"
@@ -11,8 +11,6 @@ import { MysqlContainer } from "./utils.ts"
 it.layer(MysqlContainer.layerClient, { timeout: "90 seconds" })("Persistence", (it) => {
   PersistedCacheTest.suiteWith("sql-mysql2-multi", Persistence.layerSqlMultiTable, it)
 
-  PersistedCacheTest.suiteWith("sql-mysql2-single", Persistence.layerSql, it)
-
   PersistedQueueTest.suiteWith("sql-mysql2", PersistedQueue.layerStoreSql(), it)
 
   // elements are stored in a MEDIUMTEXT column, so payloads must survive the
@@ -34,52 +32,56 @@ it.layer(MysqlContainer.layerClient, { timeout: "90 seconds" })("Persistence", (
       assert.strictEqual(value, payload)
     }).pipe(TestClock.withLive), { timeout: 30000 })
 
-  it.effect("deletes expired entries in batches", () =>
-    Effect.gen(function*() {
-      const sql = (yield* SqlClient.SqlClient).withoutTransforms()
-      const table = sql("effect_persistence")
-      const expiredCount = sql<{ readonly count: number }>`
-        SELECT COUNT(*) AS count FROM ${table} WHERE store_id = 'expired'
-      `.pipe(Effect.map((rows) => Number(rows[0].count)))
-      // Reset the table left by the single-table cache suite so cleanup builds its own schema and index.
-      yield* sql`DROP TABLE IF EXISTS ${table}`
-      yield* sql`
-        CREATE TABLE ${table} (
-          store_id VARCHAR(191) NOT NULL,
-          id VARCHAR(191) NOT NULL,
-          value TEXT NOT NULL,
-          expires BIGINT,
-          PRIMARY KEY (store_id, id)
-        )
-      `
+  describe("single-table persistence", { concurrent: false }, () => {
+    PersistedCacheTest.suiteWith("sql-mysql2-single", Persistence.layerSql, it)
+
+    it.effect("deletes expired entries in batches", () =>
+      Effect.gen(function*() {
+        const sql = (yield* SqlClient.SqlClient).withoutTransforms()
+        const table = sql("effect_persistence")
+        const expiredCount = sql<{ readonly count: number }>`
+          SELECT COUNT(*) AS count FROM ${table} WHERE store_id = 'expired'
+        `.pipe(Effect.map((rows) => Number(rows[0].count)))
+        // Reset the table left by the single-table cache suite so cleanup builds its own schema and index.
+        yield* sql`DROP TABLE IF EXISTS ${table}`
+        yield* sql`
+          CREATE TABLE ${table} (
+            store_id VARCHAR(191) NOT NULL,
+            id VARCHAR(191) NOT NULL,
+            value TEXT NOT NULL,
+            expires BIGINT,
+            PRIMARY KEY (store_id, id)
+          )
+        `
 
-      const entries = Array.from({ length: SqlCleanupTest.expiredEntryCount }, (_, i) => ({
-        store_id: "expired",
-        id: String(i),
-        value: "{}",
-        expires: SqlCleanupTest.expiredAtEpoch
-      }))
-      yield* sql`INSERT INTO ${table} ${sql.insert(entries)}`.unprepared
-      yield* sql`
-        INSERT INTO ${table} (store_id, id, value, expires)
-        VALUES ('live', 'live', '{}', NULL), ('live', 'future', '{}', ${SqlCleanupTest.futureExpiresAt})
-      `
+        const entries = Array.from({ length: SqlCleanupTest.expiredEntryCount }, (_, i) => ({
+          store_id: "expired",
+          id: String(i),
+          value: "{}",
+          expires: SqlCleanupTest.expiredAtEpoch
+        }))
+        yield* sql`INSERT INTO ${table} ${sql.insert(entries)}`.unprepared
+        yield* sql`
+          INSERT INTO ${table} (store_id, id, value, expires)
+          VALUES ('live', 'live', '{}', NULL), ('live', 'future', '{}', ${SqlCleanupTest.futureExpiresAt})
+        `
 
-      yield* Layer.build(Persistence.layerBackingSql).pipe(TestClock.withLive)
+        yield* Layer.build(Persistence.layerBackingSql).pipe(TestClock.withLive)
 
-      const expired = yield* SqlCleanupTest.waitForCount(expiredCount, (count) => count === 0)
-      assert.strictEqual(expired, 0)
-      const live = yield* sql<{ readonly count: number }>`
-        SELECT COUNT(*) AS count FROM ${table} WHERE store_id = 'live'
-      `
-      assert.strictEqual(Number(live[0].count), 2)
+        const expired = yield* SqlCleanupTest.waitForCount(expiredCount, (count) => count === 0)
+        assert.strictEqual(expired, 0)
+        const live = yield* sql<{ readonly count: number }>`
+          SELECT COUNT(*) AS count FROM ${table} WHERE store_id = 'live'
+        `
+        assert.strictEqual(Number(live[0].count), 2)
 
-      const indexes = yield* sql<{ readonly count: number }>`
-        SELECT COUNT(*) AS count FROM information_schema.statistics
-        WHERE table_schema = DATABASE()
-          AND table_name = 'effect_persistence'
-          AND index_name = 'effect_persistence_expires_idx'
-      `
-      assert.strictEqual(Number(indexes[0].count), 1)
-    }), { timeout: SqlCleanupTest.testTimeout })
+        const indexes = yield* sql<{ readonly count: number }>`
+          SELECT COUNT(*) AS count FROM information_schema.statistics
+          WHERE table_schema = DATABASE()
+            AND table_name = 'effect_persistence'
+            AND index_name = 'effect_persistence_expires_idx'
+        `
+        assert.strictEqual(Number(indexes[0].count), 1)
+      }), { timeout: SqlCleanupTest.testTimeout })
+  })
 })
diff --git a/repos/effect/packages/sql/mysql2/test/SqlErrorClassification.test.ts b/repos/effect/packages/sql/mysql2/test/SqlErrorClassification.test.ts
index fbc7d7b7b..afbdf9b60 100644
--- a/repos/effect/packages/sql/mysql2/test/SqlErrorClassification.test.ts
+++ b/repos/effect/packages/sql/mysql2/test/SqlErrorClassification.test.ts
@@ -38,7 +38,7 @@ const assertUniqueViolation = (reason: SqlError.SqlErrorReason, constraint: stri
   }
 }
 
-describe("MysqlClient SqlError classification", () => {
+describe("MysqlClient SqlError classification", { concurrent: false }, () => {
   it.effect("maps representative errno codes to reasons", () =>
     Effect.gen(function*() {
       const cases = [
diff --git a/repos/effect/packages/sql/mysql2/test/utils.ts b/repos/effect/packages/sql/mysql2/test/utils.ts
index ef749fcce..b148801d3 100644
--- a/repos/effect/packages/sql/mysql2/test/utils.ts
+++ b/repos/effect/packages/sql/mysql2/test/utils.ts
@@ -43,7 +43,7 @@ export class MysqlContainer extends Context.Service<
 
   static layerClient = this.client.pipe(Layer.provide(this.layer))
 
-  static layerClientWithTransforms = Layer.unwrap(
+  static clientWithTransforms = Layer.unwrap(
     Effect.gen(function*() {
       const container = yield* MysqlContainer
       return MysqlClient.layer({
@@ -52,7 +52,7 @@ export class MysqlContainer extends Context.Service<
         transformResultNames: String.snakeToCamel
       })
     })
-  ).pipe(Layer.provide(this.layer))
+  )
 
   static layerVitest = Layer.effect(
     this,
diff --git a/repos/effect/packages/sql/pg/CHANGELOG.md b/repos/effect/packages/sql/pg/CHANGELOG.md
index 989da0cef..489710589 100644
--- a/repos/effect/packages/sql/pg/CHANGELOG.md
+++ b/repos/effect/packages/sql/pg/CHANGELOG.md
@@ -1,5 +1,105 @@
 # @effect/sql-pg
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- [#8309](https://github.com/Effect-TS/effect/pull/8309) [`7869f54`](https://github.com/Effect-TS/effect/commit/7869f54af4bd6b2bd58ff45edcb16ba7fe0a69e4) Thanks @tristanz! - Decode binary `regclass` and `regclass[]` values as unsigned numeric OIDs, fixing the migration runner's table-existence check. Cast `regclass` values to `text` in SQL to return relation names.
+
+- [#8327](https://github.com/Effect-TS/effect/pull/8327) [`201b5ab`](https://github.com/Effect-TS/effect/commit/201b5ab5c4b4570fff18aa0833b2e3c6a87c02c7) Thanks @tim-smart! - Namespace prepared statement names per connection to avoid collisions when backend sessions are shared.
+
+- [#8308](https://github.com/Effect-TS/effect/pull/8308) [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca) Thanks @tristanz! - Release savepoints after nested transactions succeed or successfully roll back in PostgreSQL, PGlite, MySQL, libSQL, and the Node, Bun, React Native, and WASM SQLite clients. This frees PostgreSQL transaction locks before the outer transaction completes.
+  
+  Custom SQL clients can opt in through the new `releaseSavepoint` option. Clients that omit it are unchanged.
+
+- [#8330](https://github.com/Effect-TS/effect/pull/8330) [`27de875`](https://github.com/Effect-TS/effect/commit/27de8756121c0278ee92d409d1fdcec5693ca0a0) Thanks @tim-smart! - Retire pooled PostgreSQL sessions with an unconfirmed `CancelRequest`, preventing a delayed cancel from reaching a later checkout. This includes interrupts sent while idle. The current checkout and unpooled sessions remain exposed to their own late cancel.
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- [#8215](https://github.com/Effect-TS/effect/pull/8215) [`9367dcb`](https://github.com/Effect-TS/effect/commit/9367dcbeda92c6473e9f2d90377663152b285d08) Thanks @hsyntax! - Preserve the original `SqlError` when a PostgreSQL LISTEN connection fails after registration, allowing `Stream.retry` to acquire a new listener. Intentional scope closure still interrupts consumers.
+  
+  Notification queues returned by `PgClient.listen` and `PgConnection.listen` now carry `SqlError`. Update explicit queue and stream type annotations to include this error.
+
+- [#8200](https://github.com/Effect-TS/effect/pull/8200) [`8feeb3c`](https://github.com/Effect-TS/effect/commit/8feeb3c4cdbd0f2e57fa25bb0d6fe3b9509117db) Thanks @tim-smart! - Support `sslmode=prefer` and `sslmode=allow` by trying TLS first, then plaintext if the server declines `SSLRequest`. Unlike libpq, `allow` also tries TLS first. Explicit `ssl` overrides and certificate verification are unchanged. TLS handshake and certificate failures remain fatal. Cancellation never downgrades a TLS session to plaintext.
+
+- [#8234](https://github.com/Effect-TS/effect/pull/8234) [`4e4a3a6`](https://github.com/Effect-TS/effect/commit/4e4a3a60554b8fa8075cf44cf29f50698e871644) Thanks @tim-smart! - Add structured `startupParameters` and opaque `startupOptions` to connection config, and restore support for URL `options`. Explicit `startupOptions` overrides URL `options`; the startup packet field remains `options`. Send session defaults in every physical connection's startup packet, including pooled replacements, with config validation and documented application-name precedence.
+
+- [#8224](https://github.com/Effect-TS/effect/pull/8224) [`205066a`](https://github.com/Effect-TS/effect/commit/205066a76f6b131cf5889bb655e755b4bbcdd8c4) Thanks @alvarosevilla95! - Support infallible Effect password providers with no service requirements, refreshed per PostgreSQL connection and schema dump.
+
+- [#8241](https://github.com/Effect-TS/effect/pull/8241) [`8ef3fcb`](https://github.com/Effect-TS/effect/commit/8ef3fcbbe7cd75f63114ba19755fad620a1b3c17) Thanks @tim-smart! - Decode `timestamp` and `timestamptz` values, including array elements, as `Date` instead of epoch milliseconds. Their encoders, including `PgTypes.timestamp` and `PgTypes.timestamptz`, accept either form. Precision remains milliseconds.
+  
+  ### Breaking changes
+  
+  - Numeric readers must call `date.getTime()` or restore numeric codecs with `PgTypes.register` or a client `Registry` passed as `types`.
+  - `infinity`, `-infinity` and values outside the JavaScript `Date` range decode to an invalid `Date`. Numeric `±Infinity` still encodes PostgreSQL's sentinels; encoding an invalid `Date` fails with `PgTypes.CodecError`.
+  
+  Date parameters bind as `timestamptz`. Inserting one into a `timestamp` column applies the session `TimeZone`. Use UTC or `PgTypes.timestamp(value)` to preserve its UTC fields. `timestamptz` round trips preserve the instant regardless of session timezone.
+
+- [#8240](https://github.com/Effect-TS/effect/pull/8240) [`fd910d1`](https://github.com/Effect-TS/effect/commit/fd910d1cc6f817ceb677c688d964f4173b3aa0e3) Thanks @tim-smart! - Decode unregistered OIDs as UTF-8 text so scalar enums return string labels.
+  
+  Other binary user-defined types, including enum arrays, may produce garbled text or fail UTF-8 decoding. Decode failures close the connection, failing its pending queries and discarding transactions and `LISTEN` subscriptions; the pool replaces it.
+  
+  Register scalar codecs with `PgTypes.register`. For arrays, use `PgTypes.makeRegistry().register(elementOid, codec, { arrayOid })` and pass the registry as the client's `types` option.
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- [#8174](https://github.com/Effect-TS/effect/pull/8174) [`91abe38`](https://github.com/Effect-TS/effect/commit/91abe38c3797b1c290aedef3b01e8c96dd4fee79) Thanks @tim-smart! - Default TLS servername to the hostname for non-IP hosts during connection startup and cancellation, restoring connections to Postgres endpoints that require SNI. Preserve explicit SSL servername overrides.
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7426](https://github.com/Effect-TS/effect/pull/7426) [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468) Thanks @tim-smart! - Replace `@effect/sql-pg`'s `pg` runtime with a native PostgreSQL client. `PgConnection` and `PgPool` now handle connection setup, binary queries, prepared statements, pipelining, streaming, notifications, cancellation, and custom codecs. `PgConnection.listen` and `PgClient.listen` return scoped notification dequeues after PostgreSQL confirms the subscription. `PgClient` uses the native stack, and the legacy `fromPool`, `fromClient`, and `makeWith` constructors are removed.
+  
+  ### Breaking changes
+  
+  - `fromPool`, `fromClient`, and `makeWith` are removed. Use `make` for a pool or `makeClient` for one connection.
+  - `PgClient.listen` returns a scoped `Effect<Dequeue<string>, SqlError, Scope>` instead of a `Stream`. Acquisition completes after PostgreSQL confirms `LISTEN`, so notifications sent after it returns cannot be missed.
+  - `PgClientConfig.types` now accepts a `PgTypes.Registry` instead of `pg.CustomTypesConfig`. Plain object parameters are no longer inferred as JSON; wrap them with `sql.json`.
+  - Query strings must contain one statement. PostgreSQL's extended protocol rejects multi-statement strings.
+  - Results use the native binary codecs. In particular, `int8` decodes to `bigint`, `date` to a string, timestamps to Unix epoch milliseconds, and `bytea` or unknown OIDs to `Uint8Array`. `executeRaw` returns the native `PgConnection.Result` shape rather than `pg.Result`.
+  - Named prepared statements are enabled by default. Set `prepare: false` when using a pooler that cannot preserve prepared statements between queries. `Statement.unprepared` and `Statement.valuesUnprepared` use unnamed extended queries without adding entries to the prepared-statement cache.
+  
+  Inferred parameters stay permissive: strings bind untyped so the backend derives the type from the statement, and safe integers beyond the `int4` range bind as `int8`.
+  
+  Add `Pool.reserve` for exclusive access to a concurrent pool item, and fix waiter wakeups and capacity replacement after invalidation.
+
+- [#7509](https://github.com/Effect-TS/effect/pull/7509) [`c405edc`](https://github.com/Effect-TS/effect/commit/c405edc991566c38168dd0ca5087f66b8d0085d3) Thanks @tim-smart! - Set the default `multiplexConcurrency` to 32 when PostgreSQL connection multiplexing is enabled. Set a lower value explicitly to limit how many statements share each connection.
+
+- [#7503](https://github.com/Effect-TS/effect/pull/7503) [`96ea948`](https://github.com/Effect-TS/effect/commit/96ea9486558ea64801c91a8d74dda9a45845d8fc) Thanks @tim-smart! - Allow each PostgreSQL pool connection to complete its first checkout before applying `connectionTTL`, so a zero TTL
+  disables connection reuse without entering an invalidate/reconnect loop.
+
+- [#7502](https://github.com/Effect-TS/effect/pull/7502) [`e203638`](https://github.com/Effect-TS/effect/commit/e203638f6e594ff738c6cdb5a5ac8e57ae3be1d2) Thanks @tim-smart! - Add a `maxMessageSize` connection option so PostgreSQL clients can receive backend messages larger than the 16 MiB default.
+
+- [#7524](https://github.com/Effect-TS/effect/pull/7524) [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6) Thanks @fubhy! - Add `NetAddress` under `effect/unstable/net` for MAC, IP, internet socket, and Unix socket addresses, with checked parsing, schemas, equality, canonical string serialization, and URL formatting. Companion modules `IpInterface` and `IpNetwork` represent IP interfaces and CIDR networks.
+  
+  HTTP and socket servers now expose `NetAddress.SocketAddress`. Replace TCP `hostname` access with `NetAddress.formatIp(address.address)` and use `UnixPathAddress.path` for Unix sockets. URL helpers bracket IPv6 addresses and reject scoped IPv6. Bun and Deno HTTP server layers can now fail with `ServeError` when listener address conversion fails.
+  
+  PostgreSQL `inet` values now use `IpInterface`; `cidr` values use `IpNetwork` and reject addresses with host bits set.
+
+- [#7734](https://github.com/Effect-TS/effect/pull/7734) [`fe3830a`](https://github.com/Effect-TS/effect/commit/fe3830add4734f942d495499ef22fb21a00d4cd0) Thanks @kitlangton! - Honor explicit `ssl` options when PostgreSQL URLs use `sslmode=prefer` or `sslmode=allow`.
+
+- [#7504](https://github.com/Effect-TS/effect/pull/7504) [`9adb9f2`](https://github.com/Effect-TS/effect/commit/9adb9f2c8224c2794f36ea048cff6e2275be9102) Thanks @tim-smart! - Reject PostgreSQL LISTEN and NOTIFY channel names longer than 63 UTF-8 bytes.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/sql/pg/README.md b/repos/effect/packages/sql/pg/README.md
index 59525f45a..5a62ae062 100644
--- a/repos/effect/packages/sql/pg/README.md
+++ b/repos/effect/packages/sql/pg/README.md
@@ -1,6 +1,6 @@
 # @effect/sql-pg
 
-An Effect SQL client for PostgreSQL, built on the [`pg`](https://node-postgres.com) library.
+An Effect SQL client for PostgreSQL with a native wire-protocol driver.
 
 ## Installation
 
@@ -8,6 +8,130 @@ An Effect SQL client for PostgreSQL, built on the [`pg`](https://node-postgres.c
 npm install effect@rc @effect/sql-pg@rc
 ```
 
+## Session defaults
+
+Use `startupParameters` to establish PostgreSQL session defaults when each physical
+connection opens, including replacement connections in a pool:
+
+```ts
+import { PgClient } from "@effect/sql-pg"
+import { Redacted } from "effect"
+
+const PostgresLive = PgClient.layer({
+  url: Redacted.make("postgres://user:password@localhost/app"),
+  startupParameters: {
+    statement_timeout: "5s",
+    search_path: "app, public"
+  },
+  startupOptions: "-c lock_timeout=1000"
+})
+```
+
+These settings are sent in the startup packet. PostgreSQL's `RESET ALL` restores
+the startup defaults after session-level changes. Both `PgConnection.Config` and
+`PgClientConfig` accept these fields, and pools inherit them.
+
+Parameter names are normalized to lowercase. Empty names and NUL bytes in names
+or values are rejected before connecting. The names `user`, `database`,
+`replication`, and `options` are reserved; use `username`, `database`, and `startupOptions`
+on the config for identity and opaque options. Replication mode is not supported
+through `startupParameters`. The driver accepts only `UTF8` or `UTF-8`
+(case-insensitive) for `client_encoding` and sends the canonical value `UTF8`.
+PostgreSQL validates other settings and reports invalid names or values at connect
+time.
+
+The `startupOptions` field is an opaque PostgreSQL options string. It can also come
+from the URL query, for example `?options=-c%20statement_timeout%3D5000`. Explicit
+config `startupOptions` overrides URL `options`, including when the explicit value
+is empty. The URL query key and startup packet field are both named `options`.
+Named parameters and opaque options can be sent together, but callers must not
+set the same GUC in both. The driver does not parse `-c` flags, detect conflicts,
+or read `PGOPTIONS`.
+
+The startup `application_name` is selected in this order:
+
+1. Explicit `applicationName`
+2. `startupParameters.application_name`
+3. URL `application_name`
+4. `"@effect/sql-pg"`
+
+The driver does not extract `application_name` from the opaque options string.
+
+## User-defined types
+
+Columns whose type OID has no codec are decoded as UTF-8 text, so user-defined
+enums read as plain strings:
+
+```ts
+import { PgClient } from "@effect/sql-pg"
+import { Effect } from "effect"
+
+// CREATE TYPE capability AS ENUM ('use_key', 'manage')
+const program = Effect.gen(function*() {
+  const sql = yield* PgClient.PgClient
+  const rows = yield* sql`SELECT 'use_key'::capability AS capability`
+  // rows[0].capability === "use_key"
+})
+```
+
+Strings bind to enum columns without any setup; the server infers the type.
+
+The fallback applies to every OID without a codec, not only enums, and it has
+two failure modes:
+
+- Invalid UTF-8 fails with `PgTypes.CodecError`, as it does for `text`. A codec
+  failure while reading a row is fatal to the connection, not just to the
+  query: the socket is destroyed, every other query pipelined on that
+  connection fails, an open transaction is lost, `LISTEN` channels on it are
+  torn down, and the pool replaces the connection. Columns of a binary
+  user-defined type such as a composite, a PostGIS geometry, or a pgvector
+  `vector` hold bytes that are usually not valid UTF-8, so register a codec
+  before querying them.
+- Bytes that happen to be valid UTF-8 decode as garbled text without any
+  error. Arrays of user-defined types, including enum arrays, land here: the
+  array header is all low bytes, so a `capability[]` column reads as a string
+  of control characters followed by the labels.
+
+Register a codec for a scalar user-defined type with
+`PgTypes.register(oid, codec)`; registered codecs take precedence over the
+fallback. `PgTypes.register` cannot attach an array type. For arrays, create a
+registry, register the element codec with its `arrayOid`, and pass the registry
+to the client as `types`. The registry builds the array codec from the element
+codec:
+
+```ts
+import { PgClient, PgTypes } from "@effect/sql-pg"
+import { Redacted, Result } from "effect"
+
+// SELECT oid, typarray FROM pg_type WHERE typname = 'capability'
+declare const capabilityOid: number
+declare const capabilityArrayOid: number
+
+const decoder = new TextDecoder("utf-8", { fatal: true })
+
+const utf8: PgTypes.Codec<string> = {
+  encode: (value) => Result.succeed(new TextEncoder().encode(value)),
+  decode: (bytes) => {
+    try {
+      return Result.succeed(decoder.decode(bytes))
+    } catch {
+      return Result.fail(new PgTypes.CodecError({ message: "Invalid UTF-8 in capability" }))
+    }
+  }
+}
+
+const types = PgTypes.makeRegistry()
+types.register(capabilityOid, utf8, { arrayOid: capabilityArrayOid })
+
+const PostgresLive = PgClient.layer({
+  url: Redacted.make("postgres://user:password@localhost/app"),
+  types
+})
+```
+
+OIDs of user-defined types are assigned per database, so look them up in
+`pg_type` at startup rather than hard-coding them.
+
 ## Documentation
 
 - [Effect website](https://effect.website)
diff --git a/repos/effect/packages/sql/pg/package.json b/repos/effect/packages/sql/pg/package.json
index 23c8c8ed7..fe497d61b 100644
--- a/repos/effect/packages/sql/pg/package.json
+++ b/repos/effect/packages/sql/pg/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/sql-pg",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "A PostgreSQL toolkit for Effect",
@@ -64,10 +64,10 @@
   },
   "devDependencies": {
     "@testcontainers/postgresql": "^12.1.0",
-    "@types/node": "^26.4.0",
+    "@types/node": "^26.6.2",
     "effect": "workspace:^",
     "postgres": "^3.4.9",
-    "tinybench": "^6.1.4"
+    "tinybench": "^6.2.0"
   },
   "peerDependencies": {
     "effect": "workspace:^"
diff --git a/repos/effect/packages/sql/pg/src/PgClient.ts b/repos/effect/packages/sql/pg/src/PgClient.ts
index c6b875969..bc8b7b4ee 100644
--- a/repos/effect/packages/sql/pg/src/PgClient.ts
+++ b/repos/effect/packages/sql/pg/src/PgClient.ts
@@ -53,13 +53,15 @@ export interface PgClient extends Client.SqlClient {
   readonly config: PgClientConfig
   readonly json: (_: unknown) => Fragment
   /**
-   * Registers a channel listener and returns its non-empty payload queue after
+   * Registers a channel listener and returns its notification queue after
    * PostgreSQL confirms `LISTEN`. The listener holds a connection until the
    * scope closes.
+   * Connection failures after registration fail the queue with the original
+   * `SqlError`. Intentional scope closure interrupts consumers.
    */
   readonly listen: (
     channel: string
-  ) => Effect.Effect<Queue.Dequeue<PgConnection.Notification>, SqlError, Scope.Scope>
+  ) => Effect.Effect<Queue.Dequeue<PgConnection.Notification, SqlError>, SqlError, Scope.Scope>
   readonly notify: (channel: string, payload: string) => Effect.Effect<void, SqlError>
 }
 
@@ -86,13 +88,35 @@ export interface PgClientConfig {
   readonly ssl?: boolean | ConnectionOptions | undefined
   readonly database?: string | undefined
   readonly username?: string | undefined
-  readonly password?: Redacted.Redacted | undefined
+  /**
+   * A static password or an Effect evaluated for each connection attempt.
+   * Providers must handle typed errors and require no services.
+   * {@link Effect.orDie} converts typed errors to defects, not retryable SQL errors.
+   */
+  readonly password?: Redacted.Redacted | Effect.Effect<Redacted.Redacted> | undefined
 
   readonly connectTimeout?: Duration.Input | undefined
 
   readonly stream?: (() => Duplex) | undefined
 
+  /**
+   * Overrides `startupParameters.application_name`, the URL's `application_name`,
+   * and the default `"@effect/sql-pg"`, in that order.
+   */
   readonly applicationName?: string | undefined
+  /**
+   * Session defaults sent in every physical connection's startup packet.
+   * Names are lowercased; `user`, `database`, `replication`, and `options` are
+   * reserved. `client_encoding` only accepts UTF8 / UTF-8 (case-insensitive).
+   * Empty names and NUL bytes fail before connecting; PostgreSQL validates
+   * other settings. Do not set the same GUC here and in `startupOptions`.
+   */
+  readonly startupParameters?: Readonly<Record<string, string>> | undefined
+  /**
+   * Opaque PostgreSQL startup options, overriding the URL's `options` parameter.
+   * Forwarded without parsing `-c` flags or checking for duplicate GUCs.
+   */
+  readonly startupOptions?: string | undefined
   readonly spanAttributes?: Record<string, unknown> | undefined
 
   readonly transformResultNames?: ((str: string) => string) | undefined
@@ -203,7 +227,7 @@ const makeImpl = Effect.fnUntraced(function*(
 
   const listen = (
     channel: string
-  ): Effect.Effect<Queue.Dequeue<PgConnection.Notification>, SqlError, Scope.Scope> =>
+  ): Effect.Effect<Queue.Dequeue<PgConnection.Notification, SqlError>, SqlError, Scope.Scope> =>
     Effect.flatMap(options.listenAcquirer, (connection) => connection.listen(channel))
 
   return Object.assign(
@@ -213,6 +237,7 @@ const makeImpl = Effect.fnUntraced(function*(
       // Postgres prepares transaction control like anything else, and a client
       // with preparation turned off falls back to the unnamed path anyway.
       prepareTransactionControls: true,
+      releaseSavepoint: (name) => `RELEASE SAVEPOINT ${name}`,
       transactionAcquirer: options.transactionAcquirer,
       compiler,
       spanAttributes: [
diff --git a/repos/effect/packages/sql/pg/src/PgConnection.ts b/repos/effect/packages/sql/pg/src/PgConnection.ts
index 03034b1c8..4ad47bc33 100644
--- a/repos/effect/packages/sql/pg/src/PgConnection.ts
+++ b/repos/effect/packages/sql/pg/src/PgConnection.ts
@@ -34,6 +34,7 @@ import type { Duplex } from "node:stream"
 import * as Tls from "node:tls"
 import type { ConnectionOptions } from "node:tls"
 import { type ConnectionInternals, internalsKey } from "./internal/connection.ts"
+import * as PasswordInternal from "./internal/password.ts"
 import { classifySqlState, validateChannelName } from "./internal/sqlError.ts"
 import * as PgAuth from "./PgAuth.ts"
 import * as PgProtocol from "./PgProtocol.ts"
@@ -66,6 +67,11 @@ export type TypeId = "~@effect/sql-pg/PgConnection"
  * socket path, while a `host` beginning with `/` is treated as a socket
  * directory and expands to `${host}/.s.PGSQL.${port}`.
  *
+ * URL modes `sslmode=prefer` and `sslmode=allow` try TLS first, falling back
+ * to plaintext only when the server answers `SSLRequest` with `N`. Unlike
+ * libpq, `allow` also tries TLS first. Certificate verification stays enabled
+ * unless explicitly disabled through `ssl` options.
+ *
  * Prepared statements are enabled by default and limited by
  * `preparedStatementCacheSize`. Disable them for statement-mode poolers or
  * workloads that generate unique SQL. Streams always use unnamed statements.
@@ -86,9 +92,31 @@ export interface Config {
   readonly ssl?: boolean | ConnectionOptions | undefined
   readonly database?: string | undefined
   readonly username?: string | undefined
-  readonly password?: Redacted.Redacted | undefined
+  /**
+   * A static password or an Effect evaluated for each connection attempt.
+   * Providers must handle typed errors and require no services.
+   * {@link Effect.orDie} converts typed errors to defects, not retryable SQL errors.
+   */
+  readonly password?: Redacted.Redacted | Effect.Effect<Redacted.Redacted> | undefined
   readonly connectTimeout?: Duration.Input | undefined
+  /**
+   * Overrides `startupParameters.application_name`, the URL's `application_name`,
+   * and the default `"@effect/sql-pg"`, in that order.
+   */
   readonly applicationName?: string | undefined
+  /**
+   * Session defaults sent in every physical connection's startup packet.
+   * Names are lowercased; `user`, `database`, `replication`, and `options` are
+   * reserved. `client_encoding` only accepts UTF8 / UTF-8 (case-insensitive).
+   * Empty names and NUL bytes fail before connecting; PostgreSQL validates
+   * other settings. Do not set the same GUC here and in `startupOptions`.
+   */
+  readonly startupParameters?: Readonly<Record<string, string>> | undefined
+  /**
+   * Opaque PostgreSQL startup options, overriding the URL's `options` parameter.
+   * Forwarded without parsing `-c` flags or checking for duplicate GUCs.
+   */
+  readonly startupOptions?: string | undefined
   readonly stream?: (() => Duplex) | undefined
   readonly types?: PgTypes.Registry | undefined
   readonly multiplex?: boolean | undefined
@@ -171,13 +199,26 @@ export interface PgConnection {
    * ownership queue, while calls through the original connection wait.
    */
   readonly pin: Effect.Effect<PgConnection, never, Scope.Scope>
-  /** Runs a query and returns rows keyed by column name. Pass `false` to skip the prepared statement cache. */
+  /**
+   * Runs a query and returns rows keyed by column name. Pass `false` to skip
+   * the prepared statement cache.
+   *
+   * On interruption, the connection drains to `ReadyForQuery` and sends a
+   * `CancelRequest` if needed. Unless the backend confirms cancellation with
+   * `57014`, a pool retires the session before its next checkout. A retained
+   * checkout and an unpooled session remain exposed to a late cancel.
+   * `statement_timeout` also reports `57014` and can be mistaken for
+   * confirmation.
+   */
   readonly query: (
     sql: string,
     params?: ReadonlyArray<unknown>,
     prepare?: boolean
   ) => Effect.Effect<Result, SqlError>
-  /** Runs a query and returns positional rows. Pass `false` to skip the prepared statement cache. */
+  /**
+   * Runs a query and returns positional rows. Pass `false` to skip the
+   * prepared statement cache. Interruption behaves as for `query`.
+   */
   readonly queryValues: (
     sql: string,
     params?: ReadonlyArray<unknown>,
@@ -185,9 +226,8 @@ export interface PgConnection {
   ) => Effect.Effect<ReadonlyArray<ReadonlyArray<unknown>>, SqlError>
   /**
    * Streams rows without collecting the full result. The session is pinned for
-   * the lifetime of the stream. Aborting the stream
-   * before the result completes cancels the statement with a `CancelRequest`
-   * and drains the connection back to `ReadyForQuery`.
+   * the lifetime of the stream. An early abort behaves like an interrupted
+   * `query`.
    */
   readonly stream: (
     sql: string,
@@ -198,10 +238,12 @@ export interface PgConnection {
    * PostgreSQL confirms `LISTEN`. The session stays pinned until the scope
    * closes, when it runs `UNLISTEN` and shuts down the queue. PostgreSQL
    * registration errors fail the acquiring effect.
+   * Connection failures after registration fail the queue with the original
+   * `SqlError`. Intentional scope closure interrupts consumers.
    */
   readonly listen: (
     channel: string
-  ) => Effect.Effect<Queue.Dequeue<Notification>, SqlError, Scope.Scope>
+  ) => Effect.Effect<Queue.Dequeue<Notification, SqlError>, SqlError, Scope.Scope>
   /**
    * Attempts to cancel the active query through a side connection. This is a
    * no-op for an unpinned multiplexed connection because the active
@@ -223,14 +265,13 @@ export const PgConnection = Context.Service<PgConnection>("@effect/sql-pg/PgConn
  *
  * **Details**
  *
- * The transport, optional `SSLRequest`, startup, and authentication steps run
- * under `connectTimeout` (5 seconds by default). The effect resolves once the
- * backend sends `ReadyForQuery`. When the scope closes, the
- * session sends `Terminate` and ends the socket.
+ * Password resolution, transport, optional `SSLRequest`, startup, and
+ * authentication run under `connectTimeout` (5 seconds by default). The effect
+ * resolves when the backend sends `ReadyForQuery`. Closing the scope sends
+ * `Terminate` and ends the socket.
  *
- * When `ssl` is enabled, a server that rejects `SSLRequest` fails the
- * connection. Unix sockets and custom streams should set `ssl.servername`
- * explicitly.
+ * Use `sslmode=require` or explicit `ssl: true` to require encryption.
+ * Unix sockets and custom streams should set `ssl.servername` explicitly.
  *
  * @category constructors
  * @since 4.0.0
@@ -238,10 +279,11 @@ export const PgConnection = Context.Service<PgConnection>("@effect/sql-pg/PgConn
 export const make = (options: Config): Effect.Effect<PgConnection, SqlError, Scope.Scope> =>
   Effect.flatMap(resolveConfig(options), (config) =>
     Effect.acquireRelease(
-      Effect.map(
-        connect(config),
-        (session) => new PgConnectionImpl(options, config, session, options.types)
-      ),
+      Effect.gen(function*() {
+        const password = yield* PasswordInternal.resolve(config.password)
+        const session = yield* connect(config, password)
+        return new PgConnectionImpl(options, config, session, options.types)
+      }),
       (connection) => Effect.sync(() => connection.closeUnsafe()),
       { interruptible: true }
     ).pipe(
@@ -262,6 +304,7 @@ export const make = (options: Config): Effect.Effect<PgConnection, SqlError, Sco
 
 interface Session {
   readonly socket: Duplex
+  readonly encrypted: boolean
   readonly parser: PgProtocol.Parser<unknown>
   readonly processId: number
   readonly secretKey: number
@@ -286,6 +329,9 @@ interface PipelineEntry {
 }
 
 const abortDrainTimeoutMillis = 5000
+const abortDrainGraceMillis = 10
+/** PostgreSQL `query_canceled` SQLSTATE. */
+const queryCanceledCode = "57014"
 const cancelRequestTimeoutMillis = 5000
 /** How many statements a multiplexed session keeps on the wire at once. */
 const maxPipelineDepth = 128
@@ -311,8 +357,9 @@ class PgConnectionImpl implements PgConnection {
   consumer: Consumer | undefined
   deadWith: SqlError | undefined
   closed = false
-  readonly channels = new Map<string, Set<Queue.Queue<Notification>>>()
-  readonly fatalHooks = new Set<() => void>()
+  cancelPending = false
+  readonly channels = new Map<string, Set<Queue.Queue<Notification, SqlError>>>()
+  readonly retireHooks = new Set<() => void>()
   /** Queued but not yet written; drained into `pipelineInFlight` on flush. */
   readonly pipelinePending: Array<PipelineEntry> = []
   /** Written and awaiting their `ReadyForQuery`, oldest first. */
@@ -336,7 +383,7 @@ class PgConnectionImpl implements PgConnection {
     this[internalsKey] = {
       base: this,
       deadError: () => this.deadWith,
-      fatalHooks: this.fatalHooks
+      retireHooks: this.retireHooks
     }
     this.pinnedView = new PinnedPgConnection(this)
     session.socket.on("data", this.onData)
@@ -368,6 +415,15 @@ class PgConnectionImpl implements PgConnection {
   private readonly dispatch = (message: PgProtocol.BackendMessage<unknown>): void => {
     if (this.deadWith !== undefined) return
     switch (message._tag) {
+      case "ErrorResponse":
+        if (message.fields.code === queryCanceledCode) this.cancelPending = false
+        break
+      case "ReadyForQuery":
+        if (this.cancelPending) {
+          this.cancelPending = false
+          this.retire()
+        }
+        break
       case "NotificationResponse": {
         const queues = this.channels.get(message.channel)
         if (queues !== undefined) {
@@ -412,12 +468,16 @@ class PgConnectionImpl implements PgConnection {
     consumer?.onFatal(error)
     const sets = Array.from(this.channels.values())
     this.channels.clear()
+    const cause = this.closed ? Cause.interrupt() : Cause.fail(error)
     for (const set of sets) {
-      for (const queue of set) Queue.failCauseUnsafe(queue, Cause.interrupt())
-    }
-    if (!this.closed) {
-      for (const hook of this.fatalHooks) hook()
+      for (const queue of set) Queue.failCauseUnsafe(queue, cause)
     }
+    this.retire()
+  }
+
+  private retire(): void {
+    if (this.closed) return
+    for (const hook of this.retireHooks) hook()
   }
 
   closeUnsafe(): void {
@@ -663,7 +723,9 @@ class PgConnectionImpl implements PgConnection {
   /** Sends a `CancelRequest` for this session on a side connection. */
   readonly cancel: Effect.Effect<void> = Effect.suspend(() => {
     if (this.deadWith !== undefined) return Effect.void
-    return sendCancelRequest(this.resolved, this.session.processId, this.session.secretKey)
+    this.cancelPending = true
+    if (this.consumer === undefined) this.retire()
+    return sendCancelRequest(this.resolved, this.session)
   })
 
   readonly pin: Effect.Effect<PgConnection, never, Scope.Scope> = Effect.suspend(() => {
@@ -719,7 +781,8 @@ class PgConnectionImpl implements PgConnection {
 
   readonly listen = (
     channel: string
-  ): Effect.Effect<Queue.Dequeue<Notification>, SqlError, Scope.Scope> => listenChannel(this, this.pin, channel)
+  ): Effect.Effect<Queue.Dequeue<Notification, SqlError>, SqlError, Scope.Scope> =>
+    listenChannel(this, this.pin, channel)
 
   readonly interrupt: Effect.Effect<void> = Effect.suspend(() =>
     this.multiplex && !this.pinned ? Effect.void : this.cancel
@@ -768,7 +831,8 @@ class PinnedPgConnection implements PgConnection {
 
   readonly listen = (
     channel: string
-  ): Effect.Effect<Queue.Dequeue<Notification>, SqlError, Scope.Scope> => listenChannel(this.base, this.pin, channel)
+  ): Effect.Effect<Queue.Dequeue<Notification, SqlError>, SqlError, Scope.Scope> =>
+    listenChannel(this.base, this.pin, channel)
 }
 
 interface QueryOutput {
@@ -809,11 +873,7 @@ const inferScalar = (value: unknown): PgTypes.Parameter => {
       // or timestamp column the way it did with the text-protocol drivers.
       return inferredParameter(0, value)
   }
-  if (value instanceof Date) {
-    const time = value.getTime()
-    if (Number.isNaN(time)) throw new PgTypes.CodecError({ message: "Invalid Date parameter" })
-    return inferredParameter(PgTypes.OID.timestamptz, time)
-  }
+  if (value instanceof Date) return inferredParameter(PgTypes.OID.timestamptz, value)
   if (value instanceof Uint8Array) return inferredParameter(PgTypes.OID.bytea, value)
   if (value instanceof Int8Array) {
     return inferredParameter(
@@ -1047,6 +1107,7 @@ const encodeQuery = (
 class PreparedCache {
   readonly max: number
   private readonly statements = new Map<string, Prepared>()
+  private readonly namespace = randomBytes(8).toString("hex")
   private closes: Array<Uint8Array> | undefined
   private counter = 0
 
@@ -1066,7 +1127,7 @@ class PreparedCache {
       return found
     }
     const prepared: Prepared = {
-      name: `effect${++this.counter}`,
+      name: `effect_${this.namespace}_${++this.counter}`,
       key,
       ready: false,
       parsing: false,
@@ -1427,6 +1488,32 @@ class QueryMachine implements Consumer {
 const emptyRows: ReadonlyArray<Row> = []
 const emptyValues: ReadonlyArray<ReadonlyArray<unknown>> = []
 
+/** Drains an aborted statement, sending a cancel after a short grace period and failing if it stalls. */
+const drainAborted = (
+  conn: PgConnectionImpl,
+  timeoutMessage: string,
+  abort: (onDrained: () => void) => void
+): Effect.Effect<void> => {
+  const drained = Deferred.makeUnsafe<void>()
+  const timeout = setTimeout(
+    () => conn.fatal(connectionQueryError(new Error(timeoutMessage), `PgConnection: ${timeoutMessage}`)),
+    abortDrainTimeoutMillis
+  )
+  abort(() => {
+    clearTimeout(timeout)
+    Deferred.doneUnsafe(drained, Effect.void)
+  })
+  const grace = Effect.callback<void>((resume) => {
+    const timer = setTimeout(() => resume(Effect.void), abortDrainGraceMillis)
+    return Effect.sync(() => clearTimeout(timer))
+  })
+  const cancelAndDrain = Effect.andThen(conn.cancel, Deferred.await(drained))
+  return Effect.andThen(
+    Effect.raceFirst(Deferred.await(drained), grace),
+    Effect.suspend(() => Deferred.isDoneUnsafe(drained) ? Effect.void : cancelAndDrain)
+  )
+}
+
 /** One cycle on a connection that carries a single statement at a time. */
 const runQuery = (
   conn: PgConnectionImpl,
@@ -1452,26 +1539,13 @@ const runQuery = (
       conn.fatal(connectionQueryError(cause, "PgConnection: Failed to write query"))
     }
 
-    // On interruption: cancel the statement and drain the connection back to
-    // ReadyForQuery so it stays usable, destroying it when the drain stalls.
     return Effect.suspend(() => {
       if (machine.isDone()) return Effect.void
-      const wait = Effect.callback<void>((resumeWait) => {
-        const timer = setTimeout(
-          () =>
-            conn.fatal(connectionQueryError(
-              new Error("Query cancellation timed out"),
-              "PgConnection: Query cancellation timed out"
-            )),
-          abortDrainTimeoutMillis
-        )
+      return drainAborted(conn, "Query cancellation timed out", (onDrained) =>
         machine.abort(() => {
-          clearTimeout(timer)
           conn.consumer = undefined
-          resumeWait(Effect.void)
-        })
-      })
-      return Effect.andThen(conn.cancel, wait)
+          onDrained()
+        }))
     })
   })
 
@@ -1716,30 +1790,16 @@ const streamRows = (
       else if (buffer.length >= streamPauseThreshold) setPaused(true)
     }
 
-    // On early abort: cancel the statement and drain back to ReadyForQuery so
-    // the pinned connection stays usable, destroying it when the drain stalls.
     yield* Scope.addFinalizer(
       scope,
       Effect.suspend(() => {
         if (done) return Effect.void
         aborted = true
-        setPaused(false)
-        const wait = Effect.callback<void>((resumeWait) => {
-          if (done) return resumeWait(Effect.void)
-          const timer = setTimeout(
-            () =>
-              conn.fatal(connectionQueryError(
-                new Error("Stream cancellation timed out"),
-                "PgConnection: Stream cancellation timed out"
-              )),
-            abortDrainTimeoutMillis
-          )
-          drainDone = () => {
-            clearTimeout(timer)
-            resumeWait(Effect.void)
-          }
+        const drain = drainAborted(conn, "Stream cancellation timed out", (onDrained) => {
+          drainDone = onDrained
         })
-        return Effect.andThen(conn.cancel, wait)
+        setPaused(false)
+        return drain
       })
     )
 
@@ -1768,7 +1828,7 @@ const listenChannel = (
   conn: PgConnectionImpl,
   pin: Effect.Effect<PgConnection, never, Scope.Scope>,
   channel: string
-): Effect.Effect<Queue.Dequeue<Notification>, SqlError, Scope.Scope> =>
+): Effect.Effect<Queue.Dequeue<Notification, SqlError>, SqlError, Scope.Scope> =>
   Effect.uninterruptibleMask((restore) =>
     Effect.gen(function*() {
       const channelError = validateChannelName(channel, "listen")
@@ -1778,7 +1838,7 @@ const listenChannel = (
       return yield* restore(Effect.gen(function*() {
         const pinned = yield* Scope.provide(pin, scope)
         if (conn.deadWith !== undefined) return yield* conn.deadWith
-        const queue = yield* Queue.unbounded<Notification>()
+        const queue = yield* Queue.unbounded<Notification, SqlError>()
         const identifier = escapeIdentifier(channel)
         let queues = conn.channels.get(channel)
         if (queues === undefined) {
@@ -1808,7 +1868,7 @@ const listenChannel = (
     })
   )
 
-const sendCancelRequest = (config: ResolvedConfig, pid: number, secret: number): Effect.Effect<void> =>
+const sendCancelRequest = (config: ResolvedConfig, session: Session): Effect.Effect<void> =>
   Effect.callback<void>((resume) => {
     let done = false
     let socket: Duplex
@@ -1820,7 +1880,7 @@ const sendCancelRequest = (config: ResolvedConfig, pid: number, secret: number):
       socket?.destroy()
       resume(Effect.void)
     }
-    const frame = PgProtocol.encodeCancelRequest({ pid, secret })
+    const frame = PgProtocol.encodeCancelRequest({ pid: session.processId, secret: session.secretKey })
     // After the frame is written the server processes the request and closes
     // the connection, which lands in the `close` handler.
     const send = (): void => {
@@ -1830,14 +1890,15 @@ const sendCancelRequest = (config: ResolvedConfig, pid: number, secret: number):
       if (config.ssl === false) return send()
       socket.once("data", (chunk: Uint8Array) => {
         if (done) return
-        // Never send the cancel secret over a connection the server refused
-        // to upgrade.
+        // A TLS session's cancel secret must stay encrypted.
+        if (chunk.length === 1 && chunk[0] === 0x4e && config.sslOptional && !session.encrypted) return send()
         if (chunk.length !== 1 || chunk[0] !== 0x53) return finish()
         const raw = socket
         raw.off("error", finish)
         raw.off("close", finish)
         socket = Tls.connect({
           host: config.host,
+          servername: Net.isIP(config.host) === 0 ? config.host : undefined,
           ...(typeof config.ssl === "object" ? config.ssl : {}),
           socket: raw as Net.Socket
         })
@@ -1865,10 +1926,11 @@ const sendCancelRequest = (config: ResolvedConfig, pid: number, secret: number):
     return Effect.sync(finish)
   })
 
-const connect = (config: ResolvedConfig): Effect.Effect<Session, SqlError> =>
+const connect = (config: ResolvedConfig, resolvedPassword: string | undefined): Effect.Effect<Session, SqlError> =>
   Effect.callback<Session, SqlError>((resume) => {
     let done = false
     let socket: Duplex
+    let encrypted = false
     let parser: PgProtocol.Parser<unknown> | undefined
     let sslErrorParser: PgProtocol.Parser | undefined
     let scram: PgAuth.ScramState | undefined
@@ -1891,14 +1953,14 @@ const connect = (config: ResolvedConfig): Effect.Effect<Session, SqlError> =>
       failConnect(new Error("Connection closed unexpectedly"), "PgConnection: Connection closed during startup")
 
     const password = (): string | undefined => {
-      if (config.password === undefined) {
+      if (resolvedPassword === undefined) {
         failAuth(
           new Error("The server requested password authentication"),
           "PgConnection: No password configured"
         )
         return undefined
       }
-      return config.password
+      return resolvedPassword
     }
 
     const handleMessage = (message: PgProtocol.BackendMessage<unknown>): void => {
@@ -1990,7 +2052,7 @@ const connect = (config: ResolvedConfig): Effect.Effect<Session, SqlError> =>
           socket.off("error", onError)
           socket.off("close", onClose)
           socket.on("error", ignoreError)
-          resume(Effect.succeed({ socket, parser: parser!, processId, secretKey }))
+          resume(Effect.succeed({ socket, encrypted, parser: parser!, processId, secretKey }))
           return
         default:
           return failConnect(
@@ -2016,11 +2078,7 @@ const connect = (config: ResolvedConfig): Effect.Effect<Session, SqlError> =>
     const startup = (): void => {
       parser = PgProtocol.makeParser<unknown>({ maxMessageSize: config.maxMessageSize })
       socket.on("data", onData)
-      socket.write(PgProtocol.encodeStartupMessage({
-        user: config.username,
-        database: config.database,
-        application_name: config.applicationName
-      }))
+      socket.write(PgProtocol.encodeStartupMessage(config.startupParameters))
     }
 
     const onSslResponse = (chunk: Uint8Array): void => {
@@ -2056,6 +2114,7 @@ const connect = (config: ResolvedConfig): Effect.Effect<Session, SqlError> =>
         return failConnect(response.failure, "PgConnection: Invalid SSLRequest response")
       }
       if (response.success === "N") {
+        if (config.sslOptional) return startup()
         return failConnect(new Error("The server does not support TLS"), "PgConnection: Server refused TLS")
       }
       const raw = socket
@@ -2063,12 +2122,16 @@ const connect = (config: ResolvedConfig): Effect.Effect<Session, SqlError> =>
       raw.off("close", onClose)
       socket = Tls.connect({
         host: config.host,
+        servername: Net.isIP(config.host) === 0 ? config.host : undefined,
         ...(typeof config.ssl === "object" ? config.ssl : {}),
         socket: raw as Net.Socket
       })
       socket.on("error", onError)
       socket.on("close", onClose)
-      socket.once("secureConnect", startup)
+      socket.once("secureConnect", () => {
+        encrypted = true
+        startup()
+      })
     }
 
     const begin = (): void => {
@@ -2115,11 +2178,11 @@ interface ResolvedConfig {
   readonly port: number
   readonly path: string | undefined
   readonly ssl: boolean | ConnectionOptions
-  readonly database: string | undefined
+  readonly sslOptional: boolean
   readonly username: string
-  readonly password: string | undefined
+  readonly password: Redacted.Redacted | Effect.Effect<Redacted.Redacted> | undefined
   readonly connectTimeout: Duration.Duration
-  readonly applicationName: string
+  readonly startupParameters: PgProtocol.StartupParameters
   readonly stream: (() => Duplex) | undefined
   readonly maxMessageSize: number | undefined
 }
@@ -2146,16 +2209,49 @@ const resolveConfig = (options: Config): Effect.Effect<ResolvedConfig, SqlError>
     if (username === undefined) {
       return Effect.fail(configError("No username configured"))
     }
+    const named: Record<string, string> = Object.create(null)
+    for (const [name, value] of Object.entries(options.startupParameters ?? {})) {
+      const key = name.toLowerCase()
+      if (key === "user" || key === "database" || key === "replication" || key === "options") {
+        return Effect.fail(configError(`Reserved startup parameter: "${name}"`))
+      }
+      if (key === "client_encoding") {
+        const encoding = value.toUpperCase()
+        if (encoding !== "UTF8" && encoding !== "UTF-8") {
+          return Effect.fail(configError("Startup parameter client_encoding must be UTF8 or UTF-8"))
+        }
+        named[key] = "UTF8"
+      } else {
+        named[key] = value
+      }
+      if (name === "" || name.includes("\0") || value.includes("\0")) {
+        return Effect.fail(
+          configError("Startup parameter names must be nonempty and names/values must not contain NUL")
+        )
+      }
+    }
+    const startupParameters: PgProtocol.StartupParameters = {
+      ...named,
+      user: username,
+      database: options.database ?? url.database,
+      application_name: options.applicationName ?? named.application_name ?? url.applicationName ?? "@effect/sql-pg",
+      options: options.startupOptions ?? url.options
+    }
+    for (const [name, value] of Object.entries(startupParameters)) {
+      if (value?.includes("\0")) {
+        return Effect.fail(configError(`Startup parameter "${name}" must not contain NUL`))
+      }
+    }
     return Effect.succeed<ResolvedConfig>({
       host,
       port,
       path: options.path ?? (host.startsWith("/") ? `${host}/.s.PGSQL.${port}` : undefined),
-      ssl: options.ssl ?? url.ssl ?? false,
-      database: options.database ?? url.database,
+      ssl: options.ssl ?? (url.ssl === "prefer" ? true : url.ssl ?? false),
+      sslOptional: options.ssl === undefined && url.ssl === "prefer",
       username,
-      password: options.password !== undefined ? Redacted.value(options.password) : url.password,
+      password: options.password ?? (url.password !== undefined ? Redacted.make(url.password) : undefined),
       connectTimeout: Duration.fromInputUnsafe(options.connectTimeout ?? url.connectTimeout ?? Duration.seconds(5)),
-      applicationName: options.applicationName ?? url.applicationName ?? "@effect/sql-pg",
+      startupParameters,
       stream: options.stream,
       maxMessageSize: options.maxMessageSize
     })
@@ -2168,8 +2264,9 @@ interface UrlConfig {
   username?: string | undefined
   password?: string | undefined
   applicationName?: string | undefined
+  options?: string | undefined
   connectTimeout?: Duration.Duration | undefined
-  ssl?: boolean | undefined
+  ssl?: boolean | "prefer" | undefined
 }
 
 const decodeComponent = (value: string, what: string): EffectResult.Result<string, SqlError> => {
@@ -2250,6 +2347,9 @@ const parseUrl = (raw: string): EffectResult.Result<UrlConfig, SqlError> => {
       case "application_name":
         config.applicationName = value
         break
+      case "options":
+        config.options = value
+        break
       case "connect_timeout": {
         const seconds = Number(value)
         if (!Number.isInteger(seconds) || seconds < 0) {
@@ -2270,9 +2370,8 @@ const parseUrl = (raw: string): EffectResult.Result<UrlConfig, SqlError> => {
             break
           case "prefer":
           case "allow":
-            return EffectResult.fail(
-              configError(`sslmode "${value}" is not supported: set ssl explicitly to true or false`)
-            )
+            config.ssl = "prefer"
+            break
           default:
             return EffectResult.fail(configError(`Unrecognized sslmode in URL: "${value}"`))
         }
diff --git a/repos/effect/packages/sql/pg/src/PgMigrator.ts b/repos/effect/packages/sql/pg/src/PgMigrator.ts
index 3751edeaa..f0f5cdde6 100644
--- a/repos/effect/packages/sql/pg/src/PgMigrator.ts
+++ b/repos/effect/packages/sql/pg/src/PgMigrator.ts
@@ -13,12 +13,12 @@ import * as Effect from "effect/Effect"
 import * as FileSystem from "effect/FileSystem"
 import * as Layer from "effect/Layer"
 import * as Path from "effect/Path"
-import * as Redacted from "effect/Redacted"
 import * as ChildProcess from "effect/unstable/process/ChildProcess"
 import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner"
 import * as Migrator from "effect/unstable/sql/Migrator"
 import type { SqlClient } from "effect/unstable/sql/SqlClient"
 import type { SqlError } from "effect/unstable/sql/SqlError"
+import * as Password from "./internal/password.ts"
 import { PgClient } from "./PgClient.ts"
 
 /**
@@ -45,7 +45,7 @@ export const run: <R2 = never>(
   | R2
 > = Migrator.make({
   dumpSchema(path, table) {
-    const pgDump = (args: Array<string>) =>
+    const pgDump = (args: Array<string>, password: string | undefined) =>
       Effect.gen(function*() {
         const sql = yield* PgClient
         const spawner = yield* ChildProcessSpawner.ChildProcessSpawner
@@ -55,9 +55,7 @@ export const run: <R2 = never>(
             PGHOST: sql.config.host,
             PGPORT: sql.config.port?.toString(),
             PGUSER: sql.config.username,
-            PGPASSWORD: sql.config.password
-              ? Redacted.value(sql.config.password)
-              : undefined,
+            PGPASSWORD: password,
             PGDATABASE: sql.config.database,
             PGSSLMODE: sql.config.ssl ? "require" : "prefer"
           }
@@ -69,21 +67,20 @@ export const run: <R2 = never>(
           .replace(/\n{2,}/gm, "\n\n")
           .trim()
       }).pipe(
-        Effect.mapError((error) => new Migrator.MigrationError({ kind: "Failed", message: error.message }))
+        Effect.mapError((error) =>
+          new Migrator.MigrationError({ kind: "Failed", message: error.message, cause: error })
+        )
       )
 
-    const pgDumpSchema = pgDump(["--schema-only"])
-
-    const pgDumpMigrations = pgDump([
-      "--column-inserts",
-      "--data-only",
-      `--table=${table}`
-    ])
-
-    const pgDumpAll = Effect.map(
-      Effect.all([pgDumpSchema, pgDumpMigrations], { concurrency: 2 }),
-      ([schema, migrations]) => schema + "\n\n" + migrations
-    )
+    const pgDumpAll = Effect.gen(function*() {
+      const sql = yield* PgClient
+      const password = yield* Password.resolve(sql.config.password)
+      const [schema, migrations] = yield* Effect.all([
+        pgDump(["--schema-only"], password),
+        pgDump(["--column-inserts", "--data-only", `--table=${table}`], password)
+      ], { concurrency: 2 })
+      return schema + "\n\n" + migrations
+    })
 
     const pgDumpFile = (path: string) =>
       Effect.gen(function*() {
@@ -93,7 +90,9 @@ export const run: <R2 = never>(
         yield* fs.makeDirectory(path_.dirname(path), { recursive: true })
         yield* fs.writeFileString(path, dump)
       }).pipe(
-        Effect.mapError((error) => new Migrator.MigrationError({ kind: "Failed", message: error.message }))
+        Effect.mapError((error) =>
+          new Migrator.MigrationError({ kind: "Failed", message: error.message, cause: error })
+        )
       )
 
     return pgDumpFile(path)
diff --git a/repos/effect/packages/sql/pg/src/PgPool.ts b/repos/effect/packages/sql/pg/src/PgPool.ts
index 5ea0ebca1..7ddb9ba91 100644
--- a/repos/effect/packages/sql/pg/src/PgPool.ts
+++ b/repos/effect/packages/sql/pg/src/PgPool.ts
@@ -140,7 +140,7 @@ export const make = Effect.fnUntraced(function*(options: Config): Effect.fn.Retu
     Effect.sync(() => {
       createdAt.set(connection, clock.currentTimeMillisUnsafe())
       const internals = connectionInternals(connection)
-      internals.fatalHooks.add(() => {
+      internals.retireHooks.add(() => {
         deadConnections.add(connection)
         // `deadConnections` is only read by the next checkout, and a checkout
         // already waiting for this connection would never get that far. Tell
@@ -204,12 +204,9 @@ export const make = Effect.fnUntraced(function*(options: Config): Effect.fn.Retu
   // `pin` reserves the pool item itself, so this needs no help.
   const reserve = Effect.flatMap(get, (connection) => connection.pin)
 
-  // `Pool.use` cannot check the session it hands over before running the
-  // effect, so it is only taken when there is nothing to check: no session is
-  // known dead, and no lifetime can have run out. Otherwise the scoped
-  // checkout does its replacement pass first. Checking inside the callback
-  // instead would hold one lease while acquiring another, which deadlocks a
-  // pool of one.
+  // `Pool.use` cannot pre-check a session. Use it only when no TTL applies and
+  // no connection awaits retirement. Checking inside its callback can deadlock
+  // a size-one pool while acquiring a replacement.
   const use = <A, E, R>(
     f: (connection: PgConnection.PgConnection) => Effect.Effect<A, E, R>
   ): Effect.Effect<A, E | SqlError, R> =>
diff --git a/repos/effect/packages/sql/pg/src/PgTypes.ts b/repos/effect/packages/sql/pg/src/PgTypes.ts
index 93be1add8..53084ff01 100644
--- a/repos/effect/packages/sql/pg/src/PgTypes.ts
+++ b/repos/effect/packages/sql/pg/src/PgTypes.ts
@@ -10,14 +10,29 @@
  * There is no `typeof` inference: an OID is always supplied, either directly
  * or through a constructor such as `int4` that carries it.
  *
- * `timestamp` has no time zone on the wire and is treated as UTC in both
- * directions. Decoding drops sub-millisecond precision by truncating toward
- * zero, including for timestamps before the PostgreSQL epoch.
+ * `timestamp` and `timestamptz` values, including array elements, decode to
+ * `Date`. Encoders accept `Date` or epoch milliseconds.
+ * Decoding truncates to milliseconds toward zero relative to the PostgreSQL
+ * epoch. To restore numeric decoding, override the codecs with `register`
+ * or a client `Registry`.
+ *
+ * `infinity`, `-infinity` and values outside the JavaScript `Date` range
+ * (±8.64e15 epoch milliseconds) decode to an invalid `Date`. Numeric
+ * `±Infinity` encodes the PostgreSQL sentinels; encoding an invalid `Date` fails.
+ *
+ * The `timestamp` codec maps wall-clock fields to UTC fields of a `Date`.
+ * Date parameters bind as `timestamptz`, so inserting one into a `timestamp`
+ * column applies the session `TimeZone`. Use UTC or `timestamp(value)` to
+ * preserve its UTC fields. `timestamptz` round trips preserve the instant
+ * regardless of session timezone.
  *
  * @since 4.0.0
  */
 import * as Data from "effect/Data"
 import * as Result from "effect/Result"
+import * as IpInterface from "effect/unstable/net/IpInterface"
+import * as IpNetwork from "effect/unstable/net/IpNetwork"
+import * as NetAddress from "effect/unstable/net/NetAddress"
 import type * as PgProtocol from "./PgProtocol.ts"
 import type { ValueSink } from "./PgProtocol.ts"
 
@@ -298,6 +313,7 @@ export const OID = {
   timestamptz: 1184,
   timetz: 1266,
   numeric: 1700,
+  regclass: 2205,
   uuid: 2950,
   jsonb: 3802,
   boolArray: 1000,
@@ -321,6 +337,7 @@ export const OID = {
   timestamptzArray: 1185,
   timetzArray: 1270,
   numericArray: 1231,
+  regclassArray: 2210,
   uuidArray: 2951,
   jsonbArray: 3807
 } as const
@@ -347,6 +364,7 @@ const arrayToElement = new Map<number, number>([
   [OID.timestamptzArray, OID.timestamptz],
   [OID.timetzArray, OID.timetz],
   [OID.numericArray, OID.numeric],
+  [OID.regclassArray, OID.regclass],
   [OID.uuidArray, OID.uuid],
   [OID.jsonbArray, OID.jsonb]
 ])
@@ -655,124 +673,28 @@ const decodeNumeric = (bytes: Uint8Array, offset: number, size: number): string
 const PGSQL_AF_INET = 2
 const PGSQL_AF_INET6 = 3
 
-const parseIPv4 = (text: string): Uint8Array | undefined => {
-  const parts = text.split(".")
-  if (parts.length !== 4) return undefined
-  const bytes = new Uint8Array(4)
-  for (let i = 0; i < 4; i++) {
-    if (!/^\d{1,3}$/.test(parts[i])) return undefined
-    const value = Number(parts[i])
-    if (value > 255) return undefined
-    bytes[i] = value
-  }
-  return bytes
-}
-
-const parseIPv6 = (text: string): Uint8Array | undefined => {
-  const halves = text.split("::")
-  if (halves.length > 2) return undefined
-  const toGroups = (part: string): Array<string> => part === "" ? [] : part.split(":")
-  const head = toGroups(halves[0])
-  const tail = halves.length === 2 ? toGroups(halves[1]) : []
-  const bytes = new Uint8Array(16)
-
-  const trailing = tail.length > 0 ? tail[tail.length - 1] : head.length > 0 ? head[head.length - 1] : ""
-  const embedded = trailing.includes(".") ? parseIPv4(trailing) : undefined
-  if (trailing.includes(".") && embedded === undefined) return undefined
-  if (embedded !== undefined) {
-    if (halves.length === 2 && tail.length === 0) return undefined
-    if (tail.length > 0) tail.pop()
-    else head.pop()
-  }
-  const groupCount = embedded === undefined ? 8 : 6
-  if (head.length + tail.length > groupCount) return undefined
-  if (halves.length === 1 && head.length !== groupCount) return undefined
-
-  const writeGroup = (group: string, offset: number): boolean => {
-    if (!/^[0-9a-fA-F]{1,4}$/.test(group)) return false
-    const value = Number.parseInt(group, 16)
-    bytes[offset] = value >> 8
-    bytes[offset + 1] = value & 0xff
-    return true
-  }
-  for (let i = 0; i < head.length; i++) {
-    if (!writeGroup(head[i], i * 2)) return undefined
-  }
-  for (let i = 0; i < tail.length; i++) {
-    if (!writeGroup(tail[i], (groupCount - tail.length + i) * 2)) return undefined
-  }
-  if (embedded !== undefined) bytes.set(embedded, 12)
-  return bytes
-}
-
-const formatIPv4 = (bytes: Uint8Array, offset: number): string =>
-  `${bytes[offset]}.${bytes[offset + 1]}.${bytes[offset + 2]}.${bytes[offset + 3]}`
-
-const formatIPv6 = (bytes: Uint8Array, offset: number): string => {
-  let isV4Mapped = bytes[offset + 10] === 0xff && bytes[offset + 11] === 0xff
-  for (let i = 0; isV4Mapped && i < 10; i++) isV4Mapped = bytes[offset + i] === 0
-  if (isV4Mapped) return `::ffff:${formatIPv4(bytes, offset + 12)}`
-
-  const groups: Array<number> = []
-  for (let i = 0; i < 8; i++) groups.push(readUint16(bytes, offset + i * 2))
-
-  let bestStart = -1
-  let bestLength = 0
-  let start = -1
-  for (let i = 0; i <= 8; i++) {
-    if (i < 8 && groups[i] === 0) {
-      if (start === -1) start = i
-    } else if (start !== -1) {
-      if (i - start > bestLength) {
-        bestStart = start
-        bestLength = i - start
-      }
-      start = -1
-    }
-  }
-  if (bestLength < 2) {
-    return groups.map((group) => group.toString(16)).join(":")
-  }
-  const head = groups.slice(0, bestStart).map((group) => group.toString(16)).join(":")
-  const tail = groups.slice(bestStart + bestLength).map((group) => group.toString(16)).join(":")
-  return `${head}::${tail}`
-}
-
-const hasHostBits = (bytes: Uint8Array, offset: number, length: number, bits: number): boolean => {
-  const wholeBytes = Math.floor(bits / 8)
-  const partialBits = bits % 8
-  if (partialBits !== 0 && (bytes[offset + wholeBytes] & ((1 << (8 - partialBits)) - 1)) !== 0) {
-    return true
-  }
-  for (let index = wholeBytes + (partialBits === 0 ? 0 : 1); index < length; index++) {
-    if (bytes[offset + index] !== 0) return true
-  }
-  return false
-}
-
 const encodeInet = (value: unknown, isCidr: boolean): Uint8Array => {
-  const text = requireString(value, isCidr ? "cidr" : "inet")
-  const slash = text.lastIndexOf("/")
-  const address = slash === -1 ? text : text.slice(0, slash)
-  const v4 = parseIPv4(address)
-  const bytes = v4 ?? parseIPv6(address)
-  if (bytes === undefined) {
-    return fail(`Expected an IP address, received "${text}"`)
-  }
-  const fullBits = bytes.length * 8
-  const bits = slash === -1 ? fullBits : Number(text.slice(slash + 1))
-  if (!Number.isInteger(bits) || bits < 0 || bits > fullBits) {
-    return fail(`Invalid netmask length in "${text}"`)
-  }
-  if (isCidr && hasHostBits(bytes, 0, bytes.length, bits)) {
-    return fail(`CIDR address has host bits set in "${text}"`)
+  const type = isCidr ? "cidr" : "inet"
+  const text = requireString(value, type)
+  const parsed = IpInterface.fromString(text)
+  if (Result.isFailure(parsed)) return fail(`Invalid ${type} value ${JSON.stringify(text)}: ${parsed.failure.message}`)
+  const address = parsed.success.address
+  const bits = parsed.success.prefixLength
+  if (isCidr) {
+    const network = IpNetwork.make(address, bits)
+    if (Result.isFailure(network)) {
+      return fail(`Invalid ${type} value ${JSON.stringify(text)}: ${network.failure.message}`)
+    }
   }
-  const result = new Uint8Array(4 + bytes.length)
-  result[0] = v4 === undefined ? PGSQL_AF_INET6 : PGSQL_AF_INET
+  const octets = NetAddress.isIpv4Address(address)
+    ? NetAddress.ipv4ToOctets(address)
+    : NetAddress.ipv6ToOctets(address)
+  const result = new Uint8Array(4 + octets.length)
+  result[0] = NetAddress.isIpv4Address(address) ? PGSQL_AF_INET : PGSQL_AF_INET6
   result[1] = bits
   result[2] = isCidr ? 1 : 0
-  result[3] = bytes.length
-  result.set(bytes, 4)
+  result[3] = octets.length
+  result.set(octets, 4)
   return result
 }
 
@@ -790,11 +712,18 @@ const decodeInet = (bytes: Uint8Array, offset: number, size: number): string =>
   }
   requireSize(size, 4 + addressSize, "inet")
   if (bits > addressSize * 8) return fail(`Invalid inet netmask length: ${bits}`)
-  if (isCidr && hasHostBits(bytes, offset + 4, addressSize, bits)) {
-    return fail("CIDR address has host bits set")
-  }
-  const text = family === PGSQL_AF_INET ? formatIPv4(bytes, offset + 4) : formatIPv6(bytes, offset + 4)
-  return isCidr || bits !== addressSize * 8 ? `${text}/${bits}` : text
+  const addressBytes = bytes.slice(offset + 4, offset + 4 + addressSize)
+  const address = family === PGSQL_AF_INET
+    ? NetAddress.ipv4FromBytesUnsafe(addressBytes)
+    : NetAddress.ipv6FromBytesUnsafe(addressBytes)
+  if (isCidr) {
+    const network = IpNetwork.make(address, bits)
+    if (Result.isFailure(network)) return fail(network.failure.message)
+    return IpNetwork.format(network.success)
+  }
+  return bits === addressSize * 8
+    ? NetAddress.formatIp(address)
+    : IpInterface.format(IpInterface.makeUnsafe(address, bits))
 }
 
 // -----------------------------------------------------------------------------
@@ -1078,20 +1007,22 @@ const readTimeMicros = (bytes: Uint8Array, offset: number): number => {
   return micros
 }
 
-/** The two halves of the int64 `timestampInt64` last produced. */
 let timestampHigh = 0
 let timestampLow = 0
 
 /**
- * Converts epoch milliseconds to the halves of the wire int64. Both encoding
- * paths read them from here rather than from a returned pair, so neither
- * allocates.
+ * Writes the wire int64 to timestampHigh/Low, avoiding a pair allocation.
  */
 const timestampInt64 = (value: unknown): void => {
-  const ms = requireNumber(value, "timestamp")
-  if (Number.isNaN(ms)) {
-    fail("timestamp cannot be NaN")
-  } else if (ms === Number.POSITIVE_INFINITY) {
+  let ms: number
+  if (value instanceof Date) {
+    ms = value.getTime()
+    if (Number.isNaN(ms)) fail("timestamp cannot be an invalid Date")
+  } else {
+    ms = typeof value === "number" ? value : fail("Expected a Date or number for timestamp")
+    if (Number.isNaN(ms)) fail("timestamp cannot be NaN")
+  }
+  if (ms === Number.POSITIVE_INFINITY) {
     timestampHigh = INT32_MAX
     timestampLow = -1
   } else if (ms === Number.NEGATIVE_INFINITY) {
@@ -1123,17 +1054,14 @@ const timestampCodec: UnsafeCodec<any> = codecOf(
     requireSize(size, 8, "timestamp")
     const high = readInt32(bytes, offset)
     if (high >= -MAX_EXACT_HIGH && high < MAX_EXACT_HIGH) {
-      // Inside these bounds the whole conversion is float arithmetic, so it
-      // allocates no BigInt. Everything outside them, the sentinels included,
-      // needs the exact 64-bit value.
+      // These bounds allow exact conversion without BigInt.
       const micros = high * 4294967296 + readUint32(bytes, offset + 4)
-      return (micros - micros % 1000) / 1000 + PG_EPOCH_MS
+      return new Date((micros - micros % 1000) / 1000 + PG_EPOCH_MS)
     }
     stage8(bytes, offset)
     const micros = scratchView8.getBigInt64(0)
-    if (micros === INT64_MAX) return Number.POSITIVE_INFINITY
-    if (micros === INT64_MIN) return Number.NEGATIVE_INFINITY
-    return Number(micros / THOUSAND) + PG_EPOCH_MS
+    if (micros === INT64_MAX || micros === INT64_MIN) return new Date(Number.NaN)
+    return new Date(Number(micros / THOUSAND) + PG_EPOCH_MS)
   },
   (value) => {
     timestampInt64(value)
@@ -1142,7 +1070,6 @@ const timestampCodec: UnsafeCodec<any> = codecOf(
     writeInt32(bytes, 4, timestampLow)
     return bytes
   },
-  // Two int32s are the int64, so the sink needs nothing of its own for it.
   (sink, value) => {
     timestampInt64(value)
     sink.int32(timestampHigh)
@@ -1236,6 +1163,23 @@ const jsonbCodec: UnsafeCodec<any> = codecOf(
   }
 )
 
+const oidCodec: UnsafeCodec<any> = codecOf(
+  (bytes, offset, size) => {
+    requireSize(size, 4, "oid")
+    return readUint32(bytes, offset)
+  },
+  (value) => {
+    const num = requireInteger(value, "oid", 0, 4294967295)
+    const bytes = new Uint8Array(4)
+    bytes[0] = num >>> 24
+    bytes[1] = num >>> 16
+    bytes[2] = num >>> 8
+    bytes[3] = num
+    return bytes
+  },
+  (sink, value) => sink.int32(requireInteger(value, "oid", 0, 4294967295))
+)
+
 const builtinScalars = new Map<number, UnsafeCodec<any>>([
   [
     OID.bool,
@@ -1300,25 +1244,8 @@ const builtinScalars = new Map<number, UnsafeCodec<any>>([
       (sink, value) => sink.int32(requireInteger(value, "int4", INT32_MIN, INT32_MAX))
     )
   ],
-  [
-    OID.oid,
-    codecOf(
-      (bytes, offset, size) => {
-        requireSize(size, 4, "oid")
-        return readUint32(bytes, offset)
-      },
-      (value) => {
-        const num = requireInteger(value, "oid", 0, 4294967295)
-        const bytes = new Uint8Array(4)
-        bytes[0] = num >>> 24
-        bytes[1] = num >>> 16
-        bytes[2] = num >>> 8
-        bytes[3] = num
-        return bytes
-      },
-      (sink, value) => sink.int32(requireInteger(value, "oid", 0, 4294967295))
-    )
-  ],
+  [OID.oid, oidCodec],
+  [OID.regclass, oidCodec],
   [
     OID.int8,
     codecOf(
@@ -1485,6 +1412,13 @@ const lookupFor = (registry: Registry | undefined): Lookup =>
  * Registers a binary codec for an OID the built-in catalogue does not cover,
  * or overrides a built-in one. Registered codecs take precedence.
  *
+ * **Details**
+ *
+ * Unregistered OIDs decode as UTF-8 text. Register binary user-defined types
+ * to avoid garbled output or codec errors, which close the connection when
+ * reading rows. For arrays, use `makeRegistry().register` with
+ * `RegisterOptions.arrayOid` and pass the registry as the client's `types` option.
+ *
  * @category registry
  * @since 4.0.0
  */
@@ -1677,9 +1611,9 @@ export interface Column {
  *
  * **Details**
  *
- * Codecs are resolved once per column. SQL `NULL` becomes `null`, and columns
- * without a registered codec return a copy of their bytes. Text-format columns
- * fail with `CodecError`.
+ * Codecs are resolved once per column. SQL `NULL` becomes `null`.
+ * Unregistered OIDs decode as UTF-8 text. Invalid UTF-8 and text-format
+ * columns fail with `CodecError`.
  *
  * **Example** (Updating the reader after `RowDescription`)
  *
@@ -1710,7 +1644,7 @@ export const makeFieldReader = (
     return (bytes: Uint8Array, offset: number, size: number, column: number): unknown => {
       if (size < 0) return null
       const codec = codecs[column]
-      if (codec === undefined) return bytes.slice(offset, offset + size)
+      if (codec === undefined) return decodeUtf8(bytes, offset, size)
       const read = codec.read
       return read === undefined ? codec.decode(bytes.subarray(offset, offset + size)) : read(bytes, offset, size)
     }
@@ -1739,8 +1673,9 @@ export const encode = (value: unknown, oid: number, registry?: Registry): Result
  *
  * **Details**
  *
- * `format` must be `1`; the text format is not implemented. An OID that is
- * neither built in nor registered decodes to the raw bytes.
+ * Only binary format (`1`) is supported. Unregistered OIDs decode as UTF-8
+ * text; invalid UTF-8 fails with `CodecError`. See `register` for binary
+ * user-defined types, including arrays.
  *
  * @category decoding
  * @since 4.0.0
@@ -1756,7 +1691,7 @@ export const decode = (
       return fail(`Only the binary format is supported, received format ${format}`)
     }
     const codec = lookupFor(registry)(oid)
-    return codec === undefined ? bytes : codec.decode(bytes)
+    return codec === undefined ? decodeUtf8(bytes, 0, bytes.length) : codec.decode(bytes)
   })
 
 // -----------------------------------------------------------------------------
@@ -2048,21 +1983,21 @@ export const time: (value: bigint | null) => Parameter = parameter(OID.time)
 export const timetz: (value: string | null) => Parameter = parameter(OID.timetz)
 
 /**
- * A `timestamp` parameter, given as Unix epoch milliseconds and interpreted
- * as UTC.
+ * A `timestamp` parameter from a `Date` or epoch milliseconds. UTC fields
+ * become the stored wall-clock fields, regardless of session `TimeZone`.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const timestamp: (value: number | null) => Parameter = parameter(OID.timestamp)
+export const timestamp: (value: Date | number | null) => Parameter = parameter(OID.timestamp)
 
 /**
- * A `timestamptz` parameter, given as Unix epoch milliseconds.
+ * A `timestamptz` parameter, given as a `Date` or Unix epoch milliseconds.
  *
  * @category constructors
  * @since 4.0.0
  */
-export const timestamptz: (value: number | null) => Parameter = parameter(OID.timestamptz)
+export const timestamptz: (value: Date | number | null) => Parameter = parameter(OID.timestamptz)
 
 /**
  * A one-dimensional array parameter whose elements have the given OID.
diff --git a/repos/effect/packages/sql/pg/src/internal/connection.ts b/repos/effect/packages/sql/pg/src/internal/connection.ts
index b2f4d5ba7..c0a839575 100644
--- a/repos/effect/packages/sql/pg/src/internal/connection.ts
+++ b/repos/effect/packages/sql/pg/src/internal/connection.ts
@@ -10,8 +10,8 @@ export interface ConnectionInternals {
   /** The pool item identity: the unpinned base connection. */
   readonly base: object
   readonly deadError: () => SqlError | undefined
-  /** Fired once when the connection dies outside its own scope release. */
-  readonly fatalHooks: Set<() => void>
+  /** Fired when a pool must stop reusing the connection. */
+  readonly retireHooks: Set<() => void>
   /**
    * Installed by a multiplexed pool so that pinning the session also takes it
    * out of shared circulation for as long as the pin lasts. Every route to an
diff --git a/repos/effect/packages/sql/pg/src/internal/password.ts b/repos/effect/packages/sql/pg/src/internal/password.ts
new file mode 100644
index 000000000..5171a01dd
--- /dev/null
+++ b/repos/effect/packages/sql/pg/src/internal/password.ts
@@ -0,0 +1,11 @@
+import * as Effect from "effect/Effect"
+import * as Redacted from "effect/Redacted"
+
+export const resolve = (
+  password: Redacted.Redacted | Effect.Effect<Redacted.Redacted> | undefined
+): Effect.Effect<string | undefined> =>
+  password === undefined
+    ? Effect.succeed(undefined)
+    : Effect.isEffect(password)
+    ? Effect.map(password, Redacted.value)
+    : Effect.succeed(Redacted.value(password))
diff --git a/repos/effect/packages/sql/pg/test/Client.integration.test.ts b/repos/effect/packages/sql/pg/test/Client.integration.test.ts
index c87f236e3..0ee8b2d2c 100644
--- a/repos/effect/packages/sql/pg/test/Client.integration.test.ts
+++ b/repos/effect/packages/sql/pg/test/Client.integration.test.ts
@@ -1,9 +1,10 @@
 import { PgClient } from "@effect/sql-pg"
 import { assert, expect, it } from "@effect/vitest"
-import { Deferred, Effect, Fiber, Option, Queue, Stream, String } from "effect"
+import { DateTime, Deferred, Effect, Fiber, Option, Queue, Schedule, Schema, Stream, String } from "effect"
 import { TestClock } from "effect/testing"
 import * as Reactivity from "effect/unstable/reactivity/Reactivity"
-import { SqlClient } from "effect/unstable/sql"
+import { Model } from "effect/unstable/schema"
+import { SqlClient, SqlModel } from "effect/unstable/sql"
 import * as Statement from "effect/unstable/sql/Statement"
 import { PgContainer } from "./utils.ts"
 
@@ -12,6 +13,33 @@ const transformsNested = Statement.defaultTransforms(String.snakeToCamel)
 const transforms = Statement.defaultTransforms(String.snakeToCamel, false)
 
 it.layer(PgContainer.layerClient, { timeout: "30 seconds" })("PgClient", (it) => {
+  it.effect("round trips Model.DateTimeInsertFromDate through a repository", () =>
+    Effect.gen(function*() {
+      class Entry extends Model.Class<Entry>("Entry")({
+        id: Schema.Int.pipe(Model.FieldExcept(["insert"])),
+        created_at: Model.DateTimeInsertFromDate
+      }) {}
+
+      const sql = yield* PgClient.PgClient
+      const repo = yield* SqlModel.makeRepository(Entry, {
+        tableName: "model_timestamp",
+        idColumn: "id",
+        spanPrefix: "EntryRepository"
+      })
+      const instant = new Date("2024-05-06T07:08:09.123Z")
+      yield* sql.withTransaction(Effect.gen(function*() {
+        yield* sql`SET LOCAL TIME ZONE 'Europe/Berlin'`
+        yield* sql`CREATE TEMP TABLE model_timestamp (id SERIAL PRIMARY KEY, created_at TIMESTAMPTZ) ON COMMIT DROP`
+        const inserted = yield* repo.insert(
+          Entry.insert.make({ created_at: Model.Override(DateTime.makeUnsafe(instant)) })
+        )
+        assert.strictEqual(DateTime.toEpochMillis(inserted.created_at), instant.getTime())
+        const selected = yield* repo.findById(inserted.id)
+        assert.deepStrictEqual(selected, inserted)
+        assert.strictEqual(DateTime.toEpochMillis(selected.created_at), instant.getTime())
+      }))
+    }))
+
   it.effect("insert helper", () =>
     Effect.gen(function*() {
       const sql = yield* PgClient.PgClient
@@ -238,6 +266,30 @@ it.layer(PgContainer.layerClient, { timeout: "30 seconds" })("PgClient", (it) =>
       expect(rows[0].json).toEqual({ testValue: 123 })
     }))
 
+  it.effect("reads scalar enums as strings without registering their OIDs", () =>
+    Effect.gen(function*() {
+      const sql = yield* PgClient.PgClient
+      yield* sql.withTransaction(Effect.gen(function*() {
+        yield* sql`CREATE TYPE capability_scalar AS ENUM ('use_key', 'manage', 'gérer')`
+        const rows = yield* sql`
+          SELECT 'use_key'::capability_scalar AS capability,
+                 ${"gérer"}::capability_scalar AS bound,
+                 NULL::capability_scalar AS nullable
+        `
+        yield* sql`DROP TYPE capability_scalar`
+        assert.deepStrictEqual(rows, [{ capability: "use_key", bound: "gérer", nullable: null }])
+      }))
+    }))
+
+  it.effect("reads bytea as Uint8Array", () =>
+    Effect.gen(function*() {
+      const sql = yield* PgClient.PgClient
+      const payload = new Uint8Array([0, 1, 254, 255])
+      const rows = yield* sql`SELECT ${payload}::bytea AS payload`
+      assert.instanceOf(rows[0].payload, Uint8Array)
+      assert.deepStrictEqual(rows, [{ payload }])
+    }))
+
   it.effect("stream", () =>
     Effect.gen(function*() {
       const sql = yield* SqlClient.SqlClient
@@ -251,6 +303,27 @@ it.layer(PgContainer.layerClient, { timeout: "30 seconds" })("PgClient", (it) =>
       ])
     }))
 
+  it.effect("releases completed nested transaction locks", () =>
+    Effect.gen(function*() {
+      const sql = yield* PgClient.PgClient
+      const locks = sql`SELECT count(*)::integer AS count FROM pg_locks
+        WHERE pid = pg_backend_pid() AND locktype = 'transactionid'`
+      yield* sql.withTransaction(Effect.gen(function*() {
+        yield* sql`CREATE TEMP TABLE savepoint_locks (value INTEGER) ON COMMIT DROP`
+
+        yield* sql.withTransaction(sql`INSERT INTO savepoint_locks VALUES (1)`)
+        assert.deepStrictEqual(yield* locks, [{ count: 1 }])
+
+        const error = yield* sql.withTransaction(
+          sql`INSERT INTO savepoint_locks VALUES (2)`.pipe(Effect.andThen(Effect.fail("rollback")))
+        ).pipe(Effect.flip)
+        assert.strictEqual(error, "rollback")
+        assert.deepStrictEqual(yield* locks, [{ count: 1 }])
+
+        assert.deepStrictEqual(yield* sql`SELECT value FROM savepoint_locks`, [{ value: 1 }])
+      }))
+    }))
+
   it.effect("preserves successful concurrent nested transactions", () =>
     Effect.gen(function*() {
       const sql = yield* PgClient.PgClient
@@ -486,7 +559,8 @@ it.layer(PgContainer.layerClientWithTransforms, { timeout: "30 seconds" })("PgCl
     }))
 })
 
-it.layer(PgContainer.layerClientForListen, { timeout: "30 seconds" })("PgClient listen", (it) => {
+// Each listener uses one of two pool connections.
+it.layer(PgContainer.layerClientForListen, { timeout: "30 seconds", concurrent: false })("PgClient listen", (it) => {
   it.effect("keeps queries available while a listener reserves one connection", () =>
     Effect.gen(function*() {
       const sql = yield* PgClient.PgClient
@@ -510,7 +584,7 @@ it.layer(PgContainer.layerClientForListen, { timeout: "30 seconds" })("PgClient
         })
       )
       expect(payload.payload).toEqual("payload")
-    }).pipe(TestClock.withLive), 20_000)
+    }).pipe(TestClock.withLive), { timeout: 20_000 })
 
   it.effect("notify sends payload", () =>
     Effect.gen(function*() {
@@ -527,7 +601,42 @@ it.layer(PgContainer.layerClientForListen, { timeout: "30 seconds" })("PgClient
         })
       )
       expect(payload.payload).toEqual("payload")
-    }).pipe(TestClock.withLive), 20_000)
+    }).pipe(TestClock.withLive), { timeout: 20_000 })
+
+  it.effect("retries a failed listener and receives notifications on a new connection", () =>
+    Effect.gen(function*() {
+      const sql = yield* PgClient.PgClient
+      const channel = "retry_listener"
+      const registered = yield* Queue.unbounded<void>()
+      const consumer = yield* Stream.unwrap(Effect.gen(function*() {
+        const notifications = yield* sql.listen(channel)
+        yield* Queue.offer(registered, undefined)
+        return Stream.fromQueue(notifications)
+      })).pipe(
+        Stream.retry(Schedule.recurs(1)),
+        Stream.runHead,
+        Effect.forkScoped
+      )
+
+      yield* Queue.take(registered)
+      const [listener] = yield* sql<{ pid: number }>`
+        SELECT pid FROM pg_stat_activity WHERE query = ${`LISTEN "${channel}"`}
+      `
+      assert.isDefined(listener)
+      yield* sql`SELECT pg_terminate_backend(${listener.pid})`
+
+      // Wait for registration; PostgreSQL does not replay missed notifications.
+      yield* Queue.take(registered)
+      const [replacement] = yield* sql<{ pid: number }>`
+        SELECT pid FROM pg_stat_activity
+        WHERE query = ${`LISTEN "${channel}"`} AND pid <> ${listener.pid}
+      `
+      assert.isDefined(replacement)
+      yield* sql.notify(channel, "after reconnect")
+      const notification = Option.getOrThrow(yield* Fiber.join(consumer))
+      assert.strictEqual(notification.channel, channel)
+      assert.strictEqual(notification.payload, "after reconnect")
+    }), { timeout: 20_000 })
 
   it.effect("listen rejects channel names longer than 63 UTF-8 bytes", () =>
     Effect.gen(function*() {
diff --git a/repos/effect/packages/sql/pg/test/PgConnection.in-process.test.ts b/repos/effect/packages/sql/pg/test/PgConnection.in-process.test.ts
index 263100505..b3f9118b6 100644
--- a/repos/effect/packages/sql/pg/test/PgConnection.in-process.test.ts
+++ b/repos/effect/packages/sql/pg/test/PgConnection.in-process.test.ts
@@ -7,6 +7,27 @@ import * as Net from "node:net"
 import { tmpdir } from "node:os"
 import { join } from "node:path"
 import { Duplex } from "node:stream"
+import type * as Tls from "node:tls"
+import { vi } from "vitest"
+
+const tlsOptions = new WeakMap<Duplex, Tls.ConnectionOptions | undefined>()
+
+// Only simulate TLS for registered streams; other connections use native TLS.
+vi.mock("node:tls", async (importOriginal) => {
+  const original = await importOriginal<typeof Tls>()
+  return {
+    ...original,
+    connect(options: Tls.ConnectionOptions) {
+      const socket = options.socket
+      if (socket === undefined || !tlsOptions.has(socket)) {
+        return original.connect(options)
+      }
+      tlsOptions.set(socket, options)
+      queueMicrotask(() => socket.emit("secureConnect"))
+      return socket
+    }
+  }
+})
 
 const backendMessage = (tag: string, payload: Uint8Array): Buffer => {
   const length = Buffer.allocUnsafe(4)
@@ -32,6 +53,31 @@ const authentication = (method: number, payload: Uint8Array = Buffer.alloc(0)):
 const authenticationOk = authentication(0)
 const backendKeyData = backendMessage("K", Buffer.concat([int32(1234), int32(5678)]))
 const readyForQuery = backendMessage("Z", Buffer.from("I"))
+const sslRequest = Buffer.concat([int32(8), int32(80877103)])
+const cancelRequest = Buffer.concat([int32(16), int32(80877102), int32(1234), int32(5678)])
+
+const makeSslStream = (reply: "S" | "N", cancel: boolean) => {
+  const writes: Array<Buffer> = []
+  const socket: Duplex = new Duplex({
+    read() {},
+    write(chunk: Buffer, _encoding, callback) {
+      writes.push(Buffer.from(chunk))
+      queueMicrotask(() => {
+        if (writes.length === 1) {
+          socket.push(Buffer.from(reply))
+        } else if (cancel) {
+          socket.destroy()
+        } else if (writes.length === 2) {
+          socket.push(Buffer.concat([authenticationOk, backendKeyData, readyForQuery]))
+        }
+      })
+      callback()
+    }
+  })
+  tlsOptions.set(socket, undefined)
+  return { socket, writes }
+}
+
 const emptyQueryResult = Buffer.concat([
   backendMessage("1", Buffer.alloc(0)),
   backendMessage("2", Buffer.alloc(0)),
@@ -50,6 +96,22 @@ const frontendTags = (message: Buffer): ReadonlyArray<string> => {
   return tags
 }
 
+const frontendPreparedNames = (message: Buffer): ReadonlyArray<string> => {
+  const names: Array<string> = []
+  let offset = 0
+  while (offset < message.length) {
+    const tag = String.fromCharCode(message[offset])
+    const length = message.readInt32BE(offset + 1)
+    if (tag === "P") {
+      const nameStart = offset + 5
+      const nameEnd = message.indexOf(0, nameStart)
+      names.push(message.subarray(nameStart, nameEnd).toString())
+    }
+    offset += 1 + length
+  }
+  return names
+}
+
 const consumeFrontend = (
   socket: Net.Socket,
   onMessage: (tag: string | undefined, message: Buffer) => void
@@ -148,6 +210,40 @@ const withUnixServer = (
   )
 
 describe("PgConnection in-process server", () => {
+  it.live("forwards startup defaults and lets explicit fields override URL values", () =>
+    Effect.scoped(Effect.gen(function*() {
+      let parameters: ReadonlyMap<string, string> | undefined
+      const { port } = yield* withTcpServer((socket) => {
+        consumeFrontend(socket, (tag, message) => {
+          if (tag === undefined) {
+            parameters = startupParameters(message)
+            socket.write(Buffer.concat([authenticationOk, backendKeyData, readyForQuery]))
+          }
+        })
+      })
+      const config = {
+        host: "127.0.0.1",
+        port,
+        url: Redacted.make(
+          "postgres://test@localhost/db?application_name=url-app&options=-c%20statement_timeout%3D1234"
+        ),
+        startupParameters: { SEARCH_PATH: "public", CLIENT_ENCODING: "uTf-8", application_name: "named-app" }
+      }
+      yield* PgConnection.make(config)
+      assert.deepStrictEqual(Object.fromEntries(parameters!), {
+        user: "test",
+        database: "db",
+        application_name: "named-app",
+        search_path: "public",
+        client_encoding: "UTF8",
+        options: "-c statement_timeout=1234"
+      })
+
+      yield* PgConnection.make({ ...config, applicationName: "explicit-app", startupOptions: "-c lock_timeout=2345" })
+      assert.strictEqual(parameters!.get("application_name"), "explicit-app")
+      assert.strictEqual(parameters!.get("options"), "-c lock_timeout=2345")
+    })))
+
   it.effect("accepts backend messages over the default limit when configured", () =>
     Effect.gen(function*() {
       const fieldSize = 16 * 1024 * 1024
@@ -236,6 +332,41 @@ describe("PgConnection in-process server", () => {
       assert.deepStrictEqual(frontendTags(writes[1]), ["P", "B", "D", "E", "S", "P", "B", "D", "E", "S"])
     }))
 
+  it.effect("uses distinct prepared statement names across connections", () =>
+    Effect.gen(function*() {
+      const writes: Array<Array<Buffer>> = []
+      const makeStream = () => {
+        const connectionWrites: Array<Buffer> = []
+        const socket: Duplex = new Duplex({
+          read() {},
+          write(chunk: Buffer, _encoding, callback) {
+            connectionWrites.push(Buffer.from(chunk))
+            queueMicrotask(() => {
+              socket.push(
+                connectionWrites.length === 1
+                  ? Buffer.concat([authenticationOk, backendKeyData, readyForQuery])
+                  : emptyQueryResult
+              )
+            })
+            callback()
+          }
+        })
+        writes.push(connectionWrites)
+        return socket
+      }
+
+      const first = yield* PgConnection.make({ username: "test", stream: makeStream })
+      const second = yield* PgConnection.make({ username: "test", stream: makeStream })
+      yield* first.query("SELECT $1", [1])
+      yield* second.query("SELECT $1, $2", [1, 2])
+
+      const firstName = frontendPreparedNames(writes[0][1])
+      const secondName = frontendPreparedNames(writes[1][1])
+      assert.strictEqual(firstName.length, 1)
+      assert.strictEqual(secondName.length, 1)
+      assert.notStrictEqual(firstName[0], secondName[0])
+    }))
+
   it.effect("reuses a prepared name after a pending pipeline query is interrupted", () =>
     Effect.gen(function*() {
       const writes: Array<Buffer> = []
@@ -264,8 +395,9 @@ describe("PgConnection in-process server", () => {
       yield* connection.query("SELECT 1")
 
       assert.strictEqual(writes.length, 2)
-      const nameEnd = writes[1].indexOf(0, 5)
-      assert.strictEqual(writes[1].subarray(5, nameEnd).toString(), "effect1")
+      const names = frontendPreparedNames(writes[1])
+      assert.strictEqual(names.length, 1)
+      assert.match(names[0], /^effect_[0-9a-f]{16}_1$/)
     }))
 
   it.effect("ends a custom stream after writing Terminate", () =>
@@ -289,6 +421,244 @@ describe("PgConnection in-process server", () => {
       assert.isFalse(socket.destroyed)
     }))
 
+  describe("TLS servername", () => {
+    const cases: ReadonlyArray<{
+      readonly name: string
+      readonly config: PgConnection.Config
+      readonly servername: string | undefined
+    }> = [
+      { name: "DNS host with ssl=true", config: { host: "db.example.com", ssl: true }, servername: "db.example.com" },
+      {
+        name: "DNS host with SSL options",
+        config: { host: "db.example.com", ssl: { rejectUnauthorized: false } },
+        servername: "db.example.com"
+      },
+      {
+        name: "DNS host from a URL",
+        config: { url: Redacted.make("postgres://test@db.example.com/db?sslmode=require") },
+        servername: "db.example.com"
+      },
+      {
+        name: "ssl=true overrides sslmode=disable",
+        config: { url: Redacted.make("postgres://test@db.example.com/db?sslmode=disable"), ssl: true },
+        servername: "db.example.com"
+      },
+      ...["prefer", "allow"].flatMap((sslmode) => [
+        {
+          name: `sslmode=${sslmode} enables TLS`,
+          config: { url: Redacted.make(`postgresql://test@db.example.com/db?sslmode=${sslmode}`) },
+          servername: "db.example.com"
+        },
+        {
+          name: `SSL options override sslmode=${sslmode}`,
+          config: {
+            url: Redacted.make(`postgres://test@db.example.com/db?sslmode=${sslmode}`),
+            ssl: { servername: "routing.example.com", rejectUnauthorized: false }
+          },
+          servername: "routing.example.com"
+        }
+      ]),
+      { name: "IPv4 host", config: { host: "127.0.0.1", ssl: true }, servername: undefined },
+      { name: "IPv6 host", config: { host: "::1", ssl: true }, servername: undefined },
+      ...["db.example.com", "127.0.0.1", "::1"].map((host) => ({
+        name: `explicit servername for ${host}`,
+        config: { host, ssl: { servername: "routing.example.com", rejectUnauthorized: false } },
+        servername: "routing.example.com"
+      })),
+      {
+        name: "explicit empty servername",
+        config: { host: "db.example.com", ssl: { servername: "" } },
+        servername: ""
+      }
+    ]
+
+    for (const path of ["startup", "cancel"] as const) {
+      describe(path, () => {
+        it.effect.each(cases)("$name", ({ config, servername }) =>
+          Effect.gen(function*() {
+            const streams: Array<ReturnType<typeof makeSslStream>> = []
+            const connection = yield* PgConnection.make({
+              username: "test",
+              ...config,
+              stream: () => {
+                const stream = makeSslStream("S", streams.length > 0)
+                streams.push(stream)
+                return stream.socket
+              }
+            })
+            if (path === "cancel") {
+              yield* connection.interrupt
+            }
+
+            assert.strictEqual(streams.length, path === "cancel" ? 2 : 1)
+            const stream = streams[path === "cancel" ? 1 : 0]
+            assert.deepStrictEqual(stream.writes[0], sslRequest)
+            if (path === "cancel") {
+              assert.deepStrictEqual(stream.writes[1], cancelRequest)
+            } else {
+              assert.strictEqual(stream.writes[1].readInt32BE(4), 196608)
+              assert.strictEqual(startupParameters(stream.writes[1]).get("user"), "test")
+            }
+            const options = tlsOptions.get(stream.socket)
+            assert.isDefined(options)
+            assert.strictEqual(options!.servername, servername)
+            if (typeof config.ssl === "object") {
+              assert.strictEqual(options!.rejectUnauthorized, config.ssl.rejectUnauthorized)
+            } else {
+              assert.notStrictEqual(options!.rejectUnauthorized, false)
+            }
+          }))
+      })
+    }
+  })
+
+  it.effect.each(["prefer", "allow"])(
+    "ssl=false overrides sslmode=%s with plaintext startup",
+    (sslmode) =>
+      Effect.gen(function*() {
+        const writes: Array<Buffer> = []
+        const socket: Duplex = new Duplex({
+          read() {},
+          write(chunk: Buffer, _encoding, callback) {
+            writes.push(Buffer.from(chunk))
+            if (writes.length === 1) {
+              queueMicrotask(() => socket.push(Buffer.concat([authenticationOk, backendKeyData, readyForQuery])))
+            }
+            callback()
+          }
+        })
+        tlsOptions.set(socket, undefined)
+
+        yield* PgConnection.make({
+          url: Redacted.make(`postgresql://test@db.example.com/db?sslmode=${sslmode}`),
+          ssl: false,
+          stream: () => socket
+        })
+
+        assert.strictEqual(writes.length, 1)
+        assert.strictEqual(writes[0].readInt32BE(4), 196608)
+        assert.strictEqual(startupParameters(writes[0]).get("user"), "test")
+        assert.isUndefined(tlsOptions.get(socket))
+      })
+  )
+
+  it.effect.each(["require", "verify-ca", "verify-full"])(
+    "sslmode=%s fails when the server refuses TLS",
+    (sslmode) =>
+      Effect.gen(function*() {
+        const writes: Array<Buffer> = []
+        const socket: Duplex = new Duplex({
+          read() {},
+          write(chunk: Buffer, _encoding, callback) {
+            writes.push(Buffer.from(chunk))
+            queueMicrotask(() => socket.push(Buffer.from("N")))
+            callback()
+          }
+        })
+        const error = yield* Effect.flip(PgConnection.make({
+          url: Redacted.make(`postgres://test@db.example.com/db?sslmode=${sslmode}`),
+          stream: () => socket
+        }))
+
+        assert.deepStrictEqual(writes, [Buffer.concat([int32(8), int32(80877103)])])
+        assert.strictEqual(error.reason._tag, "ConnectionError")
+        assert.strictEqual(error.reason.message, "PgConnection: Server refused TLS")
+        assert.isTrue(socket.destroyed)
+      })
+  )
+
+  describe("TLS fallback", () => {
+    it.effect.each(["prefer", "allow"])("sslmode=%s starts in plaintext after N", (sslmode) =>
+      Effect.gen(function*() {
+        const stream = makeSslStream("N", false)
+        let connections = 0
+        yield* PgConnection.make({
+          url: Redacted.make(`postgres://test@db.example.com/db?sslmode=${sslmode}`),
+          stream: () => {
+            connections++
+            return stream.socket
+          }
+        })
+
+        assert.strictEqual(connections, 1)
+        assert.strictEqual(stream.writes.length, 2)
+        assert.deepStrictEqual(stream.writes[0], sslRequest)
+        assert.strictEqual(stream.writes[1].readInt32BE(4), 196608)
+        assert.strictEqual(startupParameters(stream.writes[1]).get("user"), "test")
+        assert.isUndefined(tlsOptions.get(stream.socket))
+      }))
+
+    it.effect.each(["prefer", "allow"])(
+      "sslmode=%s allows plaintext cancellation for a plaintext session",
+      (sslmode) =>
+        Effect.gen(function*() {
+          const streams: Array<ReturnType<typeof makeSslStream>> = []
+          const connection = yield* PgConnection.make({
+            url: Redacted.make(`postgres://test@db.example.com/db?sslmode=${sslmode}`),
+            stream: () => {
+              const stream = makeSslStream("N", streams.length > 0)
+              streams.push(stream)
+              return stream.socket
+            }
+          })
+          yield* connection.interrupt
+
+          assert.strictEqual(streams.length, 2)
+          assert.isUndefined(tlsOptions.get(streams[0].socket))
+          assert.deepStrictEqual(streams[0].writes[0], sslRequest)
+          assert.strictEqual(streams[0].writes[1].readInt32BE(4), 196608)
+          assert.deepStrictEqual(streams[1].writes, [sslRequest, cancelRequest])
+          assert.isUndefined(tlsOptions.get(streams[1].socket))
+          assert.isTrue(streams[1].socket.destroyed)
+        })
+    )
+
+    it.effect.each(["prefer", "allow", "require"])(
+      "sslmode=%s refuses plaintext cancellation for a TLS session",
+      (sslmode) =>
+        Effect.gen(function*() {
+          const streams: Array<ReturnType<typeof makeSslStream>> = []
+          const connection = yield* PgConnection.make({
+            url: Redacted.make(`postgres://test@db.example.com/db?sslmode=${sslmode}`),
+            stream: () => {
+              const cancel = streams.length > 0
+              const stream = makeSslStream(cancel ? "N" : "S", cancel)
+              streams.push(stream)
+              return stream.socket
+            }
+          })
+          yield* connection.interrupt
+
+          assert.strictEqual(streams.length, 2)
+          assert.isDefined(tlsOptions.get(streams[0].socket))
+          assert.deepStrictEqual(streams[1].writes, [sslRequest])
+          assert.isUndefined(tlsOptions.get(streams[1].socket))
+          assert.isTrue(streams[1].socket.destroyed)
+        })
+    )
+
+    for (const sslmode of ["prefer", "allow"]) {
+      it.effect.each([true, { rejectUnauthorized: false }] as const)(
+        `explicit ssl=%j prevents sslmode=${sslmode} fallback`,
+        (ssl) =>
+          Effect.gen(function*() {
+            const stream = makeSslStream("N", false)
+            const error = yield* Effect.flip(PgConnection.make({
+              url: Redacted.make(`postgres://test@db.example.com/db?sslmode=${sslmode}`),
+              ssl,
+              stream: () => stream.socket
+            }))
+
+            assert.deepStrictEqual(stream.writes, [sslRequest])
+            assert.strictEqual(error.reason._tag, "ConnectionError")
+            assert.strictEqual(error.reason.message, "PgConnection: Server refused TLS")
+            assert.isUndefined(tlsOptions.get(stream.socket))
+            assert.isTrue(stream.socket.destroyed)
+          })
+      )
+    }
+  })
+
   it.live("preserves an ErrorResponse returned for SSLRequest", () =>
     Effect.scoped(Effect.gen(function*() {
       const { port } = yield* withTcpServer((socket) => {
@@ -478,6 +848,34 @@ describe("PgConnection in-process server", () => {
       assert.strictEqual(password, "secret")
     })))
 
+  it.live("resolves a password Effect for each connection", () =>
+    Effect.gen(function*() {
+      const passwords: Array<string> = []
+      const { port } = yield* withTcpServer((socket) => {
+        consumeFrontend(socket, (tag, message) => {
+          if (tag === undefined) {
+            socket.write(authentication(3))
+          } else if (tag === "p") {
+            passwords.push(message.subarray(5, -1).toString())
+            socket.write(Buffer.concat([authenticationOk, backendKeyData, readyForQuery]))
+          }
+        })
+      })
+      let calls = 0
+      const acquire = PgConnection.make({
+        host: "127.0.0.1",
+        port,
+        username: "test",
+        password: Effect.sync(() => Redacted.make(`secret-${++calls}`))
+      })
+
+      yield* Effect.scoped(acquire)
+      yield* acquire
+
+      assert.strictEqual(calls, 2)
+      assert.deepStrictEqual(passwords, ["secret-1", "secret-2"])
+    }))
+
   it.live("authenticates with an MD5 password request", () =>
     Effect.scoped(Effect.gen(function*() {
       let password: string | undefined
diff --git a/repos/effect/packages/sql/pg/test/PgConnection.integration.test.ts b/repos/effect/packages/sql/pg/test/PgConnection.integration.test.ts
index a80594f8e..a363e1b36 100644
--- a/repos/effect/packages/sql/pg/test/PgConnection.integration.test.ts
+++ b/repos/effect/packages/sql/pg/test/PgConnection.integration.test.ts
@@ -1,6 +1,7 @@
 import { PgConnection, PgTypes } from "@effect/sql-pg"
 import { assert, it } from "@effect/vitest"
-import { Deferred, Effect, Fiber, Redacted, Stream } from "effect"
+import { Cause, Deferred, Effect, Exit, Fiber, Queue, Redacted, Scope, Stream } from "effect"
+import type { SqlError } from "effect/unstable/sql/SqlError"
 import { PgContainer } from "./utils.ts"
 
 const makeConnection = (options?: PgConnection.Config) =>
@@ -12,7 +13,34 @@ const makeConnection = (options?: PgConnection.Config) =>
     })
   })
 
+const assertInterruptedOnClose = (
+  scope: Scope.Scope,
+  notifications: Queue.Dequeue<PgConnection.Notification, SqlError>
+) =>
+  Effect.gen(function*() {
+    const consumer = yield* Effect.forkScoped(Queue.take(notifications))
+    yield* Scope.close(scope, Exit.void)
+    const exit = yield* Fiber.await(consumer)
+    assert.isTrue(Exit.isFailure(exit) && Cause.hasInterruptsOnly(exit.cause))
+  })
+
 it.layer(PgContainer.layer, { timeout: "30 seconds" })("PgConnection", (it) => {
+  it.effect("interrupts notification consumers when the connection scope closes", () =>
+    Effect.gen(function*() {
+      const scope = yield* Scope.fork(yield* Scope.Scope)
+      const connection = yield* Scope.provide(makeConnection(), scope)
+      const notifications = yield* connection.listen("closed_listener")
+      yield* assertInterruptedOnClose(scope, notifications)
+    }))
+
+  it.effect("interrupts notification consumers when the listener scope closes", () =>
+    Effect.gen(function*() {
+      const scope = yield* Scope.fork(yield* Scope.Scope)
+      const connection = yield* makeConnection()
+      const notifications = yield* Scope.provide(connection.listen("closed_listener"), scope)
+      yield* assertInterruptedOnClose(scope, notifications)
+    }))
+
   it.effect("connects through ReadyForQuery", () =>
     Effect.gen(function*() {
       const connection = yield* makeConnection()
@@ -50,7 +78,7 @@ it.layer(PgContainer.layer, { timeout: "30 seconds" })("PgConnection", (it) => {
         flag: true,
         text: "hello",
         bytes: new Uint8Array([1, 255]),
-        instant: instant.getTime(),
+        instant,
         numbers: [1, null, 3],
         nil: null,
         jsonb: { nested: true }
@@ -69,6 +97,30 @@ it.layer(PgContainer.layer, { timeout: "30 seconds" })("PgConnection", (it) => {
       ])
     }))
 
+  it.effect("applies the session TimeZone only to Dates bound into timestamp columns", () =>
+    Effect.gen(function*() {
+      const connection = yield* makeConnection()
+      const instant = new Date("2024-05-06T07:08:09.123Z")
+      yield* connection.query(
+        "CREATE TEMP TABLE timestamp_timezone (bare timestamp, explicit timestamp, zoned timestamptz)"
+      )
+      for (
+        const [zone, expectedBare] of [
+          ["UTC", instant],
+          ["Europe/Berlin", new Date("2024-05-06T09:08:09.123Z")]
+        ] as const
+      ) {
+        yield* connection.query(`SET TIME ZONE '${zone}'`)
+        yield* connection.query("TRUNCATE timestamp_timezone")
+        yield* connection.query(
+          "INSERT INTO timestamp_timezone VALUES ($1, $2, $3)",
+          [instant, PgTypes.timestamp(instant), instant]
+        )
+        const result = yield* connection.query("SELECT * FROM timestamp_timezone")
+        assert.deepStrictEqual(result.rows, [{ bare: expectedBare, explicit: instant, zoned: instant }])
+      }
+    }))
+
   it.effect("returns queryValues in RowDescription order", () =>
     Effect.gen(function*() {
       const connection = yield* makeConnection()
diff --git a/repos/effect/packages/sql/pg/test/PgConnection.test.ts b/repos/effect/packages/sql/pg/test/PgConnection.test.ts
index 966c625ff..796c1370b 100644
--- a/repos/effect/packages/sql/pg/test/PgConnection.test.ts
+++ b/repos/effect/packages/sql/pg/test/PgConnection.test.ts
@@ -1,24 +1,87 @@
 import { PgConnection } from "@effect/sql-pg"
 import { assert, describe, it } from "@effect/vitest"
-import { Effect, Redacted } from "effect"
+import { Effect, Fiber, Redacted } from "effect"
+import * as TestClock from "effect/testing/TestClock"
 
 describe("PgConnection config", () => {
-  it.effect("rejects sslmode=prefer in a URL", () =>
+  it.effect.each([
+    { startupParameters: { REPLICATION: "database" } },
+    { startupParameters: { client_encoding: "LATIN1" } },
+    { startupParameters: { "": "value" } },
+    { startupParameters: { search_path: "public\0private" } },
+    { startupOptions: "-c lock_timeout=2345\0" },
+    { url: Redacted.make("postgres://test@localhost/db?options=%00") }
+  ])("rejects invalid startup config %j before connecting", (config) =>
     Effect.gen(function*() {
+      let connected = false
       const error = yield* Effect.flip(PgConnection.make({
-        url: Redacted.make("postgres://user@localhost/db?sslmode=prefer")
+        ...config,
+        username: "test",
+        stream: () => {
+          connected = true
+          throw new Error("unexpected connection")
+        }
       }))
+      assert.isFalse(connected)
       assert.strictEqual(error.reason._tag, "ConnectionError")
-      assert.include(error.reason.message, "sslmode")
     }))
 
-  it.effect("rejects sslmode=allow in a URL", () =>
+  it.effect("interrupts a stalled password provider when connectTimeout expires", () =>
     Effect.gen(function*() {
+      let connected = false
+      let interrupted = false
+      const fiber = yield* PgConnection.make({
+        username: "test",
+        password: Effect.never.pipe(Effect.onInterrupt(() =>
+          Effect.sync(() => {
+            interrupted = true
+          })
+        )),
+        connectTimeout: "1 second",
+        stream: () => {
+          connected = true
+          throw new Error("unexpected connection")
+        }
+      }).pipe(Effect.flip, Effect.forkScoped)
+
+      yield* TestClock.adjust("1 second")
+      const error = yield* Fiber.join(fiber)
+
+      assert.isTrue(interrupted)
+      assert.isFalse(connected)
+      assert.strictEqual(error.reason._tag, "ConnectionError")
+      assert.strictEqual(error.reason.message, "PgConnection: Connection timed out")
+      assert.isTrue(error.isRetryable)
+    }))
+
+  it.effect.each(["prefer", "allow"])("accepts sslmode=%s in a URL", (sslmode) =>
+    Effect.gen(function*() {
+      let connected = false
+      const error = yield* Effect.flip(PgConnection.make({
+        url: Redacted.make(`postgres://user@localhost/db?sslmode=${sslmode}`),
+        stream: () => {
+          connected = true
+          throw new Error("test connection")
+        }
+      }))
+      assert.isTrue(connected)
+      assert.strictEqual(error.reason._tag, "ConnectionError")
+      assert.strictEqual(error.reason.message, "PgConnection: Failed to connect")
+    }))
+
+  it.effect("rejects an unrecognized sslmode before connecting", () =>
+    Effect.gen(function*() {
+      let connected = false
       const error = yield* Effect.flip(PgConnection.make({
-        url: Redacted.make("postgresql://user@localhost/db?sslmode=allow")
+        url: Redacted.make("postgresql://user@localhost/db?sslmode=invalid"),
+        stream: () => {
+          connected = true
+          throw new Error("test connection")
+        }
       }))
+      assert.isFalse(connected)
       assert.strictEqual(error.reason._tag, "ConnectionError")
-      assert.include(error.reason.message, "sslmode")
+      assert.strictEqual(error.reason.message, "PgConnection: Unrecognized sslmode in URL: \"invalid\"")
     }))
 
   it.effect("rejects a non-postgres URL protocol", () =>
diff --git a/repos/effect/packages/sql/pg/test/PgMigrator.test.ts b/repos/effect/packages/sql/pg/test/PgMigrator.test.ts
new file mode 100644
index 000000000..a9c771964
--- /dev/null
+++ b/repos/effect/packages/sql/pg/test/PgMigrator.test.ts
@@ -0,0 +1,86 @@
+import { PgClient, PgMigrator } from "@effect/sql-pg"
+import { assert, describe, it } from "@effect/vitest"
+import { Effect, FileSystem, Path, Redacted, Stream } from "effect"
+import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
+import { Reactivity } from "effect/unstable/reactivity"
+import * as SqlClient from "effect/unstable/sql/SqlClient"
+
+const makeMigrator = (password: PgClient.PgClientConfig["password"]) =>
+  Effect.gen(function*() {
+    const commands: Array<ChildProcess.StandardCommand> = []
+    const files: Array<string> = []
+    const pg = yield* PgClient.make({ password })
+    const sql = yield* SqlClient.make({
+      acquirer: Effect.succeed({
+        execute: () => Effect.succeed([]),
+        executeRaw: () => Effect.succeed([]),
+        executeValues: () => Effect.succeed([]),
+        executeUnprepared: () => Effect.succeed([]),
+        executeValuesUnprepared: () => Effect.succeed([]),
+        executeStream: () => Stream.empty
+      }),
+      compiler: PgClient.makeCompiler(),
+      spanAttributes: []
+    })
+    const run = PgMigrator.run({
+      loader: PgMigrator.fromRecord({ "1_init": Effect.void }),
+      schemaDirectory: "migrations"
+    }).pipe(
+      Effect.provideService(PgClient.PgClient, pg),
+      Effect.provideService(SqlClient.SqlClient, sql),
+      Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, {
+        ...ChildProcessSpawner.make(() => Effect.die("unexpected spawn")),
+        string: (command) =>
+          Effect.sync(() => {
+            assert(ChildProcess.isStandardCommand(command))
+            commands.push(command)
+            return "SELECT 1;"
+          })
+      }),
+      Effect.provide(FileSystem.layerNoop({
+        makeDirectory: () => Effect.void,
+        writeFileString: (path) =>
+          Effect.sync(() => {
+            files.push(path)
+          })
+      })),
+      Effect.provide(Path.layer)
+    )
+    return { commands, files, run }
+  }).pipe(Effect.provide(Reactivity.layer))
+
+describe("PgMigrator", () => {
+  it.effect("shares one password per schema dump and refreshes it for the next dump", () =>
+    Effect.gen(function*() {
+      let calls = 0
+      const { commands, files, run } = yield* makeMigrator(
+        Effect.map(Effect.yieldNow, () => Redacted.make(`secret-${++calls}`))
+      )
+
+      yield* run
+
+      assert.strictEqual(calls, 1)
+      assert.deepStrictEqual(commands.map((command) => command.command), ["pg_dump", "pg_dump"])
+      assert.deepStrictEqual(commands.map((command) => command.options.env?.PGPASSWORD), ["secret-1", "secret-1"])
+
+      yield* run
+
+      assert.strictEqual(calls, 2)
+      assert.deepStrictEqual(commands.map((command) => command.options.env?.PGPASSWORD), [
+        "secret-1",
+        "secret-1",
+        "secret-2",
+        "secret-2"
+      ])
+      assert.deepStrictEqual(files, ["migrations/_schema.sql", "migrations/_schema.sql"])
+    }))
+
+  it.effect("passes a static password to both dump processes", () =>
+    Effect.gen(function*() {
+      const { commands, files, run } = yield* makeMigrator(Redacted.make("static"))
+      yield* run
+
+      assert.deepStrictEqual(commands.map((command) => command.options.env?.PGPASSWORD), ["static", "static"])
+      assert.deepStrictEqual(files, ["migrations/_schema.sql"])
+    }))
+})
diff --git a/repos/effect/packages/sql/pg/test/PgPool.integration.test.ts b/repos/effect/packages/sql/pg/test/PgPool.integration.test.ts
index 2219b60ec..418dd11ec 100644
--- a/repos/effect/packages/sql/pg/test/PgPool.integration.test.ts
+++ b/repos/effect/packages/sql/pg/test/PgPool.integration.test.ts
@@ -1,17 +1,144 @@
 import { PgConnection, PgPool } from "@effect/sql-pg"
 import { assert, it } from "@effect/vitest"
 import { Effect, Fiber, Queue, Redacted, Stream } from "effect"
+import * as Net from "node:net"
+import { Duplex } from "node:stream"
 import { PgContainer } from "./utils.ts"
 
 // `it.effect` runs under the TestClock, so poll loops sleep in real time.
 const realSleep = Effect.promise(() => new Promise((resolve) => setTimeout(resolve, 10)))
+const activeTimeoutMs = 10_000
+const cancellationTestTimeout = 20_000
 
 const poolConfig = Effect.gen(function*() {
   const container = yield* PgContainer
   return { url: Redacted.make(container.getConnectionUri()) }
 })
 
-it.layer(PgContainer.layer, { timeout: "30 seconds" })("PgPool", (it) => {
+const waitUntilActive = (observer: PgConnection.PgConnection, pid: number) =>
+  Effect.gen(function*() {
+    const startedAt = Date.now()
+    while (Date.now() - startedAt < activeTimeoutMs) {
+      const active = yield* observer.query(
+        "SELECT count(*)::int4 AS active FROM pg_stat_activity WHERE pid = $1 AND state = 'active'",
+        [pid]
+      )
+      if (active.rows[0].active === 1) return
+      yield* realSleep
+    }
+    return yield* Effect.fail(new Error(`PostgreSQL backend ${pid} did not become active within 10 seconds`))
+  })
+
+const cancelRequestCode = 80877102
+
+/** Holds `CancelRequest` messages until the test releases them. */
+class LateCancelProxy extends Duplex {
+  private readonly backend: Net.Socket
+  private cancelDeferred = false
+
+  constructor(host: string, port: number, private readonly gate: CancelRequestGate) {
+    super()
+    this.backend = Net.connect({ host, port, noDelay: true })
+    this.backend.on("data", (chunk: Buffer) => {
+      if (!this.push(chunk)) this.backend.pause()
+    })
+    this.backend.on("end", () => this.push(null))
+    this.backend.on("error", (error) => this.destroy(error))
+    this.backend.on("close", () => {
+      if (this.cancelDeferred) this.gate.markDelivered()
+      else this.destroy()
+    })
+  }
+
+  override _read(): void {
+    this.backend.resume()
+  }
+
+  override _write(chunk: Buffer, _encoding: BufferEncoding, callback: (error?: Error | null) => void): void {
+    if (chunk.length === 16 && chunk.readInt32BE(0) === 16 && chunk.readInt32BE(4) === cancelRequestCode) {
+      this.cancelDeferred = true
+      const backend = this.backend
+      this.gate.intercept(() => backend.end(chunk))
+      callback()
+      this.destroy()
+      return
+    }
+    this.backend.write(chunk, callback)
+  }
+
+  override _final(callback: (error?: Error | null) => void): void {
+    this.backend.end(callback)
+  }
+
+  override _destroy(error: Error | null, callback: (error?: Error | null) => void): void {
+    if (!this.cancelDeferred) this.backend.destroy()
+    callback(error)
+  }
+}
+
+class CancelRequestGate {
+  private readonly interceptedPromise: Promise<void>
+  private readonly deliveredPromise: Promise<void>
+  private resolveIntercepted!: () => void
+  private resolveDelivered!: () => void
+  private forward: (() => void) | undefined
+  private released = false
+
+  constructor() {
+    this.interceptedPromise = new Promise((resolve) => {
+      this.resolveIntercepted = resolve
+    })
+    this.deliveredPromise = new Promise((resolve) => {
+      this.resolveDelivered = resolve
+    })
+  }
+
+  get intercepted() {
+    return Effect.promise(() => this.interceptedPromise).pipe(Effect.timeout("5 seconds"))
+  }
+
+  get delivered() {
+    return Effect.promise(() => this.deliveredPromise).pipe(Effect.timeout("5 seconds"))
+  }
+
+  intercept(forward: () => void): void {
+    this.forward = forward
+    this.resolveIntercepted()
+    if (this.released) this.release()
+  }
+
+  release(): void {
+    this.released = true
+    const forward = this.forward
+    this.forward = undefined
+    forward?.()
+  }
+
+  markDelivered(): void {
+    this.resolveDelivered()
+  }
+}
+
+const lateCancelPoolConfig = (gate: CancelRequestGate) =>
+  Effect.gen(function*() {
+    const container = yield* PgContainer
+    const host = container.getHost()
+    const port = container.getMappedPort(5432)
+    return {
+      ...(yield* poolConfig),
+      maxConnections: 1,
+      stream: () => new LateCancelProxy(host, port, gate)
+    }
+  })
+
+const blockedStream = `
+  SELECT n FROM generate_series(1, 1000) AS g(n)
+  UNION ALL
+  SELECT 1001::int4 AS n
+  FROM (SELECT pg_advisory_xact_lock($1::int4)) AS blocked
+`
+
+it.layer(PgContainer.layer, { timeout: "30 seconds", concurrent: false })("PgPool", (it) => {
   it.effect("reuses checked out connections", () =>
     Effect.gen(function*() {
       const pool = yield* PgPool.make({ ...(yield* poolConfig), maxConnections: 1 })
@@ -49,14 +176,13 @@ it.layer(PgContainer.layer, { timeout: "30 seconds" })("PgPool", (it) => {
       assert.deepStrictEqual(rows[999], { n: 1000 })
 
       const aborted = yield* Stream.runCollect(
-        connection.stream("SELECT n FROM generate_series(1, 1000000) AS g(n)").pipe(Stream.take(5))
+        connection.stream("SELECT n FROM generate_series(1, 5000) AS g(n)").pipe(Stream.take(5))
       )
       assert.deepStrictEqual(aborted, [{ n: 1 }, { n: 2 }, { n: 3 }, { n: 4 }, { n: 5 }])
 
-      // The connection survives the cancelled stream.
-      const result = yield* connection.query("SELECT $1::text AS after", ["ok"])
-      assert.deepStrictEqual(result.rows, [{ after: "ok" }])
-    }))
+      const result = yield* connection.query("SELECT pg_backend_pid()::int4 AS pid, $1::text AS after", ["ok"])
+      assert.deepStrictEqual(result.rows, [{ pid: connection.processId, after: "ok" }])
+    }), cancellationTestTimeout)
 
   it.effect("acquires a multiplexed listener after registration", () =>
     Effect.gen(function*() {
@@ -88,6 +214,22 @@ it.layer(PgContainer.layer, { timeout: "30 seconds" })("PgPool", (it) => {
       assert.deepStrictEqual(result.rows, [{ one: 1 }])
     }))
 
+  it.effect("preserves the server error when a listener backend is terminated", () =>
+    Effect.gen(function*() {
+      const config = yield* poolConfig
+      const pool = yield* PgPool.make({ ...config, maxConnections: 1, multiplex: true })
+      const listener = yield* pool.reserve
+      const notifications = yield* listener.listen("terminated_listener")
+      const consumer = yield* Effect.forkScoped(Queue.take(notifications))
+      const terminator = yield* PgConnection.make(config)
+
+      yield* terminator.query("SELECT pg_terminate_backend($1)", [listener.processId])
+      const error = yield* Effect.flip(Fiber.join(consumer))
+      assert.strictEqual(error._tag, "SqlError")
+      assert.propertyVal(error.reason.cause, "code", "57P01")
+      assert.strictEqual(yield* Effect.flip(listener.query("SELECT 1")), error)
+    }))
+
   it.effect("returns a multiplexed reservation to shared circulation", () =>
     Effect.gen(function*() {
       const pool = yield* PgPool.make({ ...(yield* poolConfig), maxConnections: 1, multiplex: true })
@@ -102,28 +244,266 @@ it.layer(PgContainer.layer, { timeout: "30 seconds" })("PgPool", (it) => {
 
   it.effect("interrupt cancels an in-flight query", () =>
     Effect.gen(function*() {
-      const pool = yield* PgPool.make(yield* poolConfig)
+      const config = yield* poolConfig
+      const pool = yield* PgPool.make({ ...config, maxConnections: 1 })
+      const blocker = yield* PgConnection.make(config)
+      const observer = yield* PgConnection.make(config)
+      const first = yield* Effect.scoped(Effect.gen(function*() {
+        const connection = yield* pool.get
+        yield* blocker.query("BEGIN")
+        yield* blocker.query("SELECT pg_advisory_xact_lock($1::int4)", [connection.processId])
+        const fiber = yield* Effect.forkScoped(
+          connection.query("SELECT pg_advisory_xact_lock($1::int4)", [connection.processId])
+        )
+        yield* waitUntilActive(observer, connection.processId)
+        yield* connection.interrupt
+        const error = yield* Effect.flip(Fiber.join(fiber))
+        assert.strictEqual(error._tag, "SqlError")
+        assert.strictEqual(error.reason._tag, "StatementTimeoutError")
+        yield* blocker.query("ROLLBACK")
+        return connection.processId
+      }))
+
+      const second = yield* Effect.scoped(Effect.map(pool.get, (connection) => connection.processId))
+      assert.strictEqual(second, first)
+    }), cancellationTestTimeout)
+
+  it.effect("replaces a pooled session after an unconfirmed query cancel", () =>
+    Effect.gen(function*() {
+      const config = yield* poolConfig
+      const gate = new CancelRequestGate()
+      const pool = yield* PgPool.make(yield* lateCancelPoolConfig(gate))
+      const blocker = yield* PgConnection.make(config)
+      const observer = yield* PgConnection.make(config)
+
+      yield* Effect.gen(function*() {
+        const first = yield* Effect.scoped(Effect.gen(function*() {
+          const connection = yield* pool.get
+          yield* blocker.query("BEGIN")
+          yield* blocker.query("SELECT pg_advisory_xact_lock($1::int4)", [connection.processId])
+          const query = yield* Effect.forkScoped(
+            connection.query("SELECT pg_advisory_xact_lock($1::int4)", [connection.processId])
+          )
+          yield* waitUntilActive(observer, connection.processId)
+          const interruption = yield* Effect.forkScoped(Fiber.interrupt(query))
+          yield* gate.intercepted
+          yield* blocker.query("COMMIT")
+          yield* Fiber.join(interruption)
+          return connection.processId
+        }))
+
+        const second = yield* Effect.scoped(Effect.map(pool.get, (connection) => connection.processId))
+        assert.notStrictEqual(second, first)
+        gate.release()
+        yield* gate.delivered
+      }).pipe(Effect.ensuring(Effect.sync(() => gate.release())))
+    }), cancellationTestTimeout)
+
+  it.effect("replaces a session before pool.use after an unconfirmed query cancel", () =>
+    Effect.gen(function*() {
+      const config = yield* poolConfig
+      const gate = new CancelRequestGate()
+      const pool = yield* PgPool.make(yield* lateCancelPoolConfig(gate))
+      const blocker = yield* PgConnection.make(config)
+      const observer = yield* PgConnection.make(config)
+
+      yield* Effect.gen(function*() {
+        const first = yield* Effect.scoped(Effect.gen(function*() {
+          const connection = yield* pool.get
+          yield* blocker.query("BEGIN")
+          yield* blocker.query("SELECT pg_advisory_xact_lock($1::int4)", [connection.processId])
+          const query = yield* Effect.forkScoped(
+            connection.query("SELECT pg_advisory_xact_lock($1::int4)", [connection.processId])
+          )
+          yield* waitUntilActive(observer, connection.processId)
+          const interruption = yield* Effect.forkScoped(Fiber.interrupt(query))
+          yield* gate.intercepted
+          yield* blocker.query("COMMIT")
+          yield* Fiber.join(interruption)
+          return connection.processId
+        }))
+
+        const second = yield* pool.use((connection) => Effect.succeed(connection.processId))
+        assert.notStrictEqual(second, first)
+        gate.release()
+        yield* gate.delivered
+      }).pipe(Effect.ensuring(Effect.sync(() => gate.release())))
+    }), cancellationTestTimeout)
+
+  it.effect("protects an active pool.use query from a late cancel", () =>
+    Effect.gen(function*() {
+      const config = yield* poolConfig
+      const gate = new CancelRequestGate()
+      const pool = yield* PgPool.make(yield* lateCancelPoolConfig(gate))
+      const blocker = yield* PgConnection.make(config)
+      const observer = yield* PgConnection.make(config)
+      const started = yield* Queue.unbounded<number>()
+      const lockAcquired = yield* Queue.unbounded<void>()
+
+      yield* Effect.gen(function*() {
+        yield* Effect.scoped(Effect.gen(function*() {
+          const connection = yield* pool.get
+          yield* blocker.query("BEGIN")
+          yield* blocker.query("SELECT pg_advisory_xact_lock($1::int4)", [connection.processId])
+          const query = yield* Effect.forkScoped(
+            connection.query("SELECT pg_advisory_xact_lock($1::int4)", [connection.processId])
+          )
+          yield* waitUntilActive(observer, connection.processId)
+          const interruption = yield* Effect.forkScoped(Fiber.interrupt(query))
+          yield* gate.intercepted
+          yield* blocker.query("COMMIT")
+          yield* Fiber.join(interruption)
+        }))
+
+        const followUp = yield* Effect.forkScoped(
+          pool.use((connection) =>
+            Effect.gen(function*() {
+              yield* Queue.offer(started, connection.processId)
+              yield* Queue.take(lockAcquired)
+              return yield* connection.query(
+                "SELECT 1 AS after FROM pg_advisory_xact_lock($1::int4)",
+                [connection.processId]
+              )
+            })
+          )
+        )
+        const followUpPid = yield* Queue.take(started)
+        yield* blocker.query("BEGIN")
+        yield* blocker.query("SELECT pg_advisory_xact_lock($1::int4)", [followUpPid])
+        yield* Queue.offer(lockAcquired, undefined)
+        yield* waitUntilActive(observer, followUpPid)
+        gate.release()
+        yield* gate.delivered
+        yield* blocker.query("COMMIT")
+        const result = yield* Fiber.join(followUp)
+        assert.deepStrictEqual(result.rows, [{ after: 1 }])
+      }).pipe(
+        Effect.ensuring(
+          Effect.sync(() => gate.release()).pipe(
+            Effect.andThen(blocker.query("ROLLBACK")),
+            Effect.ignore
+          )
+        )
+      )
+    }), cancellationTestTimeout)
+
+  it.effect("retires an idle interrupted session before pool.use", () =>
+    Effect.gen(function*() {
+      const config = yield* poolConfig
+      const gate = new CancelRequestGate()
+      const pool = yield* PgPool.make(yield* lateCancelPoolConfig(gate))
+      const observer = yield* PgConnection.make(config)
+      const started = yield* Queue.unbounded<number>()
+
+      yield* Effect.gen(function*() {
+        const first = yield* Effect.scoped(Effect.gen(function*() {
+          const connection = yield* pool.get
+          yield* connection.interrupt
+          yield* gate.intercepted
+          return connection.processId
+        }))
+
+        const followUp = yield* Effect.forkScoped(
+          pool.use((connection) =>
+            Effect.gen(function*() {
+              yield* Queue.offer(started, connection.processId)
+              return yield* connection.query("SELECT 1 AS after FROM pg_sleep(1)")
+            })
+          )
+        )
+        const followUpPid = yield* Queue.take(started)
+        assert.notStrictEqual(followUpPid, first)
+        yield* waitUntilActive(observer, followUpPid)
+        gate.release()
+        yield* gate.delivered
+        const result = yield* Fiber.join(followUp)
+        assert.deepStrictEqual(result.rows, [{ after: 1 }])
+      }).pipe(Effect.ensuring(Effect.sync(() => gate.release())))
+    }), cancellationTestTimeout)
+
+  it.effect("replaces a pooled session after an unconfirmed stream cancel", () =>
+    Effect.gen(function*() {
+      const config = yield* poolConfig
+      const gate = new CancelRequestGate()
+      const pool = yield* PgPool.make(yield* lateCancelPoolConfig(gate))
+      const blocker = yield* PgConnection.make(config)
+
+      yield* Effect.gen(function*() {
+        const first = yield* Effect.scoped(Effect.gen(function*() {
+          const connection = yield* pool.get
+          yield* blocker.query("BEGIN")
+          yield* blocker.query("SELECT pg_advisory_xact_lock($1::int4)", [connection.processId])
+          const stream = yield* Effect.forkScoped(
+            connection.stream(blockedStream, [connection.processId]).pipe(Stream.take(1), Stream.runCollect)
+          )
+          yield* gate.intercepted
+          yield* blocker.query("COMMIT")
+          const rows = yield* Fiber.join(stream)
+          assert.deepStrictEqual(rows, [{ n: 1 }])
+          return connection.processId
+        }))
+
+        yield* Effect.scoped(Effect.gen(function*() {
+          const replacement = yield* pool.get
+          assert.notStrictEqual(replacement.processId, first)
+          const query = yield* Effect.forkScoped(replacement.query("SELECT 1 AS after FROM pg_sleep(1)"))
+          yield* waitUntilActive(blocker, replacement.processId)
+          gate.release()
+          yield* gate.delivered
+          const result = yield* Fiber.join(query)
+          assert.deepStrictEqual(result.rows, [{ after: 1 }])
+        }))
+      }).pipe(Effect.ensuring(Effect.sync(() => gate.release())))
+    }), cancellationTestTimeout)
+
+  it.effect("keeps a session after a confirmed stream cancel", () =>
+    Effect.gen(function*() {
+      const config = yield* poolConfig
+      const pool = yield* PgPool.make({ ...config, maxConnections: 1 })
+      const blocker = yield* PgConnection.make(config)
       const connection = yield* pool.get
-      const other = yield* pool.get
-      const fiber = yield* Effect.forkScoped(connection.query("SELECT pg_sleep(10)"))
-      // Wait until the statement is running server side.
-      while (true) {
-        const active = yield* other.query(
-          "SELECT count(*)::int4 AS active FROM pg_stat_activity WHERE pid = $1 AND state = 'active'",
-          [connection.processId]
+      yield* blocker.query("BEGIN")
+      yield* blocker.query("SELECT pg_advisory_xact_lock($1::int4)", [connection.processId])
+      const rows = yield* connection.stream(blockedStream, [connection.processId]).pipe(
+        Stream.take(1),
+        Stream.runCollect,
+        Effect.timeout("5 seconds")
+      )
+      assert.deepStrictEqual(rows, [{ n: 1 }])
+      const result = yield* connection.query("SELECT pg_backend_pid()::int4 AS pid")
+      assert.deepStrictEqual(result.rows, [{ pid: connection.processId }])
+      yield* blocker.query("ROLLBACK")
+    }), cancellationTestTimeout)
+
+  it.effect("keeps a held session after an unconfirmed query cancel", () =>
+    Effect.gen(function*() {
+      const config = yield* poolConfig
+      const gate = new CancelRequestGate()
+      const pool = yield* PgPool.make(yield* lateCancelPoolConfig(gate))
+      const blocker = yield* PgConnection.make(config)
+      const observer = yield* PgConnection.make(config)
+
+      yield* Effect.gen(function*() {
+        const connection = yield* pool.get
+        yield* blocker.query("BEGIN")
+        yield* blocker.query("SELECT pg_advisory_xact_lock($1::int4)", [connection.processId])
+        const query = yield* Effect.forkScoped(
+          connection.query("SELECT pg_advisory_xact_lock($1::int4)", [connection.processId])
         )
-        if (active.rows[0].active === 1) break
-        yield* realSleep
-      }
-      yield* connection.interrupt
-      const error = yield* Effect.flip(Fiber.join(fiber))
-      assert.strictEqual(error._tag, "SqlError")
-      assert.strictEqual(error.reason._tag, "StatementTimeoutError")
+        yield* waitUntilActive(observer, connection.processId)
+        const interruption = yield* Effect.forkScoped(Fiber.interrupt(query))
+        yield* gate.intercepted
+        yield* blocker.query("COMMIT")
+        yield* Fiber.join(interruption)
 
-      // The connection survives the cancelled statement.
-      const result = yield* connection.query("SELECT $1::int4 AS after", [2])
-      assert.deepStrictEqual(result.rows, [{ after: 2 }])
-    }))
+        const beforeDelivery = yield* connection.query("SELECT pg_backend_pid()::int4 AS pid")
+        assert.deepStrictEqual(beforeDelivery.rows, [{ pid: connection.processId }])
+        gate.release()
+        yield* gate.delivered
+        const afterDelivery = yield* connection.query("SELECT pg_backend_pid()::int4 AS pid")
+        assert.deepStrictEqual(afterDelivery.rows, [{ pid: connection.processId }])
+      }).pipe(Effect.ensuring(Effect.sync(() => gate.release())))
+    }), cancellationTestTimeout)
 
   it.effect("replaces connections that die", () =>
     Effect.gen(function*() {
@@ -224,7 +604,7 @@ it.layer(PgContainer.layer, { timeout: "30 seconds" })("PgPool", (it) => {
         (yield* borrow((connection) => connection.query("SELECT 2 AS ok"))).rows,
         [{ ok: 2 }]
       )
-    }), 20_000)
+    }), cancellationTestTimeout)
 
   it.effect("borrows around a connection that has to be replaced", () =>
     Effect.gen(function*() {
diff --git a/repos/effect/packages/sql/pg/test/PgTypes.test.ts b/repos/effect/packages/sql/pg/test/PgTypes.test.ts
index 9cf7a7f5a..fbd5feb83 100644
--- a/repos/effect/packages/sql/pg/test/PgTypes.test.ts
+++ b/repos/effect/packages/sql/pg/test/PgTypes.test.ts
@@ -51,6 +51,8 @@ const roundTrips: Array<{
   readonly value: unknown
   /** Set when PostgreSQL normalises the value, so encode is checked separately. */
   readonly encoded?: unknown
+  /** Expected decoded value, if different from the input. */
+  readonly decoded?: unknown
 }> = [
   { name: "bool", oid: PgTypes.OID.bool, value: true },
   { name: "int2", oid: PgTypes.OID.int2, value: -12345 },
@@ -58,6 +60,7 @@ const roundTrips: Array<{
   { name: "int8Max", oid: PgTypes.OID.int8, value: BigInt("9223372036854775807") },
   { name: "int8Min", oid: PgTypes.OID.int8, value: BigInt("-9223372036854775808") },
   { name: "oid", oid: PgTypes.OID.oid, value: 4294967295 },
+  { name: "regclass", oid: PgTypes.OID.regclass, value: 4294967295 },
   { name: "float4", oid: PgTypes.OID.float4, value: 1.5 },
   { name: "float8", oid: PgTypes.OID.float8, value: -3.0625 },
   { name: "numeric", oid: PgTypes.OID.numeric, value: "12345.6789" },
@@ -82,13 +85,27 @@ const roundTrips: Array<{
   { name: "dateNegInfinity", oid: PgTypes.OID.date, value: "-infinity" },
   { name: "time", oid: PgTypes.OID.time, value: BigInt(45296000000) },
   { name: "timetz", oid: PgTypes.OID.timetz, value: "12:34:56+02:00" },
-  { name: "timestamp", oid: PgTypes.OID.timestamp, value: 1717171717123 },
-  { name: "timestampInfinity", oid: PgTypes.OID.timestamp, value: Number.POSITIVE_INFINITY },
-  { name: "timestamptz", oid: PgTypes.OID.timestamptz, value: 1717171717123 },
-  { name: "timestamptzNegInfinity", oid: PgTypes.OID.timestamptz, value: Number.NEGATIVE_INFINITY },
+  { name: "timestamp", oid: PgTypes.OID.timestamp, value: new Date(1717171717123) },
+  {
+    name: "timestampInfinity",
+    oid: PgTypes.OID.timestamp,
+    value: Number.POSITIVE_INFINITY,
+    decoded: new Date(Number.NaN)
+  },
+  { name: "timestamptz", oid: PgTypes.OID.timestamptz, value: new Date(1717171717123) },
+  {
+    name: "timestamptzNegInfinity",
+    oid: PgTypes.OID.timestamptz,
+    value: Number.NEGATIVE_INFINITY,
+    decoded: new Date(Number.NaN)
+  },
   { name: "int4ArrayWithNulls", oid: PgTypes.OID.int4Array, value: [1, null, -3] },
   { name: "textArrayEmpty", oid: PgTypes.OID.textArray, value: [] },
-  { name: "timestamptzArray", oid: PgTypes.OID.timestamptzArray, value: [0, null, 1717171717000] }
+  {
+    name: "timestamptzArray",
+    oid: PgTypes.OID.timestamptzArray,
+    value: [new Date(0), null, new Date(1717171717000)]
+  }
 ]
 
 /** One value per element OID that has an array type. */
@@ -101,6 +118,7 @@ const elementSamples: Record<number, unknown> = {
   [PgTypes.OID.int4]: 70000,
   [PgTypes.OID.text]: "héllo ☃",
   [PgTypes.OID.oid]: 4294967295,
+  [PgTypes.OID.regclass]: 4294967295,
   [PgTypes.OID.json]: { a: [1, 2] },
   [PgTypes.OID.jsonb]: { a: [1, 2] },
   [PgTypes.OID.cidr]: "10.0.0.0/8",
@@ -111,8 +129,8 @@ const elementSamples: Record<number, unknown> = {
   [PgTypes.OID.varchar]: "abc",
   [PgTypes.OID.date]: "2024-02-29",
   [PgTypes.OID.time]: BigInt(45296000000),
-  [PgTypes.OID.timestamp]: 1717171717123,
-  [PgTypes.OID.timestamptz]: 0,
+  [PgTypes.OID.timestamp]: new Date(1717171717123),
+  [PgTypes.OID.timestamptz]: new Date(0),
   [PgTypes.OID.timetz]: "12:34:56+02:00",
   [PgTypes.OID.numeric]: "-98765432109876543210",
   [PgTypes.OID.uuid]: "6ba7b810-9dad-11d1-80b4-00c04fd430c8"
@@ -163,14 +181,15 @@ describe("PgTypes", () => {
   })
 
   describe("round trips against captured PostgreSQL rows", () => {
-    for (const { encoded, name, oid, value } of roundTrips) {
+    for (const { decoded, encoded, name, oid, value } of roundTrips) {
       it(name, () => {
         const golden = column(rows[name])
-        assert.deepStrictEqual(PgTypes.decode(golden, oid, 1), value)
+        const expected = decoded === undefined ? value : decoded
+        assert.deepStrictEqual(PgTypes.decode(golden, oid, 1), expected)
         if (encoded !== false) {
           assert.deepStrictEqual(PgTypes.encode(value, oid), golden)
         }
-        assert.deepStrictEqual(PgTypes.decode(PgTypes.encode(value, oid), oid, 1), value)
+        assert.deepStrictEqual(PgTypes.decode(PgTypes.encode(value, oid), oid, 1), expected)
       })
     }
   })
@@ -278,6 +297,52 @@ describe("PgTypes", () => {
     })
   })
 
+  it("uses canonical PostgreSQL wire bytes for equivalent IPv6 CIDR text", () => {
+    const expected = bytes("0320011020010db8000000000000000000000000")
+    assert.deepStrictEqual(
+      PgTypes.encode("2001:0DB8:0000:0000:0000:0000:0000:0000/32", PgTypes.OID.cidr),
+      expected
+    )
+    assert.strictEqual(PgTypes.decode(expected, PgTypes.OID.cidr, 1), "2001:db8::/32")
+  })
+
+  it("includes the input and column type in network encoding errors", () => {
+    for (
+      const [type, input, reason] of [
+        ["inet", "010.1.2.3/24", "leading zeroes are not allowed"],
+        ["cidr", "010.1.2.3/24", "leading zeroes are not allowed"],
+        ["inet", "192.0.2.1/33", "prefix length must be an integer from 0 through 32"],
+        ["cidr", "10.1.2.3/8", "address has non-zero host bits"],
+        ["cidr", "2001:db8::1/32", "address has non-zero host bits"]
+      ] as const
+    ) {
+      const result = PgTypesResult.encode(input, PgTypes.OID[type])
+      if (Result.isSuccess(result)) assert.fail("expected Failure")
+      assert.strictEqual(result.failure._tag, "PgTypesCodecError")
+      assert.strictEqual(result.failure.message, `Invalid ${type} value ${JSON.stringify(input)}: ${reason}`)
+    }
+  })
+
+  it("uses shared canonical parsing for inet and cidr", () => {
+    assert.deepStrictEqual(
+      PgTypes.encode("10.1.2.3", PgTypes.OID.cidr),
+      bytes("022001040a010203")
+    )
+    const inet = bytes("0380001020010db8000000000000000000000001")
+    assert.deepStrictEqual(
+      PgTypes.encode("2001:0DB8:0000:0000:0000:0000:0000:0001", PgTypes.OID.inet),
+      inet
+    )
+    assert.strictEqual(PgTypes.decode(inet, PgTypes.OID.inet, 1), "2001:db8::1")
+    assertThrowsTagged("PgTypesCodecError", () => PgTypes.encode("010.1.2.3", PgTypes.OID.inet))
+  })
+
+  it("preserves inet host bits alongside the prefix", () => {
+    for (const value of ["10.1.2.3/8", "2001:db8::1/32"]) {
+      assert.strictEqual(PgTypes.decode(PgTypes.encode(value, PgTypes.OID.inet), PgTypes.OID.inet, 1), value)
+    }
+  })
+
   describe("errors", () => {
     it("rejects the text format", () => {
       assertThrowsTagged("PgTypesCodecError", () => PgTypes.decode(bytes("31"), PgTypes.OID.int4, 0))
@@ -316,8 +381,10 @@ describe("PgTypes", () => {
       )
     })
 
-    it("rejects NaN timestamps", () => {
+    it("rejects NaN and invalid Date timestamps", () => {
       assertThrowsTagged("PgTypesCodecError", () => PgTypes.encode(Number.NaN, PgTypes.OID.timestamptz))
+      assertThrowsTagged("PgTypesCodecError", () => PgTypes.encode(new Date(Number.NaN), PgTypes.OID.timestamptz))
+      assertThrowsTagged("PgTypesCodecError", () => PgTypes.encode(new Date(Number.NaN), PgTypes.OID.timestamp))
     })
 
     it("rejects timestamps outside the PostgreSQL int64 range", () => {
@@ -480,8 +547,30 @@ describe("PgTypes", () => {
   })
 
   describe("unknown OIDs", () => {
-    it("decodes to the raw bytes", () => {
-      assert.deepStrictEqual(PgTypes.decode(bytes("00ff"), 99999, 1), bytes("00ff"))
+    it("decodes unregistered scalar OIDs as UTF-8 text", () => {
+      for (const label of ["use_key", "gérer ☃", ""]) {
+        assert.strictEqual(PgTypes.decode(new TextEncoder().encode(label), 99999, 1), label)
+      }
+    })
+
+    it("rejects invalid UTF-8 with the same codec failure as text", () => {
+      for (const wire of ["ff", "c3", "c328"]) {
+        const expected = PgTypesResult.decode(bytes(wire), PgTypes.OID.text, 1)
+        const actual = PgTypesResult.decode(bytes(wire), 99999, 1)
+        assert.isTrue(Result.isFailure(expected))
+        assert.isTrue(Result.isFailure(actual))
+        if (Result.isFailure(expected) && Result.isFailure(actual)) {
+          assert.strictEqual(actual.failure._tag, "PgTypesCodecError")
+          assert.strictEqual(actual.failure.message, expected.failure.message)
+        }
+      }
+    })
+
+    it("keeps bytea binary even when its bytes are invalid UTF-8", () => {
+      const payload = bytes("00ff")
+      const value = PgTypes.decode(payload, PgTypes.OID.bytea, 1)
+      assert.instanceOf(value, Uint8Array)
+      assert.deepStrictEqual(value, payload)
     })
 
     it("fails to encode until a codec is registered", () => {
@@ -551,6 +640,7 @@ describe("PgTypes", () => {
     it("agrees with the exact 64-bit conversion either side of the Number boundary", () => {
       const epochMs = BigInt(946684800000)
       const boundary = BigInt("9007199254740992")
+      const dateLimitMs = BigInt("8640000000000000")
       const micros = [
         BigInt(0),
         BigInt(1),
@@ -563,21 +653,45 @@ describe("PgTypes", () => {
         boundary + BigInt(7),
         -boundary,
         -boundary - BigInt(7),
+        (dateLimitMs - epochMs) * BigInt(1000),
+        (dateLimitMs - epochMs) * BigInt(1000) - BigInt(1),
+        (-dateLimitMs - epochMs) * BigInt(1000),
+        (-dateLimitMs - epochMs) * BigInt(1000) + BigInt(1)
+      ]
+      for (const oid of [PgTypes.OID.timestamp, PgTypes.OID.timestamptz]) {
+        for (const value of micros) {
+          const expectedMs = Number(value / BigInt(1000) + epochMs)
+          const decoded = PgTypes.decode(int64Bytes(value), oid, 1) as Date
+          assert.instanceOf(decoded, Date)
+          assert.isTrue(Number.isFinite(decoded.getTime()), `${value} microseconds, OID ${oid}`)
+          assert.strictEqual(decoded.getTime(), expectedMs, `${value} microseconds, OID ${oid}`)
+        }
+      }
+    })
+
+    it("decodes finite wire timestamps outside the Date range to invalid Dates", () => {
+      const epochMs = BigInt(946684800000)
+      const dateLimitMs = BigInt("8640000000000000")
+      const micros = [
+        (dateLimitMs + BigInt(1) - epochMs) * BigInt(1000),
+        (-dateLimitMs - BigInt(1) - epochMs) * BigInt(1000),
         BigInt("9223372036854775806"),
         BigInt("-9223372036854775807")
       ]
-      for (const value of micros) {
-        assert.strictEqual(
-          PgTypes.decode(int64Bytes(value), PgTypes.OID.timestamptz, 1),
-          Number(value / BigInt(1000)) + 946684800000,
-          `${value} microseconds`
-        )
+      for (const oid of [PgTypes.OID.timestamp, PgTypes.OID.timestamptz]) {
+        for (const value of micros) {
+          const decoded = PgTypes.decode(int64Bytes(value), oid, 1) as Date
+          assert.instanceOf(decoded, Date)
+          assert.isTrue(Number.isNaN(decoded.getTime()), `${value} microseconds, OID ${oid}`)
+        }
       }
     })
 
     it("round trips milliseconds through both the float and the BigInt path", () => {
       for (const ms of [0, 1, -1, 946684800000, 1717171717123, -62135596800000, 253402300799000, 9007199254740]) {
-        assert.strictEqual(PgTypes.decode(PgTypes.encode(ms, PgTypes.OID.timestamp), PgTypes.OID.timestamp, 1), ms)
+        const encoded = PgTypes.encode(ms, PgTypes.OID.timestamp)
+        assert.deepStrictEqual(PgTypes.encode(new Date(ms), PgTypes.OID.timestamp), encoded)
+        assert.deepStrictEqual(PgTypes.decode(encoded, PgTypes.OID.timestamp, 1), new Date(ms))
       }
     })
 
@@ -586,8 +700,8 @@ describe("PgTypes", () => {
       const after = new Uint8Array(8)
       new DataView(before.buffer).setBigInt64(0, BigInt(-1))
       new DataView(after.buffer).setBigInt64(0, BigInt(1))
-      assert.strictEqual(PgTypes.decode(before, PgTypes.OID.timestamp, 1), 946684800000)
-      assert.strictEqual(PgTypes.decode(after, PgTypes.OID.timestamp, 1), 946684800000)
+      assert.deepStrictEqual(PgTypes.decode(before, PgTypes.OID.timestamp, 1), new Date(946684800000))
+      assert.deepStrictEqual(PgTypes.decode(after, PgTypes.OID.timestamp, 1), new Date(946684800000))
     })
   })
 
@@ -902,6 +1016,7 @@ describe("PgTypes", () => {
 
     it("maps element OIDs to array OIDs", () => {
       assert.strictEqual(PgTypes.arrayOidFor(PgTypes.OID.text), PgTypes.OID.textArray)
+      assert.strictEqual(PgTypes.arrayOidFor(PgTypes.OID.regclass), PgTypes.OID.regclassArray)
       assert.strictEqual(PgTypes.arrayOidFor(99999), undefined)
       assertThrowsTagged("PgTypesCodecError", () => PgTypes.array([], 99999))
     })
@@ -926,15 +1041,38 @@ describe("PgTypes", () => {
       assert.deepStrictEqual((messages[0] as PgProtocol.DataRow<unknown>).values, [null, "a"])
     })
 
-    it("copies the bytes of a column whose OID has no codec", () => {
-      const parser = PgProtocol.makeParser({ readField: PgTypes.makeFieldReader(binary([99999])) })
-      const payload = new Uint8Array([1, 2, 3])
+    it("reads unregistered scalar columns as UTF-8 text and preserves NULL", () => {
+      const parser = PgProtocol.makeParser({
+        readField: PgTypes.makeFieldReader(binary([PgTypes.OID.int4, 99999, 99999, 99999, 99999]))
+      })
+      const messages = parser.push(dataRow([
+        PgTypes.encode(7, PgTypes.OID.int4),
+        new TextEncoder().encode("use_key"),
+        new TextEncoder().encode("gérer ☃"),
+        new Uint8Array(0),
+        null
+      ]))
+      assert.deepStrictEqual((messages[0] as PgProtocol.DataRow<unknown>).values, [7, "use_key", "gérer ☃", "", null])
+    })
+
+    it("rejects invalid UTF-8 in an unregistered column with a codec error", () => {
+      for (const wire of ["ff", "c3", "c328"]) {
+        const parser = PgProtocol.makeParser({
+          readField: PgTypes.makeFieldReader(binary([PgTypes.OID.int4, 99999]))
+        })
+        assertThrowsTagged(
+          "PgTypesCodecError",
+          () => parser.push(dataRow([PgTypes.encode(7, PgTypes.OID.int4), bytes(wire)]))
+        )
+      }
+    })
+
+    it("reads bytea as Uint8Array even when its bytes are invalid UTF-8", () => {
+      const parser = PgProtocol.makeParser({ readField: PgTypes.makeFieldReader(binary([PgTypes.OID.bytea])) })
+      const payload = bytes("00ff")
       const value = (parser.push(dataRow([payload]))[0] as PgProtocol.DataRow<unknown>).values[0]
+      assert.instanceOf(value, Uint8Array)
       assert.deepStrictEqual(value, payload)
-      // A copy, not a view into the parser's buffer, which is far larger and
-      // holds the whole frame rather than just this field.
-      assert.strictEqual((value as Uint8Array).byteOffset, 0)
-      assert.strictEqual((value as Uint8Array).buffer.byteLength, payload.length)
     })
 
     it("hands a view to a registered codec that cannot read in place", () => {
diff --git a/repos/effect/packages/sql/pg/test/StartupParameters.integration.test.ts b/repos/effect/packages/sql/pg/test/StartupParameters.integration.test.ts
new file mode 100644
index 000000000..a0a84385a
--- /dev/null
+++ b/repos/effect/packages/sql/pg/test/StartupParameters.integration.test.ts
@@ -0,0 +1,38 @@
+import { PgPool } from "@effect/sql-pg"
+import { assert, it } from "@effect/vitest"
+import { Effect, Redacted } from "effect"
+import { PgContainer } from "./utils.ts"
+
+it.layer(PgContainer.layer, { timeout: "30 seconds" })("PostgreSQL startup defaults", (it) => {
+  it.effect("preserves named and opaque defaults across replacement and RESET ALL", () =>
+    Effect.gen(function*() {
+      const container = yield* PgContainer
+      const pool = yield* PgPool.make({
+        url: Redacted.make(container.getConnectionUri()),
+        startupParameters: { statement_timeout: "1234ms" },
+        startupOptions: "-c lock_timeout=2345",
+        maxConnections: 1
+      })
+      const query = "SELECT current_setting('statement_timeout') AS timeout, " +
+        "current_setting('lock_timeout') AS lock"
+      const defaults = [{ timeout: "1234ms", lock: "2345ms" }]
+      const firstPid = yield* Effect.scoped(Effect.gen(function*() {
+        const connection = yield* pool.get
+        assert.deepStrictEqual((yield* connection.query(query)).rows, defaults)
+        yield* pool.invalidate(connection)
+        return connection.processId
+      }))
+      const replacement = yield* pool.get
+      assert.notStrictEqual(replacement.processId, firstPid)
+      assert.deepStrictEqual((yield* replacement.query(query)).rows, defaults)
+
+      yield* replacement.query("SET statement_timeout = '5678ms'")
+      yield* replacement.query("SET lock_timeout = '6789ms'")
+      assert.deepStrictEqual((yield* replacement.query(query)).rows, [{
+        timeout: "5678ms",
+        lock: "6789ms"
+      }])
+      yield* replacement.query("RESET ALL")
+      assert.deepStrictEqual((yield* replacement.query(query)).rows, defaults)
+    }))
+})
diff --git a/repos/effect/packages/sql/pg/test/fixtures/goldens.ts b/repos/effect/packages/sql/pg/test/fixtures/goldens.ts
index 1bb2b8d68..452a9b8a3 100644
--- a/repos/effect/packages/sql/pg/test/fixtures/goldens.ts
+++ b/repos/effect/packages/sql/pg/test/fixtures/goldens.ts
@@ -82,6 +82,7 @@ export const rows = {
   int8Max: "44000000120001000000087fffffffffffffff",
   int8Min: "44000000120001000000088000000000000000",
   oid: "440000000e000100000004ffffffff",
+  regclass: "440000000e000100000004ffffffff",
   float4: "440000000e0001000000043fc00000",
   float8: "4400000012000100000008c008800000000000",
   numeric: "440000001800010000000e0003000100000004000109291a85",
diff --git a/repos/effect/packages/sql/pg/test/fixtures/regenerate.ts b/repos/effect/packages/sql/pg/test/fixtures/regenerate.ts
index 39016d07a..f1307f995 100644
--- a/repos/effect/packages/sql/pg/test/fixtures/regenerate.ts
+++ b/repos/effect/packages/sql/pg/test/fixtures/regenerate.ts
@@ -171,6 +171,7 @@ const rowCases: ReadonlyArray<
   { name: "int8Max", type: "int8", oid: PgTypes.OID.int8, value: BigInt("9223372036854775807") },
   { name: "int8Min", type: "int8", oid: PgTypes.OID.int8, value: BigInt("-9223372036854775808") },
   { name: "oid", type: "oid", oid: PgTypes.OID.oid, value: 4294967295 },
+  { name: "regclass", type: "regclass", oid: PgTypes.OID.regclass, value: 4294967295 },
   { name: "float4", type: "float4", oid: PgTypes.OID.float4, value: 1.5 },
   { name: "float8", type: "float8", oid: PgTypes.OID.float8, value: -3.0625 },
   { name: "numeric", type: "numeric", oid: PgTypes.OID.numeric, value: "12345.6789" },
@@ -194,9 +195,9 @@ const rowCases: ReadonlyArray<
   { name: "dateNegInfinity", type: "date", oid: PgTypes.OID.date, value: "-infinity" },
   { name: "time", type: "time", oid: PgTypes.OID.time, value: BigInt(45296000000) },
   { name: "timetz", type: "timetz", oid: PgTypes.OID.timetz, value: "12:34:56+02:00" },
-  { name: "timestamp", type: "timestamp", oid: PgTypes.OID.timestamp, value: 1717171717123 },
+  { name: "timestamp", type: "timestamp", oid: PgTypes.OID.timestamp, value: new Date(1717171717123) },
   { name: "timestampInfinity", type: "timestamp", oid: PgTypes.OID.timestamp, value: Number.POSITIVE_INFINITY },
-  { name: "timestamptz", type: "timestamptz", oid: PgTypes.OID.timestamptz, value: 1717171717123 },
+  { name: "timestamptz", type: "timestamptz", oid: PgTypes.OID.timestamptz, value: new Date(1717171717123) },
   {
     name: "timestamptzNegInfinity",
     type: "timestamptz",
@@ -209,7 +210,7 @@ const rowCases: ReadonlyArray<
     name: "timestamptzArray",
     type: "timestamptz[]",
     oid: PgTypes.OID.timestamptzArray,
-    value: [0, null, 1717171717000]
+    value: [new Date(0), null, new Date(1717171717000)]
   }
 ]
 
diff --git a/repos/effect/packages/sql/pglite/CHANGELOG.md b/repos/effect/packages/sql/pglite/CHANGELOG.md
index d0659303d..69e267fa2 100644
--- a/repos/effect/packages/sql/pglite/CHANGELOG.md
+++ b/repos/effect/packages/sql/pglite/CHANGELOG.md
@@ -1,5 +1,48 @@
 # @effect/sql-pglite
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- [#8308](https://github.com/Effect-TS/effect/pull/8308) [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca) Thanks @tristanz! - Release savepoints after nested transactions succeed or successfully roll back in PostgreSQL, PGlite, MySQL, libSQL, and the Node, Bun, React Native, and WASM SQLite clients. This frees PostgreSQL transaction locks before the outer transaction completes.
+  
+  Custom SQL clients can opt in through the new `releaseSavepoint` option. Clients that omit it are unchanged.
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7534](https://github.com/Effect-TS/effect/pull/7534) [`c1693ff`](https://github.com/Effect-TS/effect/commit/c1693ffda83924ef2c71959cda643477ee42002d) Thanks @tim-smart! - Update production dependencies to their latest releases.
+
+- [#7720](https://github.com/Effect-TS/effect/pull/7720) [`2b3a9a3`](https://github.com/Effect-TS/effect/commit/2b3a9a3fbb7831a5b52aa957eef2fb7392968e7b) Thanks @kitlangton! - Preserve string values passed to `sql.json` when using PGlite.
+
+- [#7456](https://github.com/Effect-TS/effect/pull/7456) [`8fb2d0b`](https://github.com/Effect-TS/effect/commit/8fb2d0b3a477f579b26d9d452998f49c896a5326) Thanks @candrewlee14! - Align PGlite `listen` with the PostgreSQL client. It now returns a scoped dequeue after the listener is installed, providing an explicit readiness boundary and preserving notifications received before the first take.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/sql/pglite/package.json b/repos/effect/packages/sql/pglite/package.json
index 6254c2afc..eb42e4727 100644
--- a/repos/effect/packages/sql/pglite/package.json
+++ b/repos/effect/packages/sql/pglite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/sql-pglite",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "A PGlite toolkit for Effect",
diff --git a/repos/effect/packages/sql/pglite/src/PgliteClient.ts b/repos/effect/packages/sql/pglite/src/PgliteClient.ts
index a1ed4ea0f..c7ed114ee 100644
--- a/repos/effect/packages/sql/pglite/src/PgliteClient.ts
+++ b/repos/effect/packages/sql/pglite/src/PgliteClient.ts
@@ -229,6 +229,7 @@ export const fromClient = (
       acquirer,
       compiler,
       transactionAcquirer,
+      releaseSavepoint: (name) => `RELEASE SAVEPOINT ${name}`,
       spanAttributes,
       transformRows
     })
@@ -429,13 +430,12 @@ export const makeCompiler = (
     onCustom(type, placeholder, withoutTransform) {
       switch (type.kind) {
         case "PgJson": {
+          const value = withoutTransform || transformValue === undefined
+            ? type.paramA
+            : transformValue(type.paramA)
           return [
             placeholder(undefined),
-            [
-              withoutTransform || transformValue === undefined
-                ? type.paramA
-                : transformValue(type.paramA)
-            ]
+            [typeof value === "string" ? JSON.stringify(value) : value]
           ]
         }
       }
diff --git a/repos/effect/packages/sql/pglite/test/Client.test.ts b/repos/effect/packages/sql/pglite/test/Client.test.ts
index 69ac14557..ab3ccf9ef 100644
--- a/repos/effect/packages/sql/pglite/test/Client.test.ts
+++ b/repos/effect/packages/sql/pglite/test/Client.test.ts
@@ -14,7 +14,8 @@ const Migrations = Layer.effectDiscard(
   })
 )
 
-describe("PgliteClient", () => {
+// Avoid overlapping PGlite startup with SQL assertions in other tests.
+describe("PgliteClient", { concurrent: false }, () => {
   layer(ClientLayer, { timeout: "30 seconds" })((it) => {
     it.effect("basic insert/select", () =>
       Effect.gen(function*() {
@@ -123,7 +124,12 @@ describe("PgliteClient", () => {
   describe("fromClient", () => {
     layer(
       PgliteClient.layerFrom(Effect.gen(function*() {
-        const pg = new Pglite.PGlite()
+        const pg = yield* Effect.acquireRelease(
+          Effect.sync(() => new Pglite.PGlite()),
+          (pg) => Effect.promise(() => pg.close())
+        )
+        // Charge startup to the layer hook timeout, not the first query's test timeout.
+        yield* Effect.promise(() => pg.waitReady)
         return yield* PgliteClient.fromClient({ liveClient: pg })
       })),
       { timeout: "30 seconds" }
diff --git a/repos/effect/packages/sql/pglite/test/Json.test.ts b/repos/effect/packages/sql/pglite/test/Json.test.ts
new file mode 100644
index 000000000..f0d1e6939
--- /dev/null
+++ b/repos/effect/packages/sql/pglite/test/Json.test.ts
@@ -0,0 +1,19 @@
+import { PgliteClient } from "@effect/sql-pglite"
+import { assert, describe, layer } from "@effect/vitest"
+import { Effect } from "effect"
+
+describe("PgliteClient JSON values", () => {
+  layer(PgliteClient.layer(), { timeout: "30 seconds" })((it) => {
+    for (const type of ["json", "jsonb"]) {
+      it.effect.each(["null", "123", "hello", "", "\"quoted\"\\\n"])(
+        `${type} preserves the string %j`,
+        (input) =>
+          Effect.gen(function*() {
+            const sql = yield* PgliteClient.PgliteClient
+            const rows = yield* sql<{ value: unknown }>`SELECT ${sql.json(input)}::${sql.literal(type)} AS value`
+            assert.deepStrictEqual(rows, [{ value: input }])
+          })
+      )
+    }
+  })
+})
diff --git a/repos/effect/packages/sql/pglite/test/Transaction.test.ts b/repos/effect/packages/sql/pglite/test/Transaction.test.ts
index 0e2023b2a..99d71992d 100644
--- a/repos/effect/packages/sql/pglite/test/Transaction.test.ts
+++ b/repos/effect/packages/sql/pglite/test/Transaction.test.ts
@@ -60,6 +60,27 @@ describe("PgliteClient transactions", () => {
         assert.strictEqual(rows.at(0)?.total, 1)
       }))
 
+    it.effect("releases completed nested transaction locks", () =>
+      Effect.gen(function*() {
+        const sql = yield* PgliteClient.PgliteClient
+        const locks = sql`SELECT count(*)::integer AS count FROM pg_locks
+          WHERE pid = pg_backend_pid() AND locktype = 'transactionid'`
+        yield* sql.withTransaction(Effect.gen(function*() {
+          yield* sql`CREATE TEMP TABLE savepoint_locks (value INTEGER) ON COMMIT DROP`
+
+          yield* sql.withTransaction(sql`INSERT INTO savepoint_locks VALUES (1)`)
+          assert.deepStrictEqual(yield* locks, [{ count: 1 }])
+
+          const error = yield* sql.withTransaction(
+            sql`INSERT INTO savepoint_locks VALUES (2)`.pipe(Effect.andThen(Effect.fail("rollback")))
+          ).pipe(Effect.flip)
+          assert.strictEqual(error, "rollback")
+          assert.deepStrictEqual(yield* locks, [{ count: 1 }])
+
+          assert.deepStrictEqual(yield* sql`SELECT value FROM savepoint_locks`, [{ value: 1 }])
+        }))
+      }))
+
     it.effect("preserves successful concurrent nested transactions", () =>
       Effect.gen(function*() {
         const sql = yield* setup("tx_nested_concurrent")
diff --git a/repos/effect/packages/sql/sqlite-bun/CHANGELOG.md b/repos/effect/packages/sql/sqlite-bun/CHANGELOG.md
index bb74ba6eb..fccf48d73 100644
--- a/repos/effect/packages/sql/sqlite-bun/CHANGELOG.md
+++ b/repos/effect/packages/sql/sqlite-bun/CHANGELOG.md
@@ -1,5 +1,48 @@
 # @effect/sql-sqlite-bun
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- [#8308](https://github.com/Effect-TS/effect/pull/8308) [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca) Thanks @tristanz! - Release savepoints after nested transactions succeed or successfully roll back in PostgreSQL, PGlite, MySQL, libSQL, and the Node, Bun, React Native, and WASM SQLite clients. This frees PostgreSQL transaction locks before the outer transaction completes.
+  
+  Custom SQL clients can opt in through the new `releaseSavepoint` option. Clients that omit it are unchanged.
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7484](https://github.com/Effect-TS/effect/pull/7484) [`5612962`](https://github.com/Effect-TS/effect/commit/561296283c5359f91d37335df2667eb5310dd384) Thanks @Kashkovsky! - Allow read-only SQLite clients to use `withTransaction` when `PRAGMA query_only` is enabled. Writable clients continue
+  to reserve the writer lock when a transaction starts.
+
+- [#7831](https://github.com/Effect-TS/effect/pull/7831) [`5fe42ce`](https://github.com/Effect-TS/effect/commit/5fe42ce4431fb3b09548b29c207ff9cfa7bf0900) Thanks @kitlangton! - Allow database exports inside `withTransaction` to complete instead of waiting indefinitely. The exported snapshot
+  includes the transaction's uncommitted writes, while exports outside that transaction still wait for it to finish.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/sql/sqlite-bun/package.json b/repos/effect/packages/sql/sqlite-bun/package.json
index aedbff849..3fde21139 100644
--- a/repos/effect/packages/sql/sqlite-bun/package.json
+++ b/repos/effect/packages/sql/sqlite-bun/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/sql-sqlite-bun",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "A SQLite toolkit for Effect",
@@ -62,7 +62,7 @@
   },
   "devDependencies": {
     "@effect/platform-bun": "workspace:^",
-    "@types/bun": "^1.4.0",
+    "@types/bun": "^1.4.2",
     "effect": "workspace:^"
   },
   "peerDependencies": {
diff --git a/repos/effect/packages/sql/sqlite-bun/src/SqliteClient.ts b/repos/effect/packages/sql/sqlite-bun/src/SqliteClient.ts
index 463593457..800077b5c 100644
--- a/repos/effect/packages/sql/sqlite-bun/src/SqliteClient.ts
+++ b/repos/effect/packages/sql/sqlite-bun/src/SqliteClient.ts
@@ -230,11 +230,12 @@ export const make = (
       )
     })
 
-    return Object.assign(
+    const client: SqliteClient = Object.assign(
       (yield* Client.make({
         acquirer,
         compiler,
         transactionAcquirer,
+        releaseSavepoint: (name) => `RELEASE SAVEPOINT ${name}`,
         beginTransaction: options.readonly === true ? "BEGIN" : "BEGIN IMMEDIATE",
         spanAttributes: [
           ...(options.spanAttributes ? Object.entries(options.spanAttributes) : []),
@@ -245,10 +246,15 @@ export const make = (
       {
         [TypeId]: TypeId as TypeId,
         config: options,
-        export: Effect.flatMap(acquirer, (_) => _.export),
+        export: Effect.withFiber((fiber) =>
+          Context.getOption(fiber.context, client.transactionService)._tag === "Some"
+            ? connection.export
+            : Effect.flatMap(acquirer, (_) => _.export)
+        ),
         loadExtension: (path: string) => Effect.flatMap(acquirer, (_) => _.loadExtension(path))
       }
     )
+    return client
   })
 
 /**
diff --git a/repos/effect/packages/sql/sqlite-bun/test/Client.test.ts b/repos/effect/packages/sql/sqlite-bun/test/Client.test.ts
index e82702cde..b4109a205 100644
--- a/repos/effect/packages/sql/sqlite-bun/test/Client.test.ts
+++ b/repos/effect/packages/sql/sqlite-bun/test/Client.test.ts
@@ -44,6 +44,24 @@ describe("Client", () => {
       )
     }).pipe(Effect.provide(Reactivity.layer)))
 
+  it.effect.skipIf(!isBun)("exports inside transactions", () =>
+    Effect.gen(function*() {
+      const { SqliteClient } = yield* Effect.promise(() => import("@effect/sql-sqlite-bun"))
+      const { Database } = yield* Effect.promise(() => import("bun:sqlite"))
+      const sql = yield* SqliteClient.make({ filename: ":memory:" })
+      yield* sql`CREATE TABLE test (id INTEGER PRIMARY KEY)`
+
+      const bytes = yield* sql.withTransaction(
+        sql`INSERT INTO test DEFAULT VALUES`.pipe(Effect.andThen(sql.export))
+      )
+      const snapshot = Database.deserialize(bytes)
+      try {
+        assert.deepStrictEqual(snapshot.query("SELECT * FROM test").all(), [{ id: 1 }])
+      } finally {
+        snapshot.close()
+      }
+    }).pipe(Effect.provide(Reactivity.layer)))
+
   it.effect.skipIf(!isBun)("readonly clients reject writes", () =>
     Effect.gen(function*() {
       const { SqliteClient } = yield* Effect.promise(() => import("@effect/sql-sqlite-bun"))
diff --git a/repos/effect/packages/sql/sqlite-do/CHANGELOG.md b/repos/effect/packages/sql/sqlite-do/CHANGELOG.md
index 3e1abd0ed..2f755841e 100644
--- a/repos/effect/packages/sql/sqlite-do/CHANGELOG.md
+++ b/repos/effect/packages/sql/sqlite-do/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @effect/sql-sqlite-do
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- [#8267](https://github.com/Effect-TS/effect/pull/8267) [`072e35a`](https://github.com/Effect-TS/effect/commit/072e35ae83c6fe5f41c9f01798e2582295d02434) Thanks @tim-smart! - Support nested transactions with independent child rollback.
+
+- [#8291](https://github.com/Effect-TS/effect/pull/8291) [`9a81b9b`](https://github.com/Effect-TS/effect/commit/9a81b9b4a6725d81b962a656e0d53581a774fd1f) Thanks @tim-smart! - Prevent automatic scheduler yields inside storage-backed transactions to avoid Durable Object input-gate deadlocks when another fiber is queued. Explicit asynchronous operations inside transactions remain unsupported.
+
+- [#8257](https://github.com/Effect-TS/effect/pull/8257) [`a7a7192`](https://github.com/Effect-TS/effect/commit/a7a71921dee10f96e0d617e5895c6445e02a7d56) Thanks @danieljvdm! - Propagate native Durable Object transaction completion failures as `SqlError`.
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7732](https://github.com/Effect-TS/effect/pull/7732) [`412bc40`](https://github.com/Effect-TS/effect/commit/412bc408a11731b5326cfba7a8b2ead81c1431f2) Thanks @kitlangton! - Report synchronous Durable Object SQL streaming failures as recoverable `SqlError` values.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/sql/sqlite-do/package.json b/repos/effect/packages/sql/sqlite-do/package.json
index 6a851eb9a..fbf53bf1f 100644
--- a/repos/effect/packages/sql/sqlite-do/package.json
+++ b/repos/effect/packages/sql/sqlite-do/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/sql-sqlite-do",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "A SQLite toolkit for Effect",
@@ -61,8 +61,10 @@
     "check": "tsc -b tsconfig.json"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^5.20260829.1",
-    "effect": "workspace:^"
+    "@cloudflare/workers-types": "^5.20260919.1",
+    "effect": "workspace:^",
+    "esbuild": "^0.28.2",
+    "miniflare": "5.20260918.0-alpha"
   },
   "peerDependencies": {
     "effect": "workspace:^"
diff --git a/repos/effect/packages/sql/sqlite-do/src/SqliteClient.ts b/repos/effect/packages/sql/sqlite-do/src/SqliteClient.ts
index 7a4c1a253..5fda2e9c5 100644
--- a/repos/effect/packages/sql/sqlite-do/src/SqliteClient.ts
+++ b/repos/effect/packages/sql/sqlite-do/src/SqliteClient.ts
@@ -1,26 +1,23 @@
 /**
  * Connects Effect SQL to SQLite storage inside Cloudflare Durable Objects.
  *
- * This module adapts a Durable Object `SqlStorage` handle into both the
- * Durable Object-specific `SqliteClient` service and the generic Effect
- * `SqlClient` service. Use it from inside a Durable Object to run local
- * per-object queries, repositories, migrations, transactional read/write
- * workflows, and tests that exercise Cloudflare's SQLite-backed storage API.
+ * Provides `SqliteClient` and the generic `SqlClient` service. Pass `db` for
+ * queries only, or `storage` for transactions and migrations. SQLite blobs are
+ * returned as `Uint8Array`; `updateValues` is unsupported.
  *
- * Durable Object SQLite storage is scoped to one object id, so each object
- * instance has its own database. Callers can pass the `SqlStorage` handle for
- * normal queries, or the full `DurableObjectStorage` when `withTransaction` or
- * migrations need Cloudflare-managed transactions. This adapter serializes
- * Effect SQL access through one connection; a transaction holds that permit for
- * the lifetime of its scope, so keep transactions short, avoid suspending them
- * across unrelated work, and use them when multi-statement writes must commit
- * atomically. `SqlStorage.exec` returns `ArrayBuffer` values
- * for SQLite blobs, which this client normalizes to `Uint8Array`, and SQLite
- * does not support `updateValues`.
+ * The outer transaction holds the connection semaphore until storage completes.
+ * Nested `withTransaction` calls reuse that connection and call
+ * `storage.transaction()` without emitting transaction SQL. Child failures and
+ * interruptions roll back the child; uncaught failures also roll back the parent.
+ *
+ * Concurrent sibling transactions are unsupported. Fibers inheriting the
+ * transaction context must finish their transaction work before the enclosing
+ * transaction exits; later use can bypass the connection semaphore.
  *
  * @since 4.0.0
  */
 import type { DurableObjectStorage, SqlStorage } from "@cloudflare/workers-types"
+import * as Cause from "effect/Cause"
 import * as Config from "effect/Config"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
@@ -29,6 +26,7 @@ import * as Fiber from "effect/Fiber"
 import { identity } from "effect/Function"
 import * as Layer from "effect/Layer"
 import * as Rec from "effect/Record"
+import * as Scheduler from "effect/Scheduler"
 import * as Scope from "effect/Scope"
 import * as Semaphore from "effect/Semaphore"
 import * as Stream from "effect/Stream"
@@ -128,45 +126,54 @@ const makeStorageBackedWithTransaction = (
   Effect.withFiber((fiber) => {
     const services = fiber.context
     const connOption = Context.getOption(services, SqliteTransaction)
-    if (connOption._tag === "Some") {
+    if (connOption._tag === "Some" && connOption.value[0] !== connection) {
       return Effect.fail(
         unsupportedTransaction(
-          "Nested transactions are not supported by Cloudflare Durable Object SQLite storage",
+          "Transactions cannot use a connection from a different SQLite client",
           "transaction"
         )
       )
     }
+    const depth = connOption._tag === "Some" ? connOption.value[1] + 1 : 0
 
     const effectWithTxn = Effect.provideContext(
       effect,
-      Context.add(services, SqliteTransaction, [connection, 0] as const)
+      Context.add(services, SqliteTransaction, [connection, depth] as const)
     )
 
-    return semaphore.withPermits(1)(
-      Effect.callback((resume) => {
-        let interrupted = false
-        const promise = storage.transaction((txn) =>
-          new Promise<void>((resolve) => {
-            if (interrupted) return resolve()
-            resume(Effect.onExit(effectWithTxn, (exit) => {
-              if (Exit.isFailure(exit)) {
-                txn.rollback()
-              }
-              resolve()
-              // wait for the transaction to complete
-              return Effect.promise(() => promise)
-            }))
-          })
-        ).catch((cause) =>
-          resume(Effect.fail(new SqlError({ reason: classifyError(cause, "Failed transaction", "transaction") })))
-        )
-        return Effect.suspend(() => {
-          interrupted = true
-          return Effect.promise(() => promise)
+    const transaction = Effect.callback<A, E | SqlError, R>((resume) => {
+      let interrupted = false
+      const promise = storage.transaction((txn) =>
+        new Promise<void>((resolve) => {
+          if (interrupted) return resolve()
+          resume(Effect.onExit(effectWithTxn, (exit) => {
+            if (Exit.isFailure(exit)) {
+              txn.rollback()
+            }
+            // Throwing from a child callback can abort its parent.
+            resolve()
+            return Effect.flatten(Effect.promise(() => promise))
+          }))
         })
+      ).then(
+        () => Exit.void,
+        (cause) => {
+          const exit = Exit.fail(new SqlError({ reason: classifyError(cause, "Failed transaction", "transaction") }))
+          // Report rejection before the transaction callback starts; later resumes are ignored.
+          resume(exit)
+          return exit
+        }
+      )
+      return Effect.suspend(() => {
+        interrupted = true
+        return Effect.asVoid(Effect.promise(() => promise))
       })
-    )
-  })
+    })
+    return connOption._tag === "Some" ? transaction : semaphore.withPermits(1)(transaction)
+  }).pipe(
+    // The storage transaction closes the input gate, blocking dispatcher tasks until it completes.
+    Effect.provideService(Scheduler.PreventSchedulerYield, true)
+  )
 
 /**
  * Creates a scoped Cloudflare Durable Object SQLite client around Durable Object SQLite storage, serializing access and converting returned `ArrayBuffer` values to `Uint8Array`.
@@ -258,6 +265,12 @@ export const make = (
             const iterator = runIterator(sql, params)
             return Stream.fromIteratorSucceed(iterator, 128)
           }).pipe(
+            Stream.catchCauseFilter(Cause.findDefect, (defect) =>
+              Stream.fail(
+                new SqlError({
+                  reason: classifyError(defect, "Failed to execute statement", "execute")
+                })
+              )),
             transformRows
               ? Stream.mapArray((chunk) => transformRows(chunk) as any)
               : identity
diff --git a/repos/effect/packages/sql/sqlite-do/test/Client.test.ts b/repos/effect/packages/sql/sqlite-do/test/Client.test.ts
index c2cce8b88..bc66b7beb 100644
--- a/repos/effect/packages/sql/sqlite-do/test/Client.test.ts
+++ b/repos/effect/packages/sql/sqlite-do/test/Client.test.ts
@@ -1,7 +1,7 @@
 import type { DurableObjectStorage, SqlStorage } from "@cloudflare/workers-types"
 import { SqliteClient, SqliteMigrator } from "@effect/sql-sqlite-do"
 import { assert, describe, it } from "@effect/vitest"
-import { Deferred, Effect, Fiber } from "effect"
+import { Deferred, Effect, Exit, Fiber, Stream } from "effect"
 import * as Reactivity from "effect/unstable/reactivity/Reactivity"
 import * as SqlClient from "effect/unstable/sql/SqlClient"
 
@@ -121,10 +121,12 @@ class FakeDurableObjectStorage {
   readonly sql = new FakeSqlStorage()
   transactionCalls = 0
   rollbackCalls = 0
+  readonly snapshots: Array<ReturnType<FakeSqlStorage["snapshot"]>> = []
 
   transaction<T>(body: (txn: { rollback: () => void }) => Promise<T>): Promise<T> {
     this.transactionCalls++
     const snapshot = this.sql.snapshot()
+    this.snapshots.push(snapshot)
     let rolledBack = false
     const txn = {
       rollback: () => {
@@ -143,7 +145,9 @@ class FakeDurableObjectStorage {
         this.sql.restore(snapshot)
         throw error
       }
-    )
+    ).finally(() => {
+      assert.strictEqual(this.snapshots.pop(), snapshot)
+    })
   }
 }
 
@@ -192,6 +196,22 @@ describe("Client", () => {
       assert.strictEqual(error.reason._tag, "UnknownError")
     }))
 
+  it.effect("classifies streaming native errors without stable sqlite codes as UnknownError", () =>
+    Effect.gen(function*() {
+      const driverError = new Error("boom")
+      const failingDb = {
+        exec: () => {
+          throw driverError
+        }
+      } as unknown as SqlStorage
+
+      const client = yield* makeClient({ db: failingDb })
+      const error = yield* client`SELECT 1`.stream.pipe(Stream.runCollect, Effect.flip)
+      assert.strictEqual(error._tag, "SqlError")
+      assert.strictEqual(error.reason._tag, "UnknownError")
+      assert.strictEqual(error.reason.cause, driverError)
+    }))
+
   it.effect("db-only clients support normal queries", () =>
     Effect.gen(function*() {
       const db = new FakeSqlStorage()
@@ -251,6 +271,51 @@ describe("Client", () => {
       assert.strictEqual(storage.rollbackCalls, 1)
     }))
 
+  it.effect("propagates native rejection after the body succeeds before releasing the connection", () =>
+    Effect.gen(function*() {
+      const storage = new FakeDurableObjectStorage()
+      const commitError = new Error("native completion failed")
+      const bodyCompleted = yield* Deferred.make<void>()
+      let complete!: () => void
+      const completion = new Promise<void>((resolve) => {
+        complete = resolve
+      })
+      const sql = yield* makeClient({
+        storage: {
+          sql: storage.sql,
+          transaction: <T>(body: (txn: { rollback: () => void }) => Promise<T>) =>
+            storage.transaction(async (txn) => {
+              await body(txn)
+              Deferred.doneUnsafe(bodyCompleted, Effect.void)
+              await completion
+              throw commitError
+            })
+        } as unknown as DurableObjectStorage
+      })
+
+      yield* sql`CREATE TABLE test (id INTEGER PRIMARY KEY, name TEXT)`
+      const transaction = yield* sql`INSERT INTO test (name) VALUES ('hello')`.pipe(
+        sql.withTransaction,
+        Effect.flip,
+        Effect.forkChild
+      )
+      yield* Deferred.await(bodyCompleted)
+      const query = yield* sql`SELECT * FROM test`.pipe(Effect.forkChild({ startImmediately: true }))
+      const transactionBeforeCompletion = transaction.pollUnsafe()
+      const queryBeforeCompletion = query.pollUnsafe()
+      complete()
+
+      const error = yield* Fiber.join(transaction)
+      const rows = yield* Fiber.join(query)
+      assert.isUndefined(transactionBeforeCompletion)
+      assert.isUndefined(queryBeforeCompletion)
+      assert.strictEqual(error._tag, "SqlError")
+      assert.strictEqual(error.reason.cause, commitError)
+      assert.strictEqual(storage.rollbackCalls, 0)
+      assert.strictEqual(storage.transactionCalls, 1)
+      assert.deepStrictEqual(rows, [])
+    }))
+
   it.effect("storage-backed interrupted transactions roll back before release", () =>
     Effect.gen(function*() {
       const storage = new FakeDurableObjectStorage()
@@ -272,24 +337,138 @@ describe("Client", () => {
       assert.strictEqual(storage.rollbackCalls, 1)
     }))
 
-  it.effect("nested transactions fail clearly without savepoint SQL", () =>
+  it.effect("nested transactions commit inner and outer writes without transaction SQL", () =>
     Effect.gen(function*() {
       const storage = new FakeDurableObjectStorage()
       const sql = yield* makeClient({ storage: storage as unknown as DurableObjectStorage })
 
       yield* sql`CREATE TABLE test (id INTEGER PRIMARY KEY, name TEXT)`
-      const error = yield* sql.withTransaction(
+      yield* sql.withTransaction(
         Effect.gen(function*() {
           yield* sql`INSERT INTO test (name) VALUES ('outer')`
           yield* sql.withTransaction(sql`INSERT INTO test (name) VALUES ('inner')`)
+          yield* sql`INSERT INTO test (name) VALUES ('after')`
         })
-      ).pipe(Effect.flip)
+      )
       const rows = yield* sql`SELECT * FROM test`
 
+      assert.deepStrictEqual(rows, [
+        { id: 1, name: "outer" },
+        { id: 2, name: "inner" },
+        { id: 3, name: "after" }
+      ])
+      assert.strictEqual(storage.transactionCalls, 2)
+      assert.strictEqual(storage.rollbackCalls, 0)
+      assert.deepStrictEqual(storage.snapshots, [])
+      assert.strictEqual(hasForbiddenTransactionSql(storage.sql), false)
+    }))
+
+  it.effect("cross-client nested transactions fail before opening storage or running the body", () =>
+    Effect.gen(function*() {
+      const storageA = new FakeDurableObjectStorage()
+      const storageB = new FakeDurableObjectStorage()
+      const sqlA = yield* makeClient({ storage: storageA as unknown as DurableObjectStorage })
+      const sqlB = yield* makeClient({ storage: storageB as unknown as DurableObjectStorage })
+      let bodyRan = false
+
+      const exit = yield* sqlA.withTransaction(
+        sqlB.withTransaction(Effect.sync(() => {
+          bodyRan = true
+        }))
+      ).pipe(Effect.exit)
+
+      assert.strictEqual(storageA.transactionCalls, 1)
+      assert.strictEqual(storageB.transactionCalls, 0)
+      assert.strictEqual(bodyRan, false)
+      const error = yield* Effect.flip(exit)
       assert.strictEqual(error.reason._tag, "UnknownError")
-      assert.match(error.message, /Nested transactions are not supported/)
+      assert.match(error.message, /Transactions cannot use a connection from a different SQLite client/)
+    }))
+
+  it.effect("caught nested failure rolls back only inner writes and lets the outer transaction commit", () =>
+    Effect.gen(function*() {
+      const storage = new FakeDurableObjectStorage()
+      const sql = yield* makeClient({ storage: storage as unknown as DurableObjectStorage })
+
+      yield* sql`CREATE TABLE test (id INTEGER PRIMARY KEY, name TEXT)`
+      yield* sql.withTransaction(
+        Effect.gen(function*() {
+          yield* sql`INSERT INTO test (name) VALUES ('outer')`
+          const error = yield* sql`INSERT INTO test (name) VALUES ('inner')`.pipe(
+            Effect.andThen(Effect.fail("inner failure")),
+            sql.withTransaction,
+            Effect.flip
+          )
+          assert.strictEqual(error, "inner failure")
+          assert.deepStrictEqual(yield* sql`SELECT * FROM test`, [{ id: 1, name: "outer" }])
+          yield* sql`INSERT INTO test (name) VALUES ('after')`
+        })
+      )
+      const rows = yield* sql`SELECT * FROM test`
+
+      assert.deepStrictEqual(rows, [{ id: 1, name: "outer" }, { id: 2, name: "after" }])
+      assert.strictEqual(storage.transactionCalls, 2)
+      assert.strictEqual(storage.rollbackCalls, 1)
+      assert.deepStrictEqual(storage.snapshots, [])
+      assert.strictEqual(hasForbiddenTransactionSql(storage.sql), false)
+    }))
+
+  it.effect("uncaught nested failure rolls back the whole transaction", () =>
+    Effect.gen(function*() {
+      const storage = new FakeDurableObjectStorage()
+      const sql = yield* makeClient({ storage: storage as unknown as DurableObjectStorage })
+
+      yield* sql`CREATE TABLE test (id INTEGER PRIMARY KEY, name TEXT)`
+      const error = yield* sql.withTransaction(
+        Effect.gen(function*() {
+          yield* sql`INSERT INTO test (name) VALUES ('outer')`
+          return yield* sql`INSERT INTO test (name) VALUES ('inner')`.pipe(
+            Effect.andThen(Effect.fail("inner failure")),
+            sql.withTransaction
+          )
+        })
+      ).pipe(Effect.flip)
+      const rows = yield* sql`SELECT * FROM test`
+
+      assert.strictEqual(error, "inner failure")
       assert.deepStrictEqual(rows, [])
+      assert.strictEqual(storage.transactionCalls, 2)
+      assert.strictEqual(storage.rollbackCalls, 2)
+      assert.deepStrictEqual(storage.snapshots, [])
+      assert.strictEqual(hasForbiddenTransactionSql(storage.sql), false)
+    }))
+
+  it.effect("interrupted nested transactions roll back only the child before the outer transaction continues", () =>
+    Effect.gen(function*() {
+      const storage = new FakeDurableObjectStorage()
+      const sql = yield* makeClient({ storage: storage as unknown as DurableObjectStorage })
+      const inserted = yield* Deferred.make<void>()
+
+      yield* sql`CREATE TABLE test (id INTEGER PRIMARY KEY, name TEXT)`
+      yield* sql.withTransaction(
+        Effect.gen(function*() {
+          yield* sql`INSERT INTO test (name) VALUES ('outer')`
+          const fiber = yield* sql`INSERT INTO test (name) VALUES ('inner')`.pipe(
+            Effect.tap(() => Deferred.succeed(inserted, void 0)),
+            Effect.andThen(Effect.never),
+            sql.withTransaction,
+            Effect.forkChild
+          )
+          // Surface an early transaction failure rather than waiting for an insert that never happens.
+          yield* Effect.raceFirst(Deferred.await(inserted), Fiber.join(fiber))
+          yield* Fiber.interrupt(fiber)
+          assert.isTrue(Exit.hasInterrupts(yield* Fiber.await(fiber)))
+          assert.strictEqual(storage.rollbackCalls, 1)
+          assert.deepStrictEqual(yield* sql`SELECT * FROM test`, [{ id: 1, name: "outer" }])
+          yield* sql`INSERT INTO test (name) VALUES ('after')`
+        })
+      )
+      const rows = yield* sql`SELECT * FROM test`
+
+      assert.deepStrictEqual(rows, [{ id: 1, name: "outer" }, { id: 2, name: "after" }])
+      assert.strictEqual(storage.transactionCalls, 2)
       assert.strictEqual(storage.rollbackCalls, 1)
+      assert.deepStrictEqual(storage.snapshots, [])
       assert.strictEqual(hasForbiddenTransactionSql(storage.sql), false)
     }))
 
diff --git a/repos/effect/packages/sql/sqlite-do/test/Miniflare.test.ts b/repos/effect/packages/sql/sqlite-do/test/Miniflare.test.ts
new file mode 100644
index 000000000..1e189724c
--- /dev/null
+++ b/repos/effect/packages/sql/sqlite-do/test/Miniflare.test.ts
@@ -0,0 +1,66 @@
+import { assert, describe, it } from "@effect/vitest"
+import { Effect } from "effect"
+import * as esbuild from "esbuild"
+import { Miniflare } from "miniflare"
+import { fileURLToPath } from "node:url"
+
+const workerPath = fileURLToPath(new URL("./fixtures/transaction.ts", import.meta.url))
+
+describe("storage transaction scheduling", () => {
+  it.live.each([
+    { mode: "commit", success: true, count: 64 },
+    { mode: "nested", success: true, count: 64 },
+    { mode: "rollback", success: false, count: 0 }
+  ])(
+    "$mode completes after automatic yields with an outside fiber queued",
+    ({ count, mode, success }) =>
+      Effect.gen(function*() {
+        const bundle = yield* Effect.promise(() =>
+          esbuild.build({
+            entryPoints: [workerPath],
+            bundle: true,
+            format: "esm",
+            platform: "browser",
+            target: "es2022",
+            conditions: ["workerd", "worker", "browser"],
+            write: false
+          })
+        )
+        const miniflare = yield* Effect.acquireRelease(
+          Effect.sync(() =>
+            new Miniflare({
+              workers: [{
+                config: {
+                  name: "test",
+                  type: "worker",
+                  compatibilityDate: "2026-09-11",
+                  compatibilityFlags: ["nodejs_compat"],
+                  manifest: {
+                    mainModule: "index.mjs",
+                    modules: {
+                      "index.mjs": { type: "esm", contents: bundle.outputFiles[0].text }
+                    }
+                  },
+                  exports: {
+                    TransactionObject: { type: "durable-object", storage: "sqlite" }
+                  },
+                  env: {
+                    TEST: { type: "durable-object", worker: "test", exportName: "TransactionObject" }
+                  }
+                }
+              }]
+            })
+          ),
+          (miniflare) => Effect.promise(() => miniflare.dispose())
+        )
+        const response = yield* Effect.promise(() => miniflare.dispatchFetch(`http://localhost/${mode}`))
+        assert.strictEqual(response.status, 200, yield* Effect.promise(() => response.clone().text()))
+        assert.deepStrictEqual(yield* Effect.promise(() => response.json()), {
+          success,
+          outsideRows: [{ n: count }],
+          rows: [{ n: count }]
+        })
+      }),
+    { timeout: 40_000 }
+  )
+})
diff --git a/repos/effect/packages/sql/sqlite-do/test/fixtures/transaction.ts b/repos/effect/packages/sql/sqlite-do/test/fixtures/transaction.ts
new file mode 100644
index 000000000..c3a2dd2a7
--- /dev/null
+++ b/repos/effect/packages/sql/sqlite-do/test/fixtures/transaction.ts
@@ -0,0 +1,40 @@
+import type { DurableObjectNamespace, DurableObjectState } from "@cloudflare/workers-types"
+import * as SqliteClient from "@effect/sql-sqlite-do/SqliteClient"
+import { Effect, Exit, Fiber, Scheduler } from "effect"
+import * as SqlClient from "effect/unstable/sql/SqlClient"
+
+export class TransactionObject {
+  constructor(private readonly state: DurableObjectState) {}
+
+  async fetch(request: Request) {
+    const mode = new URL(request.url).pathname
+    const program = Effect.gen(function*() {
+      const sql = yield* SqlClient.SqlClient
+      yield* sql`CREATE TABLE writes (id INTEGER PRIMARY KEY)`
+      // Queue an outside timer before the transaction closes the input gate.
+      const outside = yield* Effect.forkScoped(sql`SELECT count(*) AS n FROM writes`)
+      // Exhaust the operation budget using synchronous SQL, not explicit yieldNow.
+      const writes = Effect.forEach(
+        Array.from({ length: 64 }, (_, id) => id),
+        (id) => sql`INSERT INTO writes VALUES (${id})`,
+        { discard: true }
+      ).pipe(Effect.provideService(Scheduler.MaxOpsBeforeYield, 32))
+      const body = mode === "/nested"
+        ? sql.withTransaction(writes)
+        : mode === "/rollback"
+        ? Effect.andThen(writes, Effect.fail("rollback"))
+        : writes
+      const exit = yield* Effect.exit(sql.withTransaction(body))
+      const outsideRows = yield* Fiber.join(outside)
+      const rows = yield* sql`SELECT count(*) AS n FROM writes`
+      return { success: Exit.isSuccess(exit), outsideRows, rows }
+    }).pipe(Effect.scoped, Effect.provide(SqliteClient.layer({ storage: this.state.storage })))
+    return Response.json(await Effect.runPromise(program))
+  }
+}
+
+export default {
+  fetch(request: Request, env: { TEST: DurableObjectNamespace }) {
+    return env.TEST.get(env.TEST.idFromName(new URL(request.url).pathname)).fetch(request.url)
+  }
+}
diff --git a/repos/effect/packages/sql/sqlite-node/CHANGELOG.md b/repos/effect/packages/sql/sqlite-node/CHANGELOG.md
index e284bfe54..dd6b62c1b 100644
--- a/repos/effect/packages/sql/sqlite-node/CHANGELOG.md
+++ b/repos/effect/packages/sql/sqlite-node/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @effect/sql-sqlite-node
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- [#8308](https://github.com/Effect-TS/effect/pull/8308) [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca) Thanks @tristanz! - Release savepoints after nested transactions succeed or successfully roll back in PostgreSQL, PGlite, MySQL, libSQL, and the Node, Bun, React Native, and WASM SQLite clients. This frees PostgreSQL transaction locks before the outer transaction completes.
+  
+  Custom SQL clients can opt in through the new `releaseSavepoint` option. Clients that omit it are unchanged.
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7484](https://github.com/Effect-TS/effect/pull/7484) [`5612962`](https://github.com/Effect-TS/effect/commit/561296283c5359f91d37335df2667eb5310dd384) Thanks @Kashkovsky! - Allow read-only SQLite clients to use `withTransaction` when `PRAGMA query_only` is enabled. Writable clients continue
+  to reserve the writer lock when a transaction starts.
+
+- [#7722](https://github.com/Effect-TS/effect/pull/7722) [`4daa260`](https://github.com/Effect-TS/effect/commit/4daa26052632b448b71457e476de49aabce8940d) Thanks @kitlangton! - Capture unprepared statement preparation failures as typed `SqlError`s.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/sql/sqlite-node/package.json b/repos/effect/packages/sql/sqlite-node/package.json
index 694606e33..c409275fd 100644
--- a/repos/effect/packages/sql/sqlite-node/package.json
+++ b/repos/effect/packages/sql/sqlite-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/sql-sqlite-node",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "A SQLite toolkit for Effect",
@@ -62,7 +62,7 @@
   },
   "devDependencies": {
     "@effect/platform-node": "workspace:^",
-    "@types/node": "^26.4.0",
+    "@types/node": "^26.6.2",
     "effect": "workspace:^"
   },
   "peerDependencies": {
diff --git a/repos/effect/packages/sql/sqlite-node/src/SqliteClient.ts b/repos/effect/packages/sql/sqlite-node/src/SqliteClient.ts
index eaa327147..7d49914a9 100644
--- a/repos/effect/packages/sql/sqlite-node/src/SqliteClient.ts
+++ b/repos/effect/packages/sql/sqlite-node/src/SqliteClient.ts
@@ -151,14 +151,16 @@ export const make = (
         db.exec("PRAGMA journal_mode = WAL")
       }
 
+      const prepare = (sql: string) =>
+        Effect.try({
+          try: () => db.prepare(sql),
+          catch: (cause) => new SqlError({ reason: classifyError(cause, "Failed to prepare statement", "prepare") })
+        })
+
       const prepareCache = yield* Cache.make({
         capacity: options.prepareCacheSize ?? 200,
         timeToLive: options.prepareCacheTTL ?? Duration.minutes(10),
-        lookup: (sql: string) =>
-          Effect.try({
-            try: () => db.prepare(sql),
-            catch: (cause) => new SqlError({ reason: classifyError(cause, "Failed to prepare statement", "prepare") })
-          })
+        lookup: prepare
       })
 
       const runStatement = (
@@ -246,7 +248,7 @@ export const make = (
       const runValuesUnprepared = (
         sql: string,
         params: ReadonlyArray<unknown>
-      ) => runStatementValuesUnprepared(db.prepare(sql), params)
+      ) => Effect.flatMap(prepare(sql), (statement) => runStatementValuesUnprepared(statement, params))
 
       return identity<SqliteConnection>({
         execute(sql, params, transformRows) {
@@ -264,7 +266,7 @@ export const make = (
           return runValuesUnprepared(sql, params)
         },
         executeUnprepared(sql, params, transformRows) {
-          const effect = runStatement(db.prepare(sql), params ?? [], false)
+          const effect = Effect.flatMap(prepare(sql), (statement) => runStatement(statement, params ?? [], false))
           return transformRows ? Effect.map(effect, transformRows) : effect
         },
         executeStream(_sql, _params) {
@@ -320,6 +322,7 @@ export const make = (
         acquirer,
         compiler,
         transactionAcquirer,
+        releaseSavepoint: (name) => `RELEASE SAVEPOINT ${name}`,
         beginTransaction: options.readonly === true ? "BEGIN" : "BEGIN IMMEDIATE",
         spanAttributes: [
           ...(options.spanAttributes ? Object.entries(options.spanAttributes) : []),
diff --git a/repos/effect/packages/sql/sqlite-node/test/Client.test.ts b/repos/effect/packages/sql/sqlite-node/test/Client.test.ts
index 94a21405a..70f6754bb 100644
--- a/repos/effect/packages/sql/sqlite-node/test/Client.test.ts
+++ b/repos/effect/packages/sql/sqlite-node/test/Client.test.ts
@@ -23,6 +23,31 @@ const makeClients = Effect.gen(function*() {
 }).pipe(Effect.provide([NodeFileSystem.layer, Reactivity.layer]))
 
 describe("Client", () => {
+  it.effect("releases completed nested savepoints", () =>
+    Effect.gen(function*() {
+      const sql = yield* makeClient
+      yield* sql`CREATE TABLE savepoint_release (value INTEGER)`
+      yield* sql.withTransaction(Effect.gen(function*() {
+        for (const rollback of [false, true]) {
+          yield* sql.withTransaction(
+            sql`INSERT INTO savepoint_release VALUES (1)`.pipe(
+              Effect.andThen(rollback ? Effect.fail("rollback") : Effect.void)
+            )
+          ).pipe(Effect.ignore)
+          const error = yield* sql`RELEASE SAVEPOINT effect_sql_1`.unprepared.pipe(Effect.flip)
+          assert.strictEqual(error._tag, "SqlError")
+        }
+      }))
+      assert.deepStrictEqual(yield* sql`SELECT value FROM savepoint_release`, [{ value: 1 }])
+      const error = yield* sql.withTransaction(
+        sql.withTransaction(sql`INSERT INTO savepoint_release VALUES (2)`).pipe(
+          Effect.andThen(Effect.fail("outer rollback"))
+        )
+      ).pipe(Effect.flip)
+      assert.strictEqual(error, "outer rollback")
+      assert.deepStrictEqual(yield* sql`SELECT value FROM savepoint_release`, [{ value: 1 }])
+    }))
+
   it.effect("should work", () =>
     Effect.gen(function*() {
       const sql = yield* makeClient
@@ -63,6 +88,22 @@ describe("Client", () => {
       ])
     }))
 
+  for (const mode of ["unprepared", "valuesUnprepared"] as const) {
+    it.effect(`captures ${mode} preparation errors`, () =>
+      Effect.gen(function*() {
+        const sql = yield* makeClient
+        yield* sql`CREATE TABLE test (id INTEGER PRIMARY KEY)`
+
+        const statement = sql`CREATE TABLE test (id INTEGER PRIMARY KEY)`
+        const execution = mode === "unprepared"
+          ? Effect.as(statement.unprepared, false)
+          : Effect.as(statement.valuesUnprepared, false)
+        const recovered = yield* execution.pipe(Effect.catchTag("SqlError", () => Effect.succeed(true)))
+
+        assert.isTrue(recovered)
+      }))
+  }
+
   it.effect("withTransaction", () =>
     Effect.gen(function*() {
       const sql = yield* makeClient
diff --git a/repos/effect/packages/sql/sqlite-node/test/Persistence.test.ts b/repos/effect/packages/sql/sqlite-node/test/Persistence.test.ts
index 76b5ab3c9..f0667478b 100644
--- a/repos/effect/packages/sql/sqlite-node/test/Persistence.test.ts
+++ b/repos/effect/packages/sql/sqlite-node/test/Persistence.test.ts
@@ -23,7 +23,18 @@ const ClientLayer = Effect.gen(function*() {
 const testLayer = (layer: Layer.Layer<Persistence.BackingPersistence, never, SqlClient.SqlClient>) =>
   layer.pipe(Layer.provideMerge(ClientLayer))
 
-const suite = (name: string, layer: Layer.Layer<Persistence.BackingPersistence, never, SqlClient.SqlClient>) =>
+const suite = (
+  name: string,
+  layer: Layer.Layer<Persistence.BackingPersistence, never, SqlClient.SqlClient>,
+  options: {
+    /**
+     * A crafted `getMany` key which, if request keys are interpolated into SQL
+     * without parameterization, escapes the `IN` list and
+     * reads the `sqli_victim` store's entries from the `sqli_attacker` store.
+     */
+    readonly injectionProbe: string
+  }
+) =>
   it.layer(testLayer(layer))(`Persistence (${name})`, (it) => {
     it.effect("set + get", () =>
       Effect.gen(function*() {
@@ -114,10 +125,49 @@ const suite = (name: string, layer: Layer.Layer<Persistence.BackingPersistence,
         expect(yield* storeA.get("shared-key")).toEqual(undefined)
         expect(yield* storeB.get("shared-key")).toEqual({ name: "Bob" })
       }))
+
+    it.effect("getMany treats keys containing single quotes as data", () =>
+      Effect.gen(function*() {
+        const persistence = yield* Persistence.BackingPersistence
+        const store = yield* persistence.make("test_store_quotes")
+        yield* store.set("it's-a-key", { name: "Alice" }, undefined)
+
+        // Keys must be bound as parameters, not
+        // interpolated into the `IN` list as raw string literals.
+        const values = yield* store.getMany(["it's-a-key", "missing'key"])
+        expect(values).toEqual([{ name: "Alice" }, undefined])
+      }))
+
+    it.effect("getMany preserves store isolation for crafted keys", () =>
+      Effect.gen(function*() {
+        const persistence = yield* Persistence.BackingPersistence
+        const victim = yield* persistence.make("sqli_victim")
+        yield* victim.set("secret", { secret: "victim-data" }, undefined)
+
+        const attacker = yield* persistence.make("sqli_attacker")
+        yield* attacker.set("innocent", { name: "Mallory" }, undefined)
+
+        // The probe is a no-op key when keys are parameterized. If keys are
+        // interpolated into raw SQL it escapes the `IN` list and exfiltrates
+        // the victim store's `secret` entry into the attacker's results.
+        const values = yield* attacker.getMany(["secret", options.injectionProbe])
+        expect(values).toEqual([undefined, undefined])
+        expect(yield* attacker.get("secret")).toEqual(undefined)
+      }))
   })
 
-suite("table-per-store", Persistence.layerBackingSqlMultiTable)
-suite("single-table", Persistence.layerBackingSql)
+suite("table-per-store", Persistence.layerBackingSqlMultiTable, {
+  // Expands to `... WHERE id IN ('secret', '') UNION SELECT id, value FROM
+  // effect_persistence_sqli_victim WHERE ('1'='1') AND (expires IS NULL OR
+  // expires > ?)`, appending every victim row to the attacker's result set.
+  injectionProbe: `') UNION SELECT id, value FROM effect_persistence_sqli_victim WHERE ('1'='1`
+})
+suite("single-table", Persistence.layerBackingSql, {
+  // Expands to `... WHERE store_id = 'sqli_attacker' AND id IN ('secret', '')
+  // OR store_id='sqli_victim' AND ('1'='1') AND (expires IS NULL OR expires >
+  // ?)`, bypassing the store isolation filter.
+  injectionProbe: `') OR store_id='sqli_victim' AND ('1'='1`
+})
 
 PersistedQueueTest.suite(
   "sql-sqlite-node",
diff --git a/repos/effect/packages/sql/sqlite-node/test/SqlEventJournal.test.ts b/repos/effect/packages/sql/sqlite-node/test/SqlEventJournal.test.ts
index c082b6195..a19701774 100644
--- a/repos/effect/packages/sql/sqlite-node/test/SqlEventJournal.test.ts
+++ b/repos/effect/packages/sql/sqlite-node/test/SqlEventJournal.test.ts
@@ -14,6 +14,35 @@ const makeJournal = Effect.gen(function*() {
 }).pipe(Effect.provide(Reactivity.layer))
 
 describe("SqlEventJournal", () => {
+  it.effect("preserves write callback error identity", () =>
+    Effect.gen(function*() {
+      const journal = yield* makeJournal
+      const error = new Error("callback failed")
+      const actual = yield* Effect.flip(journal.write({
+        event: "Repro",
+        primaryKey: "key",
+        payload: new Uint8Array([1]),
+        effect: () => Effect.fail(error)
+      }))
+      assert.strictEqual(actual, error)
+    }))
+
+  it.effect("preserves remote callback error identity", () =>
+    Effect.gen(function*() {
+      const journal = yield* makeJournal
+      yield* journal.write({
+        event: "Repro",
+        primaryKey: "key",
+        payload: new Uint8Array([1]),
+        effect: () => Effect.void
+      })
+      const error = new Error("callback failed")
+      const actual = yield* Effect.flip(
+        journal.withRemoteUncommited(EventJournal.makeRemoteIdUnsafe(), () => Effect.fail(error))
+      )
+      assert.strictEqual(actual, error)
+    }))
+
   it.effect("commits only after the write callback succeeds", () =>
     Effect.gen(function*() {
       const sql = yield* SqliteClient.make({ filename: ":memory:" })
diff --git a/repos/effect/packages/sql/sqlite-node/test/SqlModelServices.test.ts b/repos/effect/packages/sql/sqlite-node/test/SqlModelServices.test.ts
new file mode 100644
index 000000000..1a525c648
--- /dev/null
+++ b/repos/effect/packages/sql/sqlite-node/test/SqlModelServices.test.ts
@@ -0,0 +1,106 @@
+import { SqliteClient } from "@effect/sql-sqlite-node"
+import { assert, describe, it } from "@effect/vitest"
+import { Context, Effect, Schema, SchemaGetter } from "effect"
+import { Model } from "effect/unstable/schema"
+import { SqlClient, SqlModel, SqlResolver } from "effect/unstable/sql"
+
+class NameDecoder extends Context.Service<NameDecoder, { readonly prefix: string }>()("test/NameDecoder") {}
+class NameEncoder extends Context.Service<NameEncoder, { readonly prefix: string }>()("test/NameEncoder") {}
+const decodedName = Schema.String.pipe(Schema.decodeTo(Schema.String, {
+  decode: SchemaGetter.transformEffect((value: string) => Effect.map(NameDecoder, ({ prefix }) => prefix + value)),
+  encode: SchemaGetter.passthrough()
+}))
+const encodedName = Schema.String.pipe(Schema.decodeTo(Schema.String, {
+  decode: SchemaGetter.passthrough(),
+  encode: SchemaGetter.transformEffect((value: string) => Effect.map(NameEncoder, ({ prefix }) => prefix + value))
+}))
+class User extends Model.Class<User>("User")({ id: Schema.Int, name: decodedName }) {}
+class Both extends Model.Class<Both>("Both")({
+  id: Schema.Int,
+  name: Model.Field({ select: decodedName, insert: encodedName, update: encodedName })
+}) {}
+class Plain extends Model.Class<Plain>("Plain")({ id: Schema.Int, name: Schema.String }) {}
+const options = { tableName: "users", idColumn: "id", spanPrefix: "User" } as const
+const database = SqliteClient.layer({ filename: ":memory:" })
+const createTable = Effect.gen(function*() {
+  const sql = yield* SqlClient.SqlClient
+  yield* sql`CREATE TABLE users (id INTEGER PRIMARY KEY, name TEXT NOT NULL)`
+  return sql
+})
+
+describe("SqlModel insert native node:sqlite runtime controls", () => {
+  it.effect("decoder is supplied at request execution, not resolver construction", () =>
+    Effect.gen(function*() {
+      assert.strictEqual(process.versions.bun, undefined)
+      assert.isString(process.versions.sqlite)
+      const sql = yield* createTable
+      const resolvers = yield* SqlModel.makeResolvers(User, options)
+      const result = yield* SqlResolver.request({ id: 1, name: "Ada" }, resolvers.insert).pipe(
+        Effect.provideService(NameDecoder, { prefix: "read:" })
+      )
+      assert.instanceOf(result, User)
+      assert.strictEqual(result.name, "read:Ada")
+      assert.deepStrictEqual(yield* sql`SELECT * FROM users`, [{ id: 1, name: "Ada" }])
+      const found = yield* SqlResolver.request(1, resolvers.findById).pipe(
+        Effect.provideService(NameDecoder, { prefix: "find:" })
+      )
+      assert.strictEqual(found.name, "find:Ada")
+    }).pipe(Effect.provide(database)))
+
+  it.effect("distinct encoder and decoder execute in their own directions", () =>
+    Effect.gen(function*() {
+      const sql = yield* createTable
+      const resolvers = yield* SqlModel.makeResolvers(Both, options)
+      const result = yield* SqlResolver.request({ id: 2, name: "Ada" }, resolvers.insert).pipe(
+        Effect.provideService(NameEncoder, { prefix: "write:" }),
+        Effect.provideService(NameDecoder, { prefix: "read:" })
+      )
+      assert.instanceOf(result, Both)
+      assert.strictEqual(result.name, "read:write:Ada")
+      assert.deepStrictEqual(yield* sql`SELECT * FROM users`, [{ id: 2, name: "write:Ada" }])
+    }).pipe(Effect.provide(database)))
+
+  it.effect("plain model insert is unchanged", () =>
+    Effect.gen(function*() {
+      const sql = yield* createTable
+      const resolvers = yield* SqlModel.makeResolvers(Plain, options)
+      const result = yield* SqlResolver.request({ id: 3, name: "plain" }, resolvers.insert)
+      assert.instanceOf(result, Plain)
+      assert.strictEqual(result.name, "plain")
+      assert.deepStrictEqual(yield* sql`SELECT * FROM users`, [{ id: 3, name: "plain" }])
+    }).pipe(Effect.provide(database)))
+
+  it.effect("insertVoid does not execute the model decoder", () =>
+    Effect.gen(function*() {
+      const sql = yield* createTable
+      const resolvers = yield* SqlModel.makeResolvers(User, options)
+      yield* SqlResolver.request({ id: 4, name: "void" }, resolvers.insertVoid)
+      assert.deepStrictEqual(yield* sql`SELECT * FROM users`, [{ id: 4, name: "void" }])
+    }).pipe(Effect.provide(database)))
+
+  it.effect("SQL failures keep their typed SqlError", () =>
+    Effect.gen(function*() {
+      const sql = yield* createTable
+      yield* sql`INSERT INTO users VALUES (5, 'existing')`
+      const resolvers = yield* SqlModel.makeResolvers(User, options)
+      const error = yield* SqlResolver.request({ id: 5, name: "duplicate" }, resolvers.insert).pipe(
+        Effect.provideService(NameDecoder, { prefix: "read:" }),
+        Effect.flip
+      )
+      assert.strictEqual(error._tag, "SqlError")
+      assert.deepStrictEqual(yield* sql`SELECT * FROM users`, [{ id: 5, name: "existing" }])
+    }).pipe(Effect.provide(database)))
+
+  it.effect("a real returned-row schema failure keeps its typed SchemaError", () =>
+    Effect.gen(function*() {
+      const sql = yield* SqlClient.SqlClient
+      yield* sql`CREATE TABLE users (id TEXT PRIMARY KEY, name TEXT NOT NULL)`
+      const resolvers = yield* SqlModel.makeResolvers(User, options)
+      const error = yield* SqlResolver.request({ id: 6, name: "invalid row" }, resolvers.insert).pipe(
+        Effect.provideService(NameDecoder, { prefix: "read:" }),
+        Effect.flip
+      )
+      assert.strictEqual(error._tag, "SchemaError")
+      assert.deepStrictEqual(yield* sql`SELECT * FROM users`, [{ id: "6.0", name: "invalid row" }])
+    }).pipe(Effect.provide(database)))
+})
diff --git a/repos/effect/packages/sql/sqlite-react-native/CHANGELOG.md b/repos/effect/packages/sql/sqlite-react-native/CHANGELOG.md
index 974f0a5f5..1bf2df17f 100644
--- a/repos/effect/packages/sql/sqlite-react-native/CHANGELOG.md
+++ b/repos/effect/packages/sql/sqlite-react-native/CHANGELOG.md
@@ -1,5 +1,44 @@
 # @effect/sql-sqlite-react-native
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- [#8308](https://github.com/Effect-TS/effect/pull/8308) [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca) Thanks @tristanz! - Release savepoints after nested transactions succeed or successfully roll back in PostgreSQL, PGlite, MySQL, libSQL, and the Node, Bun, React Native, and WASM SQLite clients. This frees PostgreSQL transaction locks before the outer transaction completes.
+  
+  Custom SQL clients can opt in through the new `releaseSavepoint` option. Clients that omit it are unchanged.
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7469](https://github.com/Effect-TS/effect/pull/7469) [`3787c46`](https://github.com/Effect-TS/effect/commit/3787c46b19f76855433661c3a1a6a608edec6dd9) Thanks @gjermundgaraba! - Return selected rows from synchronous and asynchronous OP-SQLite value queries.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/sql/sqlite-react-native/package.json b/repos/effect/packages/sql/sqlite-react-native/package.json
index 348dd8a6d..adb1a021e 100644
--- a/repos/effect/packages/sql/sqlite-react-native/package.json
+++ b/repos/effect/packages/sql/sqlite-react-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/sql-sqlite-react-native",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "A SQLite toolkit for Effect",
@@ -61,7 +61,7 @@
     "check": "tsc -b tsconfig.json"
   },
   "devDependencies": {
-    "@op-engineering/op-sqlite": "^18.1.4",
+    "@op-engineering/op-sqlite": "^18.2.4",
     "effect": "workspace:^"
   },
   "peerDependencies": {
diff --git a/repos/effect/packages/sql/sqlite-react-native/src/SqliteClient.ts b/repos/effect/packages/sql/sqlite-react-native/src/SqliteClient.ts
index c7fe3a772..9f413b82e 100644
--- a/repos/effect/packages/sql/sqlite-react-native/src/SqliteClient.ts
+++ b/repos/effect/packages/sql/sqlite-react-native/src/SqliteClient.ts
@@ -240,6 +240,7 @@ export const make = (
         acquirer,
         compiler,
         transactionAcquirer,
+        releaseSavepoint: (name) => `RELEASE SAVEPOINT ${name}`,
         spanAttributes: [
           ...(options.spanAttributes ? Object.entries(options.spanAttributes) : []),
           [ATTR_DB_SYSTEM_NAME, "sqlite"]
diff --git a/repos/effect/packages/sql/sqlite-wasm/CHANGELOG.md b/repos/effect/packages/sql/sqlite-wasm/CHANGELOG.md
index d8f679730..b8d20998a 100644
--- a/repos/effect/packages/sql/sqlite-wasm/CHANGELOG.md
+++ b/repos/effect/packages/sql/sqlite-wasm/CHANGELOG.md
@@ -1,5 +1,48 @@
 # @effect/sql-sqlite-wasm
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- [#8308](https://github.com/Effect-TS/effect/pull/8308) [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca) Thanks @tristanz! - Release savepoints after nested transactions succeed or successfully roll back in PostgreSQL, PGlite, MySQL, libSQL, and the Node, Bun, React Native, and WASM SQLite clients. This frees PostgreSQL transaction locks before the outer transaction completes.
+  
+  Custom SQL clients can opt in through the new `releaseSavepoint` option. Clients that omit it are unchanged.
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7951](https://github.com/Effect-TS/effect/pull/7951) [`f4981cf`](https://github.com/Effect-TS/effect/commit/f4981cf9a5f68f283d40034bd221f38bdeab01c0) Thanks @kitlangton! - Start incoming MessagePort queues after registering the SQLite WASM client and OPFS worker listeners. Fresh ports, including a SharedWorker's client port, no longer require manual activation to receive ready messages and query replies or process worker requests.
+
+- [#7953](https://github.com/Effect-TS/effect/pull/7953) [`4b7e6c7`](https://github.com/Effect-TS/effect/commit/4b7e6c74d2177c55209ceb901e0ae8533267a527) Thanks @kitlangton! - Preserve statement-specific column names in SQLite WASM worker-backed query results.
+
+- [#7947](https://github.com/Effect-TS/effect/pull/7947) [`88593e4`](https://github.com/Effect-TS/effect/commit/88593e4abca7065512214a0affd15fa401b0d64e) Thanks @kitlangton! - Preserve native SQLite error codes in OPFS worker replies so the client can classify constraint failures as `ConstraintError` instead of `UnknownError`. For coded worker failures, `SqlError.reason.cause` now contains a `{ message, code }` record instead of a string.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/sql/sqlite-wasm/package.json b/repos/effect/packages/sql/sqlite-wasm/package.json
index 68a859829..db887cf85 100644
--- a/repos/effect/packages/sql/sqlite-wasm/package.json
+++ b/repos/effect/packages/sql/sqlite-wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/sql-sqlite-wasm",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "A SQLite toolkit for Effect",
diff --git a/repos/effect/packages/sql/sqlite-wasm/src/OpfsWorker.ts b/repos/effect/packages/sql/sqlite-wasm/src/OpfsWorker.ts
index 0e078ab6b..4546e217d 100644
--- a/repos/effect/packages/sql/sqlite-wasm/src/OpfsWorker.ts
+++ b/repos/effect/packages/sql/sqlite-wasm/src/OpfsWorker.ts
@@ -29,7 +29,7 @@ const classifyError = (cause: unknown, message: string, operation: string) =>
  * @since 4.0.0
  */
 export interface OpfsWorkerConfig {
-  readonly port: EventTarget & Pick<MessagePort, "postMessage" | "close">
+  readonly port: EventTarget & Pick<MessagePort, "postMessage" | "close"> & Partial<Pick<MessagePort, "start">>
   readonly dbName: string
 }
 
@@ -94,13 +94,15 @@ export const run = (
               const [id, sql, params] = message
               messageId = id
               const results: Array<any> = []
-              let columns: Array<string> | undefined
+              const columns: Array<Array<string>> = []
               for (const stmt of sqlite3.statements(db, sql)) {
+                let statementColumns: Array<string> | undefined
                 sqlite3.bind_collection(stmt, params as any)
                 while (sqlite3.step(stmt) === WaSqlite.SQLITE_ROW) {
-                  columns = columns ?? sqlite3.column_names(stmt)
+                  statementColumns = statementColumns ?? sqlite3.column_names(stmt)
                   const row = sqlite3.row(stmt)
                   results.push(row)
+                  columns.push(statementColumns)
                 }
               }
               options.port.postMessage([id, undefined, [columns, results]])
@@ -109,10 +111,12 @@ export const run = (
           }
         } catch (e: any) {
           const message = "message" in e ? e.message : String(e)
-          options.port.postMessage([messageId!, message, undefined])
+          const error = typeof e.code === "number" ? { message, code: e.code } : message
+          options.port.postMessage([messageId!, error, undefined])
         }
       }
       options.port.addEventListener("message", onMessage)
+      options.port.start?.()
       options.port.postMessage(["ready", undefined, undefined])
       return Effect.sync(() => {
         options.port.removeEventListener("message", onMessage)
diff --git a/repos/effect/packages/sql/sqlite-wasm/src/SqliteClient.ts b/repos/effect/packages/sql/sqlite-wasm/src/SqliteClient.ts
index 55fa88d06..c06e6a441 100644
--- a/repos/effect/packages/sql/sqlite-wasm/src/SqliteClient.ts
+++ b/repos/effect/packages/sql/sqlite-wasm/src/SqliteClient.ts
@@ -274,6 +274,7 @@ export const makeMemory = (
         acquirer,
         compiler,
         transactionAcquirer,
+        releaseSavepoint: (name) => `RELEASE SAVEPOINT ${name}`,
         spanAttributes: [
           ...(options.spanAttributes ? Object.entries(options.spanAttributes) : []),
           [ATTR_DB_SYSTEM_NAME, "sqlite"]
@@ -334,7 +335,7 @@ export const make = (
           if (error) {
             resume(
               Exit.fail(
-                new SqlError({ reason: classifyError(error as string, "Failed to execute statement", "execute") })
+                new SqlError({ reason: classifyError(error, "Failed to execute statement", "execute") })
               )
             )
           } else {
@@ -343,6 +344,9 @@ export const make = (
         }
       }
       port.addEventListener("message", onMessage)
+      if ("start" in port) {
+        port.start()
+      }
 
       function onError(cause: Event) {
         const exit = Exit.fail(
@@ -362,7 +366,7 @@ export const make = (
       yield* Scope.addFinalizer(
         scope,
         Effect.sync(() => {
-          worker.removeEventListener("message", onMessage)
+          port.removeEventListener("message", onMessage)
           worker.removeEventListener("error", onError)
         })
       )
@@ -384,7 +388,7 @@ export const make = (
         params: ReadonlyArray<unknown> = [],
         rowMode: "object" | "array" = "object"
       ): Effect.Effect<Array<any>, SqlError, never> => {
-        const rows = Effect.withFiber<[Array<string>, Array<any>], SqlError>((fiber) => {
+        const rows = Effect.withFiber<WorkerResult, SqlError>((fiber) => {
           const id = currentId++
           return send(id, [id, sql, params], fiber.getRef(Transferables))
         })
@@ -444,6 +448,7 @@ export const make = (
         acquirer,
         compiler,
         transactionAcquirer,
+        releaseSavepoint: (name) => `RELEASE SAVEPOINT ${name}`,
         spanAttributes: [
           ...(options.spanAttributes ? Object.entries(options.spanAttributes) : []),
           [ATTR_DB_SYSTEM_NAME, "sqlite"]
@@ -468,8 +473,10 @@ function rowToObject(columns: Array<string>, row: Array<any>) {
   }
   return obj
 }
-const extractObject = (rows: [Array<string>, Array<any>]) => rows[1].map((row) => rowToObject(rows[0], row))
-const extractRows = (rows: [Array<string>, Array<any>]) => rows[1]
+type WorkerResult = [columns: Array<Array<string>>, rows: Array<any>]
+
+const extractObject = (rows: WorkerResult) => rows[1].map((row, index) => rowToObject(rows[0][index], row))
+const extractRows = (rows: WorkerResult) => rows[1]
 
 /**
  * Fiber reference that stores transferables to include with worker-backed SQLite WASM query messages.
diff --git a/repos/effect/packages/sql/sqlite-wasm/test/Client.test.ts b/repos/effect/packages/sql/sqlite-wasm/test/Client.test.ts
index d126c9748..2a45b5ec0 100644
--- a/repos/effect/packages/sql/sqlite-wasm/test/Client.test.ts
+++ b/repos/effect/packages/sql/sqlite-wasm/test/Client.test.ts
@@ -17,9 +17,24 @@ vi.mock("@effect/wa-sqlite/src/examples/AccessHandlePoolVFS.js", () => ({
   }
 }))
 vi.mock("@effect/wa-sqlite", () => ({
+  SQLITE_ROW: 100,
   Factory: () => ({
+    bind_collection() {},
     close() {},
+    column_names: (statement: { readonly columns: ReadonlyArray<string> }) => statement.columns,
     open_v2: () => 1,
+    row: (statement: { readonly index: number; readonly rows: ReadonlyArray<ReadonlyArray<number>> }) =>
+      statement.rows[statement.index],
+    *statements(_db: number, sql: string) {
+      if (sql !== "SELECT 1 AS first; SELECT 2 AS second, 3 AS third") {
+        throw new Error(`Unexpected SQL: ${sql}`)
+      }
+      yield { columns: ["first"], index: -1, rows: [[1]] }
+      yield { columns: ["second", "third"], index: -1, rows: [[2, 3]] }
+    },
+    step(statement: { index: number; readonly rows: ReadonlyArray<ReadonlyArray<number>> }) {
+      return ++statement.index < statement.rows.length ? 100 : 101
+    },
     vfs_register() {}
   })
 }))
@@ -61,6 +76,34 @@ class FakeWorker extends EventTarget {
   }
 }
 
+// A MessagePort only delivers queued messages once `start()` is called.
+class GatedPort extends EventTarget {
+  private queued: Array<ReadonlyArray<unknown>> = []
+  private started = false
+
+  start(): void {
+    this.started = true
+    for (const data of this.queued.splice(0)) {
+      this.dispatchEvent(new MessageEvent("message", { data }))
+    }
+  }
+
+  deliver(data: ReadonlyArray<unknown>): void {
+    if (this.started) this.dispatchEvent(new MessageEvent("message", { data }))
+    else this.queued.push(data)
+  }
+
+  postMessage(): void {}
+  close(): void {}
+}
+
+const settled = <A, E>(effect: Effect.Effect<A, E>) =>
+  Effect.gen(function*() {
+    const fiber = yield* effect.pipe(Effect.exit, Effect.timeoutOption("100 millis"), Effect.forkChild)
+    yield* TestClock.adjust("100 millis")
+    return yield* Fiber.join(fiber)
+  })
+
 describe("Client", () => {
   it.effect("should work", () => Effect.void)
 
@@ -70,6 +113,18 @@ describe("Client", () => {
       assert.strictEqual(state.vfsCloseCalls, 1)
     }))
 
+  it.effect("keeps columns scoped to each statement", () =>
+    Effect.gen(function*() {
+      const channel = new MessageChannel()
+      yield* Effect.addFinalizer(() => Effect.sync(() => channel.port2.close()))
+      yield* Effect.forkChild(OpfsWorker.run({ port: channel.port1, dbName: "test.db" }))
+      const sql = yield* SqliteClient.make({ worker: Effect.succeed(channel.port2) })
+
+      const rows = yield* sql`SELECT 1 AS first; SELECT 2 AS second, 3 AS third`
+
+      assert.deepStrictEqual(rows, [{ first: 1 }, { second: 2, third: 3 }])
+    }).pipe(Effect.provide(Reactivity.layer)))
+
   it.effect("settles an in-flight query when the worker errors and reconnects", () =>
     Effect.gen(function*() {
       const queryPosted = yield* Deferred.make<void>()
@@ -86,4 +141,24 @@ describe("Client", () => {
       assert(Option.isSome(result), "the request remained pending after worker replacement")
       assert(Exit.isFailure(result.value))
     }).pipe(Effect.provide(Reactivity.layer)))
+
+  it.effect("starts a MessagePort transport so the ready message arrives", () =>
+    Effect.gen(function*() {
+      const port = new GatedPort()
+      port.deliver(["ready", undefined, undefined])
+      const fiber = yield* Effect.forkChild(SqliteClient.make({ worker: Effect.succeed(port as unknown as Worker) }))
+      const result = yield* settled(Fiber.join(fiber))
+      assert(Option.isSome(result), "the ready message was never delivered")
+      assert(Exit.isSuccess(result.value))
+    }).pipe(Effect.provide(Reactivity.layer)))
+
+  it.effect("starts a MessagePort port so worker requests are consumed", () =>
+    Effect.gen(function*() {
+      const port = new GatedPort()
+      port.deliver(["close"])
+      const fiber = yield* Effect.forkChild(OpfsWorker.run({ port, dbName: "test.db" }))
+      const result = yield* settled(Fiber.join(fiber))
+      assert(Option.isSome(result), "the queued request was never consumed")
+      assert(Exit.isSuccess(result.value))
+    }))
 })
diff --git a/repos/effect/packages/tools/ai-codegen/package.json b/repos/effect/packages/tools/ai-codegen/package.json
index 5c627c807..f2c57433b 100644
--- a/repos/effect/packages/tools/ai-codegen/package.json
+++ b/repos/effect/packages/tools/ai-codegen/package.json
@@ -50,9 +50,9 @@
     "@effect/platform-node": "workspace:^",
     "effect": "workspace:^",
     "glob": "^13.0.6",
-    "yaml": "^2.9.0"
+    "yaml": "^2.9.1"
   },
   "devDependencies": {
-    "@types/node": "^26.4.0"
+    "@types/node": "^26.6.2"
   }
 }
diff --git a/repos/effect/packages/tools/ai-codegen/src/Generator.ts b/repos/effect/packages/tools/ai-codegen/src/Generator.ts
index ed705d2e8..e699a40ae 100644
--- a/repos/effect/packages/tools/ai-codegen/src/Generator.ts
+++ b/repos/effect/packages/tools/ai-codegen/src/Generator.ts
@@ -155,9 +155,10 @@ export const layer: Layer.Layer<
     // Parse all patches, resolving file paths relative to the provider package
     const parsedPatches = yield* Effect.forEach(patchInputs, (input) => {
       // If it looks like a file path and is not absolute, resolve relative to package
-      const resolvedInput = !input.startsWith("[") && !pathService.isAbsolute(input)
-        ? pathService.join(provider.packagePath, input)
-        : input
+      const trimmed = input.trimStart()
+      const resolvedInput = !trimmed.startsWith("[") && !pathService.isAbsolute(trimmed)
+        ? pathService.join(provider.packagePath, trimmed)
+        : trimmed
       return OpenApiPatch.parsePatchInput(resolvedInput).pipe(
         Effect.map((patch) => ({ source: resolvedInput, patch }))
       )
diff --git a/repos/effect/packages/tools/ai-codegen/src/main.ts b/repos/effect/packages/tools/ai-codegen/src/main.ts
index 47ab19769..3d9c036a1 100644
--- a/repos/effect/packages/tools/ai-codegen/src/main.ts
+++ b/repos/effect/packages/tools/ai-codegen/src/main.ts
@@ -21,18 +21,18 @@ import * as SpecFetcher from "./SpecFetcher.ts"
 // Flags
 // =============================================================================
 
-const providerFlag = Flag.string("provider").pipe(
+const providerFlag = Flag.String("provider").pipe(
   Flag.withAlias("p"),
   Flag.withDescription("Generate for specific provider only"),
   Flag.optional
 )
 
-const skipLintFlag = Flag.boolean("skip-lint").pipe(
+const skipLintFlag = Flag.Boolean("skip-lint").pipe(
   Flag.withDescription("Skip Oxlint step"),
   Flag.withDefault(false)
 )
 
-const skipFormatFlag = Flag.boolean("skip-format").pipe(
+const skipFormatFlag = Flag.Boolean("skip-format").pipe(
   Flag.withDescription("Skip Dprint step"),
   Flag.withDefault(false)
 )
diff --git a/repos/effect/packages/tools/ai-codegen/test/Generator.test.ts b/repos/effect/packages/tools/ai-codegen/test/Generator.test.ts
new file mode 100644
index 000000000..ac13f314b
--- /dev/null
+++ b/repos/effect/packages/tools/ai-codegen/test/Generator.test.ts
@@ -0,0 +1,68 @@
+import * as Config from "@effect/ai-codegen/Config"
+import type { DiscoveredProvider } from "@effect/ai-codegen/Discovery"
+import * as Generator from "@effect/ai-codegen/Generator"
+import * as OpenApiGenerator from "@effect/openapi-generator/OpenApiGenerator"
+import * as NodeServices from "@effect/platform-node/NodeServices"
+import { assert, describe, it } from "@effect/vitest"
+import * as Effect from "effect/Effect"
+import * as Layer from "effect/Layer"
+import * as Path from "effect/Path"
+
+const TestLayer = Generator.layer.pipe(
+  Layer.provide(Layer.succeed(OpenApiGenerator.OpenApiGenerator, {
+    generate: (spec) => Effect.succeed(JSON.stringify(spec))
+  })),
+  Layer.provideMerge(NodeServices.layer)
+)
+
+const provider = (patch: string): DiscoveredProvider => ({
+  name: "test",
+  packagePath: "/providers/test",
+  config: new Config.CodegenConfig({
+    spec: "spec.json",
+    output: "Generated.ts",
+    patches: [patch]
+  }),
+  specSource: Config.SpecSource.File("spec.json"),
+  outputPath: "Generated.ts"
+})
+
+const generateWithPatch = (patch: string) =>
+  Effect.gen(function*() {
+    const generator = yield* Generator.CodeGenerator
+    const output = yield* generator.generate(provider(patch), {
+      openapi: "3.1.0",
+      info: { title: "Before", version: "1.0.0" },
+      paths: {}
+    })
+    return JSON.parse(output)
+  })
+
+describe("CodeGenerator patch inputs", () => {
+  it.effect("accepts inline patches with leading whitespace", () =>
+    Effect.gen(function*() {
+      const result = yield* generateWithPatch(
+        " \n[{\"op\":\"replace\",\"path\":\"/info/title\",\"value\":\"After\"}]"
+      )
+      assert.deepStrictEqual(result, {
+        openapi: "3.1.0",
+        info: { title: "After", version: "1.0.0" },
+        paths: {}
+      })
+    }).pipe(Effect.provide(TestLayer)))
+
+  it.effect("accepts absolute paths with leading whitespace", () =>
+    Effect.gen(function*() {
+      const path = yield* Path.Path
+      const patch = path.join(
+        import.meta.dirname,
+        "../../openapi-generator/test/fixtures/patches/valid-replace.json"
+      )
+      const result = yield* generateWithPatch(` ${patch}`)
+      assert.deepStrictEqual(result, {
+        openapi: "3.1.0",
+        info: { title: "Updated API Title", version: "1.0.0" },
+        paths: {}
+      })
+    }).pipe(Effect.provide(TestLayer)))
+})
diff --git a/repos/effect/packages/tools/ai-docgen/package.json b/repos/effect/packages/tools/ai-docgen/package.json
index 3a82de584..54d2462e7 100644
--- a/repos/effect/packages/tools/ai-docgen/package.json
+++ b/repos/effect/packages/tools/ai-docgen/package.json
@@ -49,9 +49,9 @@
     "@effect/platform-node": "workspace:^",
     "effect": "workspace:^",
     "glob": "^13.0.6",
-    "yaml": "^2.9.0"
+    "yaml": "^2.9.1"
   },
   "devDependencies": {
-    "@types/node": "^26.4.0"
+    "@types/node": "^26.6.2"
   }
 }
diff --git a/repos/effect/packages/tools/ai-docgen/src/main.ts b/repos/effect/packages/tools/ai-docgen/src/main.ts
index 15ff14a62..58c640a1d 100755
--- a/repos/effect/packages/tools/ai-docgen/src/main.ts
+++ b/repos/effect/packages/tools/ai-docgen/src/main.ts
@@ -16,14 +16,14 @@ import * as Argument from "effect/unstable/cli/Argument"
 import * as Command from "effect/unstable/cli/Command"
 import * as Flag from "effect/unstable/cli/Flag"
 
-const directory = Argument.directory("directory", { mustExist: true })
+const directory = Argument.Directory("directory", { mustExist: true })
 
-const output = Flag.path("output").pipe(
+const output = Flag.Path("output").pipe(
   Flag.withAlias("o"),
   Flag.withDescription("Output file path")
 )
 
-const watch = Flag.boolean("watch").pipe(
+const watch = Flag.Boolean("watch").pipe(
   Flag.withAlias("w"),
   Flag.withDescription("Watch for file changes and regenerate documentation"),
   Flag.withDefault(false)
diff --git a/repos/effect/packages/tools/api-diff/README.md b/repos/effect/packages/tools/api-diff/README.md
index b4841ec8c..db8b3570a 100644
--- a/repos/effect/packages/tools/api-diff/README.md
+++ b/repos/effect/packages/tools/api-diff/README.md
@@ -20,6 +20,11 @@ discovers every public package entrypoint independently, extracts both snapshots
 with one pinned TypeScript compiler API, and caches successful snapshots by
 commit and compiler.
 
+After updating the extractor, regenerate both snapshots with the same extractor
+before comparing them. Old snapshots may have lost information that the current
+extractor preserves; comparing snapshots from different extractor generations is
+not supported.
+
 The command writes:
 
 - `base.snapshot.json`
@@ -39,6 +44,9 @@ SHAs, preserves the existing import map sections, and replaces the API
 reference in place. It does not write `diff.json` unless `--output` is also
 provided.
 
+An API annotation can set `include: true` to retain migration guidance even
+when the declaration comparison does not classify that API as changed.
+
 List missing annotations, grouped by v3 module, and exit non-zero when any are
 missing:
 
diff --git a/repos/effect/packages/tools/api-diff/package.json b/repos/effect/packages/tools/api-diff/package.json
index bd359564a..dad7170b4 100644
--- a/repos/effect/packages/tools/api-diff/package.json
+++ b/repos/effect/packages/tools/api-diff/package.json
@@ -18,13 +18,13 @@
   "dependencies": {
     "@effect/platform-node": "workspace:^",
     "effect": "workspace:^",
-    "yaml": "^2.9.0"
+    "yaml": "^2.9.1"
   },
   "devDependencies": {
     "@effect/vitest": "workspace:^",
-    "@types/node": "^26.4.0",
+    "@types/node": "^26.6.2",
     "typescript": "^6.0.3",
     "typescript-compiler": "npm:typescript@6.0.3",
-    "vitest": "4.1.11"
+    "vitest": "5.0.1"
   }
 }
diff --git a/repos/effect/packages/tools/api-diff/src/Annotations.ts b/repos/effect/packages/tools/api-diff/src/Annotations.ts
index 86bcbc096..e3f500aae 100644
--- a/repos/effect/packages/tools/api-diff/src/Annotations.ts
+++ b/repos/effect/packages/tools/api-diff/src/Annotations.ts
@@ -8,6 +8,7 @@ export interface MigrationAnnotation {
   readonly replacement: string
   readonly note: string
   readonly example?: string | undefined
+  readonly include?: boolean | undefined
 }
 
 const compareStrings = (left: string, right: string): number => left < right ? -1 : left > right ? 1 : 0
@@ -17,14 +18,16 @@ const parseAnnotation = (id: string, value: unknown, file: string): MigrationAnn
     typeof value !== "object" || value === null ||
     typeof Reflect.get(value, "replacement") !== "string" ||
     typeof Reflect.get(value, "note") !== "string" ||
-    (Reflect.get(value, "example") !== undefined && typeof Reflect.get(value, "example") !== "string")
+    (Reflect.get(value, "example") !== undefined && typeof Reflect.get(value, "example") !== "string") ||
+    (Reflect.get(value, "include") !== undefined && typeof Reflect.get(value, "include") !== "boolean")
   ) {
     throw new Error(`Invalid annotation for ${id} in ${file}`)
   }
   return {
     replacement: Reflect.get(value, "replacement"),
     note: Reflect.get(value, "note"),
-    ...(Reflect.get(value, "example") === undefined ? {} : { example: Reflect.get(value, "example") })
+    ...(Reflect.get(value, "example") === undefined ? {} : { example: Reflect.get(value, "example") }),
+    ...(Reflect.get(value, "include") === undefined ? {} : { include: Reflect.get(value, "include") })
   }
 }
 
diff --git a/repos/effect/packages/tools/api-diff/src/Cli.ts b/repos/effect/packages/tools/api-diff/src/Cli.ts
index 2e1590c40..1d53de0e2 100644
--- a/repos/effect/packages/tools/api-diff/src/Cli.ts
+++ b/repos/effect/packages/tools/api-diff/src/Cli.ts
@@ -4,29 +4,29 @@ import * as Command from "effect/unstable/cli/Command"
 import * as Flag from "effect/unstable/cli/Flag"
 import { ApiDiff, type ApiDiffOptions } from "./ApiDiff.ts"
 
-const baseRef = Flag.string("base-ref").pipe(
+const baseRef = Flag.String("base-ref").pipe(
   Flag.withDescription("Explicit base Git ref"),
   Flag.withDefault("v3")
 )
 
-const headRef = Flag.string("head-ref").pipe(
+const headRef = Flag.String("head-ref").pipe(
   Flag.withDescription("Explicit head Git ref"),
   Flag.withDefault("main")
 )
 
-const output = Flag.string("output").pipe(
+const output = Flag.String("output").pipe(
   Flag.withMetavar("DIRECTORY"),
   Flag.withDescription("Report output directory"),
   Flag.optional
 )
 
-const writeDoc = Flag.string("write-doc").pipe(
+const writeDoc = Flag.String("write-doc").pipe(
   Flag.withMetavar("FILE"),
   Flag.withDescription("Write the annotation-driven migration reference"),
   Flag.optional
 )
 
-const check = Flag.boolean("check").pipe(
+const check = Flag.Boolean("check").pipe(
   Flag.withDescription("List APIs without migration annotations and fail if any remain"),
   Flag.withDefault(false)
 )
diff --git a/repos/effect/packages/tools/api-diff/src/MigrationDoc.ts b/repos/effect/packages/tools/api-diff/src/MigrationDoc.ts
index eacb0038c..dea89b80f 100644
--- a/repos/effect/packages/tools/api-diff/src/MigrationDoc.ts
+++ b/repos/effect/packages/tools/api-diff/src/MigrationDoc.ts
@@ -30,8 +30,16 @@ const displayApiId = (id: string): string => {
   return `${module}.${id.slice(separator + 1)}`
 }
 
+const backtickDelimiter = (value: string, minimum: number): string => {
+  let length = minimum
+  for (const match of value.matchAll(/`+/g)) {
+    length = Math.max(length, match[0].length + 1)
+  }
+  return "`".repeat(length)
+}
+
 const codeSpan = (value: string): string => {
-  const delimiter = "`".repeat(Math.max(1, ...(value.match(/`+/g)?.map((run) => run.length + 1) ?? [])))
+  const delimiter = backtickDelimiter(value, 1)
   const content = value.startsWith("`") || value.endsWith("`") ? ` ${value} ` : value
   return `${delimiter}${content}${delimiter}`
 }
@@ -87,7 +95,7 @@ interface MigrationEntry {
 
 const importMapReplacements = (importMapSections: string): ReadonlyMap<string, ReadonlyArray<string>> => {
   const replacements = new Map<string, Array<string>>()
-  for (const line of importMapSections.split("\n")) {
+  for (const line of importMapSections.split(/\r?\n/)) {
     const match = /^(\S+) -> (\S+)(?: \(barrel: [^)]+\))?$/.exec(line)
     if (match === null) {
       continue
@@ -219,6 +227,11 @@ const migrationEntries = (
       rename
     })
   }
+  for (const [id, annotation] of annotations) {
+    if (annotation.include === true && id.includes("#") && !entries.some((entry) => entry.id === id)) {
+      entries.push({ id, module: id.split("#")[0]!, rename: undefined })
+    }
+  }
   return entries.sort((left, right) => compareStrings(left.module, right.module) || compareStrings(left.id, right.id))
 }
 
@@ -226,20 +239,23 @@ const renderDetailedEntry = (
   entry: MigrationEntry,
   annotation: MigrationAnnotation,
   example: string
-): ReadonlyArray<string> => [
-  `#### ${codeSpan(displayApiId(entry.id))}`,
-  "",
-  `**Replacement:** ${codeSpan(annotation.replacement)}`,
-  "",
-  escapeAnnotationText(annotation.note),
-  "",
-  "**Example**",
-  "",
-  "```ts",
-  example,
-  "```",
-  ""
-]
+): ReadonlyArray<string> => {
+  const fence = backtickDelimiter(example, 3)
+  return [
+    `#### ${codeSpan(displayApiId(entry.id))}`,
+    "",
+    `**Replacement:** ${codeSpan(annotation.replacement)}`,
+    "",
+    escapeAnnotationText(annotation.note),
+    "",
+    "**Example**",
+    "",
+    `${fence}ts`,
+    example,
+    fence,
+    ""
+  ]
+}
 
 const renderCompactEntry = (
   entry: MigrationEntry,
diff --git a/repos/effect/packages/tools/api-diff/src/Snapshot.ts b/repos/effect/packages/tools/api-diff/src/Snapshot.ts
index 445d58097..2c9049180 100644
--- a/repos/effect/packages/tools/api-diff/src/Snapshot.ts
+++ b/repos/effect/packages/tools/api-diff/src/Snapshot.ts
@@ -227,8 +227,18 @@ export const serializeType = (node: ts.TypeNode, context: SerializationContext):
   }
   if (ts.isLiteralTypeNode(node)) {
     const literal = node.literal
+    const operand = ts.isPrefixUnaryExpression(literal) ? literal.operand : literal
     return {
       kind: "literal",
+      literalKind: ts.isStringLiteralLike(operand)
+        ? "string"
+        : ts.isNumericLiteral(operand)
+        ? "number"
+        : ts.isBigIntLiteral(operand)
+        ? "bigint"
+        : operand.kind === ts.SyntaxKind.NullKeyword
+        ? "null"
+        : "boolean",
       value: literal.kind === ts.SyntaxKind.TrueKeyword
         ? true
         : literal.kind === ts.SyntaxKind.FalseKeyword
@@ -397,11 +407,14 @@ const serializeClassMember = (
       kind: "property",
       name: nameText(node.name),
       type: node.type === undefined ? { kind: "unknown" } : serializeType(node.type, context),
-      modifiers: visibility
+      modifiers: node.questionToken === undefined ? visibility : [...(visibility ?? []), "optional"].sort()
     }
   }
   if (ts.isMethodDeclaration(node)) {
-    return serializeSignature(node, context, "method", nameText(node.name))
+    return {
+      ...serializeSignature(node, context, "method", nameText(node.name)),
+      modifiers: node.questionToken === undefined ? visibility : [...(visibility ?? []), "optional"].sort()
+    }
   }
   if (ts.isConstructorDeclaration(node)) {
     return serializeSignature(node, context, "constructor", "constructor")
@@ -846,7 +859,15 @@ const extractSnapshot = (
 export const snapshotCacheKey = (
   sha: string,
   modules?: ReadonlyArray<string>
-): string => fingerprint(["snapshot-v4", sha, ts.version, modules === undefined ? "all" : [...modules].sort()])
+): string =>
+  fingerprint([
+    "snapshot-v4",
+    "class-member-optionality-v1",
+    "literal-type-category-v1",
+    sha,
+    ts.version,
+    modules === undefined ? "all" : [...modules].sort()
+  ])
 
 export class Snapshotter extends Context.Service<Snapshotter, {
   readonly extract: (options: ExtractSnapshotOptions) => Effect.Effect<
diff --git a/repos/effect/packages/tools/api-diff/test/Diff.test.ts b/repos/effect/packages/tools/api-diff/test/Diff.test.ts
index c06f644b2..b63646462 100644
--- a/repos/effect/packages/tools/api-diff/test/Diff.test.ts
+++ b/repos/effect/packages/tools/api-diff/test/Diff.test.ts
@@ -1,7 +1,15 @@
 import { diffSnapshots } from "@effect/api-diff/Diff"
 import type { ApiDiff, ApiEntity, ApiSnapshot, DeclarationModel } from "@effect/api-diff/Model"
 import { renderMarkdownReport } from "@effect/api-diff/Report"
+import { Snapshotter } from "@effect/api-diff/Snapshot"
+import * as NodeServices from "@effect/platform-node/NodeServices"
 import { assert, describe, it } from "@effect/vitest"
+import * as Effect from "effect/Effect"
+import * as FileSystem from "effect/FileSystem"
+import * as Layer from "effect/Layer"
+import { writeFixturePackage } from "./utils.ts"
+
+const MainLayer = Snapshotter.layer.pipe(Layer.provideMerge(NodeServices.layer))
 
 const entity = (
   module: string,
@@ -35,6 +43,63 @@ const snapshot = (ref: string, entities: ReadonlyArray<ApiEntity>): ApiSnapshot
 })
 
 describe("snapshot diff", () => {
+  it.effect("detects optional class member changes", () =>
+    Effect.gen(function*() {
+      const fs = yield* FileSystem.FileSystem
+      const snapshotter = yield* Snapshotter
+      const extract = Effect.fnUntraced(function*(ref: string, source: string) {
+        const repoRoot = yield* fs.makeTempDirectoryScoped({ prefix: "api-diff-optional-class-" })
+        yield* writeFixturePackage(repoRoot, { "Api.d.ts": source }, { "./Api": { types: "./Api.d.ts" } })
+        return yield* snapshotter.extract({
+          repoRoot,
+          ref,
+          sha: "0".repeat(40),
+          modules: ["@fixture/sample/Api"]
+        })
+      })
+      const base = yield* extract("base", "export declare class Client { value: string }\n")
+      const head = yield* extract("head", "export declare class Client { value?: string }\n")
+      const diff = diffSnapshots(base, head)
+
+      for (const bucket of ["type", "value"]) {
+        const id = `@fixture/sample/Api#Client#${bucket}`
+        const baseEntity = base.entities.find((entity) => entity.id === id)
+        const headEntity = head.entities.find((entity) => entity.id === id)
+        assert(baseEntity !== undefined)
+        assert(headEntity !== undefined)
+        assert.notStrictEqual(baseEntity.fingerprint, headEntity.fingerprint)
+        assert(diff.changes.some((change) =>
+          change.classification === "member-changed" &&
+          change.baseApiId === id &&
+          change.headApiId === id
+        ))
+      }
+    }).pipe(Effect.provide(MainLayer)))
+
+  it.effect("detects changes between numeric and string literal types", () =>
+    Effect.gen(function*() {
+      const fs = yield* FileSystem.FileSystem
+      const snapshotter = yield* Snapshotter
+      const extract = (repoRoot: string, ref: string) =>
+        snapshotter.extract({
+          repoRoot,
+          ref,
+          sha: ref.repeat(40),
+          modules: ["@fixture/sample/Value"]
+        })
+      const baseRoot = yield* fs.makeTempDirectoryScoped({ prefix: "api-diff-literal-base-" })
+      const headRoot = yield* fs.makeTempDirectoryScoped({ prefix: "api-diff-literal-head-" })
+      yield* writeFixturePackage(baseRoot, { "Value.d.ts": "export type Value = 1\n" })
+      yield* writeFixturePackage(headRoot, { "Value.d.ts": "export type Value = \"1\"\n" })
+
+      assert.deepStrictEqual(
+        diffSnapshots(yield* extract(baseRoot, "a"), yield* extract(headRoot, "b")).changes.map((change) =>
+          change.classification
+        ),
+        ["structural-change"]
+      )
+    }).pipe(Effect.provide(MainLayer)))
+
   it("matches renames, classifies signature changes, and separates suggestions", () => {
     const base = snapshot("a", [
       entity("old/A", "changed", {
diff --git a/repos/effect/packages/tools/api-diff/test/MigrationDoc.test.ts b/repos/effect/packages/tools/api-diff/test/MigrationDoc.test.ts
index 89f1e53e9..c98a1e550 100644
--- a/repos/effect/packages/tools/api-diff/test/MigrationDoc.test.ts
+++ b/repos/effect/packages/tools/api-diff/test/MigrationDoc.test.ts
@@ -143,6 +143,50 @@ describe("migration document", () => {
     assert(!document.includes("**After**"))
   })
 
+  it.each([
+    { name: "plain", example: "const value = 1", fence: "```" },
+    { name: "empty", example: "", fence: "```" },
+    { name: "single backticks", example: "const value = `text`", fence: "```" },
+    { name: "double backticks", example: "// ``literal``", fence: "```" },
+    { name: "triple backticks", example: "/*\n```text\nliteral\n```\n*/", fence: "````" },
+    { name: "four backticks", example: "/*\n````text\nliteral\n````\n*/", fence: "`````" },
+    { name: "longest run last", example: "const value = `text`\n/*\n```\n`````\n*/", fence: "``````" },
+    { name: "whitespace", example: "\n  const value = 1  \n\n", fence: "```" },
+    { name: "many backtick runs", example: "// ` ".repeat(400_000), fence: "```" }
+  ])("preserves example framing: $name", ({ example, fence }) => {
+    const document = renderMigrationDocument(
+      diff,
+      new Map([...annotations, ["effect/Zeta#changed", {
+        replacement: "Zeta.changed()",
+        note: "Call the zero-argument form.",
+        example
+      }]]),
+      "## Import Map\n"
+    )
+
+    assert.strictEqual(document.split("**Example**\n\n")[1], `${fence}ts\n${example}\n${fence}\n`)
+    assert.deepStrictEqual(markdownSafetyIssues(document), [])
+  })
+
+  it.each([
+    { name: "compact", example: undefined },
+    { name: "detailed", example: "Zeta.changed()" }
+  ])("renders replacements with many backtick runs in $name entries", ({ example }) => {
+    const replacement = "// ` ".repeat(400_000)
+    const document = renderMigrationDocument(
+      diff,
+      new Map([...annotations, ["effect/Zeta#changed", {
+        replacement,
+        note: "Use the replacement.",
+        example
+      }]]),
+      "## Import Map\n"
+    )
+
+    assert(document.includes("``" + replacement + "``"))
+    assert.deepStrictEqual(markdownSafetyIssues(document), [])
+  })
+
   it("escapes annotation prose while preserving inline code and fenced examples", () => {
     const document = renderMigrationDocument(
       diff,
@@ -240,6 +284,54 @@ describe("migration document", () => {
     )
   })
 
+  it.each(["LF", "CRLF", "mixed"])("preserves %s import-map replacement guidance", (ending) => {
+    const moduleDiff: ApiDiff = {
+      ...diff,
+      changes: [
+        change({ classification: "module-removed", delta: { from: "effect/Legacy", to: [] } }),
+        change({
+          classification: "api-removed",
+          baseApiId: "effect/Legacy#unchanged#value",
+          before: "declare const unchanged: string"
+        }),
+        change({
+          classification: "api-added",
+          headApiId: "effect/Current#unchanged#value",
+          after: "declare const unchanged: string"
+        })
+      ]
+    }
+    const eol = ending === "LF" ? "\n" : "\r\n"
+    const authored = [
+      "## Import Map",
+      "",
+      "```text",
+      "effect/Legacy -> effect/Other",
+      "effect/Legacy -> effect/Current (barrel: effect)",
+      "effect/Legacy -> effect/Current",
+      "```",
+      "",
+      "## No Counterpart Imports",
+      "",
+      "None."
+    ].join(eol)
+    const section = ending === "mixed" ? authored.replace("## Import Map\r\n", "## Import Map\n") : authored
+    const importMap = extractImportMapSections(
+      `# Existing reference${eol}${section}${eol}${eol}## Removed Modules${eol}Old guidance.`
+    )
+    const moduleAnnotations = new Map<string, MigrationAnnotation>()
+    const document = renderMigrationDocument(moduleDiff, moduleAnnotations, importMap)
+
+    assert.strictEqual(importMap, `${section}\n`)
+    assert.strictEqual(extractImportMapSections(document), importMap)
+    assert(document.includes("## Removed Modules\n\n- `effect/Legacy` -> `effect/Other`, `effect/Current`\n"))
+    assert(!document.includes("Legacy.unchanged"))
+    assert.strictEqual(
+      renderMissingAnnotations(moduleDiff, moduleAnnotations, importMap),
+      "All migration APIs and removed modules have guidance.\n"
+    )
+  })
+
   it("uses exact removed-module guidance for APIs without replacements", () => {
     const moduleDiff: ApiDiff = {
       ...diff,
diff --git a/repos/effect/packages/tools/bundle/fixtures/http-router.ts b/repos/effect/packages/tools/bundle/fixtures/http-router.ts
new file mode 100644
index 000000000..1a6b1da35
--- /dev/null
+++ b/repos/effect/packages/tools/bundle/fixtures/http-router.ts
@@ -0,0 +1,17 @@
+import * as Effect from "effect/Effect"
+import * as Layer from "effect/Layer"
+import * as HttpRouter from "effect/unstable/http/HttpRouter"
+import * as HttpServerResponse from "effect/unstable/http/HttpServerResponse"
+
+const Routes = Layer.mergeAll(
+  HttpRouter.add("GET", "/hello", HttpServerResponse.text("Hello")),
+  HttpRouter.add(
+    "GET",
+    "/users/:id",
+    Effect.map(HttpRouter.params, (params) => HttpServerResponse.jsonUnsafe({ id: params.id }))
+  )
+)
+
+const { handler } = HttpRouter.toWebHandler(Routes, { disableLogger: true })
+
+handler(new Request("http://localhost/hello")).then((response) => response.text())
diff --git a/repos/effect/packages/tools/bundle/fixtures/schema-bigdecimal.ts b/repos/effect/packages/tools/bundle/fixtures/schema-bigdecimal.ts
new file mode 100644
index 000000000..412a46913
--- /dev/null
+++ b/repos/effect/packages/tools/bundle/fixtures/schema-bigdecimal.ts
@@ -0,0 +1,3 @@
+import * as Schema from "effect/Schema"
+
+export const decode = Schema.decodeUnknownSync(Schema.BigDecimal)
diff --git a/repos/effect/packages/tools/bundle/fixtures/schema-representation-roundtrip.ts b/repos/effect/packages/tools/bundle/fixtures/schema-representation-roundtrip.ts
index a22278cce..e3ceaf1e3 100644
--- a/repos/effect/packages/tools/bundle/fixtures/schema-representation-roundtrip.ts
+++ b/repos/effect/packages/tools/bundle/fixtures/schema-representation-roundtrip.ts
@@ -11,5 +11,5 @@ const json = SchemaRepresentation.toJson(SchemaRepresentation.toRepresentation(s
 
 export const roundtrip = SchemaRepresentation.fromRepresentation(
   SchemaRepresentation.fromJson(JSON.parse(JSON.stringify(json))),
-  { revivers: [Schema.isFiniteReviver] }
+  { revivers: [SchemaRepresentation.isFiniteReviver] }
 )
diff --git a/repos/effect/packages/tools/bundle/fixtures/schema-string-transformation.ts b/repos/effect/packages/tools/bundle/fixtures/schema-string-transformation.ts
index 305148efa..5543ee0fa 100644
--- a/repos/effect/packages/tools/bundle/fixtures/schema-string-transformation.ts
+++ b/repos/effect/packages/tools/bundle/fixtures/schema-string-transformation.ts
@@ -5,7 +5,7 @@ import * as SchemaTransformation from "effect/SchemaTransformation"
 
 const schema = Schema.String.pipe(Schema.decodeTo(
   Schema.String,
-  SchemaTransformation.transformOrFail({
+  SchemaTransformation.transformEffect({
     decode: (s) =>
       Effect.gen(function*() {
         yield* Effect.clockWith((clock) => clock.sleep(Duration.millis(300)))
diff --git a/repos/effect/packages/tools/bundle/package.json b/repos/effect/packages/tools/bundle/package.json
index 19ab09ab7..8355c5289 100644
--- a/repos/effect/packages/tools/bundle/package.json
+++ b/repos/effect/packages/tools/bundle/package.json
@@ -41,11 +41,14 @@
     "@rollup/plugin-terser": "^1.0.0",
     "effect": "workspace:^",
     "glob": "^13.0.6",
-    "rollup": "^4.63.1",
+    "rollup": "^4.63.4",
     "rollup-plugin-esbuild": "^6.2.1",
     "rollup-plugin-visualizer": "^7.1.1"
   },
   "devDependencies": {
-    "@types/node": "^26.4.0"
+    "@babel/core": "^8.0.6",
+    "@types/node": "^26.6.2",
+    "babel-plugin-annotate-pure-calls": "^0.5.0",
+    "esbuild": "^0.28.2"
   }
 }
diff --git a/repos/effect/packages/tools/bundle/src/Cli.ts b/repos/effect/packages/tools/bundle/src/Cli.ts
index b5a37052c..e8fff9574 100644
--- a/repos/effect/packages/tools/bundle/src/Cli.ts
+++ b/repos/effect/packages/tools/bundle/src/Cli.ts
@@ -30,12 +30,12 @@ import * as Prompt from "effect/unstable/cli/Prompt"
 import { Fixtures } from "./Fixtures.ts"
 import { Reporter } from "./Reporter.ts"
 
-const baseDirectory = Flag.directory("base-dir", { mustExist: true }).pipe(
+const baseDirectory = Flag.Directory("base-dir", { mustExist: true }).pipe(
   Flag.withAlias("b"),
   Flag.withDescription("The base directory to use for bundle size comparisons")
 )
 
-const outputPath = Flag.file("output-path").pipe(
+const outputPath = Flag.File("output-path").pipe(
   Flag.withAlias("o"),
   Flag.withDescription("The name of the file to write the bundle size report to"),
   Flag.withDefault("stats.txt"),
@@ -55,7 +55,7 @@ const compare = Command.make("compare", { baseDirectory, outputPath }).pipe(
   }))
 )
 
-const outputDirectory = Flag.directory("output-dir").pipe(
+const outputDirectory = Flag.Directory("output-dir").pipe(
   Flag.withAlias("o"),
   Flag.withDescription("The name of the directory to write the bundle size visualizations to"),
   Flag.mapEffect(Effect.fnUntraced(function*(outputPath) {
@@ -70,7 +70,7 @@ const visualize = Command.make("visualize", { outputDirectory }).pipe(
     const { fixtures, fixturesDir } = yield* Fixtures
     const reporter = yield* Reporter
 
-    const paths = yield* Prompt.multiSelect({
+    const paths = yield* Prompt.MultiSelect({
       message: "Select files whose bundle size you would like to visualize",
       choices: fixtures.map((fixture) => ({
         title: fixture,
@@ -83,7 +83,7 @@ const visualize = Command.make("visualize", { outputDirectory }).pipe(
   }))
 )
 
-const reportPaths = Argument.file("paths", { mustExist: true }).pipe(
+const reportPaths = Argument.File("paths", { mustExist: true }).pipe(
   Argument.withDescription("Fixture files to include in the report"),
   Argument.variadic({ min: 1 })
 )
diff --git a/repos/effect/packages/tools/bundle/src/Fixtures.ts b/repos/effect/packages/tools/bundle/src/Fixtures.ts
index 6c439c197..0bbda382f 100644
--- a/repos/effect/packages/tools/bundle/src/Fixtures.ts
+++ b/repos/effect/packages/tools/bundle/src/Fixtures.ts
@@ -22,6 +22,7 @@ import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
 import * as Order from "effect/Order"
 import * as Glob from "glob"
+import { fileURLToPath } from "node:url"
 
 /**
  * Context service that discovers and sorts TypeScript fixture files used by the bundle size tooling.
@@ -33,7 +34,7 @@ export class Fixtures extends Context.Service<Fixtures>()(
   "@effect/bundle/Fixtures",
   {
     make: Effect.gen(function*() {
-      const fixturesDir = new URL("../fixtures/", import.meta.url).pathname
+      const fixturesDir = fileURLToPath(new URL("../fixtures/", import.meta.url))
 
       const fixtures = yield* Effect.promise(() => Glob.glob("*.ts", { cwd: fixturesDir })).pipe(
         Effect.map(Array.sort(Order.String)),
diff --git a/repos/effect/packages/tools/bundle/src/Reporter.ts b/repos/effect/packages/tools/bundle/src/Reporter.ts
index cfde4812b..24253e582 100644
--- a/repos/effect/packages/tools/bundle/src/Reporter.ts
+++ b/repos/effect/packages/tools/bundle/src/Reporter.ts
@@ -201,14 +201,8 @@ export class Reporter extends Context.Service<Reporter>()(
             { concurrency: fixtures.length }
           )
 
-          const [currentStats, previousStats] = yield* Effect.all([
-            rollup.bundleAll({
-              paths: currentPaths
-            }),
-            rollup.bundleAll({
-              paths: previousPaths
-            })
-          ], { concurrency: 2 })
+          const currentStats = yield* rollup.bundleAll({ paths: currentPaths })
+          const previousStats = yield* rollup.bundleAll({ paths: previousPaths })
 
           yield* Effect.logInfo("Bundling complete! Generating bundle size report...")
 
@@ -261,10 +255,8 @@ export class Reporter extends Context.Service<Reporter>()(
             { concurrency: currentPaths.length }
           )
 
-          const [currentStats, previousStats] = yield* Effect.all([
-            rollup.bundleAll({ paths: currentPaths }),
-            rollup.bundleAll({ paths: previousPaths })
-          ], { concurrency: 2 })
+          const currentStats = yield* rollup.bundleAll({ paths: currentPaths })
+          const previousStats = yield* rollup.bundleAll({ paths: previousPaths })
 
           const entries: Array<{
             readonly current: BundleStats
diff --git a/repos/effect/packages/tools/bundle/src/Rollup.ts b/repos/effect/packages/tools/bundle/src/Rollup.ts
index 8d900a0b2..7c1daa844 100644
--- a/repos/effect/packages/tools/bundle/src/Rollup.ts
+++ b/repos/effect/packages/tools/bundle/src/Rollup.ts
@@ -20,7 +20,6 @@ import * as NodeStream from "@effect/platform-node/NodeStream"
 import * as Context from "effect/Context"
 import * as Data from "effect/Data"
 import * as Effect from "effect/Effect"
-import * as FiberSet from "effect/FiberSet"
 import * as FileSystem from "effect/FileSystem"
 import * as Layer from "effect/Layer"
 import * as Path from "effect/Path"
@@ -131,8 +130,6 @@ export class Rollup extends Context.Service<Rollup>()(
             }),
             (bundle) => Effect.promise(() => bundle.close())
           )
-          const fibers = yield* FiberSet.make()
-
           const { output } = yield* Effect.tryPromise({
             try: () => bundle.generate({ format: "esm" }),
             catch: (cause) => new RollupError({ cause })
@@ -145,31 +142,29 @@ export class Rollup extends Context.Service<Rollup>()(
             Stream.broadcast({ capacity: 8, replay: 8 })
           )
 
-          if (options.outputDirectory) {
-            const outputPath = pathService.join(
-              options.outputDirectory,
-              `${pathService.parse(options.path).name}.min.js`
+          const writeOutput = options.outputDirectory
+            ? stream.pipe(
+              Stream.run(fs.sink(pathService.join(
+                options.outputDirectory,
+                `${pathService.parse(options.path).name}.min.js`
+              ))),
+              Effect.mapError((cause) => new RollupError({ cause }))
             )
-            yield* FiberSet.run(
-              fibers,
-              stream.pipe(
-                Stream.run(fs.sink(outputPath))
+            : Effect.void
+
+          const [, sizeInBytes] = yield* Effect.all([
+            writeOutput,
+            stream.pipe(
+              NodeStream.pipeThroughDuplex({
+                evaluate: () => createGzip({ level: 9 }),
+                onError: (cause) => new RollupError({ cause })
+              }),
+              Stream.runFold(
+                () => 0,
+                (totalBytes, chunkBytes) => chunkBytes.length + totalBytes
               )
             )
-          }
-
-          const sizeInBytes = yield* stream.pipe(
-            NodeStream.pipeThroughDuplex({
-              evaluate: () => createGzip({ level: 9 }),
-              onError: (cause) => new RollupError({ cause })
-            }),
-            Stream.runFold(
-              () => 0,
-              (totalBytes, chunkBytes) => chunkBytes.length + totalBytes
-            )
-          )
-
-          yield* FiberSet.awaitEmpty(fibers)
+          ], { concurrency: 2 })
 
           yield* Effect.log(`Bundled ${options.path}`).pipe(
             Effect.annotateLogs({ size: `${(sizeInBytes / 1000).toFixed(2)} kB` })
@@ -185,7 +180,9 @@ export class Rollup extends Context.Service<Rollup>()(
           return yield* Effect.forEach(
             options.paths,
             (path) => bundle({ path, visualize: options.visualize, outputDirectory: options.outputDirectory }),
-            { concurrency: options.paths.length }
+            // Rollup retains a module graph for each active bundle, so unbounded
+            // concurrency can exhaust the Node.js heap on CI runners.
+            { concurrency: 4 }
           )
         }
       )
diff --git a/repos/effect/packages/tools/bundle/test/HttpRouterEsbuild.test.ts b/repos/effect/packages/tools/bundle/test/HttpRouterEsbuild.test.ts
new file mode 100644
index 000000000..679c51a16
--- /dev/null
+++ b/repos/effect/packages/tools/bundle/test/HttpRouterEsbuild.test.ts
@@ -0,0 +1,76 @@
+import * as babel from "@babel/core"
+import { assert, describe, it } from "@effect/vitest"
+import * as esbuild from "esbuild"
+import * as fs from "node:fs/promises"
+import * as path from "node:path"
+import { fileURLToPath } from "node:url"
+
+const packageDir = fileURLToPath(new URL("..", import.meta.url))
+const effectSrcDir = fileURLToPath(new URL("../../../effect/src/", import.meta.url))
+
+// The published build runs babel with annotate-pure-calls over the compiler
+// output. Bundlers rely on those annotations to drop unused module-scope
+// calls, so the same step is reproduced here for every effect source module.
+// Without it esbuild shakes source differently from the published package.
+const annotatePureCalls: esbuild.Plugin = {
+  name: "annotate-pure-calls",
+  setup(build) {
+    build.onLoad({ filter: /\.ts$/ }, async (args) => {
+      if (!args.path.startsWith(effectSrcDir)) {
+        return undefined
+      }
+      const source = await fs.readFile(args.path, "utf8")
+      const transpiled = await esbuild.transform(source, {
+        loader: "ts",
+        format: "esm",
+        target: "es2022",
+        sourcefile: args.path,
+        tsconfigRaw: { compilerOptions: { verbatimModuleSyntax: true } }
+      })
+      const annotated = await babel.transformAsync(transpiled.code, {
+        babelrc: false,
+        configFile: false,
+        compact: false,
+        cwd: packageDir,
+        filename: args.path,
+        plugins: ["annotate-pure-calls"]
+      })
+      return { contents: annotated!.code!, loader: "js" }
+    })
+  }
+}
+
+// Bundles a fixture the way wrangler does (esbuild, worker conditions) and
+// returns the effect source modules that made it into the output. Only the
+// output entry of the metafile lists retained modules; `metafile.inputs` is
+// the whole import graph, tree-shaken or not.
+const bundledEffectModules = async (fixture: string): Promise<ReadonlyArray<string>> => {
+  const result = await esbuild.build({
+    entryPoints: [path.join(packageDir, "fixtures", fixture)],
+    bundle: true,
+    write: false,
+    metafile: true,
+    format: "esm",
+    platform: "browser",
+    target: "es2022",
+    conditions: ["workerd", "worker", "browser"],
+    logLevel: "silent",
+    absWorkingDir: packageDir,
+    plugins: [annotatePureCalls]
+  })
+  const [output] = Object.values(result.metafile.outputs)
+  return Object.keys(output.inputs)
+    .map((input) => path.relative(effectSrcDir, path.resolve(packageDir, input)))
+    .filter((module) => !module.startsWith(".."))
+    .sort()
+}
+
+describe("http-router fixture bundled with esbuild", () => {
+  it("does not include any Schema module", async () => {
+    const modules = await bundledEffectModules("http-router.ts")
+    assert.include(modules, "unstable/http/HttpRouter.ts")
+    assert.include(modules, "unstable/http/HttpServerRespondable.ts")
+    const schemaModules = modules.filter((module) => /^Schema[A-Za-z]*\.ts$|^internal\/schema\//.test(module))
+    assert.deepStrictEqual(schemaModules, [], `Schema modules reached the router bundle: ${schemaModules.join(", ")}`)
+  })
+})
diff --git a/repos/effect/packages/tools/bundle/test/Plugins.test.ts b/repos/effect/packages/tools/bundle/test/Plugins.test.ts
index 9c272d97b..f180028c1 100644
--- a/repos/effect/packages/tools/bundle/test/Plugins.test.ts
+++ b/repos/effect/packages/tools/bundle/test/Plugins.test.ts
@@ -1,8 +1,10 @@
 import { createResolveLocalPackageImports } from "@effect/bundle/Plugins"
 import { assert, describe, it } from "@effect/vitest"
+import * as Effect from "effect/Effect"
 import type * as EffectPath from "effect/Path"
+import * as fs from "node:fs/promises"
 import * as path from "node:path"
-import { fileURLToPath } from "node:url"
+import { fileURLToPath, pathToFileURL } from "node:url"
 import type { Plugin } from "rollup"
 
 type Resolved = {
@@ -23,6 +25,7 @@ type ResolveId = (
 ) => Promise<Resolved | null>
 
 const packageDir = fileURLToPath(new URL("../../../effect", import.meta.url))
+const bundleDir = fileURLToPath(new URL("..", import.meta.url))
 const pathService = path as unknown as EffectPath.Path
 
 const getResolveId = (plugin: Plugin): ResolveId => {
@@ -72,3 +75,27 @@ describe("createResolveLocalPackageImports", () => {
     assert.deepStrictEqual(result, resolved(path.join(packageDir, "dist", "Schema.js")))
   })
 })
+
+describe("Fixtures", () => {
+  it("discovers fixtures when the module path contains spaces", async () => {
+    const root = await fs.mkdtemp(path.join(bundleDir, ".fixtures-test-"))
+    try {
+      const directory = path.join(root, "Effect Work")
+      const modulePath = path.join(directory, "src", "Fixtures.ts")
+      const fixturesDir = path.join(directory, "fixtures")
+      await fs.mkdir(path.dirname(modulePath), { recursive: true })
+      await fs.mkdir(fixturesDir)
+      await fs.copyFile(path.join(bundleDir, "src", "Fixtures.ts"), modulePath)
+      await fs.writeFile(path.join(fixturesDir, "example.ts"), "")
+
+      const { Fixtures } = await import(pathToFileURL(modulePath).href)
+
+      assert.deepStrictEqual(await Effect.runPromise(Fixtures.make), {
+        fixtures: ["example.ts"],
+        fixturesDir: fixturesDir + path.sep
+      })
+    } finally {
+      await fs.rm(root, { recursive: true, force: true })
+    }
+  })
+})
diff --git a/repos/effect/packages/tools/docgen/CHANGELOG.md b/repos/effect/packages/tools/docgen/CHANGELOG.md
index 6768ba356..5a8aafa73 100644
--- a/repos/effect/packages/tools/docgen/CHANGELOG.md
+++ b/repos/effect/packages/tools/docgen/CHANGELOG.md
@@ -1,5 +1,53 @@
 # @effect/docgen
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- [#8328](https://github.com/Effect-TS/effect/pull/8328) [`eea03fc`](https://github.com/Effect-TS/effect/commit/eea03fca8f2eb8868d144cc5201c5d892b85aee3) Thanks @tim-smart! - Update repository dependencies to their latest compatible releases.
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+  - @effect/platform-node@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+  - @effect/platform-node@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+  - @effect/platform-node@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+  - @effect/platform-node@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7752](https://github.com/Effect-TS/effect/pull/7752) [`f01b8ad`](https://github.com/Effect-TS/effect/commit/f01b8ad9199df7ac617052a2d7f0f2a9d627c2a9) Thanks @kitlangton! - Preserve alias names, constraints, and defaults in generated type signatures.
+
+- [#8041](https://github.com/Effect-TS/effect/pull/8041) [`32f9c60`](https://github.com/Effect-TS/effect/commit/32f9c60189225e0105af46d532272f7462b39aa8) Thanks @kitlangton! - Type-check parsed class property examples and execute them when `runExamples` is enabled. Previously unchecked property examples with type errors now cause docgen to fail.
+
+- [#8051](https://github.com/Effect-TS/effect/pull/8051) [`e7eebf4`](https://github.com/Effect-TS/effect/commit/e7eebf4685c294b423da3f7618629c0e0efc34cc) Thanks @kitlangton! - Fix module page paths for `.`, nested, and absolute source directories so modules with the same filename in different subdirectories produce distinct pages.
+
+- [#8043](https://github.com/Effect-TS/effect/pull/8043) [`1747d84`](https://github.com/Effect-TS/effect/commit/1747d842c80413dc4488574600c935d240d662d2) Thanks @kitlangton! - Prevent examples from modules with colliding flattened paths from overwriting each other, so all examples are checked and optionally executed. Temporary example filenames and diagnostic paths now include a numeric prefix.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`cce221e`](https://github.com/Effect-TS/effect/commit/cce221ebf450bbcf067f73bce98598303f6e4798), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`a4bb2aa`](https://github.com/Effect-TS/effect/commit/a4bb2aa22698ea8a98d5172d81305f4f74bd7caa), [`5664c94`](https://github.com/Effect-TS/effect/commit/5664c941b522a5f318e609b9c45f2eb4c2b92ea1), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`dd6ce2d`](https://github.com/Effect-TS/effect/commit/dd6ce2d6e32c86465a7e706ffd31c0925ec6a9b9), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`e406217`](https://github.com/Effect-TS/effect/commit/e406217f8c12f95626e72bb2b23054d8483b1009), [`f93d051`](https://github.com/Effect-TS/effect/commit/f93d051c3326c4d4e24aa8c2cde67c50850ec02a), [`9252a00`](https://github.com/Effect-TS/effect/commit/9252a00ba3cf8a9eacb72ed161d6bed306444f6c), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`72b8582`](https://github.com/Effect-TS/effect/commit/72b85820f1baeb0abb21a47bd470720f58435a15), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`505dc05`](https://github.com/Effect-TS/effect/commit/505dc05dd68a80694f30bfaf772699494726f54d), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+  - @effect/platform-node@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/tools/docgen/package.json b/repos/effect/packages/tools/docgen/package.json
index 4c5490e0b..19978b173 100644
--- a/repos/effect/packages/tools/docgen/package.json
+++ b/repos/effect/packages/tools/docgen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/docgen",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "An opinionated documentation generator for Effect projects",
@@ -57,14 +57,14 @@
     "check": "tsc -b tsconfig.json"
   },
   "dependencies": {
-    "@babel/code-frame": "^8.0.0",
+    "@babel/code-frame": "^8.0.6",
     "@effect/markdown-toc": "^0.1.0",
     "@effect/platform-node": "workspace:^",
     "chalk": "^6.0.0",
     "doctrine": "^3.0.0",
     "effect": "workspace:^",
     "glob": "^13.0.6",
-    "prettier": "^3.9.6",
+    "prettier": "^3.9.8",
     "ts-morph": "^28.0.0",
     "tsconfck": "^3.1.6"
   },
@@ -76,9 +76,9 @@
     "@effect/vitest": "workspace:^",
     "@types/babel__code-frame": "^7.27.0",
     "@types/doctrine": "^0.0.9",
-    "@types/node": "^26.4.0",
-    "tsx": "^4.23.12",
+    "@types/node": "^26.6.2",
+    "tsx": "^4.23.13",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.11"
+    "vitest": "^5.0.1"
   }
 }
diff --git a/repos/effect/packages/tools/docgen/src/CLI.ts b/repos/effect/packages/tools/docgen/src/CLI.ts
index af0a8379c..f7386fb8d 100644
--- a/repos/effect/packages/tools/docgen/src/CLI.ts
+++ b/repos/effect/packages/tools/docgen/src/CLI.ts
@@ -18,7 +18,7 @@ import * as Configuration from "./Configuration.ts"
 import * as Core from "./Core.ts"
 import * as Domain from "./Domain.ts"
 
-const projectHomepage = Flag.string("homepage").pipe(
+const projectHomepage = Flag.String("homepage").pipe(
   Flag.withFallbackConfig(Config.String("projectHomepage")),
   Flag.withDescription(
     "The link to the project homepage (will be shown in the Auxiliary Links of the generated documentation)"
@@ -26,43 +26,43 @@ const projectHomepage = Flag.string("homepage").pipe(
   Flag.optional
 )
 
-const srcLink = Flag.string("srcLink").pipe(
+const srcLink = Flag.String("srcLink").pipe(
   Flag.withFallbackConfig(Config.String("srcLink")),
   Flag.withDescription("The link to the project source code"),
   Flag.optional
 )
 
-const srcDir = Flag.directory("src", { mustExist: true }).pipe(
+const srcDir = Flag.Directory("src", { mustExist: true }).pipe(
   Flag.withFallbackConfig(Config.String("src").pipe(Config.withDefault("src"))),
   Flag.withDescription("The directory in which docgen will search for TypeScript files to parse")
 )
 
-const outDir = Flag.directory("out").pipe(
+const outDir = Flag.Directory("out").pipe(
   Flag.withFallbackConfig(Config.String("out").pipe(Config.withDefault("docs"))),
   Flag.withDescription("The directory to which docgen will generate its output markdown documents")
 )
 
-const theme = Flag.string("theme").pipe(
+const theme = Flag.String("theme").pipe(
   Flag.withFallbackConfig(Config.String("theme").pipe(Config.withDefault(Configuration.DEFAULT_THEME))),
   Flag.withDescription("The Jekyll theme that should be used for the generated documentation")
 )
 
-const disableSearch = Flag.boolean("disable-search").pipe(
+const disableSearch = Flag.Boolean("disable-search").pipe(
   Flag.withDescription("Whether or not search should be enabled in the generated documentation"),
   Flag.optional
 )
 
-const enableSearchAlias = Flag.boolean("enable-search").pipe(
+const enableSearchAlias = Flag.Boolean("enable-search").pipe(
   Flag.withDescription("Whether or not search should be enabled in the generated documentation"),
   Flag.optional
 )
 
-const enforceDescriptions = Flag.boolean("enforce-descriptions").pipe(
+const enforceDescriptions = Flag.Boolean("enforce-descriptions").pipe(
   Flag.withDescription("Whether or not a description for each module export should be required"),
   Flag.optional
 )
 
-const enforceExamples = Flag.boolean("enforce-examples").pipe(
+const enforceExamples = Flag.Boolean("enforce-examples").pipe(
   Flag.withDescription(
     "Whether or not @example tags for each module export should be required " +
       "(Note: examples will not be enforced in module documentation)"
@@ -70,22 +70,22 @@ const enforceExamples = Flag.boolean("enforce-examples").pipe(
   Flag.optional
 )
 
-const noEnforceVersion = Flag.boolean("no-enforce-version").pipe(
+const noEnforceVersion = Flag.Boolean("no-enforce-version").pipe(
   Flag.withDescription("Whether or not @since tags for each module export should be required"),
   Flag.optional
 )
 
-const enforceVersionAlias = Flag.boolean("enforce-version").pipe(
+const enforceVersionAlias = Flag.Boolean("enforce-version").pipe(
   Flag.withDescription("Whether or not @since tags for each module export should be required"),
   Flag.optional
 )
 
-const runExamples = Flag.boolean("run-examples").pipe(
+const runExamples = Flag.Boolean("run-examples").pipe(
   Flag.withDescription("Whether or not to execute examples discovered in the TypeScript source files"),
   Flag.optional
 )
 
-const exclude = Flag.string("exclude").pipe(
+const exclude = Flag.String("exclude").pipe(
   Flag.between(0, Infinity),
   Flag.withFallbackConfig(
     Config.Array(Schema.String, "exclude").pipe(
@@ -100,7 +100,7 @@ const exclude = Flag.string("exclude").pipe(
 const compilerOptionsSchema = Schema.fromJsonString(Schema.Record(Schema.String, Schema.Unknown))
 
 const parseCompilerOptionsFlag = (name: string, description: string) =>
-  Flag.string(name).pipe(
+  Flag.String(name).pipe(
     Flag.withDescription(description),
     Flag.mapEffect((value) =>
       Schema.decodeUnknownEffect(compilerOptionsSchema)(value).pipe(
@@ -116,7 +116,7 @@ const parseCompilerOptionsFlag = (name: string, description: string) =>
     )
   )
 
-const parseCompilerOptionsFile = Flag.file("parse-tsconfig-file", { mustExist: true }).pipe(
+const parseCompilerOptionsFile = Flag.File("parse-tsconfig-file", { mustExist: true }).pipe(
   Flag.withDescription("The TypeScript TSConfig file to use for parsing source files"),
   Flag.optional
 )
@@ -126,7 +126,7 @@ const parseCompilerOptionsInline = parseCompilerOptionsFlag(
   "The TypeScript compiler options to use for parsing source files"
 ).pipe(Flag.optional)
 
-const examplesCompilerOptionsFile = Flag.file("examples-tsconfig-file", { mustExist: true }).pipe(
+const examplesCompilerOptionsFile = Flag.File("examples-tsconfig-file", { mustExist: true }).pipe(
   Flag.withDescription("The TypeScript TSConfig file to use for examples"),
   Flag.optional
 )
diff --git a/repos/effect/packages/tools/docgen/src/Core.ts b/repos/effect/packages/tools/docgen/src/Core.ts
index ad36ea344..51e5e8046 100644
--- a/repos/effect/packages/tools/docgen/src/Core.ts
+++ b/repos/effect/packages/tools/docgen/src/Core.ts
@@ -220,6 +220,8 @@ const getExampleFiles = (modules: ReadonlyArray<Domain.Module>) =>
     const config = yield* Configuration.Configuration
     const path = yield* Path.Path
     let warnings: Array<string> = []
+    // Flattened module paths can collide, so give every emitted example a unique prefix.
+    let fileIndex = 0
     const files = Array.flatMap(modules, (module) => {
       const prefix = module.path.join("-")
 
@@ -246,7 +248,7 @@ const getExampleFiles = (modules: ReadonlyArray<Domain.Module>) =>
                 path.join(
                   config.outDir,
                   "examples",
-                  `${prefix}-${exampleId}-${namedDoc.name}-${i}.ts`
+                  `${fileIndex++}-${prefix}-${exampleId}-${namedDoc.name}-${i}.ts`
                 ),
                 example,
                 true // make the file overwritable
@@ -262,6 +264,7 @@ const getExampleFiles = (modules: ReadonlyArray<Domain.Module>) =>
       const classExamples = Array.flatMap(module.classes, (c) =>
         Array.flatten([
           getFiles("class")(c),
+          Array.flatMap(c.properties, getFiles(`${c.name}-property`)),
           Array.flatMap(
             c.methods,
             getFiles(`${c.name}-method`)
@@ -549,12 +552,13 @@ const getModuleMarkdownOutputPath = (module: Domain.Module) => {
     return path.normalize(path.join(
       config.outDir,
       "modules",
-      `${module.path.slice(1).join(path.sep)}.md`
+      `${path.relative(config.srcDir, module.path.join(path.sep))}.md`
     ))
   })
 }
 
-const getModuleMarkdownFiles = (modules: ReadonlyArray<Domain.Module>) =>
+/** @internal */
+export const getModuleMarkdownFiles = (modules: ReadonlyArray<Domain.Module>) =>
   Effect.forEach(modules, (module, i) =>
     Effect.gen(function*() {
       const outputPath = yield* getModuleMarkdownOutputPath(module)
diff --git a/repos/effect/packages/tools/docgen/src/Parser.ts b/repos/effect/packages/tools/docgen/src/Parser.ts
index 33f6116c4..c2fa97696 100644
--- a/repos/effect/packages/tools/docgen/src/Parser.ts
+++ b/repos/effect/packages/tools/docgen/src/Parser.ts
@@ -292,10 +292,9 @@ const parseTypeAliasDeclaration = (ta: ast.TypeAliasDeclaration) =>
       return []
     }
     const name = ta.getName()
-    const len = ta.getTypeParameters().length
-    const type = parseType(ta)
+    const typeParameters = ta.getTypeParameters().map((parameter) => parameter.getText()).join(", ")
     const definition = ta.getTypeNode()?.getText()
-    const signature = `type ${len > 0 ? type : name} = ${definition}`
+    const signature = `type ${name}${typeParameters.length > 0 ? `<${typeParameters}>` : ""} = ${definition}`
     const position = yield* parsePosition(ta)
     return [
       new Domain.TypeAlias(
diff --git a/repos/effect/packages/tools/docgen/test/Configuration.test.ts b/repos/effect/packages/tools/docgen/test/Configuration.test.ts
index 2c05a3a69..7d7b823a8 100644
--- a/repos/effect/packages/tools/docgen/test/Configuration.test.ts
+++ b/repos/effect/packages/tools/docgen/test/Configuration.test.ts
@@ -3,6 +3,7 @@ import * as Configuration from "@effect/docgen/Configuration"
 import * as Domain from "@effect/docgen/Domain"
 import * as NodeServices from "@effect/platform-node/NodeServices"
 import { assert, describe, it } from "@effect/vitest"
+import * as ByteSize from "effect/ByteSize"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as Exit from "effect/Exit"
@@ -31,7 +32,7 @@ const fileInfo: FileSystem.File.Info = {
   uid: Option.none(),
   gid: Option.none(),
   rdev: Option.none(),
-  size: FileSystem.Size(0),
+  size: ByteSize.zero,
   blksize: Option.none(),
   blocks: Option.none()
 }
diff --git a/repos/effect/packages/tools/docgen/test/Core.test.ts b/repos/effect/packages/tools/docgen/test/Core.test.ts
index fd16ccf2c..ab9eaf493 100644
--- a/repos/effect/packages/tools/docgen/test/Core.test.ts
+++ b/repos/effect/packages/tools/docgen/test/Core.test.ts
@@ -1,7 +1,17 @@
+import * as Configuration from "@effect/docgen/Configuration"
 import * as Core from "@effect/docgen/Core"
+import * as Domain from "@effect/docgen/Domain"
+import * as Parser from "@effect/docgen/Parser"
 import * as NodeServices from "@effect/platform-node/NodeServices"
 import { assert, describe, it } from "@effect/vitest"
 import * as Effect from "effect/Effect"
+import * as FileSystem from "effect/FileSystem"
+import * as Path from "effect/Path"
+import * as Sink from "effect/Sink"
+import * as Stream from "effect/Stream"
+import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner"
+import * as path from "node:path"
+import * as ast from "ts-morph"
 
 const assertFencedCode = (
   markdown: string,
@@ -11,7 +21,209 @@ const assertFencedCode = (
   assert.deepStrictEqual(Core.extractFencedCode(markdown), [expectedExamples, expectedWarnings])
 }
 
+const assertExampleFiles = (source: string, expected: ReadonlyArray<string>, runExamples = true) =>
+  Effect.gen(function*() {
+    const fs = yield* FileSystem.FileSystem
+    const path = yield* Path.Path
+    const cwd = yield* fs.makeTempDirectoryScoped()
+    const config: Configuration.ConfigurationShape = {
+      projectName: "docgen",
+      projectHomepage: "https://example.test",
+      srcLink: "https://example.test",
+      srcDir: path.relative(process.cwd(), path.join(cwd, "src")),
+      outDir: path.relative(process.cwd(), path.join(cwd, "docs")),
+      theme: Configuration.DEFAULT_THEME,
+      enableSearch: true,
+      enforceDescriptions: false,
+      enforceExamples: false,
+      enforceVersion: false,
+      tscExecutable: "tsc",
+      runExamples,
+      exclude: [],
+      parseCompilerOptions: {},
+      examplesCompilerOptions: Configuration.defaultCompilerOptions
+    }
+    yield* fs.makeDirectory(config.srcDir)
+    yield* fs.writeFileString(path.join(config.srcDir, "Box.ts"), source)
+
+    const commands: Array<string> = []
+    // Inspect the generated inputs without invoking a compiler or executing examples.
+    const spawner = ChildProcessSpawner.make((command) =>
+      Effect.gen(function*() {
+        if (command._tag !== "StandardCommand") return yield* Effect.die("Unexpected pipeline")
+        commands.push(command.command)
+        const directory = path.join(config.outDir, "examples")
+        const names = (yield* fs.readDirectory(directory))
+          .filter((name) => name.endsWith(".ts") && name !== "index.ts").sort()
+        const contents = yield* Effect.forEach(names, (name) => fs.readFileString(path.join(directory, name)))
+        assert.deepStrictEqual(contents.sort(), [...expected].sort())
+        const index = yield* fs.readFileString(path.join(directory, "index.ts"))
+        assert.deepStrictEqual(index.trim().split("\n").sort(), names.map((name) => `import './${name.slice(0, -3)}'`))
+        return ChildProcessSpawner.makeHandle({
+          pid: ChildProcessSpawner.ProcessId(1),
+          exitCode: Effect.succeed(ChildProcessSpawner.ExitCode(0)),
+          isRunning: Effect.succeed(false),
+          kill: () => Effect.void,
+          stdin: Sink.drain,
+          stdout: Stream.empty,
+          stderr: Stream.empty,
+          all: Stream.empty,
+          getInputFd: () => Sink.drain,
+          getOutputFd: () => Stream.empty,
+          unref: Effect.succeed(Effect.void)
+        })
+      })
+    )
+    yield* Core.program.pipe(
+      Effect.provideService(Configuration.Configuration, config),
+      Effect.provideService(Domain.Process, {
+        cwd: Effect.succeed(process.cwd()),
+        platform: Effect.succeed(process.platform),
+        argv: Effect.succeed([]),
+        env: Effect.succeed({})
+      }),
+      Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner)
+    )
+    const executables = expected.length === 0 ? [] : runExamples ? ["tsc", "tsx"] : ["tsc"]
+    assert.deepStrictEqual(commands, executables.map((name) => process.platform === "win32" ? `${name}.cmd` : name))
+  }).pipe(Effect.provide(NodeServices.layer))
+
 describe("Core", () => {
+  describe("class property examples", () => {
+    for (const runExamples of [true, false]) {
+      it.effect(`collects property-only examples with runExamples: ${runExamples}`, () =>
+        assertExampleFiles(
+          `export class Box {
+            /**
+             * @example
+             * ~~~ts
+             * const value = 1
+             * ~~~
+             */
+            readonly value = 1
+          }`,
+          ["const value = 1"],
+          runExamples
+        ))
+    }
+
+    it.effect("collects property descriptions and example tags alongside methods, excluding skipped fences", () =>
+      assertExampleFiles(
+        `export class Box {
+          /**
+           * ~~~ts
+           * const description = 1
+           * ~~~
+           * @example
+           * ~~~ts
+           * const first = 1
+           * ~~~
+           * @example
+           * ~~~ts
+           * const second = 2
+           * ~~~
+           * @example
+           * ~~~ts skip-type-checking
+           * const skipped: string = 1
+           * ~~~
+           */
+          readonly value = 1
+          /**
+           * @example
+           * ~~~ts
+           * const method = 3
+           * ~~~
+           */
+          read() { return this.value }
+        }`,
+        ["const description = 1", "const first = 1", "const second = 2", "const method = 3"]
+      ))
+
+    it.effect("does not request validation when all property examples are skipped", () =>
+      assertExampleFiles(
+        `export class Box {
+          /**
+           * @example
+           * ~~~ts skip-type-checking
+           * const skipped: string = 1
+           * ~~~
+           */
+          readonly value = 1
+        }`,
+        []
+      ))
+  })
+
+  describe("[internal] getModuleMarkdownFiles", () => {
+    for (const srcDir of [".", "src", "source/lib", path.resolve("source/lib"), process.cwd()]) {
+      it.effect(`generates distinct source-relative pages for ${srcDir}`, () =>
+        Effect.gen(function*() {
+          const project = new ast.Project({ useInMemoryFileSystem: true })
+          const sources = [
+            ["left/Shared.ts", "leftMarker"],
+            ["right/Shared.ts", "rightMarker"],
+            ["Flat.ts", "flatMarker"]
+          ] as const
+          const modules = yield* Effect.forEach(sources, ([relativePath, marker]) => {
+            const filePath = path.join(srcDir, relativePath)
+            const content = `/** @since 1.0.0 */\nexport const ${marker} = "${marker}"\n`
+            project.createSourceFile(filePath, content)
+            return Parser.parseFile(project)(new Domain.File(filePath, content))
+          })
+          const files = yield* Core.getModuleMarkdownFiles(modules)
+
+          assert.deepStrictEqual(files.map((file) => file.path), [
+            path.join("docs", "modules", "left", "Shared.ts.md"),
+            path.join("docs", "modules", "right", "Shared.ts.md"),
+            path.join("docs", "modules", "Flat.ts.md")
+          ])
+          for (const [index, file] of files.entries()) {
+            assert.deepStrictEqual(
+              sources.map(([, marker]) => marker).filter((marker) => file.content.includes(marker)),
+              [sources[index][1]]
+            )
+            assert.isTrue(file.isOverwriteable)
+          }
+        }).pipe(
+          Effect.provideService(Configuration.Configuration, {
+            projectName: "docgen",
+            projectHomepage: "https://example.com",
+            srcLink: "https://example.com/src",
+            srcDir,
+            outDir: "docs",
+            theme: Configuration.DEFAULT_THEME,
+            enableSearch: true,
+            enforceDescriptions: false,
+            enforceExamples: false,
+            enforceVersion: true,
+            runExamples: false,
+            tscExecutable: "tsc",
+            exclude: [],
+            parseCompilerOptions: {},
+            examplesCompilerOptions: {}
+          }),
+          Effect.provide(NodeServices.layer)
+        ))
+    }
+  })
+
+  it.effect("preserves a type alias name and declared type parameters", () => {
+    const sourceFile = new ast.Project({ useInMemoryFileSystem: true }).createSourceFile(
+      "Identity.ts",
+      `/**
+       * A boxed value.
+       *
+       * @since 1.0.0
+       */
+      export type Identity<A extends string = string> = A`
+    )
+
+    return Parser.parseTypeAliases.pipe(
+      Effect.provideService(Parser.Source, { path: ["Identity.ts"], sourceFile }),
+      Effect.map(([alias]) => assert.strictEqual(alias?.signature, "type Identity<A extends string = string> = A"))
+    )
+  })
+
   describe("[internal] extractFencedCode", () => {
     it("should extract fenced code blocks from markdown (backticks)", () => {
       assertFencedCode("a\n\n```ts\nconst a = 1\n```\n\nb", ["const a = 1"], [])
diff --git a/repos/effect/packages/tools/doctest/CHANGELOG.md b/repos/effect/packages/tools/doctest/CHANGELOG.md
index ab09c5b35..6fc62482f 100644
--- a/repos/effect/packages/tools/doctest/CHANGELOG.md
+++ b/repos/effect/packages/tools/doctest/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @effect/doctest
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- [#8328](https://github.com/Effect-TS/effect/pull/8328) [`eea03fc`](https://github.com/Effect-TS/effect/commit/eea03fca8f2eb8868d144cc5201c5d892b85aee3) Thanks @tim-smart! - Update repository dependencies to their latest compatible releases.
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- [#8225](https://github.com/Effect-TS/effect/pull/8225) [`8abae87`](https://github.com/Effect-TS/effect/commit/8abae870f901540fe7e1ec461aef755558a3fe69) Thanks @tim-smart! - Update Rolldown, the Deno Redis driver, Cloudflare Workers types, and MySQL dependencies to their latest releases.
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#8096](https://github.com/Effect-TS/effect/pull/8096) [`cce221e`](https://github.com/Effect-TS/effect/commit/cce221ebf450bbcf067f73bce98598303f6e4798) Thanks @tim-smart! - Update dependencies to their latest compatible versions.
+
+- [#8049](https://github.com/Effect-TS/effect/pull/8049) [`8efa569`](https://github.com/Effect-TS/effect/commit/8efa56986d827b052d5a2abdf996812008e04635) Thanks @kitlangton! - Fix spurious TypeScript syntax errors when running marked code fences in Markdown and MDX documents.
+
+- [#7754](https://github.com/Effect-TS/effect/pull/7754) [`d902f1f`](https://github.com/Effect-TS/effect/commit/d902f1fd92dba535ebcf220163e9fe0871210013) Thanks @kitlangton! - Preserve statement boundaries after generated doctest assertions.
+
+- [#7534](https://github.com/Effect-TS/effect/pull/7534) [`c1693ff`](https://github.com/Effect-TS/effect/commit/c1693ffda83924ef2c71959cda643477ee42002d) Thanks @tim-smart! - Update production dependencies to their latest releases.
+
+- [#8104](https://github.com/Effect-TS/effect/pull/8104) [`e9915d5`](https://github.com/Effect-TS/effect/commit/e9915d5d7a13c2abab99eea4603bfb945d6090b7) Thanks @tim-smart! - Require Vitest `>=5.0.0 <6.0.0` and Node.js `^22.12.0 || ^24.0.0 || >=26.0.0`.
+  
+  ### Breaking changes
+  
+  - Replace `.sequential` and `{ sequential: true }` with `{ concurrent: false }`.
+  - Use `bench` from the test context and await `bench(name, fn).run()`. The top-level benchmark API is removed.
+  - Use `Assertion<void, T>` or `Assertion<Promise<void>, T>`. Define custom matchers through `vitest.Matchers`, not `@vitest/expect`.
+  - Import reporter types from `vitest/node` and environment/snapshot APIs from `vitest/runtime`. Set `outputFile` when consuming JSON reports.
+  - Await asynchronous assertions. Mock history now clears before each test.
+  
+  See the [Vitest migration guide](https://vitest.dev/guide/migration/) for removed types and other upstream changes.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/tools/doctest/README.md b/repos/effect/packages/tools/doctest/README.md
index 045951405..bc038a77f 100644
--- a/repos/effect/packages/tools/doctest/README.md
+++ b/repos/effect/packages/tools/doctest/README.md
@@ -4,10 +4,14 @@
 
 ## Installation
 
+Install Vitest 5 (`>=5.0.0 <6.0.0`) and Vite `>=8.1.5 <9.0.0` alongside the package:
+
 ```sh
-npm install -D @effect/doctest@rc
+npm install -D @effect/doctest@rc vitest@^5 vite@^8.1.5
 ```
 
+Vitest 5 supports Node.js `^22.12.0 || ^24.0.0 || >=26.0.0`. Existing snippet markers and doctest configuration remain supported. When upgrading, import reporter types from `vitest/node`; JSON reports now default to a file, so configure `outputFile` explicitly when consuming the report. See the [Vitest migration guide](https://vitest.dev/guide/migration/) for upstream changes.
+
 ## Documentation
 
 - [Effect website](https://effect.website)
diff --git a/repos/effect/packages/tools/doctest/package.json b/repos/effect/packages/tools/doctest/package.json
index 51ad5d244..09f7ae891 100644
--- a/repos/effect/packages/tools/doctest/package.json
+++ b/repos/effect/packages/tools/doctest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/doctest",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "Runs TypeScript documentation examples as Vitest tests",
@@ -46,18 +46,18 @@
     "check": "tsc -b tsconfig.json"
   },
   "dependencies": {
-    "rolldown": "^1.2.6"
+    "rolldown": "^1.2.9"
   },
   "peerDependencies": {
     "effect": "workspace:^",
     "vite": ">=8.1.5 <9.0.0",
-    "vitest": ">=4.1.10 <5.0.0"
+    "vitest": ">=5.0.0 <6.0.0"
   },
   "devDependencies": {
     "@effect/vitest": "workspace:^",
-    "@types/node": "^26.4.0",
+    "@types/node": "^26.6.2",
     "effect": "workspace:^",
-    "vite": "^8.2.2",
-    "vitest": "^4.1.11"
+    "vite": "^8.3.0",
+    "vitest": "^5.0.1"
   }
 }
diff --git a/repos/effect/packages/tools/doctest/src/Plugin.ts b/repos/effect/packages/tools/doctest/src/Plugin.ts
index d0735859e..836ae60b2 100644
--- a/repos/effect/packages/tools/doctest/src/Plugin.ts
+++ b/repos/effect/packages/tools/doctest/src/Plugin.ts
@@ -2,7 +2,7 @@
  * @since 4.0.0
  */
 
-import { normalizePath, type Plugin } from "vite"
+import { normalizePath, type Plugin, transformWithOxc } from "vite"
 import type { TestUserConfig } from "vitest/config"
 import * as Protocol from "./Protocol.ts"
 import * as Source from "./Source.ts"
@@ -95,7 +95,7 @@ export const plugin = (): Plugin => {
       }
 
       this.addWatchFile(loaded.file)
-      return loadExamples(loaded.file, loaded.version).then((snippets) => {
+      return loadExamples(loaded.file, loaded.version).then(async (snippets) => {
         if (loaded.kind === "collector") {
           return collectorModule(loaded.file, snippets, loaded.version)
         }
@@ -105,7 +105,13 @@ export const plugin = (): Plugin => {
           throw new Error(`Unknown documentation snippet module '${id}'`)
         }
 
-        return transform(snippet.source, loaded.file, snippet.line)
+        const source = transform(snippet.source, loaded.file, snippet.line)
+        if (Source.isMarkdown(loaded.file)) {
+          // Seed the source map with the snippet's document offset. Oxc removes
+          // these blank lines from the emitted code but preserves their mapping.
+          return transformWithOxc("\n".repeat(snippet.line) + source, loaded.file, { lang: "ts" })
+        }
+        return source
       })
     },
     watchChange(id) {
diff --git a/repos/effect/packages/tools/doctest/src/Source.ts b/repos/effect/packages/tools/doctest/src/Source.ts
index 9185b2ed5..b3d864165 100644
--- a/repos/effect/packages/tools/doctest/src/Source.ts
+++ b/repos/effect/packages/tools/doctest/src/Source.ts
@@ -24,6 +24,14 @@ export interface Snippet {
  */
 export type SourceFormat = "jsdoc" | "markdown"
 
+/**
+ * Returns whether a file uses Markdown or MDX documentation syntax.
+ *
+ * @category guards
+ * @since 4.0.0
+ */
+export const isMarkdown = (file: string): boolean => file.endsWith(".md") || file.endsWith(".mdx")
+
 const jsdocPattern = /\/\*\*[\s\S]*?\*\//g
 const fencePattern = /(?:```|~~~)(.*?)\n([\s\S]*?)(?:(?:```|~~~)|$)/g
 const runnableMarker = "import.meta.vitest"
@@ -98,6 +106,4 @@ export const extract = (source: string, format: SourceFormat = "jsdoc"): Readonl
  * @since 4.0.0
  */
 export const extractFile = (file: string): Promise<ReadonlyArray<Snippet>> =>
-  readFile(file, "utf8").then((source) =>
-    extract(source, file.endsWith(".md") || file.endsWith(".mdx") ? "markdown" : "jsdoc")
-  )
+  readFile(file, "utf8").then((source) => extract(source, isMarkdown(file) ? "markdown" : "jsdoc"))
diff --git a/repos/effect/packages/tools/doctest/src/Transform.ts b/repos/effect/packages/tools/doctest/src/Transform.ts
index 49c78a0c8..9dbcc85c2 100644
--- a/repos/effect/packages/tools/doctest/src/Transform.ts
+++ b/repos/effect/packages/tools/doctest/src/Transform.ts
@@ -175,7 +175,7 @@ export const transform = (source: string, file: string, line: number): string =>
       output.overwrite(
         expression.start,
         comment.end,
-        `${alias}(${source.slice(expression.start, expression.end)}, ${expected})`
+        `${alias}(${source.slice(expression.start, expression.end)}, ${expected});`
       )
       continue
     }
@@ -189,7 +189,7 @@ export const transform = (source: string, file: string, line: number): string =>
         id?.type === "Identifier" && typeof id.name === "string"
       ) {
         const indentation = source.slice(source.lastIndexOf("\n", node.start - 1) + 1, node.start)
-        output.overwrite(node.end, comment.end, `\n${indentation}${alias}(${id.name}, ${expected})`)
+        output.overwrite(node.end, comment.end, `\n${indentation}${alias}(${id.name}, ${expected});`)
         continue
       }
     }
diff --git a/repos/effect/packages/tools/doctest/test/Plugin.test.ts b/repos/effect/packages/tools/doctest/test/Plugin.test.ts
index f4fe70e46..5bf0e90ec 100644
--- a/repos/effect/packages/tools/doctest/test/Plugin.test.ts
+++ b/repos/effect/packages/tools/doctest/test/Plugin.test.ts
@@ -1,11 +1,52 @@
 import * as Doctest from "@effect/doctest/Plugin"
 import * as Protocol from "@effect/doctest/Protocol"
 import { assert, describe, it } from "@effect/vitest"
-import { mkdtempSync, rmSync, writeFileSync } from "node:fs"
+import { rejects } from "node:assert/strict"
+import { spawnSync } from "node:child_process"
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs"
+import { createRequire, SourceMap } from "node:module"
 import { tmpdir } from "node:os"
-import { join } from "node:path"
+import { dirname, join, relative } from "node:path"
+import { compileFunction } from "node:vm"
+import type { JsonTestResults } from "vitest/node"
 
 describe("Plugin", () => {
+  it("executes Markdown, MDX and JSDoc snippets through Vitest", () => {
+    const output = mkdtempSync(join(tmpdir(), "effect-doctest-report-"))
+    try {
+      const reportFile = join(output, "report.json")
+      const result = spawnSync("node", [
+        join(dirname(createRequire(import.meta.url).resolve("vitest/package.json")), "vitest.mjs"),
+        "run",
+        "--config",
+        "vitest.config.ts",
+        "--reporter=default",
+        "--reporter=json",
+        "--outputFile.json",
+        reportFile
+      ], {
+        cwd: join(import.meta.dirname, "fixtures/markdown"),
+        encoding: "utf8",
+        timeout: 30_000
+      })
+      assert.strictEqual(result.status, 0, `${result.error ?? ""}\n${result.stdout}\n${result.stderr}`)
+      const report: JsonTestResults = JSON.parse(readFileSync(reportFile, "utf8"))
+      assert.deepStrictEqual(
+        report.testResults.flatMap((file) => file.assertionResults.map((test) => [test.fullName, test.status])).sort(),
+        [
+          ["assertion-comments", "passed"],
+          ["dynamic-import", "passed"],
+          ["javascript", "passed"],
+          ["static-import", "passed"],
+          ["typed-jsdoc", "passed"],
+          ["typed-mdx", "passed"]
+        ]
+      )
+    } finally {
+      rmSync(output, { recursive: true, force: true })
+    }
+  }, 40_000)
+
   it("configures the doctest runner by default", () => {
     const config = Doctest.plugin().config
     if (typeof config !== "function") return assert.fail("expected config hook")
@@ -22,7 +63,7 @@ describe("Plugin", () => {
     assert.isUndefined(config.call({} as never, { test: { runner: "./custom-runner.ts" } }, {} as never))
   })
 
-  it("transforms inline assertions in snippet modules", async () => {
+  it("preserves statement boundaries after inline assertions", async () => {
     const root = mkdtempSync(join(tmpdir(), "effect-doctest-plugin-"))
     const file = join(root, "example.ts")
     writeFileSync(
@@ -30,7 +71,8 @@ describe("Plugin", () => {
       [
         "/**",
         " * ```ts import.meta.vitest name=asserted",
-        " * const result = 1 // => 1",
+        " * const result = 1; // => 1",
+        " * [1, 2].forEach(record)",
         " * ```",
         " */"
       ].join("\n")
@@ -58,8 +100,98 @@ describe("Plugin", () => {
       if (typeof resolvedSnippet !== "string") return assert.fail("expected resolved snippet ID")
       const snippet = await load.call(context, resolvedSnippet, {} as never)
       if (typeof snippet !== "string") return assert.fail("expected snippet source")
-      assert.match(snippet, /const result = 1\n__effect_doctest_assert_0\(result, 1\)/)
+      assert.match(snippet, /const result = 1;\n__effect_doctest_assert_0\(result, 1\)/)
       assert.match(snippet, /assertEquals as __effect_doctest_assert_0/)
+
+      const values: Array<number> = []
+      compileFunction(snippet.slice(0, snippet.lastIndexOf("\n\nimport ")), ["__effect_doctest_assert_0", "record"])(
+        (actual: unknown, expected: unknown) => assert.deepStrictEqual(actual, expected),
+        (value: number) => values.push(value)
+      )
+      assert.deepStrictEqual(values, [1, 2])
+    } finally {
+      rmSync(root, { recursive: true, force: true })
+    }
+  })
+
+  it("lowers TypeScript without changing the snippet identity and maps to the document line", async () => {
+    const root = mkdtempSync(join(tmpdir(), "effect-doctest-markdown-"))
+    try {
+      const file = join(root, "example.md")
+      writeFileSync(file, "# Example\n\n```ts import.meta.vitest\nconst local: number = 42\nrecord(local)\n```\n")
+      const plugin = Doctest.plugin()
+      const resolveId = plugin.resolveId
+      const load = plugin.load
+      if (typeof resolveId !== "function" || typeof load !== "function") {
+        return assert.fail("expected function plugin hooks")
+      }
+      const context = { addWatchFile() {} } as never
+      const collector = Protocol.resolvedId("collector", { file, version: "test" })
+      await load.call(context, collector, {} as never)
+      const resolved = await resolveId.call(context, Protocol.snippetId(file, 0, "test"), undefined, {} as never)
+      assert.strictEqual(resolved, Protocol.resolvedId("snippet", { file, index: 0, version: "test" }))
+      if (typeof resolved !== "string") return assert.fail("expected string ID")
+      const output = await load.call(context, resolved, {} as never)
+      if (output === null || typeof output !== "object") return assert.fail("expected compiled snippet")
+      const values: Array<unknown> = []
+      compileFunction(output.code, ["record"])((value: unknown) => values.push(value))
+      assert.deepStrictEqual(values, [42])
+      if (output.map === null || output.map === undefined || typeof output.map === "string") {
+        return assert.fail("expected source map")
+      }
+      assert.deepStrictEqual(output.map.sources, [file])
+      const line = output.code.split("\n").findIndex((line) => line.includes("record(local)"))
+      const mapping = new SourceMap({
+        version: 3,
+        file,
+        sourceRoot: "",
+        sources: output.map.sources?.map((source) => source ?? "") ?? [],
+        sourcesContent: output.map.sourcesContent?.map((source) => source ?? "") ?? [],
+        names: output.map.names ?? [],
+        mappings: output.map.mappings
+      }).findEntry(line, 0)
+      assert.deepInclude(mapping, { originalSource: file, originalLine: 4 })
+    } finally {
+      rmSync(root, { recursive: true, force: true })
+    }
+  })
+
+  it("leaves normal TypeScript snippets for Vite to compile once", async () => {
+    const root = mkdtempSync(join(tmpdir(), "effect-doctest-typescript-"))
+    try {
+      const file = join(root, "example.ts")
+      writeFileSync(file, "/**\n * ```ts import.meta.vitest\n * const local: number = 42\n * ```\n */\n")
+      const load = Doctest.plugin().load
+      if (typeof load !== "function") return assert.fail("expected load hook")
+      const output = await load.call(
+        { addWatchFile() {} } as never,
+        Protocol.resolvedId("snippet", { file, index: 0, version: "test" }),
+        {} as never
+      )
+      assert.strictEqual(output, "const local: number = 42")
+    } finally {
+      rmSync(root, { recursive: true, force: true })
+    }
+  })
+
+  it("reports invalid TypeScript using the document filename and line", async () => {
+    const root = mkdtempSync(join(tmpdir(), "effect-doctest-invalid-"))
+    try {
+      const file = join(root, "example.md")
+      writeFileSync(file, "# Example\n\n```ts import.meta.vitest\nconst local: = 42\n```\n")
+      const load = Doctest.plugin().load
+      if (typeof load !== "function") return assert.fail("expected load hook")
+      await rejects(
+        Promise.resolve(load.call(
+          { addWatchFile() {} } as never,
+          Protocol.resolvedId("snippet", { file, index: 0, version: "test" }),
+          {} as never
+        )),
+        (error: unknown) => {
+          assert.include(String(error), `${relative(process.cwd(), file)}:4:14`)
+          return true
+        }
+      )
     } finally {
       rmSync(root, { recursive: true, force: true })
     }
diff --git a/repos/effect/packages/tools/doctest/test/Transform.test.ts b/repos/effect/packages/tools/doctest/test/Transform.test.ts
index 563014090..c92e95c51 100644
--- a/repos/effect/packages/tools/doctest/test/Transform.test.ts
+++ b/repos/effect/packages/tools/doctest/test/Transform.test.ts
@@ -7,21 +7,21 @@ describe("Transform", () => {
   it("transforms expression assertions", () => {
     assert.strictEqual(
       transform("Option.some(1) // => Option.some(1)", "example.ts", 10),
-      `__effect_doctest_assert_0(Option.some(1), Option.some(1))\n\n${imported}`
+      `__effect_doctest_assert_0(Option.some(1), Option.some(1));\n\n${imported}`
     )
   })
 
   it("transforms const declaration assertions without evaluating the initializer twice", () => {
     assert.strictEqual(
       transform("const result = makeValue() // => Option.some(1)\nuse(result)", "example.ts", 10),
-      `const result = makeValue()\n__effect_doctest_assert_0(result, Option.some(1))\nuse(result)\n\n${imported}`
+      `const result = makeValue()\n__effect_doctest_assert_0(result, Option.some(1));\nuse(result)\n\n${imported}`
     )
   })
 
   it("preserves indentation in nested blocks", () => {
     assert.strictEqual(
       transform("if (enabled) {\n  const result = makeValue() // => 1\n}", "example.ts", 10),
-      `if (enabled) {\n  const result = makeValue()\n  __effect_doctest_assert_0(result, 1)\n}\n\n${imported}`
+      `if (enabled) {\n  const result = makeValue()\n  __effect_doctest_assert_0(result, 1);\n}\n\n${imported}`
     )
   })
 
diff --git a/repos/effect/packages/tools/doctest/test/fixtures/markdown/docs/helper.ts b/repos/effect/packages/tools/doctest/test/fixtures/markdown/docs/helper.ts
new file mode 100644
index 000000000..eab39ce89
--- /dev/null
+++ b/repos/effect/packages/tools/doctest/test/fixtures/markdown/docs/helper.ts
@@ -0,0 +1 @@
+export const answer = 42
diff --git a/repos/effect/packages/tools/doctest/test/fixtures/markdown/docs/typed.md b/repos/effect/packages/tools/doctest/test/fixtures/markdown/docs/typed.md
new file mode 100644
index 000000000..47c0199ad
--- /dev/null
+++ b/repos/effect/packages/tools/doctest/test/fixtures/markdown/docs/typed.md
@@ -0,0 +1,43 @@
+# Typed Markdown examples
+
+This prose is not JavaScript and must never execute.
+throw new Error("Markdown prose must not execute")
+
+```ts import.meta.vitest name=static-import
+import { expect } from "vitest"
+import { answer } from "./helper.ts"
+const local: number = answer
+expect.assertions(2)
+expect(local).toBe(42)
+expect(import.meta.url).toContain("/docs/typed.md")
+```
+
+```ts import.meta.vitest name=dynamic-import
+import { expect } from "vitest"
+const { answer } = await import("./helper.ts")
+const local: number = answer + 1
+expect.assertions(2)
+expect(local).toBe(43)
+expect(import.meta.url).toContain("/docs/typed.md")
+```
+
+```ts import.meta.vitest name=javascript
+import { expect } from "vitest"
+const local = 42
+expect.assertions(1)
+expect(local).toBe(42)
+```
+
+```ts import.meta.vitest name=assertion-comments
+import { expect } from "vitest"
+import { answer } from "./helper.ts"
+let evaluations = 0
+const expected = (value: number): number => {
+  evaluations++
+  return value
+}
+const local: number = answer // => expected(42)
+local + 1 // => expected(43)
+expect.assertions(1)
+expect(evaluations).toBe(2)
+```
diff --git a/repos/effect/packages/tools/doctest/test/fixtures/markdown/docs/typed.mdx b/repos/effect/packages/tools/doctest/test/fixtures/markdown/docs/typed.mdx
new file mode 100644
index 000000000..a4980b567
--- /dev/null
+++ b/repos/effect/packages/tools/doctest/test/fixtures/markdown/docs/typed.mdx
@@ -0,0 +1,10 @@
+# Typed MDX example
+
+```ts import.meta.vitest name=typed-mdx
+import { expect } from "vitest"
+import { answer } from "./helper.ts"
+const local: number = answer
+expect.assertions(2)
+expect(local).toBe(42)
+expect(import.meta.url).toContain("/docs/typed.mdx")
+```
diff --git a/repos/effect/packages/tools/doctest/test/fixtures/markdown/src/typed.ts b/repos/effect/packages/tools/doctest/test/fixtures/markdown/src/typed.ts
new file mode 100644
index 000000000..ad63cfcd9
--- /dev/null
+++ b/repos/effect/packages/tools/doctest/test/fixtures/markdown/src/typed.ts
@@ -0,0 +1,12 @@
+throw new Error("The source module must not execute")
+
+/**
+ * ```ts import.meta.vitest name=typed-jsdoc
+ * import { expect } from "vitest"
+ * import { answer } from "../docs/helper.ts"
+ * const local: number = answer
+ * expect.assertions(2)
+ * expect(local).toBe(42)
+ * expect(import.meta.url).toContain("/src/typed.ts")
+ * ```
+ */
diff --git a/repos/effect/packages/tools/doctest/test/fixtures/markdown/vitest.config.ts b/repos/effect/packages/tools/doctest/test/fixtures/markdown/vitest.config.ts
new file mode 100644
index 000000000..2f7923f4a
--- /dev/null
+++ b/repos/effect/packages/tools/doctest/test/fixtures/markdown/vitest.config.ts
@@ -0,0 +1,16 @@
+import * as Doctest from "@effect/doctest/Plugin"
+import { defineConfig } from "vitest/config"
+
+export default defineConfig({
+  root: import.meta.dirname,
+  plugins: [Doctest.plugin()],
+  test: {
+    watch: false,
+    include: [],
+    includeSource: ["docs/typed.md", "docs/typed.mdx", "src/typed.ts"],
+    passWithNoTests: false,
+    fileParallelism: false,
+    maxWorkers: 1,
+    retry: 0
+  }
+})
diff --git a/repos/effect/packages/tools/jsdocs/package.json b/repos/effect/packages/tools/jsdocs/package.json
index fcf9c05a2..17c44a35d 100644
--- a/repos/effect/packages/tools/jsdocs/package.json
+++ b/repos/effect/packages/tools/jsdocs/package.json
@@ -54,8 +54,8 @@
   },
   "devDependencies": {
     "@effect/vitest": "workspace:^",
-    "@types/node": "^26.4.0",
+    "@types/node": "^26.6.2",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.11"
+    "vitest": "^5.0.1"
   }
 }
diff --git a/repos/effect/packages/tools/jsdocs/src/Jsdocs.ts b/repos/effect/packages/tools/jsdocs/src/Jsdocs.ts
index a5b9d0d0a..a60a6b5fb 100644
--- a/repos/effect/packages/tools/jsdocs/src/Jsdocs.ts
+++ b/repos/effect/packages/tools/jsdocs/src/Jsdocs.ts
@@ -468,8 +468,9 @@ const tagOrder = new Map([
   ["deprecated", 0],
   ["default", 1],
   ["see", 2],
-  ["category", 3],
-  ["since", 4]
+  ["unstable", 3],
+  ["category", 4],
+  ["since", 5]
 ])
 const signatureTypeFormatFlags = ts.TypeFormatFlags.NoTruncation |
   ts.TypeFormatFlags.UseSingleQuotesForStringLiteralType
@@ -1460,7 +1461,7 @@ function buildTags(
 ): Result<ParsedModuleTags | ParsedDeclarationTags | ParsedNamespaceTags | ParsedMemberTags, JSDocParseError> {
   const diagnostics: Array<JSDocDiagnostic> = []
   const allowed = scope === "declaration"
-    ? new Set(["deprecated", "see", "category", "since"])
+    ? new Set(["deprecated", "see", "unstable", "category", "since"])
     : scope === "member"
     ? new Set(["deprecated", "default", "see", "since"])
     : scope === "module"
@@ -3377,6 +3378,10 @@ export function loadJSDocConfig(cwd = process.cwd(), configPath = "jsdocs.config
  * @since 4.0.0
  */
 export function extractJSDocsSync(options: ExtractJSDocsOptions): JSDocModel {
+  // Share caches within an extraction, not across source snapshots.
+  programCache.clear()
+  packageMetadataCache.clear()
+  barrelExportCache.clear()
   const cwd = path.resolve(options.cwd ?? process.cwd())
   const tsconfigPath = path.resolve(cwd, options.tsconfig)
   const entry = getProgram(tsconfigPath)
diff --git a/repos/effect/packages/tools/jsdocs/test/jsdocs.test.ts b/repos/effect/packages/tools/jsdocs/test/jsdocs.test.ts
index a9f86a7a1..36808aa50 100644
--- a/repos/effect/packages/tools/jsdocs/test/jsdocs.test.ts
+++ b/repos/effect/packages/tools/jsdocs/test/jsdocs.test.ts
@@ -33,6 +33,17 @@ describe("jsdocs", () => {
     }
   })
 
+  it("accepts unstable declarations", () => {
+    const result = parseJSDoc(`/**
+ * Creates an unstable value.
+ *
+ * @unstable
+ * @category constructors
+ * @since 1.0.0
+ */`)
+    assert.strictEqual(result._tag, "Success")
+  })
+
   it("accepts doctest metadata on TypeScript fences", () => {
     const result = parseJSDoc(`/**
  * Creates a value.
@@ -89,7 +100,7 @@ describe("jsdocs", () => {
     }
   })
 
-  it("extracts docs with TypeScript", () => {
+  it("refreshes extracted docs after a source change", () => {
     const cwd = fs.mkdtempSync(path.join(os.tmpdir(), "jsdocs-"))
     fs.mkdirSync(path.join(cwd, "src"), { recursive: true })
     fs.writeFileSync(
@@ -119,12 +130,13 @@ describe("jsdocs", () => {
 export const makeValue = () => 1
 `
     )
-    const model = extractJSDocsSync({
+    const options = {
       cwd,
       tsconfig: "tsconfig.json",
       include: ["src/**/*.ts"],
       output: ".data/jsdocs.json"
-    })
+    }
+    const model = extractJSDocsSync(options)
     assert.strictEqual(model.version, 2)
     assert.strictEqual(model.files.length, 1)
     assert.strictEqual(model.files[0]?.declarations[0]?.name, "makeValue")
@@ -134,6 +146,11 @@ export const makeValue = () => 1
       importDeclaration: "import { Foo } from \"@effect/sample\"",
       usage: "Foo.makeValue"
     })
+
+    const sourcePath = path.join(cwd, "src/Foo.ts")
+    fs.writeFileSync(sourcePath, fs.readFileSync(sourcePath, "utf8").replaceAll("makeValue", "makeUpdatedValue"))
+    const updated = extractJSDocsSync(options)
+    assert.strictEqual(updated.files[0]?.declarations[0]?.name, "makeUpdatedValue")
   })
 
   it("stores a stable input hash for cache checks", () => {
diff --git a/repos/effect/packages/tools/openapi-generator/CHANGELOG.md b/repos/effect/packages/tools/openapi-generator/CHANGELOG.md
index ecba5a816..1bc033fa7 100644
--- a/repos/effect/packages/tools/openapi-generator/CHANGELOG.md
+++ b/repos/effect/packages/tools/openapi-generator/CHANGELOG.md
@@ -1,5 +1,62 @@
 # @effect/openapi-generator
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+  - @effect/platform-node@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- [#8261](https://github.com/Effect-TS/effect/pull/8261) [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9) Thanks @nikhilsnayak! - Add HTTP `QUERY` support to clients, routers, HttpApi endpoints, and AI request metadata. Configure CORS support through `allowedMethods`; defaults are unchanged.
+  
+  OpenAPI 3.1 output represents `QUERY` through `x-oai-additionalOperations`, which requires consumer support for that extension. The OpenAPI generator accepts the extension and the native OpenAPI 3.2 `query` field.
+
+- [#8208](https://github.com/Effect-TS/effect/pull/8208) [`abb93c2`](https://github.com/Effect-TS/effect/commit/abb93c221bc65a32450685eec2077e7280a24175) Thanks @xia-chao! - Generated HTTP clients now type `multipart/form-data` fields with `format: binary` as `File | Blob` instead of `string`. `httpapi` output is unchanged.
+  
+  Referenced components containing binary fields use `*Multipart` exports, such as `UploadBodyMultipart`. If a component is used only by multipart requests, update imports from its original name to the generated name. Components also used by JSON requests or responses keep their original exports and string fields.
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+  - @effect/platform-node@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- [#8188](https://github.com/Effect-TS/effect/pull/8188) [`ccad0fe`](https://github.com/Effect-TS/effect/commit/ccad0fe130ce46b9fa57046968d6c6245d4b4341) Thanks @tim-smart! - Quote static paths and percent-encode path parameters in generated HTTP clients, including SSE and binary stream methods. Reject empty parameters and dot segments with an HTTP client error before sending a request.
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+  - @effect/platform-node@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+  - @effect/platform-node@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7545](https://github.com/Effect-TS/effect/pull/7545) [`a267ff0`](https://github.com/Effect-TS/effect/commit/a267ff08fefd328f0f2e1744901093515acbd660) Thanks @tim-smart! - Use Effect's YAML parser for OpenAPI patch files and remove the direct `yaml` dependency.
+
+- [#7768](https://github.com/Effect-TS/effect/pull/7768) [`c8072b6`](https://github.com/Effect-TS/effect/commit/c8072b6c4af75f93fc286912b3bc7ff5ce67f349) Thanks @kitlangton! - Encode form-urlencoded request bodies in generated HTTP clients.
+
+- [#7770](https://github.com/Effect-TS/effect/pull/7770) [`ff0f006`](https://github.com/Effect-TS/effect/commit/ff0f00627e4312544a8bdb3e5e8f16c349889679) Thanks @kitlangton! - Encode multipart record payloads as form data in generated schema-backed clients.
+
+- [#8081](https://github.com/Effect-TS/effect/pull/8081) [`ad07200`](https://github.com/Effect-TS/effect/commit/ad072007127dcfd394ff6b13e584ee5bd58f1373) Thanks @tim-smart! - Apply `transformClient` when generated binary and SSE streams are consumed, preserving lazy stream construction.
+
+- [#7546](https://github.com/Effect-TS/effect/pull/7546) [`3623e35`](https://github.com/Effect-TS/effect/commit/3623e3550bca2cccab19a3c65c6b32af0473ab8b) Thanks @tim-smart! - Preserve omitted `additionalProperties` when generating schemas from OpenAPI documents.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`cce221e`](https://github.com/Effect-TS/effect/commit/cce221ebf450bbcf067f73bce98598303f6e4798), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`a4bb2aa`](https://github.com/Effect-TS/effect/commit/a4bb2aa22698ea8a98d5172d81305f4f74bd7caa), [`5664c94`](https://github.com/Effect-TS/effect/commit/5664c941b522a5f318e609b9c45f2eb4c2b92ea1), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`dd6ce2d`](https://github.com/Effect-TS/effect/commit/dd6ce2d6e32c86465a7e706ffd31c0925ec6a9b9), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`e406217`](https://github.com/Effect-TS/effect/commit/e406217f8c12f95626e72bb2b23054d8483b1009), [`f93d051`](https://github.com/Effect-TS/effect/commit/f93d051c3326c4d4e24aa8c2cde67c50850ec02a), [`9252a00`](https://github.com/Effect-TS/effect/commit/9252a00ba3cf8a9eacb72ed161d6bed306444f6c), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`72b8582`](https://github.com/Effect-TS/effect/commit/72b85820f1baeb0abb21a47bd470720f58435a15), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`505dc05`](https://github.com/Effect-TS/effect/commit/505dc05dd68a80694f30bfaf772699494726f54d), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+  - @effect/platform-node@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/tools/openapi-generator/package.json b/repos/effect/packages/tools/openapi-generator/package.json
index 3368e185d..a7955eb64 100644
--- a/repos/effect/packages/tools/openapi-generator/package.json
+++ b/repos/effect/packages/tools/openapi-generator/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@effect/openapi-generator",
   "type": "module",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "license": "MIT",
   "description": "Generate Effect Schema types, HTTP clients, and HttpApi modules from OpenAPI specifications",
   "homepage": "https://effect.website",
@@ -72,6 +72,7 @@
     "@types/swagger2openapi": "^7.0.4",
     "effect": "workspace:^",
     "json-schema-typed": "^8.0.2",
-    "openapi-typescript": "^7.13.0"
+    "openapi-typescript": "^7.13.0",
+    "rolldown": "^1.2.9"
   }
 }
diff --git a/repos/effect/packages/tools/openapi-generator/src/JsonSchemaGenerator.ts b/repos/effect/packages/tools/openapi-generator/src/JsonSchemaGenerator.ts
index 6d7dbd023..580df8d6e 100644
--- a/repos/effect/packages/tools/openapi-generator/src/JsonSchemaGenerator.ts
+++ b/repos/effect/packages/tools/openapi-generator/src/JsonSchemaGenerator.ts
@@ -28,16 +28,16 @@ import * as SchemaRepresentation from "effect/SchemaRepresentation"
 type Source = "openapi-3.0" | "openapi-3.1"
 interface GenerateOptions {
   readonly onEnter?: ((js: JsonSchema.JsonSchema) => JsonSchema.JsonSchema) | undefined
+  readonly multipartSchemaRefs?: MultipartSchemaRefs | undefined
 }
 
-interface MultipartSchemaRefs {
+interface HttpApiMultipartSchemaRefs {
+  readonly kind: "httpapi"
   readonly singleFile: string
   readonly files: string
 }
 
-interface GenerateHttpApiOptions extends GenerateOptions {
-  readonly multipartSchemaRefs?: MultipartSchemaRefs | undefined
-}
+type MultipartSchemaRefs = HttpApiMultipartSchemaRefs | { readonly kind: "client"; readonly singleFile: string }
 
 /**
  * Create a stateful JSON Schema code generator for OpenAPI-derived schemas.
@@ -81,7 +81,7 @@ function makeWithRepresentation() {
     const recursiveReferences = Object.entries(generated.codeDocument.references.recursives)
 
     const nonRecursives = nonRecursiveReferences.map(({ $ref, code }) =>
-      renderSchemaTypeAndRuntime($ref, code, typeOnly)
+      renderSchemaTypeAndRuntime($ref, code, typeOnly, options)
     )
 
     const recursiveDeclarations: Array<string> = []
@@ -89,7 +89,7 @@ function makeWithRepresentation() {
 
     if (typeOnly) {
       for (const [$ref, code] of recursiveReferences) {
-        recursives.push(renderSchemaTypeAndRuntime($ref, code, true))
+        recursives.push(renderSchemaTypeAndRuntime($ref, code, true, options))
       }
     } else {
       const recursivelyForwardReferenced = collectForwardReferencedRecursives(
@@ -113,12 +113,12 @@ function makeWithRepresentation() {
           continue
         }
 
-        recursives.push(renderSchemaTypeAndRuntime($ref, code, false))
+        recursives.push(renderSchemaTypeAndRuntime($ref, code, false, options))
       }
     }
 
     const codes = generated.codeDocument.codes.map((code, i) =>
-      renderSchemaTypeAndRuntime(generated.nameMap[i], code, typeOnly)
+      renderSchemaTypeAndRuntime(generated.nameMap[i], code, typeOnly, options)
     )
 
     return renderImportArtifacts(generated.codeDocument, !typeOnly) +
@@ -131,7 +131,7 @@ function makeWithRepresentation() {
   function generateHttpApi(
     source: Source,
     components: JsonSchema.Definitions,
-    options?: GenerateHttpApiOptions
+    options?: GenerateOptions
   ) {
     const generated = makeCodeDocument(source, components, options)
     if (generated === undefined) {
@@ -142,7 +142,7 @@ function makeWithRepresentation() {
     const recursiveReferences = Object.entries(generated.codeDocument.references.recursives)
 
     const nonRecursives = nonRecursiveReferences.map(({ $ref, code }) =>
-      renderSchemaTypeAndRuntime($ref, code, false, options?.multipartSchemaRefs)
+      renderSchemaTypeAndRuntime($ref, code, false, options)
     )
 
     const recursivelyForwardReferenced = collectForwardReferencedRecursives(nonRecursiveReferences, recursiveReferences)
@@ -166,11 +166,11 @@ function makeWithRepresentation() {
         continue
       }
 
-      recursives.push(renderSchemaTypeAndRuntime($ref, code, false, options?.multipartSchemaRefs))
+      recursives.push(renderSchemaTypeAndRuntime($ref, code, false, options))
     }
 
     const codes = generated.codeDocument.codes.map((code, i) =>
-      renderSchemaTypeAndRuntime(generated.nameMap[i], code, false, options?.multipartSchemaRefs)
+      renderSchemaTypeAndRuntime(generated.nameMap[i], code, false, options)
     )
 
     return renderImportArtifacts(generated.codeDocument, true) +
@@ -183,7 +183,7 @@ function makeWithRepresentation() {
   function makeCodeDocument(
     source: Source,
     components: JsonSchema.Definitions,
-    options?: GenerateHttpApiOptions
+    options?: GenerateOptions
   ): {
     readonly nameMap: Array<string>
     readonly codeDocument: SchemaRepresentation.CodeDocument
@@ -204,7 +204,7 @@ function makeWithRepresentation() {
     if (!Arr.isArrayNonEmpty(schemas)) {
       return
     }
-    if (options?.multipartSchemaRefs !== undefined) {
+    if (options?.multipartSchemaRefs?.kind === "httpapi") {
       definitions = omitSupersededMultipartDefinitions(definitions, schemas, options.multipartSchemaRefs)
     }
 
@@ -278,23 +278,9 @@ function renderSchemaTypeAndRuntime(
   $ref: string,
   code: SchemaRepresentation.Code,
   typeOnly: boolean,
-  multipartSchemaRefs?: MultipartSchemaRefs
+  options?: GenerateOptions
 ) {
-  if (!typeOnly && multipartSchemaRefs !== undefined) {
-    if ($ref === multipartSchemaRefs.singleFile) {
-      return [
-        `export type ${$ref} = Multipart.PersistedFile`,
-        `export const ${$ref} = Multipart.SingleFileSchema`
-      ].join("\n")
-    }
-    if ($ref === multipartSchemaRefs.files) {
-      return [
-        `export type ${$ref} = ReadonlyArray<Multipart.PersistedFile>`,
-        `export const ${$ref} = Multipart.FilesSchema`
-      ].join("\n")
-    }
-  }
-
+  code = multipartCode($ref, options?.multipartSchemaRefs) ?? code
   const strings = [`export type ${$ref} = ${code.Type}`]
   if (!typeOnly) {
     strings.push(`export const ${$ref} = ${code.runtime}`)
@@ -302,6 +288,27 @@ function renderSchemaTypeAndRuntime(
   return strings.join("\n")
 }
 
+function multipartCode(
+  $ref: string,
+  refs: MultipartSchemaRefs | undefined
+): SchemaRepresentation.Code | undefined {
+  if (refs === undefined) {
+    return undefined
+  }
+  if ($ref === refs.singleFile) {
+    return refs.kind === "httpapi"
+      ? { Type: "Multipart.PersistedFile", runtime: "Multipart.SingleFileSchema" }
+      : {
+        Type: "globalThis.File | globalThis.Blob",
+        runtime: `Schema.instanceOf(globalThis.Blob, { expected: "File | Blob" })`
+      }
+  }
+  if (refs.kind === "httpapi" && $ref === refs.files) {
+    return { Type: "ReadonlyArray<Multipart.PersistedFile>", runtime: "Multipart.FilesSchema" }
+  }
+  return undefined
+}
+
 function renderRecursiveReferenceDeclaration(
   $ref: string,
   code: SchemaRepresentation.Code,
@@ -329,7 +336,7 @@ function renderImportArtifacts(codeDocument: SchemaRepresentation.CodeDocument,
 function omitSupersededMultipartDefinitions(
   definitions: JsonSchema.Definitions,
   schemas: ReadonlyArray<JsonSchema.JsonSchema>,
-  multipartSchemaRefs: MultipartSchemaRefs
+  multipartSchemaRefs: HttpApiMultipartSchemaRefs
 ): JsonSchema.Definitions {
   const rootReferences = collectReferenceKeys(schemas)
   const multipartReferences = new Set([multipartSchemaRefs.singleFile, multipartSchemaRefs.files])
diff --git a/repos/effect/packages/tools/openapi-generator/src/OpenApiGenerator.ts b/repos/effect/packages/tools/openapi-generator/src/OpenApiGenerator.ts
index 167b9ea7c..10bd4c004 100644
--- a/repos/effect/packages/tools/openapi-generator/src/OpenApiGenerator.ts
+++ b/repos/effect/packages/tools/openapi-generator/src/OpenApiGenerator.ts
@@ -18,7 +18,8 @@ import * as Layer from "effect/Layer"
 import * as Predicate from "effect/Predicate"
 import * as Rec from "effect/Record"
 import * as String from "effect/String"
-import type { OpenAPISecurityScheme, OpenAPISpec, OpenAPISpecMethodName } from "effect/unstable/httpapi/OpenApi"
+import type { HttpMethod } from "effect/unstable/http/HttpMethod"
+import type { OpenAPISecurityScheme, OpenAPISpec, OpenAPISpecOperation } from "effect/unstable/httpapi/OpenApi"
 import SwaggerToOpenApi from "swagger2openapi"
 import * as HttpApiTransformer from "./HttpApiTransformer.ts"
 import * as JsonSchemaGenerator from "./JsonSchemaGenerator.ts"
@@ -74,7 +75,7 @@ export interface OpenApiGeneratorWarning {
   readonly code: OpenApiGeneratorWarningCode
   readonly message: string
   readonly path?: string | undefined
-  readonly method?: OpenAPISpecMethodName | undefined
+  readonly method?: Lowercase<HttpMethod> | undefined
   readonly operationId?: string | undefined
 }
 
@@ -104,11 +105,14 @@ export interface OpenApiGenerateOptions {
 }
 
 interface HttpApiMultipartSchemaRefs {
+  readonly kind: "httpapi"
   readonly singleFile: string
   readonly files: string
 }
 
-const methodNames: ReadonlyArray<OpenAPISpecMethodName> = [
+type MultipartSchemaRefs = HttpApiMultipartSchemaRefs | { readonly kind: "client"; readonly singleFile: string }
+
+const methodNames: ReadonlyArray<Lowercase<HttpMethod>> = [
   "get",
   "put",
   "post",
@@ -116,7 +120,8 @@ const methodNames: ReadonlyArray<OpenAPISpecMethodName> = [
   "options",
   "head",
   "patch",
-  "trace"
+  "trace",
+  "query"
 ]
 
 /**
@@ -132,7 +137,6 @@ export const make = Effect.gen(function*() {
       const openApiTransformer = yield* OpenApiTransformer.OpenApiTransformer
       const emitWarning = makeWarningEmitter(options)
 
-      // If we receive a Swagger 2.0 spec, convert it to an OpenApi 3.0 spec
       if (isSwaggerSpec(spec)) {
         spec = yield* convertSwaggerSpec(spec)
       }
@@ -146,32 +150,17 @@ export const make = Effect.gen(function*() {
         return current
       }
 
-      const multipartSchemaRefs = options.format === "httpapi"
-        ? makeHttpApiMultipartSchemaRefs(spec.components?.schemas ?? {})
-        : undefined
+      const multipart = makeMultipartSchemas(spec.components?.schemas ?? {}, options.format, resolveRef)
 
-      const parsed = parseOpenApi(spec, generator, resolveRef, options.format, emitWarning, multipartSchemaRefs)
+      const parsed = parseOpenApi(spec, generator, resolveRef, options.format, emitWarning, multipart.transform)
 
       // TODO: make a CLI option ?
       const importName = "Schema"
       const source = getDialect(spec)
+      const schemaOptions = { onEnter: options.onEnter, multipartSchemaRefs: multipart.refs }
       const generation = options.format === "httpapi"
-        ? generator.generateHttpApi(
-          source,
-          withHttpApiMultipartSchemas(spec.components?.schemas ?? {}, multipartSchemaRefs, resolveRef),
-          {
-            onEnter: options.onEnter,
-            multipartSchemaRefs
-          }
-        )
-        : generator.generate(
-          source,
-          spec.components?.schemas ?? {},
-          options.format === "httpclient-type-only",
-          {
-            onEnter: options.onEnter
-          }
-        )
+        ? generator.generateHttpApi(source, multipart.definitions, schemaOptions)
+        : generator.generate(source, multipart.definitions, options.format === "httpclient-type-only", schemaOptions)
 
       if (options.format === "httpapi") {
         const needsMultipartImport = generation.includes("Multipart.")
@@ -215,7 +204,7 @@ const parseOpenApi = (
   resolveRef: (ref: string) => unknown,
   format: OpenApiGeneratorFormat,
   emitWarning: WarningEmitter,
-  multipartSchemaRefs: HttpApiMultipartSchemaRefs | undefined
+  transformMultipart: (schema: JsonSchema.JsonSchema) => JsonSchema.JsonSchema
 ): ParsedOperation.ParsedOpenApi => {
   const operations: Array<ParsedOperation.ParsedOperation> = []
   const reservedSchemaNames = new Set<string>(Object.keys(spec.components?.schemas ?? {}))
@@ -244,13 +233,14 @@ const parseOpenApi = (
   }
 
   for (const [path, methods] of Object.entries(spec.paths)) {
+    const pathItem: Partial<Record<Lowercase<HttpMethod>, OpenAPISpecOperation>> = methods
     for (const method of methodNames) {
-      const operation = methods[method]
-
+      const operation = method === "query"
+        ? pathItem.query ?? methods["x-oai-additionalOperations"]?.QUERY
+        : pathItem[method]
       if (Predicate.isUndefined(operation)) {
         continue
       }
-
       const id = operation.operationId
         ? Utils.camelize(operation.operationId)
         : `${method.toUpperCase()}${path}`
@@ -420,7 +410,7 @@ const parseOpenApi = (
         if (Predicate.isNotUndefined(content["multipart/form-data"]?.schema)) {
           op.payload = addSchema(
             `${schemaId}RequestFormData`,
-            transformMultipartSchema(content["multipart/form-data"].schema, multipartSchemaRefs, resolveRef),
+            transformMultipart(content["multipart/form-data"].schema),
             op
           )
           op.payloadFormData = true
@@ -450,7 +440,7 @@ const parseOpenApi = (
             let schemaName = requestSchemaNames.get(contentType)
             if (schemaName === undefined) {
               const schema = encoding === "multipart"
-                ? transformMultipartSchema(mediaType.schema as JsonSchema.JsonSchema, multipartSchemaRefs, resolveRef)
+                ? transformMultipart(mediaType.schema as JsonSchema.JsonSchema)
                 : mediaType.schema as JsonSchema.JsonSchema
               schemaName = addSchema(
                 `${schemaId}Request${mediaTypeToSuffix(contentType)}`,
@@ -829,7 +819,11 @@ const mediaTypeToSuffix = (contentType: string): string => {
   return suffix.length > 0 ? suffix : "Body"
 }
 
-const makeHttpApiMultipartSchemaRefs = (definitions: JsonSchema.Definitions): HttpApiMultipartSchemaRefs => {
+const makeMultipartSchemas = (
+  definitions: JsonSchema.Definitions,
+  format: OpenApiGeneratorFormat,
+  resolveRef: (ref: string) => unknown
+) => {
   const names = new Set(Object.keys(definitions))
   const allocate = (base: string): string => {
     let candidate = base
@@ -841,48 +835,98 @@ const makeHttpApiMultipartSchemaRefs = (definitions: JsonSchema.Definitions): Ht
     names.add(candidate)
     return candidate
   }
+  const output = { ...definitions }
+  if (format === "httpapi") {
+    const refs: HttpApiMultipartSchemaRefs = {
+      kind: "httpapi",
+      singleFile: allocate("__HttpApiMultipartSingleFile"),
+      files: allocate("__HttpApiMultipartFiles")
+    }
+    const transform = (schema: JsonSchema.JsonSchema) => transformMultipartSchema(schema, refs, resolveRef)
+    Rec.assignProperty(output, refs.singleFile, { type: "string", format: "binary" })
+    for (const [name, schema] of Object.entries(definitions)) {
+      Rec.assignProperty(output, name, transform(schema))
+    }
+    Rec.assignProperty(output, refs.files, { type: "array", items: { $ref: toDefinitionRef(refs.singleFile) } })
+    return { refs, definitions: output, transform }
+  }
+  const refs: MultipartSchemaRefs = { kind: "client", singleFile: allocate("__ClientMultipartFile") }
+  Rec.assignProperty(output, refs.singleFile, { type: "string", format: "binary" })
+  // The client transform adds `*Multipart` copies to `output` while parsing, so render schemas after parseOpenApi.
   return {
-    singleFile: allocate("__HttpApiMultipartSingleFile"),
-    files: allocate("__HttpApiMultipartFiles")
+    refs,
+    definitions: output,
+    transform: makeClientMultipartTransformer(output, refs.singleFile, allocate, resolveRef)
   }
 }
 
 const toDefinitionRef = (name: string): string => `#/$defs/${name.replaceAll("~", "~0").replaceAll("/", "~1")}`
 
-const withHttpApiMultipartSchemas = (
+const makeClientMultipartTransformer = (
   definitions: JsonSchema.Definitions,
-  multipartSchemaRefs: HttpApiMultipartSchemaRefs | undefined,
+  singleFile: string,
+  allocate: (base: string) => string,
   resolveRef: (ref: string) => unknown
-): JsonSchema.Definitions => {
-  if (multipartSchemaRefs === undefined) {
-    return definitions
+) => {
+  const binaryComponents = new Map<string, boolean>()
+  const copies = new Map<string, string>()
+
+  const hasBinary = (value: unknown, seen: Set<string>): boolean => {
+    if (Array.isArray(value)) return value.some((item) => hasBinary(item, seen))
+    if (!Predicate.isObject(value)) return false
+    if (isMultipartBinaryFile(value)) return true
+    if (isComponentRef(value.$ref) && !seen.has(value.$ref)) {
+      seen.add(value.$ref)
+      if (hasBinary(resolveRef(value.$ref), seen)) return true
+    }
+    return Object.values(value).some((item) => hasBinary(item, seen))
   }
-  return {
-    ...Rec.map(definitions, (schema) => transformMultipartSchema(schema, multipartSchemaRefs, resolveRef)),
-    [multipartSchemaRefs.singleFile]: {
-      type: "string",
-      format: "binary"
-    },
-    [multipartSchemaRefs.files]: {
-      type: "array",
-      items: {
-        $ref: toDefinitionRef(multipartSchemaRefs.singleFile)
-      }
+
+  const isBinaryComponent = ($ref: string): boolean => {
+    let binary = binaryComponents.get($ref)
+    if (binary === undefined) {
+      binary = hasBinary(resolveRef($ref), new Set([$ref]))
+      binaryComponents.set($ref, binary)
+    }
+    return binary
+  }
+
+  // Copies a binary-bearing component to `<Name>Multipart`, leaving the original for JSON payloads.
+  const copyComponent = ($ref: string): string => {
+    let name = copies.get($ref)
+    if (name === undefined) {
+      name = allocate(`${JsonPointer.unescapeToken($ref.slice(componentRefPrefix.length))}Multipart`)
+      copies.set($ref, name)
+      Rec.assignProperty(definitions, name, visit(resolveRef($ref)))
     }
+    return name
   }
+
+  const visit = (value: unknown): unknown => {
+    if (Array.isArray(value)) return value.map(visit)
+    if (!Predicate.isObject(value)) return value
+    if (isMultipartBinaryFile(value)) return { $ref: toDefinitionRef(singleFile) }
+    const out = Rec.map(value, visit)
+    if (isComponentRef(value.$ref) && isBinaryComponent(value.$ref)) {
+      out.$ref = toDefinitionRef(copyComponent(value.$ref))
+    }
+    return out
+  }
+
+  return (schema: JsonSchema.JsonSchema) => visit(schema) as JsonSchema.JsonSchema
 }
 
+const componentRefPrefix = "#/components/schemas/"
+
+const isComponentRef = (value: unknown): value is string =>
+  typeof value === "string" && value.startsWith(componentRefPrefix)
+
 const transformMultipartSchema = (
   schema: JsonSchema.JsonSchema,
-  multipartSchemaRefs: HttpApiMultipartSchemaRefs | undefined,
+  multipartSchemaRefs: HttpApiMultipartSchemaRefs,
   resolveRef: (ref: string) => unknown
 ): JsonSchema.JsonSchema => {
-  if (multipartSchemaRefs === undefined) {
-    return schema
-  }
-
   const singleFileRef = toDefinitionRef(multipartSchemaRefs.singleFile)
-  const filesRef = toDefinitionRef(multipartSchemaRefs.files)
   const cache = new Map<string, unknown>()
   const stack = new Set<string>()
 
@@ -894,7 +938,7 @@ const transformMultipartSchema = (
       return value
     }
 
-    if (typeof value.$ref === "string" && value.$ref.startsWith("#/components/schemas/")) {
+    if (isComponentRef(value.$ref)) {
       const { $ref, ...siblings } = value
       const withSiblings = (schema: unknown): unknown =>
         Object.keys(siblings).length === 0 ? schema : { allOf: [schema, visit(siblings)] }
@@ -922,7 +966,7 @@ const transformMultipartSchema = (
     }
 
     if (isMultipartBinaryFiles(out, singleFileRef)) {
-      return { $ref: filesRef }
+      return { $ref: toDefinitionRef(multipartSchemaRefs.files) }
     }
 
     return out
@@ -931,7 +975,7 @@ const transformMultipartSchema = (
   return visit(schema) as JsonSchema.JsonSchema
 }
 
-const isMultipartBinaryFile = (value: unknown): value is JsonSchema.JsonSchema =>
+const isMultipartBinaryFile = (value: unknown): boolean =>
   Predicate.isObject(value) &&
   value.type === "string" &&
   (
@@ -1248,7 +1292,7 @@ const hasUnsupportedSuccessfulSseResponse = (
 const remapDefaultResponseStatusForHttpApi = (status: string, hasExplicitSuccessResponse: boolean): string =>
   status === "default" ? (hasExplicitSuccessResponse ? "500" : "200") : status
 
-const methodSupportsRequestBody = (method: OpenAPISpecMethodName): boolean =>
+const methodSupportsRequestBody = (method: Lowercase<HttpMethod>): boolean =>
   method !== "get" && method !== "head" && method !== "options" && method !== "trace"
 
 const warnForOperation = (
@@ -1310,11 +1354,16 @@ const processPath = (path: string): {
   readonly pathTemplate: string
 } => {
   const pathIds: Array<string> = []
-  path = path.replace(/{([^}]+)}/g, (_, name) => {
-    const id = Utils.camelize(name)
+  const fragments: Array<string> = []
+  let offset = 0
+  for (const match of path.matchAll(/{([^}]+)}/g)) {
+    fragments.push(JSON.stringify(path.slice(offset, match.index)))
+    const id = Utils.camelize(match[1])
     pathIds.push(id)
-    return "${" + id + "}"
-  })
-  const pathTemplate = "`" + path + "`"
+    fragments.push(`__encodePathParam(${id})`)
+    offset = match.index + match[0].length
+  }
+  fragments.push(JSON.stringify(path.slice(offset)))
+  const pathTemplate = fragments.join(" + ")
   return { pathIds, pathTemplate } as const
 }
diff --git a/repos/effect/packages/tools/openapi-generator/src/OpenApiTransformer.ts b/repos/effect/packages/tools/openapi-generator/src/OpenApiTransformer.ts
index 6a3c9bcc1..01139a772 100644
--- a/repos/effect/packages/tools/openapi-generator/src/OpenApiTransformer.ts
+++ b/repos/effect/packages/tools/openapi-generator/src/OpenApiTransformer.ts
@@ -85,6 +85,20 @@ const normalizeSuccessStatus = (
   return successCount === 1 && status.startsWith("2") ? "2xx" : status
 }
 
+const requestToImpl = (operation: ParsedOperation, pipeline: Array<string>, streaming = false): string => {
+  const request = `HttpClientRequest.${operation.method}`
+  const pipe = `.pipe(\n      ${pipeline.join(",\n      ")}\n    )`
+  if (operation.pathIds.length === 0) {
+    return `${request}(${operation.pathTemplate})${pipe}`
+  }
+  const effect = `__makePathRequest(${request}, [${
+    operation.pathIds.join(", ")
+  }], () => ${operation.pathTemplate}).pipe(
+    Effect.${streaming ? "map" : "flatMap"}((request) => request${pipe})
+  )`
+  return streaming ? `Stream.unwrap(${effect})` : effect
+}
+
 /**
  * Create the transformer used for schema-backed HttpClient output.
  *
@@ -261,6 +275,12 @@ ${clientErrorSource(name)}`
     }
 
     const helpers: Array<string> = [commonSource]
+    if (operations.some((operation) => operation.pathIds.length > 0)) {
+      helpers.push(pathRequestSource)
+    }
+    if (requiresStreaming(requirements)) {
+      helpers.push(executeStreamRequestSource)
+    }
     if (requirements.eventStreamData) {
       helpers.push(sseRequestSource(importName))
     }
@@ -347,7 +367,7 @@ export const make = (
 
     const payloadVarName = "options.payload"
     if (operation.payloadFormData) {
-      pipeline.push(`HttpClientRequest.bodyFormData(${payloadVarName} as any)`)
+      pipeline.push(`HttpClientRequest.bodyFormDataRecord(${payloadVarName} as any)`)
     } else if (operation.payloadFormUrlEncoded) {
       pipeline.push(`HttpClientRequest.bodyUrlParams(${payloadVarName} as any)`)
     } else if (operation.payload) {
@@ -379,8 +399,7 @@ export const make = (
 
     return (
       `"${operation.id}": (${params}) => ` +
-      `HttpClientRequest.${operation.method}(${operation.pathTemplate})` +
-      `.pipe(\n    ${pipeline.join(",\n    ")}\n  )`
+      requestToImpl(operation, pipeline)
     )
   }
 
@@ -412,7 +431,9 @@ export const make = (
     }
 
     if (operation.payloadFormData) {
-      pipeline.push(`HttpClientRequest.bodyFormData(options.payload as any)`)
+      pipeline.push(`HttpClientRequest.bodyFormDataRecord(options.payload as any)`)
+    } else if (operation.payloadFormUrlEncoded) {
+      pipeline.push(`HttpClientRequest.bodyUrlParams(options.payload as any)`)
     } else if (operation.payload) {
       pipeline.push(`HttpClientRequest.bodyJsonUnsafe(options.payload)`)
     }
@@ -421,8 +442,7 @@ export const make = (
 
     return (
       `"${operation.id}Sse": (${params}) => ` +
-      `HttpClientRequest.${operation.method}(${operation.pathTemplate})` +
-      `.pipe(\n      ${pipeline.join(",\n      ")}\n    )`
+      requestToImpl(operation, pipeline, true)
     )
   }
 
@@ -453,7 +473,9 @@ export const make = (
     }
 
     if (operation.payloadFormData) {
-      pipeline.push(`HttpClientRequest.bodyFormData(options.payload as any)`)
+      pipeline.push(`HttpClientRequest.bodyFormDataRecord(options.payload as any)`)
+    } else if (operation.payloadFormUrlEncoded) {
+      pipeline.push(`HttpClientRequest.bodyUrlParams(options.payload as any)`)
     } else if (operation.payload) {
       pipeline.push(`HttpClientRequest.bodyJsonUnsafe(options.payload)`)
     }
@@ -462,8 +484,7 @@ export const make = (
 
     return (
       `"${operation.id}Stream": (${params}) => ` +
-      `HttpClientRequest.${operation.method}(${operation.pathTemplate})` +
-      `.pipe(\n      ${pipeline.join(",\n      ")}\n    )`
+      requestToImpl(operation, pipeline, true)
     )
   }
 
@@ -686,6 +707,12 @@ ${clientErrorSource(name)}`
     }
 
     const helpers: Array<string> = [commonSource]
+    if (operations.some((operation) => operation.pathIds.length > 0)) {
+      helpers.push(pathRequestSource)
+    }
+    if (requiresStreaming(requirements)) {
+      helpers.push(executeStreamRequestSource)
+    }
     if (requirements.eventStream) {
       helpers.push(sseRequestSourceTs)
     }
@@ -778,6 +805,8 @@ export const make = (
     const payloadAccessor = "options.payload"
     if (operation.payloadFormData) {
       pipeline.push(`HttpClientRequest.bodyFormDataRecord(${payloadAccessor} as any)`)
+    } else if (operation.payloadFormUrlEncoded) {
+      pipeline.push(`HttpClientRequest.bodyUrlParams(${payloadAccessor} as any)`)
     } else if (operation.payload) {
       pipeline.push(`HttpClientRequest.bodyJsonUnsafe(${payloadAccessor})`)
     }
@@ -807,8 +836,7 @@ export const make = (
 
     return (
       `"${operation.id}": (${params}) => ` +
-      `HttpClientRequest.${operation.method}(${operation.pathTemplate})` +
-      `.pipe(\n    ${pipeline.join(",\n    ")}\n  )`
+      requestToImpl(operation, pipeline)
     )
   }
 
@@ -840,6 +868,8 @@ export const make = (
 
     if (operation.payloadFormData) {
       pipeline.push(`HttpClientRequest.bodyFormDataRecord(options.payload as any)`)
+    } else if (operation.payloadFormUrlEncoded) {
+      pipeline.push(`HttpClientRequest.bodyUrlParams(options.payload as any)`)
     } else if (operation.payload) {
       pipeline.push(`HttpClientRequest.bodyJsonUnsafe(options.payload)`)
     }
@@ -848,8 +878,7 @@ export const make = (
 
     return (
       `"${operation.id}Sse": (${params}) => ` +
-      `HttpClientRequest.${operation.method}(${operation.pathTemplate})` +
-      `.pipe(\n      ${pipeline.join(",\n      ")}\n    )`
+      requestToImpl(operation, pipeline, true)
     )
   }
 
@@ -881,6 +910,8 @@ export const make = (
 
     if (operation.payloadFormData) {
       pipeline.push(`HttpClientRequest.bodyFormDataRecord(options.payload as any)`)
+    } else if (operation.payloadFormUrlEncoded) {
+      pipeline.push(`HttpClientRequest.bodyUrlParams(options.payload as any)`)
     } else if (operation.payload) {
       pipeline.push(`HttpClientRequest.bodyJsonUnsafe(options.payload)`)
     }
@@ -889,8 +920,7 @@ export const make = (
 
     return (
       `"${operation.id}Stream": (${params}) => ` +
-      `HttpClientRequest.${operation.method}(${operation.pathTemplate})` +
-      `.pipe(\n      ${pipeline.join(",\n      ")}\n    )`
+      requestToImpl(operation, pipeline, true)
     )
   }
 
@@ -939,6 +969,36 @@ export const layerTransformerTs = Layer.sync(
   makeTransformerTs
 )
 
+const pathRequestSource = `const __encodePathParam = encodeURIComponent
+  const __makePathRequest = (
+    method: (url: string) => HttpClientRequest.HttpClientRequest,
+    parameters: ReadonlyArray<string>,
+    getPath: () => string,
+  ) => Effect.suspend(() => {
+    const fail = (description: string, cause?: unknown) => Effect.fail(
+      new HttpClientError.HttpClientError({
+        reason: new HttpClientError.InvalidUrlError({
+          request: method(""),
+          cause,
+          description,
+        }),
+      }),
+    )
+    if (parameters.some((value) => value === "" || /^(?:\\.|%2e){1,2}$/i.test(value))) {
+      return fail("Path parameters must be non-empty and cannot be dot segments")
+    }
+    let path: string
+    try {
+      path = getPath()
+    } catch (cause) {
+      return fail("Failed to encode path parameter", cause)
+    }
+    if (path.split("/").some((segment) => /^(?:\\.|%2e){1,2}$/i.test(segment))) {
+      return fail("Request paths cannot contain dot segments")
+    }
+    return Effect.succeed(method(path))
+  })`
+
 const commonSource = `const unexpectedStatus = (response: HttpClientResponse.HttpClientResponse) =>
     Effect.flatMap(
       Effect.orElseSucceed(response.json, () => "Unexpected status code"),
@@ -1022,6 +1082,13 @@ const onRequestSource = (withResponseVariants: boolean) => {
   }`
 }
 
+const executeStreamRequestSource = `const executeStreamRequest = (request: HttpClientRequest.HttpClientRequest) =>
+    Effect.suspend(() =>
+      options.transformClient
+        ? Effect.flatMap(options.transformClient(httpClient), (client) => HttpClient.filterStatusOk(client).execute(request))
+        : HttpClient.filterStatusOk(httpClient).execute(request)
+    )`
+
 const sseRequestSource = (_importName: string) =>
   `const sseRequest = <
      Type,
@@ -1036,7 +1103,7 @@ const sseRequestSource = (_importName: string) =>
       HttpClientError.HttpClientError | SchemaError | Sse.Retry | Sse.SseError,
       DecodingServices
     > =>
-      HttpClient.filterStatusOk(httpClient).execute(request).pipe(
+      executeStreamRequest(request).pipe(
         Effect.map((response) => response.stream),
         Stream.unwrap,
         Stream.decodeText(),
@@ -1051,7 +1118,7 @@ const sseEventRequestSource = `const sseEventRequest = <S extends Sse.EventCodec
       HttpClientError.HttpClientError | SchemaError | Sse.Retry | Sse.SseError,
       S["DecodingServices"]
     > =>
-      HttpClient.filterStatusOk(httpClient).execute(request).pipe(
+      executeStreamRequest(request).pipe(
         Effect.map((response) => response.stream),
         Stream.unwrap,
         Stream.decodeText(),
@@ -1060,7 +1127,7 @@ const sseEventRequestSource = `const sseEventRequest = <S extends Sse.EventCodec
 
 const binaryRequestSource =
   `const binaryRequest = (request: HttpClientRequest.HttpClientRequest): Stream.Stream<Uint8Array, HttpClientError.HttpClientError> =>
-    HttpClient.filterStatusOk(httpClient).execute(request).pipe(
+    executeStreamRequest(request).pipe(
       Effect.map((response) => response.stream),
       Stream.unwrap
     )`
@@ -1068,7 +1135,7 @@ const binaryRequestSource =
 // Type-only mode helpers (no schema decoding)
 const sseRequestSourceTs =
   `const sseRequest = (request: HttpClientRequest.HttpClientRequest): Stream.Stream<unknown, HttpClientError.HttpClientError> =>
-    HttpClient.filterStatusOk(httpClient).execute(request).pipe(
+    executeStreamRequest(request).pipe(
       Effect.map((response) => response.stream),
       Stream.unwrap,
       Stream.decodeText(),
@@ -1079,7 +1146,7 @@ const sseRequestSourceTs =
 
 const binaryRequestSourceTs =
   `const binaryRequest = (request: HttpClientRequest.HttpClientRequest): Stream.Stream<Uint8Array, HttpClientError.HttpClientError> =>
-    HttpClient.filterStatusOk(httpClient).execute(request).pipe(
+    executeStreamRequest(request).pipe(
       Effect.map((response) => response.stream),
       Stream.unwrap
     )`
diff --git a/repos/effect/packages/tools/openapi-generator/src/ParsedOperation.ts b/repos/effect/packages/tools/openapi-generator/src/ParsedOperation.ts
index 177a4a2c1..15947d27a 100644
--- a/repos/effect/packages/tools/openapi-generator/src/ParsedOperation.ts
+++ b/repos/effect/packages/tools/openapi-generator/src/ParsedOperation.ts
@@ -11,11 +11,11 @@
  * @since 4.0.0
  */
 import type * as Types from "effect/Types"
+import type { HttpMethod } from "effect/unstable/http/HttpMethod"
 import type {
   OpenAPISecurityRequirement,
   OpenAPISpecExternalDocs,
   OpenAPISpecLicense,
-  OpenAPISpecMethodName,
   OpenAPISpecServer
 } from "effect/unstable/httpapi/OpenApi"
 
@@ -202,7 +202,7 @@ export interface ParsedOperation {
   readonly id: string
   readonly operationId: string | undefined
   readonly path: string
-  readonly method: OpenAPISpecMethodName
+  readonly method: Lowercase<HttpMethod>
   readonly tags: ReadonlyArray<string>
   readonly metadata: ParsedOperationMetadata
   readonly parameters: {
@@ -243,7 +243,7 @@ export interface ParsedOperation {
  */
 export const makeDeepMutable = (options: {
   readonly id: string
-  readonly method: OpenAPISpecMethodName
+  readonly method: Lowercase<HttpMethod>
   readonly pathIds: Array<string>
   readonly pathTemplate: string
   readonly description: string | undefined
diff --git a/repos/effect/packages/tools/openapi-generator/src/main.ts b/repos/effect/packages/tools/openapi-generator/src/main.ts
index c9be37d9f..5484dabf2 100644
--- a/repos/effect/packages/tools/openapi-generator/src/main.ts
+++ b/repos/effect/packages/tools/openapi-generator/src/main.ts
@@ -18,18 +18,18 @@ import type { OpenAPISpec } from "effect/unstable/httpapi/OpenApi"
 import * as OpenApiGenerator from "./OpenApiGenerator.ts"
 import * as OpenApiPatch from "./OpenApiPatch.ts"
 
-const spec = Flag.fileParse("spec").pipe(
+const spec = Flag.FileParse("spec").pipe(
   Flag.withAlias("s"),
   Flag.withDescription("The OpenAPI spec file to generate output from")
 )
 
-const name = Flag.string("name").pipe(
+const name = Flag.String("name").pipe(
   Flag.withAlias("n"),
   Flag.withDescription("The name of the generated output"),
   Flag.withDefault("Client")
 )
 
-const format = Flag.choice("format", ["httpclient", "httpclient-type-only", "httpapi"] as const).pipe(
+const format = Flag.Literals("format", ["httpclient", "httpclient-type-only", "httpapi"] as const).pipe(
   Flag.withAlias("f"),
   Flag.withDescription(
     "Output format to generate: httpclient | httpclient-type-only | httpapi (default: httpclient)"
@@ -37,7 +37,7 @@ const format = Flag.choice("format", ["httpclient", "httpclient-type-only", "htt
   Flag.withDefault("httpclient")
 )
 
-const patch = Flag.string("patch").pipe(
+const patch = Flag.String("patch").pipe(
   Flag.withAlias("p"),
   Flag.withDescription(
     "JSON patch to apply to OpenAPI spec before generation. " +
diff --git a/repos/effect/packages/tools/openapi-generator/test/OpenApiGenerator.test.ts b/repos/effect/packages/tools/openapi-generator/test/OpenApiGenerator.test.ts
index 1e581af5e..36d8a95a6 100644
--- a/repos/effect/packages/tools/openapi-generator/test/OpenApiGenerator.test.ts
+++ b/repos/effect/packages/tools/openapi-generator/test/OpenApiGenerator.test.ts
@@ -1,12 +1,16 @@
 import * as OpenApiGenerator from "@effect/openapi-generator/OpenApiGenerator"
 import { assert, describe, it } from "@effect/vitest"
 import * as Effect from "effect/Effect"
-import type { OpenAPISpec } from "effect/unstable/httpapi/OpenApi"
+import type * as JsonSchema from "effect/JsonSchema"
+import type { OpenAPISpec, OpenAPISpecOperation, OpenAPISpecPathItem } from "effect/unstable/httpapi/OpenApi"
 import { spawnSync } from "node:child_process"
 import { mkdtempSync, rmSync, writeFileSync } from "node:fs"
 import { dirname, join } from "node:path"
 import { fileURLToPath } from "node:url"
 
+// These integration checks start a fresh TypeScript compiler under CI load.
+const compilationTimeout = 60_000
+
 function assertRuntime(spec: OpenAPISpec, expected: string) {
   return Effect.gen(function*() {
     const generator = yield* OpenApiGenerator.OpenApiGenerator
@@ -92,6 +96,7 @@ function assertGeneratedClientsCompile(
   options: {
     readonly exactOptionalPropertyTypes?: boolean | undefined
     readonly formats?: ReadonlyArray<"httpclient" | "httpclient-type-only"> | undefined
+    readonly usage?: string | undefined
   } = {}
 ) {
   const generate = (
@@ -117,7 +122,7 @@ function assertGeneratedClientsCompile(
     try {
       const files = clients.map((client, index) => {
         const path = join(directory, `Client${index}.ts`)
-        writeFileSync(path, client)
+        writeFileSync(path, `${client}\n${options.usage ?? ""}`)
         return path
       })
       const configPath = join(directory, "tsconfig.json")
@@ -610,7 +615,33 @@ const voidSuccessSpec: OpenAPISpec = {
   tags: [{ name: "VoidSuccess" }]
 }
 
-describe("OpenApiGenerator", () => {
+function multipartSpec(schema: JsonSchema.JsonSchema, schemas: JsonSchema.Definitions = {}): OpenAPISpec {
+  return {
+    openapi: "3.1.0",
+    info: { title: "Upload API", version: "1.0.0" },
+    paths: {
+      "/upload": {
+        post: {
+          operationId: "upload",
+          parameters: [],
+          requestBody: {
+            required: true,
+            content: { "multipart/form-data": { schema } }
+          },
+          responses: { "204": { description: "Uploaded" } },
+          tags: ["Upload"],
+          security: []
+        }
+      }
+    },
+    components: { schemas, securitySchemes: {} },
+    security: [],
+    tags: [{ name: "Upload" }]
+  }
+}
+
+// spawnSync blocks this worker, so compilation must not consume another test's deadline.
+describe("OpenApiGenerator", { concurrent: false }, () => {
   describe("schema", () => {
     it.effect("get operation", () =>
       assertRuntime(
@@ -739,6 +770,35 @@ export const make = (
           )
       : (request) => Effect.flatMap(httpClient.execute(request), withOptionalResponse)
   }
+  const __encodePathParam = encodeURIComponent
+  const __makePathRequest = (
+    method: (url: string) => HttpClientRequest.HttpClientRequest,
+    parameters: ReadonlyArray<string>,
+    getPath: () => string,
+  ) => Effect.suspend(() => {
+    const fail = (description: string, cause?: unknown) => Effect.fail(
+      new HttpClientError.HttpClientError({
+        reason: new HttpClientError.InvalidUrlError({
+          request: method(""),
+          cause,
+          description,
+        }),
+      }),
+    )
+    if (parameters.some((value) => value === "" || /^(?:\\.|%2e){1,2}$/i.test(value))) {
+      return fail("Path parameters must be non-empty and cannot be dot segments")
+    }
+    let path: string
+    try {
+      path = getPath()
+    } catch (cause) {
+      return fail("Failed to encode path parameter", cause)
+    }
+    if (path.split("/").some((segment) => /^(?:\\.|%2e){1,2}$/i.test(segment))) {
+      return fail("Request paths cannot contain dot segments")
+    }
+    return Effect.succeed(method(path))
+  })
   const decodeSuccess =
     <Schema extends Schema.Constraint>(schema: Schema) =>
     (response: HttpClientResponse.HttpClientResponse) =>
@@ -752,11 +812,13 @@ export const make = (
       )
   return {
     httpClient,
-    "getUser": (id, options) => HttpClientRequest.get(\`/users/\${id}\`).pipe(
-    withResponse(options?.config)(HttpClientResponse.matchStatus({
+    "getUser": (id, options) => __makePathRequest(HttpClientRequest.get, [id], () => "/users/" + __encodePathParam(id) + "").pipe(
+    Effect.flatMap((request) => request.pipe(
+      withResponse(options?.config)(HttpClientResponse.matchStatus({
       "2xx": decodeSuccess(GetUser200),
       orElse: unexpectedStatus
     }))
+    ))
   )
   }
 }
@@ -896,7 +958,7 @@ export const TestClientError = <Tag extends string, E>(
         [
           `import * as Sse from "effect/unstable/encoding/Sse"`,
           `readonly "streamEventsSse": () => Stream.Stream<{ readonly event: string; readonly id: string | undefined; readonly data: typeof StreamEvents200Sse.Type }, HttpClientError.HttpClientError | SchemaError | Sse.Retry | Sse.SseError, typeof StreamEvents200Sse.DecodingServices>`,
-          `"streamEventsSse": () => HttpClientRequest.get(\`/events\`).pipe(`,
+          `"streamEventsSse": () => HttpClientRequest.get("/events").pipe(`,
           `sseRequest(StreamEvents200Sse)`,
           `schema: Schema.ConstraintDecoder<Type, DecodingServices>`
         ]
@@ -1040,8 +1102,8 @@ export const TestClientError = <Tag extends string, E>(
         `readonly "downloadArchive": <Config extends OperationConfig>(options: { readonly config?: Config | undefined } | undefined) => Effect.Effect<WithOptionalResponse<Uint8Array, Config>`,
         `readonly "downloadArchiveStream": () => Stream.Stream<Uint8Array, HttpClientError.HttpClientError>`,
         `readonly "downloadAvatarStream": () => Stream.Stream<Uint8Array, HttpClientError.HttpClientError>`,
-        `"downloadAvatar": (options) => HttpClientRequest.get(\`/avatar\`).pipe(
-    withResponse(options?.config)(HttpClientResponse.matchStatus({
+        `"downloadAvatar": (options) => HttpClientRequest.get("/avatar").pipe(
+      withResponse(options?.config)(HttpClientResponse.matchStatus({
       "2xx": decodeBinary`,
         `readonly "downloadCustomBinaryStream": () => Stream.Stream<Uint8Array, HttpClientError.HttpClientError>`,
         `"400": decodeError("DownloadMixedContent400", DownloadMixedContent400)`,
@@ -1190,6 +1252,35 @@ export const make = (
           )
       : (request) => Effect.flatMap(httpClient.execute(request), withOptionalResponse)
   }
+  const __encodePathParam = encodeURIComponent
+  const __makePathRequest = (
+    method: (url: string) => HttpClientRequest.HttpClientRequest,
+    parameters: ReadonlyArray<string>,
+    getPath: () => string,
+  ) => Effect.suspend(() => {
+    const fail = (description: string, cause?: unknown) => Effect.fail(
+      new HttpClientError.HttpClientError({
+        reason: new HttpClientError.InvalidUrlError({
+          request: method(""),
+          cause,
+          description,
+        }),
+      }),
+    )
+    if (parameters.some((value) => value === "" || /^(?:\\.|%2e){1,2}$/i.test(value))) {
+      return fail("Path parameters must be non-empty and cannot be dot segments")
+    }
+    let path: string
+    try {
+      path = getPath()
+    } catch (cause) {
+      return fail("Failed to encode path parameter", cause)
+    }
+    if (path.split("/").some((segment) => /^(?:\\.|%2e){1,2}$/i.test(segment))) {
+      return fail("Request paths cannot contain dot segments")
+    }
+    return Effect.succeed(method(path))
+  })
   const decodeSuccess = <A>(response: HttpClientResponse.HttpClientResponse) =>
     response.json as Effect.Effect<A, HttpClientError.HttpClientError>
   const decodeVoid = (_response: HttpClientResponse.HttpClientResponse) =>
@@ -1226,8 +1317,10 @@ export const make = (
   }
   return {
     httpClient,
-    "getUser": (id, options) => HttpClientRequest.get(\`/users/\${id}\`).pipe(
-    onRequest(options?.config)(["2xx"])
+    "getUser": (id, options) => __makePathRequest(HttpClientRequest.get, [id], () => "/users/" + __encodePathParam(id) + "").pipe(
+    Effect.flatMap((request) => request.pipe(
+      onRequest(options?.config)(["2xx"])
+    ))
   )
   }
 }
@@ -1274,8 +1367,8 @@ export const TestClientError = <Tag extends string, E>(
         `onRequest(options?.config)([], {"404":"DownloadArchive404"}, {"binary":["2xx"],"voidSuccess":[],"voidError":[]})`,
         `readonly "downloadArchive": <Config extends OperationConfig>(options: { readonly config?: Config | undefined } | undefined) => Effect.Effect<WithOptionalResponse<Uint8Array, Config>`,
         `readonly "downloadAvatarStream": () => Stream.Stream<Uint8Array, HttpClientError.HttpClientError>`,
-        `"downloadAvatar": (options) => HttpClientRequest.get(\`/avatar\`).pipe(
-    onRequest(options?.config)([], undefined, {"binary":["2xx"],"voidSuccess":[],"voidError":[]})`,
+        `"downloadAvatar": (options) => HttpClientRequest.get("/avatar").pipe(
+      onRequest(options?.config)([], undefined, {"binary":["2xx"],"voidSuccess":[],"voidError":[]})`,
         `readonly "downloadCustomBinaryStream": () => Stream.Stream<Uint8Array, HttpClientError.HttpClientError>`,
         `import * as HttpClient from "effect/unstable/http/HttpClient"`,
         `onRequest(options?.config)([], {"400":"DownloadMixedContent400"}, {"binary":["2xx"],"voidSuccess":[],"voidError":[]})`,
@@ -1296,8 +1389,11 @@ export const TestClientError = <Tag extends string, E>(
         `WithOptionalResponse<MixedSuccess200 | void, Config>`
       ]))
 
-    it.effect("emits compilable clients for schema-backed and type-only formats", () =>
-      assertGeneratedClientsCompile(responseMatchingSpec))
+    it.effect(
+      "emits compilable clients for schema-backed and type-only formats",
+      () => assertGeneratedClientsCompile(responseMatchingSpec),
+      compilationTimeout
+    )
   })
 
   describe("httpapi", () => {
@@ -2770,7 +2866,120 @@ export const __HttpApiMultipartFiles = Multipart.FilesSchema`,
       ))
   })
 
+  describe("QUERY", () => {
+    const queryOperation: OpenAPISpecOperation = {
+      operationId: "search",
+      parameters: [],
+      tags: ["Search"],
+      security: [],
+      requestBody: {
+        required: true,
+        content: {
+          "application/json": {
+            schema: {
+              type: "object",
+              properties: { query: { type: "string" } },
+              required: ["query"],
+              additionalProperties: false
+            }
+          }
+        }
+      },
+      responses: { "204": { description: "No content" } }
+    }
+
+    const makeQuerySpec = (pathItem: OpenAPISpecPathItem & { query?: OpenAPISpecOperation }): OpenAPISpec => ({
+      openapi: "3.1.0",
+      info: { title: "QUERY API", version: "1.0.0" },
+      components: { schemas: {}, securitySchemes: {} },
+      security: [],
+      tags: [{ name: "Search" }],
+      paths: {
+        "/search": {
+          get: {
+            operationId: "list",
+            parameters: [],
+            tags: ["Search"],
+            security: [],
+            responses: { "204": { description: "No content" } }
+          },
+          ...pathItem
+        }
+      }
+    })
+
+    it.effect.each([
+      {
+        name: "OpenAPI 3.1 extension",
+        spec: makeQuerySpec({ "x-oai-additionalOperations": { QUERY: queryOperation } })
+      },
+      {
+        name: "native OpenAPI 3.2 field",
+        spec: {
+          ...makeQuerySpec({
+            query: queryOperation,
+            "x-oai-additionalOperations": { QUERY: { ...queryOperation, operationId: "legacySearch" } }
+          }),
+          openapi: "3.2.0"
+        } as unknown as OpenAPISpec
+      }
+    ])("generates QUERY request bodies from the $name", ({ spec }) =>
+      Effect.all([
+        assertRuntimeIncludes(spec, [
+          `HttpClientRequest.get("/search")`,
+          `HttpClientRequest.query("/search")`,
+          `export const SearchRequestJson = Schema.Struct({ "query": Schema.String })`,
+          `HttpClientRequest.bodyJsonUnsafe(options.payload)`,
+          `readonly payload: typeof SearchRequestJson.Encoded`
+        ], ["legacySearch", "LegacySearch"]),
+        assertTypeOnlyIncludes(spec, [
+          `HttpClientRequest.get("/search")`,
+          `HttpClientRequest.query("/search")`,
+          `HttpClientRequest.bodyJsonUnsafe(options.payload)`,
+          `export type SearchRequestJson = { readonly "query": string }`,
+          `readonly payload: SearchRequestJson`
+        ], ["legacySearch", "LegacySearch"]),
+        assertHttpApiIncludes(spec, [
+          `HttpApiEndpoint.get("list", "/search"`,
+          `export const SearchRequestJson = Schema.Struct({ "query": Schema.String })`,
+          `HttpApiEndpoint.query("search", "/search", { payload: SearchRequestJson, success: HttpApiSchema.Empty(204) })`
+        ], ["legacySearch", "LegacySearch"])
+      ]))
+  })
+
   describe("regression", () => {
+    it.effect("quotes static path text with and without parameters", () => {
+      const prefix = "/files/\"`\\\n/"
+      const suffix = "/content\"`"
+      const operation: OpenAPISpecOperation = {
+        operationId: "read",
+        parameters: [],
+        tags: ["Files"],
+        security: [],
+        responses: { "204": { description: "No content" } }
+      }
+      return assertRuntimeIncludes({
+        openapi: "3.1.0",
+        info: { title: "Quoted paths", version: "1.0.0" },
+        components: { schemas: {}, securitySchemes: {} },
+        security: [],
+        tags: [],
+        paths: {
+          [prefix + suffix]: { get: operation },
+          [prefix + "{id}" + suffix]: {
+            get: {
+              ...operation,
+              operationId: "readById",
+              parameters: [{ name: "id", in: "path", required: true, schema: { type: "string" } }]
+            }
+          }
+        }
+      }, [
+        `HttpClientRequest.get(${JSON.stringify(prefix + suffix)})`,
+        `() => ${JSON.stringify(prefix)} + __encodePathParam(id) + ${JSON.stringify(suffix)}`
+      ])
+    })
+
     it.effect("emits compilable clients when schema examples are invalid", () =>
       assertGeneratedClientsCompile({
         openapi: "3.0.3",
@@ -2808,7 +3017,7 @@ export const __HttpApiMultipartFiles = Multipart.FilesSchema`,
         },
         security: [],
         tags: [{ name: "Triggers" }]
-      } as unknown as OpenAPISpec))
+      } as unknown as OpenAPISpec), compilationTimeout)
 
     it.effect("runtime warnings do not report additional-tags-dropped outside httpapi", () =>
       assertRuntimeStableWithWarnings(
@@ -2922,6 +3131,103 @@ export const __HttpApiMultipartFiles = Multipart.FilesSchema`,
           exactOptionalPropertyTypes: false,
           formats: ["httpclient"]
         }
-      ))
+      ), compilationTimeout)
+
+    it.effect("types multipart binary fields as File | Blob for generated clients", () =>
+      assertGeneratedClientsCompile(
+        multipartSpec({
+          type: "object",
+          properties: { file: { type: "string", format: "binary" } },
+          required: ["file"],
+          additionalProperties: false
+        }),
+        {
+          usage: `export const withFile: UploadRequestFormData = { file: new File([], "upload.txt") }
+export const withBlob: UploadRequestFormData = { file: new Blob([]) }
+// @ts-expect-error Binary multipart fields do not accept strings.
+export const withString: UploadRequestFormData = { file: "upload.txt" }
+`
+        }
+      ), compilationTimeout)
+
+    it.effect(
+      "types recursive multipart binary references as File | Blob for generated clients",
+      () =>
+        assertGeneratedClientsCompile(
+          multipartSpec({ $ref: "#/components/schemas/Node" }, {
+            Node: {
+              type: "object",
+              properties: {
+                file: { type: "string", format: "binary" },
+                child: { $ref: "#/components/schemas/Node" }
+              },
+              required: ["file"],
+              additionalProperties: false
+            }
+          }),
+          {
+            usage: `const file = new File([], "upload.txt")
+const blob = new Blob([])
+export const payload: UploadRequestFormData = { file, child: { file: blob, child: { file } } }
+// @ts-expect-error Recursive binary fields do not accept strings.
+export const withString: UploadRequestFormData = { file, child: { file: "upload.txt" } }
+`
+          }
+        ),
+      compilationTimeout
+    )
+
+    for (
+      const [format, assertIncludes] of [
+        ["httpclient", assertRuntimeIncludes],
+        ["httpclient-type-only", assertTypeOnlyIncludes]
+      ] as const
+    ) {
+      it.effect(`preserves named multipart components without binary fields (${format})`, () =>
+        assertIncludes(
+          multipartSpec({ $ref: "#/components/schemas/FormBody" }, {
+            FormBody: {
+              type: "object",
+              properties: {
+                name: { type: "string" },
+                meta: { $ref: "#/components/schemas/Meta" }
+              },
+              required: ["name"],
+              additionalProperties: false
+            },
+            Meta: {
+              type: "object",
+              properties: { k: { type: "string" } },
+              required: ["k"],
+              additionalProperties: false
+            }
+          }),
+          [
+            "export type Meta =",
+            "export type FormBody =",
+            "export type UploadRequestFormData = FormBody"
+          ]
+        ))
+    }
+
+    it.effect(
+      "types multipart binary arrays as File | Blob arrays for generated clients",
+      () =>
+        assertGeneratedClientsCompile(
+          multipartSpec({
+            type: "object",
+            properties: { files: { type: "array", items: { type: "string", format: "binary" } } },
+            required: ["files"],
+            additionalProperties: false
+          }),
+          {
+            usage: `export const payload: UploadRequestFormData = { files: [new File([], "upload.txt"), new Blob([])] }
+// @ts-expect-error Binary multipart arrays do not accept strings.
+export const withString: UploadRequestFormData = { files: ["upload.txt"] }
+`
+          }
+        ),
+      compilationTimeout
+    )
   })
 })
diff --git a/repos/effect/packages/tools/openapi-generator/test/OpenApiTransformer.test.ts b/repos/effect/packages/tools/openapi-generator/test/OpenApiTransformer.test.ts
new file mode 100644
index 000000000..6381a23e9
--- /dev/null
+++ b/repos/effect/packages/tools/openapi-generator/test/OpenApiTransformer.test.ts
@@ -0,0 +1,313 @@
+import * as OpenApiGenerator from "@effect/openapi-generator/OpenApiGenerator"
+import { assert, describe, it } from "@effect/vitest"
+import * as Data from "effect/Data"
+import * as Effect from "effect/Effect"
+import * as Schema from "effect/Schema"
+import * as Stream from "effect/Stream"
+import * as Sse from "effect/unstable/encoding/Sse"
+import * as HttpClient from "effect/unstable/http/HttpClient"
+import * as HttpClientError from "effect/unstable/http/HttpClientError"
+import * as HttpClientRequest from "effect/unstable/http/HttpClientRequest"
+import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse"
+import type { OpenAPISpec } from "effect/unstable/httpapi/OpenApi"
+import { rolldown } from "rolldown"
+
+const modules = {
+  "effect/Data": Data,
+  "effect/Effect": Effect,
+  "effect/Schema": Schema,
+  "effect/Stream": Stream,
+  "effect/unstable/encoding/Sse": Sse,
+  "effect/unstable/http/HttpClient": HttpClient,
+  "effect/unstable/http/HttpClientError": HttpClientError,
+  "effect/unstable/http/HttpClientRequest": HttpClientRequest,
+  "effect/unstable/http/HttpClientResponse": HttpClientResponse
+}
+
+type TransformClient = (client: HttpClient.HttpClient) => Effect.Effect<HttpClient.HttpClient>
+
+async function loadClient<
+  Client = {
+    readStream: () => Stream.Stream<unknown, HttpClientError.HttpClientError>
+    readSse: () => Stream.Stream<unknown, HttpClientError.HttpClientError>
+  }
+>(source: string) {
+  const bundle = await rolldown({
+    input: "client.ts",
+    external: (id) => id !== "client.ts",
+    plugins: [{
+      name: "generated-client",
+      resolveId: (id) => id === "client.ts" ? id : undefined,
+      load: (id) => id === "client.ts" ? source : undefined
+    }]
+  })
+  try {
+    const { output } = await bundle.generate({ format: "cjs" })
+    const compiled = output[0]
+    assert.strictEqual(compiled.type, "chunk")
+    const exports = {} as {
+      make: (httpClient: HttpClient.HttpClient, options?: { transformClient: TransformClient }) => Client
+    }
+    new Function("require", "exports", compiled.code)(
+      (id: keyof typeof modules) => {
+        assert.property(modules, id)
+        return modules[id]
+      },
+      exports
+    )
+    return exports.make
+  } finally {
+    await bundle.close()
+  }
+}
+
+const paths = [
+  { format: "httpclient", encoding: "binary" },
+  { format: "httpclient", encoding: "sse-data" },
+  { format: "httpclient", encoding: "sse-event" },
+  { format: "httpclient-type-only", encoding: "binary" },
+  { format: "httpclient-type-only", encoding: "sse-data" }
+] as const
+
+describe("OpenApiTransformer", () => {
+  describe("path parameters", () => {
+    const generate = Effect.gen(function*() {
+      const generator = yield* OpenApiGenerator.OpenApiGenerator
+      const source = yield* generator.generate({
+        openapi: "3.1.0",
+        info: { title: "Files", version: "1.0.0" },
+        components: { schemas: {}, securitySchemes: {} },
+        security: [],
+        tags: [],
+        paths: {
+          "/files/{id}/content": {
+            get: {
+              operationId: "read",
+              parameters: [{ name: "id", in: "path", required: true, schema: { type: "string" } }],
+              tags: ["Files"],
+              security: [],
+              responses: {
+                "200": {
+                  description: "File contents",
+                  content: { "application/octet-stream": { schema: { type: "string" } } }
+                }
+              }
+            }
+          }
+        }
+      }, { name: "TestClient", format: "httpclient-type-only" })
+      return yield* Effect.promise(() =>
+        loadClient<{
+          read: (id: string) => Effect.Effect<unknown, HttpClientError.HttpClientError>
+          readStream: (id: string) => Stream.Stream<unknown, HttpClientError.HttpClientError>
+        }>(source)
+      )
+    }).pipe(Effect.provide(OpenApiGenerator.layerTransformerTs))
+
+    it.effect("percent-encodes each parameter as one path segment", () =>
+      Effect.gen(function*() {
+        const make = yield* generate
+        const urls: Array<string> = []
+        const client = make(
+          HttpClient.make((request, url) => {
+            urls.push(url.href)
+            return Effect.succeed(HttpClientResponse.fromWeb(request, new Response("")))
+          }).pipe(HttpClient.mapRequest(HttpClientRequest.prependUrl("https://example.com")))
+        )
+        for (
+          const [value, encoded] of [
+            ["alice", "alice"],
+            ["../a/b?c#d\\e%20", "..%2Fa%2Fb%3Fc%23d%5Ce%2520"],
+            ["hello world/é", "hello%20world%2F%C3%A9"]
+          ]
+        ) {
+          yield* client.read(value)
+          assert.strictEqual(urls.at(-1), `https://example.com/files/${encoded}/content`)
+        }
+        assert.strictEqual(urls.length, 3)
+      }))
+
+    it.effect("rejects empty and dot parameters with a typed error before sending", () =>
+      Effect.gen(function*() {
+        const make = yield* generate
+        let requests = 0
+        const client = make(
+          HttpClient.make(() => {
+            requests++
+            return Effect.die("Unexpected request")
+          }).pipe(HttpClient.mapRequest(HttpClientRequest.prependUrl("https://example.com")))
+        )
+        for (const value of ["", ".", ".."]) {
+          const error = yield* Effect.flip(client.read(value))
+          assert.instanceOf(error, HttpClientError.HttpClientError)
+          assert.instanceOf(error.reason, HttpClientError.InvalidUrlError)
+        }
+        assert.strictEqual(requests, 0)
+      }))
+
+    it.effect("propagates path rejection through the stream error channel", () =>
+      Effect.gen(function*() {
+        const make = yield* generate
+        let requests = 0
+        const client = make(
+          HttpClient.make(() => {
+            requests++
+            return Effect.die("Unexpected request")
+          }).pipe(HttpClient.mapRequest(HttpClientRequest.prependUrl("https://example.com")))
+        )
+        const error = yield* Effect.flip(Stream.runCollect(client.readStream("..")))
+        assert.instanceOf(error, HttpClientError.HttpClientError)
+        assert.instanceOf(error.reason, HttpClientError.InvalidUrlError)
+        assert.strictEqual(requests, 0)
+      }))
+  })
+
+  for (const { encoding, format } of paths) {
+    const binary = encoding === "binary"
+    const body = binary
+      ? "download"
+      : encoding === "sse-event"
+      ? "event: message\nid: 1\ndata: hello\n\n"
+      : "event: message\nid: 1\ndata: \"hello\"\n\n"
+    const expected = binary
+      ? [new TextEncoder().encode(body)]
+      : format === "httpclient-type-only"
+      ? ["hello"]
+      : [{ event: "message", id: "1", data: "hello" }]
+    const spec: OpenAPISpec = {
+      openapi: "3.1.0",
+      info: { title: "Streaming API", version: "1.0.0" },
+      components: { schemas: {}, securitySchemes: {} },
+      security: [],
+      tags: [],
+      paths: {
+        "/read": {
+          get: {
+            operationId: "read",
+            parameters: [],
+            tags: ["Streams"],
+            security: [],
+            responses: {
+              "200": {
+                description: "Success",
+                content: {
+                  [binary ? "application/octet-stream" : "text/event-stream"]: {
+                    schema: encoding === "sse-event"
+                      ? {
+                        type: "object",
+                        properties: {
+                          id: { anyOf: [{ type: "string" }, { type: "null" }] },
+                          event: { const: "message" },
+                          data: { type: "string" }
+                        },
+                        required: ["id", "event", "data"],
+                        additionalProperties: false
+                      }
+                      : { type: "string" },
+                    ...(encoding === "sse-event"
+                      ? {
+                        "x-effect-stream": {
+                          encoding: "sse",
+                          errorSchema: {},
+                          causeSchema: {},
+                          failureEvent: "effect/httpapi/stream/failure"
+                        }
+                      }
+                      : {})
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    const generate = Effect.gen(function*() {
+      const generator = yield* OpenApiGenerator.OpenApiGenerator
+      const source = yield* generator.generate(spec, { name: "TestClient", format })
+      return yield* Effect.promise(() => loadClient(source))
+    }).pipe(Effect.provide(
+      format === "httpclient" ? OpenApiGenerator.layerTransformerSchema : OpenApiGenerator.layerTransformerTs
+    ))
+
+    describe(`${format} ${encoding}`, () => {
+      it.effect("defers transformation and applies fresh headers on each consumption", () =>
+        Effect.gen(function*() {
+          const make = yield* generate
+          const requests: Array<HttpClientRequest.HttpClientRequest> = []
+          let transforms = 0
+          let transformEffects = 0
+          const httpClient = HttpClient.make((request) => {
+            requests.push(request)
+            return Effect.succeed(HttpClientResponse.fromWeb(request, new Response(body)))
+          }).pipe(HttpClient.mapRequest(HttpClientRequest.prependUrl("https://example.com")))
+          const client = make(httpClient, {
+            transformClient: (client) => {
+              transforms++
+              return Effect.sync(() => {
+                transformEffects++
+                return HttpClient.mapRequest(client, HttpClientRequest.setHeader("x-transformed", String(transforms)))
+              })
+            }
+          })
+          const stream = binary ? client.readStream() : client.readSse()
+          assert.strictEqual(transforms, 0)
+          assert.strictEqual(transformEffects, 0)
+          assert.deepStrictEqual(requests, [])
+          for (let run = 1; run <= 2; run++) {
+            assert.deepStrictEqual(yield* Stream.runCollect(stream), expected)
+            assert.strictEqual(requests.length, run)
+            assert.strictEqual(requests[run - 1].headers["x-transformed"], String(run))
+            assert.strictEqual(transforms, run)
+            assert.strictEqual(transformEffects, run)
+          }
+        }))
+
+      it.effect("filters the response returned by the transformed client", () =>
+        Effect.gen(function*() {
+          const make = yield* generate
+          const httpClient = HttpClient.make((request) =>
+            Effect.succeed(HttpClientResponse.fromWeb(request, new Response(body)))
+          ).pipe(HttpClient.mapRequest(HttpClientRequest.prependUrl("https://example.com")))
+          const client = make(httpClient, {
+            transformClient: (client) =>
+              Effect.succeed(HttpClient.transformResponse(
+                client,
+                Effect.map((response) =>
+                  HttpClientResponse.fromWeb(response.request, new Response(body, { status: 403 }))
+                )
+              ))
+          })
+          const stream = binary ? client.readStream() : client.readSse()
+          const error = yield* Effect.flip(Stream.runCollect(stream))
+          assert.strictEqual(error._tag, "HttpClientError")
+          assert.strictEqual(error.reason._tag, "StatusCodeError")
+          if (error.reason._tag === "StatusCodeError") {
+            assert.strictEqual(error.reason.response.status, 403)
+          }
+        }))
+
+      for (const status of [200, 403]) {
+        it.effect(`preserves status ${status} handling without a transform`, () =>
+          Effect.gen(function*() {
+            const make = yield* generate
+            let requests = 0
+            const httpClient = HttpClient.make((request) => {
+              requests++
+              return Effect.succeed(HttpClientResponse.fromWeb(request, new Response(body, { status })))
+            }).pipe(HttpClient.mapRequest(HttpClientRequest.prependUrl("https://example.com")))
+            const client = make(httpClient)
+            const stream = binary ? client.readStream() : client.readSse()
+            assert.strictEqual(requests, 0)
+            if (status === 200) {
+              assert.deepStrictEqual(yield* Stream.runCollect(stream), expected)
+            } else {
+              const error = yield* Effect.flip(Stream.runCollect(stream))
+              assert.strictEqual(error.reason._tag, "StatusCodeError")
+            }
+            assert.strictEqual(requests, 1)
+          }))
+      }
+    })
+  }
+})
diff --git a/repos/effect/packages/tools/openapi-generator/test/Utils.test.ts b/repos/effect/packages/tools/openapi-generator/test/Utils.test.ts
index c7846e81b..af9dcb564 100644
--- a/repos/effect/packages/tools/openapi-generator/test/Utils.test.ts
+++ b/repos/effect/packages/tools/openapi-generator/test/Utils.test.ts
@@ -1,5 +1,60 @@
+import * as OpenApiGenerator from "@effect/openapi-generator/OpenApiGenerator"
 import * as Utils from "@effect/openapi-generator/Utils"
-import { describe, expect, it } from "vitest"
+import { assert, describe, expect, it } from "@effect/vitest"
+import * as Data from "effect/Data"
+import * as Effect from "effect/Effect"
+import * as Schema from "effect/Schema"
+import * as Stream from "effect/Stream"
+import * as Sse from "effect/unstable/encoding/Sse"
+import * as HttpClient from "effect/unstable/http/HttpClient"
+import * as HttpClientError from "effect/unstable/http/HttpClientError"
+import * as HttpClientRequest from "effect/unstable/http/HttpClientRequest"
+import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse"
+import type { OpenAPISpec } from "effect/unstable/httpapi/OpenApi"
+import { rolldown } from "rolldown"
+
+const modules = {
+  "effect/Data": Data,
+  "effect/Effect": Effect,
+  "effect/Schema": Schema,
+  "effect/Stream": Stream,
+  "effect/unstable/encoding/Sse": Sse,
+  "effect/unstable/http/HttpClient": HttpClient,
+  "effect/unstable/http/HttpClientError": HttpClientError,
+  "effect/unstable/http/HttpClientRequest": HttpClientRequest,
+  "effect/unstable/http/HttpClientResponse": HttpClientResponse
+}
+
+async function loadClient(source: string, httpClient: HttpClient.HttpClient) {
+  const bundle = await rolldown({
+    input: "client.ts",
+    external: (id) => id !== "client.ts",
+    plugins: [{
+      name: "generated-client",
+      resolveId: (id) => id === "client.ts" ? id : undefined,
+      load: (id) => id === "client.ts" ? source : undefined
+    }]
+  })
+  const { output } = await bundle.generate({ format: "cjs" })
+  await bundle.close()
+  const compiled = output[0]
+  assert.strictEqual(compiled.type, "chunk")
+  const exports = {} as {
+    make: (httpClient: HttpClient.HttpClient) => {
+      submit: (options: { payload: { name: string } }) => Effect.Effect<unknown, unknown>
+      submitSse: (options: { payload: { name: string } }) => Stream.Stream<unknown, unknown>
+      submitStream: (options: { payload: { name: string } }) => Stream.Stream<unknown, unknown>
+    }
+  }
+  new Function("require", "exports", compiled.code)(
+    (id: keyof typeof modules) => {
+      assert.property(modules, id)
+      return modules[id]
+    },
+    exports
+  )
+  return exports.make(httpClient)
+}
 
 describe("Utils", () => {
   describe("camelize", () => {
@@ -30,4 +85,143 @@ describe("Utils", () => {
       expect(Utils.identifier("operation-2")).toBe("Operation2")
     })
   })
+
+  describe("generated request encoding", () => {
+    for (const format of ["httpclient", "httpclient-type-only"] as const) {
+      for (const method of ["submit", "submitSse", "submitStream"] as const) {
+        it.effect(`${format} ${method} sends form-urlencoded payloads`, () =>
+          Effect.gen(function*() {
+            const responseContentType = method === "submitSse"
+              ? "text/event-stream"
+              : method === "submitStream"
+              ? "application/octet-stream"
+              : "application/json"
+            const spec: OpenAPISpec = {
+              openapi: "3.1.0",
+              info: { title: "Form API", version: "1.0.0" },
+              components: { schemas: {}, securitySchemes: {} },
+              security: [],
+              tags: [],
+              paths: {
+                "/submit": {
+                  post: {
+                    operationId: "submit",
+                    parameters: [],
+                    tags: ["Forms"],
+                    security: [],
+                    requestBody: {
+                      required: true,
+                      content: {
+                        "application/x-www-form-urlencoded": {
+                          schema: {
+                            type: "object",
+                            properties: { name: { type: "string" } },
+                            required: ["name"]
+                          }
+                        }
+                      }
+                    },
+                    responses: {
+                      "200": {
+                        description: "Success",
+                        content: { [responseContentType]: { schema: { type: "string" } } }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            const generator = yield* OpenApiGenerator.OpenApiGenerator
+            const source = yield* generator.generate(spec, { name: "TestClient", format })
+            const requests: Array<HttpClientRequest.HttpClientRequest> = []
+            const httpClient = HttpClient.make((request) => {
+              requests.push(request)
+              return Effect.succeed(HttpClientResponse.fromWeb(
+                request,
+                new Response(method === "submitSse" ? "data: \"ok\"\n\n" : "\"ok\"", {
+                  headers: { "content-type": responseContentType }
+                })
+              ))
+            }).pipe(HttpClient.mapRequest(HttpClientRequest.prependUrl("https://example.test")))
+            const client = yield* Effect.promise(() => loadClient(source, httpClient))
+            const options = { payload: { name: "Ada Lovelace" } }
+            if (method === "submit") {
+              yield* client.submit(options)
+            } else {
+              yield* Stream.runDrain(client[method](options))
+            }
+            assert.strictEqual(requests.length, 1)
+            const request = yield* HttpClientRequest.toWeb(requests[0])
+            assert.deepStrictEqual({
+              contentType: request.headers.get("content-type"),
+              body: yield* Effect.promise(() => request.text())
+            }, {
+              contentType: "application/x-www-form-urlencoded",
+              body: "name=Ada+Lovelace"
+            })
+          }).pipe(Effect.provide(
+            format === "httpclient" ? OpenApiGenerator.layerTransformerSchema : OpenApiGenerator.layerTransformerTs
+          )))
+      }
+    }
+  })
+
+  it.effect("encodes multipart record payloads as form data", () =>
+    Effect.gen(function*() {
+      const spec: OpenAPISpec = {
+        openapi: "3.1.0",
+        info: { title: "Form API", version: "1.0.0" },
+        components: { schemas: {}, securitySchemes: {} },
+        security: [],
+        tags: [],
+        paths: {
+          "/submit": {
+            post: {
+              operationId: "submit",
+              parameters: [],
+              tags: ["Forms"],
+              security: [],
+              requestBody: {
+                required: true,
+                content: {
+                  "multipart/form-data": {
+                    schema: {
+                      type: "object",
+                      properties: { name: { type: "string" } },
+                      required: ["name"]
+                    }
+                  }
+                }
+              },
+              responses: {
+                "200": {
+                  description: "Success",
+                  content: { "application/json": { schema: { type: "string" } } }
+                }
+              }
+            }
+          }
+        }
+      }
+      const generator = yield* OpenApiGenerator.OpenApiGenerator
+      const source = yield* generator.generate(spec, { name: "TestClient", format: "httpclient" })
+      const requests: Array<HttpClientRequest.HttpClientRequest> = []
+      const httpClient = HttpClient.make((request) => {
+        requests.push(request)
+        return Effect.succeed(HttpClientResponse.fromWeb(
+          request,
+          new Response("\"ok\"", { headers: { "content-type": "application/json" } })
+        ))
+      }).pipe(HttpClient.mapRequest(HttpClientRequest.prependUrl("https://example.test")))
+      const client = yield* Effect.promise(() => loadClient(source, httpClient))
+
+      yield* client.submit({ payload: { name: "Ada Lovelace" } })
+
+      assert.strictEqual(requests.length, 1)
+      const request = yield* HttpClientRequest.toWeb(requests[0])
+      const body = yield* Effect.promise(() => request.clone().text())
+      assert.notStrictEqual(body, "[object Object]")
+      const formData = yield* Effect.promise(() => request.formData())
+      assert.deepStrictEqual(Array.from(formData.entries()), [["name", "Ada Lovelace"]])
+    }).pipe(Effect.provide(OpenApiGenerator.layerTransformerSchema)))
 })
diff --git a/repos/effect/packages/tools/oxc/package.json b/repos/effect/packages/tools/oxc/package.json
index c4d935d0c..7b6cf2b96 100644
--- a/repos/effect/packages/tools/oxc/package.json
+++ b/repos/effect/packages/tools/oxc/package.json
@@ -56,14 +56,14 @@
     "check": "tsc -b tsconfig.json"
   },
   "dependencies": {
-    "@oxlint/plugins": "^1.80.0"
+    "@oxlint/plugins": "^1.83.0"
   },
   "peerDependencies": {
     "typescript": ">=5.0.0 <7.0.0"
   },
   "devDependencies": {
-    "@types/node": "^26.4.0",
+    "@types/node": "^26.6.2",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.11"
+    "vitest": "^5.0.1"
   }
 }
diff --git a/repos/effect/packages/tools/oxc/src/oxlint/rules/no-bigint-literals.ts b/repos/effect/packages/tools/oxc/src/oxlint/rules/no-bigint-literals.ts
index 2139717de..dd14ad7e0 100644
--- a/repos/effect/packages/tools/oxc/src/oxlint/rules/no-bigint-literals.ts
+++ b/repos/effect/packages/tools/oxc/src/oxlint/rules/no-bigint-literals.ts
@@ -10,7 +10,7 @@ const rule: CreateRule = {
     return {
       Literal(node) {
         if (typeof node.value === "bigint") {
-          const fixedSource = `BigInt(${node.value})`
+          const fixedSource = `BigInt("${node.value}")`
           context.report({
             node,
             message: "BigInt literals are not allowed",
diff --git a/repos/effect/packages/tools/oxc/src/oxlint/rules/no-js-extension-imports.ts b/repos/effect/packages/tools/oxc/src/oxlint/rules/no-js-extension-imports.ts
index 4dcf2def0..f7973a44c 100644
--- a/repos/effect/packages/tools/oxc/src/oxlint/rules/no-js-extension-imports.ts
+++ b/repos/effect/packages/tools/oxc/src/oxlint/rules/no-js-extension-imports.ts
@@ -44,7 +44,7 @@ const rule: CreateRule = {
       context.report({
         node: source,
         message: `Use "${tsExt}" extension instead of "${ext}" for relative imports`,
-        fix: (fixer: Fixer) => fixer.replaceTextRange(source.range, `"${fixedSource}"`)
+        fix: (fixer: Fixer) => fixer.replaceTextRange(source.range, JSON.stringify(fixedSource))
       })
     }
 
diff --git a/repos/effect/packages/tools/oxc/test/no-js-extension-imports.test.ts b/repos/effect/packages/tools/oxc/test/no-js-extension-imports.test.ts
index 8879334f2..689c3e32d 100644
--- a/repos/effect/packages/tools/oxc/test/no-js-extension-imports.test.ts
+++ b/repos/effect/packages/tools/oxc/test/no-js-extension-imports.test.ts
@@ -1,4 +1,5 @@
 import rule from "@effect/oxc/oxlint/rules/no-js-extension-imports"
+import type { Fix, Visitor } from "@oxlint/plugins"
 import { describe, expect, it } from "vitest"
 import { runRule } from "./utils.ts"
 
@@ -21,6 +22,42 @@ describe("no-js-extension-imports", () => {
     range: [0, 50] as [number, number]
   })
 
+  const applyFix = (visitor: keyof Visitor, node: unknown): Fix => {
+    const errors = runRule(rule, visitor, node)
+    expect(errors).toHaveLength(1)
+    return errors[0].fix!({ replaceTextRange: (range, text) => ({ range, text }) })
+  }
+
+  describe("fixes", () => {
+    const declarations = [
+      ["ImportDeclaration", "import "],
+      ["ExportAllDeclaration", "export * from "],
+      ["ExportNamedDeclaration", "export { value } from "]
+    ] as const
+
+    it.each(declarations)("escapes the replacement in %s", (visitor, prefix) => {
+      const value = "./say\"hello.js"
+      const source = `${prefix}'${value}'`
+      const node = { source: { value, range: [prefix.length, source.length] } }
+      const fix = applyFix(visitor, node)
+      expect(fix.range).toEqual([prefix.length, source.length])
+      expect(Function(`return ${fix.text}`)()).toBe("./say\"hello.ts")
+    })
+
+    it.each([
+      ["./back\\file.js", "./back\\file.ts"],
+      ["./a\nb.js", "./a\nb.ts"],
+      ["./plain.js", "./plain.ts"],
+      ["./plain.jsx", "./plain.tsx"],
+      ["./plain.mjs", "./plain.mts"],
+      ["./plain.cjs", "./plain.cts"],
+      ["./say'hello.js", "./say'hello.ts"]
+    ])("preserves the decoded specifier for %s", (value, expected) => {
+      const fix = applyFix("ImportDeclaration", createImportDeclaration(value))
+      expect(Function(`return ${fix.text}`)()).toBe(expected)
+    })
+  })
+
   describe("ImportDeclaration", () => {
     it("should report .js extension in relative imports", () => {
       const node = createImportDeclaration("./foo.js")
diff --git a/repos/effect/packages/tools/oxc/test/utils.ts b/repos/effect/packages/tools/oxc/test/utils.ts
index 002c8c956..71d5a92fe 100644
--- a/repos/effect/packages/tools/oxc/test/utils.ts
+++ b/repos/effect/packages/tools/oxc/test/utils.ts
@@ -1,8 +1,9 @@
-import type { CreateRule, Visitor } from "@oxlint/plugins"
+import type { CreateRule, Fix, Fixer, Visitor } from "@oxlint/plugins"
 
 export interface ReportedError {
   node: unknown
   message: string
+  fix?: (fixer: Pick<Fixer, "replaceTextRange">) => Fix
 }
 
 export interface TestContextOptions {
diff --git a/repos/effect/packages/tools/utils/package.json b/repos/effect/packages/tools/utils/package.json
index 898cd16c3..a783456d4 100644
--- a/repos/effect/packages/tools/utils/package.json
+++ b/repos/effect/packages/tools/utils/package.json
@@ -51,6 +51,6 @@
     "glob": "^13.0.6"
   },
   "devDependencies": {
-    "@types/node": "^26.4.0"
+    "@types/node": "^26.6.2"
   }
 }
diff --git a/repos/effect/packages/tools/utils/src/Codegen.ts b/repos/effect/packages/tools/utils/src/Codegen.ts
index 5c948a3e1..12833cf53 100644
--- a/repos/effect/packages/tools/utils/src/Codegen.ts
+++ b/repos/effect/packages/tools/utils/src/Codegen.ts
@@ -182,7 +182,10 @@ export const layer: Layer.Layer<BarrelGenerator, never, FileSystem.FileSystem |
         nodir: true
       })
 
-      const results = yield* Effect.forEach(indexFiles, (file) => discoverFile(path.join(cwd, file)))
+      const results = yield* Effect.forEach(
+        indexFiles,
+        (file) => discoverFile(path.isAbsolute(file) ? file : path.join(cwd, file))
+      )
       return results.filter((file) => file !== undefined)
     })
 
diff --git a/repos/effect/packages/tools/utils/src/commands/codegen.ts b/repos/effect/packages/tools/utils/src/commands/codegen.ts
index 0d30fc57a..6b38980e8 100644
--- a/repos/effect/packages/tools/utils/src/commands/codegen.ts
+++ b/repos/effect/packages/tools/utils/src/commands/codegen.ts
@@ -29,8 +29,8 @@ const CodegenLayer = Layer.provideMerge(Codegen.layer, Glob.layer)
  * @since 4.0.0
  */
 export const codegen = Command.make("codegen", {
-  cwd: Flag.directory("cwd", { mustExist: true }).pipe(Flag.withDefault(".")),
-  pattern: Flag.string("pattern").pipe(Flag.withDefault("src/**/index.ts"))
+  cwd: Flag.Directory("cwd", { mustExist: true }).pipe(Flag.withDefault(".")),
+  pattern: Flag.String("pattern").pipe(Flag.withDefault("src/**/index.ts"))
 }, (config) =>
   Effect.gen(function*() {
     const path = yield* Path.Path
diff --git a/repos/effect/packages/tools/utils/test/Codegen.test.ts b/repos/effect/packages/tools/utils/test/Codegen.test.ts
new file mode 100644
index 000000000..aa4090d77
--- /dev/null
+++ b/repos/effect/packages/tools/utils/test/Codegen.test.ts
@@ -0,0 +1,25 @@
+import * as NodeServices from "@effect/platform-node/NodeServices"
+import * as Codegen from "@effect/utils/Codegen"
+import * as Glob from "@effect/utils/Glob"
+import { assert, describe, it } from "@effect/vitest"
+import * as Effect from "effect/Effect"
+import * as FileSystem from "effect/FileSystem"
+import * as Layer from "effect/Layer"
+import * as path from "node:path"
+
+const MainLayer = Codegen.layer.pipe(Layer.provide(Glob.layer), Layer.provideMerge(NodeServices.layer))
+
+describe("BarrelGenerator", () => {
+  it.effect("discovers a barrel from an absolute pattern", () =>
+    Effect.gen(function*() {
+      const fs = yield* FileSystem.FileSystem
+      const directory = yield* fs.makeTempDirectoryScoped({ prefix: "codegen-" })
+      const barrel = path.join(directory, "index.ts")
+      yield* fs.writeFileString(barrel, "// @barrel\n")
+
+      const generator = yield* Codegen.BarrelGenerator
+      const files = yield* generator.discoverFiles(barrel, directory)
+
+      assert.deepStrictEqual(files, [{ path: barrel, pattern: "*.ts", offset: 1 }])
+    }).pipe(Effect.provide(MainLayer)))
+})
diff --git a/repos/effect/packages/vitest/CHANGELOG.md b/repos/effect/packages/vitest/CHANGELOG.md
index 372ad0f29..b1c9bbcbf 100644
--- a/repos/effect/packages/vitest/CHANGELOG.md
+++ b/repos/effect/packages/vitest/CHANGELOG.md
@@ -1,5 +1,171 @@
 # @effect/vitest
 
+## 4.0.0-rc.117
+
+### Patch Changes
+
+- Updated dependencies [[`9953c92`](https://github.com/Effect-TS/effect/commit/9953c92b860061ec928098b121279087ee56e5e9), [`c6e8b20`](https://github.com/Effect-TS/effect/commit/c6e8b20c27b08e94549a9431c38e867aa014b724), [`8d40572`](https://github.com/Effect-TS/effect/commit/8d40572de3762d51b142cfff30e6927ef21e37a3), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3b155e3`](https://github.com/Effect-TS/effect/commit/3b155e3e24e42b603d48dff5d3280715944998f0), [`895d944`](https://github.com/Effect-TS/effect/commit/895d94410f90c45546aec593730e5630f200ca1b), [`705fb68`](https://github.com/Effect-TS/effect/commit/705fb6852ac24791352bd78889d57f07cbe949a9), [`87912c0`](https://github.com/Effect-TS/effect/commit/87912c014132648694015a5636177b2ba2bdeb2a), [`106af64`](https://github.com/Effect-TS/effect/commit/106af64cf7117dfad53d3b11b61bb3d17d63bfca), [`1b21e0d`](https://github.com/Effect-TS/effect/commit/1b21e0df6ab777d6a1664dfabdea88511f2d25d1), [`3d59ae6`](https://github.com/Effect-TS/effect/commit/3d59ae6d5f9ff3e52cb6ed4a9f325320580218d5), [`89c9a39`](https://github.com/Effect-TS/effect/commit/89c9a398412f1f5e7f9c6f697a1badd982bcd741)]:
+  - effect@4.0.0-rc.117
+
+## 4.0.0-rc.116
+
+### Patch Changes
+
+- Updated dependencies [[`c19c63f`](https://github.com/Effect-TS/effect/commit/c19c63fb710422aaf00b8d923188aa2e52a6776f), [`8cb0a4f`](https://github.com/Effect-TS/effect/commit/8cb0a4f28fba991e15659d08ecc09da28cf742d2), [`8f420bb`](https://github.com/Effect-TS/effect/commit/8f420bb3dc3c9be8c4a48d57dccee201dcb0260d), [`1393080`](https://github.com/Effect-TS/effect/commit/1393080f1cc8f47d459119fcb759e2cc00fd7356), [`ccae354`](https://github.com/Effect-TS/effect/commit/ccae35423188f58d7c3dec5db3e36ed4bf42bcdf), [`553c403`](https://github.com/Effect-TS/effect/commit/553c403f1d9199df738f73446dacd090da2e698b), [`45b5103`](https://github.com/Effect-TS/effect/commit/45b510352d42ac55718f9f5f43573975b323143f), [`77a5612`](https://github.com/Effect-TS/effect/commit/77a56120354d1d3f7341b117266f211143a3734a), [`1076170`](https://github.com/Effect-TS/effect/commit/10761707b5cae0a66ef605abd1737ae59a18f5ac), [`f110af1`](https://github.com/Effect-TS/effect/commit/f110af1ac5a54a7d62c2b96e35d4521a09f3fa06), [`0045152`](https://github.com/Effect-TS/effect/commit/0045152cdf796f20be5e690c69c40da611f813b8), [`51d4a2f`](https://github.com/Effect-TS/effect/commit/51d4a2f08a5c7691dc876415bc9fc0ecf467e153), [`4d4c4e8`](https://github.com/Effect-TS/effect/commit/4d4c4e8a4436d49997a5a7234860ede651467537), [`ccfe152`](https://github.com/Effect-TS/effect/commit/ccfe152d11bed497f2d26aba8ef1a3613d0d6746), [`d30a0c8`](https://github.com/Effect-TS/effect/commit/d30a0c880f8ffe06d7f0695c17f35910f1fcfbc9), [`84fe64a`](https://github.com/Effect-TS/effect/commit/84fe64a5fbfdecd23b66c207d0daa848d59dd825), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`a2c4154`](https://github.com/Effect-TS/effect/commit/a2c4154cf8bcbe455bd43bf7f3f12d9cbf38247c), [`23a58c0`](https://github.com/Effect-TS/effect/commit/23a58c020b25dde573ce523c2d157032676de0a3), [`feef90c`](https://github.com/Effect-TS/effect/commit/feef90ccbd86e5ab49b7e3cc3845591e23bdcb1b), [`755e863`](https://github.com/Effect-TS/effect/commit/755e863a793e5621183e7992cb3f85d29030ad7b), [`49e4b37`](https://github.com/Effect-TS/effect/commit/49e4b37b831a573567e0b67d3ec4593403dc2e72), [`9ad9891`](https://github.com/Effect-TS/effect/commit/9ad9891e24058065bcd445772e005f8ce4b3e42f), [`0beded0`](https://github.com/Effect-TS/effect/commit/0beded04f5cffe8dd263f989c38a609e27f27fa5), [`2940742`](https://github.com/Effect-TS/effect/commit/2940742c3f8529bc3b024b379904fbefd40ece55), [`63c1566`](https://github.com/Effect-TS/effect/commit/63c15662f90ae970969de29761207c99ecdbf66b)]:
+  - effect@4.0.0-rc.116
+
+## 4.0.0-rc.115
+
+### Patch Changes
+
+- Updated dependencies [[`657254b`](https://github.com/Effect-TS/effect/commit/657254b8218628b0116497d09aaf783cb88279f3), [`f9ef0e9`](https://github.com/Effect-TS/effect/commit/f9ef0e970260b5de143392d00593e6c8b4614cff), [`4f73f9e`](https://github.com/Effect-TS/effect/commit/4f73f9e0bd9538260f0f7166e0e6abdbd507a0e8)]:
+  - effect@4.0.0-rc.115
+
+## 4.0.0-rc.114
+
+### Patch Changes
+
+- Updated dependencies [[`3ff4952`](https://github.com/Effect-TS/effect/commit/3ff49521afa6fe6c85c2c230f7e986f7374ef353), [`6d55555`](https://github.com/Effect-TS/effect/commit/6d55555b83701c42855758944985a6fdbf57fffe), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`d4e4ad5`](https://github.com/Effect-TS/effect/commit/d4e4ad57d06d0a30d5e8090ed951f080bcd3a3d7), [`b1988f4`](https://github.com/Effect-TS/effect/commit/b1988f496eef07482f10f4cc03ef20b9570ea0ac), [`482b7d7`](https://github.com/Effect-TS/effect/commit/482b7d7eb08ebe6bc57781414a5a9a12600b2c71), [`716e0c0`](https://github.com/Effect-TS/effect/commit/716e0c00942b42d36631b3114b1deb9a4a944ce3), [`9941e6d`](https://github.com/Effect-TS/effect/commit/9941e6dbf800cfd3723bfb421306e04e36b5882d)]:
+  - effect@4.0.0-rc.114
+
+## 4.0.0-rc.113
+
+### Patch Changes
+
+- [#7254](https://github.com/Effect-TS/effect/pull/7254) [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9) Thanks @gcanti! - Add the experimental Schema-first `effect/unstable/arbitrary/Arbitrary` module for native generation without
+  fast-check. `Arbitrary.schema` derives an opaque arbitrary from the decoded Schema `Type`, `Arbitrary.sampleEffect`
+  provides interruptible sampling with typed exhaustion, and `Arbitrary.checkEffect` returns structured property results.
+  The initial implementation supports bounded discards, shrinking, replay, and recursive and mutually recursive Schemas.
+  `SampleError` and `Exhausted` include the effective seed so discarded runs remain reproducible even when the caller did
+  not provide one. `Arbitrary.isArbitrary` identifies values through the module's nominal protocol. Numeric constraints
+  retain `NaN` when it is accepted by their supported `Order.Number` bounds. Union derivation validates `oneOf`
+  exclusivity and isolates lazy cross-member shrinking from unrelated random generation. Object derivation keeps
+  optional-property selection constructive when candidate fields have different recursive costs.
+  Struct, Record, JSON-object, and record-shaped `Arbitrary.all` outputs periodically use a null prototype as an edge
+  case, preserving that prototype throughout shrinking and replay without perturbing structural PRNG choices. The change
+  adds 0.01–0.03 KB gzip to representative Arbitrary fixtures and leaves production-only bundle sentinels unchanged.
+  
+  Add `Arbitrary.map`, `Arbitrary.flatMap`, `Arbitrary.filter`, `Arbitrary.filterMap`, and `Arbitrary.all` for composing
+  derived Arbitraries without exposing a second catalog of primitive constructors. Filtering remains bounded and
+  promotes valid shrink descendants through rejected nodes. `maxShrinks` bounds every inspected shrink candidate,
+  including candidates rejected before property evaluation, while retaining the best shrunk input found when the
+  budget is exhausted. `flatMap` provides deterministic dependent generation, source-first shrinking, post-source PRNG
+  checkpoints, and one shared residual recursion budget. `all` combines tuples, iterables, and records with a shared
+  budget, randomized internal generation order, stable output shape, and independent member shrinking. Arbitrary values
+  implement `Pipeable` for composition with data-last combinators.
+  
+  Add the experimental Schema `arbitraryConstraint` and `toCodecArbitrary` annotations and their
+  `Schema.Annotations.ToArbitrary` types. Declarations can provide a Schema Link optimized for generation, while filters
+  can contribute native semantic constraints. The callback receives decoded type parameters and normalized constraints.
+  The compiler owns efficient representations for common built-ins, including JSON, RegExp, URL, Date, byte arrays,
+  ReadonlyMap, and ReadonlySet. Effect-specific HashMap, HashSet, Chunk, Graph, BigDecimal, and date-time declarations keep
+  local generation Links, while declarations with productive canonical codecs require no arbitrary-specific annotation.
+  `Schema.isUniqueKey` provides key-based Map uniqueness for explicit array representations.
+  
+  The same ownership policy applies to formatter and equivalence derivation: implementations for common declarations
+  live in their compiler, while domain-specific and dynamically constructed declarations retain local annotations.
+  Declarations whose intrinsic `Equal` implementation already matches their Schema equivalence need no annotation or
+  compiler special case. This keeps unused common callbacks out of production Schema bundles.
+  
+  Against the previous layout, `schema-toArbitrary` decreases from 36.68 KB to 33.24 KB gzip and
+  `arbitrary-combinators` decreases from 37.16 KB to 33.70 KB. `schema-toFormatter` increases from 18.92 KB to 19.49 KB
+  and `schema-toEquivalence` increases from 19.05 KB to 19.39 KB because callers that explicitly derive these capabilities
+  now retain the common declaration handlers. Generic production fixtures remain unchanged; an equivalence-specific
+  production fixture using common declarations decreases from 20.75 KB to 20.48 KB, while declarations whose intrinsic
+  equality is sufficient decrease from 23.42 KB to 23.34 KB. An Arbitrary-specific production fixture using common
+  declarations decreases from 20.35 KB to 19.61 KB, while one using the locally annotated BigDecimal and date-time
+  declarations increases from 18.34 KB to 23.01 KB.
+  The complete 31-scenario native Arbitrary comparison reports no statistically classified runtime regression; the five
+  moved BigDecimal and date-time scenarios remain within measurement noise.
+  
+  Add `SchemaGetter.forbiddenEncoding`, a reusable getter for the encode side of decode-only Schema transformations.
+  
+  Remove the fast-check bridge from the `effect` package, including `Schema.toArbitrary` and
+  `effect/testing/FastCheck`. Replace the legacy `Schema.Annotations.ToArbitrary` callback contract with the native
+  Schema-first types. The `effect` package no longer depends on fast-check.
+  
+  Migrate `TestSchema.Asserts.verifyLosslessTransformation` and `TestSchema.Asserts.arbitrary().verifyGeneration` to the
+  native runner. Both methods now accept native check options directly, bound unsuccessful generation, and include the
+  shrunk input and replay token in property failures.
+  
+  Use the Arbitrary runner for all `@effect/vitest` property tests. Property inputs may combine Schemas and Arbitraries,
+  and are composed directly with `Arbitrary.all`; check options are available through `arbitrary`. Raw fast-check
+  arbitraries and the `fastCheck` options object are no longer supported. As with the previous fast-check adapter, thrown
+  exceptions, defects, and typed failures from a property are shrinkable falsifications; Effect interruption remains an
+  interruption.
+  
+  Optimize constructive regular-expression generation by caching feasible lengths on the compiled pattern, computing
+  sequence-suffix feasibility once, and precomputing character-class metadata. Seeded generation, shrinking, and replay
+  remain unchanged.
+  
+  Optimize `BigDecimal.Order` and `BigDecimal.Equivalence` with a shared hybrid comparator. Ordinary scale differences
+  use cached, bounded coefficient alignment, while large differences are compared without materializing their decimal
+  zeroes. `BigDecimal.make` now rejects scales that are not safe integers.
+  
+  Before its removal, the materialized fast-check bridge fixture
+  `schema-toArbitrary-materialized-fast-check.ts` measured 79.00 KB minified and gzipped.
+  
+  Representative runtime measurements against corresponding hand-written fast-check 4.9.0 arbitraries are shown below.
+  Values are median latency on Node 24.12.0 and Apple M3; lower is better. Both implementations validate the
+  same output domains, although their generation distributions are not identical. Native speedup is fast-check latency
+  divided by Native latency, so higher is better.
+  
+  | Scenario                            | fast-check |  Native | Native speedup |
+  | ----------------------------------- | ---------: | ------: | -------------: |
+  | 32 recursive samples                |     150 µs |  103 µs |          1.45x |
+  | 128 optional Struct samples         |     244 µs | 86.0 µs |          2.84x |
+  | 128 constrained strings             |     742 µs | 49.7 µs |         14.86x |
+  | RegExp derivation and first sample  |    13.4 ms | 30.8 µs |        429.02x |
+  | 64 RegExp strings                   |     595 µs |  919 µs |          0.64x |
+  | RegExp failure and shrinking        |     168 µs | 88.2 µs |          1.91x |
+  | 128 bounded numbers                 |    68.9 µs | 21.8 µs |          3.18x |
+  | 128 `Uint8Array` samples            |    98.3 µs | 74.4 µs |          1.32x |
+  | 128 `BigDecimal` samples            |    66.6 µs | 56.3 µs |          1.18x |
+  | 128 `DateTime.Utc` samples          |    71.2 µs | 50.5 µs |          1.42x |
+  | 128 named time zones                |    52.2 µs | 27.9 µs |          1.85x |
+  | 128 time zones                      |    63.7 µs | 33.8 µs |          1.89x |
+  | 128 zoned date-times                |     130 µs |  112 µs |          1.16x |
+  | 32 samples through Schema filter    |    65.9 µs | 49.4 µs |          1.33x |
+  | 32 unique arrays                    |     156 µs |  132 µs |          1.18x |
+  | 128 literal samples                 |    40.0 µs | 3.70 µs |         10.78x |
+  | 128 mapped samples                  |    59.0 µs | 14.1 µs |          4.21x |
+  | 128 samples through passing filter  |    58.9 µs | 13.9 µs |          4.23x |
+  | 32 samples through selective filter |    66.1 µs | 42.9 µs |          1.54x |
+  | 128 `filterMap` samples             |    75.7 µs | 31.5 µs |          2.40x |
+  | Filtered failure and shrinking      |    12.7 µs | 7.71 µs |          1.66x |
+  | 128 `all` tuple samples             |    43.5 µs | 18.5 µs |          2.35x |
+  | 128 `all` record samples            |    81.0 µs | 30.4 µs |          2.66x |
+  | 128 dependent `flatMap` samples     |     125 µs | 67.2 µs |          1.86x |
+  | `flatMap` failure and shrinking     |    20.1 µs | 6.71 µs |          2.99x |
+  | Replay `flatMap` shrink path        |    14.3 µs | 6.57 µs |          2.17x |
+  | Passing property, 100 runs          |    42.3 µs | 27.1 µs |          1.56x |
+  | `TestSchema`, 100 generations       |    44.5 µs | 35.9 µs |          1.24x |
+  | First failure plus one shrink       |    8.77 µs | 1.30 µs |          6.75x |
+  | Replay recorded failure             |    6.35 µs | 1.19 µs |          5.36x |
+  
+  Cold recursive derivation is not included because the native fixture constructs and compiles a Schema, while the
+  fast-check fixture constructs a hand-written arbitrary; it is not a like-for-like warm-generator comparison.
+  
+  Add a guide for the native module and a migration guide from the fast-check bridge published in `effect@4.0.0-rc.109`.
+
+- [#8154](https://github.com/Effect-TS/effect/pull/8154) [`3993340`](https://github.com/Effect-TS/effect/commit/399334052dcb627798a644a7f3737aa5a04d1bda) Thanks @tim-smart! - Await asynchronous test and layer finalizers after an Effect test times out before starting the next test.
+
+- [#8104](https://github.com/Effect-TS/effect/pull/8104) [`e9915d5`](https://github.com/Effect-TS/effect/commit/e9915d5d7a13c2abab99eea4603bfb945d6090b7) Thanks @tim-smart! - Require Vitest `>=5.0.0 <6.0.0` and Node.js `^22.12.0 || ^24.0.0 || >=26.0.0`.
+  
+  ### Breaking changes
+  
+  - Replace `.sequential` and `{ sequential: true }` with `{ concurrent: false }`.
+  - Use `bench` from the test context and await `bench(name, fn).run()`. The top-level benchmark API is removed.
+  - Use `Assertion<void, T>` or `Assertion<Promise<void>, T>`. Define custom matchers through `vitest.Matchers`, not `@vitest/expect`.
+  - Import reporter types from `vitest/node` and environment/snapshot APIs from `vitest/runtime`. Set `outputFile` when consuming JSON reports.
+  - Await asynchronous assertions. Mock history now clears before each test.
+  
+  See the [Vitest migration guide](https://vitest.dev/guide/migration/) for removed types and other upstream changes.
+
+- [#8104](https://github.com/Effect-TS/effect/pull/8104) [`e9915d5`](https://github.com/Effect-TS/effect/commit/e9915d5d7a13c2abab99eea4603bfb945d6090b7) Thanks @tim-smart! - Add a `concurrent` option to named `layer` and `it.layer` suites. Omitted options and anonymous layers preserve inherited concurrency.
+- Updated dependencies [[`49e3901`](https://github.com/Effect-TS/effect/commit/49e39010ff84acbde32c50d559a2f76426cf830e), [`b945ded`](https://github.com/Effect-TS/effect/commit/b945ded23aa9a0ad88bb55aa4089680866dccf92), [`d6422f4`](https://github.com/Effect-TS/effect/commit/d6422f4104062e3e176abe92ef0e444cd4cc6bab), [`5a80204`](https://github.com/Effect-TS/effect/commit/5a802043984727b0c5a291af39d1b9bbfa8d7b8b), [`53511ef`](https://github.com/Effect-TS/effect/commit/53511efcd1c7a05d34b4c9a19c19ed317ebc5d4c), [`79ae49f`](https://github.com/Effect-TS/effect/commit/79ae49f19cab9a42c8f27ae8b104d5e39e6131fa), [`0d083ba`](https://github.com/Effect-TS/effect/commit/0d083ba26b2e1afec8d3e8d83db0d05683b6602b), [`be0f822`](https://github.com/Effect-TS/effect/commit/be0f8221e37abd52668567b60fc1be28e3ff3803), [`debe8fd`](https://github.com/Effect-TS/effect/commit/debe8fdc15d00d51cf707353365d7b877123eec6), [`a8588f9`](https://github.com/Effect-TS/effect/commit/a8588f99a43dc9b85dacb14f7be5d3e1ed994d4f), [`f17eb0a`](https://github.com/Effect-TS/effect/commit/f17eb0a6f669e09647c5ded5832ea6baac596659), [`f30cbfe`](https://github.com/Effect-TS/effect/commit/f30cbfe53951128ad8124ae733f12423dbc78bd8), [`78cc9c0`](https://github.com/Effect-TS/effect/commit/78cc9c0d0f36b59f7034b2ace56a4a5c02b7a551), [`ccbdbd5`](https://github.com/Effect-TS/effect/commit/ccbdbd51e7bdb114302701fbc03021868b71956a), [`a63dcbf`](https://github.com/Effect-TS/effect/commit/a63dcbf04e5c3d8d934a41bc6122e9951b1cefa9), [`b845b18`](https://github.com/Effect-TS/effect/commit/b845b186379106c17ed4b1149e2462cd0d2d77b5), [`381b794`](https://github.com/Effect-TS/effect/commit/381b79464f8e0a520585fdcfdd3e95e0553d0b27), [`4ffcaf4`](https://github.com/Effect-TS/effect/commit/4ffcaf4c4a94d3d9d5715db91aa37d7f5d9ecd99), [`ba2fd82`](https://github.com/Effect-TS/effect/commit/ba2fd822e9618f30d0f430ae4eed2eaa4813e2e3), [`02be94c`](https://github.com/Effect-TS/effect/commit/02be94ce78a3c9fc1e4c516d37d8e11e1c0eef2e), [`115d8c2`](https://github.com/Effect-TS/effect/commit/115d8c22599640ece2fd6a10564925b1d79f8a8c), [`1452635`](https://github.com/Effect-TS/effect/commit/14526354f3d0288bd1d0a85c8d4aeee8abe2cd9b), [`77f85fe`](https://github.com/Effect-TS/effect/commit/77f85fe1613348f5c990016b49dc97e252576c82), [`a3f2b31`](https://github.com/Effect-TS/effect/commit/a3f2b319343f28edb028270f7074066cea0ec429), [`310f8d3`](https://github.com/Effect-TS/effect/commit/310f8d3424a025ce1f1cc5c338232db2362052d8), [`291d616`](https://github.com/Effect-TS/effect/commit/291d616282b666bbba3664143fa1d19e839a6a5d), [`48dbbb2`](https://github.com/Effect-TS/effect/commit/48dbbb22bb2e04f63992fc267dd711a0cbd76d72), [`b43bfd6`](https://github.com/Effect-TS/effect/commit/b43bfd644a3205f1518abbfd006f761e31b3a5f9), [`1c89c78`](https://github.com/Effect-TS/effect/commit/1c89c78f9faa3638f398772f3ed7182aa97a1edd), [`9bbe1a5`](https://github.com/Effect-TS/effect/commit/9bbe1a5940eee4642ffe854356128b617e0a064c), [`dd99ab0`](https://github.com/Effect-TS/effect/commit/dd99ab007e3352761187dae330d52f65feeff7c0), [`8f397ed`](https://github.com/Effect-TS/effect/commit/8f397ed4e7852026591819cc4c8c1995bdd2fb8c), [`d7ae6b6`](https://github.com/Effect-TS/effect/commit/d7ae6b6491a88f2710612bfcddaf608ebe925f7c), [`8cf1203`](https://github.com/Effect-TS/effect/commit/8cf12030e8a3e1e76384884d41afa96e2bd72b13), [`87654c5`](https://github.com/Effect-TS/effect/commit/87654c5eed150387f4eac7153751b6085616ba52), [`f05ae0b`](https://github.com/Effect-TS/effect/commit/f05ae0b3fd2cfc7f12b668af244b3cf3fae59bc5), [`436f5eb`](https://github.com/Effect-TS/effect/commit/436f5eb44aa234bdf1de37b07da2ce8dc31ad4ec), [`d8ff960`](https://github.com/Effect-TS/effect/commit/d8ff9605bb5ef7b0cacd80e3b43ed1ce9e3d5e36), [`8766475`](https://github.com/Effect-TS/effect/commit/876647502300b9fb79d163de10fd497716d93be0), [`b64f406`](https://github.com/Effect-TS/effect/commit/b64f406de13a1b9da4664dbde2dbddaa5f776a05), [`4697aaa`](https://github.com/Effect-TS/effect/commit/4697aaa1d38f9da7fe0bcb62f708183f766fe496), [`cec6c2d`](https://github.com/Effect-TS/effect/commit/cec6c2d7bec7bea0ea179123af581a23c2e24494), [`9956f0e`](https://github.com/Effect-TS/effect/commit/9956f0e6f47096a6e31305ec2c7320b8e1a140af), [`5c7eed0`](https://github.com/Effect-TS/effect/commit/5c7eed0c5aa0988716206dd374359223edf828ee), [`183c2ea`](https://github.com/Effect-TS/effect/commit/183c2ea65ee1e9b967c746aa1b0bf2b8d3422de2), [`1e92dbd`](https://github.com/Effect-TS/effect/commit/1e92dbd26f5a74bb32103cbaac0f09460b7954de), [`4eb0fa7`](https://github.com/Effect-TS/effect/commit/4eb0fa72302b0a63ac34c6515a9cdf96338e586a), [`534b8b9`](https://github.com/Effect-TS/effect/commit/534b8b9dba195ec38a4795fe564d5e0876cb6468), [`b76a1cf`](https://github.com/Effect-TS/effect/commit/b76a1cf32b0a742c24c1874137e2da8fed5c48eb), [`acc1e53`](https://github.com/Effect-TS/effect/commit/acc1e5384aa5cb7b072f60308013f078b0099bdf), [`4950a91`](https://github.com/Effect-TS/effect/commit/4950a914a68306531a1111d4cdc4504aa8d3854e), [`c020987`](https://github.com/Effect-TS/effect/commit/c020987a0611c9e610a7eef347648b60026745b8), [`abe95d1`](https://github.com/Effect-TS/effect/commit/abe95d12340e1dd435e5df623b1967bf01938c94), [`027ceb9`](https://github.com/Effect-TS/effect/commit/027ceb91e003fbc36f0559f72e1c614cd9198c1a), [`3d203b7`](https://github.com/Effect-TS/effect/commit/3d203b702e26687d2fea4aaae7cc01dcfb82c05e), [`a29b8f4`](https://github.com/Effect-TS/effect/commit/a29b8f4de5aee58dd9ee645365c04cfe1ea6fa9f), [`ce4aa65`](https://github.com/Effect-TS/effect/commit/ce4aa65409e8500908fb6496eca06270ef5b636f), [`a8ea807`](https://github.com/Effect-TS/effect/commit/a8ea80799a0bf187c577e052fef0b7245494c7bf), [`a3ebb7f`](https://github.com/Effect-TS/effect/commit/a3ebb7fcb208f3933a40a0fd949dbcfdf1ca2921), [`473bd81`](https://github.com/Effect-TS/effect/commit/473bd814a97dba66070435cfe84933bcc143effe), [`53843f6`](https://github.com/Effect-TS/effect/commit/53843f6490f4eebaf1eeb91fdcc5f1c542b0e132), [`c5eca65`](https://github.com/Effect-TS/effect/commit/c5eca6539f0d605acd5ce19437fa88f167d69bb7), [`d6f9eba`](https://github.com/Effect-TS/effect/commit/d6f9eba7e8df0c8bd74762c313402884d94ba146), [`8d1e97a`](https://github.com/Effect-TS/effect/commit/8d1e97adbf5a36b4b53ab56f797c2ec0267a8821), [`b28ab48`](https://github.com/Effect-TS/effect/commit/b28ab48be7cf7f2bd30f9467ccac0ab41260f7ad), [`9960708`](https://github.com/Effect-TS/effect/commit/9960708052fcaaa873c471aea144ca46955e6023), [`8ac53b6`](https://github.com/Effect-TS/effect/commit/8ac53b6ae677f06d88d7d81f932ab5ff9b59a10e), [`84ad49a`](https://github.com/Effect-TS/effect/commit/84ad49a357ef156b4ff46cefc945efbe3e292eff), [`72cfa24`](https://github.com/Effect-TS/effect/commit/72cfa2420977919ba57a8e6de538e01e06d5f380), [`95c2581`](https://github.com/Effect-TS/effect/commit/95c2581e0f78e1537aad21764fe562206ca50adb), [`d5c7cd2`](https://github.com/Effect-TS/effect/commit/d5c7cd2c47b2b01523aaea48d2dd039b89b36114), [`fe4fed1`](https://github.com/Effect-TS/effect/commit/fe4fed1b014c78043a8efe37520c527100910010), [`d150a64`](https://github.com/Effect-TS/effect/commit/d150a643c4f60da2dc19ae813b807d48b580087e), [`05b1e80`](https://github.com/Effect-TS/effect/commit/05b1e80cde3a8da1ff1afe288f8539b72c05bb87), [`414dc90`](https://github.com/Effect-TS/effect/commit/414dc9056a39aa22f7cc27aeb5e631231ce50982), [`3f51acd`](https://github.com/Effect-TS/effect/commit/3f51acdf5e2490d7d0a833cd67ce06d1d867facd), [`d68ff05`](https://github.com/Effect-TS/effect/commit/d68ff05506ab5bb3ec07e1b759ce296423b0dbbe), [`f3cf1e6`](https://github.com/Effect-TS/effect/commit/f3cf1e6c36f1aac8399d9b540aecb6410be3096f), [`6525771`](https://github.com/Effect-TS/effect/commit/6525771eef7df6b71a3ef6e299ee93d798ed3dda), [`4ab4e83`](https://github.com/Effect-TS/effect/commit/4ab4e838a4c9ab3c9cc0d52d3e83de88686601b0), [`f7f1d78`](https://github.com/Effect-TS/effect/commit/f7f1d78e52023bdfbebf76949c550db8bb9411dd), [`47b358a`](https://github.com/Effect-TS/effect/commit/47b358a4b85d22973a7957abd1a859f65b75b7da), [`45ffa72`](https://github.com/Effect-TS/effect/commit/45ffa7221259c7e4be9797b90f6ca569fe7ec8a3), [`6232650`](https://github.com/Effect-TS/effect/commit/62326505a74fcd8fe27c8e2064128d2dea484ecc), [`4b73e1b`](https://github.com/Effect-TS/effect/commit/4b73e1bd5576346d7939be8915f3053e428d1c0e), [`284050c`](https://github.com/Effect-TS/effect/commit/284050c2aa6e78eceb08e5eff1803501cc80a658), [`c85fc0b`](https://github.com/Effect-TS/effect/commit/c85fc0b8f2195780929d6fc8ecdc084faf18736c), [`7999b07`](https://github.com/Effect-TS/effect/commit/7999b078950fda15e235db1e61e8db5eb0632528), [`7d455f5`](https://github.com/Effect-TS/effect/commit/7d455f51acf2f0e9f710f298e14e4d81179a9259), [`d681c2e`](https://github.com/Effect-TS/effect/commit/d681c2eb1bb07d782540286368e8b42533df3063), [`84d2a47`](https://github.com/Effect-TS/effect/commit/84d2a470ecc0fcad7f1d1e7a50464e02af0e6972), [`ed74b18`](https://github.com/Effect-TS/effect/commit/ed74b18b95b0797808f2f7928f413f1cf2279d77), [`2245997`](https://github.com/Effect-TS/effect/commit/2245997ad2214591b7d9674777595092926743cf), [`d386979`](https://github.com/Effect-TS/effect/commit/d386979fedbdd433d28816f9cc74675a9af45189), [`fc9fedf`](https://github.com/Effect-TS/effect/commit/fc9fedf59fc26a8bc6e45c3860a921f3b7e0f971), [`7750dbe`](https://github.com/Effect-TS/effect/commit/7750dbe0d5b9929c6d92b0365b42784b993ea2a6), [`fc91af6`](https://github.com/Effect-TS/effect/commit/fc91af659d0682659e6347eede288f90f618acc0), [`39b9738`](https://github.com/Effect-TS/effect/commit/39b9738727ab4d87298fd640edd138f352c70ee3), [`88093b5`](https://github.com/Effect-TS/effect/commit/88093b57951a1b597599fe4772ab690b36a95818), [`d14c463`](https://github.com/Effect-TS/effect/commit/d14c4631ac82911a8ca0b6c24c14ecb95863ee6b), [`d473bd3`](https://github.com/Effect-TS/effect/commit/d473bd3ee966a3a0c245d0e3c752fd91368b8ff6), [`84864bc`](https://github.com/Effect-TS/effect/commit/84864bc30c9e92a1226f65bb78b0641a7e0acea2), [`e2ae724`](https://github.com/Effect-TS/effect/commit/e2ae72481e755a454f28ce45e90f43b857b7c6e5), [`f921ed3`](https://github.com/Effect-TS/effect/commit/f921ed305c63415dc468e94d9319cc3237119138), [`1df933d`](https://github.com/Effect-TS/effect/commit/1df933d1dee2e09a25f9c27214b31aa94fa9d020), [`829aff9`](https://github.com/Effect-TS/effect/commit/829aff97d71d7900b7765ba2f63e33874b898cdc), [`aa0aba3`](https://github.com/Effect-TS/effect/commit/aa0aba383382ca1b99fbe618dceba63c3a5a6a53), [`a71140f`](https://github.com/Effect-TS/effect/commit/a71140fbe79809aa5311a55b1c6908905dc2df26), [`0276a27`](https://github.com/Effect-TS/effect/commit/0276a27ddbb15d163daf56f059ca9f62c4fd9939), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`c86c999`](https://github.com/Effect-TS/effect/commit/c86c99939e1628813a2f92f0906cfbbe924504e8), [`975f758`](https://github.com/Effect-TS/effect/commit/975f7586f3dcda5743d6570a740013a9fbdce9a7), [`2a3a478`](https://github.com/Effect-TS/effect/commit/2a3a4783bcd2d4e91e3505c7a6c1e398fea89595), [`1e6e206`](https://github.com/Effect-TS/effect/commit/1e6e206f6327a114f55a541775f465c0bc9fbf3e), [`fa6027b`](https://github.com/Effect-TS/effect/commit/fa6027b16e65376078e526fa33116ac0cc82485b), [`7616f73`](https://github.com/Effect-TS/effect/commit/7616f73c16bd45a3a3e2202d3f81c6d1cc63f4e0), [`fc668b6`](https://github.com/Effect-TS/effect/commit/fc668b61e9755545a47582dee6c4425d5652cbb6), [`d425c8c`](https://github.com/Effect-TS/effect/commit/d425c8c1319519e861714bcb9d055b63a9434fad), [`ce120f4`](https://github.com/Effect-TS/effect/commit/ce120f474b87d8a5a787dd7f848177ecd3b960fc), [`248201f`](https://github.com/Effect-TS/effect/commit/248201f7846d855685a4dc1b2f01968981706d69), [`e80d397`](https://github.com/Effect-TS/effect/commit/e80d3972fcca4e986b6497d67406f45ee1be540d), [`f1a941d`](https://github.com/Effect-TS/effect/commit/f1a941d52c2f71973e998883869e4e9ef510abf2), [`73bc3a1`](https://github.com/Effect-TS/effect/commit/73bc3a13b6e1b7a060e6bcd19ae7796443211a80), [`b628bb1`](https://github.com/Effect-TS/effect/commit/b628bb1240a09df2244c3ff6c587f978feb25225), [`6e3ae7b`](https://github.com/Effect-TS/effect/commit/6e3ae7b6359bda08cea74b761fd54224d7af45e2), [`e891247`](https://github.com/Effect-TS/effect/commit/e8912473bd4128714a0f8cb04621f3e12f62a910), [`53e6c73`](https://github.com/Effect-TS/effect/commit/53e6c7311b948a62e93e57f6daee66a8ec24b030), [`1579d6f`](https://github.com/Effect-TS/effect/commit/1579d6fd063e444e4fcdfd08ff194c7485203f9c), [`d3c6b73`](https://github.com/Effect-TS/effect/commit/d3c6b73cc4b78f22fdb2e25c8bebda027551540b), [`4a59c6a`](https://github.com/Effect-TS/effect/commit/4a59c6a559e69d399b00c6acd48c8e1977e34875), [`145d8e1`](https://github.com/Effect-TS/effect/commit/145d8e1013220425b8edf34f7011c73f73e1cdcf), [`f74282c`](https://github.com/Effect-TS/effect/commit/f74282cb08de808b678ce67687acbcd61939d2f6), [`0a38623`](https://github.com/Effect-TS/effect/commit/0a3862349ebfbc41746aa0de5e682992719c1da6), [`0a08ae0`](https://github.com/Effect-TS/effect/commit/0a08ae0626f8124779ec2e32ae2088d28db157c6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`d60c5d4`](https://github.com/Effect-TS/effect/commit/d60c5d40b5954ea1557aef1502b4b87f98bbf134), [`07ffd25`](https://github.com/Effect-TS/effect/commit/07ffd25bd0e82c9e6b72b8e669833fb4531a9da3), [`9b517ad`](https://github.com/Effect-TS/effect/commit/9b517ad28a0c2f213693bcab408658c40e3b6d9b), [`604b1c1`](https://github.com/Effect-TS/effect/commit/604b1c109d6c9e654b9b7fcc98d6b80361400325), [`ccc2e02`](https://github.com/Effect-TS/effect/commit/ccc2e02def5965f5535ca97fac2051f4387c4e13), [`14d810a`](https://github.com/Effect-TS/effect/commit/14d810a726caad8a7b0d42f04a6876f25fbcc005), [`a9d1ee3`](https://github.com/Effect-TS/effect/commit/a9d1ee3d4d51e97ea33440fe6100935d5fd5aada), [`a31adbe`](https://github.com/Effect-TS/effect/commit/a31adbefd6c04c70536de11433edba9edd1f5013), [`7245f87`](https://github.com/Effect-TS/effect/commit/7245f87ace09806d15893df8f0bac8f0b9b817db), [`3a0828b`](https://github.com/Effect-TS/effect/commit/3a0828b058abb4b4646bd880458b4e636d77d1c3), [`cd83544`](https://github.com/Effect-TS/effect/commit/cd83544dd594b99e8ea0d7a7645c086f5861769b), [`6550a07`](https://github.com/Effect-TS/effect/commit/6550a074c5c501d8a95dcd354f17e9785a1ae1eb), [`6f090d4`](https://github.com/Effect-TS/effect/commit/6f090d4c2032cc35f7f9a9eac900d0329b8ac07e), [`b505c0d`](https://github.com/Effect-TS/effect/commit/b505c0db03e86eb126237690a5867f457eb4237f), [`186dd49`](https://github.com/Effect-TS/effect/commit/186dd4914084fa346a870ce9c637b9c2a6cc8100), [`9f37e58`](https://github.com/Effect-TS/effect/commit/9f37e58d00e06150d96af48fffe780947ca0d519), [`4446451`](https://github.com/Effect-TS/effect/commit/44464510114773e1ebd1abb6efffa382cf69998e), [`58be972`](https://github.com/Effect-TS/effect/commit/58be97238ee1f6cd26f6a3a645d1df97a091a224), [`1320075`](https://github.com/Effect-TS/effect/commit/1320075fd4ed381f60f6f37f280dbec17cb29b81), [`ba53b64`](https://github.com/Effect-TS/effect/commit/ba53b646e9dad9b39fd6cf5b2d89de9bf858bb80), [`f7490d4`](https://github.com/Effect-TS/effect/commit/f7490d49c75b99118c6c42549511ffa166459f59), [`c8ea602`](https://github.com/Effect-TS/effect/commit/c8ea60231ad69e23c0bf319f6f6b3ff28fc45e4b), [`62d82f4`](https://github.com/Effect-TS/effect/commit/62d82f4919c72d8cc0cfd2b704ed6900f69ad9a8), [`a2c9e7c`](https://github.com/Effect-TS/effect/commit/a2c9e7c17a4118b74a1eab3332042dafe0bb7318), [`97dd022`](https://github.com/Effect-TS/effect/commit/97dd022fe7fbd1696dd60f3319eae594abdd3760), [`f984ee8`](https://github.com/Effect-TS/effect/commit/f984ee82d255c7958eeed6f0dd08de1b88cbbfd6), [`f1b2910`](https://github.com/Effect-TS/effect/commit/f1b291027c3055f801c2f288dda21ba84c361956), [`a29e05a`](https://github.com/Effect-TS/effect/commit/a29e05a907053a8617763b4e7408e1f012b59049), [`1aa1d8b`](https://github.com/Effect-TS/effect/commit/1aa1d8bd0f2c2d429938657927f34f8ff0f940a0), [`bb99734`](https://github.com/Effect-TS/effect/commit/bb99734ef87bcc377c628bc4072aa856ce5f7ca6), [`222e7ca`](https://github.com/Effect-TS/effect/commit/222e7caa4bb0da6d81a4eabf25dffc181c20f6a3), [`797c9e3`](https://github.com/Effect-TS/effect/commit/797c9e3c1f2e66db1570cf6aa5c4a15e94507bf0), [`b4d5398`](https://github.com/Effect-TS/effect/commit/b4d5398598c04a84054a55873c943d587880058d), [`c8349ed`](https://github.com/Effect-TS/effect/commit/c8349ede1a2add807e9ec9c37612b3a39bf284f8), [`8426e5f`](https://github.com/Effect-TS/effect/commit/8426e5f7ad11f15e39565cf8ba0874bf974f5085), [`26e0085`](https://github.com/Effect-TS/effect/commit/26e0085d098f6e526c085c357b8d82ee068b6518), [`1a86166`](https://github.com/Effect-TS/effect/commit/1a86166f102b517ee4d89dca0095e28f738eee10), [`0856631`](https://github.com/Effect-TS/effect/commit/0856631a89d8f72d206c366905ddac75468a8e85), [`0af0985`](https://github.com/Effect-TS/effect/commit/0af0985d5c132b33e14a2df59e0567d7ba2a1710), [`bc582c9`](https://github.com/Effect-TS/effect/commit/bc582c94313cbb89d87b3844ffffabebbb4ffa83), [`2c63f1e`](https://github.com/Effect-TS/effect/commit/2c63f1e07e375b7958e14929c6a4b358c819a9d0), [`0d98213`](https://github.com/Effect-TS/effect/commit/0d9821346453d44696258103643d5482e63638b4), [`ca6f0dc`](https://github.com/Effect-TS/effect/commit/ca6f0dc4fcea564b351bf505df015d16a8b965ed), [`d8cc9ed`](https://github.com/Effect-TS/effect/commit/d8cc9ed80e1df9c056a46ba62df01f7fc0f531c3), [`42fd969`](https://github.com/Effect-TS/effect/commit/42fd969b45025eed6d60cb87b97c5ff88d187671), [`5641ad3`](https://github.com/Effect-TS/effect/commit/5641ad333a88bb9e56baf886006682678391be0a), [`629870d`](https://github.com/Effect-TS/effect/commit/629870d461b36d3dacb30c8d203b8d20d4beaba0), [`d592c14`](https://github.com/Effect-TS/effect/commit/d592c1492ad895ea72537e10387b735f3ba0e7de), [`10d2c98`](https://github.com/Effect-TS/effect/commit/10d2c983a80d19b84fb52f33c7f719ebd81746bb), [`53909a9`](https://github.com/Effect-TS/effect/commit/53909a9bf14b29725a08dcccde02bee8e95a6b14), [`78a4269`](https://github.com/Effect-TS/effect/commit/78a42697f6085c87c09b18e8095bb7541bd65261), [`06c6307`](https://github.com/Effect-TS/effect/commit/06c6307d3d5538bc398c67a44239bc3d52ab1a4d), [`0847c41`](https://github.com/Effect-TS/effect/commit/0847c41e2472a347cd8f77d460d3cbdfecd4adf0), [`5a77084`](https://github.com/Effect-TS/effect/commit/5a77084651bc58617b9988606473cf9ba5ca0032), [`96f99b3`](https://github.com/Effect-TS/effect/commit/96f99b325da32bfa535e826d89d838d0edec0dea), [`7bb8781`](https://github.com/Effect-TS/effect/commit/7bb878176b8ad20cf0e671b570caf72e194f9515), [`4907e9b`](https://github.com/Effect-TS/effect/commit/4907e9b2470894ddaf0cbdec2612b59f04a51dbe), [`2a30248`](https://github.com/Effect-TS/effect/commit/2a30248b6eb739f22403456209bc468f2f4ef26a), [`8364ddd`](https://github.com/Effect-TS/effect/commit/8364ddda233d35ee472cc2356312317a60a148a2), [`ad67d8c`](https://github.com/Effect-TS/effect/commit/ad67d8c5a1b195ff5468a9f2e963c59aa0b3166f), [`ec0c087`](https://github.com/Effect-TS/effect/commit/ec0c0875262fb81c7992f5023776b8fa894c49b6), [`fa6a56b`](https://github.com/Effect-TS/effect/commit/fa6a56b862229cfb699e076bac50e3b737ae3c72), [`a2c1ce6`](https://github.com/Effect-TS/effect/commit/a2c1ce62f04214d98d848f4cfe33d677e1a87d39), [`91e9af0`](https://github.com/Effect-TS/effect/commit/91e9af0d5f138933d3a131ca1cfbc52d3bc55481), [`7bd3f34`](https://github.com/Effect-TS/effect/commit/7bd3f34385a06157b249a351e32ffdcbe1cf2c37), [`ef16581`](https://github.com/Effect-TS/effect/commit/ef165814eae0a199fdca5b3c2839bb4fcdfd5b5d), [`1693a87`](https://github.com/Effect-TS/effect/commit/1693a877324273f5a23fa7d7fc892f4ee12f20c2), [`df3fc47`](https://github.com/Effect-TS/effect/commit/df3fc47609eda7843dae2b557c8fe834299e26b4), [`e11be41`](https://github.com/Effect-TS/effect/commit/e11be41dfc73fa6b5643ab9af7df18d6907927d7), [`2e39e8b`](https://github.com/Effect-TS/effect/commit/2e39e8bafef7d3fee9f3b324b7d50cc064376667), [`11c5ee7`](https://github.com/Effect-TS/effect/commit/11c5ee7202acd3bb789d0a8ce78e6c4523071553), [`1742d2f`](https://github.com/Effect-TS/effect/commit/1742d2f48441cb7b1a8d9aca3a8e6f0acbc35a96), [`8efc70e`](https://github.com/Effect-TS/effect/commit/8efc70ea16bee43fd9adde2871cf82a8131b80a0), [`9642776`](https://github.com/Effect-TS/effect/commit/964277661423f398f777ec2eab4b3ecc0b53f53b), [`6680828`](https://github.com/Effect-TS/effect/commit/668082885f52672e4c7fad4e0fe2bfa0e69703e2), [`c34edcb`](https://github.com/Effect-TS/effect/commit/c34edcb6d7a6151d53e19828c92abf7dd8450c2a), [`7b2c5bd`](https://github.com/Effect-TS/effect/commit/7b2c5bd3c394fa4751fb229394ac9c03e401f441), [`1a2ccee`](https://github.com/Effect-TS/effect/commit/1a2ccee2bbb93514dc66e0a9cdeb52a82172ab0e), [`db995df`](https://github.com/Effect-TS/effect/commit/db995df19b0381b64cc39b50aa28d7bd8f2c1294), [`af0ccdd`](https://github.com/Effect-TS/effect/commit/af0ccdd13aa8917bce7161b8bc257fbe51c6a6a5), [`addeaea`](https://github.com/Effect-TS/effect/commit/addeaea0b0abe0dc24ca1d4d0fd194a0e458be70), [`7704034`](https://github.com/Effect-TS/effect/commit/770403411bcd8befef0552a0e40066abc417f6ea), [`e72b12f`](https://github.com/Effect-TS/effect/commit/e72b12fc305710550bc6dcb978e92de8abff88cd), [`310dd9c`](https://github.com/Effect-TS/effect/commit/310dd9ce9681e97f558bb042adb35f6040ab81e3), [`1c2afc1`](https://github.com/Effect-TS/effect/commit/1c2afc15bbf4ce5a91d24da99bc275b5bd744e77), [`44f44ca`](https://github.com/Effect-TS/effect/commit/44f44cae65249801c082c3a3848016eeeac5eb24), [`f43b9d6`](https://github.com/Effect-TS/effect/commit/f43b9d6d99cb591c0377bb1474121827201627c9), [`56e72b3`](https://github.com/Effect-TS/effect/commit/56e72b38c01bbe6ec921ad151f83b7849444f219), [`50ef80e`](https://github.com/Effect-TS/effect/commit/50ef80e251b85b5ee63aed06fe0244b5433ec2fa), [`fc3b718`](https://github.com/Effect-TS/effect/commit/fc3b7187114a31cbb21a250f55fda601bb3edcf0), [`ee336d8`](https://github.com/Effect-TS/effect/commit/ee336d80b4024b51654e7a2b8d869d244153fcdf), [`d12f922`](https://github.com/Effect-TS/effect/commit/d12f922853eff2310dbe9fc9b31562ad81b38435), [`46d8310`](https://github.com/Effect-TS/effect/commit/46d83101e8408c0428d9a8760e06e23a69ad6070), [`59812fd`](https://github.com/Effect-TS/effect/commit/59812fd221cde16fc77c03d326c6a2cf8fbec6b9), [`f9d0dec`](https://github.com/Effect-TS/effect/commit/f9d0dec12c5f229f05d7a74d532a85c6bbffefbf), [`4372c79`](https://github.com/Effect-TS/effect/commit/4372c79a32fcecc7b6b284d49a215b2c4fef9d77), [`81485ef`](https://github.com/Effect-TS/effect/commit/81485ef0288a3321e75d7d4ae32b7e0e06b6f86b), [`bd393d6`](https://github.com/Effect-TS/effect/commit/bd393d63c19bdd0ab212d95576cec89051c8501c), [`0c95c04`](https://github.com/Effect-TS/effect/commit/0c95c04b41c2d5d09e4564fd997572207fd72595)]:
+  - effect@4.0.0-rc.113
+
 ## 4.0.0-rc.112
 
 ### Patch Changes
diff --git a/repos/effect/packages/vitest/README.md b/repos/effect/packages/vitest/README.md
index f7e24b9e8..89e19c8e9 100644
--- a/repos/effect/packages/vitest/README.md
+++ b/repos/effect/packages/vitest/README.md
@@ -4,12 +4,42 @@ Helpers for testing Effect-based code with [Vitest](https://vitest.dev). Provide
 
 ## Installation
 
-Ensure a supported `vitest` version is installed (`^4.1.0`), then add the package as a dev dependency:
+Install Vitest 5 (`>=5.0.0 <6.0.0`) with the package as a dev dependency:
 
 ```sh
-npm install -D vitest @effect/vitest@rc
+npm install -D vitest@^5 @effect/vitest@rc
 ```
 
+Vitest 5 supports Node.js `^22.12.0 || ^24.0.0 || >=26.0.0` and Vite 6.4 or later within majors 6, 7, and 8.
+
+## Migrating to Vitest 5
+
+The package re-exports Vitest's public API. Upgrading removes the same exports and helpers that Vitest 5 removes; it does not provide compatibility shims.
+
+- Replace `test.sequential`, `it.sequential`, `describe.sequential`, and `{ sequential: true }` with `{ concurrent: false }`. Set this explicitly for suites that share mutable state or depend on test order when concurrency is enabled.
+- Replace the top-level `bench` import with the test-context fixture:
+
+  ```ts
+  import { test } from "@effect/vitest"
+
+  test("sort", async ({ bench }) => {
+    await bench("sort", () => [3, 1, 2].sort()).run()
+  })
+  ```
+
+  Use `test.skip`, `test.only`, or `test.todo` on the enclosing test. The old `BenchFactory`, `BenchFunction`, `BenchTask`, `BenchTaskResult`, `Benchmark`, `BenchmarkAPI`, `BenchmarkResult`, and `BenchmarkRunner` exports are removed. Use the fixture's `Bench`, `BenchFn`, `BenchRegistration`, and `BenchResult` types as appropriate; custom benchmark engines use `BenchmarkProvider`.
+- Change `Assertion<T>` to `Assertion<void, T>` for synchronous assertions or `Assertion<Promise<void>, T>` for asynchronous assertions. Augment `Matchers<R, T>` in `vitest` for custom matchers. Vitest's assertion state is no longer shared with `@vitest/expect`.
+- The `ExpectPollOptions` export is removed. Derive the options type with `NonNullable<Parameters<typeof expect.poll>[1]>` when needed.
+- Import reporter types from `vitest/node` and environment or snapshot APIs from `vitest/runtime`.
+
+Vitest 5 clears mock call history before each test by default and requires asynchronous assertions to be awaited. JSON reporters write to a file by default; use an explicit `outputFile` when consuming their results. See the [Vitest migration guide](https://vitest.dev/guide/migration/) for the remaining upstream changes.
+
+The Effect helpers retain their existing calling convention: `it.effect(name, effect, options)`, `it.live(name, effect, options)`, shared layers, and property tests.
+
+Both `layer` and `it.layer` accept `{ concurrent: false }` to serialize a named shared-layer suite, or `{ concurrent: true }` to run its tests concurrently. Omitting the option inherits suite concurrency; nested named layers can override it. Anonymous layers always inherit the enclosing suite's concurrency, regardless of the option.
+
+In concurrent tests, use the callback's `ctx.expect` so snapshots and assertion counts belong to the right test.
+
 ## Documentation
 
 - [Effect website](https://effect.website)
diff --git a/repos/effect/packages/vitest/package.json b/repos/effect/packages/vitest/package.json
index 3d1cb44da..1336a7a80 100644
--- a/repos/effect/packages/vitest/package.json
+++ b/repos/effect/packages/vitest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect/vitest",
-  "version": "4.0.0-rc.112",
+  "version": "4.0.0-rc.117",
   "type": "module",
   "license": "MIT",
   "description": "A set of helpers for testing Effects with vitest",
@@ -51,11 +51,11 @@
   },
   "peerDependencies": {
     "effect": "workspace:^",
-    "vitest": ">=4.1.0 <5.0.0"
+    "vitest": ">=5.0.0 <6.0.0"
   },
   "devDependencies": {
-    "@types/node": "^26.4.0",
+    "@types/node": "^26.6.2",
     "effect": "workspace:^",
-    "vitest": "4.1.11"
+    "vitest": "5.0.1"
   }
 }
diff --git a/repos/effect/packages/vitest/src/index.ts b/repos/effect/packages/vitest/src/index.ts
index 997ef65ef..7726aac02 100644
--- a/repos/effect/packages/vitest/src/index.ts
+++ b/repos/effect/packages/vitest/src/index.ts
@@ -116,6 +116,7 @@ export namespace Vitest {
       timeout?: Duration.Input
     ) => Effect.Effect<A, never, R2>
     readonly layer: <R2, E>(layer: Layer.Layer<R2, E, R>, options?: {
+      readonly concurrent?: boolean
       readonly timeout?: Duration.Input
     }) => {
       (f: (it: Vitest.MethodsNonLive<R | R2>) => void): void
@@ -164,6 +165,7 @@ export namespace Vitest {
   export interface Methods<R = never> extends MethodsNonLive<R> {
     readonly live: Vitest.Tester<Scope.Scope | R>
     readonly layer: <R2, E>(layer: Layer.Layer<R2, E, R>, options?: {
+      readonly concurrent?: boolean
       readonly memoMap?: Layer.MemoMap
       readonly timeout?: Duration.Input
       readonly excludeTestServices?: boolean
@@ -196,6 +198,10 @@ export const live: Vitest.Tester<Scope.Scope> = internal.live
  * Share a `Layer` between multiple tests, optionally wrapping
  * the tests in a `describe` block if a name is provided.
  *
+ * Named layers accept `concurrent` to override inherited suite concurrency.
+ * Anonymous layers always inherit the enclosing suite's concurrency.
+ * Use `ctx.expect` in concurrent tests for test-local snapshots and assertion counts.
+ *
  * @since 4.0.0
  *
  * ```ts
@@ -235,6 +241,7 @@ export const live: Vitest.Tester<Scope.Scope> = internal.live
 export const layer: <R, E>(
   layer_: Layer.Layer<R, E>,
   options?: {
+    readonly concurrent?: boolean
     readonly memoMap?: Layer.MemoMap
     readonly timeout?: Duration.Input
     readonly excludeTestServices?: boolean
diff --git a/repos/effect/packages/vitest/src/internal/internal.ts b/repos/effect/packages/vitest/src/internal/internal.ts
index ad3e25c60..3e001b198 100644
--- a/repos/effect/packages/vitest/src/internal/internal.ts
+++ b/repos/effect/packages/vitest/src/internal/internal.ts
@@ -6,7 +6,7 @@ import * as Cause from "effect/Cause"
 import * as Duration from "effect/Duration"
 import * as Effect from "effect/Effect"
 import * as Exit from "effect/Exit"
-import { flow, pipe } from "effect/Function"
+import { constVoid, flow, pipe } from "effect/Function"
 import * as Layer from "effect/Layer"
 import * as Schedule from "effect/Schedule"
 import type * as Schema from "effect/Schema"
@@ -34,7 +34,21 @@ const runPromise: <E, A>(
 }, (effect, _, ctx) => Effect.runPromise(effect, { signal: ctx?.signal }))
 
 /** @internal */
-const runTest = (ctx?: Vitest.TestContext) => <E, A>(effect: Effect.Effect<A, E>) => runPromise(effect, ctx)
+const runTest = (ctx?: Vitest.TestContext) => <E, A>(effect: Effect.Effect<A, E>) => {
+  const promise = runPromise(effect, ctx)
+  if (ctx) {
+    // Vitest stops awaiting the test promise once the signal aborts (timeout or
+    // cancellation), so only then add a hook that waits for the finalizers.
+    // Registering it unconditionally would change the teardown of every test.
+    const onAbort = () => ctx.onTestFinished(() => promise.then(constVoid, constVoid))
+    ctx.signal.addEventListener("abort", onAbort, { once: true })
+    const cleanup = () => ctx.signal.removeEventListener("abort", onAbort)
+    promise.then(cleanup, cleanup)
+    // A retry after a timed-out attempt reuses the aborted signal, so no event fires.
+    if (ctx.signal.aborted) onAbort()
+  }
+  return promise
+}
 
 /** @internal */
 export type TestContext = TestConsole.TestConsole | TestClock.TestClock
@@ -221,6 +235,7 @@ export const prop: Vitest.Vitest.Methods["prop"] = (name, arbitraries, self, tim
 export const layer = <R, E>(
   layer_: Layer.Layer<R, E>,
   options?: {
+    readonly concurrent?: boolean
     readonly memoMap?: Layer.MemoMap
     readonly timeout?: Duration.Input
     readonly excludeTestServices?: boolean
@@ -254,12 +269,13 @@ export const layer = <R, E>(
     Effect.runSync
   )
   let closed = false
-  const closeScope = (ctx?: Vitest.TestContext) => {
+  const closeScope = () => {
     if (closed) {
       return Promise.resolve()
     }
     closed = true
-    return runPromise(Scope.close(scope, Exit.void), ctx)
+    // Layer cleanup must outlive the last test's already-aborted signal.
+    return runPromise(Scope.close(scope, Exit.void))
   }
 
   const makeIt = (it: V.TestAPI): Vitest.Vitest.MethodsNonLive<R> =>
@@ -276,6 +292,7 @@ export const layer = <R, E>(
       prop,
       flakyTest,
       layer<R2, E2>(nestedLayer: Layer.Layer<R2, E2, R>, options?: {
+        readonly concurrent?: boolean
         readonly timeout?: Duration.Input
       }) {
         return layer(Layer.provideMerge(nestedLayer, withTestEnv), {
@@ -311,7 +328,7 @@ export const layer = <R, E>(
         ctx.onTestFinished(() => {
           remaining--
           if (remaining === 0) {
-            return closeScope(ctx)
+            return closeScope()
           }
         })
         return runPromise(Effect.asVoid(contextEffect), ctx)
@@ -322,7 +339,8 @@ export const layer = <R, E>(
     return
   }
 
-  return V.describe(args[0], () => {
+  const suiteOptions = options?.concurrent === undefined ? {} : { concurrent: options.concurrent }
+  return V.describe(args[0], suiteOptions, () => {
     V.beforeAll(
       () => runPromise(Effect.asVoid(contextEffect)),
       hookTimeout(options?.timeout)
diff --git a/repos/effect/packages/vitest/test/layer-concurrency.test.ts b/repos/effect/packages/vitest/test/layer-concurrency.test.ts
new file mode 100644
index 000000000..1b79791ea
--- /dev/null
+++ b/repos/effect/packages/vitest/test/layer-concurrency.test.ts
@@ -0,0 +1,72 @@
+import { assert, describe, it, layer, type Vitest } from "@effect/vitest"
+import { Effect, Layer } from "effect"
+
+const checkConcurrency = (
+  it: Vitest.MethodsNonLive,
+  concurrent: boolean,
+  options?: { readonly concurrent: boolean }
+) => {
+  let running = 0
+  let release!: () => void
+  const bothStarted = new Promise<void>((resolve) => {
+    release = resolve
+  })
+
+  for (const name of ["first", "second"]) {
+    it.effect(name, (ctx) =>
+      Effect.gen(function*() {
+        assert.strictEqual(ctx.task.concurrent ?? false, concurrent)
+        running++
+        if (running === 2) release()
+        try {
+          if (concurrent) {
+            yield* Effect.promise(() => bothStarted)
+          } else {
+            // Let another test start if the suite was accidentally made concurrent.
+            yield* Effect.promise(() => new Promise<void>((resolve) => setTimeout(resolve, 0)))
+            assert.strictEqual(running, 1)
+          }
+        } finally {
+          running--
+        }
+      }), options)
+  }
+}
+
+for (const [name, makeLayer] of [["layer", layer], ["it.layer", it.layer]] as const) {
+  describe(name, () => {
+    for (const concurrent of [false, true]) {
+      describe(`enclosing suite concurrent=${concurrent}`, { concurrent }, () => {
+        makeLayer(Layer.empty)("named layer inherits by default", (it) => {
+          checkConcurrency(it, concurrent)
+        })
+
+        makeLayer(Layer.empty, { concurrent: !concurrent })("named layer overrides enclosing suite", (it) => {
+          checkConcurrency(it, !concurrent)
+
+          it.layer(Layer.empty)("nested layer inherits", (it) => {
+            checkConcurrency(it, !concurrent)
+          })
+
+          it.layer(Layer.empty, { concurrent })("nested layer overrides parent", (it) => {
+            checkConcurrency(it, concurrent)
+          })
+
+          describe("test options override layer", () => {
+            checkConcurrency(it, concurrent, { concurrent })
+          })
+        })
+
+        describe("anonymous layer preserves enclosing suite", () => {
+          makeLayer(Layer.empty, { concurrent: !concurrent })((it) => {
+            checkConcurrency(it, concurrent)
+
+            it.layer(Layer.empty)("nested layer inherits enclosing suite", (it) => {
+              checkConcurrency(it, concurrent)
+            })
+          })
+        })
+      })
+    }
+  })
+}
diff --git a/repos/effect/packages/vitest/test/nested-isolation.test.ts b/repos/effect/packages/vitest/test/nested-isolation.test.ts
index 15c3b0566..0871897d7 100644
--- a/repos/effect/packages/vitest/test/nested-isolation.test.ts
+++ b/repos/effect/packages/vitest/test/nested-isolation.test.ts
@@ -1,7 +1,7 @@
 import { afterAll, assert, beforeAll, describe, expect, layer } from "@effect/vitest"
 import { Context, Effect, Layer, Ref } from "effect"
 
-describe("nested sibling layers", () => {
+describe("nested sibling layers", { concurrent: false }, () => {
   let nextChildId = 0
   let firstChildId = -1
   let secondChildId = -1
@@ -119,7 +119,7 @@ describe.concurrent("nested sibling layers in concurrent suites", () => {
   })
 })
 
-describe("nested sibling isolation with provided state graph", () => {
+describe("nested sibling isolation with provided state graph", { concurrent: false }, () => {
   interface StateShape {
     readonly id: number
     readonly todos: Ref.Ref<Array<string>>
diff --git a/repos/effect/packages/vitest/test/timeout.test.ts b/repos/effect/packages/vitest/test/timeout.test.ts
new file mode 100644
index 000000000..5a49a80c6
--- /dev/null
+++ b/repos/effect/packages/vitest/test/timeout.test.ts
@@ -0,0 +1,105 @@
+import { afterAll, assert, describe, it } from "@effect/vitest"
+import { Effect, Layer } from "effect"
+
+const pendingReleases: Array<Promise<void>> = []
+
+// Drain the real timers even when a broken adapter abandons a finalizer.
+afterAll(() => Promise.all(pendingReleases))
+
+// The release takes real time: the TestClock is not advanced once a test has timed out.
+const resource = (events: Array<string>, name: string) =>
+  Effect.acquireRelease(
+    Effect.sync(() => {
+      events.push(`${name}:acquired`)
+    }),
+    () =>
+      Effect.promise(() => {
+        events.push(`${name}:release:start`)
+        const pending = new Promise<void>((resolve) =>
+          setTimeout(() => {
+            events.push(`${name}:release:end`)
+            resolve()
+          }, 250)
+        )
+        pendingReleases.push(pending)
+        return pending
+      })
+  )
+
+for (const mode of ["effect", "live"] as const) {
+  describe(`it.${mode} timeout finalizers`, { concurrent: false }, () => {
+    const events: Array<string> = []
+    let signal: AbortSignal | undefined
+
+    it[mode].fails("times out while holding a resource", (ctx) =>
+      Effect.gen(function*() {
+        signal = ctx.signal
+        yield* resource(events, "test")
+        return yield* Effect.never
+      }), { timeout: 75 })
+
+    it("awaits the finalizer before starting the next test", () => {
+      events.push("next:start")
+      assert.isTrue(signal?.aborted)
+      assert.deepStrictEqual(events, ["test:acquired", "test:release:start", "test:release:end", "next:start"])
+    })
+  })
+}
+
+describe("it.effect timeout retry finalizers", { concurrent: false }, () => {
+  const events: Array<string> = []
+  const abortedAtStart: Array<boolean> = []
+  let attempts = 0
+
+  it.effect.fails("retries after timing out while holding a resource", (ctx) =>
+    Effect.gen(function*() {
+      const attempt = ++attempts
+      abortedAtStart.push(ctx.signal.aborted)
+      yield* resource(events, `attempt${attempt}`)
+      return yield* Effect.never
+    }), { timeout: 75, retry: 1 })
+
+  it("awaits the retry's finalizer before starting the next test", () => {
+    events.push("next:start")
+    assert.strictEqual(attempts, 2)
+    // Vitest reuses the signal aborted by the first attempt's timeout.
+    assert.deepStrictEqual(abortedAtStart, [false, true])
+    assert.deepStrictEqual(events, [
+      "attempt1:acquired",
+      "attempt1:release:start",
+      "attempt1:release:end",
+      "attempt2:acquired",
+      "attempt2:release:start",
+      "attempt2:release:end",
+      "next:start"
+    ])
+  })
+})
+
+describe("it.layer timeout finalizers", { concurrent: false }, () => {
+  const events: Array<string> = []
+  let signal: AbortSignal | undefined
+
+  it.layer(Layer.effectDiscard(resource(events, "layer")))((it) => {
+    it.effect.fails("times out in the last test using the layer", (ctx) =>
+      Effect.gen(function*() {
+        signal = ctx.signal
+        yield* resource(events, "test")
+        return yield* Effect.never
+      }), { timeout: 75 })
+  })
+
+  it("awaits both test and layer finalizers before starting the next test", () => {
+    events.push("next:start")
+    assert.isTrue(signal?.aborted)
+    assert.deepStrictEqual(events, [
+      "layer:acquired",
+      "test:acquired",
+      "test:release:start",
+      "test:release:end",
+      "layer:release:start",
+      "layer:release:end",
+      "next:start"
+    ])
+  })
+})
diff --git a/repos/effect/packages/vitest/typetest/index.tst.ts b/repos/effect/packages/vitest/typetest/index.tst.ts
index f77913f99..5c2259ab3 100644
--- a/repos/effect/packages/vitest/typetest/index.tst.ts
+++ b/repos/effect/packages/vitest/typetest/index.tst.ts
@@ -9,6 +9,7 @@ class Bar extends Context.Service<Bar, "bar">()("Bar") {}
 describe("layer", () => {
   test("top-level export accepts full options", () => {
     expect(layer).type.toBeCallableWith(Layer.succeed(Foo, "foo"), {
+      concurrent: false,
       timeout: "5 seconds",
       excludeTestServices: true,
       memoMap: undefined as any
@@ -21,6 +22,7 @@ describe("layer", () => {
 
   test("it.layer accepts full options", () => {
     expect(it.layer).type.toBeCallableWith(Layer.succeed(Foo, "foo"), {
+      concurrent: false,
       timeout: "5 seconds",
       excludeTestServices: true,
       memoMap: undefined as any
@@ -31,14 +33,31 @@ describe("layer", () => {
     expect(it.layer).type.toBeCallableWith(Layer.succeed(Foo, "foo"))
   })
 
-  test("nested it.layer accepts timeout", () => {
+  test("nested it.layer accepts concurrency and timeout", () => {
     layer(Layer.succeed(Foo, "foo"))((it) => {
       expect(it.layer).type.toBeCallableWith(Layer.succeed(Bar, "bar"), {
+        concurrent: true,
         timeout: "3 seconds"
       })
     })
   })
 
+  test("concurrency does not require other options", () => {
+    expect(layer).type.toBeCallableWith(Layer.succeed(Foo, "foo"), { concurrent: true })
+    expect(it.layer).type.toBeCallableWith(Layer.succeed(Foo, "foo"), { concurrent: true })
+    layer(Layer.succeed(Foo, "foo"))((it) => {
+      expect(it.layer).type.toBeCallableWith(Layer.succeed(Bar, "bar"), { concurrent: false })
+    })
+  })
+
+  test("concurrency must be boolean", () => {
+    expect(layer).type.not.toBeCallableWith(Layer.succeed(Foo, "foo"), { concurrent: "false" })
+    expect(it.layer).type.not.toBeCallableWith(Layer.succeed(Foo, "foo"), { concurrent: "false" })
+    layer(Layer.succeed(Foo, "foo"))((it) => {
+      expect(it.layer).type.not.toBeCallableWith(Layer.succeed(Bar, "bar"), { concurrent: "false" })
+    })
+  })
+
   test("nested it.layer rejects excludeTestServices", () => {
     layer(Layer.succeed(Foo, "foo"))((it) => {
       expect(it.layer).type.not.toBeCallableWith(Layer.succeed(Bar, "bar"), {
diff --git a/repos/effect/patches/@changesets__get-github-info@1.0.0.patch b/repos/effect/patches/@changesets__get-github-info@1.0.0.patch
deleted file mode 100644
index c7a3e4498..000000000
--- a/repos/effect/patches/@changesets__get-github-info@1.0.0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/dist/index.mjs b/dist/index.mjs
-index 0b8a76abaac754e0a9a5d69ec26e62fc5788aa98..6b8ffafb842aba9b15dde5cc50dc276b6edc3900 100644
---- a/dist/index.mjs
-+++ b/dist/index.mjs
-@@ -27,7 +27,14 @@ async function readEnv() {
- }
- //#endregion
- //#region src/dataloader.ts
--const GHDataLoader = new DataLoader(batchLoad, { maxBatchSize: 50 });
-+const GHDataLoader = new DataLoader(batchLoad, {
-+	maxBatchSize: 50,
-+	cacheKeyFn: (request) => JSON.stringify([
-+		request.repo,
-+		request.kind,
-+		request.kind === "pull" ? request.pull : request.commit
-+	])
-+});
- async function loadCommitData(options) {
- 	return await GHDataLoader.load({
- 		...options,
-@@ -166,7 +173,7 @@ async function getCommitInfo(options) {
- 		const bDate = new Date(b.mergedAt);
- 		return aDate.getTime() - bDate.getTime();
- 	})[0];
--	const author = pr?.author ?? data.author?.user;
-+	const author = data.author?.user;
- 	return {
- 		commit: {
- 			sha: options.commit,
-@@ -176,7 +183,7 @@ async function getCommitInfo(options) {
- 		author: author ? {
- 			login: author.login,
- 			url: author.url,
--			markdownLink: `[@${author.login}](${author.url})`
-+			markdownLink: `@${author.login}`
- 		} : void 0,
- 		pull: pr ? {
- 			number: pr.number,
diff --git a/repos/effect/patches/@changesets__get-github-info@1.0.1.patch b/repos/effect/patches/@changesets__get-github-info@1.0.1.patch
new file mode 100644
index 000000000..4d1e36cbb
--- /dev/null
+++ b/repos/effect/patches/@changesets__get-github-info@1.0.1.patch
@@ -0,0 +1,21 @@
+diff --git a/dist/index.mjs b/dist/index.mjs
+--- a/dist/index.mjs
++++ b/dist/index.mjs
+@@ -171,7 +171,7 @@
+ 		const bDate = new Date(b.mergedAt);
+ 		return aDate.getTime() - bDate.getTime();
+ 	})[0];
+-	const author = pr?.author ?? data.author?.user;
++	const author = data.author?.user;
+ 	return {
+ 		commit: {
+ 			sha: options.commit,
+@@ -181,7 +181,7 @@
+ 		author: author ? {
+ 			login: author.login,
+ 			url: author.url,
+-			markdownLink: `[@${author.login}](${author.url})`
++			markdownLink: `@${author.login}`
+ 		} : void 0,
+ 		pull: pr ? {
+ 			number: pr.number,
diff --git a/repos/effect/pnpm-lock.yaml b/repos/effect/pnpm-lock.yaml
index 01ca94fed..95f24d186 100644
--- a/repos/effect/pnpm-lock.yaml
+++ b/repos/effect/pnpm-lock.yaml
@@ -4,31 +4,34 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
+overrides:
+  jsdom: ~30.0.1
+
 patchedDependencies:
-  '@changesets/get-github-info@1.0.0': a5b1907668397f36aab989954aa78993792f578b83e41a164ab7ecd573ac9166
+  '@changesets/get-github-info@1.0.1': 4b2756eb490a2ad802075423f6b08a5f50f12307ec25e117b20a79e12236b625
 
 importers:
 
   .:
     devDependencies:
       '@babel/cli':
-        specifier: ^8.0.4
-        version: 8.0.4(@babel/core@8.0.1)
+        specifier: ^8.0.6
+        version: 8.0.6(@babel/core@8.0.6)
       '@babel/core':
-        specifier: ^8.0.1
-        version: 8.0.1
+        specifier: ^8.0.6
+        version: 8.0.6
       '@babel/plugin-transform-export-namespace-from':
         specifier: ^8.0.1
-        version: 8.0.1(@babel/core@8.0.1)
+        version: 8.0.1(@babel/core@8.0.6)
       '@babel/plugin-transform-modules-commonjs':
         specifier: ^8.0.1
-        version: 8.0.1(@babel/core@8.0.1)
+        version: 8.0.1(@babel/core@8.0.6)
       '@changesets/changelog-github':
-        specifier: 1.0.0
-        version: 1.0.0
+        specifier: 1.0.1
+        version: 1.0.1
       '@changesets/cli':
-        specifier: 3.0.1
-        version: 3.0.1
+        specifier: 3.0.3
+        version: 3.0.3
       '@effect/ai-docgen':
         specifier: workspace:^
         version: link:packages/tools/ai-docgen
@@ -48,8 +51,8 @@ importers:
         specifier: workspace:^
         version: link:packages/tools/oxc
       '@effect/tsgo':
-        specifier: ^0.38.0
-        version: 0.38.0
+        specifier: ^0.45.0
+        version: 0.45.0
       '@effect/utils':
         specifier: workspace:^
         version: link:packages/tools/utils
@@ -61,49 +64,43 @@ importers:
         version: 10.6.0
       '@rollup/plugin-node-resolve':
         specifier: ^16.0.3
-        version: 16.0.3(rollup@4.63.1)
+        version: 16.0.3(rollup@4.63.4)
       '@rollup/plugin-replace':
         specifier: ^6.0.3
-        version: 6.0.3(rollup@4.63.1)
+        version: 6.0.3(rollup@4.63.4)
       '@rollup/plugin-terser':
         specifier: ^1.0.0
-        version: 1.0.0(rollup@4.63.1)
+        version: 1.0.0(rollup@4.63.4)
       '@types/jscodeshift':
         specifier: ^17.3.0
         version: 17.3.0
       '@types/node':
-        specifier: ^26.4.0
-        version: 26.4.0
-      '@vitest/browser':
-        specifier: ^4.1.11
-        version: 4.1.11(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))(vitest@4.1.11)
+        specifier: ^26.6.2
+        version: 26.6.2
       '@vitest/coverage-v8':
-        specifier: ^4.1.11
-        version: 4.1.11(@vitest/browser@4.1.11)(vitest@4.1.11)
-      '@vitest/expect':
-        specifier: ^4.1.11
-        version: 4.1.11
+        specifier: ^5.0.1
+        version: 5.0.1(vitest@5.0.1)
       '@vitest/web-worker':
-        specifier: ^4.1.11
-        version: 4.1.11(vitest@4.1.11)
+        specifier: ^5.0.1
+        version: 5.0.1(vitest@5.0.1)
       ast-types:
-        specifier: ^0.16.1
-        version: 0.16.1
+        specifier: ^0.16.3
+        version: 0.16.3
       babel-plugin-annotate-pure-calls:
         specifier: ^0.5.0
-        version: 0.5.0(@babel/core@8.0.1)
+        version: 0.5.0(@babel/core@8.0.6)
       dprint:
-        specifier: ^0.56.1
-        version: 0.56.1
+        specifier: ^0.57.4
+        version: 0.57.4
       fast-check:
-        specifier: ^4.9.0
-        version: 4.9.0
+        specifier: ^4.10.2
+        version: 4.10.2
       glob:
         specifier: ^13.0.6
         version: 13.0.6
       happy-dom:
-        specifier: ^20.12.0
-        version: 20.12.0
+        specifier: ^20.14.5
+        version: 20.14.5
       jscodeshift:
         specifier: ^17.4.0
         version: 17.4.0(supports-color@10.2.2)
@@ -114,47 +111,47 @@ importers:
         specifier: ^8.0.0
         version: 8.0.0(supports-color@10.2.2)(typescript@7.0.2)
       oxlint:
-        specifier: ^1.80.0
-        version: 1.80.0
+        specifier: ^1.83.0
+        version: 1.83.0
       pkg-pr-new:
         specifier: 0.0.88
         version: 0.0.88
       playwright:
-        specifier: ^1.62.1
-        version: 1.62.1
+        specifier: ^1.63.0
+        version: 1.63.0
       rollup:
-        specifier: ^4.63.1
-        version: 4.63.1
+        specifier: ^4.63.4
+        version: 4.63.4
       rollup-plugin-bundle-stats:
         specifier: ^4.22.3
-        version: 4.22.3(core-js@3.47.0)(rolldown@1.2.6)(rollup@4.63.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))
+        version: 4.22.3(core-js@3.47.0)(rolldown@1.2.9)(rollup@4.63.4)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1))
       rollup-plugin-esbuild:
         specifier: ^6.2.1
-        version: 6.2.1(esbuild@0.28.2)(rollup@4.63.1)(supports-color@10.2.2)
+        version: 6.2.1(esbuild@0.28.2)(rollup@4.63.4)(supports-color@10.2.2)
       rollup-plugin-visualizer:
         specifier: ^7.1.1
-        version: 7.1.1(rolldown@1.2.6)(rollup@4.63.1)
+        version: 7.1.1(rolldown@1.2.9)(rollup@4.63.4)
       terser:
         specifier: ^5.51.2
         version: 5.51.2
       tstyche:
-        specifier: ^7.2.3
-        version: 7.2.3(typescript@7.0.2)
+        specifier: ^7.2.5
+        version: 7.2.5(typescript@7.0.2)
       typescript:
         specifier: ^7.0.2
         version: 7.0.2
       vite:
-        specifier: ^8.2.2
-        version: 8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0)
+        specifier: ^8.3.0
+        version: 8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1)
       vitest:
-        specifier: ^4.1.11
-        version: 4.1.11(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.4.0)(@vitest/coverage-v8@4.1.11)(happy-dom@20.12.0)(jsdom@30.0.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))
+        specifier: ^5.0.1
+        version: 5.0.1(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.6.2)(@vitest/coverage-v8@5.0.1)(happy-dom@20.14.5)(jsdom@30.0.1)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1))
       vitest-websocket-mock:
-        specifier: ^0.7.0
-        version: 0.7.0(vitest@4.1.11)
+        specifier: ^0.8.0
+        version: 0.8.0(vitest@5.0.1)
       zod:
-        specifier: ^4.5.4
-        version: 4.5.4
+        specifier: ^4.6.5
+        version: 4.6.5
 
   ai-docs:
     dependencies:
@@ -228,15 +225,15 @@ importers:
         specifier: workspace:*
         version: link:../packages/effect
       hono:
-        specifier: ^4.13.5
-        version: 4.13.5
+        specifier: ^4.13.8
+        version: 4.13.8
       nodemailer:
-        specifier: ^9.0.6
-        version: 9.0.6
+        specifier: ^10.0.10
+        version: 10.0.10
     devDependencies:
       '@types/nodemailer':
-        specifier: ^8.0.1
-        version: 8.0.1
+        specifier: ^8.0.2
+        version: 8.0.2
 
   packages/ai/anthropic:
     devDependencies:
@@ -262,44 +259,50 @@ importers:
         specifier: workspace:^
         version: link:../../effect
 
+  packages/ai/typesafe:
+    devDependencies:
+      effect:
+        specifier: workspace:^
+        version: link:../../effect
+
   packages/atom/react:
     devDependencies:
       '@testing-library/dom':
-        specifier: ^10.4.1
-        version: 10.4.1
+        specifier: ^10.4.2
+        version: 10.4.2
       '@testing-library/jest-dom':
         specifier: ^7.0.1
-        version: 7.0.1(@testing-library/dom@10.4.1)(vitest@4.1.11)
+        version: 7.0.1(@testing-library/dom@10.4.2)(vitest@5.0.1)
       '@testing-library/react':
         specifier: ^16.3.3
-        version: 16.3.3(@testing-library/dom@10.4.1)(@types/react-dom@19.2.5(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 16.3.3(@testing-library/dom@10.4.2)(@types/react-dom@19.3.0(@types/react@19.3.0))(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
       '@types/react':
-        specifier: ^19.2.18
-        version: 19.2.18
+        specifier: ^19.3.0
+        version: 19.3.0
       '@types/react-dom':
-        specifier: ^19.2.5
-        version: 19.2.5(@types/react@19.2.18)
+        specifier: ^19.3.0
+        version: 19.3.0(@types/react@19.3.0)
       '@types/scheduler':
-        specifier: ^0.26.0
-        version: 0.26.0
+        specifier: ^0.28.0
+        version: 0.28.0
       effect:
         specifier: workspace:^
         version: link:../../effect
       jsdom:
-        specifier: ^30.0.1
+        specifier: ~30.0.1
         version: 30.0.1
       react:
-        specifier: ^19.2.8
-        version: 19.2.8
+        specifier: ^19.3.0
+        version: 19.3.0
       react-dom:
-        specifier: ^19.2.8
-        version: 19.2.8(react@19.2.8)
+        specifier: ^19.3.0
+        version: 19.3.0(react@19.3.0)
       react-error-boundary:
-        specifier: ^6.1.3
-        version: 6.1.3(@types/react@19.2.18)(react@19.2.8)
+        specifier: ^6.1.5
+        version: 6.1.5(@types/react@19.3.0)(react@19.3.0)
       scheduler:
-        specifier: ^0.27.0
-        version: 0.27.0
+        specifier: ^0.28.0
+        version: 0.28.0
 
   packages/atom/solid:
     devDependencies:
@@ -307,16 +310,16 @@ importers:
         specifier: ^0.8.10
         version: 0.8.10(solid-js@1.9.15)
       '@testing-library/dom':
-        specifier: ^10.4.1
-        version: 10.4.1
+        specifier: ^10.4.2
+        version: 10.4.2
       '@testing-library/jest-dom':
         specifier: ^7.0.1
-        version: 7.0.1(@testing-library/dom@10.4.1)(vitest@4.1.11)
+        version: 7.0.1(@testing-library/dom@10.4.2)(vitest@5.0.1)
       effect:
         specifier: workspace:^
         version: link:../../effect
       jsdom:
-        specifier: ^30.0.1
+        specifier: ~30.0.1
         version: 30.0.1
       solid-js:
         specifier: ^1.9.15
@@ -328,14 +331,14 @@ importers:
         specifier: workspace:^
         version: link:../../effect
       vue:
-        specifier: ^3.5.42
-        version: 3.5.42(typescript@7.0.2)
+        specifier: ^3.5.43
+        version: 3.5.43(typescript@7.0.2)
 
   packages/effect:
     devDependencies:
       '@types/node':
-        specifier: ^26.4.0
-        version: 26.4.0
+        specifier: ^26.6.2
+        version: 26.6.2
       ajv:
         specifier: ^8.20.0
         version: 8.20.0
@@ -343,8 +346,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0(ajv@8.20.0)
       ast-types:
-        specifier: ^0.16.1
-        version: 0.16.1
+        specifier: ^0.16.3
+        version: 0.16.3
       immer:
         specifier: ^11.1.18
         version: 11.1.18
@@ -352,11 +355,11 @@ importers:
         specifier: ^8.8.0
         version: 8.8.0
       tinybench:
-        specifier: ^6.1.4
-        version: 6.1.4
+        specifier: ^6.2.0
+        version: 6.2.0
       valibot:
-        specifier: ^1.4.2
-        version: 1.4.2(typescript@7.0.2)
+        specifier: ^1.5.0
+        version: 1.5.0(typescript@7.0.2)
 
   packages/opentelemetry:
     dependencies:
@@ -368,41 +371,41 @@ importers:
         specifier: ^1.9.1
         version: 1.9.1
       '@opentelemetry/api-logs':
-        specifier: ^0.221.0
-        version: 0.221.0
+        specifier: ^0.222.0
+        version: 0.222.0
       '@opentelemetry/context-async-hooks':
-        specifier: ^2.10.0
-        version: 2.10.0(@opentelemetry/api@1.9.1)
+        specifier: ^2.11.0
+        version: 2.11.0(@opentelemetry/api@1.9.1)
       '@opentelemetry/exporter-metrics-otlp-http':
-        specifier: 0.221.0
-        version: 0.221.0(@opentelemetry/api@1.9.1)
+        specifier: 0.222.0
+        version: 0.222.0(@opentelemetry/api@1.9.1)
       '@opentelemetry/exporter-prometheus':
-        specifier: ^0.221.0
-        version: 0.221.0(@opentelemetry/api@1.9.1)
+        specifier: ^0.222.0
+        version: 0.222.0(@opentelemetry/api@1.9.1)
       '@opentelemetry/exporter-trace-otlp-http':
-        specifier: ^0.221.0
-        version: 0.221.0(@opentelemetry/api@1.9.1)
+        specifier: ^0.222.0
+        version: 0.222.0(@opentelemetry/api@1.9.1)
       '@opentelemetry/otlp-exporter-base':
-        specifier: ^0.221.0
-        version: 0.221.0(@opentelemetry/api@1.9.1)
+        specifier: ^0.222.0
+        version: 0.222.0(@opentelemetry/api@1.9.1)
       '@opentelemetry/resources':
-        specifier: ^2.10.0
-        version: 2.10.0(@opentelemetry/api@1.9.1)
+        specifier: ^2.11.0
+        version: 2.11.0(@opentelemetry/api@1.9.1)
       '@opentelemetry/sdk-logs':
-        specifier: ^0.221.0
-        version: 0.221.0(@opentelemetry/api@1.9.1)
+        specifier: ^0.222.0
+        version: 0.222.0(@opentelemetry/api@1.9.1)
       '@opentelemetry/sdk-metrics':
-        specifier: ^2.10.0
-        version: 2.10.0(@opentelemetry/api@1.9.1)
+        specifier: ^2.11.0
+        version: 2.11.0(@opentelemetry/api@1.9.1)
       '@opentelemetry/sdk-trace-base':
-        specifier: ^2.10.0
-        version: 2.10.0(@opentelemetry/api@1.9.1)
+        specifier: ^2.11.0
+        version: 2.11.0(@opentelemetry/api@1.9.1)
       '@opentelemetry/sdk-trace-node':
-        specifier: ^2.10.0
-        version: 2.10.0(@opentelemetry/api@1.9.1)
+        specifier: ^2.11.0
+        version: 2.11.0(@opentelemetry/api@1.9.1)
       '@opentelemetry/sdk-trace-web':
-        specifier: ^2.10.0
-        version: 2.10.0(@opentelemetry/api@1.9.1)
+        specifier: ^2.11.0
+        version: 2.11.0(@opentelemetry/api@1.9.1)
       '@opentelemetry/semantic-conventions':
         specifier: ^1.43.0
         version: 1.43.0
@@ -426,8 +429,8 @@ importers:
         version: link:../node-shared
     devDependencies:
       '@types/bun':
-        specifier: ^1.4.0
-        version: 1.4.0
+        specifier: ^1.4.2
+        version: 1.4.2
       effect:
         specifier: workspace:^
         version: link:../../effect
@@ -435,8 +438,8 @@ importers:
   packages/platform/deno:
     dependencies:
       '@db/redis':
-        specifier: jsr:^0.41.2
-        version: '@jsr/db__redis@0.41.2'
+        specifier: jsr:^0.42.0
+        version: '@jsr/db__redis@0.42.0'
       '@effect/platform-node-shared':
         specifier: workspace:^
         version: link:../node-shared
@@ -472,8 +475,8 @@ importers:
         specifier: workspace:^
         version: link:../node-shared
       undici:
-        specifier: ^8.10.0
-        version: 8.10.0
+        specifier: ^8.10.2
+        version: 8.10.2
     devDependencies:
       '@testcontainers/mysql':
         specifier: ^12.1.0
@@ -485,8 +488,8 @@ importers:
         specifier: ^12.1.0
         version: 12.1.0(supports-color@10.2.2)
       '@types/node':
-        specifier: ^26.4.0
-        version: 26.4.0
+        specifier: ^26.6.2
+        version: 26.6.2
       effect:
         specifier: workspace:^
         version: link:../../effect
@@ -504,8 +507,8 @@ importers:
         version: 8.21.3
     devDependencies:
       '@types/node':
-        specifier: ^26.4.0
-        version: 26.4.0
+        specifier: ^26.6.2
+        version: 26.6.2
       effect:
         specifier: workspace:^
         version: link:../../effect
@@ -513,8 +516,8 @@ importers:
         specifier: ^7.5.22
         version: 7.5.22
       tinybench:
-        specifier: ^6.1.4
-        version: 6.1.4
+        specifier: ^6.2.0
+        version: 6.2.0
 
   packages/sql/clickhouse:
     dependencies:
@@ -532,21 +535,21 @@ importers:
   packages/sql/d1:
     dependencies:
       '@cloudflare/workers-types':
-        specifier: ^5.20260829.1
-        version: 5.20260829.1
+        specifier: ^5.20260919.1
+        version: 5.20260919.1
     devDependencies:
       effect:
         specifier: workspace:^
         version: link:../../effect
       miniflare:
-        specifier: 5.20260828.0-alpha
-        version: 5.20260828.0-alpha
+        specifier: 5.20260918.0-alpha
+        version: 5.20260918.0-alpha(@types/node@26.6.2)
 
   packages/sql/libsql:
     dependencies:
       '@libsql/client':
-        specifier: ^0.17.4
-        version: 0.17.4
+        specifier: ^0.18.0
+        version: 0.18.0
     devDependencies:
       effect:
         specifier: workspace:^
@@ -571,8 +574,8 @@ importers:
   packages/sql/mysql2:
     dependencies:
       mysql2:
-        specifier: ^3.24.2
-        version: 3.24.2(@types/node@26.4.0)
+        specifier: ^3.24.4
+        version: 3.24.4(@types/node@26.6.2)
     devDependencies:
       '@testcontainers/mysql':
         specifier: ^12.1.0
@@ -587,8 +590,8 @@ importers:
         specifier: ^12.1.0
         version: 12.1.0(supports-color@10.2.2)
       '@types/node':
-        specifier: ^26.4.0
-        version: 26.4.0
+        specifier: ^26.6.2
+        version: 26.6.2
       effect:
         specifier: workspace:^
         version: link:../../effect
@@ -596,8 +599,8 @@ importers:
         specifier: ^3.4.9
         version: 3.4.9
       tinybench:
-        specifier: ^6.1.4
-        version: 6.1.4
+        specifier: ^6.2.0
+        version: 6.2.0
 
   packages/sql/pglite:
     dependencies:
@@ -615,8 +618,8 @@ importers:
         specifier: workspace:^
         version: link:../../platform/bun
       '@types/bun':
-        specifier: ^1.4.0
-        version: 1.4.0
+        specifier: ^1.4.2
+        version: 1.4.2
       effect:
         specifier: workspace:^
         version: link:../../effect
@@ -624,11 +627,17 @@ importers:
   packages/sql/sqlite-do:
     devDependencies:
       '@cloudflare/workers-types':
-        specifier: ^5.20260829.1
-        version: 5.20260829.1
+        specifier: ^5.20260919.1
+        version: 5.20260919.1
       effect:
         specifier: workspace:^
         version: link:../../effect
+      esbuild:
+        specifier: ^0.28.2
+        version: 0.28.2
+      miniflare:
+        specifier: 5.20260918.0-alpha
+        version: 5.20260918.0-alpha(@types/node@26.6.2)
 
   packages/sql/sqlite-node:
     devDependencies:
@@ -636,8 +645,8 @@ importers:
         specifier: workspace:^
         version: link:../../platform/node
       '@types/node':
-        specifier: ^26.4.0
-        version: 26.4.0
+        specifier: ^26.6.2
+        version: 26.6.2
       effect:
         specifier: workspace:^
         version: link:../../effect
@@ -645,8 +654,8 @@ importers:
   packages/sql/sqlite-react-native:
     devDependencies:
       '@op-engineering/op-sqlite':
-        specifier: ^18.1.4
-        version: 18.1.4(react-native@0.83.0(@babel/core@8.0.1)(@types/react@19.2.18)(react@19.2.8)(supports-color@10.2.2))(react@19.2.8)
+        specifier: ^18.2.4
+        version: 18.2.4(react-native@0.83.0(@babel/core@8.0.6)(@types/react@19.3.0)(react@19.3.0)(supports-color@10.2.2))(react@19.3.0)
       effect:
         specifier: workspace:^
         version: link:../../effect
@@ -675,12 +684,12 @@ importers:
         specifier: ^13.0.6
         version: 13.0.6
       yaml:
-        specifier: ^2.9.0
-        version: 2.9.0
+        specifier: ^2.9.1
+        version: 2.9.1
     devDependencies:
       '@types/node':
-        specifier: ^26.4.0
-        version: 26.4.0
+        specifier: ^26.6.2
+        version: 26.6.2
 
   packages/tools/ai-docgen:
     dependencies:
@@ -694,12 +703,12 @@ importers:
         specifier: ^13.0.6
         version: 13.0.6
       yaml:
-        specifier: ^2.9.0
-        version: 2.9.0
+        specifier: ^2.9.1
+        version: 2.9.1
     devDependencies:
       '@types/node':
-        specifier: ^26.4.0
-        version: 26.4.0
+        specifier: ^26.6.2
+        version: 26.6.2
 
   packages/tools/api-diff:
     dependencies:
@@ -710,15 +719,15 @@ importers:
         specifier: workspace:^
         version: link:../../effect
       yaml:
-        specifier: ^2.9.0
-        version: 2.9.0
+        specifier: ^2.9.1
+        version: 2.9.1
     devDependencies:
       '@effect/vitest':
         specifier: workspace:^
         version: link:../../vitest
       '@types/node':
-        specifier: ^26.4.0
-        version: 26.4.0
+        specifier: ^26.6.2
+        version: 26.6.2
       typescript:
         specifier: ^6.0.3
         version: 6.0.3
@@ -726,8 +735,8 @@ importers:
         specifier: npm:typescript@6.0.3
         version: typescript@6.0.3
       vitest:
-        specifier: 4.1.11
-        version: 4.1.11(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.4.0)(@vitest/coverage-v8@4.1.11)(happy-dom@20.12.0)(jsdom@30.0.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))
+        specifier: 5.0.1
+        version: 5.0.1(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.6.2)(@vitest/coverage-v8@5.0.1)(happy-dom@20.14.5)(jsdom@30.0.1)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1))
 
   packages/tools/bundle:
     dependencies:
@@ -736,13 +745,13 @@ importers:
         version: link:../../platform/node
       '@rollup/plugin-node-resolve':
         specifier: ^16.0.3
-        version: 16.0.3(rollup@4.63.1)
+        version: 16.0.3(rollup@4.63.4)
       '@rollup/plugin-replace':
         specifier: ^6.0.3
-        version: 6.0.3(rollup@4.63.1)
+        version: 6.0.3(rollup@4.63.4)
       '@rollup/plugin-terser':
         specifier: ^1.0.0
-        version: 1.0.0(rollup@4.63.1)
+        version: 1.0.0(rollup@4.63.4)
       effect:
         specifier: workspace:^
         version: link:../../effect
@@ -750,24 +759,33 @@ importers:
         specifier: ^13.0.6
         version: 13.0.6
       rollup:
-        specifier: ^4.63.1
-        version: 4.63.1
+        specifier: ^4.63.4
+        version: 4.63.4
       rollup-plugin-esbuild:
         specifier: ^6.2.1
-        version: 6.2.1(esbuild@0.28.2)(rollup@4.63.1)(supports-color@10.2.2)
+        version: 6.2.1(esbuild@0.28.2)(rollup@4.63.4)(supports-color@10.2.2)
       rollup-plugin-visualizer:
         specifier: ^7.1.1
-        version: 7.1.1(rolldown@1.2.6)(rollup@4.63.1)
+        version: 7.1.1(rolldown@1.2.9)(rollup@4.63.4)
     devDependencies:
+      '@babel/core':
+        specifier: ^8.0.6
+        version: 8.0.6
       '@types/node':
-        specifier: ^26.4.0
-        version: 26.4.0
+        specifier: ^26.6.2
+        version: 26.6.2
+      babel-plugin-annotate-pure-calls:
+        specifier: ^0.5.0
+        version: 0.5.0(@babel/core@8.0.6)
+      esbuild:
+        specifier: ^0.28.2
+        version: 0.28.2
 
   packages/tools/docgen:
     dependencies:
       '@babel/code-frame':
-        specifier: ^8.0.0
-        version: 8.0.0
+        specifier: ^8.0.6
+        version: 8.0.6
       '@effect/markdown-toc':
         specifier: ^0.1.0
         version: 0.1.0
@@ -787,8 +805,8 @@ importers:
         specifier: ^13.0.6
         version: 13.0.6
       prettier:
-        specifier: ^3.9.6
-        version: 3.9.6
+        specifier: ^3.9.8
+        version: 3.9.8
       ts-morph:
         specifier: ^28.0.0
         version: 28.0.0
@@ -806,39 +824,39 @@ importers:
         specifier: ^0.0.9
         version: 0.0.9
       '@types/node':
-        specifier: ^26.4.0
-        version: 26.4.0
+        specifier: ^26.6.2
+        version: 26.6.2
       tsx:
-        specifier: ^4.23.12
-        version: 4.23.12
+        specifier: ^4.23.13
+        version: 4.23.13
       typescript:
         specifier: ^6.0.3
         version: 6.0.3
       vitest:
-        specifier: ^4.1.11
-        version: 4.1.11(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.4.0)(@vitest/coverage-v8@4.1.11)(happy-dom@20.12.0)(jsdom@30.0.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))
+        specifier: ^5.0.1
+        version: 5.0.1(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.6.2)(@vitest/coverage-v8@5.0.1)(happy-dom@20.14.5)(jsdom@30.0.1)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1))
 
   packages/tools/doctest:
     dependencies:
       rolldown:
-        specifier: ^1.2.6
-        version: 1.2.6
+        specifier: ^1.2.9
+        version: 1.2.9
     devDependencies:
       '@effect/vitest':
         specifier: workspace:^
         version: link:../../vitest
       '@types/node':
-        specifier: ^26.4.0
-        version: 26.4.0
+        specifier: ^26.6.2
+        version: 26.6.2
       effect:
         specifier: workspace:^
         version: link:../../effect
       vite:
-        specifier: ^8.2.2
-        version: 8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0)
+        specifier: ^8.3.0
+        version: 8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1)
       vitest:
-        specifier: ^4.1.11
-        version: 4.1.11(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.4.0)(@vitest/coverage-v8@4.1.11)(happy-dom@20.12.0)(jsdom@30.0.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))
+        specifier: ^5.0.1
+        version: 5.0.1(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.6.2)(@vitest/coverage-v8@5.0.1)(happy-dom@20.14.5)(jsdom@30.0.1)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1))
 
   packages/tools/jsdocs:
     dependencies:
@@ -853,14 +871,14 @@ importers:
         specifier: workspace:^
         version: link:../../vitest
       '@types/node':
-        specifier: ^26.4.0
-        version: 26.4.0
+        specifier: ^26.6.2
+        version: 26.6.2
       typescript:
         specifier: ^6.0.3
         version: 6.0.3
       vitest:
-        specifier: ^4.1.11
-        version: 4.1.11(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.4.0)(@vitest/coverage-v8@4.1.11)(happy-dom@20.12.0)(jsdom@30.0.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))
+        specifier: ^5.0.1
+        version: 5.0.1(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.6.2)(@vitest/coverage-v8@5.0.1)(happy-dom@20.14.5)(jsdom@30.0.1)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1))
 
   packages/tools/openapi-generator:
     dependencies:
@@ -883,22 +901,25 @@ importers:
       openapi-typescript:
         specifier: ^7.13.0
         version: 7.13.0(typescript@7.0.2)
+      rolldown:
+        specifier: ^1.2.9
+        version: 1.2.9
 
   packages/tools/oxc:
     dependencies:
       '@oxlint/plugins':
-        specifier: ^1.80.0
-        version: 1.80.0
+        specifier: ^1.83.0
+        version: 1.83.0
     devDependencies:
       '@types/node':
-        specifier: ^26.4.0
-        version: 26.4.0
+        specifier: ^26.6.2
+        version: 26.6.2
       typescript:
         specifier: ^6.0.3
         version: 6.0.3
       vitest:
-        specifier: ^4.1.11
-        version: 4.1.11(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.4.0)(@vitest/coverage-v8@4.1.11)(happy-dom@20.12.0)(jsdom@30.0.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))
+        specifier: ^5.0.1
+        version: 5.0.1(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.6.2)(@vitest/coverage-v8@5.0.1)(happy-dom@20.14.5)(jsdom@30.0.1)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1))
 
   packages/tools/utils:
     dependencies:
@@ -913,20 +934,20 @@ importers:
         version: 13.0.6
     devDependencies:
       '@types/node':
-        specifier: ^26.4.0
-        version: 26.4.0
+        specifier: ^26.6.2
+        version: 26.6.2
 
   packages/vitest:
     devDependencies:
       '@types/node':
-        specifier: ^26.4.0
-        version: 26.4.0
+        specifier: ^26.6.2
+        version: 26.6.2
       effect:
         specifier: workspace:^
         version: link:../effect
       vitest:
-        specifier: 4.1.11
-        version: 4.1.11(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.4.0)(@vitest/coverage-v8@4.1.11)(happy-dom@20.12.0)(jsdom@30.0.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))
+        specifier: 5.0.1
+        version: 5.0.1(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.6.2)(@vitest/coverage-v8@5.0.1)(happy-dom@20.14.5)(jsdom@30.0.1)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1))
 
   scratchpad:
     dependencies:
@@ -942,6 +963,9 @@ importers:
       '@effect/ai-openrouter':
         specifier: workspace:*
         version: link:../packages/ai/openrouter
+      '@effect/ai-typesafe':
+        specifier: workspace:*
+        version: link:../packages/ai/typesafe
       '@effect/opentelemetry':
         specifier: workspace:*
         version: link:../packages/opentelemetry
@@ -1038,16 +1062,16 @@ packages:
   '@adobe/css-tools@4.5.0':
     resolution: {integrity: sha512-6OzddxPio9UiWTCemp4N8cYLV2ZN1ncRnV1cVGtve7dhPOtRkleRyx32GQCYSwDYgaHU3USMm84tNsvKzRCa1Q==}
 
-  '@asamuzakjp/css-color@6.0.5':
-    resolution: {integrity: sha512-mbhpPMmnw/kwW19aRNmSUl1QzLbdGo1SCuE49BT98MNwqF6zaHb3o2owssFc/PEO/4t2UjqtCNwocuDtJornzA==}
+  '@asamuzakjp/css-color@6.0.7':
+    resolution: {integrity: sha512-vC/bk1Lz7Tn/EfU9/apOTBk80/8dyGyWMowPoV1tJ52muDGsDqt2HPT2klrFUiY60MQmQv9q8yIht15JnBgDGw==}
     engines: {node: ^22.13.0 || >=24.0.0}
 
-  '@asamuzakjp/dom-selector@8.3.0':
-    resolution: {integrity: sha512-UJLfKXBhrc8i1vH2eJXuYQMwlsLKWFw3O+CPqXSuVEiikeAim3UgrfWX0k4tA/X8cRFM8iZ7OaqBokFGbYusdg==}
+  '@asamuzakjp/dom-selector@8.3.2':
+    resolution: {integrity: sha512-93Z1N+BQNXysodoicpOIyNh2drHfz/CTf9nnT0FEx72GJcIiwgydD7tGAr78j41LsYn3hlRn+LdGPuBLn1Bl8Q==}
     engines: {node: ^22.13.0 || >=24.0.0}
 
-  '@azure-rest/core-client@2.8.0':
-    resolution: {integrity: sha512-F1ybHeN+++QhyFCF/ehLUEvrOB6fehPdFBFtGdj0C3B2lpQ9zkPiO5JDgsqc6IfjuUe6b3dAbXK0a7+VgSGfhw==}
+  '@azure-rest/core-client@2.9.0':
+    resolution: {integrity: sha512-6933vNLqh06RR7rumnrq3UZIeBtRLeBHDPMrieDPIljiCaMMwt0nRw++nd3TOxiohtasNtm29rC+b/9ZVKCOqg==}
     engines: {node: '>=22.0.0'}
 
   '@azure/abort-controller@2.2.0':
@@ -1058,8 +1082,8 @@ packages:
     resolution: {integrity: sha512-IUZydyTUkDnYdstOW9pFOOUQlBjAepK5teihDE3x6yxsPJs/hsAaaYpeGxdxrgtOiJbBKSjKW7MDk7AEhb4LRg==}
     engines: {node: '>=22.0.0'}
 
-  '@azure/core-client@1.11.0':
-    resolution: {integrity: sha512-JjQWO6akOck45PH/XBrxzsQGAiKrfFl4m5iggJ0ItMIz5omRufOXWpqCPpdjKN3vKDzlSUvFjaMb7Zwf0gvAdA==}
+  '@azure/core-client@1.11.1':
+    resolution: {integrity: sha512-2QygG2F76ZpMP2eMztiJvAiFMu71M9rDeU7vO/QKg5Css7MgM4frUOslFjhVjRhbGaCNPtz/S8M6y46/fFKVuQ==}
     engines: {node: '>=22.0.0'}
 
   '@azure/core-lro@2.7.2':
@@ -1086,8 +1110,8 @@ packages:
     resolution: {integrity: sha512-9n2pWK61veAuN0V20t9lOuoV4CFMdyAZ1ygZzvBGk/pBBJRib/PjL9PLXa/aI2CcPpyHfqVsxxqLCYl6uZlfDw==}
     engines: {node: '>=22.0.0'}
 
-  '@azure/identity@4.13.2':
-    resolution: {integrity: sha512-NXL2/pCJctLxgw8bvrwwgge743kEq8LBT+O1pmV0vyUwetzFPH9auP6jhkU/cgZCPPtWoewAe3ncaGCgPo07fA==}
+  '@azure/identity@4.13.3':
+    resolution: {integrity: sha512-zGQPtqvXPgSA8yfV2CkIQ1qirqk0p9AIVpC5uEkdXQYcKl07QHvyaGYRnZOk0AsQUmxNb4wfkcwY5di8Z5xa9A==}
     engines: {node: '>=22.0.0'}
 
   '@azure/keyvault-common@2.1.0':
@@ -1102,24 +1126,20 @@ packages:
     resolution: {integrity: sha512-rbAE25KUfjU/s3XHUdJgceoCP5dEOpMx85J04kF+QMdta73XkuG9JGHHinch+XIoKpBdqljin+KqURpJriSzLA==}
     engines: {node: '>=22.0.0'}
 
-  '@azure/msal-browser@5.20.0':
-    resolution: {integrity: sha512-mtOKr708E/E/+qhI50QufmhR8GS5C84IeFGEaH/guMOaPXT9B/obEt8TVzX5U8j5OEUgukn0PrRmwVKaigr2wA==}
-    engines: {node: '>=0.8.0'}
-
-  '@azure/msal-common@16.13.0':
-    resolution: {integrity: sha512-rOAy0KUcyBbdwVJ+f3uPpthXatFLLZN+/KWAsTLzk1aB23Xl9DRmmXYwSvBFOZyXj4jUQQ5FKxxRkhAFW1fOow==}
+  '@azure/msal-browser@5.22.0':
+    resolution: {integrity: sha512-5kgu9xeEKgGc2JeidxAtU15NJTqiH/CMCRRQAJ4Rac56kB7KVg91vbNmn+z3RO1vNomPN69UvjKG9h1Pghx6dQ==}
     engines: {node: '>=0.8.0'}
 
-  '@azure/msal-common@16.14.0':
-    resolution: {integrity: sha512-A4rb55hI86Q9tBl/+jBj7TMz7iX2RFgQs/nExFzcAtoI/BFRVdaH5SL/MivrYD7qvweMpN8AgVvVMHV8UBYxew==}
+  '@azure/msal-common@16.14.1':
+    resolution: {integrity: sha512-Or6xhPNyi4zHW25158yxBoyxuCqNSPa5YBVqfF1J5Ks4MJWBo/USXdp05DQIPu1Zli00YZu6t0+h6KvHJealxQ==}
     engines: {node: '>=0.8.0'}
 
-  '@azure/msal-node@5.6.0':
-    resolution: {integrity: sha512-uFY9NxrWHw8PwZx7gAX6PDn+9vdfS05+levc/kwkx77IkjfaldnQbbcQzzDIZ5Hq5Zdr6/z92oAIoRWKp6MnOA==}
+  '@azure/msal-node@6.0.1':
+    resolution: {integrity: sha512-ixSO1Y/kCVRthRs+hSx/5qkwaunX1/RAePhlMN0wIpIQ4WEZ6AREGGnGd1AP0qspHVsAwzWQKGubpjh50JyJIQ==}
     engines: {node: '>=20'}
 
-  '@babel/cli@8.0.4':
-    resolution: {integrity: sha512-mgg9G7dJw7xzx/0Sn8eWQkDpEcQrlDdEV4Y4Ii+8Oay88+lK45vNuSavRUj4g+e5Yfw4tkH4U3ObBFOMJhy4oQ==}
+  '@babel/cli@8.0.6':
+    resolution: {integrity: sha512-um8l/siZ6XioGNxbmEry1Z3u77Ye6bkDkg6lXewtZDacGNC+MLh85CWcnMV/A12i4eh77HkhkSKVlZtk4JsucA==}
     engines: {node: ^22.18.0 || >=24.11.0}
     hasBin: true
     peerDependencies:
@@ -1129,32 +1149,32 @@ packages:
     resolution: {integrity: sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/code-frame@8.0.0':
-    resolution: {integrity: sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==}
+  '@babel/code-frame@8.0.6':
+    resolution: {integrity: sha512-uMHhvmDmwFiLuiozaoRYTZHqMFuu3fem/X9JY78lohAuLoh8LSGGC8JqUzo2cVuBsBxkjMZNk56CE7ock8Xxkw==}
     engines: {node: ^22.18.0 || >=24.11.0}
 
   '@babel/compat-data@7.29.7':
     resolution: {integrity: sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/compat-data@8.0.0':
-    resolution: {integrity: sha512-DOjnob/cXOUgDOozCDeq/aK2p5y8dUIVdf6tNhEV1HQRd6I8aQ4f4fbtHRVEvb6lP3BGomrKHiS8ICAASSVQSw==}
+  '@babel/compat-data@8.0.5':
+    resolution: {integrity: sha512-YLsYoQMvL8l8WrGpN3Zj7O1wK5LEBN+cQtux7BcuHyxIXve724XG+zuJ1n3U1cUweRtTzQOA4IHbuQw3N34SZw==}
     engines: {node: ^22.18.0 || >=24.11.0}
 
   '@babel/core@7.29.7':
     resolution: {integrity: sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/core@8.0.1':
-    resolution: {integrity: sha512-5FgxM4dLQpMJHSiVATk8foW263dVHQHBVpXYiimNECVWG01f4nFyEbQixeT6Mwvg7TayREJ2gpKl3o2RoMdnqw==}
+  '@babel/core@8.0.6':
+    resolution: {integrity: sha512-5zwYt1V4ji3mXKKRIAkohSJ29WepxNwxQi+7y7P5AcVPh1dcxnZBU2cfxHnPwS+u9+lZnXPsv30TQaF2xg+Tfg==}
     engines: {node: ^22.18.0 || >=24.11.0}
 
   '@babel/generator@7.29.8':
     resolution: {integrity: sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/generator@8.0.0':
-    resolution: {integrity: sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g==}
+  '@babel/generator@8.0.6':
+    resolution: {integrity: sha512-/pcanjdRsonCexCuxgGD8fKnBLLzk2i9uM4kmcmGyyev2R5YDs+rafMYZ89RvaGY1mW8T7C5au0TyYaEeHBGng==}
     engines: {node: ^22.18.0 || >=24.11.0}
 
   '@babel/helper-annotate-as-pure@7.29.7':
@@ -1165,8 +1185,8 @@ packages:
     resolution: {integrity: sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-compilation-targets@8.0.0':
-    resolution: {integrity: sha512-JwculLABZvyPvyLBpwU/E/IbH2uM3mnxNtIJpxnIfb24y1PrdVxK5Dqjle4DpgqpGRnwgC7G8IkzPdSXZrO1Ew==}
+  '@babel/helper-compilation-targets@8.0.6':
+    resolution: {integrity: sha512-HTrtZ4+iA0+kzdbCgvdSk1U4pEl3BvpGnlUbualCGNbrVhhQvhgBzurTUmqpWyvyHbWYWaIfdx2mOlL9LJjsew==}
     engines: {node: ^22.18.0 || >=24.11.0}
 
   '@babel/helper-create-class-features-plugin@7.29.7':
@@ -1179,8 +1199,8 @@ packages:
     resolution: {integrity: sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-globals@8.0.0':
-    resolution: {integrity: sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==}
+  '@babel/helper-globals@8.0.6':
+    resolution: {integrity: sha512-OdnA/N52LhzFpeUuVz5YGuSWjc7TPHiFmVYZbPlSgExocO2GwbxVpSni9MVs5wwW+wZ4kPuwBEBN9pIPDYz1mA==}
     engines: {node: ^22.18.0 || >=24.11.0}
 
   '@babel/helper-member-expression-to-functions@7.29.7':
@@ -1201,8 +1221,8 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/helper-module-transforms@8.0.1':
-    resolution: {integrity: sha512-UgAhl1kqiW5ciE0yCXqqvnb4H2n3IELJ7lIIQRezwDPilPEZX5i+Rvbja9MFTkwUn2biEiSMeV31aUzR4Lwakw==}
+  '@babel/helper-module-transforms@8.0.6':
+    resolution: {integrity: sha512-YUi+3X0cb0v97xKhuqkLdrwQtP6XXv1eVbhLRCFyMwG481UskbMQk4mjH7K/Jg3oJ1KLskvFwwq4kF/QnABkWQ==}
     engines: {node: ^22.18.0 || >=24.11.0}
     peerDependencies:
       '@babel/core': ^8.0.0
@@ -1235,16 +1255,16 @@ packages:
     resolution: {integrity: sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-string-parser@8.0.0':
-    resolution: {integrity: sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==}
+  '@babel/helper-string-parser@8.0.6':
+    resolution: {integrity: sha512-+6HYEBnsDRZHJtUTAEfMQd0zMDqdFHS7C+5vAsEZqBUr3vEMWOWlHJ0Jz1gS8jJIlCvLsuA6ivmeoqzH936YcA==}
     engines: {node: ^22.18.0 || >=24.11.0}
 
   '@babel/helper-validator-identifier@7.29.7':
     resolution: {integrity: sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-validator-identifier@8.0.4':
-    resolution: {integrity: sha512-4wFaiLd0bVo4cIoTXI3zKI038NIWE/cr3jvBjejOVYVxV/m8Ltav1USiGzG1fmS5J2RhgEOgXNNK46cRPnRsrg==}
+  '@babel/helper-validator-identifier@8.0.6':
+    resolution: {integrity: sha512-HYx0YmuchRxRSpnjvcNffnPS8DCauKNmnumIuHG3jnQAVewRA7kfJGwF13ayEpSZs7s4R/oBH4eppuXcAQd5JQ==}
     engines: {node: ^22.18.0 || >=24.11.0}
 
   '@babel/helper-validator-option@7.29.7':
@@ -1259,17 +1279,17 @@ packages:
     resolution: {integrity: sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helpers@8.0.0':
-    resolution: {integrity: sha512-wfbi91pM3py96oIiJEz7qIpyXDytgr9zQC1HEWwlGNVRAEmItuU/0a41ZUKu1sJGyhhOIpc4t5vk4PYzt8wpsg==}
+  '@babel/helpers@8.0.5':
+    resolution: {integrity: sha512-fQtPOXjYOYv85PIdwotp2TJGVYOycX0PQq+l844fFAxOULtBy8BVF35GyeueX0r4KvDthqPH5xAI1clQPk/2uA==}
     engines: {node: ^22.18.0 || >=24.11.0}
 
-  '@babel/parser@7.29.8':
-    resolution: {integrity: sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA==}
+  '@babel/parser@7.29.9':
+    resolution: {integrity: sha512-CjXrNHTnvqBVqHgdBysY3vk2T8tpJHb5/RMeHJBTyVa9xgugCB0CJTx/3oO8RV2QRQP391RWpB7D6hLjm8V9uA==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
-  '@babel/parser@8.0.4':
-    resolution: {integrity: sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==}
+  '@babel/parser@8.0.6':
+    resolution: {integrity: sha512-LpGDIYJAzc3Y3PT9x+FxBrGYu2PlWxLmyN7SwPTzaX0LSwEmFJBsRnPBqmaXF2r1v+Zhz6lNiEJ+7yKtM5+Ugg==}
     engines: {node: ^22.18.0 || >=24.11.0}
     hasBin: true
 
@@ -1418,8 +1438,8 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-typescript@7.29.7':
-    resolution: {integrity: sha512-jK52h8LaLc7JarhQV2ofeFMts4H7vnOXnqZNA6fYglBTZewRBE51KWt3BUltW1P+KoPsYkHoJeXePuz4zo2LMw==}
+  '@babel/plugin-transform-typescript@7.29.9':
+    resolution: {integrity: sha512-FFwIwzU+7SCOuxxV4YtJql6T9981ZVTm+FHO5GhVsRqCTdy0WwrEZh3l42ARpXruJUDGOptdduHW6Zr7pNPLNg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1458,16 +1478,16 @@ packages:
     resolution: {integrity: sha512-I5z7H3bf/41ktsNVLtpN0wAa336HkqIHQ5BuPLEhTkt1jVSyZpeNKIzTgEWmlxjdg81R0IgUCcaE+Ok3NvrfZg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/traverse@8.0.4':
-    resolution: {integrity: sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==}
+  '@babel/traverse@8.0.6':
+    resolution: {integrity: sha512-ilYV+qLStGzSKLipJlETdvdtpK3rAuwfCmCoGKv15MU4EoeIuLkespSNoNLFGOPSciEHx9TLWtN5mv0fz5w5mQ==}
     engines: {node: ^22.18.0 || >=24.11.0}
 
   '@babel/types@7.29.8':
     resolution: {integrity: sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/types@8.0.4':
-    resolution: {integrity: sha512-eY+Yn3dCqTGmyiq2QRU66lA5FL8lqqqvecHt0fF3uHONIa7ToYsaCiWV8lOKqAs0Rb2SjixiKFROngnulPtt2g==}
+  '@babel/types@8.0.6':
+    resolution: {integrity: sha512-c+xgSWboV2pdwXP67BUWDVRHi2BO5Q3KwxyFVs7taVTY+fsK47/L51ZXQoV9rozHJDNHvJ4v4WEsI/IlxV2l2A==}
     engines: {node: ^22.18.0 || >=24.11.0}
 
   '@balena/dockerignore@1.0.2':
@@ -1477,9 +1497,6 @@ packages:
     resolution: {integrity: sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==}
     engines: {node: '>=18'}
 
-  '@blazediff/core@1.9.1':
-    resolution: {integrity: sha512-ehg3jIkYKulZh+8om/O25vkvSsXXwC+skXmyA87FFx6A/45eqOkZsBltMw/TVteb0mloiGT8oGRTcjRAz66zaA==}
-
   '@bramus/specificity@2.4.2':
     resolution: {integrity: sha512-ctxtJ/eA+t+6q2++vj5j7FYX3nRu311q1wfYH3xjlLOsczhlhxAg2FWNUXhpGvAw3BWo1xBcvOV6/YLc2r5FJw==}
     hasBin: true
@@ -1508,8 +1525,8 @@ packages:
       core-js: ^3.0.0
       lodash: ^4.0.0
 
-  '@changesets/apply-release-plan@8.0.0':
-    resolution: {integrity: sha512-kUd2pbf1w5/AYmBMb0Tt+rkIPCjFJdT0SZMrkOjJT/WV/QbtmvkyB5jkV0oaNPheavprZk+SfUiozUti7TIL2w==}
+  '@changesets/apply-release-plan@8.1.1':
+    resolution: {integrity: sha512-nk2Hbq3M9NeHMdaIRBDvawKrQJzXB9sGyBUE5yWnIKtvdcNCPj75zBekJYr0gTT2ecJH3eFeTrc8eisPImcv0Q==}
     engines: {node: ^22.11 || ^24 || >=26}
 
   '@changesets/assemble-release-plan@7.0.0':
@@ -1520,17 +1537,17 @@ packages:
     resolution: {integrity: sha512-3Dst2Ime2Op5nd4XmWJLPIgp11ZFqJqSkVug9izK6TDcIV4YlhPS4ECbEVR+eGI0bk0r1ItogD4j2Oli87bJrA==}
     engines: {node: ^22.11 || ^24 || >=26}
 
-  '@changesets/changelog-github@1.0.0':
-    resolution: {integrity: sha512-PNCSH5CGJrqOKxRjrMp2NLhceQv2QBs6HkjrLvYQqsEE2/ItN5R8GD/mskZZluoNWYvjPYFsY9T6swXfp5E0UA==}
+  '@changesets/changelog-github@1.0.1':
+    resolution: {integrity: sha512-QUcrV7878yHlWPXXPA6gqSxNKwtVHCd1K22L7ZAoJw2yGy8K4QvjwOStD75+1Q9KD9ZSUgGS94HuYdd7HOVtpA==}
     engines: {node: ^22.11 || ^24 || >=26}
 
-  '@changesets/cli@3.0.1':
-    resolution: {integrity: sha512-3IVpRSgiKDj2aRbBHKtWTXSRH2/iR3bWxau9iQUoEsZjDhRIj9nhl90k7FWMxZAJvLgJBbgMq8+qS0xQsenYsQ==}
+  '@changesets/cli@3.0.3':
+    resolution: {integrity: sha512-L1i67bMfkK6iC/kDejuNO4pFgTRcWIObsD6Qof2woP1I4M8tj17DGlcpRaTzTv1DYSP5EMwWdEtR8X0Pj5Jg3Q==}
     engines: {node: ^22.11 || ^24 || >=26, npm: '>=10.9.0', pnpm: '>=10.0.0', yarn: '>=4.5.2'}
     hasBin: true
 
-  '@changesets/config@4.0.0':
-    resolution: {integrity: sha512-mw95/YrkOuhZZxfnVAA4bSXOFUi+KlhzOBTM8C4x777NhUU6HWIl9Z+K+nME+E4PVsv5NQVQwTfiHihAS1A/ow==}
+  '@changesets/config@4.0.1':
+    resolution: {integrity: sha512-PxpxSQLQSLDjceAgRq+4FWlU+HflDIw03mmPVipxoQx9xrXFUjmqTy3SE+n/2t+DqPdpPiLWVr5NRiLZvjyLwg==}
     engines: {node: ^22.11 || ^24 || >=26}
 
   '@changesets/errors@1.0.0':
@@ -1545,12 +1562,12 @@ packages:
     resolution: {integrity: sha512-ji/t5wFA1zREKXRUePE6Qi+Qu2UgxCeSSGQrphezwvQZrp49B7sJ+8+wvM0tA7zPeSxYKCojDy3WWgrl+s+awg==}
     engines: {node: ^22.11 || ^24 || >=26}
 
-  '@changesets/get-github-info@1.0.0':
-    resolution: {integrity: sha512-nf5zPSqEKW0eXiJ4ltbjyIQ/srUHfxbghkLCjKdOLI3LehKXhiqxXcpja39eGPaj6qqGx2lFCrLJ7VWYUf9H2w==}
+  '@changesets/get-github-info@1.0.1':
+    resolution: {integrity: sha512-ifLQCky/ZtDgZ4xCiUMjnLZSJ8xk52iIzMJbBBPlZWjr2CiTNTaTDddIVWKicrUAdWuLWL7PUw2fNa1yPwLpIg==}
     engines: {node: ^22.11 || ^24 || >=26}
 
-  '@changesets/git@4.0.0':
-    resolution: {integrity: sha512-uIEswpPUgzBBqrC0qg13byNaPorzhf05LE2T+gRizEKCXvMsJC6NPJp5iNDSV/gYj4Viqh09UiOF5E7XWeH5lQ==}
+  '@changesets/git@4.0.1':
+    resolution: {integrity: sha512-6vWpIAC4LkpmlqaIu37ViT5enyd9+uBwAiGqCGhASvkSHBgx4PrtTGXWTMFYpDmZbjgyonyVgMciPrW4MqtJsA==}
     engines: {node: ^22.11 || ^24 || >=26}
 
   '@changesets/parse@1.0.0':
@@ -1561,8 +1578,8 @@ packages:
     resolution: {integrity: sha512-Zm/6YliV/a2oeWTqHJf6KxLrQwgcK1i/BRDl2m0EKZvbnxV5fG9QRhwJJGshjsZTUTS6dkfURQ2K6aAvgNw/3Q==}
     engines: {node: ^22.11 || ^24 || >=26}
 
-  '@changesets/read@1.0.0':
-    resolution: {integrity: sha512-8TdE2PwG6yArPt5Ozej83Z6iHz1G8BDBKvIEKZ455MccR4K3GNbLR2XqjBxa+5yLFnEd3xAOPXYboBg1pt8stQ==}
+  '@changesets/read@1.0.1':
+    resolution: {integrity: sha512-nzvSC6RcTiWf/dsuwZFXpLzGGsRHYCL68U3uHV7srsulU93aVWY7u2GEJiDZ+4GIIElfaW5EqtKC0UHroY+LTQ==}
     engines: {node: ^22.11 || ^24 || >=26}
 
   '@changesets/should-skip-package@1.0.0':
@@ -1577,68 +1594,68 @@ packages:
     resolution: {integrity: sha512-q/ThtP9gcnEP6xlv7LrY26C2mHqdGBti/MmOVngt/M/oIGYkssmQGxPK9WzBNt2juVcH/vml2WQ+ra8LXYOTaA==}
     engines: {node: ^22.11 || ^24 || >=26}
 
-  '@clack/core@1.4.3':
-    resolution: {integrity: sha512-/kr3UWNtdJfxZtPgDqUOmG2pvwlmcLGheex5yiZKdwbzZJxhV+HMNR9QNmyY5cGwTNV6LrR7Jtp+KjhUAP1qBQ==}
+  '@clack/core@1.5.1':
+    resolution: {integrity: sha512-iHTrHA8MtVuLl2TfZySmcKv1qO2PoyC9Z7pfSDozEuV5vtY3/wcOPKJXlqJ5Oq2Cx5DDGQGAMVx6HZfRRoVEbQ==}
     engines: {node: '>= 20.12.0'}
 
-  '@clack/prompts@1.7.0':
-    resolution: {integrity: sha512-y7/yvZ2TPAnR9+jnc00klvNNLkJiXFFrQA/hlLCcxA9a2A4zQIOimyFQ9XfwYKiGD1fb5GY8vbKIIgO8d5Tb2A==}
+  '@clack/prompts@1.8.1':
+    resolution: {integrity: sha512-dlT1m5e/0yUL0kRNcQn7yGLVThkgbB0Ga/1AmfDDC/8ik6AIiSf2QLQO2zPYvefsHP0aFgxO93cVLCCfDp7kzQ==}
     engines: {node: '>= 20.12.0'}
 
   '@clickhouse/client@1.23.1':
     resolution: {integrity: sha512-vs3/Zc1dHvT171btW5nMoPsPCJ6QVJ5pp7obxzO5sjqwFx/jjz9wwCAqcFOdc2DhprugDBaVn+4dVY8hG3A9nw==}
     engines: {node: '>=20'}
 
-  '@cloudflare/workerd-darwin-64@1.20260828.1':
-    resolution: {integrity: sha512-CVd+xPhqUESg8Xhq09TZx0wl4FSirfJGOzvbPz2yHhBIvmNHFFQkSN3rkd7wEwnhQQk37Xi0/aD6ykPLJbmGiQ==}
+  '@cloudflare/workerd-darwin-64@1.20260918.1':
+    resolution: {integrity: sha512-H5Em6Wd0jjxaloYh2rp+WLBl2eWbkk7nSP1svGt6K1RSv/rNVqmKdpjZPJTBSavOmeYGa88qvtOWwS+33OHTqQ==}
     engines: {node: '>=16'}
     cpu: [x64]
     os: [darwin]
 
-  '@cloudflare/workerd-darwin-arm64@1.20260828.1':
-    resolution: {integrity: sha512-5HDPXRM152vU5JveByGFk34X57TVyIsfp4cabepAf45DC0MKvm52ucJqAjW1h8bvW4X+zRw9GU35OHF9FEC9Ww==}
+  '@cloudflare/workerd-darwin-arm64@1.20260918.1':
+    resolution: {integrity: sha512-CR9JRZEQo93fNgBVF4Df2H2/VYO4n7rxSseSwCVv3bJQEb0huADUSCj2FK4ipxar8ToOEB4wawyw0vJo5U/rQQ==}
     engines: {node: '>=16'}
     cpu: [arm64]
     os: [darwin]
 
-  '@cloudflare/workerd-linux-64@1.20260828.1':
-    resolution: {integrity: sha512-MQ1Ll9P7F72HHUKizbb7BlDfbY8fRoNMpbIpZoU6uKsSkneFICWSKv6UlgU9EQZ+w0i7TMa12iUgJ8l29eRI9A==}
+  '@cloudflare/workerd-linux-64@1.20260918.1':
+    resolution: {integrity: sha512-UQ2nnY3qpXLzQ80frmWO+8HvtqyWaQILe8QYZwpemdjT+sqwCz4Dz+0/WVkFco0v/04kIIqikVeLTY/7gEhmkw==}
     engines: {node: '>=16'}
     cpu: [x64]
     os: [linux]
 
-  '@cloudflare/workerd-linux-arm64@1.20260828.1':
-    resolution: {integrity: sha512-FBTaUQ1xcU9jcp4OyBPcH8x0QiFvc1iuZL2GkD8zp2q1WyTVHYOptRDQUU+cuHjt0rQ2EIKVPBjahPxfa0joBw==}
+  '@cloudflare/workerd-linux-arm64@1.20260918.1':
+    resolution: {integrity: sha512-4rib51MaLNWweUIUxM/Xj558M5QmyZoBSf0ffv+lYah5VTrvwnez3XGxX72pElnBKHROvAPOi5msQ5Ts8JSI0A==}
     engines: {node: '>=16'}
     cpu: [arm64]
     os: [linux]
 
-  '@cloudflare/workerd-windows-64@1.20260828.1':
-    resolution: {integrity: sha512-yvr77hC7dUbvK5K+SCg062kkPq3sx+drV1PcgHslzHDYcJBtT0V3X80qLE49LW1vq2svaeNmsVQS+vHsqWu8cQ==}
+  '@cloudflare/workerd-windows-64@1.20260918.1':
+    resolution: {integrity: sha512-sATrMx5ShYYgmgUGrcTmvsFSJBFuN95NEkX3xwb1qk8w1A6h5N11sea7yN2IeibwPyPmXKjWNjXOno0hZAM71Q==}
     engines: {node: '>=16'}
     cpu: [x64]
     os: [win32]
 
-  '@cloudflare/workers-types@5.20260829.1':
-    resolution: {integrity: sha512-SsH4G9+JePvrBmz+b5Dl67LQ9w2/ycoIpAPcAkfg2aEs2SEisQHk7/AY0TymSXEBbDbWgcBqoLe4hNcuY3CxWA==}
+  '@cloudflare/workers-types@5.20260919.1':
+    resolution: {integrity: sha512-xUdKJoTHhNcXwnBrfrM1STkzm3oSUc9cRVzP8fO5NyJZ/UtnDnWZHDk9z8IkTnbC2WRWFAS87HICmqZhbHDvQw==}
 
   '@cspotcode/source-map-support@0.8.1':
     resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
     engines: {node: '>=12'}
 
-  '@csstools/color-helpers@6.1.0':
-    resolution: {integrity: sha512-064IFJdjTfUqnjpCVpMOdbr8FLQBhinbZj6yRv2An2E41O/pLEXqfFRWqGq/SxlE5PEUYTlvWsG2r8MswAVvkg==}
+  '@csstools/color-helpers@6.1.1':
+    resolution: {integrity: sha512-gLNsunvwf3mCi5u5o46/Z/JcJMnhbHSaZ69rkgPzNM3J4s8hWwpPUQB6/tt0EDFyCiWzxANlx+2LJwpYj4zS1w==}
     engines: {node: '>=20.19.0'}
 
-  '@csstools/css-calc@3.3.0':
-    resolution: {integrity: sha512-c5ihYsPkdG6JCkU2zTMm4+k6r7RXuGxtWYhu5DHMIiF1FHzrfmHL5so11AoFpUv/tu61xfcmT4AmKoFfMPoqdQ==}
+  '@csstools/css-calc@3.4.0':
+    resolution: {integrity: sha512-XQKj5B7QiZcHiegCOCAzcAOJdhGgWOHbbu62h5e5mkHnn8lWcfiJhllkqWmxu5zWR9jucPHuo1iTB56P033hcg==}
     engines: {node: '>=20.19.0'}
     peerDependencies:
       '@csstools/css-parser-algorithms': ^4.0.0
       '@csstools/css-tokenizer': ^4.0.0
 
-  '@csstools/css-color-parser@4.1.10':
-    resolution: {integrity: sha512-UZhQLIUyJaaMepqehrCODwCg2KW25vFvLWBmqYFaPclYvvxzj/sG8LBOhBFCp11i9uE7t1EyS+RAoV9tztPFyw==}
+  '@csstools/css-color-parser@4.2.3':
+    resolution: {integrity: sha512-y4LpL+lmpuyKDiEFq2PnZUVFdAjsoB/qQJod79yLNokXyW7jewi+/WJ69EfItj8A2unWtxXnGjw6LYXgXu5ZjA==}
     engines: {node: '>=20.19.0'}
     peerDependencies:
       '@csstools/css-parser-algorithms': ^4.0.0
@@ -1650,8 +1667,8 @@ packages:
     peerDependencies:
       '@csstools/css-tokenizer': ^4.0.0
 
-  '@csstools/css-syntax-patches-for-csstree@1.1.7':
-    resolution: {integrity: sha512-fQ+05118eQS1cofO3aJpB5efgpBZMvIzwr/sbC8kDLVA5XLG8q1kJV5yzrUAI1f7lvhPnm8fgIjzFB8/O/5Dig==}
+  '@csstools/css-syntax-patches-for-csstree@1.1.14':
+    resolution: {integrity: sha512-HpbVXyrofRXpHpgkNIjU/3EWR4WJvOkO3emNK/L6X/mTJU7bGUI3AkkpoTNXznQLp0KRjLHELTGeKI5dIkI9JQ==}
     peerDependencies:
       css-tree: ^3.2.1
     peerDependenciesMeta:
@@ -1670,87 +1687,87 @@ packages:
     resolution: {integrity: sha512-Xc3VhU02wqZ1HvHRJUwL09HkZSTvidqY5Ya0NXBSYOxAp+Ln9dcJr9fySI+CkONzP3PekQo9WdzCv0PGER/mOA==}
     engines: {node: '>=14.17.0'}
 
-  '@dprint/android-arm64@0.56.1':
-    resolution: {integrity: sha512-+tvgCtqraz5ws3et615SZThgrLtH0KV5c9beC/FK/5WW0HxvFad8vl1EyiC6Emo4/J6FFbh6c9H8DLK41QNKFg==}
+  '@dprint/android-arm64@0.57.4':
+    resolution: {integrity: sha512-vpafWVSNbB5ShCThZC3O5xOPsdxc2oeLedFVCsscSRf/iR6WZ62ROU2AGcxsJyE2y4/vxivejenbNYjWxL24sQ==}
     cpu: [arm64]
     os: [android]
 
-  '@dprint/android-x64@0.56.1':
-    resolution: {integrity: sha512-zw3qY+8z1eaPDog6XgpBJOJAfsJXapbtysxXf/VBPEk1FEYG/alrYpP0McjtlURys6lRrea8aQrIH+noatR/wg==}
+  '@dprint/android-x64@0.57.4':
+    resolution: {integrity: sha512-Zv2I12Zs9IK8yv1wdXGWluUram9h8Acy3NuF/7WzsxIfdlmnWzUGxoc4Z0dno6aJpv0ViXybkIHPvDKrQnvxVA==}
     cpu: [x64]
     os: [android]
 
-  '@dprint/darwin-arm64@0.56.1':
-    resolution: {integrity: sha512-1U2qE8i0Np5bY7aB+Mq6DqIwI/DQgR4haQFR0ixxsQ9gXQSVe8YQTzM33Kw65V5FVwTn5sNcaqjlm0mYTLt56w==}
+  '@dprint/darwin-arm64@0.57.4':
+    resolution: {integrity: sha512-2V1BzlP+5aLxMaq77MUn2EdRX+UtOq34QjyMwpq1wQkR5MAT2cglJro4Eh1tsI+btjt3FMsX4/PLvz6eUSLl3g==}
     cpu: [arm64]
     os: [darwin]
 
-  '@dprint/darwin-x64@0.56.1':
-    resolution: {integrity: sha512-88tW6kuSoJ1VjoEI/1PSLuCsed5+84YyARzz8Kyata4chP8HgEwTT7A61gWgTdLNJEj9v+MmhbiqsnK/yJn/2A==}
+  '@dprint/darwin-x64@0.57.4':
+    resolution: {integrity: sha512-dQfzBLBQro1O+CxIkIVc9LJqgYsWCKXTf+3QA0Gq/NjW6KPBwlbiCquew3UOeWwGEvarNSA0/Rvz5J8HnykTPA==}
     cpu: [x64]
     os: [darwin]
 
-  '@dprint/linux-arm64-glibc@0.56.1':
-    resolution: {integrity: sha512-XJHlFlZpcZTjs2442W01GzE63GqiMFvXnFAiW/6ewjSl7U/NupxvqlyJDVhUxgfEgApEfETkn8WxBBUlErQh4A==}
+  '@dprint/linux-arm64-glibc@0.57.4':
+    resolution: {integrity: sha512-zFCgx2E2szEnMgtBCKiI/G5vV5mi7rnTVDMB2FrIa6JheqF8pgfrx6m3HWzIed74cFM3/KCH0LmIfCNZT5vRfw==}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@dprint/linux-arm64-musl@0.56.1':
-    resolution: {integrity: sha512-HlX5HRc4Ht3BCejbs78QacfWZuDbqVEilqEQSQzQXsFiKa4HntdhvuL37rLDVi8FPziSmUm2mniBpxqPC1WfuA==}
+  '@dprint/linux-arm64-musl@0.57.4':
+    resolution: {integrity: sha512-8DV33dU5c5vp/TJJp4Dy/4HYc4r5KidlMJgoiG0S9JMygVGjhrXRNiI/C7M9hLgsamqeLYt4MWfEGKvtgOwoew==}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@dprint/linux-loong64-glibc@0.56.1':
-    resolution: {integrity: sha512-/g9PFXhODtN8zb6Ta4ILmYykF/TXNN7M5ihVfZ/KWgyhLYAyCBS3klohrVLoDhD0bRo6RgYvm3cTRXtxSiQ6Eg==}
+  '@dprint/linux-loong64-glibc@0.57.4':
+    resolution: {integrity: sha512-166HbqGPMiKjCUuaiG6xyKrw8EKFF6vPBcmwFWUYHpZE6ipVVxt1Zen9957FXoxqyA5aspmK72eQGm72dQI2Yg==}
     cpu: [loong64]
     os: [linux]
     libc: [glibc]
 
-  '@dprint/linux-loong64-musl@0.56.1':
-    resolution: {integrity: sha512-jI/RSNdJ096YsP0IfAB5qIOnuNbFZqP4SI+y8iPcaQBsMe1YngkB0jT9eA5XMJgEyWjpeDq9YNoV7SQZWYbIaA==}
+  '@dprint/linux-loong64-musl@0.57.4':
+    resolution: {integrity: sha512-TTNKhwDj4qCWSiP20pdktb/mF0MfjVnXEcCXAd37ll6lx+ri4M5aQKyeyFL1pVGU9msjQv++UTU7MGF9uKfOzA==}
     cpu: [loong64]
     os: [linux]
     libc: [musl]
 
-  '@dprint/linux-ppc64-glibc@0.56.1':
-    resolution: {integrity: sha512-/76IxLsbtGtwtENc0cPIFi7LwG9p5uJdMzVzxxZ69FTCRaobMkaepYfpwv9mxuaLLFp1dubRBoVLT0jt16+wNA==}
+  '@dprint/linux-ppc64-glibc@0.57.4':
+    resolution: {integrity: sha512-kQGTaEoZIk+aHtEltz+nBQ54dhJ3dSxN4jxBOnK2wYCTaMkRnGxfF9Uwc29u/BL3Fw6ieDOJCSHy2VWFZdyctA==}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@dprint/linux-ppc64-musl@0.56.1':
-    resolution: {integrity: sha512-JcixMtCTunVocQvai5zmn8Nm7O/HRihWsmGF6zPrte/BaMaiuTM/j6ATamuYS3FqesTnF1kNfv21C4nrya88tw==}
+  '@dprint/linux-ppc64-musl@0.57.4':
+    resolution: {integrity: sha512-NuhwpDFzyBovfpI3M47eBUju8eCxR7tfrMpPBWXyl9YgX0JeBZt6clOV/fwJ2P3DE/ARD9xoyQSGgHzDoSFlOQ==}
     cpu: [ppc64]
     os: [linux]
     libc: [musl]
 
-  '@dprint/linux-riscv64-glibc@0.56.1':
-    resolution: {integrity: sha512-hgapHq0oRtowyarRi5vtA7/rCWxTMQHK6ZORxSUKxiF4ypiCy+aetLKFERooB6axv1mUPOtEFFmuhA96di2kEg==}
+  '@dprint/linux-riscv64-glibc@0.57.4':
+    resolution: {integrity: sha512-pWBdHK8SKt9IGldbuZGbec37RyQqP4zqsWfpq7iyH+m33f7Aagus5ktvKF85KYfLTewIg+ev3vlxryB9iHBiNA==}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@dprint/linux-x64-glibc@0.56.1':
-    resolution: {integrity: sha512-hsNt9WCD8rt28Fz/kP15CQzmeiSFbr3n0XeyJ5JyfsTXxazpMBY0eAGpMn3o8x+WF74gTF8FOkz3vACPt23xvg==}
+  '@dprint/linux-x64-glibc@0.57.4':
+    resolution: {integrity: sha512-BYrSdjYo+nfUgXqgIbZZQnHvpM6UP7Dipfsuzxs0JmuHZRRkJIPjDdj/Qpbn/5Qv1gC4eV0cZsxRu8B634wkig==}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@dprint/linux-x64-musl@0.56.1':
-    resolution: {integrity: sha512-yvRcYtrQ0gJ0UyQjX9nbon3NTi+sN1pZ6o0QcB0l1QfqiIJZXXTAXrmnUXqjR43fXEjxARjWBE+M6NyYFYxjmw==}
+  '@dprint/linux-x64-musl@0.57.4':
+    resolution: {integrity: sha512-pBRF5Kfv59FLtWYWWKpDLOv2+uTIr/XG2oMuRBiXXZom0b506aMm3zKCZ7z5ELeIYutPpASfkDbHcsyTY0ky6w==}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@dprint/win32-arm64@0.56.1':
-    resolution: {integrity: sha512-yItk0aKrANS3Y7CWEcOt4zAD0c0zdLckqFte6tB2MtijV32wpS56gbUn3cQhcjoD4zuy+YvCuBuxopr5yK43Ew==}
+  '@dprint/win32-arm64@0.57.4':
+    resolution: {integrity: sha512-bGEtcSjl6T4xjwr9nUF5kgd3174NP7yb338+Ulqq5DMYcSN4ibI62eVQKBTuyLWByz56aVOL06dj8pKTUzn+yQ==}
     cpu: [arm64]
     os: [win32]
 
-  '@dprint/win32-x64@0.56.1':
-    resolution: {integrity: sha512-40xoYm0lar2naQ7uxTyziHt4o6GuRsFKzwxgKWvkmFW9RLh+htxsnISn89gDG9HJFDxxa2bVfQQ35oJbAAWWpA==}
+  '@dprint/win32-x64@0.57.4':
+    resolution: {integrity: sha512-P91JJG2sDvK+SvZHdqjKygy7fYABbMH1KYop+WCowyjZUin09977qltdXwJ1vb77Cbi2OD0GWUuAlqO0PjNmaw==}
     cpu: [x64]
     os: [win32]
 
@@ -1767,43 +1784,43 @@ packages:
     engines: {node: '>=0.10.0'}
     hasBin: true
 
-  '@effect/tsgo-darwin-arm64@0.38.0':
-    resolution: {integrity: sha512-CDTPKA0qcL+zqtBcZ0Z6BlvYnSW5MI8fOhFTI5zJUEfqSBwC/ddDHscZN4LBzra6EPR+8UwjNdGRr0wwtKiLJA==}
+  '@effect/tsgo-darwin-arm64@0.45.0':
+    resolution: {integrity: sha512-WUoiEVcm8E19QK6fl63lsssM4dkT9IFnULbmqQ6LBfv7H9uRkpE9S3thj8ZtZ+vl/QY8atwfuaTf+3A1m/kGtQ==}
     cpu: [arm64]
     os: [darwin]
 
-  '@effect/tsgo-darwin-x64@0.38.0':
-    resolution: {integrity: sha512-ghx8p8BzrDGgB444+4S0wU2dtPXPP7AncfdBZCu6brwfksJMNuhgec9TamZrYOUwEYy9OkUQEavOyjGw6xJJ8Q==}
+  '@effect/tsgo-darwin-x64@0.45.0':
+    resolution: {integrity: sha512-s3yz7ZfIzvObXJ/r5xd9sEPxHKC3L+D+yedS1BV2Kpn47Je2svYCNYKxzXIpqFLkNjK+RcOQrcfYbYEpKZZa6g==}
     cpu: [x64]
     os: [darwin]
 
-  '@effect/tsgo-linux-arm64@0.38.0':
-    resolution: {integrity: sha512-SEKZIa1u22xyWOrISQ9fqHR1suHcxxDJ9m6Y8npx5ywmroKLDy/8/t77LNaxLScBYrbZwSFqASJPZJ4XF0RgKw==}
+  '@effect/tsgo-linux-arm64@0.45.0':
+    resolution: {integrity: sha512-N+lyzixtylOOn49demDaqg0kb/U8ISxM10Gphs1pIMSGlqlfqC4inYEoFpYej+f4T/cRlkA11Ue7wJzNz83ePA==}
     cpu: [arm64]
     os: [linux]
 
-  '@effect/tsgo-linux-arm@0.38.0':
-    resolution: {integrity: sha512-+zLIdcSuFMDZUCFJGfPgMOcW8wkjrPpVVzM4tf5P+HQgiSS4hshm2aiKoV1N5fn9rsYTTMwGnfxIVBxBMGGE/Q==}
+  '@effect/tsgo-linux-arm@0.45.0':
+    resolution: {integrity: sha512-f6zL6YbWA9lXdfJ//KOjUz/U3CdGtajKi5NsR/lcQaKfZiJwHfeeLBB3yetF3qbPGSA149/kuMoDMWL13RUH3A==}
     cpu: [arm]
     os: [linux]
 
-  '@effect/tsgo-linux-x64@0.38.0':
-    resolution: {integrity: sha512-6Kx2qqA+FxerWHPjG4eXpm76CB2+/KUpShXGxw+1CkjebhXmkgG3sSKfEUMkQ331PBlmekWRe7Xnnejnwln0Mw==}
+  '@effect/tsgo-linux-x64@0.45.0':
+    resolution: {integrity: sha512-aWt0G8celAxJOis4+xiILkyMP/3J+vukimUhSoCmUAPt8zoT9qhZcN64XYZE7jfqp88ByRdgN9GK1/C7YfPtcQ==}
     cpu: [x64]
     os: [linux]
 
-  '@effect/tsgo-win32-arm64@0.38.0':
-    resolution: {integrity: sha512-jhGtiSb8bjlJcJqtJ4IVdeqep+AHGhDFN+2vqXHLdOMzmRVxCMhYmIda2nCel5UK5vVwhCYifw2JfcoO3f8Vpw==}
+  '@effect/tsgo-win32-arm64@0.45.0':
+    resolution: {integrity: sha512-EAdeV366ja+M4XCx6xjXMv4Xkc0Fgzy4bapa0saDWcGhllNLqJDfOk4lk0BgAEjBUI8+0xC+PXKVB5SMz4EpVA==}
     cpu: [arm64]
     os: [win32]
 
-  '@effect/tsgo-win32-x64@0.38.0':
-    resolution: {integrity: sha512-FjbXqAZqxs9WaRp3XCCUa8ndXDeVibAjeE1EdVAouxB36aMUzEV0ue6LLH8zVaqqR+zxf1xvFVOp4D0JL4Ur0g==}
+  '@effect/tsgo-win32-x64@0.45.0':
+    resolution: {integrity: sha512-1Hsr/sT5dmIafoY9L0ASJo4VqGyPNzM1nwTb4Wj1Lmjq6kGuwO/PVozFg3WZZ0piChFmgiU3nx1AKZfyqgjGUw==}
     cpu: [x64]
     os: [win32]
 
-  '@effect/tsgo@0.38.0':
-    resolution: {integrity: sha512-eazN0kX+WNT1jNjIm/l5esnkpKVfd1wNh2ig0pfaULKuI2PZh0JwjbepDPUr6MWx5cqOiUgwStNf5hGhg2w00g==}
+  '@effect/tsgo@0.45.0':
+    resolution: {integrity: sha512-gPG0ixVHgtYBUe5DbKX9vzHlhqd9+ZEfs4m/XWy0808av0A2XqMzaG3F5rnPBN7EUJRPlo9TluIi8WHx/pBV+A==}
     hasBin: true
 
   '@effect/wa-sqlite@0.2.1':
@@ -1987,8 +2004,8 @@ packages:
     resolution: {integrity: sha512-3RQHgEtvL1Frl/d1cSreo7qhJ3Gk1OdNUai/CtZ8G+wYeRQnJih3s9xJ9/kgYekPQRdwgh0HXRPqMlzWGwivIQ==}
     engines: {node: ^20.19.0 || ^22.13.0 || ^23.5.0 || >=24.0.0, npm: '>=10'}
 
-  '@grpc/grpc-js@1.14.4':
-    resolution: {integrity: sha512-k9Dj3DV/itK9D06Y8f190Qgop7/Ui+D0njFV3LHMPwPT75DpXLQohE9Wmz0QElrJnzsjB7KPWiKJbOl7IPDArQ==}
+  '@grpc/grpc-js@1.14.5':
+    resolution: {integrity: sha512-7VZM+SVdEcUUqSQeNI3zM8Qs/BhQKZndPo2h5VkYkAM8Iz0wJIa8mKV5ekQGqG8UUsnkQ0NMxIxwkIHYvj0qOw==}
     engines: {node: '>=12.10.0'}
 
   '@grpc/proto-loader@0.7.15':
@@ -2005,160 +2022,160 @@ packages:
     resolution: {integrity: sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==}
     engines: {node: '>=18'}
 
-  '@img/sharp-darwin-arm64@0.35.2':
-    resolution: {integrity: sha512-eEieHsMksAW4IiO5NzauESRl2D2qz3J/kwUxUrSfV06A93eEaRfMpHXyUb1mAqrR7i8U9A0GRqE9pjn6u1Jjpg==}
+  '@img/sharp-darwin-arm64@0.35.4':
+    resolution: {integrity: sha512-Uhfl4V4lhP2nbUVF9+hyH1+luj86f1gUFeo8ALYxFoULoU+G87D43BfeMP8XHsk9boxAnCY/bf2EHwhA7MuGsA==}
     engines: {node: '>=20.9.0'}
     cpu: [arm64]
     os: [darwin]
 
-  '@img/sharp-darwin-x64@0.35.2':
-    resolution: {integrity: sha512-BaktuGPCeHJMARpodR8jK4uKiZrPAy9WrfQW0sdI37clracq8Bp01AYS3SZgi5FS/y5twa9t4+LIuuxQjqRrWw==}
+  '@img/sharp-darwin-x64@0.35.4':
+    resolution: {integrity: sha512-hWniXY3bG5qKpkKrAwPe4y+VTPmf086YQAnkxWh7uA1YrlRouWGa0M0Mxj3ZjnXFkv7/TD1bTy9lGUK26vRvWw==}
     engines: {node: '>=20.9.0'}
     cpu: [x64]
     os: [darwin]
 
-  '@img/sharp-freebsd-wasm32@0.35.2':
-    resolution: {integrity: sha512-YoAxdnd8hPUkvLHd3bWY+YA8nw3xM/RyRopYucNsWHVSan8NLVM3X2volsfoRDcXdUJPg6tXahSd7HXPK7lRnw==}
+  '@img/sharp-freebsd-wasm32@0.35.4':
+    resolution: {integrity: sha512-lIsKw/BU+kjB4eZjxrYrZmwOJYi3Ajrv66iAlBmUPyKc3HpnloevB1g3wxGD9P/5BbQ1brBGl65VRRrCvQDEqA==}
     engines: {node: '>=20.9.0'}
     os: [freebsd]
 
-  '@img/sharp-libvips-darwin-arm64@1.3.1':
-    resolution: {integrity: sha512-4V/M3roRMTYjiwZY9IOVQOE8OyeCxFAkYmyZDrZl51uOKjibm3oeEJ4WAmLxutAfzFbC9jqUiPs2gbnGflH+7g==}
+  '@img/sharp-libvips-darwin-arm64@1.3.3':
+    resolution: {integrity: sha512-suTBPTDGrI9WodccaDdwZItTSaBYASlBk1NSfElSHrUfzu3szG6lvIF58+WiFvnfzuK8ZBFS5zE00PxqxnRiPg==}
     cpu: [arm64]
     os: [darwin]
 
-  '@img/sharp-libvips-darwin-x64@1.3.1':
-    resolution: {integrity: sha512-c0/DxItpJv2+dGhgycJBBgotdqruGYDvA79drdh0MD1dFpy7JzJ/PlXwi1H4rFf0eTy8tgbI91aHDnZIceY3jQ==}
+  '@img/sharp-libvips-darwin-x64@1.3.3':
+    resolution: {integrity: sha512-FVJZ5mITMobmXIz/hPDTw0EintTW5H3WfrxwLqEqjiIihlu+hVRyGrFQ60xl0Lxn7Bt3zdpevPaQi0HEzqz9fw==}
     cpu: [x64]
     os: [darwin]
 
-  '@img/sharp-libvips-linux-arm64@1.3.1':
-    resolution: {integrity: sha512-JznefmcK9j1JKPz8AkQDh89kjojubyfOasWBPKfzMIhPwsgDy9evpE/naJTXXXmghS1iFwR8u/kTwh/I2/+GCw==}
+  '@img/sharp-libvips-linux-arm64@1.3.3':
+    resolution: {integrity: sha512-0DaL0A6Xu6sQSQFwe4iVCrKWU2cCTItnRsYsCdxAMm9NF6twAA9BKnoqy4hqz4+azQ0JHuA26qiUKsf1XJ/v5A==}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-libvips-linux-arm@1.3.1':
-    resolution: {integrity: sha512-aGGy9aWzXgHBG7HNyQPWorZthlp7+x6fDRoPAQbGO3ThcttuTyKIx3NuSHb6zb4gBNq6/yNn9f1cy9nFKS/Vmg==}
+  '@img/sharp-libvips-linux-arm@1.3.3':
+    resolution: {integrity: sha512-3rbU4vqXXc3hY/OiXdl52xZvT0F1yEngWfvqudtPJg/KkyiaQw2DRsFrNzpmLvfavbwOq3qXn36GP8obHRULQA==}
     cpu: [arm]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-libvips-linux-ppc64@1.3.1':
-    resolution: {integrity: sha512-1EkwGNCZk6iWNCMWqrvdJ+r1j0PT1zIz60CNPhYnJlK/zyeWqlsPZIe+ocBVqPF8k/Ssee/NCk+tE9Ryrko6ng==}
+  '@img/sharp-libvips-linux-ppc64@1.3.3':
+    resolution: {integrity: sha512-cdn1OvUBwsXhbC0zSzJnNzf5MZ/mTrobawDvNXBTxe8VtqKAm0sRuEY2Evzovb/w9JMk4TvRxqt1mekSuJz64w==}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-libvips-linux-riscv64@1.3.1':
-    resolution: {integrity: sha512-Ilays+w2bXdnxzxtQdmXR62u8o8GYa3eL4+Gr+1KiE4xperMZUslRaVPJwwPkzlHEjGfXAfRVAa/7CYCtSqsBw==}
+  '@img/sharp-libvips-linux-riscv64@1.3.3':
+    resolution: {integrity: sha512-HjPVx7yKz+0lqdhDlTw1tt90wamBoxhiXpvl1XZpJLiHH4RCJ5yDTqH+VlYPv2fwFs89JFw4c1IexYOcQUi4IQ==}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-libvips-linux-s390x@1.3.1':
-    resolution: {integrity: sha512-VfBwVHQTbRoj4XlpA/KLZ7ltgMpz+4WSejFzQ+GnoImjo1PtEJ59QB2qR1xQEeRPYIkNrPIm2L4cICMvz4C2ew==}
+  '@img/sharp-libvips-linux-s390x@1.3.3':
+    resolution: {integrity: sha512-neWLh+3yCNThxnfy3c4BbVBeGgt9aftno+XbT56iK28RgeDs3UOFWviLWlUu0bArYVYJaFDK+RRohbicUNCm8Q==}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-libvips-linux-x64@1.3.1':
-    resolution: {integrity: sha512-+c8ukgwU62DS54nCAjw7keOfHUkmr0B5QHEdcOqRnodF/MNXJbVI8Eopoj4B/0H8Asr65I+A4Amrn7a85/md6A==}
+  '@img/sharp-libvips-linux-x64@1.3.3':
+    resolution: {integrity: sha512-4vKmvAst9nrowcqquKFAyZJUDolUaIp8uRiN0mWFguJ1IplC9/pitXtlnnlU4aa/eJw3J7i67V+pwUL+wZGdsA==}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-libvips-linuxmusl-arm64@1.3.1':
-    resolution: {integrity: sha512-qlKb/pwbkAi1WMsJrYHk7CuDrd12s27U2QnRhFYUoJNrRCmkosMTttuRFat/DDB3IlDm5qE1TJgZ4JDnHX8Ldw==}
+  '@img/sharp-libvips-linuxmusl-arm64@1.3.3':
+    resolution: {integrity: sha512-Y9kQaLMuNoB0bPYOOdcZMaseNrFpPodIWWMrx+CZyydf2xn68j9WYc6sWWRrDwNkzCQjKYfc68L7jKjGlHMibw==}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@img/sharp-libvips-linuxmusl-x64@1.3.1':
-    resolution: {integrity: sha512-yO21HwoUVLN8Qa+/SBjQLMYwBWAVJjeGPNe+hc0OUeMeifEtJqu5a1c4HayE1nNpDih9y3/KkoltfkDodmKAlg==}
+  '@img/sharp-libvips-linuxmusl-x64@1.3.3':
+    resolution: {integrity: sha512-fj8Mv0HHfD1Rr+4I68+3agJynxDWtBFgicTbSOb9Bke6pIwzGcJ+RX/yHjmiEGFMCavY/dxvem7MyNaJF+wDiw==}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@img/sharp-linux-arm64@0.35.2':
-    resolution: {integrity: sha512-af12Pnd0ZGu2HfP8NayB0kk6eC/lrfbQE6HlR4jD+34wdJ1Vw9TF6TMn6ZvffT+WgqVsl0hRbmNvz2u/23VmwA==}
+  '@img/sharp-linux-arm64@0.35.4':
+    resolution: {integrity: sha512-De4jpEnAU8Hd5oT0j1G3uL4ZvTuipVMn7YC6vPaJhy6/7EwEae0SVAoBrUMYQbkLGDm85taVWwuPc1a44LTzCQ==}
     engines: {node: '>=20.9.0'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-linux-arm@0.35.2':
-    resolution: {integrity: sha512-SE4kzF2mepn6z+6E7L6lsV8FzuLL6IPQdyX8ZiwROAG/G8td+hP/m7FsFPwidtrF19gvajuC9l6TxAVcsA4S7A==}
+  '@img/sharp-linux-arm@0.35.4':
+    resolution: {integrity: sha512-7OAS8gI0EReKGVN2HssHlM6umJgxF5VI3xN0p9FA91p/YO+ou5hiNghLdZ5BEHztwaaK5+bLKRf8x/o2L2nk9A==}
     engines: {node: '>=20.9.0'}
     cpu: [arm]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-linux-ppc64@0.35.2':
-    resolution: {integrity: sha512-hYSBm7zcNtDCozCxQHYZJiu63b/bXsgRZuOxCIBZsStMM9Vap47iFHdbX4kCvQsblPB/k+clhELpdQJHQLSHvg==}
+  '@img/sharp-linux-ppc64@0.35.4':
+    resolution: {integrity: sha512-2oYZJeIl4kCcMGk4ouZVjnkCtFrpQFlNEtJ6GbxzhHQchwH0NH/qEb9ykmOl29dqwMq+JhFdZn+1ak2FKhI9fQ==}
     engines: {node: '>=20.9.0'}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-linux-riscv64@0.35.2':
-    resolution: {integrity: sha512-qQt0Kc13+Hoan/Awq/qMSQw3L+RI1NCRPgD5cUJ/1WSSmIoysLOc72jlRM3E0OHN9Yr313jgeQ2T+zW+F03QFA==}
+  '@img/sharp-linux-riscv64@0.35.4':
+    resolution: {integrity: sha512-cPbNChoRURAWdebDIHSenxRpgEdy7JkPydSnUxRm9VvKD7m0/xVaR/8Fzlu81pk5nHEvHH87UZUA7cTtwnbJSA==}
     engines: {node: '>=20.9.0'}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-linux-s390x@0.35.2':
-    resolution: {integrity: sha512-E4fLLfRPzDLlEeDaTzI98OFLcv++WL5ChLLMwPoVd0CIoZQqupBSNbOisPL5am9XsbQ9T84+iiMpUvbFtkunbA==}
+  '@img/sharp-linux-s390x@0.35.4':
+    resolution: {integrity: sha512-RY0JFY8Fd6RonCBtHz+DvadaPkXDSI1AUn6yWL9TipqkZ1vY8w8evqdgyDFnkm4/K1ve1TvZiaePP5oSd4+WVQ==}
     engines: {node: '>=20.9.0'}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-linux-x64@0.35.2':
-    resolution: {integrity: sha512-gi0zFJJRLswfCZmHtJdikXPOc5u7qamSOS3NHedLqLd4W8Q0NqjdBr6TTRIgsfFjqfTsHFgdfvJ9LwqSgcHiAA==}
+  '@img/sharp-linux-x64@0.35.4':
+    resolution: {integrity: sha512-9qvvEAuk8k89TfWUoX2htWjbAMX8p+NxCppjpcg5k6xMsjhBQPTsoIh36h9Qde4WRuGpJeYnOjdosDn/cnv+OA==}
     engines: {node: '>=20.9.0'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@img/sharp-linuxmusl-arm64@0.35.2':
-    resolution: {integrity: sha512-siWbOW1u6HFnFLrp0waKyW7VEf7jYvcDWdrXEFa8AkdAQgEvuu5Fz8/Y70w9EeqAdwDtfU012BhEHHaDqvQNzg==}
+  '@img/sharp-linuxmusl-arm64@0.35.4':
+    resolution: {integrity: sha512-KB5jxpfWQTr0nc3xdHtWChdbifHrBGsd2SM62Eyxrl8afikm+f5qGBU75SJIZBT/S1MC8XyacdlXBMSWq6OURA==}
     engines: {node: '>=20.9.0'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@img/sharp-linuxmusl-x64@0.35.2':
-    resolution: {integrity: sha512-YBqMMcjDi4QGYiSn4vNOYBhmlC4z5AXqkOUUqI2e0AFA4urNv4ESgOgwNl3K+4etQhha0twXlzeF20bbULm9Yg==}
+  '@img/sharp-linuxmusl-x64@0.35.4':
+    resolution: {integrity: sha512-f+eZJZIQNEEd26RPSW+76chwOf1XtA2Y/O+5ocVyLliHkeih3e+jhLVBdNTd2rS3IbNXK8+ug93Vf5ZXtF5Lxg==}
     engines: {node: '>=20.9.0'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@img/sharp-wasm32@0.35.2':
-    resolution: {integrity: sha512-Mrv4JQNYVQ94xH+jzZ9r+gowleN8mv2FTgKT+PI6bx5C0G8TdNYndu161pg2i7uoBwxy2ImPMHrJOM2LZef7Bw==}
+  '@img/sharp-wasm32@0.35.4':
+    resolution: {integrity: sha512-zQnl4Kwp7Q6NHsENtU2T/00Zi+w3AQNwz3+UaTyVBy2FpXrzXzGjndpK61onhZjRtRpQXxCTeqw19bVyXOh7jA==}
     engines: {node: '>=20.9.0'}
 
-  '@img/sharp-webcontainers-wasm32@0.35.2':
-    resolution: {integrity: sha512-QNV27pxs9wpApEiCfvHM1RDoP1w1+2KrUWWDPEhEwg+latvOrfuhWrHWZKwdSFwU6jh3myjw/yOCRsUIuOft3g==}
+  '@img/sharp-webcontainers-wasm32@0.35.4':
+    resolution: {integrity: sha512-ESfNkywmCfPNyaZjxooddJQiQ+l/nTpGEOGthxiLnIHXC/CmcBixnfwUleX9mCz9ovrUUvKMap/pm8RYbzfwaA==}
     engines: {node: '>=20.9.0'}
     cpu: [wasm32]
 
-  '@img/sharp-win32-arm64@0.35.2':
-    resolution: {integrity: sha512-BiVRYc/t6/Vl3e1hBx0hugG4oN9Pydf4fgMSpxTQJmwGUg/YoXTWHiFeRymHfCZzifxu4F4rpk/I67D0LQ20wQ==}
+  '@img/sharp-win32-arm64@0.35.4':
+    resolution: {integrity: sha512-iNdlBX9gLVvqe2I3uIJSIKTq6wckP/DYxZtcqxm09x5Gi24DnFBmPAWZmr60ZyYMG0xlzo6goG3670ar+RXvRw==}
     engines: {node: '>=20.9.0'}
     cpu: [arm64]
     os: [win32]
 
-  '@img/sharp-win32-ia32@0.35.2':
-    resolution: {integrity: sha512-YYEhx9PImCC7T0tI8JDMi4DB9LwLCXCU5OWNYEXAxh5Q1ShKkyC6byxzoBJ3gEFDnH2lQckWuDe70G7mB2XJog==}
+  '@img/sharp-win32-ia32@0.35.4':
+    resolution: {integrity: sha512-kqRsbaa5CS6KHlpxnN7WhE6vAAugXyZButpRdvDWetlv6Qv4N9WTcrWzF7tXfB9T7MsoadqdI8hmwLq6UlLvtw==}
     engines: {node: ^20.9.0}
     cpu: [ia32]
     os: [win32]
 
-  '@img/sharp-win32-x64@0.35.2':
-    resolution: {integrity: sha512-imoOyBcoM/iiUr4J6VPpCNjPnjvP/Gks95898yB8YqoGGYmHYbOyCuNv9FMhFgtaiHFGbHW8bxKqRV6VjtXThQ==}
+  '@img/sharp-win32-x64@0.35.4':
+    resolution: {integrity: sha512-XtmnYhBcrORsJ4XJngyzr/EWP0hRZLAZRFaApdKuviyqF78+ylxh2y06ZmtULAMOnObJ3ucpN0AcwSWnMowTRg==}
     engines: {node: '>=20.9.0'}
     cpu: [x64]
     os: [win32]
@@ -2210,6 +2227,9 @@ packages:
   '@jridgewell/gen-mapping@0.3.13':
     resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==}
 
+  '@jridgewell/gen-mapping@0.4.0-beta.0':
+    resolution: {integrity: sha512-JdGNkbE4GlNPYQhM0L95fBQr7ctLZJ276QXQLTad4t1oSdnnCI3fDq9DW3BqYAWv8Wc3+HS+4Gsii1oPMCfz1w==}
+
   '@jridgewell/remapping@2.3.5':
     resolution: {integrity: sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==}
 
@@ -2235,8 +2255,8 @@ packages:
   '@js-sdsl/ordered-map@4.4.2':
     resolution: {integrity: sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==}
 
-  '@jsr/db__redis@0.41.2':
-    resolution: {integrity: sha512-pDHlF3sQaU5+VDwDH3jRkETBSD9gAIqdoaC3j0B4nrffr+H/Kh0Pbw7i/p5eD+9W5j38l8yRqZGbo4xgohYttg==, tarball: https://npm.jsr.io/~/11/@jsr/db__redis/0.41.2.tgz}
+  '@jsr/db__redis@0.42.0':
+    resolution: {integrity: sha512-VWY0bdbnGYp+1IpovAOCM40Jky114hFcEwKcs4+4xFtASC9GHY96rad3yTYggiLhASOlniF4W8FxRRSZMvqSWQ==, tarball: https://npm.jsr.io/~/11/@jsr/db__redis/0.42.0.tgz}
 
   '@jsr/std__assert@1.0.19':
     resolution: {integrity: sha512-pEj6RPkGbqlgRmyKwATp4cUs6+ijxtdrv3bq8v1d2I2CEcMEyPaO8cVKro61wGRDH4cNg8Zx6haztvK/9m7gkA==, tarball: https://npm.jsr.io/~/11/@jsr/std__assert/1.0.19.tgz}
@@ -2277,11 +2297,11 @@ packages:
   '@kwsites/file-exists@1.1.1':
     resolution: {integrity: sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==}
 
-  '@libsql/client@0.17.4':
-    resolution: {integrity: sha512-lYayFWasDV78A+TjlEhr6ubb3odBV6OHjb+wdp8VQcyWWAEIjuwbCHaraEUS4m4yWoo0BvZo96It4VdzZRmRWw==}
+  '@libsql/client@0.18.0':
+    resolution: {integrity: sha512-zMCCo58vv7w27j7+cnt/GW+X6/Rih6cHZ86PKi0AxCMOqMfrVgG9OZ5lW2bDMJhSeOjsv2szH2nJF3A9l36UmA==}
 
-  '@libsql/core@0.17.4':
-    resolution: {integrity: sha512-LqF9gIvnJ38nmAH1y/ChizHqDO/MO1wLgA96XrraulEEbqXxLjleSH92YWTolbuJKgPUmGu4aJk9W3UnAcxLOQ==}
+  '@libsql/core@0.18.0':
+    resolution: {integrity: sha512-N8RR2CIpcgtbKZnXs2KVpw2lJQfinUj3I56e7qRDRpK18Hty0Rr8nr00VmFb4R/DsqOanPB/TaP3+QAQLZeXMg==}
 
   '@libsql/darwin-arm64@0.5.29':
     resolution: {integrity: sha512-K+2RIB1OGFPYQbfay48GakLhqf3ArcbHqPFu7EZiaUcRgFcdw8RoltsMyvbj5ix2fY0HV3Q3Ioa/ByvQdaSM0A==}
@@ -2356,8 +2376,8 @@ packages:
   '@neon-rs/load@0.0.4':
     resolution: {integrity: sha512-kTPhdZyTQxB+2wpiRcFWrDcejc4JI6tkPuS7UZCG4l6Zvc5kU/gGQ/ozvHTh1XR5tS+UlfAfGuPajjzQjCiHCw==}
 
-  '@op-engineering/op-sqlite@18.1.4':
-    resolution: {integrity: sha512-8gjHXMyigCSDy/xdn46SQdnOW9pgJuTyrxqZj9ro75Lkp6dg+xs8wzyO+QH+khTWkY6TSofP3NcttJ1uiLdUFA==}
+  '@op-engineering/op-sqlite@18.2.4':
+    resolution: {integrity: sha512-qolai+hPLw8YVSImzXL8sRTpbdafBtlzNlmONRN06QUr/LESWOPGrqe79ct9uZQTKuuY9ztdCEp2kWsaVc1kWw==}
     peerDependencies:
       '@sqlite.org/sqlite-wasm': '*'
       react: '*'
@@ -2366,94 +2386,94 @@ packages:
       '@sqlite.org/sqlite-wasm':
         optional: true
 
-  '@opentelemetry/api-logs@0.221.0':
-    resolution: {integrity: sha512-OlanaW1vv7ufTqQ3/fPLI4arGt5ZoM+P8abOMki6uEYnpRazepSWDwDnnw+la7kE26SHVC18//SMccrDvLKOXQ==}
+  '@opentelemetry/api-logs@0.222.0':
+    resolution: {integrity: sha512-9mb1If+IF6u0ZVXkHQ6ogEae5HwA6ajIVUgpSDQyRASxft6BSXHvBvPooRle3yFN/fKnCdSOnuu0OC3PLcF6+g==}
     engines: {node: '>=8.0.0'}
 
   '@opentelemetry/api@1.9.1':
     resolution: {integrity: sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q==}
     engines: {node: '>=8.0.0'}
 
-  '@opentelemetry/context-async-hooks@2.10.0':
-    resolution: {integrity: sha512-bvyMcgLEkozzSzpEEEo1OMoeQ97bxj6Qs2uN3mPrSdDvObMI1myffD/BPqcLlzZO9//d1SqQA/WPw7Cz2AiqhA==}
+  '@opentelemetry/context-async-hooks@2.11.0':
+    resolution: {integrity: sha512-Tr79DyWI8itsBdg+jH+opjfrwLzX+erk1/ExkIwhWoAVjVrJIn2y5+cGjTC0Vy8fyNIA/y8wuJPZwr1T3xCZeQ==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
 
-  '@opentelemetry/core@2.10.0':
-    resolution: {integrity: sha512-/wNZ8twnEQQA4HoHu22+vcsdru6pWPWxW+7w+FlxT6Id7PE/WIbZmVKkte+PF72e0F2dnImFeHD2syyE1Mw6MQ==}
+  '@opentelemetry/core@2.11.0':
+    resolution: {integrity: sha512-7YP44XH0tV6+Mb54x2YGf84i7yi+31MBZlE8JwvozkxyTvXbSp10X7cI7YE49ChJ3shMJoBmCJF3+1QFBJctGA==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
 
-  '@opentelemetry/exporter-metrics-otlp-http@0.221.0':
-    resolution: {integrity: sha512-sRfCKbOzgy8xZQV2as0RzIZlnCmCseCKZGLfRcrpo2CBngJDr+rPtX0zkG0+oUCV5kfQPUoW3W3C96Ag3Y/Clg==}
+  '@opentelemetry/exporter-metrics-otlp-http@0.222.0':
+    resolution: {integrity: sha512-6Ko+0bgNP6V4G/RsmNBSk5lO1B/lo9z6tvLpFY3ykPPevXNzFmOW3C9hEmTt0zKCvHovyrol3TYlg4HVb5gwjg==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/exporter-prometheus@0.221.0':
-    resolution: {integrity: sha512-kW79a20qWESIuAdDrxzg9WKM98twV/NBWBFRAH57ap/+ssZhiCo0hckzKT0zpuwR/gSHrFAQhJL0bYDrnEM34g==}
+  '@opentelemetry/exporter-prometheus@0.222.0':
+    resolution: {integrity: sha512-I7nalnnBZrhlTgjlqsVeEjJGcQCFK5kKAYVk7XTz/cbubvj5fvjLOal/Many0taHF2GIkOWmegsbQ8vbQJjhFg==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/exporter-trace-otlp-http@0.221.0':
-    resolution: {integrity: sha512-AySXiKoC+meiWm6zdVj5T2LnPDZuatveBby1cMOeQteIWsYXAUxs8Sru13G2pVSPrUXz6vF+og7QVBX6GdC/oQ==}
+  '@opentelemetry/exporter-trace-otlp-http@0.222.0':
+    resolution: {integrity: sha512-RCnPWcHppwiquQ+cV3nWvNwdf0MG1w26e5jewW2T83nTZOlXgcg88sY9ulCVgagGHcq1mj0L0GP6YHgzk2v8oA==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/otlp-exporter-base@0.221.0':
-    resolution: {integrity: sha512-UFPIq80OH3Ns/oPFHRj14d4DTOxUo+MUFU8hUiCq5jTqFhdeJnfVSANHT+xp92409cA+oxzvlZCe6NM1wvCuBA==}
+  '@opentelemetry/otlp-exporter-base@0.222.0':
+    resolution: {integrity: sha512-YbywG3veEm2Fb6TbdxRkuquWob6eVWXuA8/Ba1tXz9jHfUqpdE3keilOHEtPboC4CvS1bjeeVfNkWGOOrLj+lw==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/otlp-transformer@0.221.0':
-    resolution: {integrity: sha512-lg6lkOU08Az23jVcn/0Els9HP+V8PnR4Km6p0KgpTggS0n/WuhnmY64rSh83Of9iR9nD+dpWr6adlcX8KzAwjg==}
+  '@opentelemetry/otlp-transformer@0.222.0':
+    resolution: {integrity: sha512-/F3BZ89+CJQnZkMh2tCrtcdB+XT2Dxhj4FFE+WPQ//413hmFL0/RfEX6vgOIWGhiSzrkHWTK3+6SiT7K5/g/jQ==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/resources@2.10.0':
-    resolution: {integrity: sha512-q6MMm2zhggzsHVNbabYwut+a6nbuQQe3URUoxaojM/8K1IBfwwPzvxIjNi2/lI1TFe+fMHMW9MWhrtDLEXEnkA==}
+  '@opentelemetry/resources@2.11.0':
+    resolution: {integrity: sha512-Ie7+8q8MDF4FAEQCKVMTx3ReUvxiIAgIiiW3c9JdmP8+HMcDy20puT+AHjexnExgnbvBxjQ9fjkFDWrikJ2jQA==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.3.0 <1.10.0'
 
-  '@opentelemetry/sdk-logs@0.221.0':
-    resolution: {integrity: sha512-FaDcazjyMp7TZZZAsqbo4IkovP0UegoCu0EBkiNt+qCqvUf7FPAsfcrZ3+ZEkKgXZ/jHafop+JoGPDk3A0SmLg==}
+  '@opentelemetry/sdk-logs@0.222.0':
+    resolution: {integrity: sha512-+19YHODIjaUCArxleaJtuufFZVpz/xvvK+VllQqE+W8hHolxdoRwHfK/s667zezwh1hkx6FFF+oYzetYgqK+Bg==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.4.0 <1.10.0'
 
-  '@opentelemetry/sdk-metrics@2.10.0':
-    resolution: {integrity: sha512-t6r1VSvXNtSDnPXU1FbZeetJb7yyovHmgu0wRSoftxtE0g2rSNhQZQUy69sRUCL+iioJpX8SN/S6wq6ZtvLySQ==}
+  '@opentelemetry/sdk-metrics@2.11.0':
+    resolution: {integrity: sha512-7GXXcObyHyDUUSG+L+kJoquty01bzm7ivE7+SSgXXJcHuPzGviptxwARmI2c+bnnxjexGQbJnyNlN8HxBP/Y7A==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.9.0 <1.10.0'
 
-  '@opentelemetry/sdk-trace-base@2.10.0':
-    resolution: {integrity: sha512-GuYQQT7QD2EeO8lcZLRQzcbOyhqAzL+6WWTKTU9mSUBYBazkEDl+VrQcXQhbB08OWM9anD1aHleVadzulpOaUQ==}
+  '@opentelemetry/sdk-trace-base@2.11.0':
+    resolution: {integrity: sha512-H19x/TX/LZdqiYOjM7fqtSxwlplC5pgelavqbQdHbhdq0q/AI/TGkM2dfGuuynTXmJPeF2HoZVoPDu+TGoW78A==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.3.0 <1.10.0'
 
-  '@opentelemetry/sdk-trace-node@2.10.0':
-    resolution: {integrity: sha512-GZK/G6oZyBLGlH1pUgeDch7D91KoHd2uotUGIkWCPi9GI5T9X0p4L7nNAMDR1BQjkRYoDqo+ddfVx9t5Uhys+Q==}
+  '@opentelemetry/sdk-trace-node@2.11.0':
+    resolution: {integrity: sha512-CuvCMJmZxswhNLlM2LfuLOW3h3fZujA4hsG4B+Sz4dX2zvaXO8Ng74cnDHWD64gLszTlhiG3c0iNUjj4g+0/sA==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
 
-  '@opentelemetry/sdk-trace-web@2.10.0':
-    resolution: {integrity: sha512-6WqXdWSlBH0GNjDhv1gg6SLVtMtIBVhLaWqd1hiKSXS8meXXP13sVPQoYFHz1uVo0feUTUCdP9vMS54KflisAw==}
+  '@opentelemetry/sdk-trace-web@2.11.0':
+    resolution: {integrity: sha512-8hgLI437x8VRKzgUr+WRcHFp9AeaHmveKRsPIMNele9tethgCKprakRRqZCWyt41ilALHATfspUMl1An0OTMUQ==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
 
-  '@opentelemetry/sdk-trace@2.10.0':
-    resolution: {integrity: sha512-MfQGq3GRmTh5fM/y+OjaO0vj6+luCB1XO2gfXCalKCfgKw0eHL++sm75DNweC6ohlp+aFvACqeE0fYayqdRaoQ==}
+  '@opentelemetry/sdk-trace@2.11.0':
+    resolution: {integrity: sha512-fFnTqGm8/G73GQVnxYi7LXa1ZVYEUvgL6XI1LpvV0bPC7WQ/ZGgKxCSl8FnlZBKto9JHHEFTO6s6CUpvvtwFrA==}
     engines: {node: ^18.19.0 || >=20.6.0}
     peerDependencies:
       '@opentelemetry/api': '>=1.3.0 <1.10.0'
@@ -2462,133 +2482,133 @@ packages:
     resolution: {integrity: sha512-eSYWTm620tTk45EKSedaUL8MFYI8hW164hIXsgIHyxu3VobUB3fFCu5t0hQby6OoWRPsG1KkKUG2M5UadiLiVg==}
     engines: {node: '>=14'}
 
-  '@oxc-project/types@0.147.0':
-    resolution: {integrity: sha512-IJ3s6ltHLp45S0bh7phkX+gJO7A1Wuz2EaqpAhb8WjqDwbzMiWKHhyyT42tskaWjEYXtHtVCPpnBJVT9+dcRLg==}
+  '@oxc-project/types@0.150.0':
+    resolution: {integrity: sha512-rDS5/31E9HfPl/CIzGrn0DOlvBbXFseQ5URJ9sYMfstbKLD/c6Gm9vmRzRGDdAXyOIL4zmO37lc9RIwYqVruZw==}
 
-  '@oxlint/binding-android-arm-eabi@1.80.0':
-    resolution: {integrity: sha512-RM3Plj+biQpxa5d1GOOX6ciDlcUROmm4OZ/pLTpitkQt2mJv4jhtY4cbgaetOm5UKWZe05/TGQ6o1Vl8EOHkrA==}
+  '@oxlint/binding-android-arm-eabi@1.83.0':
+    resolution: {integrity: sha512-0yGY24EwsLk5YDe6F+VkmZyRHSwJDALa3nIrPpq7FXmp2lV2d0TzvBCGeZk+wgiULRGr5blhyr4QMp5KCXJUqA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [android]
 
-  '@oxlint/binding-android-arm64@1.80.0':
-    resolution: {integrity: sha512-YlO5JEf0Yr2bUUlu8O8daVcUxtcGGbcSmyV7E7nSbJbfAdxTE0PFPwgnIlw7wXJaTYjb+qs5hI5q3jxUkI7cAw==}
+  '@oxlint/binding-android-arm64@1.83.0':
+    resolution: {integrity: sha512-hHfJ0vc17A4iUjH5p9BsTUPYbYRNxGpvD2lbu1aBRk54bzNIx9o5TtYF39QPZcV95DagZd+4DEAw2RH3G2ZsMg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@oxlint/binding-darwin-arm64@1.80.0':
-    resolution: {integrity: sha512-BULDOyO3AhsmdWfQeIUCykDt3dd7XZBGLhp1eIh56skRv01O+cNjNPwXMIbeW1x4+pxcln5if72wcRgViVo7PA==}
+  '@oxlint/binding-darwin-arm64@1.83.0':
+    resolution: {integrity: sha512-hsOjYjszLb/3zym/TkzUMPAoQlTJcuzSyEPOAyA+skXJIX9M0o+4JfOtqopX/Vf4hSLrJ98j0nvFo23gzk8auQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxlint/binding-darwin-x64@1.80.0':
-    resolution: {integrity: sha512-YJ4JzLw7N5TDSQFlA0hAQGHvnDZgyypm1yunObVWcWiF9KM7eGCJKYKLgTC2Fi/57OdnBhbj4OkzPGdFQJ6HyA==}
+  '@oxlint/binding-darwin-x64@1.83.0':
+    resolution: {integrity: sha512-mjh5oH2EA+wl5yRJYT9K9G61O2zFlpuv+yf2JwZOi0+dq2FnTUtm1h8i+5Ik0fXPWIu/k84I1psZR9aQsLAnyA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@oxlint/binding-freebsd-x64@1.80.0':
-    resolution: {integrity: sha512-AYUIk5QnL0s8oWAYsREZwkRYy1SupJTXALo93J1TgzHywxQtdM99FecRMQ87MXEdPQ0j1TmEpeeq3fGNkpvMqg==}
+  '@oxlint/binding-freebsd-x64@1.83.0':
+    resolution: {integrity: sha512-fNHr64/YaO8YssuoDVC8+F4Uk5enR86q5uxfHkQrjAPs1dbAILOrD2uaud+J7MO8Fx774g44ERLD0IGIvZE48w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@oxlint/binding-linux-arm-gnueabihf@1.80.0':
-    resolution: {integrity: sha512-9hBZVANupQ89W9dXyE0n8doCyaW5pDyGn3y6XlIMPZ+rIKuyqkr3SNUXmVJIhuvUq0NBU3RBiSXXE69l4XI6KA==}
+  '@oxlint/binding-linux-arm-gnueabihf@1.83.0':
+    resolution: {integrity: sha512-Qpwy3zzAwMj+8/lyYItHmkSMwbkprFNWTK7jPYDOxSyxEhaSLOWYUTCMkjF334J8/WD0nznCCsoBbIH6hpsuIw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxlint/binding-linux-arm-musleabihf@1.80.0':
-    resolution: {integrity: sha512-SvS2uKqzY+pbfuvAHzH4338R6Zwo805GAwrIMVvK1KxoOWCIjZUdfzTCvilD7z6JK91v011+zYMryabhDo2AsQ==}
+  '@oxlint/binding-linux-arm-musleabihf@1.83.0':
+    resolution: {integrity: sha512-s+BirYLFq7JL2k9sP0XI3ZXJ9dYvJ8sX3jLCLoag7tt+zrSHpZxP0jqznfL+Gdgwu7ay0dYgGYJXrQvq3iWloA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxlint/binding-linux-arm64-gnu@1.80.0':
-    resolution: {integrity: sha512-tCLadyqRVL3pQTRPNg7cjXKvcvS4fbyXeQHhKk5BTJ1oftQln5/yIIWbu/Xom/DX41zv2P9QGt6+D/TtQVtY3A==}
+  '@oxlint/binding-linux-arm64-gnu@1.83.0':
+    resolution: {integrity: sha512-7lihXt3vKr+GIyapNbHrnFHm/biiW30le6Zv/DExbAFPF6YwCQXVFlONPFehxs0CpGO4CBfYPM9rdDT+XMoIlg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-arm64-musl@1.80.0':
-    resolution: {integrity: sha512-XfpCNRlOPcLlJl4Bn/FUhjqlR6BVavEykERBf/MV7YA9VZDa5g5znVqYhyviMafcxS9Pe/i/kPvHNO0U6svEHQ==}
+  '@oxlint/binding-linux-arm64-musl@1.83.0':
+    resolution: {integrity: sha512-q63JalLYVkZiZvls1z3PPUnpmQluOMXp0khqQMznCeAPLGydfNY8JhvuA4WlK57JfrvikU8wB5lPVveqpIXvew==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@oxlint/binding-linux-ppc64-gnu@1.80.0':
-    resolution: {integrity: sha512-3I4yMwcFG9NeO8ioY6JBBuKsIm5GL/x7MATt1S4tVWaxPu5HcJ+XnLUbcVBTxG8q2Wu56HSj+NmXQiVYb1lp6A==}
+  '@oxlint/binding-linux-ppc64-gnu@1.83.0':
+    resolution: {integrity: sha512-krQmDF+dRbxvdqVPV88ZuOoPPu8X5BuqDA8Hd+qcS4YMRQCb+nexA57DazgGsc/rGdKBe3QmV0mnv0bdpW/p5g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-riscv64-gnu@1.80.0':
-    resolution: {integrity: sha512-E1wAKymkpe1/E8helzBKdm81OBOF+ezxRyXRMEuik3ZpWDER5CPOKZwF66RsdwW98uwZv8UTFremUQtC1CzdJA==}
+  '@oxlint/binding-linux-riscv64-gnu@1.83.0':
+    resolution: {integrity: sha512-MmOl8Y6txEAXZU1RG8Rr264jQ6D7VPmqFsU/45x/FeWsGe32hklTqGrLE6UxHzp5Rjt0wP+20tY8YXKgSFB3mw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-riscv64-musl@1.80.0':
-    resolution: {integrity: sha512-+gLRGD4sIo3+VA++iham5UxD9tKSoJ/VOrROCEXIcknrYtQg6iIQgvjN0cpiRF7N6UYC7pJbvHJlDnMge5LRpQ==}
+  '@oxlint/binding-linux-riscv64-musl@1.83.0':
+    resolution: {integrity: sha512-u1rMymh0W3JZkq370kzQsYPULGWqhE09pZRqnZvUSoYaI9pVO5yVX+iYIslmWuEgwuzH9YAaOsScJiobWCHoOw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
-  '@oxlint/binding-linux-s390x-gnu@1.80.0':
-    resolution: {integrity: sha512-aR0PrzHj9leW3NmzBAAP4EzdoBNoJcs9sjnIQPIwyRnBGYrRbXUIpEB5Q39AqK3PLY5JK5uEhDQDiUa1QSAstw==}
+  '@oxlint/binding-linux-s390x-gnu@1.83.0':
+    resolution: {integrity: sha512-y0zK3HNwGysu7rqtE+BQG/d0bx5gh/KwlOtghN8oWeK1KcWzeaLqtZrbm8owqdma1lFyrce/hTO5ismuNu+INQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-x64-gnu@1.80.0':
-    resolution: {integrity: sha512-vSVh5cSo3Xxs6ghBCcFJlpbkbENzDog1qXtoXLa/HC3aCrR4XO76GZbXmQoCPHnu99nQpdCeC3H9tdNICfDh7A==}
+  '@oxlint/binding-linux-x64-gnu@1.83.0':
+    resolution: {integrity: sha512-rS5gM0NgD7ngmuJmbIehsidtrOwKkLFwCQbKEeb9KuyQrrWNq5Zkn0uV6AYdXOMJ0grrWEiLwBuvMxt8w5vsNw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-x64-musl@1.80.0':
-    resolution: {integrity: sha512-FfzBXpNQ8u7/ZI/p8bl73MeZ508Ax3hxWp3SiJpEFiC+BB9XcXy5FAZHTLKDPSzrUpxQZSZJAVdDmuJp/+HDBQ==}
+  '@oxlint/binding-linux-x64-musl@1.83.0':
+    resolution: {integrity: sha512-W2IH4EtpcPaWcvNGCA95YoDg4vxqE/ZiPCi3arrxEEpsK7+JQN9WYwrlYFx9pcdP6KPXqRqkv3zdQPHcx7b6YQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@oxlint/binding-openharmony-arm64@1.80.0':
-    resolution: {integrity: sha512-zMzbkumtmprCgRwoYNzcB3iC39fXdJIMLMU33KdCjEGLlJGOEt1+LwQ4LF8ndLzAEKVz4BR0y3V6Xrkk3Nm3yA==}
+  '@oxlint/binding-openharmony-arm64@1.83.0':
+    resolution: {integrity: sha512-6LyKkUyoajssTPLlZmDbZIbu4IZ5B4bGuRUnBgCGpEvHP3FQMaYITncHA/unPUo7q+Z+pIu2HhdkQ+8d1SG7iA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@oxlint/binding-win32-arm64-msvc@1.80.0':
-    resolution: {integrity: sha512-ib6iRcrXsk4t1fm3iKcwksyWh1ZkZXC/2mEzakl0ai2+6HZunf1WWMZ/xP9EJAvw9g9K4UVTC3NF/+G2qLrbTQ==}
+  '@oxlint/binding-win32-arm64-msvc@1.83.0':
+    resolution: {integrity: sha512-Uz/fObEtF0jmNJQJ8CGRBKfefYstS0/wjD3s6IGzP8nUwsJykHQJBiN3npHwKiGRGn/vvBEgNr4B3cCzmmatvg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@oxlint/binding-win32-ia32-msvc@1.80.0':
-    resolution: {integrity: sha512-xhRWBMpLxZvgKAH6+DJZmpP+W8Y8UdQOSU1JfxSWNXsaBaRGW77j+1hCuNHlzj7OH4SPN8fYd1q0o2qrDtoVyw==}
+  '@oxlint/binding-win32-ia32-msvc@1.83.0':
+    resolution: {integrity: sha512-u7XcvPW6Bk58tY5iWs2ESb0vJjoE/kuSpHxopbwp/p3ZtWVQXZ6wor5w3ssVTHOqd/v8b+QdhSFWQ4grEUNWpA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ia32]
     os: [win32]
 
-  '@oxlint/binding-win32-x64-msvc@1.80.0':
-    resolution: {integrity: sha512-yAnO7lwBYQnz2pcfBPIGQQZWIX5zd5R/1aAKIF3oE+TVj7IhoHcROjOkz3sRDngzqhfPKfFaXqug5j5rE5dn6Q==}
+  '@oxlint/binding-win32-x64-msvc@1.83.0':
+    resolution: {integrity: sha512-LZRubd7ph13QmAg4fFecTYVZkiYbROR2Htaxh/ufWRkDhPOm2wrwaEYR89e0YpPFD3dqBrPoxS7myBw5hmYA7Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
 
-  '@oxlint/plugins@1.80.0':
-    resolution: {integrity: sha512-QRgH1XqQEYNHa4f1vvPQ5fAdNdncHGIUG1ZWLlGIZHky3qwCEeAKYitZNbZMtaXtAQAAFFTOwqUfzESvimqZNA==}
+  '@oxlint/plugins@1.83.0':
+    resolution: {integrity: sha512-qD64wr6SS1DL7YbJQ8WWjyUfFfrJsvAy9Vo0sG/PYUQy30w0uemN2h6j4xuvj4noyETDpzcGC20sv+FH7GrN5A==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
   '@pkgjs/parseargs@0.11.0':
@@ -2599,9 +2619,6 @@ packages:
     resolution: {integrity: sha512-pOr5+q1fLYKwFN3LAJuGZEnfXDcQ73zqgDHMtGy+K+uIoUqyY+6MeDCWFwfu+4EFuq76I5EPFofoNAI+Bmmq4A==}
     engines: {node: '>=22.13'}
 
-  '@polka/url@1.0.0-next.29':
-    resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==}
-
   '@poppinss/colors@4.1.6':
     resolution: {integrity: sha512-H9xkIdFswbS8n1d6vmRd8+c10t2Qe+rZITbbDHHkQixH5+2x1FDGmi/0K+WgWiqQFKPSlIYB7jlH6Kpfn6Fleg==}
 
@@ -2736,102 +2753,102 @@ packages:
   '@redocly/config@0.22.0':
     resolution: {integrity: sha512-gAy93Ddo01Z3bHuVdPWfCwzgfaYgMdaZPcfL7JZ7hWJoK9V0lXDbigTWkhiPFAaLWzbOJ+kbUQG1+XwIm0KRGQ==}
 
-  '@redocly/openapi-core@1.34.19':
-    resolution: {integrity: sha512-o/0VgsBXgwcY1lyeqcVtSGdTQAPnVggo0fbFVPlxl5XVDKUcVH0OLRqt3CbkwByT5FU305E0iE0O7MzThjDblw==}
+  '@redocly/openapi-core@1.34.20':
+    resolution: {integrity: sha512-ypeBZ/6BKXR9+7/TtbKhbl4UgD7raHhPS12oknlKno2A8+lnFkxIwiE/Aklu6L2cd/ioH+fCWuMxi9/p3EyAPw==}
     engines: {node: '>=18.17.0', npm: '>=9.5.0'}
 
-  '@rolldown/binding-android-arm-eabi@1.2.6':
-    resolution: {integrity: sha512-b+jTcARdTiFLI6jB4a5XjTm0RWd6KcRfQj/I2356fxUZemiho9zQLxo0RtCuMDAyKcLo6cEltkgbQp6d1+sjjQ==}
+  '@rolldown/binding-android-arm-eabi@1.2.9':
+    resolution: {integrity: sha512-tNISae1QEf/vkb3xkRcjV5SEdzPE97We5IVaa2Z8jSszQPZ8U60B/YCYpw4QI7VidYsBtKavczXf+DyDs9WGxw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [android]
 
-  '@rolldown/binding-android-arm64@1.2.6':
-    resolution: {integrity: sha512-lkWU8ZJaRk9q3CIEY1Tc7vIFALp3Xw5NfGJo2hQg5oIqNgxWi1zI+IiDEK3r70BF5Dzol1tcXsnzsRc8NLhG+Q==}
+  '@rolldown/binding-android-arm64@1.2.9':
+    resolution: {integrity: sha512-YC8YsI30o606GTZi0VyzYlsDKFP8W61i/QzayHDkLbNEz/IShqAmTa+hsJRj13xTHA0H+6fk4b2UmGn+Q/cMlg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@rolldown/binding-darwin-arm64@1.2.6':
-    resolution: {integrity: sha512-dgR56NYnvAszm7Ob1B2/Vn0e8bUQYZH2UjVaMMtMVOCKFSfjhfLmuA/9+O+F+ajUdG6B/bSssrKW6JJYASa8jA==}
+  '@rolldown/binding-darwin-arm64@1.2.9':
+    resolution: {integrity: sha512-IwhlH3qK5urrY8hZiEgGkHKEFN901p/p2bjxCxJlr4GyNnF7wYpUvK+Y43uaRYuC4hpfjzbR3SJC3arX1jGvmw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@rolldown/binding-darwin-x64@1.2.6':
-    resolution: {integrity: sha512-vpVxFvUCFioJqug7OTvqptkc4yb8UX0AwfDmJpaR/0sWz+BUmqSVAf7c8JkUgnN8YLspb4a/N6NhTyMAmdyQ7Q==}
+  '@rolldown/binding-darwin-x64@1.2.9':
+    resolution: {integrity: sha512-XxpJfVzFh+jilRxIXUqcfYAYcunIc/XEzIizsOL1fcJee5Sf7H3mH8WlLmfHfluz5amqR88QQo9izKtmMlavAw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@rolldown/binding-freebsd-x64@1.2.6':
-    resolution: {integrity: sha512-h1wG6Y6K3JlRswxsI64qQJqBAy4vrLuHgRbc8CZMGSWTOFRY6ghMApM1NKzB2I0n5xV1fjkE18SuVl2QpLeNpA==}
+  '@rolldown/binding-freebsd-x64@1.2.9':
+    resolution: {integrity: sha512-kSfvhmgeWyfkbT3p/1s5vSgboogoah2zkm9fX2zjg2hHxSV7T4KhMWRUUaRk4OXNqoD3QAUeRqLcs1aZOK4U1g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@rolldown/binding-linux-arm-gnueabihf@1.2.6':
-    resolution: {integrity: sha512-tbCiqub0q2MVWJKgF5PoAlNWCtQydiOYSLIkd8sByqK/6MMYLJRcSXSYodqYtd0O+Fw7QaVmKKlS4oL94YRZ0w==}
+  '@rolldown/binding-linux-arm-gnueabihf@1.2.9':
+    resolution: {integrity: sha512-1RVzG17pxqbTfYLC352JlLt6kKLG+6Hr30n8DlIJqsnV5luUDd2Qdx9Ayw1Cabfyb1K9k0jXEZ7evxkRoT+uiw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@rolldown/binding-linux-arm64-gnu@1.2.6':
-    resolution: {integrity: sha512-oxK9+baEBPhZG5HB4URY+uU04zJWeZlH6Tb9rB5DK4DF9XR1uXNLXt5Q5ZsugTKayNCNLhkcwz/ye74hRI98dg==}
+  '@rolldown/binding-linux-arm64-gnu@1.2.9':
+    resolution: {integrity: sha512-BXqPvZ2drqVD+/Z8UpKwcs4Mp7grM+eGFku4CAEKrEtcbAsUpzREphK1sogCRZGreVPiMkiiBtw0n3TPteuqvw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-arm64-musl@1.2.6':
-    resolution: {integrity: sha512-muWCk27FVBEZtv0MsK8gnfSmgczA8KQ0uRVJbTABKhkRfQc38aUrcb7fhi3BNiyseFmgcRsoMfQsSNJ+DbZdSw==}
+  '@rolldown/binding-linux-arm64-musl@1.2.9':
+    resolution: {integrity: sha512-11vWvo8YDwLzukt27J3aYDWU+gg2P7J+ZOmiJ0hkF5BXZDW7pVya7r40MXDy6ya0i9KamoENSVKIugvJNgFXIA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@rolldown/binding-linux-ppc64-gnu@1.2.6':
-    resolution: {integrity: sha512-eWDoSfU7Co2qj3vgB3Dt4lj1mG6CoWbcJQkRMP3XJplyCMtuaq3LHvPFjS9QIPvMGWVadJC04Xiy0IdcVPtnwQ==}
+  '@rolldown/binding-linux-ppc64-gnu@1.2.9':
+    resolution: {integrity: sha512-a1tijMkdwsIARtc0F39ApURROkf3NwqinI6TOiSSWCTR7dT96dffNvMUtDHnq64wKNTIZOIlzKrFvvFUznJiyw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-s390x-gnu@1.2.6':
-    resolution: {integrity: sha512-2bWNjRSIayvupRKxXUY2tWG9fYdoUlTqWywHRvE8Eq3GvuQ+f2HeIkve697fIt+IQs/PV8yFsdWuhp1aJ1PdnA==}
+  '@rolldown/binding-linux-s390x-gnu@1.2.9':
+    resolution: {integrity: sha512-x6SQNdAvv4c3hWqTMaWuawzMX9myaCs/yEmlGsxJzkdClnHW7FbrjQuSiRDhuSYzEYoEMhsaJy9qHG/XNemJPQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-x64-gnu@1.2.6':
-    resolution: {integrity: sha512-KekI0gS0wLxe1UBSQSjenBVwou/JkcQPDzBPICGZjxUv9k3RteHDPBQaiOicZUFKRIH2wKEimGwVpnJsbPzu7w==}
+  '@rolldown/binding-linux-x64-gnu@1.2.9':
+    resolution: {integrity: sha512-9s0AZ8BFK5/n7B/TBoa2yJE3gI3KURrbXcPBlsAsvjU4VeJKgE90y1YtNxyEUIcHPQkg6/yfF3qihUrcM/Kf0Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-x64-musl@1.2.6':
-    resolution: {integrity: sha512-TvtPnfVr+HtyGiDmPK4VWmlNm7QhNNAcK5Q9A7aOXsI8545yCyaoMaicXrFZ72JzeYjaUVk7yT243zT0jzjFKQ==}
+  '@rolldown/binding-linux-x64-musl@1.2.9':
+    resolution: {integrity: sha512-P7VWAmV+WdJluH7ovnRGoiv2i8To7GAZ+kGzfGup635cyL7SyYl3lSUaA3Gp5THf0n/Co5EyEqb2zbqq+nMOHQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@rolldown/binding-openharmony-arm64@1.2.6':
-    resolution: {integrity: sha512-iOo0VEay2XFhaCcH0sps5XIimkSuOnNaZrf6+ZkoSOQBJPKNU48RkmJv0/lSpipexu5P+ouFgafe5IGr/DiQfg==}
+  '@rolldown/binding-openharmony-arm64@1.2.9':
+    resolution: {integrity: sha512-1qixtsE4BK8h+yS3BfmZ09UhA7O/N4IACva6YBr7EBvCJraByTuRcgOTaiA62Tm0vey3UcKXLOaoGHtYmNGEVg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@rolldown/binding-win32-arm64-msvc@1.2.6':
-    resolution: {integrity: sha512-y5NTmmasMS455JlOCO4ZM9krIchv3Mvm1crL1iUPGOPgEzSkves9n0SdC5Sjz6+qWDFhd8/JpfWMH8NSWNHe+A==}
+  '@rolldown/binding-win32-arm64-msvc@1.2.9':
+    resolution: {integrity: sha512-ok8IQjcEPs1AKZfuEUznVBrJw+gK4soq+bx8b1X2XoMqVClarc1q5JDmVtWXY1xfr6ZuHTAsPXHTgTrqKTZeww==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@rolldown/binding-win32-x64-msvc@1.2.6':
-    resolution: {integrity: sha512-np8iZSLfXlAD4kWhiyq/u0Yt8oZDtRQ8lGhQaCXo2rl37KNjeU0GjJuwr4P3oeZ++ROfofsKNBqR5LTO8aXyWQ==}
+  '@rolldown/binding-win32-x64-msvc@1.2.9':
+    resolution: {integrity: sha512-Ip2mXoU0hM0boq3Rf+ekuT653OROSo6aSYcPT1VHE4q52KvyxgFkQgrgb/IEsxOuvQ2fZZbs8khJAyCEPM24/g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
@@ -2875,141 +2892,141 @@ packages:
       rollup:
         optional: true
 
-  '@rollup/rollup-android-arm-eabi@4.63.1':
-    resolution: {integrity: sha512-UZ8sUxPTiHWYX9QNdJedb1kDZSpS1t/VPWBWGSgqHNi9w3Cu6IXvu2mzbhiTiPvtrqgTQJ+zqiAq2iPIPilpaQ==}
+  '@rollup/rollup-android-arm-eabi@4.63.4':
+    resolution: {integrity: sha512-I+BSHzTAhKN2n7ZwGZsegGcZjDpLqFOMAtJz/u6uFGe0pUFbq56dEHjqJV/ZUdRJtNXNxA+hREUatZBvMR3Oiw==}
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.63.1':
-    resolution: {integrity: sha512-cQ4nFQABN5cDvDpbvJ7bMStCpnaVxynZrRMfUJYgxcIk9Sh54FIO1vtfkg0B69REjER77ioZ/ov+eAApx/KmLQ==}
+  '@rollup/rollup-android-arm64@4.63.4':
+    resolution: {integrity: sha512-pu3BdjS2LtEzRu2elmGzS3fIeWSZy4BMDIaLNwjorO76+k2d0LMluijhsDx3KQyQBQ/lLUZCQA9/s6csvUfuhw==}
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-darwin-arm64@4.63.1':
-    resolution: {integrity: sha512-FQNqd1lRy/0QhDk3xeRIkSBiCpXCiDnZO3YLVdcDKN1UBiKToNftCzcXYNLshmPDUMlu2TdeS8tGcsU6f3YF1Q==}
+  '@rollup/rollup-darwin-arm64@4.63.4':
+    resolution: {integrity: sha512-xfSrj9MHnWK9GaSqT9U0ImHtH/N8WZlHLx4cZHiuLcqs640hvZ3hLPd5UR2AZS57FaE8HrRUSpltbZdWRxHiDA==}
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.63.1':
-    resolution: {integrity: sha512-pvD16V939D3CloK0+qikpGaxiPrDUXTe7Y5cWOMkMSy7m1cawa8EGy/kXYi/G/cKAC4HDAbSnzCIk1WmsoOKXg==}
+  '@rollup/rollup-darwin-x64@4.63.4':
+    resolution: {integrity: sha512-bqU99PLJb/dqb3S0GIMdeuyAEETSUgZBoqXYd3Sd+WCsV+MmPhnN6JrotWyir31+QgH7EvvE5/mwGJlEoci8Fw==}
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-freebsd-arm64@4.63.1':
-    resolution: {integrity: sha512-pcFGeL2345VwdTnJhA6zLbew+YgWB0qBG2+dMtXjCicf6+rm6kO6cOoh5VnTe0ZMrMRgRyuHmCJxZWrIdzYuOw==}
+  '@rollup/rollup-freebsd-arm64@4.63.4':
+    resolution: {integrity: sha512-JinsFZ5G40oXQb+sUuiA5x689vhr6dDYK0H0NL+rwKdL6CqnmYN8PE4ZwfRSoIjrCxqTQG/SLfTtSvHeGxoVlw==}
     cpu: [arm64]
     os: [freebsd]
 
-  '@rollup/rollup-freebsd-x64@4.63.1':
-    resolution: {integrity: sha512-mRJlqSRulVzcKq/LKA6ICSIc3K/l4fzlVn/gePn2nXIHy8seRi5z/eeRE0d/XMBxcMldiXtQTSpRj0tkkC3g8Q==}
+  '@rollup/rollup-freebsd-x64@4.63.4':
+    resolution: {integrity: sha512-GAdA4UxpiNm27cLHr2GqXBpAD0x9FqwYBY7/YSP0Ss0/PNi4k8gbviqpIpYbVSRBaS2ZcegXEzgTQMbRNCwxCw==}
     cpu: [x64]
     os: [freebsd]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.63.1':
-    resolution: {integrity: sha512-YDUNvVM85TI3g/1OpnqKP1h4NeW/j64DfWMf+G3M809xNk1bJSnpFp4sh83NpmVE5DXnkh8ULor4LTVZKoYLHw==}
+  '@rollup/rollup-linux-arm-gnueabihf@4.63.4':
+    resolution: {integrity: sha512-qDd6NoA1znaLjp4jR5U/KWCdLAKDJNB8W9ChbbDaKbo0xA+Atln5HK6LFCZ4oJQpemtRZA288DCirFRjrspptw==}
     cpu: [arm]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.63.1':
-    resolution: {integrity: sha512-7Mcn71p9ZuQFAj+h+dhQXy/yeLePRS2yKRnmW1DijA9thKO5qap0GNOIQK4yQ6iP3SU0Mrb/yWo8h8vgRba8lw==}
+  '@rollup/rollup-linux-arm-musleabihf@4.63.4':
+    resolution: {integrity: sha512-WtB5Tz5KTNINb8ZA+8sQ7bmjuS1JrRT7YverYIhUGdWWDlpzVWmIwuZE+jidkEXUn1l0zrEkaIMa8dHF3NGcsA==}
     cpu: [arm]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-arm64-gnu@4.63.1':
-    resolution: {integrity: sha512-4YiLQTX6U4CSl0L9cluep9A9W6UmTfqBDc2/CH6wlu54pl4E7Jn3cOD8oxzvBDEGk/JMKgJ47C8g+radF7mwvg==}
+  '@rollup/rollup-linux-arm64-gnu@4.63.4':
+    resolution: {integrity: sha512-VcQ3L1tjnkKzWjryAVaFhHEWcqOfICX9uxVVoDzm2t0DpgKRHd2zOpVrJc0xsWeBZcBFyYROCIBdyR/fS174pg==}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-arm64-musl@4.63.1':
-    resolution: {integrity: sha512-2ra8F7w8OquwZN9z2/fKFnli69wa8PLwaVzRMIPGb13ByMJwC28Fbp8YcVGoUhlYMTt7j5j9bNgpysrN2UM+vw==}
+  '@rollup/rollup-linux-arm64-musl@4.63.4':
+    resolution: {integrity: sha512-6+ZQX6P5s0cMDN2Ypb8Lbm2+/sZYmZjdaYny992ujUU9UKi/4CWoJWsl1pNvjWJHNHGK51m+jKGLlh1ylb2ifQ==}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-loong64-gnu@4.63.1':
-    resolution: {integrity: sha512-Sy20ncyhjmBP0Ml+UvQbimjlk6VFgjW5uNP+qqwHB00mTE8Bl2C1TuHTlRwK2YoXeZbee5lP2XevBWVkAQAtSQ==}
+  '@rollup/rollup-linux-loong64-gnu@4.63.4':
+    resolution: {integrity: sha512-D72ZnvkFkBXOfzMMQLcwfPLyGkKb7HZ9/mf97B7v6/P5Lbv4oFOtSY/uHbS8lH6uKUOxoKiuokdb50XZSzzbJw==}
     cpu: [loong64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-loong64-musl@4.63.1':
-    resolution: {integrity: sha512-noITLp8oNjYliPnGWmLyelIHwULGqbHloQHGw1rtxbWhTuWooRpnZarZQJ1y9EUC4szuCusCc+HEpUtxpIwYvA==}
+  '@rollup/rollup-linux-loong64-musl@4.63.4':
+    resolution: {integrity: sha512-piU6BxeqA3O9KSu3kRCIQQtNqFFaTu21SEV4FwaRZowpnj3bLaWPZHw+xFqCs0XlJ+aOH3PTRWGoglH+mKA/OA==}
     cpu: [loong64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-ppc64-gnu@4.63.1':
-    resolution: {integrity: sha512-hlxxXd+F1mWiAcaFR7Sv9ZQT6m6UfI8+Vy/kFJzztq2pDMU/0wZ9sish0iszNZvsQDo8Gc0i5yuFEOz5dDf6fA==}
+  '@rollup/rollup-linux-ppc64-gnu@4.63.4':
+    resolution: {integrity: sha512-/5PGpHwqt2EEEOUs1XwzubE/ucr0dWDQ+to3zqi4Ds7EWpwtQ79wXc4JBoxqj/OwpawTsKWzJxHfSuBOq3DrWA==}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-ppc64-musl@4.63.1':
-    resolution: {integrity: sha512-EF7OpqQTQ/BvGqLzUi4rEHuagCV9MugAUXSHemwPW5vxZ75RR+jxO/2j95Ph2dalMpFHSVECjRoioHZgA9zOYA==}
+  '@rollup/rollup-linux-ppc64-musl@4.63.4':
+    resolution: {integrity: sha512-cX3beZDLWt7G2oJF+nhChiT+qtaihs+S2xi7ziGmVB+2pwPng6D0Ed0HmElQOgv2UsUmSJJLGwpBao/3TDx3VA==}
     cpu: [ppc64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.63.1':
-    resolution: {integrity: sha512-wQO3JesW9PRkwlabQ27y7sPfVOOTLRG73I4F2UYHG5PXun3J9U3y+b7ezVKSYbsvSKGQ1k1cq8Qlun4C9kLt3w==}
+  '@rollup/rollup-linux-riscv64-gnu@4.63.4':
+    resolution: {integrity: sha512-1uz2mGWHyptR7DgHHrlbdRAjXK7v7elGZ9lMja910/RP+ZYbX6xAmCiU9UZSX4hqmgtHMv6lr5l3kq1HIOpcag==}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-riscv64-musl@4.63.1':
-    resolution: {integrity: sha512-ouAGwhO6wHRXdnOVCOsB0tRFkA7nhNB2Nwax6oECXN0YiN8EYUTBAOudADOB1PI+yDL61TeNx/u7MVCzksNbkQ==}
+  '@rollup/rollup-linux-riscv64-musl@4.63.4':
+    resolution: {integrity: sha512-nLS8topojxyz7SRpKR2IODRpQ0XPZ+xaOXvT3+hqK/Uy8Lo5HFgkkIBiIrCu5tL5YqzTvgovGw55PwpahTAGig==}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-s390x-gnu@4.63.1':
-    resolution: {integrity: sha512-q2R38Sn+1J8RxhfJ+T54wSWmyKXWec+9jgDfqO2AtArEqHO5R2aeayp5H5OYLr5UYDVGsVaZPEFUooMhYCdz5A==}
+  '@rollup/rollup-linux-s390x-gnu@4.63.4':
+    resolution: {integrity: sha512-gs7DRKotr3l3q+jGPQBjH0ng1FjlEDm5ueQrkw5JtQvtLyEIcLASqAEaor56BhkKRzk+IcQzrcanBdb/bBQn8g==}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-x64-gnu@4.63.1':
-    resolution: {integrity: sha512-gfI5T24WLLuFfSKw7Go/zDXjAAV0fny0swTaDv+WjK7vqcw4cRhFfdsyKL1n+ukI+ooBxn3bVQnyrn06WpI50w==}
+  '@rollup/rollup-linux-x64-gnu@4.63.4':
+    resolution: {integrity: sha512-791ET7W17NnScOZM7h4dX5hYspxE28htPFsb1awY/NRR8+PRNkS53e475rDdxXXDrP+kwnCcNWg9CX5ztn/Aqw==}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-x64-musl@4.63.1':
-    resolution: {integrity: sha512-4h6XqthmB4Hspji84wvgk+ElodTsGj+dbZqHJHHtKxj4mYq0ANSEEPX9ys3moJueqsRjwpaJYH7874Itwnj2ow==}
+  '@rollup/rollup-linux-x64-musl@4.63.4':
+    resolution: {integrity: sha512-iwZQRcmj7g88g3tzefIrQY7qvmuA/cfYwhrDtTBhsmukO4U2huVO5W+86XacUMRvdSFVAc6kZUZy21JaRwiB9w==}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-openbsd-x64@4.63.1':
-    resolution: {integrity: sha512-dlfCOa87o1VAYegLQ9EKilx2JCeRofiyPGhTCmqnuXZ6bMPiycO1rq1+sKoulAp7pGLIsTIw+1x5R+zgh5LhhA==}
+  '@rollup/rollup-openbsd-x64@4.63.4':
+    resolution: {integrity: sha512-dVHFp9gRWrdTpnqQuGfCwd7hOQDatK1VCP2iWhLY/cGrOQs/ucFzJ6A5SRqbXX12ZDI8EUuejSM5kwg+ja7Png==}
     cpu: [x64]
     os: [openbsd]
 
-  '@rollup/rollup-openharmony-arm64@4.63.1':
-    resolution: {integrity: sha512-cjkLbOlfcm3QGhMM1J5zaZjsw1GggbN6rw9UTSSRrPrR1KkcXnN7Uq9rPw34xImQ9VOY9GN+6u2Zj80B9ptkcw==}
+  '@rollup/rollup-openharmony-arm64@4.63.4':
+    resolution: {integrity: sha512-t3NlauOW6gxZVVFcBEnO62Cb4wbyDFL416gTg1uFI/2tgqYQlf69FbSE115Ajre9I+c26Lk4mcmdFUsS/DGifQ==}
     cpu: [arm64]
     os: [openharmony]
 
-  '@rollup/rollup-win32-arm64-msvc@4.63.1':
-    resolution: {integrity: sha512-Li1KdUnWGE4N3e1F/B4RTB1ms+nG4WBgjByO46pkeBVX/2UBsY53xf5vK9WygVmnH3RwncIST7lkSdLSY6P9lg==}
+  '@rollup/rollup-win32-arm64-msvc@4.63.4':
+    resolution: {integrity: sha512-xWuIaSye5FWZF8+UYtVEcHtRJDN5kN9Kfgxx3Kq8XIov9KSKbc1fiqQCm90SKrgQbUXZelbnUhnlUJmfSE7P9A==}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.63.1':
-    resolution: {integrity: sha512-t4ZYOSoLTgwhuFMrmTMLx/+i1DQVK7HYqMc6kY46EApwi8X0nIVphzdNoThU3xt6n+N5urG1/gxBdCaKDLavfg==}
+  '@rollup/rollup-win32-ia32-msvc@4.63.4':
+    resolution: {integrity: sha512-9ALJJUOg/ZflMJepVo2PlgsGxSaxN7SQ4Z8GoZfVlarWr6r3rkHUNsd/zAio7p4YMtChSMXPionxej4Hkf6CXQ==}
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-gnu@4.63.1':
-    resolution: {integrity: sha512-RgroPfMmKlD1RzSDxvwgcPiy2HNQKoYV7OmwIXDsk73uKW5t6B/V8KIy27SMv/FNXFo/oSBtWc9J0X7t91ezZg==}
+  '@rollup/rollup-win32-x64-gnu@4.63.4':
+    resolution: {integrity: sha512-blj9z5qx/Pv4WU0W1NMFDB97e0JH5ed+aZGywW8WCvp/NhWX/4PFAq5uu6Q0AebNn+Vo6KzUYDT++JzTT5ojlQ==}
     cpu: [x64]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.63.1':
-    resolution: {integrity: sha512-at8QVep6S3h5Y6gSbdGU06bRY5WJkf6WUduM9YtvYMbYhB1MOFfUgc6kehitQXzOtMSaT70q7f9ydPhpqu821w==}
+  '@rollup/rollup-win32-x64-msvc@4.63.4':
+    resolution: {integrity: sha512-Erx822VRBwLa124shbj+wNXe//BOgMEctDV0m1aqTQdNO1S69DgNUCFKC1RCeZfixs1J31l6igk1ziyXErbigQ==}
     cpu: [x64]
     os: [win32]
 
@@ -3081,9 +3098,6 @@ packages:
     cpu: [x64, ia32]
     os: [win32]
 
-  '@standard-schema/spec@1.1.0':
-    resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
-
   '@testcontainers/mssqlserver@12.1.0':
     resolution: {integrity: sha512-DesPv/vgd6MBGzML5qWZyhIxREDdcdlzJ39WsH+lDgx6287mLZ38/v02GGeeOsv6P0Tw2TElp8lBieK5wH4Xhw==}
 
@@ -3096,8 +3110,8 @@ packages:
   '@testcontainers/redis@12.1.0':
     resolution: {integrity: sha512-WRiS1Lhc+e/DHXDnCmMZtm8Wv64zYlRGNV04rvtn8kxIS2aVz5lgsP+Su/cfBzHJ0/vwdVKW+YJ3nUrXYbQxqw==}
 
-  '@testing-library/dom@10.4.1':
-    resolution: {integrity: sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==}
+  '@testing-library/dom@10.4.2':
+    resolution: {integrity: sha512-yzr2S9HyAIdhz2/6qHgbs665Q7PKVcDF05vsOlHPxG1mo36gKVesdYVeDLnXgfjJ03CrKRk08knc6+E/9m8v2Q==}
     engines: {node: '>=18'}
 
   '@testing-library/jest-dom@7.0.1':
@@ -3162,8 +3176,8 @@ packages:
   '@types/babel__traverse@7.28.0':
     resolution: {integrity: sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==}
 
-  '@types/bun@1.4.0':
-    resolution: {integrity: sha512-K+lZULY23vRgK/CfTjFIV+tyifaNdSMlPh9j+6mQ/cLfpOznLyAuzgV/JQysyECpkBQLVMSyvjlr2fBUSA9wFQ==}
+  '@types/bun@1.4.2':
+    resolution: {integrity: sha512-GimotNn7+ZV0uVArItBbriZsR1oNf0+WTzPkdcFrzShI7k2norL0uzEaJT8T33dWr7O/c9ZDuAFQrctKCi72oQ==}
 
   '@types/chai@5.2.3':
     resolution: {integrity: sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==}
@@ -3210,19 +3224,19 @@ packages:
   '@types/node@18.19.130':
     resolution: {integrity: sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==}
 
-  '@types/node@26.4.0':
-    resolution: {integrity: sha512-faiGnoIrLH/V8cibOMEAZ8pMw6oXqSukl29ra4mN8GdaB2ZewzeaLj+INpV5N+Z1eKWzY+IzaIZH2EIR6YZRNQ==}
+  '@types/node@26.6.2':
+    resolution: {integrity: sha512-X1P21scMv4zGKLYqjdGjaKa7COa0RKVYYZZN/NfvLQ1JegxFhdhpZG/Lyn8AXx6CDUavKAd11v6BvfpkDByK8g==}
 
-  '@types/nodemailer@8.0.1':
-    resolution: {integrity: sha512-PxpaInm8V1JQDd4j0ds5HfvWQk8JupS1C0Picb96QJsrrRDjBH+DlK7L4ZdNSqNULhiZRQHc40nLVShaGxXAMw==}
+  '@types/nodemailer@8.0.2':
+    resolution: {integrity: sha512-c7M5ox8p0nEOfbJ2E9Qcmt8/QCu/VzsiAhzBiZbvky2PhKZDHpKB3sQHBM5MEZNkCfBOaS6S9//AGPRTNB7IaA==}
 
-  '@types/react-dom@19.2.5':
-    resolution: {integrity: sha512-fMPwH9v7r/pp43yUd2/Mbiex5KouJwwR3dzHkhLREUC6764VyDsqxhAxv6OFEYR1RhjOyD1naqba8ECDBe7ZQg==}
+  '@types/react-dom@19.3.0':
+    resolution: {integrity: sha512-ZI7bU42mZXXKHn/qNLEw2IrbiINU7X5+vfgdixBHkCNpYWXjKgfQ/P+uyGb5CjOLB9UcnTeg3rylQtV2hym44Q==}
     peerDependencies:
-      '@types/react': ^19.2.0
+      '@types/react': ^19.3.0
 
-  '@types/react@19.2.18':
-    resolution: {integrity: sha512-AnzbBERsrLKtk2XSfTbYRLjQPdy116Sty4q+T+Bp3IC4l6jNBvreVPAHmpq9qhXQM7CXZPjLVmGMw9sy+hxQ3w==}
+  '@types/react@19.3.0':
+    resolution: {integrity: sha512-N0rFCuH9YoxG9/m61l9MfpJKfmLOVU0em7ipIz6TRgSSkvReLB9vL85GB+yr8Bs5leqpvg96JSwF4ZS1s4viQg==}
 
   '@types/readable-stream@4.0.24':
     resolution: {integrity: sha512-NRvUNC/JFGPJvqdAfEve8oginbM6V08u5NzLWpG8MwA2kTPOLnqk+wpwuPT+mp3aUsxyuT6m2gnrPuHYCruzEg==}
@@ -3230,8 +3244,8 @@ packages:
   '@types/resolve@1.20.2':
     resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
 
-  '@types/scheduler@0.26.0':
-    resolution: {integrity: sha512-WFHp9YUJQ6CKshqoC37iOlHnQSmxNc795UhB26CyBBttrN9svdIrUjl/NjnNmfcwtncN0h/0PPAFWv9ovP8mLA==}
+  '@types/scheduler@0.28.0':
+    resolution: {integrity: sha512-WuK7EQ0YBvNbYwanHo+x3kixrg10+7Ak4rmYmy1dYo3l4FCh0XWeoq/SdqQamKA5wShXse8WRhh0Tt1czTAuTQ==}
 
   '@types/ssh2-streams@0.1.13':
     resolution: {integrity: sha512-faHyY3brO9oLEA0QlcO8N2wT7R0+1sHWZvQ+y3rMLwdY1ZyS1z0W3t65j9PqT4HmQ6ALzNe7RZlNuCNE0wBSWA==}
@@ -3239,8 +3253,8 @@ packages:
   '@types/ssh2@0.5.52':
     resolution: {integrity: sha512-lbLLlXxdCZOSJMCInKH2+9V/77ET2J6NPQHpFI0kda61Dd1KglJs+fPQBchizmzYSOJBgdTajhPqBO1xxLywvg==}
 
-  '@types/ssh2@1.15.5':
-    resolution: {integrity: sha512-N1ASjp/nXH3ovBHddRJpli4ozpk6UdDYIX4RJWFa9L1YKnzdhTlVmiGHm4DZnj/jLbqZpes4aeR30EFGQtvhQQ==}
+  '@types/ssh2@1.15.6':
+    resolution: {integrity: sha512-oGdxhBqcRTwSTKFm+9EiKzkNVYRLEFkcW44lhguvBalGJbWfGnDt/ezwSUZc+SF9m9bMc3VyklNAtp7zICjS5w==}
 
   '@types/stack-utils@2.0.3':
     resolution: {integrity: sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==}
@@ -3260,30 +3274,30 @@ packages:
   '@types/yargs@17.0.35':
     resolution: {integrity: sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==}
 
-  '@typescript-eslint/project-service@8.68.0':
-    resolution: {integrity: sha512-5GQtWZCXFcFYux955pvoS02WLc49pXNlvIxocKjS0clvwo3in1RdlzVKyiqQH9vE5AKWFLTaUgeQkOrTS+0Qxw==}
+  '@typescript-eslint/project-service@8.70.0':
+    resolution: {integrity: sha512-hFHbTNqhU9G+2eKFXCBVb1tjFT/LceiJ4+HfLO4pTpDI0KHi6iajpcFFkaSQ9gXmCh7n82A0PthaayEdN6mspQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/tsconfig-utils@8.68.0':
-    resolution: {integrity: sha512-F7zrGQfiJHojPwi8vhxZQC1tWtJzvL74cK/nqri2lk8YUXvYaYwl263xOJ69jDWPUk1hmcdoayFwk9lX09npVw==}
+  '@typescript-eslint/tsconfig-utils@8.70.0':
+    resolution: {integrity: sha512-adnkeeNq9Sq1sUf4+FRVc0KdgYghzsgFpZSQVZVvY0LCuUuN0FnQgyGzCJeC4fW1cdXseBAjU2EOqUIjbNcZUw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/types@8.68.0':
-    resolution: {integrity: sha512-9RnpsGJjrAllCMefGVVsImJM24YurhC0Q1h4UbvivtvOqXmR/vEJge2OoE++z9m6hyg8T1Q8t5SNT6tHSbrxcg==}
+  '@typescript-eslint/types@8.70.0':
+    resolution: {integrity: sha512-asTOIYhDg4zdzOScCyaytrsV3cR6B4ecPQlXw/dJIm7J/MZTtCtfVII9JD8Geh4jTCrK/Xe6cg5UevoleMcoJQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/typescript-estree@8.68.0':
-    resolution: {integrity: sha512-OKKsD0tYmoNiU5PW2zehO1yO56jYOm1ShYlxon/Z0SJNidAkdVg86eg9ruRuoXf8xfnuWZGbwDsStkoXbZtIIA==}
+  '@typescript-eslint/typescript-estree@8.70.0':
+    resolution: {integrity: sha512-d9NmHMPEKQ7QCLLm1jI3zmoQBwT5KwFYjXBJ9ymZfKCUU+5rmTRykKAFvH5Qn/ZCds3CEAFS9OC9M/jkl0X2bA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/visitor-keys@8.68.0':
-    resolution: {integrity: sha512-YR65gGdGvTUAWLldC3xLOvOzamdGzB4A5/N8rehEaHs3Zvoe39BhgY+u0SPch1OvrVTfLcc55wsSgK2NcnTS/A==}
+  '@typescript-eslint/visitor-keys@8.70.0':
+    resolution: {integrity: sha512-BoC8PiO4Hkdo0TVJh9Ntxr5MxPDI7/oFsrygN5ADelFSeXG/qgNuucIGA+L5Z6JpPTE/uRfcTWtscjbUaufepQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@typescript/typescript-aix-ppc64@7.0.2':
@@ -3406,29 +3420,29 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@typespec/ts-http-runtime@0.3.8':
-    resolution: {integrity: sha512-bLMpVcWZNzq6lYOybwFwOAR1IXKcHnhUNqYeHjl1bET/qE3jFPFH+p8Wrh3rU4xwdnifPxmKNESBYnvnmc75aA==}
+  '@typespec/ts-http-runtime@0.3.9':
+    resolution: {integrity: sha512-edSdeAqkdxBVzA1yL1LrLCml1YjyCVvPMtMqJpbF+6K609tHe8V6sQUzFQSGcYNhcuhOceZtjvN32+mpIth30A==}
     engines: {node: '>=22.0.0'}
 
-  '@vitest/browser@4.1.11':
-    resolution: {integrity: sha512-bwMovvAeuTFOK5kIFevw4VEf+1gVEICv4SYK4k3knJOxl6b1zEWud8mYKD73e1B0odAn174h1MofURy2TPWf3w==}
-    peerDependencies:
-      vitest: 4.1.11
-
-  '@vitest/coverage-v8@4.1.11':
-    resolution: {integrity: sha512-8MVGEFnJIcdGjcbfKmeq8z0pZHH0JlVtoVZH9Q/qwUp6wyFnEJUBMrw9DCaj+ra3vShGmhavjalMIhPNxZAUcw==}
+  '@vitest/coverage-v8@5.0.1':
+    resolution: {integrity: sha512-FRC8ACiudC3dI6MTplzRSYWHDRnIv2IPfbzs4FdoJNsMal/35sWV8hwIfV8ZcqzSPy+uXHeMVONt9CEqtOU17w==}
     peerDependencies:
-      '@vitest/browser': 4.1.11
-      vitest: 4.1.11
+      '@vitest/browser': 5.0.1
+      vitest: 5.0.1
     peerDependenciesMeta:
       '@vitest/browser':
         optional: true
 
-  '@vitest/expect@4.1.11':
-    resolution: {integrity: sha512-VX2x5vNJXET47KAFzwERI+KRMtTTCSWTfSMKsW7JsUsXV4psq++e3DvZpuTDOpHcxytiDs6p2nhVb2tVDiiUYw==}
+  '@vitest/istanbul-lib-coverage@1.0.1':
+    resolution: {integrity: sha512-k3DJZ8LhMBK9NS4SclF1ASD3OgXEWDorbIcPTRDK0/Zae6fRvu+fJRxtFdLfHsa9Y24beCdPnoNZ4LviTNstfA==}
+    engines: {node: '>=22'}
 
-  '@vitest/mocker@4.1.11':
-    resolution: {integrity: sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ==}
+  '@vitest/istanbul-lib-report@1.0.1':
+    resolution: {integrity: sha512-1EOLRfsTMnyAr3+kEAsP4o9dhaDlGPpD7H5iLBBeq//YpNB1VIahkPhB+eRp9N2Dkfw8oySROjE3yf9XDeaIkQ==}
+    engines: {node: '>=22'}
+
+  '@vitest/mocker@5.0.1':
+    resolution: {integrity: sha512-6K1DoBNAPGvuOcSsGA4D6x+5zEEff/KmOOP3uetT2TrGpVfI+HRHRnJJfKi5ib/g1vx8IYHQD8s0pbJz8WQI7Q==}
     peerDependencies:
       msw: ^2.4.9
       vite: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -3438,52 +3452,40 @@ packages:
       vite:
         optional: true
 
-  '@vitest/pretty-format@4.1.11':
-    resolution: {integrity: sha512-yiZzPbGTS9Sr/JpFl8zHrcIkAofNbFV6k21vIgQN/cY/oxZeXhJv5sc/MBJ5jFKWmWs+oJHw0UXLZjmf931+Vw==}
-
-  '@vitest/runner@4.1.11':
-    resolution: {integrity: sha512-LztvUgdwMNJMIkj3hQnnxiC2Xy1zNxq928W/xhjCLaNCzqTZOudjwbQf6v9IntZGPw132i2Lq2rgTRZHD3JHNw==}
-
-  '@vitest/snapshot@4.1.11':
-    resolution: {integrity: sha512-pN7ikn1ON7h8ee4gIAp4AzyK+zBtJPzVbqOgu5LCEh4VaJVbPQcgYQYJIMGQPXVeJJq1fnfazis7a5pFNPahog==}
-
-  '@vitest/spy@4.1.11':
-    resolution: {integrity: sha512-apNa/prQy2qCeywhnixOHPRCgGNhvg7T4Dapfl1GahLp/R+uhBm5cPyFoNVyqsNd2h1nJxL6BqqdIjiABL60YA==}
+  '@vitest/spy@5.0.1':
+    resolution: {integrity: sha512-rbto/mF/SGERxEgYOek7Xm6B9b+y+mVoo+f4b2LymYO8zM1b7uB5nHuhVMTP2hxdzgxvGiZYGxGIaMvL5y180Q==}
 
-  '@vitest/utils@4.1.11':
-    resolution: {integrity: sha512-zTCVGpyFsGWBhllOyKlTw/vnr6D9qxsfSDyfbyZmTyjHw5N/VuvzHpHoQjm2ZJzn4RJgx5w4r7V0er69CmLgPQ==}
-
-  '@vitest/web-worker@4.1.11':
-    resolution: {integrity: sha512-730ZTeK7KGvinH92mHpq2kBZNUkdF0zCijFtsBe1VQ6kDveGjYxaX+WpSnDYUh8Zoh+7jZ5oKNyWJQZEGC8S4Q==}
+  '@vitest/web-worker@5.0.1':
+    resolution: {integrity: sha512-bXXtWhAYpBe+56m1Xm2Ft363vK58kHaRVzoN1Z5rqZx0PL7gofvZ+5wfJeatOKH1elemZiqjb/e+A4PbdtGJhw==}
     peerDependencies:
-      vitest: 4.1.11
+      vitest: 5.0.1
 
-  '@vue/compiler-core@3.5.42':
-    resolution: {integrity: sha512-2Ye1ilMtKXxl8qZUrQ5j0CdgenFp/HFQmta6rfRyfEsTG69L6Wk+tWuNoHYHMx9E8tF2Slvdg1FuwDvAXdy1LQ==}
+  '@vue/compiler-core@3.5.43':
+    resolution: {integrity: sha512-zdiLhnbe1QQqgDT8xZMpNmyqZ3qlI+/Q/FHQco57Kwl/b05HhCzN6eVGN9QU9rbga4CrS0H5SYY8VGHZCt/1Hg==}
 
-  '@vue/compiler-dom@3.5.42':
-    resolution: {integrity: sha512-qbhQZEFmycr+ni/qyuccS4sucNN7VAbDfbkvNxWOX2VfgFm90MNs3/UhRNKoPMEIVn0F8gdlYjLPvqxHwHeQOA==}
+  '@vue/compiler-dom@3.5.43':
+    resolution: {integrity: sha512-PEZoAk3NQmsn/ejMzSOCyTYqwGqczrWm70PuhBKjjv1+TCoQAaO/zOqNwjV+honlNstT5ILxtc+8r8UUfj+iEQ==}
 
-  '@vue/compiler-sfc@3.5.42':
-    resolution: {integrity: sha512-fkCAFB4okcAANGMThboWnScp/gzWjU0ZSkVnjTIiplmMDq2uq0tIB3j+xVu4rhv5rvOgBySCysudmbMd6xRRqw==}
+  '@vue/compiler-sfc@3.5.43':
+    resolution: {integrity: sha512-FCbrG3XNCRl+js3huuKx4IVHBLTvMkJhVepjbxSPu1gn4yWLaYtGNQdjJGZaMytXB6qb76qQDDmDSLy/vkmleQ==}
 
-  '@vue/compiler-ssr@3.5.42':
-    resolution: {integrity: sha512-xmLk3wLkbizPAiLyomjgFFosf2ys9b5Ghb+oh/k2tnvipNz8OFrQOiTcWCzyK7MpBp9KkyGtfvgfLUivbmuGYA==}
+  '@vue/compiler-ssr@3.5.43':
+    resolution: {integrity: sha512-GF62orf7KiJX9RqrHNGrYBudsQGD0OhJ5nDs90O8UiDuS40+YMYomiXu6w6EuvtXuRDc3MSNis3EaaSKAVSWpg==}
 
-  '@vue/reactivity@3.5.42':
-    resolution: {integrity: sha512-TzNNfKpb7hDxbQltwAut8VDQA5YP+BuRlxntHUuRjyKwlMvmAPbs3unhCvieijifY6vFfVBwsS7wG/C7uq+bEQ==}
+  '@vue/reactivity@3.5.43':
+    resolution: {integrity: sha512-G/c9GyOZNI2jVaaS6OX1EF1SSFSv7H0ERqNTl4+DTFMlZmB5eVAB53aLQNam/7NL2NPtaDD7RdVrzf8uJzMuOA==}
 
-  '@vue/runtime-core@3.5.42':
-    resolution: {integrity: sha512-9uACtuHs7vJGkm5Bp3xu4xRDLFTIYy5DgxpToVjqGIAhAEKwQfsaLvKINhM6nFVp6bZPRFGdDqd1g52MqKsotA==}
+  '@vue/runtime-core@3.5.43':
+    resolution: {integrity: sha512-hU6U6VnVhBGQDpvlnnDlIB8ZGJBiOcgk2lh/0InltHiz3D8oSkluvuvY+do1G2H3+udeKFsmaBlgVYP7gXQzEw==}
 
-  '@vue/runtime-dom@3.5.42':
-    resolution: {integrity: sha512-rsCmhiWLaRxGltLwhlCWyYkFn7WAbKRh0q17eZ1A6Dq6eqc2ACQ61IIryxz0LrsvCzHSilLA9JHovVwM8CNE2g==}
+  '@vue/runtime-dom@3.5.43':
+    resolution: {integrity: sha512-Bb2Jc0YjjJdMt1SJmb9b2L/IWd3I8lIT9x9eS/xvvP9CiVgna0ffua74xKRmt4/uSJ+0r4iN8ex1jrqkhQGWQw==}
 
-  '@vue/server-renderer@3.5.42':
-    resolution: {integrity: sha512-2++5dUyYS4gvo7xQXSECUDhB7TS0aOl5SeVfC5qSq1Jgfhjvegw1zqhwTIR3imZ+QYPJQw9gfcFvXGAjGZ7ajQ==}
+  '@vue/server-renderer@3.5.43':
+    resolution: {integrity: sha512-l2Ygjv9NehV94PSBxNWsAHC0j/eIIKbn92mBuWXAPGLnn6HfJ6MH5ubsd+Nk0YoZ5FRuxWI1P2VSoh+dbPQhCQ==}
 
-  '@vue/shared@3.5.42':
-    resolution: {integrity: sha512-2rPxex1jQf4jvl9MOHl6YaXCPcrNqz/FstMOEh3QWY+/OME9nQTvl9WYeCwhW7AFjaR0SnngZGlp/wkR6rkI6g==}
+  '@vue/shared@3.5.43':
+    resolution: {integrity: sha512-uksS7YGMR5NZyr4JNq0Rp+QyLns0ueaz20KwzIPW9R0LH1Vnt4E+XUM29PNseEbf1www2gOuhuDi5AKOIXag9Q==}
 
   abort-controller@3.0.0:
     resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==}
@@ -3585,12 +3587,12 @@ packages:
     resolution: {integrity: sha512-6KuK/7nZ/2Qh7sGuVEiwxjCxzTY2Pdb5mTo5z1e6/J8BA0tvjR7G8vQJKrQMTqwmnA3UPEyKIFX4YUS1DO1Hvw==}
     engines: {node: '>=18'}
 
-  ast-types@0.16.1:
-    resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==}
+  ast-types@0.16.3:
+    resolution: {integrity: sha512-FvWoWYfSCM6kRxCSH+MGLHIKKGRL6A6AW7Zek2O32REPQRdg131428uRTKMBYAeRd3XXAaHDS60Wpri7CdKDrA==}
     engines: {node: '>=4'}
 
-  ast-v8-to-istanbul@1.0.5:
-    resolution: {integrity: sha512-UPAgKJFSEGMWSDr3LX4tqnAb4f7KGT8O40Tyx8wbYmmZ/yn58lNCm8h3svs3eXgiGd5AXxz8NDOvXWvicq+rJA==}
+  ast-v8-to-istanbul@1.0.6:
+    resolution: {integrity: sha512-fvpl29helSO2w/z7utIbrkNXILdrLwDwAMH2I/zPKlGf5244+gf+B4cyS1sANcrPY2h+hWCGSgC8N61s/+AF9A==}
 
   async-lock@1.4.1:
     resolution: {integrity: sha512-Az2ZTpuytrtqENulXwO3GGv1Bztugx6TT37NIo7imr/Qo0gsYiGtSdBa2B6fsXhTpVZDNfu1Qn3pk531e3q+nQ==}
@@ -3605,8 +3607,8 @@ packages:
     resolution: {integrity: sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==}
     engines: {node: '>= 6.0.0'}
 
-  b4a@1.8.1:
-    resolution: {integrity: sha512-aiqre1Nr0B/6DgE2N5vwTc+2/oQZ4Wh1t4NznYY4E00y8LCt6NqdRv81so00oo27D8MVKTpUa/MwUUtBLXCoDw==}
+  b4a@1.9.0:
+    resolution: {integrity: sha512-dpfcF9fDNR6++cthXR67iyhgqWy9CBouAvIWhIntzBG6cvK/cnIPiZQjBwi/ZqjjBEDGfoNDtmB0kTjroOJ3pQ==}
     peerDependencies:
       react-native-b4a: '*'
     peerDependenciesMeta:
@@ -3671,8 +3673,8 @@ packages:
       bare-buffer:
         optional: true
 
-  bare-path@3.1.1:
-    resolution: {integrity: sha512-JprUlveX3QjApC1cTpsUOiscADftCGVWkzitbHsRqv84hzYwYHw2mbluddsq5TvI8mH/8Ov1f4BiMAdcB0oYnQ==}
+  bare-path@3.1.2:
+    resolution: {integrity: sha512-ZyKbsuuqK6Ag0K8pX6V5Txq6XeJRvY+wXucnFGRjiyVYP9YWDpIQugk/b+enRYrEYBJaqLzghRQpXPMR7341Nw==}
 
   bare-stream@2.13.4:
     resolution: {integrity: sha512-PcrQ8lVLbiJscNm1Kez+Yp4Gy4AHGcN1lzwjvf5NybWen7VvEgUfyfnXYJ2zNqWnzOfCb1Abq6lH8ti0syQszA==}
@@ -3688,22 +3690,22 @@ packages:
       bare-events:
         optional: true
 
-  bare-url@2.5.2:
-    resolution: {integrity: sha512-L13PCJzKG8RGvx8V1/DdMi12ERhC3tprr7/8a94BxpmnRsFqxh5XZNdhtMxu5HPkRshYOOWRGY8lDP7ZhpG9Cg==}
+  bare-url@2.5.4:
+    resolution: {integrity: sha512-Gxa7UVWBr0/edU1b+TJhn/AZvMQUj9OGspvYsaTYQrAbZA4BOTZGL3LiZxvD+CeMlDH4juwD84+eTAp/bLYW5g==}
 
   base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
 
-  baseline-browser-mapping@2.11.20:
-    resolution: {integrity: sha512-H0ulySigv6icDJ1F7SjtdCD6PrhTpdYCmP0CactWy1+ekh0AFd0o1Wn5T8b+hnTmdBx19u9yhL6wvCylXMY7zw==}
+  baseline-browser-mapping@2.11.25:
+    resolution: {integrity: sha512-gMmEShwwq7FJqMwvfRwvCl00v4kN+KOfJqXn+f4nrufak5gNHJOksd/60Dvjuz7sI8Y5WiSFBa8FEYr+zoyqCw==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
   bcrypt-pbkdf@1.0.2:
     resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==}
 
-  bidi-js@1.0.3:
-    resolution: {integrity: sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==}
+  bidi-js@1.1.0:
+    resolution: {integrity: sha512-fX1Onk0tdVPC7obPWB5EbJ1z7NVhLq4m2xZLq2YXBkxzMXIGRpNMU88n0EPgWseKl12J7zXs7qrDxPK4sRs2fg==}
 
   bl@4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
@@ -3714,19 +3716,19 @@ packages:
   brace-expansion@1.1.16:
     resolution: {integrity: sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==}
 
-  brace-expansion@2.1.4:
-    resolution: {integrity: sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg==}
+  brace-expansion@2.1.7:
+    resolution: {integrity: sha512-uZbew1NqdmPDTMJ8ah1y+b+9QEJrfkXFk3RcTQw3X0jW/xRUvFKsg1CfQdSYGdTbXZWExtU3J3ccxtnfw1Fi0g==}
 
-  brace-expansion@5.0.9:
-    resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==}
+  brace-expansion@5.0.12:
+    resolution: {integrity: sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==}
     engines: {node: 20 || >=22}
 
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
 
-  browserslist@4.28.8:
-    resolution: {integrity: sha512-V2NpofLblG64mfOtSgDhOJESZEGogzDMBv/q+W6oc4LXWP/q75eOXoOaaOu1EOadB9U4Bwx/e0yzbvwKH8zalA==}
+  browserslist@4.29.0:
+    resolution: {integrity: sha512-3GSvyjvDI4Dur1Meg2BekJquu5uF+9R9a1+5M1Mde192eZoXbeXjzgOsgqPS2V8D5wrrip0gR5Hf/GhWQ9ZzaA==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
 
@@ -3757,8 +3759,8 @@ packages:
     resolution: {integrity: sha512-lHblz4ahamxpTmnsk+MNTRWsjYKv965MwOrSJyeD588rR3Jcu7swE+0wN5F+PbL5cjgu/9ObkhfzEPuofEMwLA==}
     engines: {node: '>=10.0.0'}
 
-  bun-types@1.4.0:
-    resolution: {integrity: sha512-iIKw23BspnQQYd3prITOBxeUsxBHnwzX6YJfGMuNOZzeNcMmVqzIIVGRm1l69ogaPQmb4wB6BN8mA5bE9YuC5Q==}
+  bun-types@1.4.2:
+    resolution: {integrity: sha512-bxV1FgK7yBIzjRe5zBozIM4Bem11ZJcCXSrjWRG3YWLt8yFDePu4cLjpebO8OvPeIE9trbyPF4fuj3Cia4Fj3w==}
 
   bundle-name@4.1.0:
     resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==}
@@ -4070,8 +4072,8 @@ packages:
     resolution: {integrity: sha512-3omnDTYrGigU0i4cJjvaKwD52B8aoqyX/NEIkukFFkogBemsIbhSa1O414fpTp5nuszJG6lvQ5vBvDVNCbSsaQ==}
     engines: {node: '>=0.8.0'}
 
-  docker-compose@1.4.2:
-    resolution: {integrity: sha512-rPHigTKGaEHpkUmfd69QgaOp+Os5vGJwG/Ry8lcr8W/382AmI+z/D7qoa9BybKIkqNppaIbs8RYeHSevdQjWww==}
+  docker-compose@1.5.0:
+    resolution: {integrity: sha512-O+eD6c63+BJORUWddXA7uAlI6H1KLDPd/aS14k73nXYpFliM48C3xrrKB3sXsR1Fp/rHUZQe7+fJ+QA7+jepyw==}
     engines: {node: '>= 6.0.0'}
 
   docker-modem@5.0.7:
@@ -4092,8 +4094,8 @@ packages:
   dom-accessibility-api@0.6.3:
     resolution: {integrity: sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==}
 
-  dprint@0.56.1:
-    resolution: {integrity: sha512-1r+e9cnecxoxIfac4+gyYvEftPgkFrNZOHMBmOYutLolph1u0yeQcBdhmLAo9RDuBD6FupKy0kZlcoyhgPVGOQ==}
+  dprint@0.57.4:
+    resolution: {integrity: sha512-iiorgfJrrV7DDf7S9AB/d5ZB59Jn5idMDQoU7o6H9m6AvGVaLAPrGTAslmTwykkft9CYbWzqUrKjmKT80KWmAA==}
     hasBin: true
 
   eastasianwidth@0.2.0:
@@ -4105,8 +4107,8 @@ packages:
   ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
-  electron-to-chromium@1.5.416:
-    resolution: {integrity: sha512-K6bvB2BjnNrugtIih6ewlbBI9DXa976jIdiIlRLHhBoEI9a4JaQjjHyF+A1IQI543aQYR4LnmOrT/K5fZj0aPA==}
+  electron-to-chromium@1.5.433:
+    resolution: {integrity: sha512-5lCAbyZBjtmUt/RAGHRqrL2q0oEFRThDAsZHHDn9XHa89Qw7gMYOeSicBTy+AHfvo0r6vwsZvqNJTQIQy1BLzA==}
 
   emoji-regex@10.6.0:
     resolution: {integrity: sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==}
@@ -4117,8 +4119,8 @@ packages:
   emoji-regex@9.2.2:
     resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
 
-  empathic@2.0.1:
-    resolution: {integrity: sha512-YGRs8knHhKHVShLkFET/rWAU8kmHbOV5LwN938RHI0pljAJ1Gf6SzXsSmRaEzcXTtOOmVqJ5+WtQPL5uigY50Q==}
+  empathic@2.1.0:
+    resolution: {integrity: sha512-AnfC1ATldl49/cvZdLPDjBfrRNwbDO05aibiOtzQu3qtlbJtomNLhF30HEtn/7iBz50dlMECqATo3fG0LrdEgw==}
     engines: {node: '>=14'}
 
   encodeurl@1.0.2:
@@ -4132,8 +4134,8 @@ packages:
   end-of-stream@1.4.5:
     resolution: {integrity: sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==}
 
-  enhanced-resolve@5.24.5:
-    resolution: {integrity: sha512-L1l8TNvomm6UVW5B253AGxQagSQr+vGwhMlrrfRS2qmhx46AMpMVJKQYLvWYbysTMY8VoicOvzHzoHMbyzB+4A==}
+  enhanced-resolve@5.25.1:
+    resolution: {integrity: sha512-nGXts5znJzmWPu+mIE9izCOzdg63oJca2mDzGWWTth7sr4aCToKcoyFVBQwN75Ij5Pf6p510EwkTqViTRzDV+w==}
     engines: {node: '>=10.13.0'}
 
   entities@7.0.1:
@@ -4245,8 +4247,8 @@ packages:
     resolution: {integrity: sha512-CGnyrvbhPlWYMngksqrSSUT1BAVP49dZocrHuK0SvtR0D5TMs5wP0o3j7jexDJW01KSadjBp1M/71o/KR3nD1w==}
     engines: {node: '>=18'}
 
-  fast-check@4.9.0:
-    resolution: {integrity: sha512-7ms6T7SybUev/PQITciI0yLM2pOSFy5zpG8Ty7tQofcVaQUvrMXp6CBwqF6fThLCLOrfBtuHAtwq6Yu4XPCllg==}
+  fast-check@4.10.2:
+    resolution: {integrity: sha512-iK2f+YrcmoeGqk6fA0ea2bptcu/itMIm4NfEozq6N25+aG6h7s5HZbB/k1aV7b5w5sFLMCbbtRUsTVR+BgC3xw==}
     engines: {node: '>=12.17.0'}
 
   fast-deep-equal@3.1.3:
@@ -4267,8 +4269,8 @@ packages:
   fast-string-width@3.0.2:
     resolution: {integrity: sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==}
 
-  fast-uri@3.1.6:
-    resolution: {integrity: sha512-7Ical1vFEMr0onbVzEDIreM22I4khW+fzyQPwvAFWBp1iwdshSZRsL4jjRvPG9JP1uiqMHRto+YU6R2/CzDz5Q==}
+  fast-uri@3.1.8:
+    resolution: {integrity: sha512-GZMtZUTNRpOVIECoXwLNZS5xUGE+mVNbTB8h/7Rwh2TFWcBQiPzTgyZi05BF9UMZKkLJv8XBRJTlU7zg8+ZfMg==}
 
   fast-wrap-ansi@0.2.2:
     resolution: {integrity: sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q==}
@@ -4326,14 +4328,18 @@ packages:
   flow-enums-runtime@0.0.6:
     resolution: {integrity: sha512-3PYnM29RFXwvAN6Pc/scUfkI7RwhQ/xqyLUyPNlXUp9S40zI8nup9tUSrTLSVnWGBN38FNiGWbwZOB6uR4OGdw==}
 
-  flow-estree@0.329.0:
-    resolution: {integrity: sha512-Stv2+LumW7n6DUrV+KlqB4HikeyQtLFUpd9iVexISblopKiYFjNYMmTGUcN5at8NKEmkhjAV5UGps3Z8QqK1lw==}
+  flow-estree@0.332.0:
+    resolution: {integrity: sha512-nsh1Ty3l/a8xJLGWnrZ0VFfQXjIpA6Gm1LqovVyj8RR6gE9Hz/cDl951qNNUnZtJ08u+6V0SFrY66XAoct76Fg==}
     engines: {node: '>=18'}
 
-  flow-parser@0.329.0:
-    resolution: {integrity: sha512-skMH3HUOF3+JSlIKt4F/LITfzMGEPpJ0S+Gu7HcmxOjWeYEO5PUZJi5WpLw+L4MZaNcMEkzUtoN+M2fAbiutWA==}
+  flow-parser@0.332.0:
+    resolution: {integrity: sha512-Ly9ylvWknL6YGW2lq0stmDg8PfEh9qHxPoqlZLDjjH/9yd9Ik37m335a0WngsxQvDfrW8lwBPm++RmZm3e4lFQ==}
     engines: {node: '>=0.4.0'}
 
+  flru@1.0.2:
+    resolution: {integrity: sha512-kWyh8ADvHBFz6ua5xYOPnUroZTT/bwWfrCeL0Wj1dzG4/YOmOcfJ99W8dOVyyynJN35rZ9aCOtHChqQovV7yog==}
+    engines: {node: '>=6'}
+
   for-in@1.0.2:
     resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==}
     engines: {node: '>=0.10.0'}
@@ -4352,11 +4358,6 @@ packages:
   fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
-  fsevents@2.3.2:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
-    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
-    os: [darwin]
-
   fsevents@2.3.3:
     resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
@@ -4380,8 +4381,8 @@ packages:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
     engines: {node: 6.* || 8.* || >= 10.*}
 
-  get-east-asian-width@1.6.0:
-    resolution: {integrity: sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==}
+  get-east-asian-width@1.7.0:
+    resolution: {integrity: sha512-XjH1AECxf0giL2V1aU8vKyRR2ppRUb5c0EvT7zuJTokQ74bNo52zOtghqdWIqrhUD79fo3x0WfKZdOqxF6LG1Q==}
     engines: {node: '>=18'}
 
   get-own-enumerable-property-symbols@3.0.2:
@@ -4427,8 +4428,8 @@ packages:
     resolution: {integrity: sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ==}
     deprecated: Removed event-stream from gulp-header
 
-  happy-dom@20.12.0:
-    resolution: {integrity: sha512-7uMYJu2SEwwL8vVcKp0C0lnt6d2LSGGe+T+oY79PiCJNNSgFpbxW8n5KuzpDQvrU4mt+fYiK1+Jy7Z2v39YR6g==}
+  happy-dom@20.14.5:
+    resolution: {integrity: sha512-x/RzkpWO40bTjIoT30iQtt64FLLmH/iRcUCN2X//bLx7H3ifkdfPXyqsro/OYtqzIAhiLMMA7mmiOR9C3NOKjQ==}
     engines: {node: '>=20.0.0'}
 
   has-flag@4.0.0:
@@ -4454,17 +4455,14 @@ packages:
   hermes-parser@0.35.0:
     resolution: {integrity: sha512-9JLjeHxBx8T4CAsydZR49PNZUaix+WpQJwu9p2010lu+7Kwl6D/7wYFFJxoz+aXkaaClp9Zfg6W6/zVlSJORaA==}
 
-  hono@4.13.5:
-    resolution: {integrity: sha512-O6+/eCYRkzzzy0rPWwKLiGBR1nFuUPZynnwjxN1MBA62NNqbT0wQEzQyK2gSO5yDIDB336sXQleAhOHrzlYyKw==}
+  hono@4.13.8:
+    resolution: {integrity: sha512-/Gng7NfoykZl2pjukW5Z6+8Yxm3BPRf86GTbQnt0SbySkvax4fyL4H3HhY1cCpBGmiW9XDRFzRV+CXK2W8QudQ==}
     engines: {node: '>=16.9.0'}
 
   html-encoding-sniffer@6.0.0:
     resolution: {integrity: sha512-CV9TW3Y3f8/wT0BRFc1/KAVQ3TUHiXmaAb6VW9vtiMFf7SLoMd1PdAc4W3KFOFETBJUb90KatHqlsZMWV+R9Gg==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
 
-  html-escaper@2.0.2:
-    resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
-
   http-errors@2.0.1:
     resolution: {integrity: sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==}
     engines: {node: '>= 0.8'}
@@ -4530,8 +4528,8 @@ packages:
   is-buffer@1.1.6:
     resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
 
-  is-core-module@2.16.2:
-    resolution: {integrity: sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==}
+  is-core-module@2.17.0:
+    resolution: {integrity: sha512-J/vG0zBCbIKOQFfufSwyXdMrsohyJIUNkrnmo6WZGzoM7tr/lsbfW5b2BvisL6zsyMzK9UxV9L6c7AoFbyXHOA==}
     engines: {node: '>= 0.4'}
 
   is-docker@2.2.1:
@@ -4644,14 +4642,6 @@ packages:
     resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
     engines: {node: '>=8'}
 
-  istanbul-lib-report@3.0.1:
-    resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==}
-    engines: {node: '>=10'}
-
-  istanbul-reports@3.2.0:
-    resolution: {integrity: sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==}
-    engines: {node: '>=8'}
-
   jackspeak@3.4.3:
     resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
 
@@ -4694,8 +4684,8 @@ packages:
   jju@1.4.0:
     resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==}
 
-  js-base64@3.9.3:
-    resolution: {integrity: sha512-uwYQp+VJ38FVvtim6qNbit6e9uT6dwWQ4Y1+H9TxhW5hcHjpHwoxlR0nMpqUmIFOmu4VqMxwdJA88gIVuZJQ/g==}
+  js-base64@3.9.4:
+    resolution: {integrity: sha512-PtOMXpEGuP0RRiRXsjzHzl44dMHxSu2CPvAhinupR1tBa88me+1DPqsobl7eupn5UukjLkln1ZnAOAOXOrYG0Q==}
 
   js-levenshtein@1.1.6:
     resolution: {integrity: sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==}
@@ -4714,8 +4704,8 @@ packages:
     resolution: {integrity: sha512-6EuL879VkRA+1Cz578mKMiKvjPNEuk6+r1JaFzoSWejZmtf7xWbIyw1e3KkxlkzTIt9Taw6JBhEppG7utc1P+w==}
     hasBin: true
 
-  js-yaml@4.3.1:
-    resolution: {integrity: sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==}
+  js-yaml@4.3.2:
+    resolution: {integrity: sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==}
     hasBin: true
 
   jsc-safe-url@0.2.4:
@@ -4952,15 +4942,15 @@ packages:
   lru-cache@10.4.3:
     resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
 
-  lru-cache@11.5.2:
-    resolution: {integrity: sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==}
+  lru-cache@11.5.3:
+    resolution: {integrity: sha512-U4N8FgzmWxc8k1VH8Kr6lQg18U7Fjvby6wXHVRX/ZZ7IwWbRMgrRbP0Wrb5q5NVinryp4SQampHKdvtecItxUg==}
     engines: {node: 20 || >=22}
 
   lru-cache@5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
 
-  lru.min@1.1.4:
-    resolution: {integrity: sha512-DqC6n3QQ77zdFpCMASA1a3Jlb64Hv2N2DciFGkO/4L9+q/IpIAuRlKOvCXabtRW6cQf8usbmM6BE/TOPysCdIA==}
+  lru.min@1.1.5:
+    resolution: {integrity: sha512-5J9ysMYUpYIg9RF2vJpy9SinEmSviFSe0GyPpCQ4L5QSkLAgeLXlTAOu2ZwWUU5m+0SBl6gUU1R1ZQB3aKypfA==}
     engines: {bun: '>=1.0.0', deno: '>=1.30.0', node: '>=8.0.0'}
 
   lz-string@1.5.0:
@@ -4980,8 +4970,11 @@ packages:
   magic-string@0.30.21:
     resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
 
-  magicast@0.5.4:
-    resolution: {integrity: sha512-llBEhWm1SacoRwgHUoQJYtwp4PBLF4faQi5TCpIGyGs9n4y5+juI0tDgyKIfpqxckRHaHzouUEph3THklWh03w==}
+  magic-string@1.4.1:
+    resolution: {integrity: sha512-8lyCu36ErXR0J9uaGKlKQoiLZKmtI63YGLE8G2o9jyRPdr4X47LusSOwgOJOzcVtp81fTAAjxR7BwKz682Jhow==}
+
+  magicast@0.5.5:
+    resolution: {integrity: sha512-UicdXN8zQ3JHlxVq+28afMXPr1z7WNY6+7EJnzTdQWkTAlMLF5fNCCKxJHBQwGaNGR11581EiQmQzx73+MvszA==}
 
   make-dir@2.1.0:
     resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
@@ -4991,10 +4984,6 @@ packages:
     resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
     engines: {node: '>=8'}
 
-  make-dir@4.0.0:
-    resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
-    engines: {node: '>=10'}
-
   makeerror@1.0.12:
     resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
 
@@ -5100,8 +5089,8 @@ packages:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
 
-  miniflare@5.20260828.0-alpha:
-    resolution: {integrity: sha512-6nbxhZEcz/UET3Y1OnYPsrAUjUmuFoib3ynUqteRdn1YnDxsLg8cwgZJZCk9QmtOmGzXwzXzgE/d/C0dJAPtVw==}
+  miniflare@5.20260918.0-alpha:
+    resolution: {integrity: sha512-vyIes7yW/OTzHtz4GhcBCTohZfqk2eQNiIkngZ07VRA5Qu24aNgW/TrFwlPkMLMjWDQ8R4JJBBHR/KX+liSDtg==}
     engines: {node: '>=22.0.0'}
     hasBin: true
 
@@ -5166,18 +5155,14 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
-  mrmime@2.0.1:
-    resolution: {integrity: sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==}
-    engines: {node: '>=10'}
-
   ms@2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
 
   ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
-  mysql2@3.24.2:
-    resolution: {integrity: sha512-l9kXeKGwd6VCbSjmpO/bLWb+YCYpbvE4whte8ec6InXebvCNyEEydyRCnRU+TSHNqRLJ8B+Tk1uWb+vMCJgJzA==}
+  mysql2@3.24.4:
+    resolution: {integrity: sha512-A2olluVlj0mvgyIRRISMEzXc51m+21mRtcMVjJyIpt2GG98+XrC9m9HzsqcMsX2LcnfccJvY5NB22g8fENBnOA==}
     engines: {node: '>= 8.0'}
     peerDependencies:
       '@types/node': '>= 8'
@@ -5186,11 +5171,11 @@ packages:
     resolution: {integrity: sha512-Tz09sEL2EEuv5fFowm419c1+a/jSMiBjI9gHxVLrVdbUkkNUUfjsVYs9pVZu5oCon/kmRh9TfLEObFtkVxmY0w==}
     engines: {node: '>=8.0.0'}
 
-  nan@2.28.0:
-    resolution: {integrity: sha512-fTsDz99OTq2sVePhGdp4qQhggZFtKr64ZNVyVajRKtMOkJxYekplBh577PiJB12v/D3s2E5cGtOI45LWp6rnLQ==}
+  nan@2.29.0:
+    resolution: {integrity: sha512-GlGk3HIvitbvs+LT3g6XUP1kpirKNvmDFwF/bmo6XNWSb/eYEs/O4bfgIEIXCZ+lIOTS5xNwDvSGMw6FJdAhtA==}
 
-  nanoid@3.3.18:
-    resolution: {integrity: sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==}
+  nanoid@3.3.19:
+    resolution: {integrity: sha512-Y2tUNy4ouw6tq5oDSKeQYGOyhkUBhNOcGV/02KC+6kd9eDGqdZd++mjMiIDilrBYvjEnCYvVtsuHCuP+okSfug==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
@@ -5231,17 +5216,17 @@ packages:
   node-readfiles@0.2.0:
     resolution: {integrity: sha512-SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA==}
 
-  node-releases@2.0.54:
-    resolution: {integrity: sha512-YHs7BmmcsdAI5Ozuf8JZo6PT0mv2GIWC9vMfvUC3dp65M8hn7Ux8CPL+2oBI7juNuj9d0ndhTcznq2ODBps9cQ==}
+  node-releases@2.0.56:
+    resolution: {integrity: sha512-x0InOIyzgdk+eyaWaRJFH5snEtiImgBgblZ2CyPrLmqqcuMQkEvcDPHbzqbD8eDsSeJbVOjn+crzyzHaM4D+/A==}
     engines: {node: '>=18'}
 
   node-source-walk@7.0.2:
     resolution: {integrity: sha512-71kFFjYaSshDTA8/a2HiTYPLdASWjLJxUyJxGE+ffxU+KhxSBtM9kiLUX+R2yooFdSFKMFpi4n3PFtDy6qXv8A==}
     engines: {node: '>=18'}
 
-  nodemailer@9.0.6:
-    resolution: {integrity: sha512-IQUGFdhdGwI9+AWX+FpUt4DLmvFaOjTMEoneTIWX/RXxuy1TdenPwWrvFMSfLkPKl+HQEXWuSAxEMMbPYXtBmg==}
-    engines: {node: '>=6.0.0'}
+  nodemailer@10.0.10:
+    resolution: {integrity: sha512-He9XskOFms62SyAKkLu8CcGcYHAo+BSHSsORI8s4PJH8qZgZY4L4lDfvyN0twvmbpyG+eGrxpyBlskj9d9rJ8A==}
+    engines: {node: '>=20.0.0'}
 
   normalize-path@3.0.0:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
@@ -5274,8 +5259,8 @@ packages:
     resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==}
     engines: {node: '>=0.10.0'}
 
-  obug@2.1.4:
-    resolution: {integrity: sha512-4a+OsYv9UktOJKE+l1A4OufDgdRF9PifWj+tJnHURo/P+WOxpG4GzUFL9qCalmWauao6ogiG+QvnCovwPoyAWA==}
+  obug@2.2.1:
+    resolution: {integrity: sha512-XrsrhT5sybtKI6wakr2SPOlGZWWYbUXZ7a0jT8/QOeAPau+1X/bSegNe5YR75oJmEZQbKningirmGOEJCIk61Q==}
     engines: {node: '>=12.20.0'}
 
   on-finished@2.3.0:
@@ -5297,8 +5282,8 @@ packages:
     resolution: {integrity: sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA==}
     engines: {node: '>=18'}
 
-  open@11.0.2:
-    resolution: {integrity: sha512-RWqF+pBSkqecEvCKOn8QYhaNdRMJDZRIrlS/7rTDdLHaPcfXGCZ/h8zb413NfvdeAV0MR7T1yJcA34/q+CSm1Q==}
+  open@11.0.4:
+    resolution: {integrity: sha512-++Zlftm0kVLPmzC06t6epuWmcRMDbI4z5P3NNX979WA/k23+NtSOynEGzsVfZwguKw2mi5umVgnBlJQMwRz4Pg==}
     engines: {node: '>=20'}
 
   open@7.4.2:
@@ -5318,8 +5303,8 @@ packages:
     resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
     engines: {node: '>=10'}
 
-  oxlint@1.80.0:
-    resolution: {integrity: sha512-5nTiSps4qdbCWLbxzuO00alHkEO2exR9YMN/ig6QXWrLsYSG0KaObOAM+l6oU2LcKPWoSAGYbkZIGEu1ViiWKA==}
+  oxlint@1.83.0:
+    resolution: {integrity: sha512-cyDzSzaw3uzP0TeCeq3lLRPPoaUxkbB4ZOXj+kn+5r+BX9V+4bNVGk9lxer+WrgcpebH4JxLlJ3KQjveVztOLQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
@@ -5432,13 +5417,13 @@ packages:
     resolution: {integrity: sha512-Xc6PMJ2gher0WZP+rtjefFk26hIb7V1PTLL30bmy1Z2vsRmSvqiss7Ag1XUdyplTGYzIlFNJp4L3vMNmK44N6g==}
     hasBin: true
 
-  playwright-core@1.62.1:
-    resolution: {integrity: sha512-wPYSwEBJY9GHraISXqyqtx0na0LpO3XEX7jNDhntbex7tzUS7kLnZsOlFruFJB4Hi/rhDMjXGqHewDZ68nYZVw==}
+  playwright-core@1.63.0:
+    resolution: {integrity: sha512-rYCsBF/M5HjUch52bbtVONEFjv6Xu8sm8h72dNlR5bzIE1fvC/bxgspzkjSfU+MweEMmPM8KJebG6nnyxo5mCg==}
     engines: {node: '>=20'}
     hasBin: true
 
-  playwright@1.62.1:
-    resolution: {integrity: sha512-0M+L3LAD8/nm554LOla9Ayx0j0tmFZ0FBcoQ7F1VuVHpM/XpiC8RcDzBQB8W5+hA8L22THxELzeF+2WcUzvcLg==}
+  playwright@1.63.0:
+    resolution: {integrity: sha512-+7ziBLidS4NaNCdt57SUDT+wYmmd5fmiQejUic/kb+YsYSCPyOOE9sebzMjNmQrsnNpDJqd4WHvV/8lfKfUDUg==}
     engines: {node: '>=20'}
     hasBin: true
 
@@ -5446,18 +5431,14 @@ packages:
     resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}
     engines: {node: '>=4'}
 
-  pngjs@7.0.0:
-    resolution: {integrity: sha512-LKWqWJRhstyYo9pGvgor/ivk2w94eSjE3RGVuzLGlr3NmD8bf7RcYGze1mNdEHRP6TRP6rMuDHk5t44hnTRyow==}
-    engines: {node: '>=14.19.0'}
-
   postcss-values-parser@6.0.2:
     resolution: {integrity: sha512-YLJpK0N1brcNJrs9WatuJFtHaV9q5aAOj+S4DI5S7jgHlRfm0PIbDCAFRYMQD5SHq7Fy6xsDhyutgS0QOAs0qw==}
     engines: {node: '>=10'}
     peerDependencies:
       postcss: ^8.2.9
 
-  postcss@8.5.26:
-    resolution: {integrity: sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==}
+  postcss@8.5.28:
+    resolution: {integrity: sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==}
     engines: {node: ^10 || ^12 || >=14}
 
   postgres@3.4.9:
@@ -5477,8 +5458,8 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
-  prettier@3.9.6:
-    resolution: {integrity: sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==}
+  prettier@3.9.8:
+    resolution: {integrity: sha512-WRFq3Wn3WId7LLROfMLdH7xaFr2jR62wU8nLO6rQUOLOxNZUviyJQs1M0iIhLexSFy+L+w0ch66wtoO2jRjG0A==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -5553,13 +5534,13 @@ packages:
   react-devtools-core@6.1.5:
     resolution: {integrity: sha512-ePrwPfxAnB+7hgnEr8vpKxL9cmnp7F322t8oqcPshbIQQhDKgFDW4tjhF2wjVbdXF9O/nyuy3sQWd9JGpiLPvA==}
 
-  react-dom@19.2.8:
-    resolution: {integrity: sha512-rVprimfGBG3DR+Tq0IQG2DT5PxKth1WIGDmj5yPmlzr4YBe7uyE+Du4oVqTDXZSHGGGXRtTJEGSSePyQCMBglQ==}
+  react-dom@19.3.0:
+    resolution: {integrity: sha512-JDk8dgif51OjFoDE70+OT9ICyYr+69HlmihNwp1+Nsfbna3t5sIiCa9ZJktDmQ4/1b/rn26hIAR2uYXDMr5r0Q==}
     peerDependencies:
-      react: ^19.2.8
+      react: ^19.3.0
 
-  react-error-boundary@6.1.3:
-    resolution: {integrity: sha512-GnSKpCohFi2nQmJCWwP8O8wub7zexlePvpsejvQr35vS5RTouS1+utTNOmyc540yw5vyOXnSL1rBWsCQDmkyUA==}
+  react-error-boundary@6.1.5:
+    resolution: {integrity: sha512-l2nk+KhgM6e79tAiHEs3tXTdiTW4ARniKYMQN+cLY5vQFpDOkxuXKIC4uIwYuIKoMpFQ6jEbQz9wBArUmq7GWA==}
     peerDependencies:
       '@types/react': ^18.0.0 || ^19.0.0
       react: ^18.0.0 || ^19.0.0
@@ -5588,8 +5569,8 @@ packages:
     resolution: {integrity: sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==}
     engines: {node: '>=0.10.0'}
 
-  react@19.2.8:
-    resolution: {integrity: sha512-PWaYA1L/q9u2u7xYQi+Y3L3Yfnie7XyLeaJICV1MGD6LprsBxcAqGjYyr0eY3p+QdsA+x/Irkt4Qif8D63+Sbw==}
+  react@19.3.0:
+    resolution: {integrity: sha512-E8LUcbtBWt20bbl2YoHfx4ZDBdxVTfOKtCZn9cDSJ4l6/nuoApcpIBcj47t2wZoVX8g2ZHuMHbiShgCR1T5Sog==}
     engines: {node: '>=0.10.0'}
 
   readable-stream@2.3.8:
@@ -5687,8 +5668,8 @@ packages:
     deprecated: Rimraf versions prior to v4 are no longer supported
     hasBin: true
 
-  rolldown@1.2.6:
-    resolution: {integrity: sha512-vMM4q3aixf46GiF1Kok8jDPFsEpXgFWGjUHXNkNHNm+Y2adXAG2dbX91jkti3i0ZRsOlcmbuzAz1poObSHCmUA==}
+  rolldown@1.2.9:
+    resolution: {integrity: sha512-hx/Pv0N1haXRb11qkfnK5MXB/iqr7i0yjWQqmO9uHqZpBgQSqzc8UsSnEpalsh+j1I8qQ2CkXAkJC8Br3dKSlg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
@@ -5757,8 +5738,8 @@ packages:
       vite:
         optional: true
 
-  rollup@4.63.1:
-    resolution: {integrity: sha512-3Df9jsstwhccuEfmAMi9l8XUh/GOkVObmFTU7CCVBysEbcOZLl84jCtaAZMcPiMz2EGKsATzQcU+Xr3n/wU6cg==}
+  rollup@4.63.4:
+    resolution: {integrity: sha512-4U0liVayNIoLp3GFl1FcI8561WepLnZ1rqfraGh7S9B3Ur5F9S283y8Futii7RUU2C/97tOBmBy7nYvhoiOpbQ==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
@@ -5787,6 +5768,9 @@ packages:
   scheduler@0.27.0:
     resolution: {integrity: sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==}
 
+  scheduler@0.28.0:
+    resolution: {integrity: sha512-juorfCmIkIw8tT+p5BXSm6PJjQF/ycEYmKyzURCIt/RaZIhL+PulbQ9Yu2z1HdOJDdqDTlxA1+xKBmHXJsczAw==}
+
   semver@5.7.2:
     resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}
     hasBin: true
@@ -5840,9 +5824,14 @@ packages:
     resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==}
     engines: {node: '>=8'}
 
-  sharp@0.35.2:
-    resolution: {integrity: sha512-FVtFjtBCMiJS6yb5CX7Sop45WFMpeGw6oRKuJnXYgf/f1ms/D7LE/ZUSNxnW7rZ/dbslQWYkoqFHGPaDBtaK4w==}
+  sharp@0.35.4:
+    resolution: {integrity: sha512-n++8XWcj+jCOr2IOl7h8LbKnGBDY4aPbmprMONBNFdn0ImXqpGVv5zliDs0V9HbmbCQLpbuo2ej9rAoOQTvMDA==}
     engines: {node: '>=20.9.0'}
+    peerDependencies:
+      '@types/node': '*'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
 
   shebang-command@2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
@@ -5884,10 +5873,6 @@ packages:
     resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
     engines: {node: '>=14'}
 
-  sirv@3.0.2:
-    resolution: {integrity: sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==}
-    engines: {node: '>=18'}
-
   sisteransi@1.0.5:
     resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
 
@@ -5934,8 +5919,8 @@ packages:
   sprintf-js@1.1.3:
     resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==}
 
-  sql-escaper@1.5.1:
-    resolution: {integrity: sha512-4toX5E1fQbBrpfXidaHnF0669nkAdETeIPTs2SUjxxD7RRIs9ICG4gtpmfc68JCEKehsdwLFqBu9VlQqZ1P1gg==}
+  sql-escaper@1.5.2:
+    resolution: {integrity: sha512-6CKD38c31SENivxOADeMNLdukOnUxUcflKtzVWzace7Riv1v7cAEym5Cx9Q7gYZ3ezIJI7ZpqecQq8cqNeSSFg==}
     engines: {bun: '>=1.0.0', deno: '>=2.0.0', node: '>=12.0.0'}
 
   ssh-remote-port-forward@1.0.4:
@@ -6124,17 +6109,22 @@ packages:
   tiny-invariant@1.3.3:
     resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
 
-  tinybench@2.9.0:
-    resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
-
   tinybench@6.1.4:
     resolution: {integrity: sha512-9APumHG7r4yOk4X4WlkmE71aZcv1gvin1czO3OQ1U9iJcFA5Ja/ygyb0vPOVHTthFozUYs8CLoLUlM8grb2lTQ==}
     engines: {node: '>=20.0.0'}
 
+  tinybench@6.2.0:
+    resolution: {integrity: sha512-78U2TlB2CnVenajOFzf3BKSm0J6oz5L0NV7g32LCPccvYc0lbWvys4d3uUUCS2B1N8PAf2+aekR8i1KbC3HO7Q==}
+    engines: {node: '>=20.0.0'}
+
   tinyexec@1.3.0:
     resolution: {integrity: sha512-QKAl9m8gWWGHV8jZcPeym6j+XULi6tOf1mT83WYJ4Lk2ytW/uwAWkrP0uFsdoYMdueVJ0qs26wZ+23xeB4ibNQ==}
     engines: {node: '>=18'}
 
+  tinyexec@1.3.1:
+    resolution: {integrity: sha512-GCvB3aoys96IuDFBMcTB46JOR6mdMtAToqwiW8JlWhsoh1mhHi/xn9ss/Dg7N555GiJyEt2qzoG/NHCwM6h1EA==}
+    engines: {node: '>=18'}
+
   tinyglobby@0.2.17:
     resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==}
     engines: {node: '>=12.0.0'}
@@ -6169,10 +6159,6 @@ packages:
     resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
     engines: {node: '>=0.6'}
 
-  totalist@3.0.1:
-    resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
-    engines: {node: '>=6'}
-
   tough-cookie@6.0.2:
     resolution: {integrity: sha512-exgYmnmL/sJpR3upZfXG5PoatXQii55xAiXGXzY+sROLZ/Y+SLcp9PgJNI9Vz37HpQ74WvDcLT8eqm+kV3FzrA==}
     engines: {node: '>=16'}
@@ -6234,8 +6220,8 @@ packages:
   tslib@2.8.1:
     resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
-  tstyche@7.2.3:
-    resolution: {integrity: sha512-UqlBOleg3VR9U/BFUzamjD8GK/SeR5qnupJeiX8js9LUpzOAMaDd9tU8nfTLpDdf6AccTm6iqhA6NPd1RdO/yg==}
+  tstyche@7.2.5:
+    resolution: {integrity: sha512-FlC7XYKNfvti6345d5Bpf/U6zZ98y3btlwbtrzeiIotVYeaO4ysq0s4pnkF9cLkWfjnP4Hm+Fq+TXNsfF8EVaA==}
     engines: {node: '>=22'}
     hasBin: true
     peerDependencies:
@@ -6244,8 +6230,8 @@ packages:
       typescript:
         optional: true
 
-  tsx@4.23.12:
-    resolution: {integrity: sha512-FDf4L4sYzKtzWYhU/Xm0AQFdTjdIxNo9ElTf2mxXM6k8YMHXzYUe4yODVaXP4V9uMFbVg8c0qyBccK2OOxb45Q==}
+  tsx@4.23.13:
+    resolution: {integrity: sha512-BL5MGkRln6aDYhb0xbQlEAGw743BaZYWdbWtdJOBriYJboKgUUYCadFp2/FpBBZquBC/ezNBn7wMMPx7FDZUDw==}
     engines: {node: '>=18.0.0'}
     hasBin: true
 
@@ -6285,15 +6271,15 @@ packages:
   undici-types@5.26.5:
     resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
 
-  undici-types@8.3.0:
-    resolution: {integrity: sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==}
+  undici-types@8.9.0:
+    resolution: {integrity: sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg==}
 
   undici@7.29.0:
     resolution: {integrity: sha512-IDxfleLmmbSskfWSUATiN1nfn2rDuvnMOqb5CWR92iIfojA0Ud+ulOAAEQ57LPr9rWmsreUyf5lwyao+7GNNVw==}
     engines: {node: '>=20.18.1'}
 
-  undici@8.10.0:
-    resolution: {integrity: sha512-HvltHd7avK13QIw/oLe4qoOLyoVSoafqJ2jYOrtMRBkbYT31eiBQ8O0ehRKZiEZCMEyLFQNIADpgCWC5fALvYQ==}
+  undici@8.10.2:
+    resolution: {integrity: sha512-/y4/bH9YNU5hi9NIrpOuvGXFcxrj3CMrV+/AYpowAYTpHn8gX/XPFjNy766FPoYY0miQhdW977JFWKGNhBdwyQ==}
     engines: {node: '>=22.19.0'}
 
   unpipe@1.0.0:
@@ -6304,8 +6290,8 @@ packages:
     resolution: {integrity: sha512-gwXJnPRewT4rT7sBi/IvxKTjsms7jX7QIDLOClApuZwR49SXbrB1z2NLUZ+vDHyqCj/n58OzRRqaW+B8OZi8vg==}
     engines: {node: '>=18.12.0'}
 
-  update-browserslist-db@1.3.2:
-    resolution: {integrity: sha512-UQ+MSxlhRm1bzjhU+DcuXfjFO1FzNtqhK5+9Yvlp90ItDLk5vT932A0rFu619nf7RVS+Y/VeaUW1jaRDqZ8VJw==}
+  update-browserslist-db@1.3.3:
+    resolution: {integrity: sha512-pJ2sYawQS0R/WI928Gj5GlPhTGzbMelq0+4INtSYNDV9ErKJcX6xjGWkoG/VnB3dpUm00zALaqkrUD77pO5TDQ==}
     hasBin: true
     peerDependencies:
       browserslist: '>= 4.21.0'
@@ -6320,21 +6306,25 @@ packages:
     resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
     engines: {node: '>= 0.4.0'}
 
-  valibot@1.4.2:
-    resolution: {integrity: sha512-gjdCvJ6d3RyHAneqxMYMW9QMCwYMb3jpOO0IyHZV1bnRHFBHrX3VkIILt5XYR0WhwHiH7Mty8ovuPZ/O3gamrg==}
+  valibot@1.5.0:
+    resolution: {integrity: sha512-nil6AkP2TChWL43Z5uJ6GTxX01CUA+g8LWUM+N/rB9NBbkUMaUsi9PUNzlUPgoKASgmx9f7eGOYpJ04/fSa6FQ==}
     peerDependencies:
       typescript: '>=5'
     peerDependenciesMeta:
       typescript:
         optional: true
 
-  vite@8.2.2:
-    resolution: {integrity: sha512-cFKLV/PRgAUlIRm5WjMjJ86jrftzpqcgH+Us+DS8mI3CDNiH30Whrz8uHL3+MOLPAgqbMBAqWdAHAphOAM+z/Q==}
+  verkit@0.3.2:
+    resolution: {integrity: sha512-zj/ob3UsvJGN0whEAKFp53REA5X66hvffVqoCtVQAakJKnKlH+/PcOfMoFwIG/o4rElqLv/ycAFlx8ZlXUorCg==}
+    engines: {node: '>=18.12.0'}
+
+  vite@8.3.0:
+    resolution: {integrity: sha512-lhZBVvEHefgE+HQZC9O7EBJgCU/nVzFNl7vkS4RE0APtWLP02/8QVIkQtzBxPquh7lq5/78NHipTj7ODQ6XuyQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
       '@types/node': ^20.19.0 || >=22.12.0
-      '@vitejs/devtools': ^0.4.0 || ^0.5.0
+      '@vitejs/devtools': ^0.7.1
       esbuild: ^0.27.0 || ^0.28.0
       jiti: '>=1.21.0'
       less: ^4.0.0
@@ -6371,28 +6361,28 @@ packages:
       yaml:
         optional: true
 
-  vitest-websocket-mock@0.7.0:
-    resolution: {integrity: sha512-OrDWs/FiZl8MfcCjvxLri1Uq2NpFcqbQdFHuotmU5FgA9Z5PHRxCyHdmu/xSPgBzbxO9pz3ZdHtokFELCT7AOg==}
+  vitest-websocket-mock@0.8.0:
+    resolution: {integrity: sha512-HYPmK7bNfEpbyRh6mg72XpHKzyxcfa7kUCSi7HrTy7K0WvqClLZstTHbwzBb9XpshOy+B8ElH+M0a9A/qnD4fA==}
     peerDependencies:
-      vitest: '>=4'
+      vitest: '>=5 <6'
 
-  vitest@4.1.11:
-    resolution: {integrity: sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw==}
-    engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
+  vitest@5.0.1:
+    resolution: {integrity: sha512-iA95lQbKEkvrtTkdAgnWbXfbipWiiWe/hDl2P5tMi6WFwD76G0NxXAGp/M9EOcYupeGJRr6wppMc7CoA41TQjg==}
+    engines: {node: ^22.12.0 || ^24.0.0 || >=26.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
       '@opentelemetry/api': ^1.9.0
-      '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0
-      '@vitest/browser-playwright': 4.1.11
-      '@vitest/browser-preview': 4.1.11
-      '@vitest/browser-webdriverio': 4.1.11
-      '@vitest/coverage-istanbul': 4.1.11
-      '@vitest/coverage-v8': 4.1.11
-      '@vitest/ui': 4.1.11
+      '@types/node': ^22.0.0 || >=24.0.0
+      '@vitest/browser-playwright': 5.0.1
+      '@vitest/browser-preview': 5.0.1
+      '@vitest/browser-webdriverio': ^5.0.0-beta.5 || >=5.0.0
+      '@vitest/coverage-istanbul': 5.0.1
+      '@vitest/coverage-v8': 5.0.1
+      '@vitest/ui': 5.0.1
       happy-dom: '*'
-      jsdom: '*'
-      vite: ^6.0.0 || ^7.0.0 || ^8.0.0
+      jsdom: ~30.0.1
+      vite: ^6.4.0 || ^7.0.0 || ^8.0.0
     peerDependenciesMeta:
       '@edge-runtime/vm':
         optional: true
@@ -6420,8 +6410,8 @@ packages:
   vlq@1.0.1:
     resolution: {integrity: sha512-gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w==}
 
-  vue@3.5.42:
-    resolution: {integrity: sha512-4RyHQTbQvOPs3MfvUO1Sg0YRrKNnA0mAVtvpd12Tg1fKDN7OHBUl1IqSn8zGJjK9nI3NkNp8cgTpVrSZC5TTcA==}
+  vue@3.5.43:
+    resolution: {integrity: sha512-o5qZoksdnjIKvW1srZ3ab7pcDNYAerBjRe54D0LBLfRdCYFrSgBHVXokMas35czQc0//lmx4/tuY4ZNQ+Rf2Ng==}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
@@ -6464,8 +6454,8 @@ packages:
     resolution: {integrity: sha512-1to4zXBxmXHV3IiSSEInrreIlu02vUOvrhxJJH5vcxYTBDAx51cqZiKdyTxlecdKNSjj8EcxGBxNf6Vg+945gw==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
 
-  whatwg-url@17.1.0:
-    resolution: {integrity: sha512-3GeworPmc2ZfEEHP7lEbUfBX/L75wdEsi0rLNhXcXxnoN5jyq0SL5gCy06SGW2cyTIZdTvWIDQNQoza++vKeaw==}
+  whatwg-url@17.1.1:
+    resolution: {integrity: sha512-ohjk1mdUebJVadRt3bAhQhx8lSnISq+GDttK79LFl8EHQkAPvzwctoasC4hs8tBt6kLAncBWWyq1N52qEfKvDw==}
     engines: {node: ^22.14.0 || >=24.0.0}
 
   whatwg-url@5.0.0:
@@ -6481,8 +6471,8 @@ packages:
     engines: {node: '>=8'}
     hasBin: true
 
-  workerd@1.20260828.1:
-    resolution: {integrity: sha512-pB9yvt0kkwZDAGZHmpY59r0o3hM0DzdW6BJERqwZOhunZ3ssOyDSgQxOQer2cSZW4YCFeOTIQYN1qwhK5wv/Cw==}
+  workerd@1.20260918.1:
+    resolution: {integrity: sha512-NsjfQlBNQ0iEniv/STOy4zbp8s5k60PzL1Ter02Eg44arbDhHtf6UOs03E31XDRmmBFxSIkAZuCyld3RKH1wqA==}
     engines: {node: '>=16'}
     hasBin: true
 
@@ -6582,8 +6572,8 @@ packages:
     resolution: {integrity: sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==}
     engines: {node: '>= 6'}
 
-  yaml@2.9.0:
-    resolution: {integrity: sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==}
+  yaml@2.9.1:
+    resolution: {integrity: sha512-3NxN8+78OdzbT7C/WjGsyfPAtJaN3FNDsWxv7Y7mcDsT/oOmgW8BpyQQFFBnvZE3j9Y2Sdz1ULFLezL7Eb2yFw==}
     engines: {node: '>= 14.6'}
     hasBin: true
 
@@ -6613,35 +6603,35 @@ packages:
     resolution: {integrity: sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==}
     engines: {node: '>= 14'}
 
-  zod@4.5.4:
-    resolution: {integrity: sha512-sC95tT5iHHH9gtpj6A81kh+NEaRAUFN+qlUPDUbRfOMvNf5QCBqsb3WgvnpVtK5Y+4UfA6KqufotuTvMGiTlsA==}
+  zod@4.6.5:
+    resolution: {integrity: sha512-v5l/aFXZQeai4awLbOpSoHecE9UiMrnfx75tEXLjNonXVARxQ5mOeipTjROUchszUNCqnE+hqAMujRsRHsut2Q==}
 
 snapshots:
 
   '@adobe/css-tools@4.5.0': {}
 
-  '@asamuzakjp/css-color@6.0.5':
+  '@asamuzakjp/css-color@6.0.7':
     dependencies:
-      '@csstools/css-calc': 3.3.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
-      '@csstools/css-color-parser': 4.1.10(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-calc': 3.4.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-color-parser': 4.2.3(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      lru-cache: 11.5.2
+      lru-cache: 11.5.3
 
-  '@asamuzakjp/dom-selector@8.3.0':
+  '@asamuzakjp/dom-selector@8.3.2':
     dependencies:
-      bidi-js: 1.0.3
+      bidi-js: 1.1.0
       css-tree: 3.2.1
       is-potential-custom-element-name: 1.0.1
-      lru-cache: 11.5.2
+      lru-cache: 11.5.3
 
-  '@azure-rest/core-client@2.8.0(supports-color@10.2.2)':
+  '@azure-rest/core-client@2.9.0(supports-color@10.2.2)':
     dependencies:
       '@azure/abort-controller': 2.2.0
       '@azure/core-auth': 1.11.0(supports-color@10.2.2)
       '@azure/core-rest-pipeline': 1.25.0(supports-color@10.2.2)
       '@azure/core-tracing': 1.4.0
-      '@typespec/ts-http-runtime': 0.3.8(supports-color@10.2.2)
+      '@typespec/ts-http-runtime': 0.3.9(supports-color@10.2.2)
       tslib: 2.8.1
     transitivePeerDependencies:
       - supports-color
@@ -6658,7 +6648,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@azure/core-client@1.11.0(supports-color@10.2.2)':
+  '@azure/core-client@1.11.1(supports-color@10.2.2)':
     dependencies:
       '@azure/abort-controller': 2.2.0
       '@azure/core-auth': 1.11.0(supports-color@10.2.2)
@@ -6692,7 +6682,7 @@ snapshots:
       '@azure/core-tracing': 1.4.0
       '@azure/core-util': 1.14.0(supports-color@10.2.2)
       '@azure/logger': 1.4.0(supports-color@10.2.2)
-      '@typespec/ts-http-runtime': 0.3.8(supports-color@10.2.2)
+      '@typespec/ts-http-runtime': 0.3.9(supports-color@10.2.2)
       tslib: 2.8.1
     transitivePeerDependencies:
       - supports-color
@@ -6704,23 +6694,23 @@ snapshots:
   '@azure/core-util@1.14.0(supports-color@10.2.2)':
     dependencies:
       '@azure/abort-controller': 2.2.0
-      '@typespec/ts-http-runtime': 0.3.8(supports-color@10.2.2)
+      '@typespec/ts-http-runtime': 0.3.9(supports-color@10.2.2)
       tslib: 2.8.1
     transitivePeerDependencies:
       - supports-color
 
-  '@azure/identity@4.13.2(supports-color@10.2.2)':
+  '@azure/identity@4.13.3(supports-color@10.2.2)':
     dependencies:
       '@azure/abort-controller': 2.2.0
       '@azure/core-auth': 1.11.0(supports-color@10.2.2)
-      '@azure/core-client': 1.11.0(supports-color@10.2.2)
+      '@azure/core-client': 1.11.1(supports-color@10.2.2)
       '@azure/core-process': 1.0.0
       '@azure/core-rest-pipeline': 1.25.0(supports-color@10.2.2)
       '@azure/core-tracing': 1.4.0
       '@azure/core-util': 1.14.0(supports-color@10.2.2)
       '@azure/logger': 1.4.0(supports-color@10.2.2)
-      '@azure/msal-browser': 5.20.0
-      '@azure/msal-node': 5.6.0
+      '@azure/msal-browser': 5.22.0
+      '@azure/msal-node': 6.0.1
       open: 10.2.0
       tslib: 2.8.1
     transitivePeerDependencies:
@@ -6728,7 +6718,7 @@ snapshots:
 
   '@azure/keyvault-common@2.1.0(supports-color@10.2.2)':
     dependencies:
-      '@azure-rest/core-client': 2.8.0(supports-color@10.2.2)
+      '@azure-rest/core-client': 2.9.0(supports-color@10.2.2)
       '@azure/abort-controller': 2.2.0
       '@azure/core-auth': 1.11.0(supports-color@10.2.2)
       '@azure/core-rest-pipeline': 1.25.0(supports-color@10.2.2)
@@ -6741,7 +6731,7 @@ snapshots:
 
   '@azure/keyvault-keys@4.10.2(supports-color@10.2.2)':
     dependencies:
-      '@azure-rest/core-client': 2.8.0(supports-color@10.2.2)
+      '@azure-rest/core-client': 2.9.0(supports-color@10.2.2)
       '@azure/abort-controller': 2.2.0
       '@azure/core-auth': 1.11.0(supports-color@10.2.2)
       '@azure/core-lro': 2.7.2(supports-color@10.2.2)
@@ -6757,27 +6747,25 @@ snapshots:
 
   '@azure/logger@1.4.0(supports-color@10.2.2)':
     dependencies:
-      '@typespec/ts-http-runtime': 0.3.8(supports-color@10.2.2)
+      '@typespec/ts-http-runtime': 0.3.9(supports-color@10.2.2)
       tslib: 2.8.1
     transitivePeerDependencies:
       - supports-color
 
-  '@azure/msal-browser@5.20.0':
+  '@azure/msal-browser@5.22.0':
     dependencies:
-      '@azure/msal-common': 16.14.0
+      '@azure/msal-common': 16.14.1
 
-  '@azure/msal-common@16.13.0': {}
+  '@azure/msal-common@16.14.1': {}
 
-  '@azure/msal-common@16.14.0': {}
-
-  '@azure/msal-node@5.6.0':
+  '@azure/msal-node@6.0.1':
     dependencies:
-      '@azure/msal-common': 16.13.0
+      '@azure/msal-common': 16.14.1
       jsonwebtoken: 9.0.3
 
-  '@babel/cli@8.0.4(@babel/core@8.0.1)':
+  '@babel/cli@8.0.6(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
       '@jridgewell/trace-mapping': 0.3.31
       chokidar: 5.0.0
       commander: 14.0.3
@@ -6791,14 +6779,14 @@ snapshots:
       js-tokens: 4.0.0
       picocolors: 1.1.1
 
-  '@babel/code-frame@8.0.0':
+  '@babel/code-frame@8.0.6':
     dependencies:
-      '@babel/helper-validator-identifier': 8.0.4
+      '@babel/helper-validator-identifier': 8.0.6
       js-tokens: 10.0.0
 
   '@babel/compat-data@7.29.7': {}
 
-  '@babel/compat-data@8.0.0': {}
+  '@babel/compat-data@8.0.5': {}
 
   '@babel/core@7.29.7(supports-color@10.2.2)':
     dependencies:
@@ -6807,7 +6795,7 @@ snapshots:
       '@babel/helper-compilation-targets': 7.29.7
       '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)
       '@babel/helpers': 7.29.7
-      '@babel/parser': 7.29.8
+      '@babel/parser': 7.29.9
       '@babel/template': 7.29.7
       '@babel/traverse': 7.29.8(supports-color@10.2.2)
       '@babel/types': 7.29.8
@@ -6820,38 +6808,38 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/core@8.0.1':
+  '@babel/core@8.0.6':
     dependencies:
-      '@babel/code-frame': 8.0.0
-      '@babel/generator': 8.0.0
-      '@babel/helper-compilation-targets': 8.0.0
-      '@babel/helpers': 8.0.0
-      '@babel/parser': 8.0.4
+      '@babel/code-frame': 8.0.6
+      '@babel/generator': 8.0.6
+      '@babel/helper-compilation-targets': 8.0.6
+      '@babel/helpers': 8.0.5
+      '@babel/parser': 8.0.6
       '@babel/template': 8.0.0
-      '@babel/traverse': 8.0.4
-      '@babel/types': 8.0.4
+      '@babel/traverse': 8.0.6
+      '@babel/types': 8.0.6
       '@types/gensync': 1.0.5
       convert-source-map: 2.0.0
-      empathic: 2.0.1
+      empathic: 2.1.0
       gensync: 1.0.0-beta.2
       import-meta-resolve: 4.2.0
       json5: 2.2.3
-      obug: 2.1.4
-      semver: 7.8.5
+      obug: 2.2.1
+      verkit: 0.3.2
 
   '@babel/generator@7.29.8':
     dependencies:
-      '@babel/parser': 7.29.8
+      '@babel/parser': 7.29.9
       '@babel/types': 7.29.8
       '@jridgewell/gen-mapping': 0.3.13
       '@jridgewell/trace-mapping': 0.3.31
       jsesc: 3.1.0
 
-  '@babel/generator@8.0.0':
+  '@babel/generator@8.0.6':
     dependencies:
-      '@babel/parser': 8.0.4
-      '@babel/types': 8.0.4
-      '@jridgewell/gen-mapping': 0.3.13
+      '@babel/parser': 8.0.6
+      '@babel/types': 8.0.6
+      '@jridgewell/gen-mapping': 0.4.0-beta.0
       '@jridgewell/trace-mapping': 0.3.31
       '@types/jsesc': 2.5.1
       jsesc: 3.1.0
@@ -6864,17 +6852,17 @@ snapshots:
     dependencies:
       '@babel/compat-data': 7.29.7
       '@babel/helper-validator-option': 7.29.7
-      browserslist: 4.28.8
+      browserslist: 4.29.0
       lru-cache: 5.1.1
       semver: 6.3.1
 
-  '@babel/helper-compilation-targets@8.0.0':
+  '@babel/helper-compilation-targets@8.0.6':
     dependencies:
-      '@babel/compat-data': 8.0.0
+      '@babel/compat-data': 8.0.5
       '@babel/helper-validator-option': 8.0.0
-      browserslist: 4.28.8
-      lru-cache: 11.5.2
-      semver: 7.8.5
+      browserslist: 4.29.0
+      flru: 1.0.2
+      verkit: 0.3.2
 
   '@babel/helper-create-class-features-plugin@7.29.7(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)':
     dependencies:
@@ -6891,7 +6879,7 @@ snapshots:
 
   '@babel/helper-globals@7.29.7': {}
 
-  '@babel/helper-globals@8.0.0': {}
+  '@babel/helper-globals@8.0.6': {}
 
   '@babel/helper-member-expression-to-functions@7.29.7(supports-color@10.2.2)':
     dependencies:
@@ -6909,8 +6897,8 @@ snapshots:
 
   '@babel/helper-module-imports@8.0.0':
     dependencies:
-      '@babel/traverse': 8.0.4
-      '@babel/types': 8.0.4
+      '@babel/traverse': 8.0.6
+      '@babel/types': 8.0.6
 
   '@babel/helper-module-transforms@7.29.7(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)':
     dependencies:
@@ -6921,12 +6909,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-module-transforms@8.0.1(@babel/core@8.0.1)':
+  '@babel/helper-module-transforms@8.0.6(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
       '@babel/helper-module-imports': 8.0.0
-      '@babel/helper-validator-identifier': 8.0.4
-      '@babel/traverse': 8.0.4
+      '@babel/helper-validator-identifier': 8.0.6
+      '@babel/traverse': 8.0.6
 
   '@babel/helper-optimise-call-expression@7.29.7':
     dependencies:
@@ -6934,9 +6922,9 @@ snapshots:
 
   '@babel/helper-plugin-utils@7.29.7': {}
 
-  '@babel/helper-plugin-utils@8.0.1(@babel/core@8.0.1)':
+  '@babel/helper-plugin-utils@8.0.1(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
 
   '@babel/helper-replace-supers@7.29.7(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)':
     dependencies:
@@ -6956,11 +6944,11 @@ snapshots:
 
   '@babel/helper-string-parser@7.29.7': {}
 
-  '@babel/helper-string-parser@8.0.0': {}
+  '@babel/helper-string-parser@8.0.6': {}
 
   '@babel/helper-validator-identifier@7.29.7': {}
 
-  '@babel/helper-validator-identifier@8.0.4': {}
+  '@babel/helper-validator-identifier@8.0.6': {}
 
   '@babel/helper-validator-option@7.29.7': {}
 
@@ -6971,37 +6959,37 @@ snapshots:
       '@babel/template': 7.29.7
       '@babel/types': 7.29.8
 
-  '@babel/helpers@8.0.0':
+  '@babel/helpers@8.0.5':
     dependencies:
       '@babel/template': 8.0.0
-      '@babel/types': 8.0.4
+      '@babel/types': 8.0.6
 
-  '@babel/parser@7.29.8':
+  '@babel/parser@7.29.9':
     dependencies:
       '@babel/types': 7.29.8
 
-  '@babel/parser@8.0.4':
+  '@babel/parser@8.0.6':
     dependencies:
-      '@babel/types': 8.0.4
+      '@babel/types': 8.0.6
 
-  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@8.0.1)':
+  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
       '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-syntax-bigint@7.8.3(@babel/core@8.0.1)':
+  '@babel/plugin-syntax-bigint@7.8.3(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
       '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@8.0.1)':
+  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
       '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@8.0.1)':
+  '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
       '@babel/helper-plugin-utils': 7.29.7
 
   '@babel/plugin-syntax-flow@7.29.7(@babel/core@7.29.7(supports-color@10.2.2))':
@@ -7009,19 +6997,19 @@ snapshots:
       '@babel/core': 7.29.7(supports-color@10.2.2)
       '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-syntax-import-attributes@7.29.7(@babel/core@8.0.1)':
+  '@babel/plugin-syntax-import-attributes@7.29.7(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
       '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@8.0.1)':
+  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
       '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@8.0.1)':
+  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
       '@babel/helper-plugin-utils': 7.29.7
 
   '@babel/plugin-syntax-jsx@7.29.7(@babel/core@7.29.7(supports-color@10.2.2))':
@@ -7029,44 +7017,44 @@ snapshots:
       '@babel/core': 7.29.7(supports-color@10.2.2)
       '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@8.0.1)':
+  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
       '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@8.0.1)':
+  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
       '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@8.0.1)':
+  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
       '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@8.0.1)':
+  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
       '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@8.0.1)':
+  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
       '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@8.0.1)':
+  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
       '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@8.0.1)':
+  '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
       '@babel/helper-plugin-utils': 7.29.7
 
-  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@8.0.1)':
+  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
       '@babel/helper-plugin-utils': 7.29.7
 
   '@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.7(supports-color@10.2.2))':
@@ -7082,10 +7070,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-export-namespace-from@8.0.1(@babel/core@8.0.1)':
+  '@babel/plugin-transform-export-namespace-from@8.0.1(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
-      '@babel/helper-plugin-utils': 8.0.1(@babel/core@8.0.1)
+      '@babel/core': 8.0.6
+      '@babel/helper-plugin-utils': 8.0.1(@babel/core@8.0.6)
 
   '@babel/plugin-transform-flow-strip-types@7.29.7(@babel/core@7.29.7(supports-color@10.2.2))':
     dependencies:
@@ -7101,11 +7089,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-modules-commonjs@8.0.1(@babel/core@8.0.1)':
+  '@babel/plugin-transform-modules-commonjs@8.0.1(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
-      '@babel/helper-module-transforms': 8.0.1(@babel/core@8.0.1)
-      '@babel/helper-plugin-utils': 8.0.1(@babel/core@8.0.1)
+      '@babel/core': 8.0.6
+      '@babel/helper-module-transforms': 8.0.6(@babel/core@8.0.6)
+      '@babel/helper-plugin-utils': 8.0.1(@babel/core@8.0.6)
 
   '@babel/plugin-transform-nullish-coalescing-operator@7.29.7(@babel/core@7.29.7(supports-color@10.2.2))':
     dependencies:
@@ -7128,7 +7116,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-typescript@7.29.7(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)':
+  '@babel/plugin-transform-typescript@7.29.9(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)':
     dependencies:
       '@babel/core': 7.29.7(supports-color@10.2.2)
       '@babel/helper-annotate-as-pure': 7.29.7
@@ -7153,7 +7141,7 @@ snapshots:
       '@babel/helper-validator-option': 7.29.7
       '@babel/plugin-syntax-jsx': 7.29.7(@babel/core@7.29.7(supports-color@10.2.2))
       '@babel/plugin-transform-modules-commonjs': 7.29.7(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)
-      '@babel/plugin-transform-typescript': 7.29.7(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)
+      '@babel/plugin-transform-typescript': 7.29.9(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)
     transitivePeerDependencies:
       - supports-color
 
@@ -7171,53 +7159,51 @@ snapshots:
   '@babel/template@7.29.7':
     dependencies:
       '@babel/code-frame': 7.29.7
-      '@babel/parser': 7.29.8
+      '@babel/parser': 7.29.9
       '@babel/types': 7.29.8
 
   '@babel/template@8.0.0':
     dependencies:
-      '@babel/code-frame': 8.0.0
-      '@babel/parser': 8.0.4
-      '@babel/types': 8.0.4
+      '@babel/code-frame': 8.0.6
+      '@babel/parser': 8.0.6
+      '@babel/types': 8.0.6
 
   '@babel/traverse@7.29.8(supports-color@10.2.2)':
     dependencies:
       '@babel/code-frame': 7.29.7
       '@babel/generator': 7.29.8
       '@babel/helper-globals': 7.29.7
-      '@babel/parser': 7.29.8
+      '@babel/parser': 7.29.9
       '@babel/template': 7.29.7
       '@babel/types': 7.29.8
       debug: 4.4.3(supports-color@10.2.2)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/traverse@8.0.4':
+  '@babel/traverse@8.0.6':
     dependencies:
-      '@babel/code-frame': 8.0.0
-      '@babel/generator': 8.0.0
-      '@babel/helper-globals': 8.0.0
-      '@babel/parser': 8.0.4
+      '@babel/code-frame': 8.0.6
+      '@babel/generator': 8.0.6
+      '@babel/helper-globals': 8.0.6
+      '@babel/parser': 8.0.6
       '@babel/template': 8.0.0
-      '@babel/types': 8.0.4
-      obug: 2.1.4
+      '@babel/types': 8.0.6
+      obug: 2.2.1
 
   '@babel/types@7.29.8':
     dependencies:
       '@babel/helper-string-parser': 7.29.7
       '@babel/helper-validator-identifier': 7.29.7
 
-  '@babel/types@8.0.4':
+  '@babel/types@8.0.6':
     dependencies:
-      '@babel/helper-string-parser': 8.0.0
-      '@babel/helper-validator-identifier': 8.0.4
+      '@babel/helper-string-parser': 8.0.6
+      '@babel/helper-validator-identifier': 8.0.6
 
   '@balena/dockerignore@1.0.2': {}
 
   '@bcoe/v8-coverage@1.0.2': {}
 
-  '@blazediff/core@1.9.1': {}
-
   '@bramus/specificity@2.4.2':
     dependencies:
       css-tree: 3.2.1
@@ -7255,11 +7241,11 @@ snapshots:
       lodash: 4.18.1
       serialize-query-params: 2.0.4
 
-  '@changesets/apply-release-plan@8.0.0':
+  '@changesets/apply-release-plan@8.1.1':
     dependencies:
-      '@changesets/config': 4.0.0
+      '@changesets/config': 4.0.1
       '@changesets/format': 0.1.2
-      '@changesets/git': 4.0.0
+      '@changesets/git': 4.0.1
       '@changesets/should-skip-package': 1.0.0
       '@changesets/types': 7.0.0
       import-meta-resolve: 4.2.0
@@ -7278,26 +7264,26 @@ snapshots:
     dependencies:
       '@changesets/types': 7.0.0
 
-  '@changesets/changelog-github@1.0.0':
+  '@changesets/changelog-github@1.0.1':
     dependencies:
-      '@changesets/get-github-info': 1.0.0(patch_hash=a5b1907668397f36aab989954aa78993792f578b83e41a164ab7ecd573ac9166)
+      '@changesets/get-github-info': 1.0.1(patch_hash=4b2756eb490a2ad802075423f6b08a5f50f12307ec25e117b20a79e12236b625)
       '@changesets/types': 7.0.0
 
-  '@changesets/cli@3.0.1':
+  '@changesets/cli@3.0.3':
     dependencies:
-      '@changesets/apply-release-plan': 8.0.0
+      '@changesets/apply-release-plan': 8.1.1
       '@changesets/assemble-release-plan': 7.0.0
       '@changesets/changelog-git': 1.0.0
-      '@changesets/config': 4.0.0
+      '@changesets/config': 4.0.1
       '@changesets/errors': 1.0.0
       '@changesets/get-dependents-graph': 3.0.0
-      '@changesets/git': 4.0.0
+      '@changesets/git': 4.0.1
       '@changesets/pre': 3.0.0
-      '@changesets/read': 1.0.0
+      '@changesets/read': 1.0.1
       '@changesets/should-skip-package': 1.0.0
       '@changesets/types': 7.0.0
       '@changesets/write': 1.0.1
-      '@clack/prompts': 1.7.0
+      '@clack/prompts': 1.8.1
       '@manypkg/get-packages': 3.1.0
       '@pnpm/deps.graph-sequencer': 1100.0.1
       cac: 7.0.0
@@ -7305,9 +7291,9 @@ snapshots:
       launch-editor: 2.14.1
       package-manager-detector: 1.8.0
       semver: 7.8.5
-      tinyexec: 1.3.0
+      tinyexec: 1.3.1
 
-  '@changesets/config@4.0.0':
+  '@changesets/config@4.0.1':
     dependencies:
       '@changesets/get-dependents-graph': 3.0.0
       '@changesets/should-skip-package': 1.0.0
@@ -7320,29 +7306,29 @@ snapshots:
   '@changesets/format@0.1.2':
     dependencies:
       package-manager-detector: 1.8.0
-      tinyexec: 1.3.0
+      tinyexec: 1.3.1
 
   '@changesets/get-dependents-graph@3.0.0':
     dependencies:
       '@changesets/types': 7.0.0
       semver: 7.8.5
 
-  '@changesets/get-github-info@1.0.0(patch_hash=a5b1907668397f36aab989954aa78993792f578b83e41a164ab7ecd573ac9166)':
+  '@changesets/get-github-info@1.0.1(patch_hash=4b2756eb490a2ad802075423f6b08a5f50f12307ec25e117b20a79e12236b625)':
     dependencies:
       dataloader: 2.2.3
 
-  '@changesets/git@4.0.0':
+  '@changesets/git@4.0.1':
     dependencies:
       '@changesets/errors': 1.0.0
       '@changesets/types': 7.0.0
       '@manypkg/get-packages': 3.1.0
       picomatch: 4.0.7
-      tinyexec: 1.3.0
+      tinyexec: 1.3.1
 
   '@changesets/parse@1.0.0':
     dependencies:
       '@changesets/types': 7.0.0
-      yaml: 2.9.0
+      yaml: 2.9.1
 
   '@changesets/pre@3.0.0':
     dependencies:
@@ -7350,9 +7336,9 @@ snapshots:
       '@changesets/types': 7.0.0
       '@manypkg/get-packages': 3.1.0
 
-  '@changesets/read@1.0.0':
+  '@changesets/read@1.0.1':
     dependencies:
-      '@changesets/git': 4.0.0
+      '@changesets/git': 4.0.1
       '@changesets/parse': 1.0.0
       '@changesets/types': 7.0.0
 
@@ -7368,52 +7354,52 @@ snapshots:
       '@changesets/types': 7.0.0
       human-id: 4.2.1
 
-  '@clack/core@1.4.3':
+  '@clack/core@1.5.1':
     dependencies:
       fast-wrap-ansi: 0.2.2
       sisteransi: 1.0.5
 
-  '@clack/prompts@1.7.0':
+  '@clack/prompts@1.8.1':
     dependencies:
-      '@clack/core': 1.4.3
+      '@clack/core': 1.5.1
       fast-string-width: 3.0.2
       fast-wrap-ansi: 0.2.2
       sisteransi: 1.0.5
 
   '@clickhouse/client@1.23.1': {}
 
-  '@cloudflare/workerd-darwin-64@1.20260828.1':
+  '@cloudflare/workerd-darwin-64@1.20260918.1':
     optional: true
 
-  '@cloudflare/workerd-darwin-arm64@1.20260828.1':
+  '@cloudflare/workerd-darwin-arm64@1.20260918.1':
     optional: true
 
-  '@cloudflare/workerd-linux-64@1.20260828.1':
+  '@cloudflare/workerd-linux-64@1.20260918.1':
     optional: true
 
-  '@cloudflare/workerd-linux-arm64@1.20260828.1':
+  '@cloudflare/workerd-linux-arm64@1.20260918.1':
     optional: true
 
-  '@cloudflare/workerd-windows-64@1.20260828.1':
+  '@cloudflare/workerd-windows-64@1.20260918.1':
     optional: true
 
-  '@cloudflare/workers-types@5.20260829.1': {}
+  '@cloudflare/workers-types@5.20260919.1': {}
 
   '@cspotcode/source-map-support@0.8.1':
     dependencies:
       '@jridgewell/trace-mapping': 0.3.9
 
-  '@csstools/color-helpers@6.1.0': {}
+  '@csstools/color-helpers@6.1.1': {}
 
-  '@csstools/css-calc@3.3.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)':
+  '@csstools/css-calc@3.4.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)':
     dependencies:
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
 
-  '@csstools/css-color-parser@4.1.10(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)':
+  '@csstools/css-color-parser@4.2.3(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)':
     dependencies:
-      '@csstools/color-helpers': 6.1.0
-      '@csstools/css-calc': 3.3.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/color-helpers': 6.1.1
+      '@csstools/css-calc': 3.4.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
 
@@ -7421,7 +7407,7 @@ snapshots:
     dependencies:
       '@csstools/css-tokenizer': 4.0.0
 
-  '@csstools/css-syntax-patches-for-csstree@1.1.7(css-tree@3.2.1)':
+  '@csstools/css-syntax-patches-for-csstree@1.1.14(css-tree@3.2.1)':
     optionalDependencies:
       css-tree: 3.2.1
 
@@ -7434,49 +7420,49 @@ snapshots:
 
   '@discoveryjs/json-ext@1.1.0': {}
 
-  '@dprint/android-arm64@0.56.1':
+  '@dprint/android-arm64@0.57.4':
     optional: true
 
-  '@dprint/android-x64@0.56.1':
+  '@dprint/android-x64@0.57.4':
     optional: true
 
-  '@dprint/darwin-arm64@0.56.1':
+  '@dprint/darwin-arm64@0.57.4':
     optional: true
 
-  '@dprint/darwin-x64@0.56.1':
+  '@dprint/darwin-x64@0.57.4':
     optional: true
 
-  '@dprint/linux-arm64-glibc@0.56.1':
+  '@dprint/linux-arm64-glibc@0.57.4':
     optional: true
 
-  '@dprint/linux-arm64-musl@0.56.1':
+  '@dprint/linux-arm64-musl@0.57.4':
     optional: true
 
-  '@dprint/linux-loong64-glibc@0.56.1':
+  '@dprint/linux-loong64-glibc@0.57.4':
     optional: true
 
-  '@dprint/linux-loong64-musl@0.56.1':
+  '@dprint/linux-loong64-musl@0.57.4':
     optional: true
 
-  '@dprint/linux-ppc64-glibc@0.56.1':
+  '@dprint/linux-ppc64-glibc@0.57.4':
     optional: true
 
-  '@dprint/linux-ppc64-musl@0.56.1':
+  '@dprint/linux-ppc64-musl@0.57.4':
     optional: true
 
-  '@dprint/linux-riscv64-glibc@0.56.1':
+  '@dprint/linux-riscv64-glibc@0.57.4':
     optional: true
 
-  '@dprint/linux-x64-glibc@0.56.1':
+  '@dprint/linux-x64-glibc@0.57.4':
     optional: true
 
-  '@dprint/linux-x64-musl@0.56.1':
+  '@dprint/linux-x64-musl@0.57.4':
     optional: true
 
-  '@dprint/win32-arm64@0.56.1':
+  '@dprint/win32-arm64@0.57.4':
     optional: true
 
-  '@dprint/win32-x64@0.56.1':
+  '@dprint/win32-x64@0.57.4':
     optional: true
 
   '@edge-runtime/primitives@6.0.0':
@@ -7502,36 +7488,36 @@ snapshots:
       repeat-string: 1.6.1
       strip-color: 0.1.0
 
-  '@effect/tsgo-darwin-arm64@0.38.0':
+  '@effect/tsgo-darwin-arm64@0.45.0':
     optional: true
 
-  '@effect/tsgo-darwin-x64@0.38.0':
+  '@effect/tsgo-darwin-x64@0.45.0':
     optional: true
 
-  '@effect/tsgo-linux-arm64@0.38.0':
+  '@effect/tsgo-linux-arm64@0.45.0':
     optional: true
 
-  '@effect/tsgo-linux-arm@0.38.0':
+  '@effect/tsgo-linux-arm@0.45.0':
     optional: true
 
-  '@effect/tsgo-linux-x64@0.38.0':
+  '@effect/tsgo-linux-x64@0.45.0':
     optional: true
 
-  '@effect/tsgo-win32-arm64@0.38.0':
+  '@effect/tsgo-win32-arm64@0.45.0':
     optional: true
 
-  '@effect/tsgo-win32-x64@0.38.0':
+  '@effect/tsgo-win32-x64@0.45.0':
     optional: true
 
-  '@effect/tsgo@0.38.0':
+  '@effect/tsgo@0.45.0':
     optionalDependencies:
-      '@effect/tsgo-darwin-arm64': 0.38.0
-      '@effect/tsgo-darwin-x64': 0.38.0
-      '@effect/tsgo-linux-arm': 0.38.0
-      '@effect/tsgo-linux-arm64': 0.38.0
-      '@effect/tsgo-linux-x64': 0.38.0
-      '@effect/tsgo-win32-arm64': 0.38.0
-      '@effect/tsgo-win32-x64': 0.38.0
+      '@effect/tsgo-darwin-arm64': 0.45.0
+      '@effect/tsgo-darwin-x64': 0.45.0
+      '@effect/tsgo-linux-arm': 0.45.0
+      '@effect/tsgo-linux-arm64': 0.45.0
+      '@effect/tsgo-linux-x64': 0.45.0
+      '@effect/tsgo-win32-arm64': 0.45.0
+      '@effect/tsgo-win32-x64': 0.45.0
 
   '@effect/wa-sqlite@0.2.1': {}
 
@@ -7626,7 +7612,7 @@ snapshots:
 
   '@faker-js/faker@10.6.0': {}
 
-  '@grpc/grpc-js@1.14.4':
+  '@grpc/grpc-js@1.14.5':
     dependencies:
       '@grpc/proto-loader': 0.8.1
       '@js-sdsl/ordered-map': 4.4.2
@@ -7647,108 +7633,108 @@ snapshots:
 
   '@img/colour@1.1.0': {}
 
-  '@img/sharp-darwin-arm64@0.35.2':
+  '@img/sharp-darwin-arm64@0.35.4':
     optionalDependencies:
-      '@img/sharp-libvips-darwin-arm64': 1.3.1
+      '@img/sharp-libvips-darwin-arm64': 1.3.3
     optional: true
 
-  '@img/sharp-darwin-x64@0.35.2':
+  '@img/sharp-darwin-x64@0.35.4':
     optionalDependencies:
-      '@img/sharp-libvips-darwin-x64': 1.3.1
+      '@img/sharp-libvips-darwin-x64': 1.3.3
     optional: true
 
-  '@img/sharp-freebsd-wasm32@0.35.2':
+  '@img/sharp-freebsd-wasm32@0.35.4':
     dependencies:
-      '@img/sharp-wasm32': 0.35.2
+      '@img/sharp-wasm32': 0.35.4
     optional: true
 
-  '@img/sharp-libvips-darwin-arm64@1.3.1':
+  '@img/sharp-libvips-darwin-arm64@1.3.3':
     optional: true
 
-  '@img/sharp-libvips-darwin-x64@1.3.1':
+  '@img/sharp-libvips-darwin-x64@1.3.3':
     optional: true
 
-  '@img/sharp-libvips-linux-arm64@1.3.1':
+  '@img/sharp-libvips-linux-arm64@1.3.3':
     optional: true
 
-  '@img/sharp-libvips-linux-arm@1.3.1':
+  '@img/sharp-libvips-linux-arm@1.3.3':
     optional: true
 
-  '@img/sharp-libvips-linux-ppc64@1.3.1':
+  '@img/sharp-libvips-linux-ppc64@1.3.3':
     optional: true
 
-  '@img/sharp-libvips-linux-riscv64@1.3.1':
+  '@img/sharp-libvips-linux-riscv64@1.3.3':
     optional: true
 
-  '@img/sharp-libvips-linux-s390x@1.3.1':
+  '@img/sharp-libvips-linux-s390x@1.3.3':
     optional: true
 
-  '@img/sharp-libvips-linux-x64@1.3.1':
+  '@img/sharp-libvips-linux-x64@1.3.3':
     optional: true
 
-  '@img/sharp-libvips-linuxmusl-arm64@1.3.1':
+  '@img/sharp-libvips-linuxmusl-arm64@1.3.3':
     optional: true
 
-  '@img/sharp-libvips-linuxmusl-x64@1.3.1':
+  '@img/sharp-libvips-linuxmusl-x64@1.3.3':
     optional: true
 
-  '@img/sharp-linux-arm64@0.35.2':
+  '@img/sharp-linux-arm64@0.35.4':
     optionalDependencies:
-      '@img/sharp-libvips-linux-arm64': 1.3.1
+      '@img/sharp-libvips-linux-arm64': 1.3.3
     optional: true
 
-  '@img/sharp-linux-arm@0.35.2':
+  '@img/sharp-linux-arm@0.35.4':
     optionalDependencies:
-      '@img/sharp-libvips-linux-arm': 1.3.1
+      '@img/sharp-libvips-linux-arm': 1.3.3
     optional: true
 
-  '@img/sharp-linux-ppc64@0.35.2':
+  '@img/sharp-linux-ppc64@0.35.4':
     optionalDependencies:
-      '@img/sharp-libvips-linux-ppc64': 1.3.1
+      '@img/sharp-libvips-linux-ppc64': 1.3.3
     optional: true
 
-  '@img/sharp-linux-riscv64@0.35.2':
+  '@img/sharp-linux-riscv64@0.35.4':
     optionalDependencies:
-      '@img/sharp-libvips-linux-riscv64': 1.3.1
+      '@img/sharp-libvips-linux-riscv64': 1.3.3
     optional: true
 
-  '@img/sharp-linux-s390x@0.35.2':
+  '@img/sharp-linux-s390x@0.35.4':
     optionalDependencies:
-      '@img/sharp-libvips-linux-s390x': 1.3.1
+      '@img/sharp-libvips-linux-s390x': 1.3.3
     optional: true
 
-  '@img/sharp-linux-x64@0.35.2':
+  '@img/sharp-linux-x64@0.35.4':
     optionalDependencies:
-      '@img/sharp-libvips-linux-x64': 1.3.1
+      '@img/sharp-libvips-linux-x64': 1.3.3
     optional: true
 
-  '@img/sharp-linuxmusl-arm64@0.35.2':
+  '@img/sharp-linuxmusl-arm64@0.35.4':
     optionalDependencies:
-      '@img/sharp-libvips-linuxmusl-arm64': 1.3.1
+      '@img/sharp-libvips-linuxmusl-arm64': 1.3.3
     optional: true
 
-  '@img/sharp-linuxmusl-x64@0.35.2':
+  '@img/sharp-linuxmusl-x64@0.35.4':
     optionalDependencies:
-      '@img/sharp-libvips-linuxmusl-x64': 1.3.1
+      '@img/sharp-libvips-linuxmusl-x64': 1.3.3
     optional: true
 
-  '@img/sharp-wasm32@0.35.2':
+  '@img/sharp-wasm32@0.35.4':
     dependencies:
       '@emnapi/runtime': 1.11.3
     optional: true
 
-  '@img/sharp-webcontainers-wasm32@0.35.2':
+  '@img/sharp-webcontainers-wasm32@0.35.4':
     dependencies:
-      '@img/sharp-wasm32': 0.35.2
+      '@img/sharp-wasm32': 0.35.4
     optional: true
 
-  '@img/sharp-win32-arm64@0.35.2':
+  '@img/sharp-win32-arm64@0.35.4':
     optional: true
 
-  '@img/sharp-win32-ia32@0.35.2':
+  '@img/sharp-win32-ia32@0.35.4':
     optional: true
 
-  '@img/sharp-win32-x64@0.35.2':
+  '@img/sharp-win32-x64@0.35.4':
     optional: true
 
   '@isaacs/cliui@8.0.2':
@@ -7784,14 +7770,14 @@ snapshots:
     dependencies:
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
       jest-mock: 29.7.0
 
   '@jest/fake-timers@29.7.0':
     dependencies:
       '@jest/types': 29.6.3
       '@sinonjs/fake-timers': 10.3.0
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
       jest-message-util: 29.7.0
       jest-mock: 29.7.0
       jest-util: 29.7.0
@@ -7825,7 +7811,7 @@ snapshots:
       '@jest/schemas': 29.6.3
       '@types/istanbul-lib-coverage': 2.0.6
       '@types/istanbul-reports': 3.0.4
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
       '@types/yargs': 17.0.35
       chalk: 4.1.2
 
@@ -7834,6 +7820,11 @@ snapshots:
       '@jridgewell/sourcemap-codec': 1.6.0
       '@jridgewell/trace-mapping': 0.3.31
 
+  '@jridgewell/gen-mapping@0.4.0-beta.0':
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.6.0
+      '@jridgewell/trace-mapping': 0.3.31
+
   '@jridgewell/remapping@2.3.5':
     dependencies:
       '@jridgewell/gen-mapping': 0.3.13
@@ -7862,7 +7853,7 @@ snapshots:
 
   '@js-sdsl/ordered-map@4.4.2': {}
 
-  '@jsr/db__redis@0.41.2':
+  '@jsr/db__redis@0.42.0':
     dependencies:
       '@jsr/std__async': 1.5.0
       '@jsr/std__bytes': 1.0.6
@@ -7916,20 +7907,20 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@libsql/client@0.17.4':
+  '@libsql/client@0.18.0':
     dependencies:
-      '@libsql/core': 0.17.4
+      '@libsql/core': 0.18.0
       '@libsql/hrana-client': 0.10.0
-      js-base64: 3.9.3
+      js-base64: 3.9.4
       libsql: 0.5.29
       promise-limit: 2.7.0
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
 
-  '@libsql/core@0.17.4':
+  '@libsql/core@0.18.0':
     dependencies:
-      js-base64: 3.9.3
+      js-base64: 3.9.4
 
   '@libsql/darwin-arm64@0.5.29':
     optional: true
@@ -7940,7 +7931,7 @@ snapshots:
   '@libsql/hrana-client@0.10.0':
     dependencies:
       '@libsql/isomorphic-ws': 0.1.5
-      js-base64: 3.9.3
+      js-base64: 3.9.4
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
@@ -7987,191 +7978,189 @@ snapshots:
     dependencies:
       jju: 1.4.0
       tinyglobby: 0.2.17
-      yaml: 2.9.0
+      yaml: 2.9.1
 
   '@napi-rs/lzma-linux-x64-gnu@1.5.1':
     optional: true
 
   '@neon-rs/load@0.0.4': {}
 
-  '@op-engineering/op-sqlite@18.1.4(react-native@0.83.0(@babel/core@8.0.1)(@types/react@19.2.18)(react@19.2.8)(supports-color@10.2.2))(react@19.2.8)':
+  '@op-engineering/op-sqlite@18.2.4(react-native@0.83.0(@babel/core@8.0.6)(@types/react@19.3.0)(react@19.3.0)(supports-color@10.2.2))(react@19.3.0)':
     dependencies:
-      react: 19.2.8
-      react-native: 0.83.0(@babel/core@8.0.1)(@types/react@19.2.18)(react@19.2.8)(supports-color@10.2.2)
+      react: 19.3.0
+      react-native: 0.83.0(@babel/core@8.0.6)(@types/react@19.3.0)(react@19.3.0)(supports-color@10.2.2)
 
-  '@opentelemetry/api-logs@0.221.0':
+  '@opentelemetry/api-logs@0.222.0':
     dependencies:
       '@opentelemetry/api': 1.9.1
 
   '@opentelemetry/api@1.9.1': {}
 
-  '@opentelemetry/context-async-hooks@2.10.0(@opentelemetry/api@1.9.1)':
+  '@opentelemetry/context-async-hooks@2.11.0(@opentelemetry/api@1.9.1)':
     dependencies:
       '@opentelemetry/api': 1.9.1
 
-  '@opentelemetry/core@2.10.0(@opentelemetry/api@1.9.1)':
+  '@opentelemetry/core@2.11.0(@opentelemetry/api@1.9.1)':
     dependencies:
       '@opentelemetry/api': 1.9.1
       '@opentelemetry/semantic-conventions': 1.43.0
 
-  '@opentelemetry/exporter-metrics-otlp-http@0.221.0(@opentelemetry/api@1.9.1)':
+  '@opentelemetry/exporter-metrics-otlp-http@0.222.0(@opentelemetry/api@1.9.1)':
     dependencies:
       '@opentelemetry/api': 1.9.1
-      '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/otlp-exporter-base': 0.221.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/otlp-transformer': 0.221.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/resources': 2.10.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/sdk-metrics': 2.10.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-exporter-base': 0.222.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-transformer': 0.222.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.11.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-metrics': 2.11.0(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/exporter-prometheus@0.221.0(@opentelemetry/api@1.9.1)':
+  '@opentelemetry/exporter-prometheus@0.222.0(@opentelemetry/api@1.9.1)':
     dependencies:
       '@opentelemetry/api': 1.9.1
-      '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/resources': 2.10.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/sdk-metrics': 2.10.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.11.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-metrics': 2.11.0(@opentelemetry/api@1.9.1)
       '@opentelemetry/semantic-conventions': 1.43.0
 
-  '@opentelemetry/exporter-trace-otlp-http@0.221.0(@opentelemetry/api@1.9.1)':
+  '@opentelemetry/exporter-trace-otlp-http@0.222.0(@opentelemetry/api@1.9.1)':
     dependencies:
       '@opentelemetry/api': 1.9.1
-      '@opentelemetry/otlp-exporter-base': 0.221.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/otlp-transformer': 0.221.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/sdk-trace': 2.10.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-exporter-base': 0.222.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-transformer': 0.222.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace': 2.11.0(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/otlp-exporter-base@0.221.0(@opentelemetry/api@1.9.1)':
+  '@opentelemetry/otlp-exporter-base@0.222.0(@opentelemetry/api@1.9.1)':
     dependencies:
       '@opentelemetry/api': 1.9.1
-      '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/otlp-transformer': 0.221.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/otlp-transformer': 0.222.0(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/otlp-transformer@0.221.0(@opentelemetry/api@1.9.1)':
+  '@opentelemetry/otlp-transformer@0.222.0(@opentelemetry/api@1.9.1)':
     dependencies:
       '@opentelemetry/api': 1.9.1
-      '@opentelemetry/api-logs': 0.221.0
-      '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/resources': 2.10.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/sdk-logs': 0.221.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/sdk-metrics': 2.10.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/sdk-trace': 2.10.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/api-logs': 0.222.0
+      '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.11.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-logs': 0.222.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-metrics': 2.11.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace': 2.11.0(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/resources@2.10.0(@opentelemetry/api@1.9.1)':
+  '@opentelemetry/resources@2.11.0(@opentelemetry/api@1.9.1)':
     dependencies:
       '@opentelemetry/api': 1.9.1
-      '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1)
       '@opentelemetry/semantic-conventions': 1.43.0
 
-  '@opentelemetry/sdk-logs@0.221.0(@opentelemetry/api@1.9.1)':
+  '@opentelemetry/sdk-logs@0.222.0(@opentelemetry/api@1.9.1)':
     dependencies:
       '@opentelemetry/api': 1.9.1
-      '@opentelemetry/api-logs': 0.221.0
-      '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/resources': 2.10.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/api-logs': 0.222.0
+      '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.11.0(@opentelemetry/api@1.9.1)
       '@opentelemetry/semantic-conventions': 1.43.0
 
-  '@opentelemetry/sdk-metrics@2.10.0(@opentelemetry/api@1.9.1)':
+  '@opentelemetry/sdk-metrics@2.11.0(@opentelemetry/api@1.9.1)':
     dependencies:
       '@opentelemetry/api': 1.9.1
-      '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/resources': 2.10.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.11.0(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/sdk-trace-base@2.10.0(@opentelemetry/api@1.9.1)':
+  '@opentelemetry/sdk-trace-base@2.11.0(@opentelemetry/api@1.9.1)':
     dependencies:
       '@opentelemetry/api': 1.9.1
-      '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/resources': 2.10.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/sdk-trace': 2.10.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.11.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace': 2.11.0(@opentelemetry/api@1.9.1)
       '@opentelemetry/semantic-conventions': 1.43.0
 
-  '@opentelemetry/sdk-trace-node@2.10.0(@opentelemetry/api@1.9.1)':
+  '@opentelemetry/sdk-trace-node@2.11.0(@opentelemetry/api@1.9.1)':
     dependencies:
       '@opentelemetry/api': 1.9.1
-      '@opentelemetry/context-async-hooks': 2.10.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/sdk-trace-base': 2.10.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/context-async-hooks': 2.11.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace-base': 2.11.0(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/sdk-trace-web@2.10.0(@opentelemetry/api@1.9.1)':
+  '@opentelemetry/sdk-trace-web@2.11.0(@opentelemetry/api@1.9.1)':
     dependencies:
       '@opentelemetry/api': 1.9.1
-      '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/sdk-trace-base': 2.10.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace-base': 2.11.0(@opentelemetry/api@1.9.1)
 
-  '@opentelemetry/sdk-trace@2.10.0(@opentelemetry/api@1.9.1)':
+  '@opentelemetry/sdk-trace@2.11.0(@opentelemetry/api@1.9.1)':
     dependencies:
       '@opentelemetry/api': 1.9.1
-      '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/resources': 2.10.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.11.0(@opentelemetry/api@1.9.1)
       '@opentelemetry/semantic-conventions': 1.43.0
 
   '@opentelemetry/semantic-conventions@1.43.0': {}
 
-  '@oxc-project/types@0.147.0': {}
+  '@oxc-project/types@0.150.0': {}
 
-  '@oxlint/binding-android-arm-eabi@1.80.0':
+  '@oxlint/binding-android-arm-eabi@1.83.0':
     optional: true
 
-  '@oxlint/binding-android-arm64@1.80.0':
+  '@oxlint/binding-android-arm64@1.83.0':
     optional: true
 
-  '@oxlint/binding-darwin-arm64@1.80.0':
+  '@oxlint/binding-darwin-arm64@1.83.0':
     optional: true
 
-  '@oxlint/binding-darwin-x64@1.80.0':
+  '@oxlint/binding-darwin-x64@1.83.0':
     optional: true
 
-  '@oxlint/binding-freebsd-x64@1.80.0':
+  '@oxlint/binding-freebsd-x64@1.83.0':
     optional: true
 
-  '@oxlint/binding-linux-arm-gnueabihf@1.80.0':
+  '@oxlint/binding-linux-arm-gnueabihf@1.83.0':
     optional: true
 
-  '@oxlint/binding-linux-arm-musleabihf@1.80.0':
+  '@oxlint/binding-linux-arm-musleabihf@1.83.0':
     optional: true
 
-  '@oxlint/binding-linux-arm64-gnu@1.80.0':
+  '@oxlint/binding-linux-arm64-gnu@1.83.0':
     optional: true
 
-  '@oxlint/binding-linux-arm64-musl@1.80.0':
+  '@oxlint/binding-linux-arm64-musl@1.83.0':
     optional: true
 
-  '@oxlint/binding-linux-ppc64-gnu@1.80.0':
+  '@oxlint/binding-linux-ppc64-gnu@1.83.0':
     optional: true
 
-  '@oxlint/binding-linux-riscv64-gnu@1.80.0':
+  '@oxlint/binding-linux-riscv64-gnu@1.83.0':
     optional: true
 
-  '@oxlint/binding-linux-riscv64-musl@1.80.0':
+  '@oxlint/binding-linux-riscv64-musl@1.83.0':
     optional: true
 
-  '@oxlint/binding-linux-s390x-gnu@1.80.0':
+  '@oxlint/binding-linux-s390x-gnu@1.83.0':
     optional: true
 
-  '@oxlint/binding-linux-x64-gnu@1.80.0':
+  '@oxlint/binding-linux-x64-gnu@1.83.0':
     optional: true
 
-  '@oxlint/binding-linux-x64-musl@1.80.0':
+  '@oxlint/binding-linux-x64-musl@1.83.0':
     optional: true
 
-  '@oxlint/binding-openharmony-arm64@1.80.0':
+  '@oxlint/binding-openharmony-arm64@1.83.0':
     optional: true
 
-  '@oxlint/binding-win32-arm64-msvc@1.80.0':
+  '@oxlint/binding-win32-arm64-msvc@1.83.0':
     optional: true
 
-  '@oxlint/binding-win32-ia32-msvc@1.80.0':
+  '@oxlint/binding-win32-ia32-msvc@1.83.0':
     optional: true
 
-  '@oxlint/binding-win32-x64-msvc@1.80.0':
+  '@oxlint/binding-win32-x64-msvc@1.83.0':
     optional: true
 
-  '@oxlint/plugins@1.80.0': {}
+  '@oxlint/plugins@1.83.0': {}
 
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
   '@pnpm/deps.graph-sequencer@1100.0.1': {}
 
-  '@polka/url@1.0.0-next.29': {}
-
   '@poppinss/colors@4.1.6':
     dependencies:
       kleur: 4.1.5
@@ -8206,10 +8195,10 @@ snapshots:
 
   '@react-native/assets-registry@0.83.0': {}
 
-  '@react-native/codegen@0.83.0(@babel/core@8.0.1)':
+  '@react-native/codegen@0.83.0(@babel/core@8.0.6)':
     dependencies:
-      '@babel/core': 8.0.1
-      '@babel/parser': 7.29.8
+      '@babel/core': 8.0.6
+      '@babel/parser': 7.29.9
       glob: 7.2.3
       hermes-parser: 0.32.0
       invariant: 2.2.4
@@ -8262,14 +8251,14 @@ snapshots:
 
   '@react-native/normalize-colors@0.83.0': {}
 
-  '@react-native/virtualized-lists@0.83.0(@types/react@19.2.18)(react-native@0.83.0(@babel/core@8.0.1)(@types/react@19.2.18)(react@19.2.8)(supports-color@10.2.2))(react@19.2.8)':
+  '@react-native/virtualized-lists@0.83.0(@types/react@19.3.0)(react-native@0.83.0(@babel/core@8.0.6)(@types/react@19.3.0)(react@19.3.0)(supports-color@10.2.2))(react@19.3.0)':
     dependencies:
       invariant: 2.2.4
       nullthrows: 1.1.1
-      react: 19.2.8
-      react-native: 0.83.0(@babel/core@8.0.1)(@types/react@19.2.18)(react@19.2.8)(supports-color@10.2.2)
+      react: 19.3.0
+      react-native: 0.83.0(@babel/core@8.0.6)(@types/react@19.3.0)(react@19.3.0)(supports-color@10.2.2)
     optionalDependencies:
-      '@types/react': 19.2.18
+      '@types/react': 19.3.0
 
   '@redis/bloom@6.2.1(@redis/client@6.2.1(@opentelemetry/api@1.9.1))':
     dependencies:
@@ -8302,173 +8291,173 @@ snapshots:
 
   '@redocly/config@0.22.0': {}
 
-  '@redocly/openapi-core@1.34.19(supports-color@10.2.2)':
+  '@redocly/openapi-core@1.34.20(supports-color@10.2.2)':
     dependencies:
       '@redocly/ajv': 8.11.2
       '@redocly/config': 0.22.0
       colorette: 1.4.0
       https-proxy-agent: 7.0.6(supports-color@10.2.2)
       js-levenshtein: 1.1.6
-      js-yaml: 4.3.1
+      js-yaml: 4.3.2
       minimatch: 5.1.9
       pluralize: 8.0.0
       yaml-ast-parser: 0.0.43
     transitivePeerDependencies:
       - supports-color
 
-  '@rolldown/binding-android-arm-eabi@1.2.6':
+  '@rolldown/binding-android-arm-eabi@1.2.9':
     optional: true
 
-  '@rolldown/binding-android-arm64@1.2.6':
+  '@rolldown/binding-android-arm64@1.2.9':
     optional: true
 
-  '@rolldown/binding-darwin-arm64@1.2.6':
+  '@rolldown/binding-darwin-arm64@1.2.9':
     optional: true
 
-  '@rolldown/binding-darwin-x64@1.2.6':
+  '@rolldown/binding-darwin-x64@1.2.9':
     optional: true
 
-  '@rolldown/binding-freebsd-x64@1.2.6':
+  '@rolldown/binding-freebsd-x64@1.2.9':
     optional: true
 
-  '@rolldown/binding-linux-arm-gnueabihf@1.2.6':
+  '@rolldown/binding-linux-arm-gnueabihf@1.2.9':
     optional: true
 
-  '@rolldown/binding-linux-arm64-gnu@1.2.6':
+  '@rolldown/binding-linux-arm64-gnu@1.2.9':
     optional: true
 
-  '@rolldown/binding-linux-arm64-musl@1.2.6':
+  '@rolldown/binding-linux-arm64-musl@1.2.9':
     optional: true
 
-  '@rolldown/binding-linux-ppc64-gnu@1.2.6':
+  '@rolldown/binding-linux-ppc64-gnu@1.2.9':
     optional: true
 
-  '@rolldown/binding-linux-s390x-gnu@1.2.6':
+  '@rolldown/binding-linux-s390x-gnu@1.2.9':
     optional: true
 
-  '@rolldown/binding-linux-x64-gnu@1.2.6':
+  '@rolldown/binding-linux-x64-gnu@1.2.9':
     optional: true
 
-  '@rolldown/binding-linux-x64-musl@1.2.6':
+  '@rolldown/binding-linux-x64-musl@1.2.9':
     optional: true
 
-  '@rolldown/binding-openharmony-arm64@1.2.6':
+  '@rolldown/binding-openharmony-arm64@1.2.9':
     optional: true
 
-  '@rolldown/binding-win32-arm64-msvc@1.2.6':
+  '@rolldown/binding-win32-arm64-msvc@1.2.9':
     optional: true
 
-  '@rolldown/binding-win32-x64-msvc@1.2.6':
+  '@rolldown/binding-win32-x64-msvc@1.2.9':
     optional: true
 
   '@rolldown/pluginutils@1.0.1': {}
 
-  '@rollup/plugin-node-resolve@16.0.3(rollup@4.63.1)':
+  '@rollup/plugin-node-resolve@16.0.3(rollup@4.63.4)':
     dependencies:
-      '@rollup/pluginutils': 5.4.0(rollup@4.63.1)
+      '@rollup/pluginutils': 5.4.0(rollup@4.63.4)
       '@types/resolve': 1.20.2
       deepmerge: 4.3.1
       is-module: 1.0.0
       resolve: 1.22.12
     optionalDependencies:
-      rollup: 4.63.1
+      rollup: 4.63.4
 
-  '@rollup/plugin-replace@6.0.3(rollup@4.63.1)':
+  '@rollup/plugin-replace@6.0.3(rollup@4.63.4)':
     dependencies:
-      '@rollup/pluginutils': 5.4.0(rollup@4.63.1)
+      '@rollup/pluginutils': 5.4.0(rollup@4.63.4)
       magic-string: 0.30.21
     optionalDependencies:
-      rollup: 4.63.1
+      rollup: 4.63.4
 
-  '@rollup/plugin-terser@1.0.0(rollup@4.63.1)':
+  '@rollup/plugin-terser@1.0.0(rollup@4.63.4)':
     dependencies:
       serialize-javascript: 7.1.1
       smob: 1.6.2
       terser: 5.51.2
     optionalDependencies:
-      rollup: 4.63.1
+      rollup: 4.63.4
 
-  '@rollup/pluginutils@5.4.0(rollup@4.63.1)':
+  '@rollup/pluginutils@5.4.0(rollup@4.63.4)':
     dependencies:
       '@types/estree': 1.0.9
       estree-walker: 2.0.2
       picomatch: 4.0.7
     optionalDependencies:
-      rollup: 4.63.1
+      rollup: 4.63.4
 
-  '@rollup/rollup-android-arm-eabi@4.63.1':
+  '@rollup/rollup-android-arm-eabi@4.63.4':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.63.1':
+  '@rollup/rollup-android-arm64@4.63.4':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.63.1':
+  '@rollup/rollup-darwin-arm64@4.63.4':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.63.1':
+  '@rollup/rollup-darwin-x64@4.63.4':
     optional: true
 
-  '@rollup/rollup-freebsd-arm64@4.63.1':
+  '@rollup/rollup-freebsd-arm64@4.63.4':
     optional: true
 
-  '@rollup/rollup-freebsd-x64@4.63.1':
+  '@rollup/rollup-freebsd-x64@4.63.4':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.63.1':
+  '@rollup/rollup-linux-arm-gnueabihf@4.63.4':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.63.1':
+  '@rollup/rollup-linux-arm-musleabihf@4.63.4':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.63.1':
+  '@rollup/rollup-linux-arm64-gnu@4.63.4':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.63.1':
+  '@rollup/rollup-linux-arm64-musl@4.63.4':
     optional: true
 
-  '@rollup/rollup-linux-loong64-gnu@4.63.1':
+  '@rollup/rollup-linux-loong64-gnu@4.63.4':
     optional: true
 
-  '@rollup/rollup-linux-loong64-musl@4.63.1':
+  '@rollup/rollup-linux-loong64-musl@4.63.4':
     optional: true
 
-  '@rollup/rollup-linux-ppc64-gnu@4.63.1':
+  '@rollup/rollup-linux-ppc64-gnu@4.63.4':
     optional: true
 
-  '@rollup/rollup-linux-ppc64-musl@4.63.1':
+  '@rollup/rollup-linux-ppc64-musl@4.63.4':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.63.1':
+  '@rollup/rollup-linux-riscv64-gnu@4.63.4':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-musl@4.63.1':
+  '@rollup/rollup-linux-riscv64-musl@4.63.4':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.63.1':
+  '@rollup/rollup-linux-s390x-gnu@4.63.4':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.63.1':
+  '@rollup/rollup-linux-x64-gnu@4.63.4':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.63.1':
+  '@rollup/rollup-linux-x64-musl@4.63.4':
     optional: true
 
-  '@rollup/rollup-openbsd-x64@4.63.1':
+  '@rollup/rollup-openbsd-x64@4.63.4':
     optional: true
 
-  '@rollup/rollup-openharmony-arm64@4.63.1':
+  '@rollup/rollup-openharmony-arm64@4.63.4':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.63.1':
+  '@rollup/rollup-win32-arm64-msvc@4.63.4':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.63.1':
+  '@rollup/rollup-win32-ia32-msvc@4.63.4':
     optional: true
 
-  '@rollup/rollup-win32-x64-gnu@4.63.1':
+  '@rollup/rollup-win32-x64-gnu@4.63.4':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.63.1':
+  '@rollup/rollup-win32-x64-msvc@4.63.4':
     optional: true
 
   '@sinclair/typebox@0.27.12': {}
@@ -8485,7 +8474,7 @@ snapshots:
 
   '@solidjs/testing-library@0.8.10(solid-js@1.9.15)':
     dependencies:
-      '@testing-library/dom': 10.4.1
+      '@testing-library/dom': 10.4.2
       solid-js: 1.9.15
 
   '@speed-highlight/core@1.2.24': {}
@@ -8511,8 +8500,6 @@ snapshots:
   '@sqliteai/sqlite-vector-win32-x86_64@1.0.0':
     optional: true
 
-  '@standard-schema/spec@1.1.0': {}
-
   '@testcontainers/mssqlserver@12.1.0(supports-color@10.2.2)':
     dependencies:
       testcontainers: 12.1.0(supports-color@10.2.2)
@@ -8549,7 +8536,7 @@ snapshots:
       - react-native-b4a
       - supports-color
 
-  '@testing-library/dom@10.4.1':
+  '@testing-library/dom@10.4.2':
     dependencies:
       '@babel/code-frame': 7.29.7
       '@babel/runtime': 7.29.7
@@ -8560,27 +8547,27 @@ snapshots:
       picocolors: 1.1.1
       pretty-format: 27.5.1
 
-  '@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@4.1.11)':
+  '@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.2)(vitest@5.0.1)':
     dependencies:
       '@adobe/css-tools': 4.5.0
-      '@testing-library/dom': 10.4.1
+      '@testing-library/dom': 10.4.2
       aria-query: 5.3.2
       css.escape: 1.5.1
       dom-accessibility-api: 0.6.3
       picocolors: 1.1.1
       redent: 3.0.0
     optionalDependencies:
-      vitest: 4.1.11(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.4.0)(@vitest/coverage-v8@4.1.11)(happy-dom@20.12.0)(jsdom@30.0.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))
+      vitest: 5.0.1(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.6.2)(@vitest/coverage-v8@5.0.1)(happy-dom@20.14.5)(jsdom@30.0.1)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1))
 
-  '@testing-library/react@16.3.3(@testing-library/dom@10.4.1)(@types/react-dom@19.2.5(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@testing-library/react@16.3.3(@testing-library/dom@10.4.2)(@types/react-dom@19.3.0(@types/react@19.3.0))(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)':
     dependencies:
       '@babel/runtime': 7.29.7
-      '@testing-library/dom': 10.4.1
-      react: 19.2.8
-      react-dom: 19.2.8(react@19.2.8)
+      '@testing-library/dom': 10.4.2
+      react: 19.3.0
+      react-dom: 19.3.0(react@19.3.0)
     optionalDependencies:
-      '@types/react': 19.2.18
-      '@types/react-dom': 19.2.5(@types/react@19.2.18)
+      '@types/react': 19.3.0
+      '@types/react-dom': 19.3.0(@types/react@19.3.0)
 
   '@ts-graphviz/adapter@2.0.6':
     dependencies:
@@ -8609,7 +8596,7 @@ snapshots:
 
   '@types/babel__core@7.20.5':
     dependencies:
-      '@babel/parser': 7.29.8
+      '@babel/parser': 7.29.9
       '@babel/types': 7.29.8
       '@types/babel__generator': 7.27.0
       '@types/babel__template': 7.4.4
@@ -8621,16 +8608,16 @@ snapshots:
 
   '@types/babel__template@7.4.4':
     dependencies:
-      '@babel/parser': 7.29.8
+      '@babel/parser': 7.29.9
       '@babel/types': 7.29.8
 
   '@types/babel__traverse@7.28.0':
     dependencies:
       '@babel/types': 7.29.8
 
-  '@types/bun@1.4.0':
+  '@types/bun@1.4.2':
     dependencies:
-      bun-types: 1.4.0
+      bun-types: 1.4.2
 
   '@types/chai@5.2.3':
     dependencies:
@@ -8643,14 +8630,14 @@ snapshots:
 
   '@types/docker-modem@3.0.6':
     dependencies:
-      '@types/node': 26.4.0
-      '@types/ssh2': 1.15.5
+      '@types/node': 26.6.2
+      '@types/ssh2': 1.15.6
 
   '@types/dockerode@4.0.1':
     dependencies:
       '@types/docker-modem': 3.0.6
-      '@types/node': 26.4.0
-      '@types/ssh2': 1.15.5
+      '@types/node': 26.6.2
+      '@types/ssh2': 1.15.6
 
   '@types/doctrine@0.0.9': {}
 
@@ -8660,7 +8647,7 @@ snapshots:
 
   '@types/graceful-fs@4.1.9':
     dependencies:
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
 
   '@types/istanbul-lib-coverage@2.0.6': {}
 
@@ -8674,7 +8661,7 @@ snapshots:
 
   '@types/jscodeshift@17.3.0':
     dependencies:
-      ast-types: 0.16.1
+      ast-types: 0.16.3
       recast: 0.23.21
 
   '@types/jsesc@2.5.1': {}
@@ -8683,40 +8670,40 @@ snapshots:
     dependencies:
       undici-types: 5.26.5
 
-  '@types/node@26.4.0':
+  '@types/node@26.6.2':
     dependencies:
-      undici-types: 8.3.0
+      undici-types: 8.9.0
 
-  '@types/nodemailer@8.0.1':
+  '@types/nodemailer@8.0.2':
     dependencies:
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
 
-  '@types/react-dom@19.2.5(@types/react@19.2.18)':
+  '@types/react-dom@19.3.0(@types/react@19.3.0)':
     dependencies:
-      '@types/react': 19.2.18
+      '@types/react': 19.3.0
 
-  '@types/react@19.2.18':
+  '@types/react@19.3.0':
     dependencies:
       csstype: 3.2.3
 
   '@types/readable-stream@4.0.24':
     dependencies:
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
 
   '@types/resolve@1.20.2': {}
 
-  '@types/scheduler@0.26.0': {}
+  '@types/scheduler@0.28.0': {}
 
   '@types/ssh2-streams@0.1.13':
     dependencies:
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
 
   '@types/ssh2@0.5.52':
     dependencies:
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
       '@types/ssh2-streams': 0.1.13
 
-  '@types/ssh2@1.15.5':
+  '@types/ssh2@1.15.6':
     dependencies:
       '@types/node': 18.19.130
 
@@ -8724,14 +8711,14 @@ snapshots:
 
   '@types/swagger2openapi@7.0.4':
     dependencies:
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
       openapi-types: 12.1.3
 
   '@types/whatwg-mimetype@3.0.2': {}
 
   '@types/ws@8.18.1':
     dependencies:
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
 
   '@types/yargs-parser@21.0.3': {}
 
@@ -8739,27 +8726,27 @@ snapshots:
     dependencies:
       '@types/yargs-parser': 21.0.3
 
-  '@typescript-eslint/project-service@8.68.0(supports-color@10.2.2)(typescript@5.9.3)':
+  '@typescript-eslint/project-service@8.70.0(supports-color@10.2.2)(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.68.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.68.0
+      '@typescript-eslint/tsconfig-utils': 8.70.0(typescript@5.9.3)
+      '@typescript-eslint/types': 8.70.0
       debug: 4.4.3(supports-color@10.2.2)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/tsconfig-utils@8.68.0(typescript@5.9.3)':
+  '@typescript-eslint/tsconfig-utils@8.70.0(typescript@5.9.3)':
     dependencies:
       typescript: 5.9.3
 
-  '@typescript-eslint/types@8.68.0': {}
+  '@typescript-eslint/types@8.70.0': {}
 
-  '@typescript-eslint/typescript-estree@8.68.0(supports-color@10.2.2)(typescript@5.9.3)':
+  '@typescript-eslint/typescript-estree@8.70.0(supports-color@10.2.2)(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/project-service': 8.68.0(supports-color@10.2.2)(typescript@5.9.3)
-      '@typescript-eslint/tsconfig-utils': 8.68.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.68.0
-      '@typescript-eslint/visitor-keys': 8.68.0
+      '@typescript-eslint/project-service': 8.70.0(supports-color@10.2.2)(typescript@5.9.3)
+      '@typescript-eslint/tsconfig-utils': 8.70.0(typescript@5.9.3)
+      '@typescript-eslint/types': 8.70.0
+      '@typescript-eslint/visitor-keys': 8.70.0
       debug: 4.4.3(supports-color@10.2.2)
       minimatch: 10.2.6
       semver: 7.8.5
@@ -8769,9 +8756,9 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/visitor-keys@8.68.0':
+  '@typescript-eslint/visitor-keys@8.70.0':
     dependencies:
-      '@typescript-eslint/types': 8.68.0
+      '@typescript-eslint/types': 8.70.0
       eslint-visitor-keys: 5.0.1
 
   '@typescript/typescript-aix-ppc64@7.0.2':
@@ -8834,7 +8821,7 @@ snapshots:
   '@typescript/typescript-win32-x64@7.0.2':
     optional: true
 
-  '@typespec/ts-http-runtime@0.3.8(supports-color@10.2.2)':
+  '@typespec/ts-http-runtime@0.3.9(supports-color@10.2.2)':
     dependencies:
       http-proxy-agent: 7.0.2(supports-color@10.2.2)
       https-proxy-agent: 7.0.6(supports-color@10.2.2)
@@ -8842,138 +8829,93 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@vitest/browser@4.1.11(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))(vitest@4.1.11)':
-    dependencies:
-      '@blazediff/core': 1.9.1
-      '@vitest/mocker': 4.1.11(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))
-      '@vitest/utils': 4.1.11
-      magic-string: 0.30.21
-      pngjs: 7.0.0
-      sirv: 3.0.2
-      tinyrainbow: 3.1.1
-      vitest: 4.1.11(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.4.0)(@vitest/coverage-v8@4.1.11)(happy-dom@20.12.0)(jsdom@30.0.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))
-      ws: 8.21.3
-    transitivePeerDependencies:
-      - bufferutil
-      - msw
-      - utf-8-validate
-      - vite
-
-  '@vitest/coverage-v8@4.1.11(@vitest/browser@4.1.11)(vitest@4.1.11)':
+  '@vitest/coverage-v8@5.0.1(vitest@5.0.1)':
     dependencies:
       '@bcoe/v8-coverage': 1.0.2
-      '@vitest/utils': 4.1.11
-      ast-v8-to-istanbul: 1.0.5
-      istanbul-lib-coverage: 3.2.2
-      istanbul-lib-report: 3.0.1
-      istanbul-reports: 3.2.0
-      magicast: 0.5.4
-      obug: 2.1.4
+      '@vitest/istanbul-lib-coverage': 1.0.1
+      '@vitest/istanbul-lib-report': 1.0.1
+      ast-v8-to-istanbul: 1.0.6
+      magicast: 0.5.5
+      obug: 2.2.1
       std-env: 4.2.0
       tinyrainbow: 3.1.1
-      vitest: 4.1.11(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.4.0)(@vitest/coverage-v8@4.1.11)(happy-dom@20.12.0)(jsdom@30.0.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))
-    optionalDependencies:
-      '@vitest/browser': 4.1.11(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))(vitest@4.1.11)
+      vitest: 5.0.1(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.6.2)(@vitest/coverage-v8@5.0.1)(happy-dom@20.14.5)(jsdom@30.0.1)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1))
+
+  '@vitest/istanbul-lib-coverage@1.0.1': {}
 
-  '@vitest/expect@4.1.11':
+  '@vitest/istanbul-lib-report@1.0.1':
     dependencies:
-      '@standard-schema/spec': 1.1.0
-      '@types/chai': 5.2.3
-      '@vitest/spy': 4.1.11
-      '@vitest/utils': 4.1.11
-      chai: 6.2.2
-      tinyrainbow: 3.1.1
+      '@vitest/istanbul-lib-coverage': 1.0.1
 
-  '@vitest/mocker@4.1.11(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))':
+  '@vitest/mocker@5.0.1(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1))':
     dependencies:
-      '@vitest/spy': 4.1.11
+      '@jridgewell/trace-mapping': 0.3.31
+      '@vitest/spy': 5.0.1
       estree-walker: 3.0.3
-      magic-string: 0.30.21
+      magic-string: 1.4.1
     optionalDependencies:
-      vite: 8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0)
-
-  '@vitest/pretty-format@4.1.11':
-    dependencies:
-      tinyrainbow: 3.1.1
-
-  '@vitest/runner@4.1.11':
-    dependencies:
-      '@vitest/utils': 4.1.11
-      pathe: 2.0.3
-
-  '@vitest/snapshot@4.1.11':
-    dependencies:
-      '@vitest/pretty-format': 4.1.11
-      '@vitest/utils': 4.1.11
-      magic-string: 0.30.21
-      pathe: 2.0.3
-
-  '@vitest/spy@4.1.11': {}
+      vite: 8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1)
 
-  '@vitest/utils@4.1.11':
-    dependencies:
-      '@vitest/pretty-format': 4.1.11
-      convert-source-map: 2.0.0
-      tinyrainbow: 3.1.1
+  '@vitest/spy@5.0.1': {}
 
-  '@vitest/web-worker@4.1.11(vitest@4.1.11)':
+  '@vitest/web-worker@5.0.1(vitest@5.0.1)':
     dependencies:
-      obug: 2.1.4
-      vitest: 4.1.11(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.4.0)(@vitest/coverage-v8@4.1.11)(happy-dom@20.12.0)(jsdom@30.0.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))
+      obug: 2.2.1
+      vitest: 5.0.1(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.6.2)(@vitest/coverage-v8@5.0.1)(happy-dom@20.14.5)(jsdom@30.0.1)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1))
 
-  '@vue/compiler-core@3.5.42':
+  '@vue/compiler-core@3.5.43':
     dependencies:
-      '@babel/parser': 7.29.8
-      '@vue/shared': 3.5.42
+      '@babel/parser': 7.29.9
+      '@vue/shared': 3.5.43
       entities: 7.0.1
       estree-walker: 2.0.2
       source-map-js: 1.2.1
 
-  '@vue/compiler-dom@3.5.42':
+  '@vue/compiler-dom@3.5.43':
     dependencies:
-      '@vue/compiler-core': 3.5.42
-      '@vue/shared': 3.5.42
+      '@vue/compiler-core': 3.5.43
+      '@vue/shared': 3.5.43
 
-  '@vue/compiler-sfc@3.5.42':
+  '@vue/compiler-sfc@3.5.43':
     dependencies:
-      '@babel/parser': 7.29.8
-      '@vue/compiler-core': 3.5.42
-      '@vue/compiler-dom': 3.5.42
-      '@vue/compiler-ssr': 3.5.42
-      '@vue/shared': 3.5.42
+      '@babel/parser': 7.29.9
+      '@vue/compiler-core': 3.5.43
+      '@vue/compiler-dom': 3.5.43
+      '@vue/compiler-ssr': 3.5.43
+      '@vue/shared': 3.5.43
       estree-walker: 2.0.2
       magic-string: 0.30.21
-      postcss: 8.5.26
+      postcss: 8.5.28
       source-map-js: 1.2.1
 
-  '@vue/compiler-ssr@3.5.42':
+  '@vue/compiler-ssr@3.5.43':
     dependencies:
-      '@vue/compiler-dom': 3.5.42
-      '@vue/shared': 3.5.42
+      '@vue/compiler-dom': 3.5.43
+      '@vue/shared': 3.5.43
 
-  '@vue/reactivity@3.5.42':
+  '@vue/reactivity@3.5.43':
     dependencies:
-      '@vue/shared': 3.5.42
+      '@vue/shared': 3.5.43
 
-  '@vue/runtime-core@3.5.42':
+  '@vue/runtime-core@3.5.43':
     dependencies:
-      '@vue/reactivity': 3.5.42
-      '@vue/shared': 3.5.42
+      '@vue/reactivity': 3.5.43
+      '@vue/shared': 3.5.43
 
-  '@vue/runtime-dom@3.5.42':
+  '@vue/runtime-dom@3.5.43':
     dependencies:
-      '@vue/reactivity': 3.5.42
-      '@vue/runtime-core': 3.5.42
-      '@vue/shared': 3.5.42
+      '@vue/reactivity': 3.5.43
+      '@vue/runtime-core': 3.5.43
+      '@vue/shared': 3.5.43
       csstype: 3.2.3
 
-  '@vue/server-renderer@3.5.42':
+  '@vue/server-renderer@3.5.43':
     dependencies:
-      '@vue/compiler-ssr': 3.5.42
-      '@vue/runtime-dom': 3.5.42
-      '@vue/shared': 3.5.42
+      '@vue/compiler-ssr': 3.5.43
+      '@vue/runtime-dom': 3.5.43
+      '@vue/shared': 3.5.43
 
-  '@vue/shared@3.5.42': {}
+  '@vue/shared@3.5.43': {}
 
   abort-controller@3.0.0:
     dependencies:
@@ -8995,7 +8937,7 @@ snapshots:
   ajv@8.20.0:
     dependencies:
       fast-deep-equal: 3.1.3
-      fast-uri: 3.1.6
+      fast-uri: 3.1.8
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
 
@@ -9070,11 +9012,11 @@ snapshots:
 
   ast-module-types@6.0.2: {}
 
-  ast-types@0.16.1:
+  ast-types@0.16.3:
     dependencies:
       tslib: 2.8.1
 
-  ast-v8-to-istanbul@1.0.5:
+  ast-v8-to-istanbul@1.0.6:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
       estree-walker: 3.0.3
@@ -9090,24 +9032,24 @@ snapshots:
 
   aws-ssl-profiles@1.1.2: {}
 
-  b4a@1.8.1: {}
+  b4a@1.9.0: {}
 
-  babel-jest@29.7.0(@babel/core@8.0.1)(supports-color@10.2.2):
+  babel-jest@29.7.0(@babel/core@8.0.6)(supports-color@10.2.2):
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
       '@jest/transform': 29.7.0(supports-color@10.2.2)
       '@types/babel__core': 7.20.5
       babel-plugin-istanbul: 6.1.1(supports-color@10.2.2)
-      babel-preset-jest: 29.6.3(@babel/core@8.0.1)
+      babel-preset-jest: 29.6.3(@babel/core@8.0.6)
       chalk: 4.1.2
       graceful-fs: 4.2.11
       slash: 3.0.0
     transitivePeerDependencies:
       - supports-color
 
-  babel-plugin-annotate-pure-calls@0.5.0(@babel/core@8.0.1):
+  babel-plugin-annotate-pure-calls@0.5.0(@babel/core@8.0.6):
     dependencies:
-      '@babel/core': 8.0.1
+      '@babel/core': 8.0.6
 
   babel-plugin-istanbul@6.1.1(supports-color@10.2.2):
     dependencies:
@@ -9130,30 +9072,30 @@ snapshots:
     dependencies:
       hermes-parser: 0.32.0
 
-  babel-preset-current-node-syntax@1.2.0(@babel/core@8.0.1):
-    dependencies:
-      '@babel/core': 8.0.1
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@8.0.1)
-      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@8.0.1)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@8.0.1)
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@8.0.1)
-      '@babel/plugin-syntax-import-attributes': 7.29.7(@babel/core@8.0.1)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@8.0.1)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@8.0.1)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@8.0.1)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@8.0.1)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@8.0.1)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@8.0.1)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@8.0.1)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@8.0.1)
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@8.0.1)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@8.0.1)
-
-  babel-preset-jest@29.6.3(@babel/core@8.0.1):
-    dependencies:
-      '@babel/core': 8.0.1
+  babel-preset-current-node-syntax@1.2.0(@babel/core@8.0.6):
+    dependencies:
+      '@babel/core': 8.0.6
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@8.0.6)
+      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@8.0.6)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@8.0.6)
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@8.0.6)
+      '@babel/plugin-syntax-import-attributes': 7.29.7(@babel/core@8.0.6)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@8.0.6)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@8.0.6)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@8.0.6)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@8.0.6)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@8.0.6)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@8.0.6)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@8.0.6)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@8.0.6)
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@8.0.6)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@8.0.6)
+
+  babel-preset-jest@29.6.3(@babel/core@8.0.6):
+    dependencies:
+      '@babel/core': 8.0.6
       babel-plugin-jest-hoist: 29.6.3
-      babel-preset-current-node-syntax: 1.2.0(@babel/core@8.0.1)
+      babel-preset-current-node-syntax: 1.2.0(@babel/core@8.0.6)
 
   balanced-match@1.0.2: {}
 
@@ -9164,19 +9106,19 @@ snapshots:
   bare-fs@4.8.1:
     dependencies:
       bare-events: 2.9.2
-      bare-path: 3.1.1
+      bare-path: 3.1.2
       bare-stream: 2.13.4(bare-events@2.9.2)
-      bare-url: 2.5.2
+      bare-url: 2.5.4
       fast-fifo: 1.3.2
     transitivePeerDependencies:
       - bare-abort-controller
       - react-native-b4a
 
-  bare-path@3.1.1: {}
+  bare-path@3.1.2: {}
 
   bare-stream@2.13.4(bare-events@2.9.2):
     dependencies:
-      b4a: 1.8.1
+      b4a: 1.9.0
       streamx: 2.28.1
       teex: 1.0.1
     optionalDependencies:
@@ -9184,19 +9126,19 @@ snapshots:
     transitivePeerDependencies:
       - react-native-b4a
 
-  bare-url@2.5.2:
+  bare-url@2.5.4:
     dependencies:
-      bare-path: 3.1.1
+      bare-path: 3.1.2
 
   base64-js@1.5.1: {}
 
-  baseline-browser-mapping@2.11.20: {}
+  baseline-browser-mapping@2.11.25: {}
 
   bcrypt-pbkdf@1.0.2:
     dependencies:
       tweetnacl: 0.14.5
 
-  bidi-js@1.0.3:
+  bidi-js@1.1.0:
     dependencies:
       require-from-string: 2.0.2
 
@@ -9218,11 +9160,11 @@ snapshots:
       balanced-match: 1.0.2
       concat-map: 0.0.1
 
-  brace-expansion@2.1.4:
+  brace-expansion@2.1.7:
     dependencies:
       balanced-match: 1.0.2
 
-  brace-expansion@5.0.9:
+  brace-expansion@5.0.12:
     dependencies:
       balanced-match: 4.0.4
 
@@ -9230,13 +9172,13 @@ snapshots:
     dependencies:
       fill-range: 7.1.1
 
-  browserslist@4.28.8:
+  browserslist@4.29.0:
     dependencies:
-      baseline-browser-mapping: 2.11.20
+      baseline-browser-mapping: 2.11.25
       caniuse-lite: 1.0.30001810
-      electron-to-chromium: 1.5.416
-      node-releases: 2.0.54
-      update-browserslist-db: 1.3.2(browserslist@4.28.8)
+      electron-to-chromium: 1.5.433
+      node-releases: 2.0.56
+      update-browserslist-db: 1.3.3(browserslist@4.29.0)
 
   bser@2.1.1:
     dependencies:
@@ -9250,7 +9192,7 @@ snapshots:
 
   buffer-image-size@0.6.4:
     dependencies:
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
 
   buffer@5.7.1:
     dependencies:
@@ -9265,9 +9207,9 @@ snapshots:
   buildcheck@0.0.7:
     optional: true
 
-  bun-types@1.4.0:
+  bun-types@1.4.2:
     dependencies:
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
 
   bundle-name@4.1.0:
     dependencies:
@@ -9306,7 +9248,7 @@ snapshots:
 
   chrome-launcher@0.15.2(supports-color@10.2.2):
     dependencies:
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
       escape-string-regexp: 4.0.0
       is-wsl: 2.2.0
       lighthouse-logger: 1.4.2(supports-color@10.2.2)
@@ -9315,7 +9257,7 @@ snapshots:
 
   chromium-edge-launcher@0.2.0(supports-color@10.2.2):
     dependencies:
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
       escape-string-regexp: 4.0.0
       is-wsl: 2.2.0
       lighthouse-logger: 1.4.2(supports-color@10.2.2)
@@ -9419,7 +9361,7 @@ snapshots:
   cpu-features@0.0.10:
     dependencies:
       buildcheck: 0.0.7
-      nan: 2.28.0
+      nan: 2.29.0
     optional: true
 
   crc-32@1.2.2: {}
@@ -9520,11 +9462,11 @@ snapshots:
     dependencies:
       node-source-walk: 7.0.2
 
-  detective-postcss@8.0.4(postcss@8.5.26):
+  detective-postcss@8.0.4(postcss@8.5.28):
     dependencies:
       is-url-superb: 4.0.0
-      postcss: 8.5.26
-      postcss-values-parser: 6.0.2(postcss@8.5.26)
+      postcss: 8.5.28
+      postcss-values-parser: 6.0.2(postcss@8.5.28)
 
   detective-sass@6.0.2:
     dependencies:
@@ -9540,7 +9482,7 @@ snapshots:
 
   detective-typescript@14.1.2(supports-color@10.2.2)(typescript@5.9.3):
     dependencies:
-      '@typescript-eslint/typescript-estree': 8.68.0(supports-color@10.2.2)(typescript@5.9.3)
+      '@typescript-eslint/typescript-estree': 8.70.0(supports-color@10.2.2)(typescript@5.9.3)
       ast-module-types: 6.0.2
       node-source-walk: 7.0.2
       typescript: 5.9.3
@@ -9550,7 +9492,7 @@ snapshots:
   detective-vue2@2.3.0(supports-color@10.2.2)(typescript@5.9.3):
     dependencies:
       '@dependents/detective-less': 5.0.3
-      '@vue/compiler-sfc': 3.5.42
+      '@vue/compiler-sfc': 3.5.43
       detective-es6: 5.0.2
       detective-sass: 6.0.2
       detective-scss: 5.0.2
@@ -9562,9 +9504,9 @@ snapshots:
 
   diacritics-map@0.1.0: {}
 
-  docker-compose@1.4.2:
+  docker-compose@1.5.0:
     dependencies:
-      yaml: 2.9.0
+      yaml: 2.9.1
 
   docker-modem@5.0.7(supports-color@10.2.2):
     dependencies:
@@ -9578,7 +9520,7 @@ snapshots:
   dockerode@5.0.1(supports-color@10.2.2):
     dependencies:
       '@balena/dockerignore': 1.0.2
-      '@grpc/grpc-js': 1.14.4
+      '@grpc/grpc-js': 1.14.5
       '@grpc/proto-loader': 0.7.15
       docker-modem: 5.0.7(supports-color@10.2.2)
       protobufjs: 7.6.6
@@ -9594,23 +9536,23 @@ snapshots:
 
   dom-accessibility-api@0.6.3: {}
 
-  dprint@0.56.1:
+  dprint@0.57.4:
     optionalDependencies:
-      '@dprint/android-arm64': 0.56.1
-      '@dprint/android-x64': 0.56.1
-      '@dprint/darwin-arm64': 0.56.1
-      '@dprint/darwin-x64': 0.56.1
-      '@dprint/linux-arm64-glibc': 0.56.1
-      '@dprint/linux-arm64-musl': 0.56.1
-      '@dprint/linux-loong64-glibc': 0.56.1
-      '@dprint/linux-loong64-musl': 0.56.1
-      '@dprint/linux-ppc64-glibc': 0.56.1
-      '@dprint/linux-ppc64-musl': 0.56.1
-      '@dprint/linux-riscv64-glibc': 0.56.1
-      '@dprint/linux-x64-glibc': 0.56.1
-      '@dprint/linux-x64-musl': 0.56.1
-      '@dprint/win32-arm64': 0.56.1
-      '@dprint/win32-x64': 0.56.1
+      '@dprint/android-arm64': 0.57.4
+      '@dprint/android-x64': 0.57.4
+      '@dprint/darwin-arm64': 0.57.4
+      '@dprint/darwin-x64': 0.57.4
+      '@dprint/linux-arm64-glibc': 0.57.4
+      '@dprint/linux-arm64-musl': 0.57.4
+      '@dprint/linux-loong64-glibc': 0.57.4
+      '@dprint/linux-loong64-musl': 0.57.4
+      '@dprint/linux-ppc64-glibc': 0.57.4
+      '@dprint/linux-ppc64-musl': 0.57.4
+      '@dprint/linux-riscv64-glibc': 0.57.4
+      '@dprint/linux-x64-glibc': 0.57.4
+      '@dprint/linux-x64-musl': 0.57.4
+      '@dprint/win32-arm64': 0.57.4
+      '@dprint/win32-x64': 0.57.4
 
   eastasianwidth@0.2.0: {}
 
@@ -9620,7 +9562,7 @@ snapshots:
 
   ee-first@1.1.1: {}
 
-  electron-to-chromium@1.5.416: {}
+  electron-to-chromium@1.5.433: {}
 
   emoji-regex@10.6.0: {}
 
@@ -9628,7 +9570,7 @@ snapshots:
 
   emoji-regex@9.2.2: {}
 
-  empathic@2.0.1: {}
+  empathic@2.1.0: {}
 
   encodeurl@1.0.2: {}
 
@@ -9638,7 +9580,7 @@ snapshots:
     dependencies:
       once: 1.4.0
 
-  enhanced-resolve@5.24.5:
+  enhanced-resolve@5.25.1:
     dependencies:
       graceful-fs: 4.2.11
       tapable: 2.3.3
@@ -9746,7 +9688,7 @@ snapshots:
 
   fake-indexeddb@6.2.5: {}
 
-  fast-check@4.9.0:
+  fast-check@4.10.2:
     dependencies:
       pure-rand: 8.4.2
 
@@ -9764,7 +9706,7 @@ snapshots:
     dependencies:
       fast-string-truncated-width: 3.0.3
 
-  fast-uri@3.1.6: {}
+  fast-uri@3.1.8: {}
 
   fast-wrap-ansi@0.2.2:
     dependencies:
@@ -9784,7 +9726,7 @@ snapshots:
     dependencies:
       app-module-path: 2.2.0
       commander: 12.1.0
-      enhanced-resolve: 5.24.5
+      enhanced-resolve: 5.25.1
       module-definition: 6.0.2
       module-lookup-amd: 9.1.3
       resolve: 1.22.12
@@ -9841,11 +9783,13 @@ snapshots:
 
   flow-enums-runtime@0.0.6: {}
 
-  flow-estree@0.329.0: {}
+  flow-estree@0.332.0: {}
 
-  flow-parser@0.329.0:
+  flow-parser@0.332.0:
     dependencies:
-      flow-estree: 0.329.0
+      flow-estree: 0.332.0
+
+  flru@1.0.2: {}
 
   for-in@1.0.2: {}
 
@@ -9860,9 +9804,6 @@ snapshots:
 
   fs.realpath@1.0.0: {}
 
-  fsevents@2.3.2:
-    optional: true
-
   fsevents@2.3.3:
     optional: true
 
@@ -9881,7 +9822,7 @@ snapshots:
 
   get-caller-file@2.0.5: {}
 
-  get-east-asian-width@1.6.0: {}
+  get-east-asian-width@1.7.0: {}
 
   get-own-enumerable-property-symbols@3.0.2: {}
 
@@ -9936,9 +9877,9 @@ snapshots:
       lodash.template: 4.18.1
       through2: 2.0.5
 
-  happy-dom@20.12.0:
+  happy-dom@20.14.5:
     dependencies:
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
       '@types/whatwg-mimetype': 3.0.2
       '@types/ws': 8.18.1
       buffer-image-size: 0.6.4
@@ -9969,7 +9910,7 @@ snapshots:
     dependencies:
       hermes-estree: 0.35.0
 
-  hono@4.13.5: {}
+  hono@4.13.8: {}
 
   html-encoding-sniffer@6.0.0:
     dependencies:
@@ -9977,8 +9918,6 @@ snapshots:
     transitivePeerDependencies:
       - '@noble/hashes'
 
-  html-escaper@2.0.2: {}
-
   http-errors@2.0.1:
     dependencies:
       depd: 2.0.0
@@ -10040,7 +9979,7 @@ snapshots:
 
   is-buffer@1.1.6: {}
 
-  is-core-module@2.16.2:
+  is-core-module@2.17.0:
     dependencies:
       hasown: 2.0.4
 
@@ -10115,24 +10054,13 @@ snapshots:
   istanbul-lib-instrument@5.2.1(supports-color@10.2.2):
     dependencies:
       '@babel/core': 7.29.7(supports-color@10.2.2)
-      '@babel/parser': 7.29.8
+      '@babel/parser': 7.29.9
       '@istanbuljs/schema': 0.1.6
       istanbul-lib-coverage: 3.2.2
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  istanbul-lib-report@3.0.1:
-    dependencies:
-      istanbul-lib-coverage: 3.2.2
-      make-dir: 4.0.0
-      supports-color: 7.2.0
-
-  istanbul-reports@3.2.0:
-    dependencies:
-      html-escaper: 2.0.2
-      istanbul-lib-report: 3.0.1
-
   jackspeak@3.4.3:
     dependencies:
       '@isaacs/cliui': 8.0.2
@@ -10144,7 +10072,7 @@ snapshots:
       '@jest/environment': 29.7.0
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
       jest-mock: 29.7.0
       jest-util: 29.7.0
 
@@ -10154,7 +10082,7 @@ snapshots:
     dependencies:
       '@jest/types': 29.6.3
       '@types/graceful-fs': 4.1.9
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.11
@@ -10181,7 +10109,7 @@ snapshots:
   jest-mock@29.7.0:
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
       jest-util: 29.7.0
 
   jest-regex-util@29.6.3: {}
@@ -10189,7 +10117,7 @@ snapshots:
   jest-util@29.7.0:
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
       chalk: 4.1.2
       ci-info: 3.9.0
       graceful-fs: 4.2.11
@@ -10206,14 +10134,14 @@ snapshots:
 
   jest-worker@29.7.0:
     dependencies:
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
       jest-util: 29.7.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
   jju@1.4.0: {}
 
-  js-base64@3.9.3: {}
+  js-base64@3.9.4: {}
 
   js-levenshtein@1.1.6: {}
 
@@ -10228,7 +10156,7 @@ snapshots:
       argparse: 1.0.10
       esprima: 4.0.1
 
-  js-yaml@4.3.1:
+  js-yaml@4.3.2:
     dependencies:
       argparse: 2.0.1
 
@@ -10237,7 +10165,7 @@ snapshots:
   jscodeshift@17.4.0(supports-color@10.2.2):
     dependencies:
       '@babel/core': 7.29.7(supports-color@10.2.2)
-      '@babel/parser': 7.29.8
+      '@babel/parser': 7.29.9
       '@babel/plugin-transform-class-properties': 7.29.7(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)
       '@babel/plugin-transform-modules-commonjs': 7.29.7(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)
       '@babel/plugin-transform-nullish-coalescing-operator': 7.29.7(@babel/core@7.29.7(supports-color@10.2.2))
@@ -10246,7 +10174,7 @@ snapshots:
       '@babel/preset-flow': 7.29.7(@babel/core@7.29.7(supports-color@10.2.2))
       '@babel/preset-typescript': 7.29.7(@babel/core@7.29.7(supports-color@10.2.2))(supports-color@10.2.2)
       '@babel/register': 7.29.7(@babel/core@7.29.7(supports-color@10.2.2))
-      flow-parser: 0.329.0
+      flow-parser: 0.332.0
       graceful-fs: 4.2.11
       neo-async: 2.6.2
       picocolors: 1.1.1
@@ -10259,26 +10187,26 @@ snapshots:
 
   jsdom@30.0.1:
     dependencies:
-      '@asamuzakjp/css-color': 6.0.5
-      '@asamuzakjp/dom-selector': 8.3.0
+      '@asamuzakjp/css-color': 6.0.7
+      '@asamuzakjp/dom-selector': 8.3.2
       '@bramus/specificity': 2.4.2
-      '@csstools/css-syntax-patches-for-csstree': 1.1.7(css-tree@3.2.1)
+      '@csstools/css-syntax-patches-for-csstree': 1.1.14(css-tree@3.2.1)
       '@exodus/bytes': 1.15.1
       css-tree: 3.2.1
       data-urls: 7.0.0
       decimal.js: 10.6.0
       html-encoding-sniffer: 6.0.0
       is-potential-custom-element-name: 1.0.1
-      lru-cache: 11.5.2
+      lru-cache: 11.5.3
       parse5: 8.0.1
       saxes: 6.0.0
       symbol-tree: 3.2.4
       tough-cookie: 6.0.2
-      undici: 8.10.0
+      undici: 8.10.2
       w3c-xmlserializer: 5.0.0
       webidl-conversions: 8.0.1
       whatwg-mimetype: 5.0.0
-      whatwg-url: 17.1.0
+      whatwg-url: 17.1.1
       xml-name-validator: 5.0.0
     transitivePeerDependencies:
       - '@noble/hashes'
@@ -10487,13 +10415,13 @@ snapshots:
 
   lru-cache@10.4.3: {}
 
-  lru-cache@11.5.2: {}
+  lru-cache@11.5.3: {}
 
   lru-cache@5.1.1:
     dependencies:
       yallist: 3.1.1
 
-  lru.min@1.1.4: {}
+  lru.min@1.1.5: {}
 
   lz-string@1.5.0: {}
 
@@ -10520,9 +10448,13 @@ snapshots:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.6.0
 
-  magicast@0.5.4:
+  magic-string@1.4.1:
     dependencies:
-      '@babel/parser': 7.29.8
+      '@jridgewell/sourcemap-codec': 1.6.0
+
+  magicast@0.5.5:
+    dependencies:
+      '@babel/parser': 7.29.9
       '@babel/types': 7.29.8
       source-map-js: 1.2.1
 
@@ -10535,10 +10467,6 @@ snapshots:
     dependencies:
       semver: 6.3.1
 
-  make-dir@4.0.0:
-    dependencies:
-      semver: 7.8.5
-
   makeerror@1.0.12:
     dependencies:
       tmpl: 1.0.5
@@ -10587,7 +10515,7 @@ snapshots:
       metro-cache: 0.83.7(supports-color@10.2.2)
       metro-core: 0.83.7
       metro-runtime: 0.83.7
-      yaml: 2.9.0
+      yaml: 2.9.1
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -10667,7 +10595,7 @@ snapshots:
     dependencies:
       '@babel/core': 7.29.7(supports-color@10.2.2)
       '@babel/generator': 7.29.8
-      '@babel/parser': 7.29.8
+      '@babel/parser': 7.29.9
       '@babel/types': 7.29.8
       flow-enums-runtime: 0.0.6
       metro: 0.83.7(supports-color@10.2.2)
@@ -10688,7 +10616,7 @@ snapshots:
       '@babel/code-frame': 7.29.7
       '@babel/core': 7.29.7(supports-color@10.2.2)
       '@babel/generator': 7.29.8
-      '@babel/parser': 7.29.8
+      '@babel/parser': 7.29.9
       '@babel/template': 7.29.7
       '@babel/traverse': 7.29.8(supports-color@10.2.2)
       '@babel/types': 7.29.8
@@ -10746,21 +10674,22 @@ snapshots:
 
   min-indent@1.0.1: {}
 
-  miniflare@5.20260828.0-alpha:
+  miniflare@5.20260918.0-alpha(@types/node@26.6.2):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
-      sharp: 0.35.2
+      sharp: 0.35.4(@types/node@26.6.2)
       undici: 7.29.0
-      workerd: 1.20260828.1
+      workerd: 1.20260918.1
       ws: 8.21.0
       youch: 4.1.0-beta.10
     transitivePeerDependencies:
+      - '@types/node'
       - bufferutil
       - utf-8-validate
 
   minimatch@10.2.6:
     dependencies:
-      brace-expansion: 5.0.9
+      brace-expansion: 5.0.12
 
   minimatch@3.1.5:
     dependencies:
@@ -10768,11 +10697,11 @@ snapshots:
 
   minimatch@5.1.9:
     dependencies:
-      brace-expansion: 2.1.4
+      brace-expansion: 2.1.7
 
   minimatch@9.0.9:
     dependencies:
-      brace-expansion: 2.1.4
+      brace-expansion: 2.1.7
 
   minimist@1.2.8: {}
 
@@ -10808,31 +10737,29 @@ snapshots:
       requirejs: 2.3.8
       requirejs-config-file: 4.0.0
 
-  mrmime@2.0.1: {}
-
   ms@2.0.0: {}
 
   ms@2.1.3: {}
 
-  mysql2@3.24.2(@types/node@26.4.0):
+  mysql2@3.24.4(@types/node@26.6.2):
     dependencies:
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
       aws-ssl-profiles: 1.1.2
       generate-function: 2.3.1
       iconv-lite: 0.7.3
       long: 5.3.2
-      lru.min: 1.1.4
+      lru.min: 1.1.5
       named-placeholders: 1.1.6
-      sql-escaper: 1.5.1
+      sql-escaper: 1.5.2
 
   named-placeholders@1.1.6:
     dependencies:
-      lru.min: 1.1.4
+      lru.min: 1.1.5
 
-  nan@2.28.0:
+  nan@2.29.0:
     optional: true
 
-  nanoid@3.3.18: {}
+  nanoid@3.3.19: {}
 
   native-duplexpair@1.0.0: {}
 
@@ -10858,13 +10785,13 @@ snapshots:
     dependencies:
       es6-promise: 3.3.1
 
-  node-releases@2.0.54: {}
+  node-releases@2.0.56: {}
 
   node-source-walk@7.0.2:
     dependencies:
-      '@babel/parser': 7.29.8
+      '@babel/parser': 7.29.9
 
-  nodemailer@9.0.6: {}
+  nodemailer@10.0.10: {}
 
   normalize-path@3.0.0: {}
 
@@ -10909,7 +10836,7 @@ snapshots:
     dependencies:
       isobject: 3.0.1
 
-  obug@2.1.4: {}
+  obug@2.2.1: {}
 
   on-finished@2.3.0:
     dependencies:
@@ -10934,7 +10861,7 @@ snapshots:
       is-inside-container: 1.0.0
       wsl-utils: 0.1.0
 
-  open@11.0.2:
+  open@11.0.4:
     dependencies:
       default-browser: 5.5.1
       define-lazy-prop: 3.0.0
@@ -10952,7 +10879,7 @@ snapshots:
 
   openapi-typescript@7.13.0(typescript@7.0.2):
     dependencies:
-      '@redocly/openapi-core': 1.34.19(supports-color@10.2.2)
+      '@redocly/openapi-core': 1.34.20(supports-color@10.2.2)
       ansi-colors: 4.1.3
       change-case: 5.4.4
       parse-json: 8.3.0
@@ -10972,27 +10899,27 @@ snapshots:
       strip-ansi: 6.0.1
       wcwidth: 1.0.1
 
-  oxlint@1.80.0:
+  oxlint@1.83.0:
     optionalDependencies:
-      '@oxlint/binding-android-arm-eabi': 1.80.0
-      '@oxlint/binding-android-arm64': 1.80.0
-      '@oxlint/binding-darwin-arm64': 1.80.0
-      '@oxlint/binding-darwin-x64': 1.80.0
-      '@oxlint/binding-freebsd-x64': 1.80.0
-      '@oxlint/binding-linux-arm-gnueabihf': 1.80.0
-      '@oxlint/binding-linux-arm-musleabihf': 1.80.0
-      '@oxlint/binding-linux-arm64-gnu': 1.80.0
-      '@oxlint/binding-linux-arm64-musl': 1.80.0
-      '@oxlint/binding-linux-ppc64-gnu': 1.80.0
-      '@oxlint/binding-linux-riscv64-gnu': 1.80.0
-      '@oxlint/binding-linux-riscv64-musl': 1.80.0
-      '@oxlint/binding-linux-s390x-gnu': 1.80.0
-      '@oxlint/binding-linux-x64-gnu': 1.80.0
-      '@oxlint/binding-linux-x64-musl': 1.80.0
-      '@oxlint/binding-openharmony-arm64': 1.80.0
-      '@oxlint/binding-win32-arm64-msvc': 1.80.0
-      '@oxlint/binding-win32-ia32-msvc': 1.80.0
-      '@oxlint/binding-win32-x64-msvc': 1.80.0
+      '@oxlint/binding-android-arm-eabi': 1.83.0
+      '@oxlint/binding-android-arm64': 1.83.0
+      '@oxlint/binding-darwin-arm64': 1.83.0
+      '@oxlint/binding-darwin-x64': 1.83.0
+      '@oxlint/binding-freebsd-x64': 1.83.0
+      '@oxlint/binding-linux-arm-gnueabihf': 1.83.0
+      '@oxlint/binding-linux-arm-musleabihf': 1.83.0
+      '@oxlint/binding-linux-arm64-gnu': 1.83.0
+      '@oxlint/binding-linux-arm64-musl': 1.83.0
+      '@oxlint/binding-linux-ppc64-gnu': 1.83.0
+      '@oxlint/binding-linux-riscv64-gnu': 1.83.0
+      '@oxlint/binding-linux-riscv64-musl': 1.83.0
+      '@oxlint/binding-linux-s390x-gnu': 1.83.0
+      '@oxlint/binding-linux-x64-gnu': 1.83.0
+      '@oxlint/binding-linux-x64-musl': 1.83.0
+      '@oxlint/binding-openharmony-arm64': 1.83.0
+      '@oxlint/binding-win32-arm64-msvc': 1.83.0
+      '@oxlint/binding-win32-ia32-msvc': 1.83.0
+      '@oxlint/binding-win32-x64-msvc': 1.83.0
 
   p-limit@2.3.0:
     dependencies:
@@ -11045,7 +10972,7 @@ snapshots:
 
   path-scurry@2.0.2:
     dependencies:
-      lru-cache: 11.5.2
+      lru-cache: 11.5.3
       minipass: 7.1.3
 
   pathe@2.0.3: {}
@@ -11070,28 +10997,24 @@ snapshots:
 
   pkg-pr-new@0.0.88: {}
 
-  playwright-core@1.62.1: {}
+  playwright-core@1.63.0: {}
 
-  playwright@1.62.1:
+  playwright@1.63.0:
     dependencies:
-      playwright-core: 1.62.1
-    optionalDependencies:
-      fsevents: 2.3.2
+      playwright-core: 1.63.0
 
   pluralize@8.0.0: {}
 
-  pngjs@7.0.0: {}
-
-  postcss-values-parser@6.0.2(postcss@8.5.26):
+  postcss-values-parser@6.0.2(postcss@8.5.28):
     dependencies:
       color-name: 1.1.4
       is-url-superb: 4.0.0
-      postcss: 8.5.26
+      postcss: 8.5.28
       quote-unquote: 1.0.0
 
-  postcss@8.5.26:
+  postcss@8.5.28:
     dependencies:
-      nanoid: 3.3.18
+      nanoid: 3.3.19
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
@@ -11108,7 +11031,7 @@ snapshots:
       detective-amd: 6.1.0
       detective-cjs: 6.1.1
       detective-es6: 5.0.2
-      detective-postcss: 8.0.4(postcss@8.5.26)
+      detective-postcss: 8.0.4(postcss@8.5.28)
       detective-sass: 6.0.2
       detective-scss: 5.0.2
       detective-stylus: 5.0.1
@@ -11116,12 +11039,12 @@ snapshots:
       detective-vue2: 2.3.0(supports-color@10.2.2)(typescript@5.9.3)
       module-definition: 6.0.2
       node-source-walk: 7.0.2
-      postcss: 8.5.26
+      postcss: 8.5.28
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  prettier@3.9.6: {}
+  prettier@3.9.8: {}
 
   pretty-format@27.5.1:
     dependencies:
@@ -11173,7 +11096,7 @@ snapshots:
       '@protobufjs/path': 1.1.2
       '@protobufjs/pool': 1.1.0
       '@protobufjs/utf8': 1.1.2
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
       long: 5.3.2
 
   protobufjs@8.8.0:
@@ -11218,35 +11141,35 @@ snapshots:
       - bufferutil
       - utf-8-validate
 
-  react-dom@19.2.8(react@19.2.8):
+  react-dom@19.3.0(react@19.3.0):
     dependencies:
-      react: 19.2.8
-      scheduler: 0.27.0
+      react: 19.3.0
+      scheduler: 0.28.0
 
-  react-error-boundary@6.1.3(@types/react@19.2.18)(react@19.2.8):
+  react-error-boundary@6.1.5(@types/react@19.3.0)(react@19.3.0):
     dependencies:
-      react: 19.2.8
+      react: 19.3.0
     optionalDependencies:
-      '@types/react': 19.2.18
+      '@types/react': 19.3.0
 
   react-is@17.0.2: {}
 
   react-is@18.3.1: {}
 
-  react-native@0.83.0(@babel/core@8.0.1)(@types/react@19.2.18)(react@19.2.8)(supports-color@10.2.2):
+  react-native@0.83.0(@babel/core@8.0.6)(@types/react@19.3.0)(react@19.3.0)(supports-color@10.2.2):
     dependencies:
       '@jest/create-cache-key-function': 29.7.0
       '@react-native/assets-registry': 0.83.0
-      '@react-native/codegen': 0.83.0(@babel/core@8.0.1)
+      '@react-native/codegen': 0.83.0(@babel/core@8.0.6)
       '@react-native/community-cli-plugin': 0.83.0(supports-color@10.2.2)
       '@react-native/gradle-plugin': 0.83.0
       '@react-native/js-polyfills': 0.83.0
       '@react-native/normalize-colors': 0.83.0
-      '@react-native/virtualized-lists': 0.83.0(@types/react@19.2.18)(react-native@0.83.0(@babel/core@8.0.1)(@types/react@19.2.18)(react@19.2.8)(supports-color@10.2.2))(react@19.2.8)
+      '@react-native/virtualized-lists': 0.83.0(@types/react@19.3.0)(react-native@0.83.0(@babel/core@8.0.6)(@types/react@19.3.0)(react@19.3.0)(supports-color@10.2.2))(react@19.3.0)
       abort-controller: 3.0.0
       anser: 1.4.10
       ansi-regex: 5.0.1
-      babel-jest: 29.7.0(@babel/core@8.0.1)(supports-color@10.2.2)
+      babel-jest: 29.7.0(@babel/core@8.0.6)(supports-color@10.2.2)
       babel-plugin-syntax-hermes-parser: 0.32.0
       base64-js: 1.5.1
       commander: 12.1.0
@@ -11261,7 +11184,7 @@ snapshots:
       nullthrows: 1.1.1
       pretty-format: 29.7.0
       promise: 8.3.0
-      react: 19.2.8
+      react: 19.3.0
       react-devtools-core: 6.1.5
       react-refresh: 0.14.2
       regenerator-runtime: 0.13.11
@@ -11272,7 +11195,7 @@ snapshots:
       ws: 7.5.13
       yargs: 17.7.3
     optionalDependencies:
-      '@types/react': 19.2.18
+      '@types/react': 19.3.0
     transitivePeerDependencies:
       - '@babel/core'
       - '@react-native-community/cli'
@@ -11283,7 +11206,7 @@ snapshots:
 
   react-refresh@0.14.2: {}
 
-  react@19.2.8: {}
+  react@19.3.0: {}
 
   readable-stream@2.3.8:
     dependencies:
@@ -11317,7 +11240,7 @@ snapshots:
 
   recast@0.23.21:
     dependencies:
-      ast-types: 0.16.1
+      ast-types: 0.16.3
       esprima: 4.0.1
       source-map: 0.6.1
       tiny-invariant: 1.3.3
@@ -11372,7 +11295,7 @@ snapshots:
   resolve@1.22.12:
     dependencies:
       es-errors: 1.3.0
-      is-core-module: 2.16.2
+      is-core-module: 2.17.0
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
@@ -11387,105 +11310,105 @@ snapshots:
     dependencies:
       glob: 7.2.3
 
-  rolldown@1.2.6:
+  rolldown@1.2.9:
     dependencies:
-      '@oxc-project/types': 0.147.0
+      '@oxc-project/types': 0.150.0
       '@rolldown/pluginutils': 1.0.1
     optionalDependencies:
-      '@rolldown/binding-android-arm-eabi': 1.2.6
-      '@rolldown/binding-android-arm64': 1.2.6
-      '@rolldown/binding-darwin-arm64': 1.2.6
-      '@rolldown/binding-darwin-x64': 1.2.6
-      '@rolldown/binding-freebsd-x64': 1.2.6
-      '@rolldown/binding-linux-arm-gnueabihf': 1.2.6
-      '@rolldown/binding-linux-arm64-gnu': 1.2.6
-      '@rolldown/binding-linux-arm64-musl': 1.2.6
-      '@rolldown/binding-linux-ppc64-gnu': 1.2.6
-      '@rolldown/binding-linux-s390x-gnu': 1.2.6
-      '@rolldown/binding-linux-x64-gnu': 1.2.6
-      '@rolldown/binding-linux-x64-musl': 1.2.6
-      '@rolldown/binding-openharmony-arm64': 1.2.6
-      '@rolldown/binding-win32-arm64-msvc': 1.2.6
-      '@rolldown/binding-win32-x64-msvc': 1.2.6
-
-  rollup-plugin-bundle-stats@4.22.3(core-js@3.47.0)(rolldown@1.2.6)(rollup@4.63.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0)):
+      '@rolldown/binding-android-arm-eabi': 1.2.9
+      '@rolldown/binding-android-arm64': 1.2.9
+      '@rolldown/binding-darwin-arm64': 1.2.9
+      '@rolldown/binding-darwin-x64': 1.2.9
+      '@rolldown/binding-freebsd-x64': 1.2.9
+      '@rolldown/binding-linux-arm-gnueabihf': 1.2.9
+      '@rolldown/binding-linux-arm64-gnu': 1.2.9
+      '@rolldown/binding-linux-arm64-musl': 1.2.9
+      '@rolldown/binding-linux-ppc64-gnu': 1.2.9
+      '@rolldown/binding-linux-s390x-gnu': 1.2.9
+      '@rolldown/binding-linux-x64-gnu': 1.2.9
+      '@rolldown/binding-linux-x64-musl': 1.2.9
+      '@rolldown/binding-openharmony-arm64': 1.2.9
+      '@rolldown/binding-win32-arm64-msvc': 1.2.9
+      '@rolldown/binding-win32-x64-msvc': 1.2.9
+
+  rollup-plugin-bundle-stats@4.22.3(core-js@3.47.0)(rolldown@1.2.9)(rollup@4.63.4)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1)):
     dependencies:
       '@bundle-stats/cli-utils': 4.22.3(core-js@3.47.0)
-      rollup-plugin-stats: 2.1.3(rolldown@1.2.6)(rollup@4.63.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))
-      rollup-plugin-webpack-stats: 3.1.3(rolldown@1.2.6)(rollup@4.63.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))
+      rollup-plugin-stats: 2.1.3(rolldown@1.2.9)(rollup@4.63.4)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1))
+      rollup-plugin-webpack-stats: 3.1.3(rolldown@1.2.9)(rollup@4.63.4)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1))
       tslib: 2.8.1
     optionalDependencies:
-      rolldown: 1.2.6
-      rollup: 4.63.1
-      vite: 8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0)
+      rolldown: 1.2.9
+      rollup: 4.63.4
+      vite: 8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1)
     transitivePeerDependencies:
       - core-js
 
-  rollup-plugin-esbuild@6.2.1(esbuild@0.28.2)(rollup@4.63.1)(supports-color@10.2.2):
+  rollup-plugin-esbuild@6.2.1(esbuild@0.28.2)(rollup@4.63.4)(supports-color@10.2.2):
     dependencies:
       debug: 4.4.3(supports-color@10.2.2)
       es-module-lexer: 1.7.0
       esbuild: 0.28.2
       get-tsconfig: 4.14.3
-      rollup: 4.63.1
+      rollup: 4.63.4
       unplugin-utils: 0.2.5
     transitivePeerDependencies:
       - supports-color
 
-  rollup-plugin-stats@2.1.3(rolldown@1.2.6)(rollup@4.63.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0)):
+  rollup-plugin-stats@2.1.3(rolldown@1.2.9)(rollup@4.63.4)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1)):
     optionalDependencies:
-      rolldown: 1.2.6
-      rollup: 4.63.1
-      vite: 8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0)
+      rolldown: 1.2.9
+      rollup: 4.63.4
+      vite: 8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1)
 
-  rollup-plugin-visualizer@7.1.1(rolldown@1.2.6)(rollup@4.63.1):
+  rollup-plugin-visualizer@7.1.1(rolldown@1.2.9)(rollup@4.63.4):
     dependencies:
-      open: 11.0.2
+      open: 11.0.4
       picomatch: 4.0.7
       source-map: 0.8.0
       yargs: 18.1.0
     optionalDependencies:
-      rolldown: 1.2.6
-      rollup: 4.63.1
+      rolldown: 1.2.9
+      rollup: 4.63.4
 
-  rollup-plugin-webpack-stats@3.1.3(rolldown@1.2.6)(rollup@4.63.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0)):
+  rollup-plugin-webpack-stats@3.1.3(rolldown@1.2.9)(rollup@4.63.4)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1)):
     dependencies:
-      rollup-plugin-stats: 2.1.3(rolldown@1.2.6)(rollup@4.63.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))
+      rollup-plugin-stats: 2.1.3(rolldown@1.2.9)(rollup@4.63.4)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1))
     optionalDependencies:
-      rolldown: 1.2.6
-      rollup: 4.63.1
-      vite: 8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0)
+      rolldown: 1.2.9
+      rollup: 4.63.4
+      vite: 8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1)
 
-  rollup@4.63.1:
+  rollup@4.63.4:
     dependencies:
       '@types/estree': 1.0.9
     optionalDependencies:
       '@napi-rs/lzma-linux-x64-gnu': 1.5.1
-      '@rollup/rollup-android-arm-eabi': 4.63.1
-      '@rollup/rollup-android-arm64': 4.63.1
-      '@rollup/rollup-darwin-arm64': 4.63.1
-      '@rollup/rollup-darwin-x64': 4.63.1
-      '@rollup/rollup-freebsd-arm64': 4.63.1
-      '@rollup/rollup-freebsd-x64': 4.63.1
-      '@rollup/rollup-linux-arm-gnueabihf': 4.63.1
-      '@rollup/rollup-linux-arm-musleabihf': 4.63.1
-      '@rollup/rollup-linux-arm64-gnu': 4.63.1
-      '@rollup/rollup-linux-arm64-musl': 4.63.1
-      '@rollup/rollup-linux-loong64-gnu': 4.63.1
-      '@rollup/rollup-linux-loong64-musl': 4.63.1
-      '@rollup/rollup-linux-ppc64-gnu': 4.63.1
-      '@rollup/rollup-linux-ppc64-musl': 4.63.1
-      '@rollup/rollup-linux-riscv64-gnu': 4.63.1
-      '@rollup/rollup-linux-riscv64-musl': 4.63.1
-      '@rollup/rollup-linux-s390x-gnu': 4.63.1
-      '@rollup/rollup-linux-x64-gnu': 4.63.1
-      '@rollup/rollup-linux-x64-musl': 4.63.1
-      '@rollup/rollup-openbsd-x64': 4.63.1
-      '@rollup/rollup-openharmony-arm64': 4.63.1
-      '@rollup/rollup-win32-arm64-msvc': 4.63.1
-      '@rollup/rollup-win32-ia32-msvc': 4.63.1
-      '@rollup/rollup-win32-x64-gnu': 4.63.1
-      '@rollup/rollup-win32-x64-msvc': 4.63.1
+      '@rollup/rollup-android-arm-eabi': 4.63.4
+      '@rollup/rollup-android-arm64': 4.63.4
+      '@rollup/rollup-darwin-arm64': 4.63.4
+      '@rollup/rollup-darwin-x64': 4.63.4
+      '@rollup/rollup-freebsd-arm64': 4.63.4
+      '@rollup/rollup-freebsd-x64': 4.63.4
+      '@rollup/rollup-linux-arm-gnueabihf': 4.63.4
+      '@rollup/rollup-linux-arm-musleabihf': 4.63.4
+      '@rollup/rollup-linux-arm64-gnu': 4.63.4
+      '@rollup/rollup-linux-arm64-musl': 4.63.4
+      '@rollup/rollup-linux-loong64-gnu': 4.63.4
+      '@rollup/rollup-linux-loong64-musl': 4.63.4
+      '@rollup/rollup-linux-ppc64-gnu': 4.63.4
+      '@rollup/rollup-linux-ppc64-musl': 4.63.4
+      '@rollup/rollup-linux-riscv64-gnu': 4.63.4
+      '@rollup/rollup-linux-riscv64-musl': 4.63.4
+      '@rollup/rollup-linux-s390x-gnu': 4.63.4
+      '@rollup/rollup-linux-x64-gnu': 4.63.4
+      '@rollup/rollup-linux-x64-musl': 4.63.4
+      '@rollup/rollup-openbsd-x64': 4.63.4
+      '@rollup/rollup-openharmony-arm64': 4.63.4
+      '@rollup/rollup-win32-arm64-msvc': 4.63.4
+      '@rollup/rollup-win32-ia32-msvc': 4.63.4
+      '@rollup/rollup-win32-x64-gnu': 4.63.4
+      '@rollup/rollup-win32-x64-msvc': 4.63.4
       fsevents: 2.3.3
 
   run-applescript@7.1.0: {}
@@ -11499,7 +11422,7 @@ snapshots:
   sass-lookup@6.1.2:
     dependencies:
       commander: 12.1.0
-      enhanced-resolve: 5.24.5
+      enhanced-resolve: 5.25.1
 
   saxes@6.0.0:
     dependencies:
@@ -11507,6 +11430,8 @@ snapshots:
 
   scheduler@0.27.0: {}
 
+  scheduler@0.28.0: {}
+
   semver@5.7.2: {}
 
   semver@6.3.1: {}
@@ -11562,37 +11487,38 @@ snapshots:
     dependencies:
       kind-of: 6.0.3
 
-  sharp@0.35.2:
+  sharp@0.35.4(@types/node@26.6.2):
     dependencies:
       '@img/colour': 1.1.0
       detect-libc: 2.1.2
       semver: 7.8.5
     optionalDependencies:
-      '@img/sharp-darwin-arm64': 0.35.2
-      '@img/sharp-darwin-x64': 0.35.2
-      '@img/sharp-freebsd-wasm32': 0.35.2
-      '@img/sharp-libvips-darwin-arm64': 1.3.1
-      '@img/sharp-libvips-darwin-x64': 1.3.1
-      '@img/sharp-libvips-linux-arm': 1.3.1
-      '@img/sharp-libvips-linux-arm64': 1.3.1
-      '@img/sharp-libvips-linux-ppc64': 1.3.1
-      '@img/sharp-libvips-linux-riscv64': 1.3.1
-      '@img/sharp-libvips-linux-s390x': 1.3.1
-      '@img/sharp-libvips-linux-x64': 1.3.1
-      '@img/sharp-libvips-linuxmusl-arm64': 1.3.1
-      '@img/sharp-libvips-linuxmusl-x64': 1.3.1
-      '@img/sharp-linux-arm': 0.35.2
-      '@img/sharp-linux-arm64': 0.35.2
-      '@img/sharp-linux-ppc64': 0.35.2
-      '@img/sharp-linux-riscv64': 0.35.2
-      '@img/sharp-linux-s390x': 0.35.2
-      '@img/sharp-linux-x64': 0.35.2
-      '@img/sharp-linuxmusl-arm64': 0.35.2
-      '@img/sharp-linuxmusl-x64': 0.35.2
-      '@img/sharp-webcontainers-wasm32': 0.35.2
-      '@img/sharp-win32-arm64': 0.35.2
-      '@img/sharp-win32-ia32': 0.35.2
-      '@img/sharp-win32-x64': 0.35.2
+      '@img/sharp-darwin-arm64': 0.35.4
+      '@img/sharp-darwin-x64': 0.35.4
+      '@img/sharp-freebsd-wasm32': 0.35.4
+      '@img/sharp-libvips-darwin-arm64': 1.3.3
+      '@img/sharp-libvips-darwin-x64': 1.3.3
+      '@img/sharp-libvips-linux-arm': 1.3.3
+      '@img/sharp-libvips-linux-arm64': 1.3.3
+      '@img/sharp-libvips-linux-ppc64': 1.3.3
+      '@img/sharp-libvips-linux-riscv64': 1.3.3
+      '@img/sharp-libvips-linux-s390x': 1.3.3
+      '@img/sharp-libvips-linux-x64': 1.3.3
+      '@img/sharp-libvips-linuxmusl-arm64': 1.3.3
+      '@img/sharp-libvips-linuxmusl-x64': 1.3.3
+      '@img/sharp-linux-arm': 0.35.4
+      '@img/sharp-linux-arm64': 0.35.4
+      '@img/sharp-linux-ppc64': 0.35.4
+      '@img/sharp-linux-riscv64': 0.35.4
+      '@img/sharp-linux-s390x': 0.35.4
+      '@img/sharp-linux-x64': 0.35.4
+      '@img/sharp-linuxmusl-arm64': 0.35.4
+      '@img/sharp-linuxmusl-x64': 0.35.4
+      '@img/sharp-webcontainers-wasm32': 0.35.4
+      '@img/sharp-win32-arm64': 0.35.4
+      '@img/sharp-win32-ia32': 0.35.4
+      '@img/sharp-win32-x64': 0.35.4
+      '@types/node': 26.6.2
 
   shebang-command@2.0.0:
     dependencies:
@@ -11634,12 +11560,6 @@ snapshots:
 
   signal-exit@4.1.0: {}
 
-  sirv@3.0.2:
-    dependencies:
-      '@polka/url': 1.0.0-next.29
-      mrmime: 2.0.1
-      totalist: 3.0.1
-
   sisteransi@1.0.5: {}
 
   slash@3.0.0: {}
@@ -11673,7 +11593,7 @@ snapshots:
 
   sprintf-js@1.1.3: {}
 
-  sql-escaper@1.5.1: {}
+  sql-escaper@1.5.2: {}
 
   ssh-remote-port-forward@1.0.4:
     dependencies:
@@ -11686,7 +11606,7 @@ snapshots:
       bcrypt-pbkdf: 1.0.2
     optionalDependencies:
       cpu-features: 0.0.10
-      nan: 2.28.0
+      nan: 2.29.0
 
   stack-utils@2.0.6:
     dependencies:
@@ -11742,12 +11662,12 @@ snapshots:
   string-width@7.2.0:
     dependencies:
       emoji-regex: 10.6.0
-      get-east-asian-width: 1.6.0
+      get-east-asian-width: 1.7.0
       strip-ansi: 7.2.0
 
   string-width@8.2.2:
     dependencies:
-      get-east-asian-width: 1.6.0
+      get-east-asian-width: 1.7.0
       strip-ansi: 7.2.0
 
   string_decoder@1.1.1:
@@ -11835,7 +11755,7 @@ snapshots:
       tar-stream: 3.2.1
     optionalDependencies:
       bare-fs: 4.8.1
-      bare-path: 3.1.1
+      bare-path: 3.1.2
     transitivePeerDependencies:
       - bare-abort-controller
       - bare-buffer
@@ -11851,7 +11771,7 @@ snapshots:
 
   tar-stream@3.2.1:
     dependencies:
-      b4a: 1.8.1
+      b4a: 1.9.0
       bare-fs: 4.8.1
       fast-fifo: 1.3.2
       streamx: 2.28.1
@@ -11871,10 +11791,10 @@ snapshots:
   tedious@20.0.0(supports-color@10.2.2):
     dependencies:
       '@azure/core-auth': 1.11.0(supports-color@10.2.2)
-      '@azure/identity': 4.13.2(supports-color@10.2.2)
+      '@azure/identity': 4.13.3(supports-color@10.2.2)
       '@azure/keyvault-keys': 4.10.2(supports-color@10.2.2)
       '@js-joda/core': 6.1.0
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
       bl: 6.1.6
       iconv-lite: 0.7.3
       js-md4: 0.3.2
@@ -11911,7 +11831,7 @@ snapshots:
       async-lock: 1.4.1
       byline: 5.0.0
       debug: 4.4.3(supports-color@10.2.2)
-      docker-compose: 1.4.2
+      docker-compose: 1.5.0
       dockerode: 5.0.1(supports-color@10.2.2)
       get-port: 5.1.1
       proper-lockfile: 4.1.2
@@ -11919,7 +11839,7 @@ snapshots:
       ssh-remote-port-forward: 1.0.4
       tar-fs: 3.1.3
       tmp: 0.2.7
-      undici: 8.10.0
+      undici: 8.10.2
     transitivePeerDependencies:
       - bare-abort-controller
       - bare-buffer
@@ -11928,7 +11848,7 @@ snapshots:
 
   text-decoder@1.2.7:
     dependencies:
-      b4a: 1.8.1
+      b4a: 1.9.0
     transitivePeerDependencies:
       - react-native-b4a
 
@@ -11941,12 +11861,14 @@ snapshots:
 
   tiny-invariant@1.3.3: {}
 
-  tinybench@2.9.0: {}
-
   tinybench@6.1.4: {}
 
+  tinybench@6.2.0: {}
+
   tinyexec@1.3.0: {}
 
+  tinyexec@1.3.1: {}
+
   tinyglobby@0.2.17:
     dependencies:
       fdir: 6.5.0(picomatch@4.0.7)
@@ -11974,8 +11896,6 @@ snapshots:
 
   toidentifier@1.0.1: {}
 
-  totalist@3.0.1: {}
-
   tough-cookie@6.0.2:
     dependencies:
       tldts: 7.4.9
@@ -12034,11 +11954,11 @@ snapshots:
 
   tslib@2.8.1: {}
 
-  tstyche@7.2.3(typescript@7.0.2):
+  tstyche@7.2.5(typescript@7.0.2):
     optionalDependencies:
       typescript: 7.0.2
 
-  tsx@4.23.12:
+  tsx@4.23.13:
     dependencies:
       esbuild: 0.28.2
     optionalDependencies:
@@ -12083,11 +12003,11 @@ snapshots:
 
   undici-types@5.26.5: {}
 
-  undici-types@8.3.0: {}
+  undici-types@8.9.0: {}
 
   undici@7.29.0: {}
 
-  undici@8.10.0: {}
+  undici@8.10.2: {}
 
   unpipe@1.0.0: {}
 
@@ -12096,9 +12016,9 @@ snapshots:
       pathe: 2.0.3
       picomatch: 4.0.7
 
-  update-browserslist-db@1.3.2(browserslist@4.28.8):
+  update-browserslist-db@1.3.3(browserslist@4.29.0):
     dependencies:
-      browserslist: 4.28.8
+      browserslist: 4.29.0
       escalade: 3.2.0
       picocolors: 1.1.1
 
@@ -12108,71 +12028,67 @@ snapshots:
 
   utils-merge@1.0.1: {}
 
-  valibot@1.4.2(typescript@7.0.2):
+  valibot@1.5.0(typescript@7.0.2):
     optionalDependencies:
       typescript: 7.0.2
 
-  vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0):
+  verkit@0.3.2: {}
+
+  vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1):
     dependencies:
       lightningcss: 1.33.0
       picomatch: 4.0.7
-      postcss: 8.5.26
-      rolldown: 1.2.6
+      postcss: 8.5.28
+      rolldown: 1.2.9
       tinyglobby: 0.2.17
     optionalDependencies:
-      '@types/node': 26.4.0
+      '@types/node': 26.6.2
       esbuild: 0.28.2
       fsevents: 2.3.3
       terser: 5.51.2
-      tsx: 4.23.12
-      yaml: 2.9.0
+      tsx: 4.23.13
+      yaml: 2.9.1
 
-  vitest-websocket-mock@0.7.0(vitest@4.1.11):
+  vitest-websocket-mock@0.8.0(vitest@5.0.1):
     dependencies:
       mock-socket: 9.3.1
-      vitest: 4.1.11(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.4.0)(@vitest/coverage-v8@4.1.11)(happy-dom@20.12.0)(jsdom@30.0.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))
+      vitest: 5.0.1(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.6.2)(@vitest/coverage-v8@5.0.1)(happy-dom@20.14.5)(jsdom@30.0.1)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1))
 
-  vitest@4.1.11(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.4.0)(@vitest/coverage-v8@4.1.11)(happy-dom@20.12.0)(jsdom@30.0.1)(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0)):
+  vitest@5.0.1(@edge-runtime/vm@5.0.0)(@opentelemetry/api@1.9.1)(@types/node@26.6.2)(@vitest/coverage-v8@5.0.1)(happy-dom@20.14.5)(jsdom@30.0.1)(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1)):
     dependencies:
-      '@vitest/expect': 4.1.11
-      '@vitest/mocker': 4.1.11(vite@8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0))
-      '@vitest/pretty-format': 4.1.11
-      '@vitest/runner': 4.1.11
-      '@vitest/snapshot': 4.1.11
-      '@vitest/spy': 4.1.11
-      '@vitest/utils': 4.1.11
+      '@types/chai': 5.2.3
+      '@vitest/mocker': 5.0.1(vite@8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1))
+      chai: 6.2.2
       es-module-lexer: 2.3.2
       expect-type: 1.4.0
-      magic-string: 0.30.21
-      obug: 2.1.4
-      pathe: 2.0.3
+      magic-string: 1.4.1
+      obug: 2.2.1
       picomatch: 4.0.7
       std-env: 4.2.0
-      tinybench: 2.9.0
+      tinybench: 6.1.4
       tinyexec: 1.3.0
       tinyglobby: 0.2.17
-      tinyrainbow: 3.1.1
-      vite: 8.2.2(@types/node@26.4.0)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.12)(yaml@2.9.0)
+      vite: 8.3.0(@types/node@26.6.2)(esbuild@0.28.2)(terser@5.51.2)(tsx@4.23.13)(yaml@2.9.1)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@edge-runtime/vm': 5.0.0
       '@opentelemetry/api': 1.9.1
-      '@types/node': 26.4.0
-      '@vitest/coverage-v8': 4.1.11(@vitest/browser@4.1.11)(vitest@4.1.11)
-      happy-dom: 20.12.0
+      '@types/node': 26.6.2
+      '@vitest/coverage-v8': 5.0.1(vitest@5.0.1)
+      happy-dom: 20.14.5
       jsdom: 30.0.1
     transitivePeerDependencies:
       - msw
 
   vlq@1.0.1: {}
 
-  vue@3.5.42(typescript@7.0.2):
+  vue@3.5.43(typescript@7.0.2):
     dependencies:
-      '@vue/compiler-dom': 3.5.42
-      '@vue/compiler-sfc': 3.5.42
-      '@vue/runtime-dom': 3.5.42
-      '@vue/server-renderer': 3.5.42
-      '@vue/shared': 3.5.42
+      '@vue/compiler-dom': 3.5.43
+      '@vue/compiler-sfc': 3.5.43
+      '@vue/runtime-dom': 3.5.43
+      '@vue/server-renderer': 3.5.43
+      '@vue/shared': 3.5.43
     optionalDependencies:
       typescript: 7.0.2
 
@@ -12208,7 +12124,7 @@ snapshots:
     transitivePeerDependencies:
       - '@noble/hashes'
 
-  whatwg-url@17.1.0:
+  whatwg-url@17.1.1:
     dependencies:
       '@exodus/bytes': 1.15.1
       tr46: 6.0.0
@@ -12230,13 +12146,13 @@ snapshots:
       siginfo: 2.0.0
       stackback: 0.0.2
 
-  workerd@1.20260828.1:
+  workerd@1.20260918.1:
     optionalDependencies:
-      '@cloudflare/workerd-darwin-64': 1.20260828.1
-      '@cloudflare/workerd-darwin-arm64': 1.20260828.1
-      '@cloudflare/workerd-linux-64': 1.20260828.1
-      '@cloudflare/workerd-linux-arm64': 1.20260828.1
-      '@cloudflare/workerd-windows-64': 1.20260828.1
+      '@cloudflare/workerd-darwin-64': 1.20260918.1
+      '@cloudflare/workerd-darwin-arm64': 1.20260918.1
+      '@cloudflare/workerd-linux-64': 1.20260918.1
+      '@cloudflare/workerd-linux-arm64': 1.20260918.1
+      '@cloudflare/workerd-windows-64': 1.20260918.1
 
   wrap-ansi@7.0.0:
     dependencies:
@@ -12299,7 +12215,7 @@ snapshots:
 
   yaml@1.10.3: {}
 
-  yaml@2.9.0: {}
+  yaml@2.9.1: {}
 
   yargs-parser@21.1.1: {}
 
@@ -12343,4 +12259,4 @@ snapshots:
       compress-commons: 6.0.2
       readable-stream: 4.7.0
 
-  zod@4.5.4: {}
+  zod@4.6.5: {}
diff --git a/repos/effect/pnpm-workspace.yaml b/repos/effect/pnpm-workspace.yaml
index 3936cde02..80c11ab74 100644
--- a/repos/effect/pnpm-workspace.yaml
+++ b/repos/effect/pnpm-workspace.yaml
@@ -27,4 +27,10 @@ allowBuilds:
   workerd: false
 
 patchedDependencies:
-  '@changesets/get-github-info@1.0.0': patches/@changesets__get-github-info@1.0.0.patch
+  '@changesets/get-github-info@1.0.1': patches/@changesets__get-github-info@1.0.1.patch
+
+overrides:
+  # jsdom 30.1.0 fails under Bun when Vitest installs its window error handler.
+  # Remove after a later jsdom release passes the Atom React and Solid suites under Bun.
+  # Upstream changes: https://github.com/jsdom/jsdom/compare/v30.0.1...v30.1.0
+  jsdom: ~30.0.1
diff --git a/repos/effect/scratchpad/package.json b/repos/effect/scratchpad/package.json
index 27b7fbd17..d07d75378 100644
--- a/repos/effect/scratchpad/package.json
+++ b/repos/effect/scratchpad/package.json
@@ -8,6 +8,7 @@
     "@effect/ai-openai": "workspace:*",
     "@effect/ai-openai-compat": "workspace:*",
     "@effect/ai-openrouter": "workspace:*",
+    "@effect/ai-typesafe": "workspace:*",
     "@effect/opentelemetry": "workspace:*",
     "@effect/platform-bun": "workspace:*",
     "@effect/platform-node": "workspace:*",
diff --git a/repos/effect/scripts/check-dist-types.mjs b/repos/effect/scripts/check-dist-types.mjs
new file mode 100644
index 000000000..ce72be8b5
--- /dev/null
+++ b/repos/effect/scripts/check-dist-types.mjs
@@ -0,0 +1,56 @@
+// Type-checks the built `effect` declarations the way a consumer with
+// `skipLibCheck: false` does. Run after `pnpm build` with `stripInternal`
+// enabled to catch public declarations that reference `@internal` symbols
+// (see Effect-TS/effect#6431, #7187, #8161).
+import { execFileSync } from "node:child_process"
+import * as Fs from "node:fs"
+import * as Os from "node:os"
+import * as Path from "node:path"
+import { fileURLToPath } from "node:url"
+
+const root = Path.resolve(Path.dirname(fileURLToPath(import.meta.url)), "..")
+const pkgDir = Path.join(root, "packages", "effect")
+const dist = Path.join(pkgDir, "dist")
+
+if (!Fs.existsSync(Path.join(dist, "index.d.ts"))) {
+  console.error("packages/effect/dist is missing; run `pnpm build` first")
+  process.exit(1)
+}
+
+const pkg = JSON.parse(Fs.readFileSync(Path.join(pkgDir, "package.json"), "utf8"))
+const entrypoints = Object.entries(pkg.publishConfig.exports)
+  .filter(([key, target]) => target !== null && key !== "./package.json" && !key.includes("*"))
+  .map(([key]) => Path.posix.join(pkg.name, key))
+
+const dir = Fs.mkdtempSync(Path.join(Os.tmpdir(), "effect-dist-types-"))
+try {
+  Fs.writeFileSync(
+    Path.join(dir, "index.ts"),
+    entrypoints.map((entry, i) => `import * as _${i} from "${entry}"\nexport { _${i} }\n`).join("")
+  )
+  Fs.writeFileSync(
+    Path.join(dir, "tsconfig.json"),
+    JSON.stringify({
+      compilerOptions: {
+        strict: true,
+        noEmit: true,
+        target: "ES2022",
+        module: "ESNext",
+        moduleResolution: "bundler",
+        skipLibCheck: false,
+        types: ["node"],
+        typeRoots: [Path.join(root, "node_modules", "@types")],
+        paths: {
+          [pkg.name]: [Path.join(dist, "index.d.ts")],
+          [`${pkg.name}/*`]: [Path.join(dist, "*")]
+        }
+      },
+      files: ["index.ts"]
+    })
+  )
+  execFileSync("pnpm", ["exec", "tsc", "-p", Path.join(dir, "tsconfig.json")], { cwd: root, stdio: "inherit" })
+} catch (error) {
+  process.exitCode = typeof error.status === "number" ? error.status : 1
+} finally {
+  Fs.rmSync(dir, { recursive: true, force: true })
+}
diff --git a/repos/effect/tsconfig.packages.json b/repos/effect/tsconfig.packages.json
index fb54b67c7..49066fdd7 100644
--- a/repos/effect/tsconfig.packages.json
+++ b/repos/effect/tsconfig.packages.json
@@ -8,6 +8,7 @@
     { "path": "packages/ai/anthropic" },
     { "path": "packages/ai/openai-compat" },
     { "path": "packages/ai/openai" },
+    { "path": "packages/ai/typesafe" },
     { "path": "packages/ai/openrouter" },
     { "path": "packages/atom/react" },
     { "path": "packages/atom/vue" },
diff --git a/repos/effect/tsconfig.tests.json b/repos/effect/tsconfig.tests.json
index 943e0af02..7e6eb1356 100644
--- a/repos/effect/tsconfig.tests.json
+++ b/repos/effect/tsconfig.tests.json
@@ -33,6 +33,8 @@
       "@effect/ai-openai-compat/*": ["./packages/ai/openai-compat/src/*.ts"],
       "@effect/ai-openai": ["./packages/ai/openai/src/index.ts"],
       "@effect/ai-openai/*": ["./packages/ai/openai/src/*.ts"],
+      "@effect/ai-typesafe": ["./packages/ai/typesafe/src/index.ts"],
+      "@effect/ai-typesafe/*": ["./packages/ai/typesafe/src/*.ts"],
       "@effect/ai-openrouter": ["./packages/ai/openrouter/src/index.ts"],
       "@effect/ai-openrouter/*": ["./packages/ai/openrouter/src/*.ts"],
       "@effect/atom-react": ["./packages/atom/react/src/index.ts"],
diff --git a/repos/effect/vitest.config.ts b/repos/effect/vitest.config.ts
index 66aa54298..f60461deb 100644
--- a/repos/effect/vitest.config.ts
+++ b/repos/effect/vitest.config.ts
@@ -69,10 +69,7 @@ const shared: ViteUserConfig = {
   test: {
     exclude,
     passWithNoTests: true,
-    setupFiles: [path.join(__dirname, "vitest.setup.ts")],
-    fakeTimers: {
-      toFake: undefined
-    },
+    setupFiles: [path.join(import.meta.dirname, "vitest.setup.ts")],
     sequence: {
       concurrent: true
     },
@@ -90,20 +87,34 @@ export default defineConfig({
   test: {
     passWithNoTests: true,
     projects: [
-      ...project("effect", "packages/effect", true, {
-        test: {
-          // @see https://github.com/denoland/deno/issues/23882
-          exclude: isDeno ? ["test/cluster/**"] : []
-        }
-      }),
+      ...project(
+        "effect",
+        "packages/effect",
+        true,
+        {},
+        isBun
+          ? [
+            ...exclude,
+            // These tests assert Node-specific Web API or stack trace behavior.
+            "test/reactivity/Atom.test.ts",
+            "test/schema/Schema.test.ts",
+            "test/schema/SchemaGetter.test.ts",
+            "test/schema/toCodec.test.ts",
+            "test/schema/toDifferJsonPatch.test.ts",
+            "test/unstable/http/HttpEffect.test.ts",
+            "test/unstable/http/HttpServerRequest.test.ts"
+          ]
+          : undefined
+      ),
       ...project("@effect/ai-anthropic", "packages/ai/anthropic"),
       ...project("@effect/ai-openai", "packages/ai/openai"),
+      ...project("@effect/ai-typesafe", "packages/ai/typesafe"),
       ...project("@effect/ai-openai-compat", "packages/ai/openai-compat"),
       ...project("@effect/ai-openrouter", "packages/ai/openrouter"),
       ...project("@effect/atom-react", "packages/atom/react", true, {
         test: {
           environment: "jsdom",
-          setupFiles: [path.join(__dirname, "packages/atom/react/vitest.setup.ts")]
+          setupFiles: [path.join(import.meta.dirname, "packages/atom/react/vitest.setup.ts")]
         }
       }),
       ...project("@effect/atom-solid", "packages/atom/solid", true, {
@@ -112,7 +123,7 @@ export default defineConfig({
         },
         test: {
           environment: "jsdom",
-          setupFiles: [path.join(__dirname, "packages/atom/solid/vitest.setup.ts")]
+          setupFiles: [path.join(import.meta.dirname, "packages/atom/solid/vitest.setup.ts")]
         }
       }),
       ...project("@effect/atom-vue", "packages/atom/vue", true, {
@@ -124,11 +135,14 @@ export default defineConfig({
       ...project("@effect/platform-browser", "packages/platform/browser", true, {
         test: {
           environment: "happy-dom",
-          execArgv: [
-            "--localstorage-file",
-            path.resolve(os.tmpdir(), `vitest-${process.pid}.localstorage`)
-          ],
-          setupFiles: [path.join(__dirname, "packages/platform/browser/vitest.setup.ts")]
+          // Bun interprets Node's --localstorage-file value as a module path.
+          execArgv: isBun
+            ? []
+            : [
+              "--localstorage-file",
+              path.resolve(os.tmpdir(), `vitest-${process.pid}.localstorage`)
+            ],
+          setupFiles: [path.join(import.meta.dirname, "packages/platform/browser/vitest.setup.ts")]
         }
       }),
       ...project("@effect/platform-bun", "packages/platform/bun", isBun),
@@ -140,7 +154,9 @@ export default defineConfig({
         isNode && clusterTestsEnabled,
         {
           test: {
-            globalSetup: [path.join(__dirname, "packages/platform/node/test/cluster-integration/globalSetup.ts")],
+            globalSetup: [
+              path.join(import.meta.dirname, "packages/platform/node/test/cluster-integration/globalSetup.ts")
+            ],
             include: ["test/cluster-integration/**/*.test.ts"],
             retry: 0,
             sequence: {
@@ -154,19 +170,19 @@ export default defineConfig({
           "test/cluster-integration/**/*.test.ts"
         ]
       ),
-      ...project("@effect/platform-node-shared", "packages/platform/node-shared", !isDeno),
+      ...project("@effect/platform-node-shared", "packages/platform/node-shared", isNode),
       ...project("@effect/vitest", "packages/vitest"),
       ...project("@effect/sql-clickhouse", "packages/sql/clickhouse"),
       ...project("@effect/sql-d1", "packages/sql/d1", !isDeno),
       ...project("@effect/sql-libsql", "packages/sql/libsql"),
       ...project("@effect/sql-mssql", "packages/sql/mssql"),
       // MySQL starts a fresh container per integration test suite, so avoid competing
-      // with the other container-backed projects on Deno CI runners.
+      // with the other container-backed projects on integration-test runners.
       ...project(
         "@effect/sql-mysql2",
         "packages/sql/mysql2",
         true,
-        isDeno && integrationTestsEnabled
+        integrationTestsEnabled
           ? {
             test: {
               fileParallelism: false,
@@ -180,16 +196,25 @@ export default defineConfig({
       ...project("@effect/sql-pg", "packages/sql/pg"),
       ...project("@effect/sql-pglite", "packages/sql/pglite"),
       ...project("@effect/sql-sqlite-bun", "packages/sql/sqlite-bun"),
-      ...project("@effect/sql-sqlite-do", "packages/sql/sqlite-do"),
-      ...project("@effect/sql-sqlite-node", "packages/sql/sqlite-node", !isDeno),
+      ...project(
+        "@effect/sql-sqlite-do",
+        "packages/sql/sqlite-do",
+        true,
+        {},
+        // Miniflare needs Node/Bun; keep the in-process client tests on Deno.
+        isDeno ? [...exclude, "test/Miniflare.test.ts"] : undefined
+      ),
+      ...project("@effect/sql-sqlite-node", "packages/sql/sqlite-node", isNode),
       ...project("@effect/sql-sqlite-react-native", "packages/sql/sqlite-react-native"),
       ...project("@effect/sql-sqlite-wasm", "packages/sql/sqlite-wasm"),
+      ...project("@effect/ai-codegen", "packages/tools/ai-codegen", isNode),
       ...project("@effect/api-diff", "packages/tools/api-diff"),
       ...project("@effect/bundle", "packages/tools/bundle"),
       ...project("@effect/doctest", "packages/tools/doctest"),
       ...project("@effect/docgen", "packages/tools/docgen"),
       ...project("@effect/jsdocs", "packages/tools/jsdocs"),
       ...project("@effect/openapi-generator", "packages/tools/openapi-generator"),
+      ...project("@effect/utils", "packages/tools/utils", isNode),
       ...project("@effect/oxc", "packages/tools/oxc")
     ]
   }
diff --git a/scripts/measure-hook-cold-start.mjs b/scripts/measure-hook-cold-start.mjs
index cde6b8771..bb9ddb0b0 100644
--- a/scripts/measure-hook-cold-start.mjs
+++ b/scripts/measure-hook-cold-start.mjs
@@ -101,8 +101,11 @@ const measure = async () => {
       samplesMs.push(measureOnce(hookPath));
     }
     const rounded = samplesMs.map((value) => Math.round(value * 100) / 100);
+    const manifest = JSON.parse(
+      await readFile(join(workspaceRoot, 'packages', 'agent-bundle', 'package.json'), 'utf8'),
+    );
     return {
-      effect: '4.0.0-rc.112',
+      effect: manifest.dependencies.effect,
       hookPath: 'hooks/<generated-session-start>.mjs',
       kind: 'generated-stdio-hook-cold-start',
       maxMs: Math.round(Math.max(...rounded) * 100) / 100,